Commit c0f223de authored by Phil Hughes's avatar Phil Hughes

Merge branch 'webpack-memory-bump' into 'master'

Fix webpack dev-server crash caused by 1.5gb limit

Closes #59075

See merge request gitlab-org/gitlab-ce!26849
parents c60d0efe 8e6b6528
...@@ -852,8 +852,6 @@ qa:selectors: ...@@ -852,8 +852,6 @@ qa:selectors:
.qa-frontend-node: &qa-frontend-node .qa-frontend-node: &qa-frontend-node
<<: *dedicated-no-docs-no-db-pull-cache-job <<: *dedicated-no-docs-no-db-pull-cache-job
stage: test stage: test
variables:
NODE_OPTIONS: --max_old_space_size=3584
cache: cache:
key: "$CI_JOB_NAME" key: "$CI_JOB_NAME"
paths: paths:
...@@ -1143,3 +1141,4 @@ schedule:review-performance: ...@@ -1143,3 +1141,4 @@ schedule:review-performance:
<<: *review-schedules-only <<: *review-schedules-only
script: script:
- wait_for_job_to_be_done "schedule:review-deploy" - wait_for_job_to_be_done "schedule:review-deploy"
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"private": true, "private": true,
"scripts": { "scripts": {
"clean": "rm -rf public/assets tmp/cache/*-loader", "clean": "rm -rf public/assets tmp/cache/*-loader",
"dev-server": "nodemon -w 'config/webpack.config.js' --exec 'webpack-dev-server --config config/webpack.config.js'", "dev-server": "NODE_OPTIONS=\"--max-old-space-size=3584\" nodemon -w 'config/webpack.config.js' --exec 'webpack-dev-server --config config/webpack.config.js'",
"eslint": "eslint --max-warnings 0 --report-unused-disable-directives --ext .js,.vue .", "eslint": "eslint --max-warnings 0 --report-unused-disable-directives --ext .js,.vue .",
"eslint-fix": "eslint --max-warnings 0 --report-unused-disable-directives --ext .js,.vue --fix .", "eslint-fix": "eslint --max-warnings 0 --report-unused-disable-directives --ext .js,.vue --fix .",
"eslint-report": "eslint --max-warnings 0 --ext .js,.vue --format html --output-file ./eslint-report.html --no-inline-config .", "eslint-report": "eslint --max-warnings 0 --ext .js,.vue --format html --output-file ./eslint-report.html --no-inline-config .",
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
"stylelint-file": "node node_modules/stylelint/bin/stylelint.js", "stylelint-file": "node node_modules/stylelint/bin/stylelint.js",
"stylelint-create-utility-map": "node scripts/frontend/stylelint/stylelint-utility-map.js", "stylelint-create-utility-map": "node scripts/frontend/stylelint/stylelint-utility-map.js",
"test": "yarn jest && yarn karma", "test": "yarn jest && yarn karma",
"webpack": "webpack --config config/webpack.config.js", "webpack": "NODE_OPTIONS=\"--max-old-space-size=3584\" webpack --config config/webpack.config.js",
"webpack-prod": "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.2.2", "@babel/core": "^7.2.2",
......
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