Merge branch 'fix-broken-yarn-deps' into 'master'
Fix broken Yarn dependencies Closes #33886 and #34944 See merge request !13614
This commit is contained in:
commit
76499825d6
|
@ -259,7 +259,7 @@ setup-test-env:
|
|||
<<: *default-cache
|
||||
script:
|
||||
- node --version
|
||||
- yarn install --pure-lockfile --cache-folder .yarn-cache
|
||||
- yarn install --frozen-lockfile --cache-folder .yarn-cache
|
||||
- bundle exec rake gettext:po_to_json
|
||||
- bundle exec rake gitlab:assets:compile
|
||||
- bundle exec ruby -Ispec -e 'require "spec_helper" ; TestEnv.init'
|
||||
|
@ -508,7 +508,7 @@ gitlab:assets:compile:
|
|||
WEBPACK_REPORT: "true"
|
||||
NO_COMPRESSION: "true"
|
||||
script:
|
||||
- yarn install --pure-lockfile --production --cache-folder .yarn-cache
|
||||
- yarn install --frozen-lockfile --production --cache-folder .yarn-cache
|
||||
- bundle exec rake gettext:po_to_json
|
||||
- bundle exec rake gitlab:assets:compile
|
||||
artifacts:
|
||||
|
|
|
@ -276,14 +276,9 @@ if (IS_PRODUCTION) {
|
|||
})
|
||||
);
|
||||
|
||||
// zopfli requires a lot of compute time and is disabled in CI
|
||||
// compression can require a lot of compute time and is disabled in CI
|
||||
if (!NO_COMPRESSION) {
|
||||
// gracefully fall back to gzip if `node-zopfli` is unavailable (e.g. in CentOS 6)
|
||||
try {
|
||||
config.plugins.push(new CompressionPlugin({ algorithm: 'zopfli' }));
|
||||
} catch(err) {
|
||||
config.plugins.push(new CompressionPlugin({ algorithm: 'gzip' }));
|
||||
}
|
||||
config.plugins.push(new CompressionPlugin());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
"babel-preset-latest": "^6.24.0",
|
||||
"babel-preset-stage-2": "^6.22.0",
|
||||
"bootstrap-sass": "^3.3.6",
|
||||
"compression-webpack-plugin": "^0.3.2",
|
||||
"compression-webpack-plugin": "^1.0.0",
|
||||
"copy-webpack-plugin": "^4.0.1",
|
||||
"core-js": "^2.4.1",
|
||||
"cropper": "^2.3.0",
|
||||
|
@ -63,7 +63,7 @@
|
|||
"vue-loader": "^11.3.4",
|
||||
"vue-resource": "^1.3.4",
|
||||
"vue-template-compiler": "^2.2.6",
|
||||
"webpack": "^3.5.4",
|
||||
"webpack": "^3.5.5",
|
||||
"webpack-bundle-analyzer": "^2.8.2",
|
||||
"webpack-stats-plugin": "^0.1.5"
|
||||
},
|
||||
|
|
Loading…
Reference in New Issue