Commit af734ef3 authored by Clement Ho's avatar Clement Ho

Merge branch 'mg-update-webpack-dependencies' into 'master'

Update webpack dependencies

Closes #32616

See merge request gitlab-org/gitlab!17560
parents 43dbd4ae 059b956b
...@@ -11,7 +11,7 @@ const CopyWebpackPlugin = require('copy-webpack-plugin'); ...@@ -11,7 +11,7 @@ const CopyWebpackPlugin = require('copy-webpack-plugin');
const ROOT_PATH = path.resolve(__dirname, '..'); const ROOT_PATH = path.resolve(__dirname, '..');
const CACHE_PATH = process.env.WEBPACK_CACHE_PATH || path.join(ROOT_PATH, 'tmp/cache'); const CACHE_PATH = process.env.WEBPACK_CACHE_PATH || path.join(ROOT_PATH, 'tmp/cache');
const IS_PRODUCTION = process.env.NODE_ENV === 'production'; 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.env.WEBPACK_DEV_SERVER === 'true';
const IS_EE = require('./helpers/is_ee_env'); const IS_EE = require('./helpers/is_ee_env');
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;
...@@ -209,7 +209,9 @@ module.exports = { ...@@ -209,7 +209,9 @@ module.exports = {
{ {
loader: 'css-loader', loader: 'css-loader',
options: { options: {
name: '[name].[hash:8].[ext]', modules: {
localIdentName: '[name]__[local].[hash:8].[ext]',
},
}, },
}, },
], ],
...@@ -373,6 +375,9 @@ module.exports = { ...@@ -373,6 +375,9 @@ module.exports = {
openAnalyzer: false, openAnalyzer: false,
reportFilename: path.join(ROOT_PATH, 'webpack-report/index.html'), reportFilename: path.join(ROOT_PATH, 'webpack-report/index.html'),
statsFilename: path.join(ROOT_PATH, 'webpack-report/stats.json'), statsFilename: path.join(ROOT_PATH, 'webpack-report/stats.json'),
statsOptions: {
source: false,
},
}), }),
new webpack.DefinePlugin({ new webpack.DefinePlugin({
......
...@@ -30,13 +30,13 @@ ...@@ -30,13 +30,13 @@
"webpack-prod": "NODE_OPTIONS=\"--max-old-space-size=3584\" NODE_ENV=production webpack --config config/webpack.config.js" "webpack-prod": "NODE_OPTIONS=\"--max-old-space-size=3584\" NODE_ENV=production webpack --config config/webpack.config.js"
}, },
"dependencies": { "dependencies": {
"@babel/core": "^7.5.5", "@babel/core": "^7.6.2",
"@babel/plugin-proposal-class-properties": "^7.5.5", "@babel/plugin-proposal-class-properties": "^7.5.5",
"@babel/plugin-proposal-json-strings": "^7.2.0", "@babel/plugin-proposal-json-strings": "^7.2.0",
"@babel/plugin-proposal-private-methods": "^7.4.4", "@babel/plugin-proposal-private-methods": "^7.6.0",
"@babel/plugin-syntax-dynamic-import": "^7.2.0", "@babel/plugin-syntax-dynamic-import": "^7.2.0",
"@babel/plugin-syntax-import-meta": "^7.2.0", "@babel/plugin-syntax-import-meta": "^7.2.0",
"@babel/preset-env": "^7.5.5", "@babel/preset-env": "^7.6.2",
"@gitlab/svgs": "^1.74.0", "@gitlab/svgs": "^1.74.0",
"@gitlab/ui": "5.26.0", "@gitlab/ui": "5.26.0",
"@gitlab/visual-review-tools": "1.0.3", "@gitlab/visual-review-tools": "1.0.3",
...@@ -49,19 +49,19 @@ ...@@ -49,19 +49,19 @@
"autosize": "^4.0.0", "autosize": "^4.0.0",
"aws-sdk": "^2.526.0", "aws-sdk": "^2.526.0",
"axios": "^0.19.0", "axios": "^0.19.0",
"babel-loader": "^8.0.5", "babel-loader": "^8.0.6",
"bootstrap": "4.3.1", "bootstrap": "4.3.1",
"brace-expansion": "^1.1.8", "brace-expansion": "^1.1.8",
"cache-loader": "^2.0.1", "cache-loader": "^4.1.0",
"chart.js": "2.7.2", "chart.js": "2.7.2",
"classlist-polyfill": "^1.2.0", "classlist-polyfill": "^1.2.0",
"clipboard": "^1.7.1", "clipboard": "^1.7.1",
"codesandbox-api": "^0.0.20", "codesandbox-api": "^0.0.20",
"compression-webpack-plugin": "^2.0.0", "compression-webpack-plugin": "^3.0.0",
"copy-webpack-plugin": "^5.0.4", "copy-webpack-plugin": "^5.0.4",
"core-js": "^3.1.3", "core-js": "^3.2.1",
"cropper": "^2.3.0", "cropper": "^2.3.0",
"css-loader": "^1.0.0", "css-loader": "^3.2.0",
"d3": "^4.13.0", "d3": "^4.13.0",
"d3-array": "^1.2.1", "d3-array": "^1.2.1",
"d3-axis": "^1.0.8", "d3-axis": "^1.0.8",
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
"emoji-regex": "^7.0.3", "emoji-regex": "^7.0.3",
"emoji-unicode-version": "^0.2.1", "emoji-unicode-version": "^0.2.1",
"exports-loader": "^0.7.0", "exports-loader": "^0.7.0",
"file-loader": "^3.0.1", "file-loader": "^4.2.0",
"formdata-polyfill": "^3.0.11", "formdata-polyfill": "^3.0.11",
"fuzzaldrin-plus": "^0.5.0", "fuzzaldrin-plus": "^0.5.0",
"glob": "^7.1.2", "glob": "^7.1.2",
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
"prosemirror-model": "^1.6.4", "prosemirror-model": "^1.6.4",
"raphael": "^2.2.7", "raphael": "^2.2.7",
"raven-js": "^3.22.1", "raven-js": "^3.22.1",
"raw-loader": "^1.0.0", "raw-loader": "^3.1.0",
"sanitize-html": "^1.16.1", "sanitize-html": "^1.16.1",
"select2": "3.5.2-browserify", "select2": "3.5.2-browserify",
"sha1": "^1.1.1", "sha1": "^1.1.1",
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
"sortablejs": "^1.10.0", "sortablejs": "^1.10.0",
"sql.js": "^0.4.0", "sql.js": "^0.4.0",
"stickyfilljs": "^2.0.5", "stickyfilljs": "^2.0.5",
"style-loader": "^0.23.1", "style-loader": "^1.0.0",
"svg4everybody": "2.1.9", "svg4everybody": "2.1.9",
"three": "^0.84.0", "three": "^0.84.0",
"three-orbit-controls": "^82.1.0", "three-orbit-controls": "^82.1.0",
...@@ -128,20 +128,20 @@ ...@@ -128,20 +128,20 @@
"tiptap-commands": "^1.4.0", "tiptap-commands": "^1.4.0",
"tiptap-extensions": "^1.8.0", "tiptap-extensions": "^1.8.0",
"underscore": "^1.9.0", "underscore": "^1.9.0",
"url-loader": "^1.1.2", "url-loader": "^2.1.0",
"visibilityjs": "^1.2.4", "visibilityjs": "^1.2.4",
"vue": "^2.6.10", "vue": "^2.6.10",
"vue-apollo": "^3.0.0-beta.28", "vue-apollo": "^3.0.0-beta.28",
"vue-loader": "^15.7.0", "vue-loader": "^15.7.1",
"vue-router": "^3.0.2", "vue-router": "^3.0.2",
"vue-template-compiler": "^2.6.10", "vue-template-compiler": "^2.6.10",
"vue-virtual-scroll-list": "^1.3.1", "vue-virtual-scroll-list": "^1.3.1",
"vuedraggable": "^2.23.0", "vuedraggable": "^2.23.0",
"vuex": "^3.1.0", "vuex": "^3.1.0",
"webpack": "^4.29.0", "webpack": "^4.40.2",
"webpack-bundle-analyzer": "^3.3.2", "webpack-bundle-analyzer": "^3.5.1",
"webpack-cli": "^3.2.1", "webpack-cli": "^3.3.9",
"webpack-stats-plugin": "^0.2.1", "webpack-stats-plugin": "^0.3.0",
"worker-loader": "^2.0.0", "worker-loader": "^2.0.0",
"xterm": "^3.5.0" "xterm": "^3.5.0"
}, },
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
"stylelint-scss": "^3.9.2", "stylelint-scss": "^3.9.2",
"timezone-mock": "^1.0.8", "timezone-mock": "^1.0.8",
"vue-jest": "^4.0.0-beta.2", "vue-jest": "^4.0.0-beta.2",
"webpack-dev-server": "^3.1.14", "webpack-dev-server": "^3.8.1",
"yarn-deduplicate": "^1.1.1" "yarn-deduplicate": "^1.1.1"
}, },
"resolutions": { "resolutions": {
......
This source diff could not be displayed because it is too large. You can view the blob instead.
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