From dc406be098642eb63afc630d8cd6bdb0ab7aa2f6 Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Thu, 8 Aug 2024 20:03:48 +0200 Subject: [PATCH 1/6] add draftlog --- draftlogs/7078_change.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 draftlogs/7078_change.md diff --git a/draftlogs/7078_change.md b/draftlogs/7078_change.md new file mode 100644 index 00000000000..c90c04b79cc --- /dev/null +++ b/draftlogs/7078_change.md @@ -0,0 +1,2 @@ + - Use `Node.js v18` and `npm v10` in development [[#5922](https://github.com/plotly/plotly.js/pull/5922), [#7078](https://github.com/plotly/plotly.js/pull/7078)] + \ No newline at end of file From d38615eb8cb4fa7fe380498c2fad2d0483e879e9 Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Mon, 12 Aug 2024 22:00:03 +0200 Subject: [PATCH 2/6] use 18.20.4 --- .circleci/config.yml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 76e2dff1bfe..a1faf2f9950 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,7 +28,7 @@ jobs: install-and-cibuild: # main cibuild using node 16 & npm 7 docker: - - image: cimg/node:16.20.2 + - image: cimg/node:18.20.4 working_directory: ~/plotly.js steps: - checkout @@ -52,7 +52,7 @@ jobs: timezone-jasmine: docker: # need '-browsers' version to test in real (xvfb-wrapped) browsers - - image: cimg/node:16.20.2-browsers + - image: cimg/node:18.20.4-browsers working_directory: ~/plotly.js steps: - browser-tools/install-browser-tools: &browser-versions @@ -84,7 +84,7 @@ jobs: no-gl-jasmine: docker: # need '-browsers' version to test in real (xvfb-wrapped) browsers - - image: cimg/node:16.20.2-browsers + - image: cimg/node:18.20.4-browsers environment: # Alaska time (arbitrary timezone to test date logic) TZ: "America/Anchorage" @@ -103,7 +103,7 @@ jobs: webgl-jasmine: docker: # need '-browsers' version to test in real (xvfb-wrapped) browsers - - image: cimg/node:16.20.2-browsers + - image: cimg/node:18.20.4-browsers environment: # Alaska time (arbitrary timezone to test date logic) TZ: "America/Anchorage" @@ -122,7 +122,7 @@ jobs: virtual-webgl-jasmine: docker: # need '-browsers' version to test in real (xvfb-wrapped) browsers - - image: cimg/node:16.20.2-browsers + - image: cimg/node:18.20.4-browsers environment: # Alaska time (arbitrary timezone to test date logic) TZ: "America/Anchorage" @@ -141,7 +141,7 @@ jobs: flaky-no-gl-jasmine: docker: # need '-browsers' version to test in real (xvfb-wrapped) browsers - - image: cimg/node:16.20.2-browsers + - image: cimg/node:18.20.4-browsers environment: # Alaska time (arbitrary timezone to test date logic) TZ: "America/Anchorage" @@ -159,7 +159,7 @@ jobs: bundle-jasmine: docker: # need '-browsers' version to test in real (xvfb-wrapped) browsers - - image: cimg/node:16.20.2-browsers + - image: cimg/node:18.20.4-browsers environment: # Alaska time (arbitrary timezone to test date logic) TZ: "America/Anchorage" @@ -177,7 +177,7 @@ jobs: mathjax-firefoxLatest: docker: # need '-browsers' version to test in real (xvfb-wrapped) browsers - - image: cimg/node:16.20.2-browsers + - image: cimg/node:18.20.4-browsers environment: # Alaska time (arbitrary timezone to test date logic) TZ: "America/Anchorage" @@ -269,7 +269,7 @@ jobs: test-baselines: docker: - - image: cimg/node:16.20.2 + - image: cimg/node:18.20.4 working_directory: ~/plotly.js steps: - attach_workspace: @@ -283,7 +283,7 @@ jobs: test-baselines-virtual-webgl: docker: - - image: cimg/node:16.20.2 + - image: cimg/node:18.20.4 working_directory: ~/plotly.js steps: - attach_workspace: @@ -297,7 +297,7 @@ jobs: test-baselines-b64: docker: - - image: cimg/node:16.20.2 + - image: cimg/node:18.20.4 working_directory: ~/plotly.js steps: - attach_workspace: @@ -311,7 +311,7 @@ jobs: test-baselines-mathjax3: docker: - - image: cimg/node:16.20.2 + - image: cimg/node:18.20.4 working_directory: ~/plotly.js steps: - attach_workspace: @@ -348,7 +348,7 @@ jobs: test-exports: docker: - - image: cimg/node:16.20.2 + - image: cimg/node:18.20.4 working_directory: ~/plotly.js steps: - attach_workspace: @@ -362,7 +362,7 @@ jobs: mock-validation: docker: - - image: cimg/node:16.20.2 + - image: cimg/node:18.20.4 working_directory: ~/plotly.js steps: - attach_workspace: @@ -376,7 +376,7 @@ jobs: source-syntax: docker: - - image: cimg/node:16.20.2 + - image: cimg/node:18.20.4 working_directory: ~/plotly.js steps: - attach_workspace: @@ -387,7 +387,7 @@ jobs: publish-dist: docker: - - image: cimg/node:16.20.2 + - image: cimg/node:18.20.4 working_directory: ~/plotly.js steps: - checkout @@ -457,7 +457,7 @@ jobs: test-stackgl-bundle: docker: - - image: cimg/node:16.20.2 + - image: cimg/node:18.20.4 working_directory: ~/plotly.js steps: - checkout From 2056b8745fbc88f298abb7fd7ff7cce7bd29710f Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Mon, 12 Aug 2024 23:21:15 +0200 Subject: [PATCH 3/6] contrib --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b9414f7d2fa..b8afbe169a4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -77,10 +77,10 @@ We use the following [labels](https://github.com/plotly/plotly.js/labels) to tra #### Prerequisites - git -- [node.js](https://nodejs.org/en/). We recommend using node.js v16.x. +- [node.js](https://nodejs.org/en/). We recommend using node.js v18.x. Upgrading and managing node versions can be easily done using [`nvm`](https://github.com/creationix/nvm) or its Windows alternatives. -- [`npm`](https://www.npmjs.com/) v7.x and up to ensure that the +- [`npm`](https://www.npmjs.com/) v10.x and up to ensure that the [`package-lock.json`](https://docs.npmjs.com/files/package-lock.json) file is used and updated correctly. From adb6dd765f2134fd74adb426a4be5a3a42277185 Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Mon, 12 Aug 2024 23:39:34 +0200 Subject: [PATCH 4/6] preversion --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ce2b919eb50..a8b5d910cad 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "start": "node devtools/test_dashboard/server.js", "baseline": "node test/image/make_baseline.js", "noci-baseline": "npm run cibuild && ./tasks/noci_test.sh image && git checkout dist && echo 'Please do not commit unless the change was expected!'", - "preversion": "check-node-version --node 16 --npm 8 && npm-link-check && npm ls --prod --all", + "preversion": "check-node-version --node 18 --npm 10 && npm-link-check && npm ls --prod --all", "version": "npm run build && npm run no-bad-char && git add -A lib dist build src/version.js", "postversion": "node -e \"console.log('Version bumped and committed. If ok, run: git push && git push --tags')\"", "postpublish": "node tasks/sync_packages.js", From a100cdffc9ae83b744ac3a957f02eb17bbef6885 Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Mon, 12 Aug 2024 23:40:23 +0200 Subject: [PATCH 5/6] remove comment --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a1faf2f9950..854a5775631 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,7 +26,7 @@ jobs: name: CI-Build command: npm run cibuild - install-and-cibuild: # main cibuild using node 16 & npm 7 + install-and-cibuild: docker: - image: cimg/node:18.20.4 working_directory: ~/plotly.js From e0eafc84d145cc74eff30634098ab1d302872ef2 Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Mon, 12 Aug 2024 23:40:32 +0200 Subject: [PATCH 6/6] lint --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 854a5775631..b6ecbfcdbf0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,7 +26,7 @@ jobs: name: CI-Build command: npm run cibuild - install-and-cibuild: + install-and-cibuild: docker: - image: cimg/node:18.20.4 working_directory: ~/plotly.js @@ -336,8 +336,8 @@ jobs: - run: name: Install poppler-utils to have pdftops for exporting eps command: | - sudo apt-get update --allow-releaseinfo-change - sudo apt-get install poppler-utils + sudo apt-get update --allow-releaseinfo-change + sudo apt-get install poppler-utils - run: name: Create svg, jpg, jpeg, webp, pdf and eps files command: python3 test/image/make_exports.py