diff --git a/buildutils/package.json b/buildutils/package.json index 9bbb845b63cb..9ce6b35fab6d 100644 --- a/buildutils/package.json +++ b/buildutils/package.json @@ -23,7 +23,6 @@ "main": "lib/index.js", "types": "lib/index.d.ts", "bin": { - "ensure-max-old-space": "./lib/ensure-max-old-space.js", "get-dependency": "./lib/get-dependency.js", "remove-dependency": "./lib/remove-dependency.js", "update-dependency": "./lib/update-dependency.js", @@ -55,8 +54,7 @@ "semver": "^6.3.0", "sort-package-json": "~1.31.0", "typescript": "~3.7.3", - "webpack": "^4.41.2", - "which": "^2.0.2" + "webpack": "^4.41.2" }, "devDependencies": { "@types/fs-extra": "^8.0.1", diff --git a/buildutils/src/ensure-max-old-space.ts b/buildutils/src/ensure-max-old-space.ts deleted file mode 100755 index d8c1429f1335..000000000000 --- a/buildutils/src/ensure-max-old-space.ts +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env node -/*----------------------------------------------------------------------------- -| Copyright (c) Jupyter Development Team. -| Distributed under the terms of the Modified BSD License. -|----------------------------------------------------------------------------*/ - -/** - * This file is a temporary workaround to ensure that we can set - * max_old_space by default but allow others to override it. - * - * When node 10 support is dropped, we can remove this file as node 12 - * should just grow as required. - * - * See: https://github.com/jupyterlab/jupyterlab/issues/7175 - * - * @example - * node ensure-max-old-space.js real-cli.js arg1 arg2 - */ -import { execFileSync } from 'child_process'; -import * as which from 'which'; - -const MAX_OLD_SPACE = '--max_old_space_size=4096'; - -if (!process.env.NODE_OPTIONS) { - process.env.NODE_OPTIONS = MAX_OLD_SPACE; -} else if (!/--max[_\-]old[_\-]space[_\-]size/.test(process.env.NODE_OPTIONS)) { - process.env.NODE_OPTIONS += ` ${MAX_OLD_SPACE}`; -} - -const program = which.sync(process.argv[2]); -const args = process.argv.slice(3); -execFileSync(program, args, { env: process.env, stdio: 'inherit' }); diff --git a/dev_mode/package.json b/dev_mode/package.json index c1b9200eb40f..0d58eb8a7078 100644 --- a/dev_mode/package.json +++ b/dev_mode/package.json @@ -6,10 +6,10 @@ "build": "webpack", "build:dev": "jlpm run build", "build:dev:minimize": "jlpm run build:dev", - "build:prod": "ensure-max-old-space webpack --config webpack.prod.config.js", - "build:prod:minimize": "ensure-max-old-space webpack --config webpack.prod.minimize.config.js", - "build:prod:release": "ensure-max-old-space webpack --config webpack.prod.release.config.js", - "build:prod:stats": "ensure-max-old-space webpack --profile --config webpack.prod.minimize.config.js --json > stats.json", + "build:prod": "webpack --config webpack.prod.config.js", + "build:prod:minimize": "webpack --config webpack.prod.minimize.config.js", + "build:prod:release": "webpack --config webpack.prod.release.config.js", + "build:prod:stats": "webpack --profile --config webpack.prod.minimize.config.js --json > stats.json", "build:stats": "webpack --profile --json > stats.json", "clean": "rimraf build", "prepublishOnly": "npm run build", diff --git a/yarn.lock b/yarn.lock index 8f8d53ef15ed..789161f5bc90 100644 --- a/yarn.lock +++ b/yarn.lock @@ -16126,7 +16126,7 @@ which@1.3.1, which@^1.1.1, which@^1.2.1, which@^1.2.14, which@^1.2.9, which@^1.3 dependencies: isexe "^2.0.0" -which@^2.0.1, which@^2.0.2: +which@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==