Przeglądaj źródła

Merge pull request #9282 from jasongrout/maxmem

Remove ensure-max-old-space script
Jeremy Tuloup 4 lat temu
rodzic
commit
2d6ce5daab

+ 1 - 1
.github/workflows/linuxjs-tests.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Set up Node
         uses: actions/setup-node@v1
         with:
-          node-version: '10.x'
+          node-version: '12.x'
       - name: Cache pip on Linux
         uses: actions/cache@v1
         if: startsWith(runner.os, 'Linux')

+ 1 - 5
builder/package.json

@@ -15,8 +15,7 @@
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "bin": {
-    "build-labextension": "./lib/build-labextension.js",
-    "ensure-max-old-space": "./lib/ensure-max-old-space.js"
+    "build-labextension": "./lib/build-labextension.js"
   },
   "directories": {
     "lib": "lib/"
@@ -48,7 +47,6 @@
     "@lumino/virtualdom": "^1.7.3",
     "@lumino/widgets": "^1.14.0",
     "ajv": "^6.12.3",
-    "child_process": "~1.0.2",
     "commander": "~6.0.0",
     "css-loader": "~3.2.0",
     "duplicate-package-checker-webpack-plugin": "^3.0.0",
@@ -66,7 +64,6 @@
     "webpack": "^5.3.1",
     "webpack-cli": "^4.1.0",
     "webpack-merge": "^5.1.2",
-    "which": "^2.0.2",
     "worker-loader": "^3.0.2"
   },
   "devDependencies": {
@@ -74,7 +71,6 @@
     "@types/glob": "^7.1.1",
     "@types/node": "^14.6.1",
     "@types/supports-color": "^5.3.0",
-    "@types/which": "^1.3.2",
     "rimraf": "~3.0.0",
     "typescript": "~4.0.2"
   },

+ 0 - 32
builder/src/ensure-max-old-space.ts

@@ -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' });

+ 0 - 1
buildutils/package.json

@@ -59,7 +59,6 @@
     "@types/inquirer": "^7.3.1",
     "@types/node": "^14.6.1",
     "@types/prettier": "^2.1.0",
-    "@types/which": "^1.3.2",
     "rimraf": "~3.0.0"
   },
   "publishConfig": {

+ 5 - 5
dev_mode/package.json

@@ -6,10 +6,10 @@
     "build": "jlpm run clean && 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",
@@ -194,7 +194,7 @@
     "yarn-deduplicate": "^2.1.1"
   },
   "engines": {
-    "node": ">=10.0.0"
+    "node": ">=12.0.0"
   },
   "jupyterlab": {
     "name": "JupyterLab",

+ 1 - 1
docs/source/developer/contributing.rst

@@ -97,7 +97,7 @@ Installing Node.js and jlpm
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Building JupyterLab from its GitHub source code requires Node.js. The
-development version requires Node.js version 10+, as defined in the
+development version requires Node.js version 12+, as defined in the
 ``engines`` specification in
 `dev_mode/package.json <https://github.com/jupyterlab/jupyterlab/blob/master/dev_mode/package.json>`__.
 

+ 0 - 5
yarn.lock

@@ -3401,11 +3401,6 @@
     "@types/webpack-sources" "*"
     source-map "^0.6.0"
 
-"@types/which@^1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@types/which/-/which-1.3.2.tgz#9c246fc0c93ded311c8512df2891fb41f6227fdf"
-  integrity sha512-8oDqyLC7eD4HM307boe2QWKyuzdzWBj56xI/imSl2cpL+U3tCMaTAkMJ4ee5JBZ/FsOJlvRGeIShiZDAl1qERA==
-
 "@types/ws@^7.2.4":
   version "7.2.6"
   resolved "https://registry.yarnpkg.com/@types/ws/-/ws-7.2.6.tgz#516cbfb818310f87b43940460e065eb912a4178d"