keeweb
/
keeweb
mirror of https://github.com/keeweb/keeweb.git
1
0
Fork 0
Code Issues Releases Wiki Activity

deps: update webpack to v5.91.0, webpack-dev-server to v5.0.4 (#2163, #2156)

This commit is contained in:
Aetherinox 2024-04-21 04:23:18 -07:00
parent dd36904d00
commit 0158111f70
No known key found for this signature in database
GPG Key ID: CB5C4C30CD0D4028
4 changed files with 167 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
Gruntfile.js
View File

@ -86,6 +86,12 @@ module.exports = function (grunt) {
'libatspi2.0-0'
];
const appConfig = webpackConfig({
...webpackOptions,
mode: 'development',
sha: 'dev'
});
grunt.initConfig({
noop: { noop: {} },
clean: {
@ -148,8 +154,7 @@ module.exports = function (grunt) {
'desktop-darwin-installer-helper-x64': {
cwd: 'tmp/desktop/KeeWeb Installer.app',
src: '**',
dest:
'tmp/desktop/KeeWeb-darwin-x64/KeeWeb.app/Contents/Installer/KeeWeb Installer.app',
dest: 'tmp/desktop/KeeWeb-darwin-x64/KeeWeb.app/Contents/Installer/KeeWeb Installer.app',
expand: true,
nonull: true,
options: { mode: true }
@ -157,8 +162,7 @@ module.exports = function (grunt) {
'desktop-darwin-installer-helper-arm64': {
cwd: 'tmp/desktop/KeeWeb Installer.app',
src: '**',
dest:
'tmp/desktop/KeeWeb-darwin-arm64/KeeWeb.app/Contents/Installer/KeeWeb Installer.app',
dest: 'tmp/desktop/KeeWeb-darwin-arm64/KeeWeb.app/Contents/Installer/KeeWeb Installer.app',
expand: true,
nonull: true,
options: { mode: true }
@ -229,47 +233,40 @@ module.exports = function (grunt) {
nonull: true
},
'native-messaging-host-darwin-x64': {
src:
'node_modules/@keeweb/keeweb-native-messaging-host/darwin-x64/keeweb-native-messaging-host',
dest:
'tmp/desktop/KeeWeb-darwin-x64/KeeWeb.app/Contents/MacOS/util/keeweb-native-messaging-host',
src: 'node_modules/@keeweb/keeweb-native-messaging-host/darwin-x64/keeweb-native-messaging-host',
dest: 'tmp/desktop/KeeWeb-darwin-x64/KeeWeb.app/Contents/MacOS/util/keeweb-native-messaging-host',
nonull: true,
options: { mode: '0755' }
},
'native-messaging-host-darwin-arm64': {
src:
'node_modules/@keeweb/keeweb-native-messaging-host/darwin-arm64/keeweb-native-messaging-host',
dest:
'tmp/desktop/KeeWeb-darwin-arm64/KeeWeb.app/Contents/MacOS/util/keeweb-native-messaging-host',
src: 'node_modules/@keeweb/keeweb-native-messaging-host/darwin-arm64/keeweb-native-messaging-host',
dest: 'tmp/desktop/KeeWeb-darwin-arm64/KeeWeb.app/Contents/MacOS/util/keeweb-native-messaging-host',
nonull: true,
options: { mode: '0755' }
},
'native-messaging-host-linux-x64': {
src:
'node_modules/@keeweb/keeweb-native-messaging-host/linux-x64/keeweb-native-messaging-host',
src: 'node_modules/@keeweb/keeweb-native-messaging-host/linux-x64/keeweb-native-messaging-host',
dest: 'tmp/desktop/keeweb-linux-x64/keeweb-native-messaging-host',
nonull: true,
options: { mode: '0755' }
},
'native-messaging-host-win32-x64': {
src:
'node_modules/@keeweb/keeweb-native-messaging-host/win32-x64/keeweb-native-messaging-host.exe',
src: 'node_modules/@keeweb/keeweb-native-messaging-host/win32-x64/keeweb-native-messaging-host.exe',
dest: 'tmp/desktop/KeeWeb-win32-x64/keeweb-native-messaging-host.exe',
nonull: true
},
'native-messaging-host-win32-ia32': {
src:
'node_modules/@keeweb/keeweb-native-messaging-host/win32-ia32/keeweb-native-messaging-host.exe',
src: 'node_modules/@keeweb/keeweb-native-messaging-host/win32-ia32/keeweb-native-messaging-host.exe',
dest: 'tmp/desktop/KeeWeb-win32-ia32/keeweb-native-messaging-host.exe',
nonull: true
},
'native-messaging-host-win32-arm64': {
src:
'node_modules/@keeweb/keeweb-native-messaging-host/win32-arm64/keeweb-native-messaging-host.exe',
src: 'node_modules/@keeweb/keeweb-native-messaging-host/win32-arm64/keeweb-native-messaging-host.exe',
dest: 'tmp/desktop/KeeWeb-win32-arm64/keeweb-native-messaging-host.exe',
nonull: true
}
},
eslint: {
app: ['app/scripts/**/*.js'],
desktop: ['desktop/**/*.js', '!desktop/node_modules/**'],
@ -278,12 +275,14 @@ module.exports = function (grunt) {
util: ['util/**/*.js'],
installer: ['package/osx/installer.js']
},
inline: {
app: {
src: 'tmp/index.html',
dest: 'tmp/app.html'
}
},
'csp-hashes': {
options: {
algo: 'sha512',
@ -297,6 +296,7 @@ module.exports = function (grunt) {
dest: 'dist/index.html'
}
},
htmlmin: {
options: {
removeComments: true,
@ -308,6 +308,7 @@ module.exports = function (grunt) {
}
}
},
'string-replace': {
'update-manifest': {
options: {
@ -347,29 +348,56 @@ module.exports = function (grunt) {
files: { 'tmp/desktop/app/main.js': 'desktop/main.js' }
}
},
webpack: {
app: webpackConfig.config(webpackOptions),
app: webpackConfig(webpackOptions),
test: webpackConfigTest
},
'webpack-dev-server': {
options: {
webpack: webpackConfig.config({
...webpackOptions,
mode: 'development',
sha: 'dev'
}),
publicPath: '/',
contentBase: [
path.resolve(__dirname, 'tmp'),
path.resolve(__dirname, 'app/content')
],
progress: false
},
js: {
keepalive: true,
port: 8085
options: appConfig,
start: {
devServer: {
port: 8085,
client: {
logging: 'error',
overlay: true
},
hot: 'only',
static: [
{
directory: path.resolve(__dirname, 'tmp'),
staticOptions: {},
// Don't be confused with `devMiddleware.publicPath`, it is `publicPath` for static directory
// Can be:
// publicPath: ['/static-public-path-one/', '/static-public-path-two/'],
publicPath: '/',
// Can be:
// serveIndex: {} (options for the `serveIndex` option you can find https://github.com/expressjs/serve-index)
serveIndex: true,
// Can be:
// watch: {} (options for the `watch` option you can find https://github.com/paulmillr/chokidar)
watch: true
},
{
directory: path.resolve(__dirname, 'app/content'),
staticOptions: {},
// Don't be confused with `devMiddleware.publicPath`, it is `publicPath` for static directory
// Can be:
// publicPath: ['/static-public-path-one/', '/static-public-path-two/'],
publicPath: '/',
// Can be:
// serveIndex: {} (options for the `serveIndex` option you can find https://github.com/expressjs/serve-index)
serveIndex: true,
// Can be:
// watch: {} (options for the `watch` option you can find https://github.com/paulmillr/chokidar)
watch: true
}
]
}
}
},
electron: {
options: {
name: 'KeeWeb',
@ -438,6 +466,7 @@ module.exports = function (grunt) {
}
}
},
'electron-builder': {
linux: {
options: {
@ -472,6 +501,7 @@ module.exports = function (grunt) {
}
}
},
'electron-patch': {
'win32-x64': 'tmp/desktop/KeeWeb-win32-x64/KeeWeb.exe',
'win32-ia32': 'tmp/desktop/KeeWeb-win32-ia32/KeeWeb.exe',
@ -480,6 +510,7 @@ module.exports = function (grunt) {
'darwin-arm64': 'tmp/desktop/KeeWeb-darwin-arm64/KeeWeb.app',
'linux': 'tmp/desktop/KeeWeb-linux-x64/keeweb'
},
osacompile: {
options: {
language: 'JavaScript'
@ -490,6 +521,7 @@ module.exports = function (grunt) {
}
}
},
compress: {
options: {
level: 6
@ -514,6 +546,7 @@ module.exports = function (grunt) {
]
}
},
appdmg: {
x64: {
options: appdmgOptions('x64'),
@ -524,6 +557,7 @@ module.exports = function (grunt) {
dest: `dist/desktop/KeeWeb-${pkg.version}.mac.arm64.dmg`
}
},
nsis: {
options: {
vars: {
@ -575,6 +609,7 @@ module.exports = function (grunt) {
}
}
},
chmod: {
'linux-desktop-x64': {
options: {
@ -583,6 +618,7 @@ module.exports = function (grunt) {
src: ['tmp/desktop/keeweb-linux-x64/chrome-sandbox']
}
},
deb: {
options: {
tmpPath: 'tmp/desktop/',
@ -625,6 +661,7 @@ module.exports = function (grunt) {
]
}
},
'osx-sign': {
options: {
get identity() {
@ -651,6 +688,7 @@ module.exports = function (grunt) {
src: 'tmp/desktop/KeeWeb Installer.app'
}
},
notarize: {
options: {
appBundleId: 'net.antelle.keeweb',
@ -669,6 +707,7 @@ module.exports = function (grunt) {
src: 'tmp/desktop/KeeWeb-darwin-arm64/KeeWeb.app'
}
},
'sign-exe': {
options: {
url: pkg.homepage,
@ -764,6 +803,7 @@ module.exports = function (grunt) {
}
}
},
'sign-dist': {
dist: {
options: {
@ -774,12 +814,14 @@ module.exports = function (grunt) {
}
}
},
'run-test': {
options: {
headless: true
headless: 'new'
},
default: 'test/runner.html'
},
virustotal: {
options: {
prefix: `keeweb.v${pkg.version}-${sha}.`,

99
build/webpack.config.js
View File

@ -1,20 +1,18 @@
const path = require('path');
const fs = require('fs');
const webpack = require('webpack');
const pkg = require('../package.json');
const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
const MiniCssExtractPlugin = require('mini-css-extract-plugin');
const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
const TerserPlugin = require('terser-webpack-plugin');
const PluginBundleAnalyzer = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
const PluginMiniCssExtract = require('mini-css-extract-plugin');
const PluginMinimizeCss = require('css-minimizer-webpack-plugin');
const PluginTerser = require('terser-webpack-plugin');
const rootDir = path.join(__dirname, '..');
const pkg = require('../package.json');
process.noDeprecation = true; // for css loaders
function config(options) {
module.exports = function (options) {
const mode = options.mode || 'production';
const devMode = mode === 'development';
const date = options.date;
@ -34,9 +32,20 @@ function config(options) {
hints: false
},
stats: {
colors: false,
modules: true,
reasons: true
builtAt: false,
env: false,
hash: false,
colors: true,
modules: false,
reasons: false,
children: false,
warnings: false,
errorDetails: false,
errorStack: false,
errorsCount: false,
logging: false, // false, 'none' | 'error' | 'warn' | 'info' | 'log' | 'verbose'
loggingTrace: false,
loggingDebug: ['sass', 'sass-loader']
},
progress: false,
failOnError: true,
@ -54,7 +63,6 @@ function config(options) {
baron: `baron/baron${devMode ? '' : '.min'}.js`,
qrcode: `jsqrcode/dist/qrcode${devMode ? '' : '.min'}.js`,
argon2: 'argon2-browser/dist/argon2.js',
marked: devMode ? 'marked/lib/marked.js' : 'marked/marked.min.js',
dompurify: `dompurify/dist/purify${devMode ? '' : '.min'}.js`,
tweetnacl: `tweetnacl/nacl${devMode ? '' : '.min'}.js`,
hbs: 'handlebars/runtime.js',
@ -63,7 +71,10 @@ function config(options) {
'public-key.pem': path.join(rootDir, 'app/resources/public-key.pem'),
'public-key-new.pem': path.join(rootDir, 'app/resources/public-key-new.pem'),
'demo.kdbx': path.join(rootDir, 'app/resources/Demo.kdbx'),
'fontawesome.woff2': '@fortawesome/fontawesome-free/webfonts/fa-regular-400.woff2'
'fontawesome.woff2': path.resolve(
__dirname,
'../node_modules/@fortawesome/fontawesome-free/webfonts/fa-regular-400.woff2'
)
},
fallback: {
console: false,
@ -168,11 +179,36 @@ function config(options) {
{
test: /\.s?css$/,
use: [
MiniCssExtractPlugin.loader,
{ loader: 'css-loader', options: { sourceMap: devMode } },
{ loader: 'postcss-loader', options: { sourceMap: devMode } },
{ loader: 'sass-loader', options: { sourceMap: devMode } },
{ loader: 'scss-add-icons-loader' }
PluginMiniCssExtract.loader,
{
// translates CSS into CommonJS
loader: 'css-loader',
options: {
esModule: false,
importLoaders: 2,
sourceMap: !devMode
}
},
{
// autoprefixing, linting and more
loader: 'postcss-loader',
options: {
sourceMap: !devMode
}
},
{
// compile Sass to CSS
loader: 'sass-loader',
options: {
sassOptions: {
outputStyle: 'expanded'
},
sourceMap: !devMode
}
},
{
loader: 'scss-add-icons-loader'
}
]
},
{ test: /fontawesome.*\.woff2$/, loader: 'fontawesome-loader' },
@ -182,20 +218,27 @@ function config(options) {
},
optimization: {
runtimeChunk: false,
minimize: !devMode,
minimize: !devMode, // set true to minimize in dev + production mode
minimizer: [
new TerserPlugin({
new PluginTerser({
minify: PluginTerser.terserMinify,
extractComments: 'never-extract-comments',
terserOptions: {
ecma: 6
}
}),
new OptimizeCSSAssetsPlugin({
cssProcessorPluginOptions: {
preset: ['default', { discardComments: { removeAll: true } }]
new PluginMinimizeCss({
test: /\.min\.css$/i,
minimizerOptions: {
preset: [
'default',
{
discardComments: { removeAll: true }
}
]
}
}),
new BundleAnalyzerPlugin({
new PluginBundleAnalyzer({
openAnalyzer: false,
analyzerMode: 'static',
reportFilename: 'stats/analyzer_report.html',
@ -219,8 +262,8 @@ function config(options) {
$: 'jquery',
babelHelpers: 'babel-helpers'
}),
new webpack.IgnorePlugin(/^(moment)$/),
new MiniCssExtractPlugin({
new webpack.IgnorePlugin({ resourceRegExp: /^(moment)$/ }),
new PluginMiniCssExtract({
filename: 'css/[name].css'
})
],
@ -236,6 +279,4 @@ function config(options) {
},
devtool: devMode ? 'source-map' : undefined
};
}
module.exports.config = config;
};

2
test/test.webpack.config.js
View File

@ -1,7 +1,7 @@
const path = require('path');
const webpackConfig = require('../build/webpack.config');
const appConfig = webpackConfig.config({
const appConfig = webpackConfig({
mode: 'development',
date: new Date(),
sha: 'tests'

16
webpack.config.js
View File

@ -4,6 +4,22 @@
const path = require('path');
module.exports = {
stats: {
builtAt: false,
env: false,
hash: false,
colors: true,
modules: true,
reasons: true,
children: true,
warnings: false,
errorDetails: false,
errorStack: false,
errorsCount: false,
logging: false, // false, 'none' | 'error' | 'warn' | 'info' | 'log' | 'verbose'
loggingTrace: false,
loggingDebug: ['sass', 'sass-loader']
},
resolve: {
modules: [
path.join(__dirname, 'app/scripts'),