Commit 47f3cd02 authored by Mike Greiling's avatar Mike Greiling

Merge branch 'leipert-upgrade-webpack-copy-plugin' into 'master'

Update copy-webpack-plugin to 6.4.1

See merge request gitlab-org/gitlab!60061
parents a0440f62 48a75ffd
...@@ -451,12 +451,14 @@ module.exports = { ...@@ -451,12 +451,14 @@ module.exports = {
}), }),
dll && dll &&
new CopyWebpackPlugin([ new CopyWebpackPlugin({
{ patterns: [
from: dll.cacheFrom, {
to: dll.cacheTo, from: dll.cacheFrom,
}, to: dll.cacheTo,
]), },
],
}),
!IS_EE && !IS_EE &&
new webpack.NormalModuleReplacementPlugin(/^ee_component\/(.*)\.vue/, (resource) => { new webpack.NormalModuleReplacementPlugin(/^ee_component\/(.*)\.vue/, (resource) => {
...@@ -467,24 +469,28 @@ module.exports = { ...@@ -467,24 +469,28 @@ module.exports = {
); );
}), }),
new CopyWebpackPlugin([ new CopyWebpackPlugin({
{ patterns: [
from: path.join(ROOT_PATH, 'node_modules/pdfjs-dist/cmaps/'), {
to: path.join(WEBPACK_OUTPUT_PATH, 'cmaps/'), from: path.join(ROOT_PATH, 'node_modules/pdfjs-dist/cmaps/'),
}, to: path.join(WEBPACK_OUTPUT_PATH, 'cmaps/'),
{ },
from: path.join(ROOT_PATH, 'node_modules', SOURCEGRAPH_PACKAGE, '/'), {
to: SOURCEGRAPH_OUTPUT_PATH, from: path.join(ROOT_PATH, 'node_modules', SOURCEGRAPH_PACKAGE, '/'),
ignore: ['package.json'], to: SOURCEGRAPH_OUTPUT_PATH,
}, globOptions: {
{ ignore: ['package.json'],
from: path.join( },
ROOT_PATH, },
'node_modules/@gitlab/visual-review-tools/dist/visual_review_toolbar.js', {
), from: path.join(
to: WEBPACK_OUTPUT_PATH, ROOT_PATH,
}, 'node_modules/@gitlab/visual-review-tools/dist/visual_review_toolbar.js',
]), ),
to: WEBPACK_OUTPUT_PATH,
},
],
}),
// compression can require a lot of compute time and is disabled in CI // compression can require a lot of compute time and is disabled in CI
IS_PRODUCTION && !NO_COMPRESSION && new CompressionPlugin(), IS_PRODUCTION && !NO_COMPRESSION && new CompressionPlugin(),
......
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