From 249146979b596c039a3c64855b0b205844983d59 Mon Sep 17 00:00:00 2001 From: Robin Tail Date: Wed, 13 Mar 2024 20:58:45 +0100 Subject: [PATCH 01/12] Allowing Node 22 and testing on its nightly build. --- .github/workflows/node.js.yml | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index ca83f5644..0e1da4702 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [18.0.0, 18.6.0, 18.x, 20.0.0, 20.1.0, 20.x] + node-version: [18.0.0, 18.6.0, 18.x, 20.0.0, 20.1.0, 20.x, 22-nightly] # todo: use 22.x when released # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ steps: - name: Get yarn cache dir diff --git a/package.json b/package.json index e71b02bcd..012ee3610 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "*.md" ], "engines": { - "node": "^18.0.0 || ^20.0.0" + "node": "^18.0.0 || ^20.0.0 || ^22" }, "dependencies": { "openapi3-ts": "^4.2.1", From 9789a350806f5deca1cc5dcc6e15e3ad6c777bbf Mon Sep 17 00:00:00 2001 From: Robin Tail Date: Wed, 13 Mar 2024 21:01:10 +0100 Subject: [PATCH 02/12] Adjusting engines. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 012ee3610..b4a09fbe6 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "*.md" ], "engines": { - "node": "^18.0.0 || ^20.0.0 || ^22" + "node": "^18.0.0 || ^20.0.0 || ^22.0.0-nightly20240313" }, "dependencies": { "openapi3-ts": "^4.2.1", From 4b3412693248754ed6bfe36127432673af20691f Mon Sep 17 00:00:00 2001 From: Robin Tail Date: Wed, 13 Mar 2024 21:03:56 +0100 Subject: [PATCH 03/12] Temp: ignore engines. --- .github/workflows/node.js.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 0e1da4702..821218c78 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -34,7 +34,7 @@ jobs: path: ${{ steps.yarnCache.outputs.dir }} key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }} - name: Install dependencies - run: yarn install + run: yarn install --ignore-engines # todo remove when 22.x released - name: Lint run: yarn lint - name: Test From 15596136e8b7b29f408614d4a0aa462e6edc54ce Mon Sep 17 00:00:00 2001 From: Robin Tail Date: Wed, 13 Mar 2024 21:06:37 +0100 Subject: [PATCH 04/12] Temp: ignoring engines in CJS and ESM tests. --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index b4a09fbe6..003c2c053 100644 --- a/package.json +++ b/package.json @@ -27,8 +27,8 @@ "build:license": "tsx tools/license.ts", "build:logo": "tsx tools/startup-logo.ts", "test": "yarn test:types && yarn test:unit && yarn test:badge", - "test:cjs": "yarn --cwd tests/cjs && vitest run -r tests/cjs", - "test:esm": "yarn --cwd tests/esm && vitest run -r tests/esm", + "test:cjs": "yarn --cwd tests/cjs --ignore-engines && vitest run -r tests/cjs", + "test:esm": "yarn --cwd tests/esm --ignore-engines && vitest run -r tests/esm", "test:952": "yarn --cwd tests/issue952 && yarn --cwd tests/issue952 test", "test:compat": "yarn --cwd tests/compat && yarn --cwd tests/compat test", "test:u": "yarn test:unit -u && yarn test:badge", From f3b6e95a35c0238038cf66b07720a0d467c36ec1 Mon Sep 17 00:00:00 2001 From: Robin Tail Date: Wed, 13 Mar 2024 21:08:51 +0100 Subject: [PATCH 05/12] Ignore engines for compat test. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 003c2c053..8bf568d56 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "test:cjs": "yarn --cwd tests/cjs --ignore-engines && vitest run -r tests/cjs", "test:esm": "yarn --cwd tests/esm --ignore-engines && vitest run -r tests/esm", "test:952": "yarn --cwd tests/issue952 && yarn --cwd tests/issue952 test", - "test:compat": "yarn --cwd tests/compat && yarn --cwd tests/compat test", + "test:compat": "yarn --cwd tests/compat --ignore-engines && yarn --cwd tests/compat test", "test:u": "yarn test:unit -u && yarn test:badge", "test:types": "tsc --noEmit", "test:unit": "vitest run --coverage tests/unit tests/system", From facb72a6637fa73450299d52c5d973aa330cb090 Mon Sep 17 00:00:00 2001 From: Robin Tail Date: Wed, 13 Mar 2024 21:11:05 +0100 Subject: [PATCH 06/12] Temp: ignoring engines for issue 952 test. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8bf568d56..13a8dd240 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "test": "yarn test:types && yarn test:unit && yarn test:badge", "test:cjs": "yarn --cwd tests/cjs --ignore-engines && vitest run -r tests/cjs", "test:esm": "yarn --cwd tests/esm --ignore-engines && vitest run -r tests/esm", - "test:952": "yarn --cwd tests/issue952 && yarn --cwd tests/issue952 test", + "test:952": "yarn --cwd tests/issue952 --ignore-engines && yarn --cwd tests/issue952 test", "test:compat": "yarn --cwd tests/compat --ignore-engines && yarn --cwd tests/compat test", "test:u": "yarn test:unit -u && yarn test:badge", "test:types": "tsc --noEmit", From b9e142b8f3dc2bd8741afbd762e5a0f78af1cdaf Mon Sep 17 00:00:00 2001 From: Anna Bocharova Date: Tue, 19 Mar 2024 19:53:37 +0100 Subject: [PATCH 07/12] Update .github/workflows/node.js.yml --- .github/workflows/node.js.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 5e9988965..eaaabaf79 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -36,7 +36,7 @@ jobs: key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }} - name: Install dependencies # todo use regular "yarn install" when min Node version increased to 18.18 - # todo ignore from first install when 22.x released + # todo remove ignore from the first install when 22.x released # @typescript/eslint group compatibility issue fixed by ignoring engines for dev dependencies only: run: | npm pkg delete devDependencies From d117f38feec642bb5431553fe5595f1853400346 Mon Sep 17 00:00:00 2001 From: Anna Bocharova Date: Fri, 5 Apr 2024 09:10:46 +0200 Subject: [PATCH 08/12] Update .github/workflows/node.js.yml --- .github/workflows/node.js.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index eaaabaf79..d3cd0948f 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [18.0.0, 18.6.0, 18.12.0, 18.x, 20.0.0, 20.1.0, 20.x, 22-nightly] # todo: use 22.x when released + node-version: [18.0.0, 18.x, 20.0.0, 20.x, 22-nightly] # todo: use 22.0 and 22.x when released # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ steps: - name: Get yarn cache dir From 7d3933dcc633da87687888a21c691a2593115056 Mon Sep 17 00:00:00 2001 From: Anna Bocharova Date: Wed, 24 Apr 2024 19:16:43 +0200 Subject: [PATCH 09/12] Using 22.0.0-rc.2 --- .github/workflows/node.js.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 2e82409d5..57c8e5f32 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - node-version: [18.0.0, 18.x, 20.0.0, 20.x, 22-nightly] # todo: use 22.0 and 22.x when released + node-version: [18.0.0, 18.x, 20.0.0, 20.x, 22.0.0-rc.2] # todo: use 22.0 and 22.x when released # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ steps: - name: Get yarn cache dir From 15dae4127c6e3f26fc9864e7bc6db8485c7f669b Mon Sep 17 00:00:00 2001 From: Anna Bocharova Date: Wed, 24 Apr 2024 20:39:49 +0200 Subject: [PATCH 10/12] Using 22.0.0 --- .github/workflows/node.js.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 57c8e5f32..6b49a1c40 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - node-version: [18.0.0, 18.x, 20.0.0, 20.x, 22.0.0-rc.2] # todo: use 22.0 and 22.x when released + node-version: [18.0.0, 18.x, 20.0.0, 20.x, 22.0.0, 22.x] # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ steps: - name: Get yarn cache dir From 9b69464d897bb0f64432aee09b96df4fd448a07f Mon Sep 17 00:00:00 2001 From: Anna Bocharova Date: Wed, 24 Apr 2024 20:41:30 +0200 Subject: [PATCH 11/12] Allowing Node 22 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0e4fc0831..08996eeab 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "*.md" ], "engines": { - "node": "^18.0.0 || ^20.0.0 || ^22.0.0-nightly20240313" + "node": "^18.0.0 || ^20.0.0 || ^22.0.0" }, "dependencies": { "ansis": "^3.1.0", From 3652b28538437966b78c2519e8e381f568d0326e Mon Sep 17 00:00:00 2001 From: Anna Bocharova Date: Wed, 24 Apr 2024 20:43:32 +0200 Subject: [PATCH 12/12] Reverting engine ignoring --- .github/workflows/node.js.yml | 3 +-- package.json | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 6b49a1c40..9598179b8 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -42,11 +42,10 @@ jobs: max_attempts: 3 on_retry_command: yarn config set registry https://registry.npmjs.org # todo use regular "yarn install" when min Node version increased to 18.18 - # todo remove ignore from the first install when 22.x released # @typescript/eslint group compatibility issue fixed by ignoring engines for dev dependencies only: command: | npm pkg delete devDependencies - yarn install --ignore-engines + yarn install git checkout -- . yarn install --ignore-engines - name: Lint diff --git a/package.json b/package.json index 08996eeab..e78c6eb65 100644 --- a/package.json +++ b/package.json @@ -26,10 +26,10 @@ "build:client": "tsx example/generate-client.ts", "build:license": "tsx tools/license.ts", "test": "yarn test:types && yarn test:unit && yarn test:badge", - "test:cjs": "yarn --cwd tests/cjs --ignore-engines && vitest run -r tests/cjs", - "test:esm": "yarn --cwd tests/esm --ignore-engines && vitest run -r tests/esm", - "test:952": "yarn --cwd tests/issue952 --ignore-engines && yarn --cwd tests/issue952 test", - "test:compat": "yarn --cwd tests/compat --ignore-engines && yarn --cwd tests/compat test", + "test:cjs": "yarn --cwd tests/cjs && vitest run -r tests/cjs", + "test:esm": "yarn --cwd tests/esm && vitest run -r tests/esm", + "test:952": "yarn --cwd tests/issue952 && yarn --cwd tests/issue952 test", + "test:compat": "yarn --cwd tests/compat && yarn --cwd tests/compat test", "test:u": "yarn test:unit -u && yarn test:badge", "test:types": "tsc --noEmit", "test:unit": "vitest run --coverage tests/unit tests/system",