932ddafdb0
* [MM-19054] Added new server tab look and feel, still missing proper hover states and session expired icon * [MM-19055] Added window controls and removed border for macOS * [MM-19055] Add dark mode for macOS * [MM-19054] Added session expired icon * Test windows titlebar * Fixed the menu issue and added non-macOS dark mode * Blank commit * Fixed a lint issue * Fixed more lint issues * Fixed more issues * New tray icons * [MM-19603] Drag and drop tabs * Fixed some assets and fixed build output to include missing assets * Fixed a couple small issues * Only show tabs for only 1 server on Mac * Fixed some more tests * Fixed another test * Revert "Fixed another test" This reverts commit 36040294a71a68663d06996d71eecc5ed23d7014. * Fixed another test * Trial and error! * A bunch of additional fixes * Fixed a lint issue * Fixed restore focus on add server tab causing bad UX * Trial and error on flaky test again * Fixed some bugs based on PR feedback. * blank commit to push tests * Revert "Test windows titlebar" This reverts commit 9cd46b71b1427b75942434ac49185870d2437b85. * Remove the rest of the old new titlebar and fixes * Added three-dot link * New menu * Rest of new windows menu and other fixes * Fixed lint errors * Added windows 10 style title bar buttons for non mac OS * Lint fixes and enabled the tab bar regardless of number of servers * Missed one * Fixed unicode characters * Commenting out test that should no longer be applicable * Removed Windows 10 style titlebar icons and used material design instead * Fixed a lint issue * Some small UX fixes * blank commit * Fixed an issue where dropping the first tab moves it too far over before snapping into place * Additional style fixes * Another small issue fix * Back to Windows 10 style * Lint fixes * Accessible three dot menu * Lint fixes * Shrinking tabs when window is too small * Gradient between tabs and title bar buttons when window is too small * Add drag to gradient * Replaced icons, drag and drop cursor sticking fix, slight tab change * Lint and some mac fixes * Light theme fix to three dot menu * Hack for tab sticking to cursor on macOS * Fixes for the find utility * Fix for Catalina dark mode * Revert "Fix for Catalina dark mode" This reverts commit 45da05dd0f17f46efd1c53fafb92e9c1fd9dd8d9. * Fixed a couple issues Dean found * More fixes * Three dot hover effect to circle * PR feedback * Test fixes * Test and config fixes * Disable dragging when there are GPO servers * [MM-20757] Fixed dark mode on debug when running macOS Catalina * Allow future config versions to use v2 config if launching this version of the app * Oops * New titlebar icons, blur for titlebar on inactive * Lint fix * Set unfocused opacity to 0.4 * Final FINAL icons * Fixed closing menu not returning focus to the app * Lint fix * Update src/browser/components/TabBar.jsx Co-Authored-By: Guillermo Vayá <guivaya@gmail.com> * Update src/main/Validator.js Co-Authored-By: Guillermo Vayá <guivaya@gmail.com> * Lint fixes * Moved react-smooth-dnd fork to MM org and fixed another merge issue Co-authored-by: mattermod <mattermod@users.noreply.github.com> Co-authored-by: Guillermo Vayá <guivaya@gmail.com>
71 lines
1.5 KiB
JavaScript
71 lines
1.5 KiB
JavaScript
// Copyright (c) 2015-2016 Yuya Ochiai
|
|
// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
|
|
// See LICENSE.txt for license information.
|
|
|
|
// This file uses CommonJS.
|
|
/* eslint-disable import/no-commonjs */
|
|
'use strict';
|
|
|
|
const path = require('path');
|
|
|
|
const merge = require('webpack-merge');
|
|
|
|
const base = require('./webpack.config.base');
|
|
|
|
module.exports = merge(base, {
|
|
entry: {
|
|
index: './src/browser/index.jsx',
|
|
settings: './src/browser/settings.jsx',
|
|
updater: './src/browser/updater.jsx',
|
|
'webview/mattermost': './src/browser/webview/mattermost.js',
|
|
},
|
|
output: {
|
|
path: path.join(__dirname, 'src/browser'),
|
|
publicPath: 'browser',
|
|
filename: '[name]_bundle.js',
|
|
},
|
|
module: {
|
|
rules: [{
|
|
test: /\.(js|jsx)?$/,
|
|
use: {
|
|
loader: 'babel-loader',
|
|
},
|
|
}, {
|
|
test: /\.css$/,
|
|
use: [
|
|
{loader: 'style-loader'},
|
|
{loader: 'css-loader'},
|
|
],
|
|
}, {
|
|
test: /\.mp3$/,
|
|
use: {
|
|
loader: 'url-loader',
|
|
},
|
|
}, {
|
|
test: /\.(svg|woff2)$/,
|
|
use: [
|
|
{
|
|
loader: 'file-loader',
|
|
options: {
|
|
name: '[hash].[ext]',
|
|
publicPath: './',
|
|
},
|
|
},
|
|
{loader: 'image-webpack-loader'},
|
|
],
|
|
}],
|
|
},
|
|
node: {
|
|
__filename: true,
|
|
__dirname: true,
|
|
},
|
|
target: 'electron-renderer',
|
|
devServer: {
|
|
contentBase: path.join(__dirname, 'src'),
|
|
inline: true,
|
|
publicPath: '/browser/',
|
|
},
|
|
});
|
|
|
|
/* eslint-enable import/no-commonjs */
|