Commit 843ca90c authored by Paul Slaughter's avatar Paul Slaughter

Merge branch '118629-add-yarn-integrity-check-to-webpack-dll' into 'master'

Add yarn integrity check to vendor DLL compile process

Closes #118629

See merge request gitlab-org/gitlab!25130
parents 006a53c5 f835148b
const path = require('path'); const path = require('path');
const webpack = require('webpack'); const webpack = require('webpack');
const vendorDllHash = require('./helpers/vendor_dll_hash'); const vendorDllHash = require('./helpers/vendor_dll_hash');
const { YarnCheck } = require('yarn-check-webpack-plugin');
const ROOT_PATH = path.resolve(__dirname, '..'); const ROOT_PATH = path.resolve(__dirname, '..');
...@@ -60,6 +61,11 @@ module.exports = { ...@@ -60,6 +61,11 @@ module.exports = {
path: path.join(dllCachePath, '[name].dll.manifest.json'), path: path.join(dllCachePath, '[name].dll.manifest.json'),
name: '[name]_[hash]', name: '[name]_[hash]',
}), }),
new YarnCheck({
rootDirectory: ROOT_PATH,
exclude: /ts-jest/,
forceKill: true,
}),
], ],
node: { node: {
......
...@@ -8,7 +8,6 @@ namespace :gitlab do ...@@ -8,7 +8,6 @@ namespace :gitlab do
yarn:check yarn:check
gettext:po_to_json gettext:po_to_json
rake:assets:precompile rake:assets:precompile
gitlab:assets:vendor
webpack:compile webpack:compile
gitlab:assets:fix_urls gitlab:assets:fix_urls
].each(&Gitlab::TaskHelpers.method(:invoke_and_time_task)) ].each(&Gitlab::TaskHelpers.method(:invoke_and_time_task))
......
...@@ -198,6 +198,7 @@ ...@@ -198,6 +198,7 @@
"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.8.1", "webpack-dev-server": "^3.8.1",
"yarn-check-webpack-plugin": "^1.2.0",
"yarn-deduplicate": "^1.1.1" "yarn-deduplicate": "^1.1.1"
}, },
"resolutions": { "resolutions": {
......
...@@ -12369,6 +12369,13 @@ yargs@^7.0.0: ...@@ -12369,6 +12369,13 @@ yargs@^7.0.0:
y18n "^3.2.1" y18n "^3.2.1"
yargs-parser "^5.0.0" yargs-parser "^5.0.0"
yarn-check-webpack-plugin@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/yarn-check-webpack-plugin/-/yarn-check-webpack-plugin-1.2.0.tgz#0eb00cdcdb430f0494222a3eab1d2832737840cc"
integrity sha512-BKjFMmI2rsSxIVY6kXaYSpC/9rpfj/9Lm2armdJ+mYvCYuONfiK2+b9q6r8fYFEYJaB2Uv0hPuLvUvAwTVZ8Sg==
dependencies:
chalk "^2.4.2"
yarn-deduplicate@^1.1.1: yarn-deduplicate@^1.1.1:
version "1.1.1" version "1.1.1"
resolved "https://registry.yarnpkg.com/yarn-deduplicate/-/yarn-deduplicate-1.1.1.tgz#19b4a87654b66f55bf3a4bd6b153b4e4ab1b6e6d" resolved "https://registry.yarnpkg.com/yarn-deduplicate/-/yarn-deduplicate-1.1.1.tgz#19b4a87654b66f55bf3a4bd6b153b4e4ab1b6e6d"
......
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