Upgrade to node v12 (Merge PR #2581)

Fixes #2580
firefox-devtools · Jun 9, 2020 · 2c93c89 · 2c93c89
2 parents 9366269 + f7e742f
commit 2c93c89
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2.1
 executors:
   node:
     docker:
-      - image: circleci/node:10.15
+      - image: cimg/node:12.18
 
 commands:
   checkout-and-dependencies:

diff --git a/.gitpod.yml b/.gitpod.yml
@@ -1,7 +1,7 @@
 ports:
 - port: 4242
 tasks:
-- before: nvm install 10
+- before: nvm install 12
   init: yarn install
   command: FX_PROFILER_HOST="0.0.0.0" yarn start
 - openMode: split-right

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,11 +1,11 @@
 clone_depth: 5
 environment:
-  nodejs_version: "10.15"
+  nodejs_version: "12"
 platform: x64 # flow needs 64b platforms
 # Install scripts. (runs after repo cloning)
 install:
   # 1. Select the right node
-  - ps: Install-Product node $env:nodejs_version $env:platform
+  - ps: Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version) $env:platform
   # 2. Setup the project
   - yarn install --frozen-lockfile
 

diff --git a/bin/pre-install.js b/bin/pre-install.js
@@ -104,9 +104,7 @@ function parseExpectedNodeVersion() {
   const circleConfig = fs.readFileSync('.circleci/config.yml', {
     encoding: 'utf8',
   });
-  const expectedNodeVersion = /image: circleci\/node:([\d.]+)/.exec(
-    circleConfig
-  );
+  const expectedNodeVersion = /image: cimg\/node:([\d.]+)/.exec(circleConfig);
   if (!expectedNodeVersion) {
     throw new Error(
       `Couldn't extract the node version from .circleci/config.yml.`

diff --git a/package.json b/package.json
@@ -28,7 +28,7 @@
     "start-examples": "ws -d examples/ -s index.html -p 4242",
     "start-docs": "docsify serve ./docs-user",
     "start-photon": "node res/photon/server",
-    "test": "cross-env LC_ALL=C NODE_ENV=test NODE_OPTIONS=--experimental-worker jest",
+    "test": "cross-env LC_ALL=C NODE_ENV=test jest",
     "test-all": "run-p --max-parallel 4 flow license-check lint test test-alex test-lockfile",
     "test-build-coverage": "jest --coverage --coverageReporters=html",
     "test-serve-coverage": "ws -d coverage/ -p 4343",