Skip to content

Commit 5013ac3

Browse files
committed
Merge remote-tracking branch 'origin/v4.0' into cam/7174/remove-mapbox
2 parents 7d048dd + 065bab3 commit 5013ac3

44 files changed

Lines changed: 2760 additions & 2182 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/actions/setup-workspace/action.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
11
name: 'Setup Workspace'
22
description: 'Setup Node.js, install dependencies, and download build artifacts'
33

4-
inputs:
5-
node-version:
6-
description: 'Node.js version to use'
7-
default: '18'
8-
94
runs:
105
using: 'composite'
116
steps:
127
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6
138
with:
14-
node-version: ${{ inputs.node-version }}
9+
node-version-file: '.nvmrc'
1510
cache: 'npm'
1611

1712
- name: Install dependencies

.github/workflows/ci.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ concurrency:
1414
group: ci-${{ github.event.pull_request.number || github.ref }}
1515
cancel-in-progress: true
1616

17-
env:
18-
NODE_VERSION: '18'
19-
2017
jobs:
2118
detect-changes:
2219
runs-on: ubuntu-latest
@@ -60,7 +57,7 @@ jobs:
6057

6158
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6
6259
with:
63-
node-version: ${{ env.NODE_VERSION }}
60+
node-version-file: '.nvmrc'
6461
cache: 'npm'
6562

6663
- name: Install dependencies
@@ -270,7 +267,7 @@ jobs:
270267
chrome-version: 'stable'
271268

272269
- name: Run noCI tests
273-
uses: coactions/setup-xvfb@b6b4fcfb9f5a895edadc3bc76318fae0ac17c8b3 # v1
270+
uses: ./.github/actions/run-xvfb
274271
with:
275272
run: npm run test-jasmine -- --tags=noCI,noCIdep --nowatch
276273

@@ -613,7 +610,7 @@ jobs:
613610

614611
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6
615612
with:
616-
node-version: ${{ env.NODE_VERSION }}
613+
node-version-file: '.nvmrc'
617614
cache: 'npm'
618615

619616
- name: Set up build environment
@@ -644,7 +641,7 @@ jobs:
644641

645642
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6
646643
with:
647-
node-version: ${{ env.NODE_VERSION }}
644+
node-version-file: '.nvmrc'
648645
cache: 'npm'
649646

650647
- name: Set up build environment

.github/workflows/publish-dist.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6
2727
with:
28-
node-version: '22.14.0'
28+
node-version-file: '.nvmrc'
2929
cache: 'npm'
3030

3131
- name: Set up build environment

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@ tags
1919
!.github/
2020
!.gitignore
2121
!.npmignore
22+
!.nvmrc

.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
22.23.0

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ We use the following [labels](https://github.com/plotly/plotly.js/labels) to tra
7878
#### Prerequisites
7979

8080
- git
81-
- [node.js](https://nodejs.org/en/). We recommend using node.js v18.x.
81+
- [node.js](https://nodejs.org/en/). We recommend using node.js v22.x.
8282
Upgrading and managing node versions can be easily done using
8383
[`nvm`](https://github.com/nvm-sh/nvm) or its Windows alternatives.
8484
- [`npm`](https://www.npmjs.com/) v10.x and up to ensure that the

CUSTOM_BUNDLE.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ Make sure you have the versions of node/npm that's recommended:
55
- plotly.js before 2.5: Node 12/npm 6
66
- plotly.js from 2.5: Node 16/npm 8
77
- plotly.js from 2.35: Node 18/npm 10
8+
- plotly.js from 4.0: Node 22/npm 10
89

9-
To download a specific node version look [here](https://nodejs.org/en/download/package-manager).
10+
To download a specific node version look [here](https://nodejs.org/en/download).
1011

1112
Note: For CI, it's faster to do `git clone --depth 1` to only get one commit.
1213

draftlogs/7684_change.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Set default layout.axis.tickmode to 'sync' when axis is overlaying [[#7684](https://github.com/plotly/plotly.js/pull/7684)]

draftlogs/7856_add.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Replace `country-regex` with `country-iso-search` to search for country names in choropleth, scattergeo traces [[#7856](https://github.com/plotly/plotly.js/pull/7856)]

draftlogs/7861_change.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Update minimum required Node version to 22 [[#7861](https://github.com/plotly/plotly.js/pull/7861)]

0 commit comments

Comments
 (0)