Skip to content

G
gitlab-ce
Commit 6f61580b authored by Phil Hughes's avatar Phil Hughes
Browse files
Options

Merge branch 'ee-45532-upgrade-vue-loader' into 'master' 

Port "Upgrade vue-loader for bug fixes and a simpler webpack config" to EE

See merge request gitlab-org/gitlab-ee!5779
parents cf82c176 d6cdfb86
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 158 additions and 195 deletions
config/webpack.config.js
View file @ 6f61580b
...@@ -2,6 +2,7 @@ const fs = require('fs'); ...@@ -2,6 +2,7 @@ const fs = require('fs');
const path = require('path'); const path = require('path');
const glob = require('glob'); const glob = require('glob');
const webpack = require('webpack'); const webpack = require('webpack');
const VueLoaderPlugin = require('vue-loader/lib/plugin');
const StatsWriterPlugin = require('webpack-stats-plugin').StatsWriterPlugin; const StatsWriterPlugin = require('webpack-stats-plugin').StatsWriterPlugin;
const CopyWebpackPlugin = require('copy-webpack-plugin'); const CopyWebpackPlugin = require('copy-webpack-plugin');
const CompressionPlugin = require('compression-webpack-plugin'); const CompressionPlugin = require('compression-webpack-plugin');
...@@ -12,7 +13,7 @@ const IS_PRODUCTION = process.env.NODE_ENV === 'production'; ...@@ -12,7 +13,7 @@ const IS_PRODUCTION = process.env.NODE_ENV === 'production';
const IS_DEV_SERVER = process.argv.join(' ').indexOf('webpack-dev-server') !== -1; const IS_DEV_SERVER = process.argv.join(' ').indexOf('webpack-dev-server') !== -1;
const DEV_SERVER_HOST = process.env.DEV_SERVER_HOST || 'localhost'; const DEV_SERVER_HOST = process.env.DEV_SERVER_HOST || 'localhost';
const DEV_SERVER_PORT = parseInt(process.env.DEV_SERVER_PORT, 10) || 3808; const DEV_SERVER_PORT = parseInt(process.env.DEV_SERVER_PORT, 10) || 3808;
const DEV_SERVER_LIVERELOAD = process.env.DEV_SERVER_LIVERELOAD !== 'false'; const DEV_SERVER_LIVERELOAD = IS_DEV_SERVER && process.env.DEV_SERVER_LIVERELOAD !== 'false';
const WEBPACK_REPORT = process.env.WEBPACK_REPORT; const WEBPACK_REPORT = process.env.WEBPACK_REPORT;
const NO_COMPRESSION = process.env.NO_COMPRESSION; const NO_COMPRESSION = process.env.NO_COMPRESSION;
...@@ -68,7 +69,7 @@ function generateEntries() { ...@@ -68,7 +69,7 @@ function generateEntries() {
return Object.assign(manualEntries, autoEntries); return Object.assign(manualEntries, autoEntries);
} }
const config = { module.exports = {
mode: IS_PRODUCTION ? 'production' : 'development', mode: IS_PRODUCTION ? 'production' : 'development',
context: path.join(ROOT_PATH, 'app/assets/javascripts'), context: path.join(ROOT_PATH, 'app/assets/javascripts'),
...@@ -83,38 +84,32 @@ const config = { ...@@ -83,38 +84,32 @@ const config = {
globalObject: 'this', // allow HMR and web workers to play nice globalObject: 'this', // allow HMR and web workers to play nice
}, },
optimization: { resolve: {
nodeEnv: false, extensions: ['.js'],
runtimeChunk: 'single', alias: {
splitChunks: { '~': path.join(ROOT_PATH, 'app/assets/javascripts'),
maxInitialRequests: 4, emojis: path.join(ROOT_PATH, 'fixtures/emojis'),
cacheGroups: { empty_states: path.join(ROOT_PATH, 'app/views/shared/empty_states'),
default: false, icons: path.join(ROOT_PATH, 'app/views/shared/icons'),
common: () => ({ images: path.join(ROOT_PATH, 'app/assets/images'),
priority: 20, vendor: path.join(ROOT_PATH, 'vendor/assets/javascripts'),
name: 'main', vue$: 'vue/dist/vue.esm.js',
chunks: 'initial', spec: path.join(ROOT_PATH, 'spec/javascripts'),
minChunks: autoEntriesCount * 0.9,
}), // EE-only
vendors: { ee: path.join(ROOT_PATH, 'ee/app/assets/javascripts'),
priority: 10, ee_empty_states: path.join(ROOT_PATH, 'ee/app/views/shared/empty_states'),
chunks: 'async', ee_icons: path.join(ROOT_PATH, 'ee/app/views/shared/icons'),
test: /[\\/](node_modules|vendor[\\/]assets[\\/]javascripts)[\\/]/, ee_images: path.join(ROOT_PATH, 'ee/app/assets/images'),
},
commons: {
chunks: 'all',
minChunks: 2,
reuseExistingChunk: true,
},
},
}, },
}, },
module: { module: {
strictExportPresence: true,
rules: [ rules: [
{ {
test: /\.js$/, test: /\.js$/,
exclude: /(node_modules|vendor\/assets)/, exclude: path => /node_modules|vendor[\\/]assets/.test(path) && !/\.vue\.js/.test(path),
loader: 'babel-loader', loader: 'babel-loader',
options: { options: {
cacheDirectory: path.join(ROOT_PATH, 'tmp/cache/babel-loader'), cacheDirectory: path.join(ROOT_PATH, 'tmp/cache/babel-loader'),
...@@ -154,10 +149,9 @@ const config = { ...@@ -154,10 +149,9 @@ const config = {
}, },
}, },
{ {
test: /katex.min.css$/, test: /.css$/,
include: /node_modules\/katex\/dist/,
use: [ use: [
{ loader: 'style-loader' }, 'vue-style-loader',
{ {
loader: 'css-loader', loader: 'css-loader',
options: { options: {
...@@ -182,9 +176,34 @@ const config = { ...@@ -182,9 +176,34 @@ const config = {
], ],
}, },
], ],
noParse: [/monaco-editor\/\w+\/vs\//], noParse: [/monaco-editor\/\w+\/vs\//],
strictExportPresence: true, },
optimization: {
nodeEnv: false,
runtimeChunk: 'single',
splitChunks: {
maxInitialRequests: 4,
cacheGroups: {
default: false,
common: () => ({
priority: 20,
name: 'main',
chunks: 'initial',
minChunks: autoEntriesCount * 0.9,
}),
vendors: {
priority: 10,
chunks: 'async',
test: /[\\/](node_modules|vendor[\\/]assets[\\/]javascripts)[\\/]/,
},
commons: {
chunks: 'all',
minChunks: 2,
reuseExistingChunk: true,
},
},
},
}, },
plugins: [ plugins: [
...@@ -204,6 +223,9 @@ const config = { ...@@ -204,6 +223,9 @@ const config = {
}, },
}), }),
// enable vue-loader to use existing loader rules for other module types
new VueLoaderPlugin(),
// prevent pikaday from including moment.js // prevent pikaday from including moment.js
new webpack.IgnorePlugin(/moment/, /pikaday/), new webpack.IgnorePlugin(/moment/, /pikaday/),
...@@ -235,46 +257,52 @@ const config = { ...@@ -235,46 +257,52 @@ const config = {
}, },
}, },
]), ]),
],
resolve: { // compression can require a lot of compute time and is disabled in CI
extensions: ['.js'], IS_PRODUCTION && !NO_COMPRESSION && new CompressionPlugin(),
alias: {
'~': path.join(ROOT_PATH, 'app/assets/javascripts'),
emojis: path.join(ROOT_PATH, 'fixtures/emojis'),
empty_states: path.join(ROOT_PATH, 'app/views/shared/empty_states'),
icons: path.join(ROOT_PATH, 'app/views/shared/icons'),
images: path.join(ROOT_PATH, 'app/assets/images'),
vendor: path.join(ROOT_PATH, 'vendor/assets/javascripts'),
vue$: 'vue/dist/vue.esm.js',
spec: path.join(ROOT_PATH, 'spec/javascripts'),
// EE-only // WatchForChangesPlugin
ee: path.join(ROOT_PATH, 'ee/app/assets/javascripts'), // TODO: publish this as a separate plugin
ee_empty_states: path.join(ROOT_PATH, 'ee/app/views/shared/empty_states'), IS_DEV_SERVER && {
ee_icons: path.join(ROOT_PATH, 'ee/app/views/shared/icons'), apply(compiler) {
ee_images: path.join(ROOT_PATH, 'ee/app/assets/images'), compiler.hooks.emit.tapAsync('WatchForChangesPlugin', (compilation, callback) => {
}, const missingDeps = Array.from(compilation.missingDependencies);
}, const nodeModulesPath = path.join(ROOT_PATH, 'node_modules');
const hasMissingNodeModules = missingDeps.some(
file => file.indexOf(nodeModulesPath) !== -1
);
// sqljs requires fs // watch for changes to missing node_modules
node: { if (hasMissingNodeModules) compilation.contextDependencies.add(nodeModulesPath);
fs: 'empty',
},
};
if (IS_PRODUCTION) { // watch for changes to automatic entrypoints
config.devtool = 'source-map'; watchAutoEntries.forEach(watchPath => compilation.contextDependencies.add(watchPath));
// compression can require a lot of compute time and is disabled in CI // report our auto-generated bundle count
if (!NO_COMPRESSION) { console.log(
config.plugins.push(new CompressionPlugin()); `${autoEntriesCount} entries from '/pages' automatically added to webpack output.`
} );
}
if (IS_DEV_SERVER) { callback();
config.devtool = 'cheap-module-eval-source-map'; });
config.devServer = { },
},
// enable HMR only in webpack-dev-server
DEV_SERVER_LIVERELOAD && new webpack.HotModuleReplacementPlugin(),
// optionally generate webpack bundle analysis
WEBPACK_REPORT &&
new BundleAnalyzerPlugin({
analyzerMode: 'static',
generateStatsFile: true,
openAnalyzer: false,
reportFilename: path.join(ROOT_PATH, 'webpack-report/index.html'),
statsFilename: path.join(ROOT_PATH, 'webpack-report/stats.json'),
}),
].filter(Boolean),
devServer: {
host: DEV_SERVER_HOST, host: DEV_SERVER_HOST,
port: DEV_SERVER_PORT, port: DEV_SERVER_PORT,
disableHostCheck: true, disableHostCheck: true,
...@@ -282,46 +310,10 @@ if (IS_DEV_SERVER) { ...@@ -282,46 +310,10 @@ if (IS_DEV_SERVER) {
stats: 'errors-only', stats: 'errors-only',
hot: DEV_SERVER_LIVERELOAD, hot: DEV_SERVER_LIVERELOAD,
inline: DEV_SERVER_LIVERELOAD, inline: DEV_SERVER_LIVERELOAD,
}; },
config.plugins.push({
apply(compiler) {
compiler.hooks.emit.tapAsync('WatchForChangesPlugin', (compilation, callback) => {
const missingDeps = Array.from(compilation.missingDependencies);
const nodeModulesPath = path.join(ROOT_PATH, 'node_modules');
const hasMissingNodeModules = missingDeps.some(
file => file.indexOf(nodeModulesPath) !== -1
);
// watch for changes to missing node_modules
if (hasMissingNodeModules) compilation.contextDependencies.add(nodeModulesPath);
// watch for changes to automatic entrypoints
watchAutoEntries.forEach(watchPath => compilation.contextDependencies.add(watchPath));
// report our auto-generated bundle count
console.log(
`${autoEntriesCount} entries from '/pages' automatically added to webpack output.`
);
callback();
});
},
});
if (DEV_SERVER_LIVERELOAD) {
config.plugins.push(new webpack.HotModuleReplacementPlugin());
}
}
if (WEBPACK_REPORT) { devtool: IS_PRODUCTION ? 'source-map' : 'cheap-module-eval-source-map',
config.plugins.push(
new BundleAnalyzerPlugin({
analyzerMode: 'static',
generateStatsFile: true,
openAnalyzer: false,
reportFilename: path.join(ROOT_PATH, 'webpack-report/index.html'),
statsFilename: path.join(ROOT_PATH, 'webpack-report/stats.json'),
})
);
}
module.exports = config; // sqljs requires fs
node: { fs: 'empty' },
};
yarn.lock
View file @ 6f61580b
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7