upgrade to node18 in a backwards compatible way

storybookjs · Oct 10, 2023 · 1fc5ed4 · 1fc5ed4
1 parent beeab50
commit 1fc5ed4
Show file tree

Hide file tree

Showing 48 changed files with 96 additions and 92 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -17,7 +17,7 @@ executors:
         default: 'small'
     working_directory: /tmp/storybook
     docker:
-      - image: cimg/node:16.20.0
+      - image: cimg/node:18.18.0
         environment:
           NODE_OPTIONS: --max_old_space_size=6144
     resource_class: <<parameters.class>>
@@ -30,7 +30,7 @@ executors:
         default: 'small'
     working_directory: /tmp/storybook
     docker:
-      - image: cimg/node:16.20.0-browsers
+      - image: cimg/node:18.18.0-browsers
         environment:
           NODE_OPTIONS: --max_old_space_size=6144
     resource_class: <<parameters.class>>

diff --git a/.github/workflows/generate-sandboxes-main.yml b/.github/workflows/generate-sandboxes-main.yml
@@ -21,7 +21,7 @@ jobs:
     steps:
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version-file: '.nvmrc'
       - uses: actions/checkout@v3
         with:
           ref: main

diff --git a/.github/workflows/generate-sandboxes-next.yml b/.github/workflows/generate-sandboxes-next.yml
@@ -21,7 +21,7 @@ jobs:
     steps:
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version-file: '.nvmrc'
       - uses: actions/checkout@v3
         with:
           ref: next

diff --git a/.github/workflows/tests-unit.yml b/.github/workflows/tests-unit.yml
@@ -9,19 +9,18 @@ on:
 
 jobs:
   build:
-    name: Core Unit Tests node-${{ matrix.node_version }}, ${{ matrix.os }}
+    name: Core Unit Tests, ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         os: [windows-latest]
-        node_version: [16]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
-      - name: Set node version to ${{ matrix.node_version }}
+      - name: Set node version
         uses: actions/setup-node@v3
         with:
-          node-version: ${{ matrix.node_version }}
+          node-version-file: '.nvmrc'
       - name: install and compile
         run: yarn task --task compile --start-from=auto --no-link
       - name: test

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-16.20
+18.18
diff --git a/code/addons/interactions/package.json b/code/addons/interactions/package.json
@@ -91,7 +91,7 @@
     "@devtools-ds/object-inspector": "^1.1.2",
     "@storybook/jest": "next",
     "@storybook/testing-library": "next",
-    "@types/node": "^16.0.0",
+    "@types/node": "^18.0.0",
     "formik": "^2.2.9",
     "typescript": "~4.9.3"
   },

diff --git a/code/builders/builder-vite/package.json b/code/builders/builder-vite/package.json
@@ -62,7 +62,7 @@
   },
   "devDependencies": {
     "@types/express": "^4.17.13",
-    "@types/node": "^16.0.0",
+    "@types/node": "^18.0.0",
     "glob": "^10.0.0",
     "rollup": "^3.20.1",
     "slash": "^5.0.0",

diff --git a/code/builders/builder-webpack5/package.json b/code/builders/builder-webpack5/package.json
@@ -66,7 +66,7 @@
     "@storybook/preview": "workspace:*",
     "@storybook/preview-api": "workspace:*",
     "@swc/core": "^1.3.82",
-    "@types/node": "^16.0.0",
+    "@types/node": "^18.0.0",
     "@types/semver": "^7.3.4",
     "babel-loader": "^9.0.0",
     "babel-plugin-named-exports-order": "^0.0.2",

diff --git a/code/frameworks/angular/package.json b/code/frameworks/angular/package.json
@@ -51,7 +51,7 @@
     "@storybook/preview-api": "workspace:*",
     "@storybook/telemetry": "workspace:*",
     "@storybook/types": "workspace:*",
-    "@types/node": "^16.0.0",
+    "@types/node": "^18.0.0",
     "@types/react": "^16.14.34",
     "@types/react-dom": "^16.9.14",
     "@types/semver": "^7.3.4",

diff --git a/code/frameworks/html-vite/package.json b/code/frameworks/html-vite/package.json
@@ -57,7 +57,7 @@
     "magic-string": "^0.30.0"
   },
   "devDependencies": {
-    "@types/node": "^16.0.0",
+    "@types/node": "^18.0.0",
     "typescript": "~4.9.3"
   },
   "engines": {

diff --git a/code/frameworks/html-webpack5/package.json b/code/frameworks/html-webpack5/package.json
@@ -52,7 +52,7 @@
     "@storybook/global": "^5.0.0",
     "@storybook/html": "workspace:*",
     "@storybook/preset-html-webpack": "workspace:*",
-    "@types/node": "^16.0.0"
+    "@types/node": "^18.0.0"
   },
   "devDependencies": {
     "typescript": "~4.9.3"

diff --git a/code/frameworks/nextjs/package.json b/code/frameworks/nextjs/package.json
@@ -95,7 +95,7 @@
     "@storybook/preset-react-webpack": "workspace:*",
     "@storybook/preview-api": "workspace:*",
     "@storybook/react": "workspace:*",
-    "@types/node": "^16.0.0",
+    "@types/node": "^18.0.0",
     "css-loader": "^6.7.3",
     "find-up": "^5.0.0",
     "fs-extra": "^11.1.0",

diff --git a/code/frameworks/preact-vite/package.json b/code/frameworks/preact-vite/package.json
@@ -52,7 +52,7 @@
     "@storybook/preact": "workspace:*"
   },
   "devDependencies": {
-    "@types/node": "^16.0.0",
+    "@types/node": "^18.0.0",
     "typescript": "~4.9.3",
     "vite": "^4.0.0"
   },

diff --git a/code/frameworks/preact-webpack5/package.json b/code/frameworks/preact-webpack5/package.json
@@ -51,7 +51,7 @@
     "@storybook/core-common": "workspace:*",
     "@storybook/preact": "workspace:*",
     "@storybook/preset-preact-webpack": "workspace:*",
-    "@types/node": "^16.0.0"
+    "@types/node": "^18.0.0"
   },
   "devDependencies": {
     "preact": "^10.5.13",

diff --git a/code/frameworks/react-vite/package.json b/code/frameworks/react-vite/package.json
@@ -56,7 +56,7 @@
     "react-docgen": "^6.0.2"
   },
   "devDependencies": {
-    "@types/node": "^16.0.0",
+    "@types/node": "^18.0.0",
     "typescript": "~4.9.3",
     "vite": "^4.0.0"
   },

diff --git a/code/frameworks/react-webpack5/package.json b/code/frameworks/react-webpack5/package.json
@@ -50,7 +50,7 @@
     "@storybook/builder-webpack5": "workspace:*",
     "@storybook/preset-react-webpack": "workspace:*",
     "@storybook/react": "workspace:*",
-    "@types/node": "^16.0.0"
+    "@types/node": "^18.0.0"
   },
   "devDependencies": {
     "jest-specific-snapshot": "^8.0.0"

diff --git a/code/frameworks/server-webpack5/package.json b/code/frameworks/server-webpack5/package.json
@@ -51,7 +51,7 @@
     "@storybook/core-common": "workspace:*",
     "@storybook/preset-server-webpack": "workspace:*",
     "@storybook/server": "workspace:*",
-    "@types/node": "^16.0.0"
+    "@types/node": "^18.0.0"
   },
   "devDependencies": {
     "typescript": "~4.9.3"

diff --git a/code/frameworks/svelte-vite/package.json b/code/frameworks/svelte-vite/package.json
@@ -56,7 +56,7 @@
     "ts-dedent": "^2.2.0"
   },
   "devDependencies": {
-    "@types/node": "^16.0.0",
+    "@types/node": "^18.0.0",
     "svelte": "^4.0.0",
     "typescript": "~4.9.3",
     "vite": "^4.0.0"

diff --git a/code/frameworks/sveltekit/package.json b/code/frameworks/sveltekit/package.json
@@ -55,7 +55,7 @@
     "@storybook/svelte-vite": "workspace:*"
   },
   "devDependencies": {
-    "@types/node": "^16.0.0",
+    "@types/node": "^18.0.0",
     "typescript": "^4.9.3",
     "vite": "^4.0.0"
   },

diff --git a/code/frameworks/vue-webpack5/package.json b/code/frameworks/vue-webpack5/package.json
@@ -51,7 +51,7 @@
     "@storybook/core-common": "workspace:*",
     "@storybook/preset-vue-webpack": "workspace:*",
     "@storybook/vue": "workspace:*",
-    "@types/node": "^16.0.0"
+    "@types/node": "^18.0.0"
   },
   "devDependencies": {
     "typescript": "~4.9.3",

diff --git a/code/frameworks/vue3-vite/package.json b/code/frameworks/vue3-vite/package.json
@@ -55,7 +55,7 @@
     "vue-docgen-api": "^4.40.0"
   },
   "devDependencies": {
-    "@types/node": "^16.0.0",
+    "@types/node": "^18.0.0",
     "typescript": "~4.9.3",
     "vite": "^4.0.0"
   },

diff --git a/code/frameworks/vue3-webpack5/package.json b/code/frameworks/vue3-webpack5/package.json
@@ -51,7 +51,7 @@
     "@storybook/core-common": "workspace:*",
     "@storybook/preset-vue3-webpack": "workspace:*",
     "@storybook/vue3": "workspace:*",
-    "@types/node": "^16.0.0"
+    "@types/node": "^18.0.0"
   },
   "devDependencies": {
     "@vue/compiler-sfc": "3.0.0",

diff --git a/code/frameworks/web-components-vite/package.json b/code/frameworks/web-components-vite/package.json
@@ -54,7 +54,7 @@
     "magic-string": "^0.30.0"
   },
   "devDependencies": {
-    "@types/node": "^16.0.0",
+    "@types/node": "^18.0.0",
     "typescript": "~4.9.3"
   },
   "peerDependencies": {

diff --git a/code/frameworks/web-components-webpack5/package.json b/code/frameworks/web-components-webpack5/package.json
@@ -55,7 +55,7 @@
     "@storybook/core-common": "workspace:*",
     "@storybook/preset-web-components-webpack": "workspace:*",
     "@storybook/web-components": "workspace:*",
-    "@types/node": "^16.0.0"
+    "@types/node": "^18.0.0"
   },
   "devDependencies": {
     "lit": "2.3.1",

diff --git a/code/lib/cli/src/automigrate/fixes/nodejs-requirement.test.ts b/code/lib/cli/src/automigrate/fixes/nodejs-requirement.test.ts
@@ -38,6 +38,11 @@ describe('nodejs-requirement fix', () => {
     await expect(check({})).resolves.toBeNull();
   });
 
+  it('skips when node >= 18.0.0', async () => {
+    mockNodeVersion('18.0.0');
+    await expect(check({})).resolves.toBeNull();
+  });
+
   it('prompts when node <= 16.0.0', async () => {
     mockNodeVersion('14.0.0');
     await expect(check({})).resolves.toEqual({ nodeVersion: '14.0.0' });

diff --git a/code/lib/cli/src/link.ts b/code/lib/cli/src/link.ts
@@ -105,7 +105,7 @@ export const link = async ({ target, local, start }: LinkOptions) => {
   }
 
   // ensure that linking is possible
-  await exec(`yarn add @types/node@16`, { cwd: reproDir });
+  await exec(`yarn add @types/node@18`, { cwd: reproDir });
 
   if (start) {
     logger.info(`Running ${reproName} storybook`);

diff --git a/code/lib/core-common/package.json b/code/lib/core-common/package.json
@@ -48,7 +48,7 @@
     "@storybook/node-logger": "workspace:*",
     "@storybook/types": "workspace:*",
     "@types/find-cache-dir": "^3.2.1",
-    "@types/node": "^16.0.0",
+    "@types/node": "^18.0.0",
     "@types/node-fetch": "^2.6.4",
     "@types/pretty-hrtime": "^1.0.0",
     "chalk": "^4.1.0",

diff --git a/code/lib/core-server/package.json b/code/lib/core-server/package.json
@@ -76,7 +76,7 @@
     "@storybook/telemetry": "workspace:*",
     "@storybook/types": "workspace:*",
     "@types/detect-port": "^1.3.0",
-    "@types/node": "^16.0.0",
+    "@types/node": "^18.0.0",
     "@types/pretty-hrtime": "^1.0.0",
     "@types/semver": "^7.3.4",
     "better-opn": "^3.0.2",

diff --git a/code/lib/core-webpack/package.json b/code/lib/core-webpack/package.json
@@ -47,7 +47,7 @@
     "@storybook/core-common": "workspace:*",
     "@storybook/node-logger": "workspace:*",
     "@storybook/types": "workspace:*",
-    "@types/node": "^16.0.0",
+    "@types/node": "^18.0.0",
     "ts-dedent": "^2.0.0"
   },
   "devDependencies": {

diff --git a/code/lib/theming/package.json b/code/lib/theming/package.json
@@ -60,7 +60,7 @@
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@types/fs-extra": "^11.0.1",
-    "@types/node": "^16.0.0",
+    "@types/node": "^18.0.0",
     "deep-object-diff": "^1.1.0",
     "fs-extra": "^11.1.0",
     "polished": "^4.2.2",

diff --git a/code/lib/types/package.json b/code/lib/types/package.json
@@ -52,7 +52,7 @@
   "devDependencies": {
     "@storybook/csf": "^0.1.0",
     "@types/fs-extra": "^11.0.1",
-    "@types/node": "^16.0.0",
+    "@types/node": "^18.0.0",
     "typescript": "~4.9.3"
   },
   "publishConfig": {

diff --git a/code/package.json b/code/package.json
@@ -205,7 +205,7 @@
     "@types/express": "^4.17.11",
     "@types/fs-extra": "^11.0.1",
     "@types/lodash": "^4.14.167",
-    "@types/node": "^16.0.0",
+    "@types/node": "^18.0.0",
     "@types/react": "^16.14.34",
     "@types/react-dom": "^16.9.14",
     "@types/semver": "^7.3.4",
@@ -288,7 +288,7 @@
   },
   "packageManager": "yarn@3.5.1",
   "engines": {
-    "node": ">=16.0.0"
+    "node": ">=18.0.0"
   },
   "collective": {
     "type": "opencollective",

diff --git a/code/presets/create-react-app/package.json b/code/presets/create-react-app/package.json
@@ -59,7 +59,7 @@
   },
   "devDependencies": {
     "@storybook/node-logger": "workspace:*",
-    "@types/node": "^16.0.0",
+    "@types/node": "^18.0.0",
     "typescript": "~4.9.3"
   },
   "peerDependencies": {

diff --git a/code/presets/html-webpack/package.json b/code/presets/html-webpack/package.json
@@ -50,7 +50,7 @@
   },
   "dependencies": {
     "@storybook/core-webpack": "workspace:*",
-    "@types/node": "^16.0.0",
+    "@types/node": "^18.0.0",
     "html-loader": "^3.1.0",
     "webpack": "5"
   },

diff --git a/code/presets/preact-webpack/package.json b/code/presets/preact-webpack/package.json
@@ -52,7 +52,7 @@
     "@babel/plugin-transform-react-jsx": "^7.22.5",
     "@babel/preset-typescript": "^7.22.5",
     "@storybook/core-webpack": "workspace:*",
-    "@types/node": "^16.0.0"
+    "@types/node": "^18.0.0"
   },
   "devDependencies": {
     "preact": "^10.5.13",

diff --git a/code/presets/react-webpack/package.json b/code/presets/react-webpack/package.json
@@ -72,7 +72,7 @@
     "@storybook/node-logger": "workspace:*",
     "@storybook/react": "workspace:*",
     "@storybook/react-docgen-typescript-plugin": "1.0.6--canary.9.0c3f3b7.0",
-    "@types/node": "^16.0.0",
+    "@types/node": "^18.0.0",
     "@types/semver": "^7.3.4",
     "babel-plugin-add-react-displayname": "^0.0.5",
     "babel-plugin-react-docgen": "^4.2.1",

diff --git a/code/presets/server-webpack/package.json b/code/presets/server-webpack/package.json
@@ -58,7 +58,7 @@
     "@storybook/core-webpack": "workspace:*",
     "@storybook/global": "^5.0.0",
     "@storybook/server": "workspace:*",
-    "@types/node": "^16.0.0",
+    "@types/node": "^18.0.0",
     "safe-identifier": "^0.4.1",
     "ts-dedent": "^2.0.0",
     "yaml-loader": "^0.8.0"

diff --git a/code/presets/vue-webpack/package.json b/code/presets/vue-webpack/package.json
@@ -61,7 +61,7 @@
   "dependencies": {
     "@storybook/core-webpack": "workspace:*",
     "@storybook/docs-tools": "workspace:*",
-    "@types/node": "^16.0.0",
+    "@types/node": "^18.0.0",
     "ts-loader": "^9.2.8",
     "vue-docgen-api": "^4.44.23",
     "vue-docgen-loader": "^1.5.1",

diff --git a/code/presets/vue3-webpack/package.json b/code/presets/vue3-webpack/package.json
@@ -61,7 +61,7 @@
   "dependencies": {
     "@storybook/core-webpack": "workspace:*",
     "@storybook/docs-tools": "workspace:*",
-    "@types/node": "^16.0.0",
+    "@types/node": "^18.0.0",
     "ts-loader": "^9.2.8",
     "vue-docgen-api": "^4.46.0",
     "vue-docgen-loader": "^1.5.1",

diff --git a/code/presets/web-components-webpack/package.json b/code/presets/web-components-webpack/package.json
@@ -56,7 +56,7 @@
     "@babel/plugin-syntax-import-meta": "^7.10.4",
     "@babel/preset-env": "^7.22.9",
     "@storybook/core-webpack": "workspace:*",
-    "@types/node": "^16.0.0",
+    "@types/node": "^18.0.0",
     "babel-loader": "^7.0.0 || ^8.0.0 || ^9.0.0",
     "babel-plugin-bundled-import-meta": "^0.3.1"
   },

diff --git a/code/renderers/react/package.json b/code/renderers/react/package.json
@@ -62,7 +62,7 @@
     "@storybook/types": "workspace:*",
     "@types/escodegen": "^0.0.6",
     "@types/estree": "^0.0.51",
-    "@types/node": "^16.0.0",
+    "@types/node": "^18.0.0",
     "acorn": "^7.4.1",
     "acorn-jsx": "^5.3.1",
     "acorn-walk": "^7.2.0",