From d57124a96902ec767f808623d2ae93c93d439fd7 Mon Sep 17 00:00:00 2001 From: Julien Wajsberg Date: Tue, 14 Feb 2023 17:34:26 +0100 Subject: [PATCH 1/4] Update our CI to v18 --- .circleci/config.yml | 2 +- appveyor.yml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bd3e9d4c51..52b0b859e3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2.1 executors: node: docker: - - image: cimg/node:16.13 + - image: cimg/node:18.14 base: docker: - image: cimg/base:stable diff --git a/appveyor.yml b/appveyor.yml index 9a3f8b4ca0..c686371818 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ clone_depth: 5 environment: - nodejs_version: "16" + nodejs_version: "18.14" platform: x64 # flow needs 64b platforms branches: @@ -12,12 +12,12 @@ branches: install: # 1. Select the right node # The following command works by fully reinstalling a version of node. It's a - # lot slower than the other command. This needs the full version (eg: 16.12) - # - ps: Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version) $env:platform + # lot slower than the other command. This needs the full version (eg: 18.12) + - ps: Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version) $env:platform # Use the following command if the wanted version is already part of # appveyor's windows machines, see https://www.appveyor.com/docs/windows-images-software/#node-js - # This needs the major version only (eg: 16) - - ps: Install-Product node $env:nodejs_version $env:platform + # This needs the major version only (eg: 18) + # - ps: Install-Product node $env:nodejs_version $env:platform # 2. Setup the project - yarn install --frozen-lockfile From a796385776e8ba3fe59a86064c5fee4acd96d9c4 Mon Sep 17 00:00:00 2001 From: Julien Wajsberg Date: Tue, 14 Feb 2023 17:40:17 +0100 Subject: [PATCH 2/4] Update tests following the ICU update --- src/test/components/WindowTitle.test.js | 10 ++++++---- .../ListOfPublishedProfiles.test.js.snap | 16 ++++++++-------- .../UploadedRecordingsHome.test.js.snap | 6 +++--- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/test/components/WindowTitle.test.js b/src/test/components/WindowTitle.test.js index 0a40840e2c..7916ae1c59 100644 --- a/src/test/components/WindowTitle.test.js +++ b/src/test/components/WindowTitle.test.js @@ -35,7 +35,7 @@ describe('WindowTitle', () => { ); expect(document.title).toBe( - 'Firefox – 1/1/1970, 12:00:00 AM UTC – Firefox Profiler' + 'Firefox – 1/1/1970, 12:00:00\u202FAM UTC – Firefox Profiler' ); }); @@ -56,7 +56,7 @@ describe('WindowTitle', () => { ); expect(document.title).toBe( - 'Firefox – macOS 10.14 – 1/1/1970, 12:00:00 AM UTC – Firefox Profiler' + 'Firefox – macOS 10.14 – 1/1/1970, 12:00:00\u202FAM UTC – Firefox Profiler' ); }); @@ -100,7 +100,9 @@ describe('WindowTitle', () => { ); - expect(document.title).toBe('1/1/1970, 12:00:00 AM UTC – Firefox Profiler'); + expect(document.title).toBe( + '1/1/1970, 12:00:00\u202FAM UTC – Firefox Profiler' + ); }); it('shows the correct title for uploaded recordings', () => { @@ -167,7 +169,7 @@ describe('WindowTitle', () => { ); expect(document.title).toBe( - 'bar/profile1.json – Firefox – 1/1/1970, 12:00:00 AM UTC – Firefox Profiler' + 'bar/profile1.json – Firefox – 1/1/1970, 12:00:00\u202FAM UTC – Firefox Profiler' ); }); }); diff --git a/src/test/components/__snapshots__/ListOfPublishedProfiles.test.js.snap b/src/test/components/__snapshots__/ListOfPublishedProfiles.test.js.snap index 5d7d25a30c..8d25a786f7 100644 --- a/src/test/components/__snapshots__/ListOfPublishedProfiles.test.js.snap +++ b/src/test/components/__snapshots__/ListOfPublishedProfiles.test.js.snap @@ -61,7 +61,7 @@ exports[`ListOfPublishedProfiles limits the number of rendered profiles with the
- 2:00 PM + 2:00 PM
- 1:00 PM + 1:00 PM
- 2:00 PM + 2:00 PM
- 1:00 PM + 1:00 PM
- Jul 3, 8:00 AM + Jul 3, 8:00 AM
- 2:00 PM + 2:00 PM
- Jul 3, 8:00 AM + Jul 3, 8:00 AM
- 2:00 PM + 2:00 PM
- 2:00 PM + 2:00 PM
- 1:00 PM + 1:00 PM
- Jul 3, 8:00 AM + Jul 3, 8:00 AM
Date: Tue, 14 Feb 2023 17:46:21 +0100 Subject: [PATCH 3/4] Final small changes following the update to node v18 --- .gitpod.yml | 2 +- bin/pre-install.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitpod.yml b/.gitpod.yml index 719e57e45d..6a3361b76b 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,7 +1,7 @@ ports: - port: 4242 tasks: -- before: nvm install 16 +- before: nvm install 18 init: yarn install command: FX_PROFILER_HOST="0.0.0.0" yarn start - openMode: split-right diff --git a/bin/pre-install.js b/bin/pre-install.js index f59c8c8120..eb7d13e55a 100644 --- a/bin/pre-install.js +++ b/bin/pre-install.js @@ -60,7 +60,7 @@ function checkNode(agents /*: AgentsVersion */) { 'You can use a tool like `nvm` to install and manage installed node versions.' ); console.error( - 'You can look at https://github.com/creationix/nvm to install this tool.\n' + 'You can look at https://github.com/nvm-sh/nvm to install this tool.\n' ); console.error( 'Once `nvm` is installed you can use the following commands to upgrade:\n' + From 5dc76224182007586475c837d2f3c29f118877d1 Mon Sep 17 00:00:00 2001 From: Julien Wajsberg Date: Tue, 14 Feb 2023 18:00:04 +0100 Subject: [PATCH 4/4] Add a .nvmrc file so that tools like netlify (and others) can pick it up automatically --- .nvmrc | 1 + 1 file changed, 1 insertion(+) create mode 100644 .nvmrc diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 0000000000..2ef3430431 --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +18.14