Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .gitpod.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
18.14
10 changes: 5 additions & 5 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
clone_depth: 5
environment:
nodejs_version: "16"
nodejs_version: "18.14"
platform: x64 # flow needs 64b platforms

branches:
Expand All @@ -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

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder how much slower it will be compared to the older one. Maybe we should think about using circleci for the windows builders indeed.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not clear to me whether circleci would be faster :)

# 2. Setup the project
- yarn install --frozen-lockfile

Expand Down
2 changes: 1 addition & 1 deletion bin/pre-install.js
Original file line number Diff line number Diff line change
Expand Up @@ -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' +
Expand Down
10 changes: 6 additions & 4 deletions src/test/components/WindowTitle.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'
);
});

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

Expand Down Expand Up @@ -100,7 +100,9 @@ describe('WindowTitle', () => {
</Provider>
);

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', () => {
Expand Down Expand Up @@ -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'
);
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ exports[`ListOfPublishedProfiles limits the number of rendered profiles with the
<div
class="publishedProfilesDate"
>
2:00 PM
2:00PM
</div>
<div
class="publishedProfilesInfo"
Expand Down Expand Up @@ -104,7 +104,7 @@ exports[`ListOfPublishedProfiles limits the number of rendered profiles with the
<div
class="publishedProfilesDate"
>
1:00 PM
1:00PM
</div>
<div
class="publishedProfilesInfo"
Expand Down Expand Up @@ -304,7 +304,7 @@ exports[`ListOfPublishedProfiles renders action buttons when appropriate 1`] = `
<div
class="publishedProfilesDate"
>
2:00 PM
2:00PM
</div>
<div
class="publishedProfilesInfo"
Expand Down Expand Up @@ -363,7 +363,7 @@ exports[`ListOfPublishedProfiles renders action buttons when appropriate 1`] = `
<div
class="publishedProfilesDate"
>
1:00 PM
1:00PM
</div>
<div
class="publishedProfilesInfo"
Expand Down Expand Up @@ -420,7 +420,7 @@ exports[`ListOfPublishedProfiles renders action buttons when appropriate 1`] = `
<div
class="publishedProfilesDate"
>
Jul 3, 8:00 AM
Jul 3, 8:00AM
</div>
<div
class="publishedProfilesInfo"
Expand Down Expand Up @@ -543,7 +543,7 @@ exports[`ListOfPublishedProfiles still displays the link to all recordings when
<div
class="publishedProfilesDate"
>
2:00 PM
2:00PM
</div>
<div
class="publishedProfilesInfo"
Expand Down Expand Up @@ -586,7 +586,7 @@ exports[`ListOfPublishedProfiles still displays the link to all recordings when
<div
class="publishedProfilesDate"
>
Jul 3, 8:00 AM
Jul 3, 8:00AM
</div>
<div
class="publishedProfilesInfo"
Expand Down Expand Up @@ -692,7 +692,7 @@ exports[`ListOfPublishedProfiles still displays the link to all recordings when
<div
class="publishedProfilesDate"
>
2:00 PM
2:00PM
</div>
<div
class="publishedProfilesInfo"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ exports[`UploadedRecordingsHome matches a snapshot when rendering published prof
<div
class="publishedProfilesDate"
>
2:00 PM
2:00PM
</div>
<div
class="publishedProfilesInfo"
Expand Down Expand Up @@ -182,7 +182,7 @@ exports[`UploadedRecordingsHome matches a snapshot when rendering published prof
<div
class="publishedProfilesDate"
>
1:00 PM
1:00PM
</div>
<div
class="publishedProfilesInfo"
Expand Down Expand Up @@ -239,7 +239,7 @@ exports[`UploadedRecordingsHome matches a snapshot when rendering published prof
<div
class="publishedProfilesDate"
>
Jul 3, 8:00 AM
Jul 3, 8:00AM
</div>
<div
class="publishedProfilesInfo"
Expand Down