diff options
| author | Phil Hughes <me@iamphill.com> | 2019-04-04 12:52:04 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-04-04 12:52:04 +0000 |
| commit | c0f223deb28c121759842d42e1befe3b2eb11bb4 (patch) | |
| tree | eb57491119e7a12202ad287eebfc71e28653f736 | |
| parent | c60d0efe0d2f2f0bdd1e626c378fe655461c5f22 (diff) | |
| parent | 8e6b6528543818a779e1df2b38150eb422145fb0 (diff) | |
| download | gitlab-ce-c0f223deb28c121759842d42e1befe3b2eb11bb4.tar.gz | |
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
| -rw-r--r-- | .gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | package.json | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f89a52e7a3e..98fdda3593e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -852,8 +852,6 @@ qa:selectors: .qa-frontend-node: &qa-frontend-node <<: *dedicated-no-docs-no-db-pull-cache-job stage: test - variables: - NODE_OPTIONS: --max_old_space_size=3584 cache: key: "$CI_JOB_NAME" paths: @@ -1143,3 +1141,4 @@ schedule:review-performance: <<: *review-schedules-only script: - wait_for_job_to_be_done "schedule:review-deploy" + diff --git a/package.json b/package.json index ceb36a92cc8..711baf5d1a3 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "private": true, "scripts": { "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-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 .", @@ -21,8 +21,8 @@ "stylelint-file": "node node_modules/stylelint/bin/stylelint.js", "stylelint-create-utility-map": "node scripts/frontend/stylelint/stylelint-utility-map.js", "test": "yarn jest && yarn karma", - "webpack": "webpack --config config/webpack.config.js", - "webpack-prod": "NODE_ENV=production webpack --config config/webpack.config.js" + "webpack": "NODE_OPTIONS=\"--max-old-space-size=3584\" 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": { "@babel/core": "^7.2.2", |