From bc9ca8128b4ea3bfb92f3237d0bde7622772a3bc Mon Sep 17 00:00:00 2001 From: Stephen Mott Date: Sun, 24 May 2026 15:45:16 +0000 Subject: [PATCH 1/3] feat: update to node24 --- .devcontainer/devcontainer.json | 2 +- .github/workflows/publish.yml | 6 +++--- .github/workflows/test.yml | 6 +++--- action.yml | 2 +- package.json | 2 +- yarn.lock | 14 +++++++++++++- 6 files changed, 22 insertions(+), 10 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index ad55536..76145df 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -3,7 +3,7 @@ { "name": "Node.js & TypeScript", // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile - "image": "mcr.microsoft.com/devcontainers/typescript-node:1-20-bookworm", + "image": "mcr.microsoft.com/devcontainers/typescript-node:1-24-bookworm", // Features to add to the dev container. More info: https://containers.dev/features. // "features": {}, diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index a19bbc1..f74bd3e 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -15,10 +15,10 @@ jobs: with: ref: ${{ github.event.release.tag_name }} - - name: Set Node.js 20.x - uses: actions/setup-node@v3 + - name: Set Node.js 24.x + uses: actions/setup-node@v4 with: - node-version: 20.x + node-version: 24.x - name: Update Schemas run: yarn fetch-schemas diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9e84715..bae5548 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,10 +10,10 @@ jobs: - name: Checkout uses: actions/checkout@v3 - - name: Set Node.js 20.x - uses: actions/setup-node@v2.5.1 + - name: Set Node.js 24.x + uses: actions/setup-node@v4 with: - node-version: 20.x + node-version: 24.x - name: Update Schemas run: yarn fetch-schemas diff --git a/action.yml b/action.yml index e6164c6..bb259c8 100644 --- a/action.yml +++ b/action.yml @@ -75,5 +75,5 @@ inputs: Published Template IDs will be prefixed with the namespace. If omitted, this value will default to the source repo name runs: - using: node20 + using: node24 main: dist/index.js diff --git a/package.json b/package.json index 00a0e9a..cd3256b 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ }, "devDependencies": { "@types/ajv": "^1.0.0", - "@types/node": "^18.11.18", + "@types/node": "^24.0.0", "@vercel/ncc": "^0.34.0", "eslint": "^8.32.0", "jest": "^28.1.3", diff --git a/yarn.lock b/yarn.lock index 17d45f0..b43a286 100644 --- a/yarn.lock +++ b/yarn.lock @@ -802,11 +802,18 @@ dependencies: "@types/istanbul-lib-report" "*" -"@types/node@*", "@types/node@^18.11.18": +"@types/node@*": version "18.11.18" resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.18.tgz#8dfb97f0da23c2293e554c5a50d61ef134d7697f" integrity sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA== +"@types/node@^24.0.0": + version "24.12.4" + resolved "https://registry.yarnpkg.com/@types/node/-/node-24.12.4.tgz#2709745569811dcbdc57c097fafdd387c6330382" + integrity sha512-GUUEShf+PBCGW2KaXwcIt3Yk+e3pkKwWKb9GSyM9WQVE+ep2jzmHdGsHzu4wgcZy5fN9FBdVzjpBQsYlpfpgLA== + dependencies: + undici-types "~7.16.0" + "@types/prettier@^2.1.5": version "2.7.0" resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.0.tgz#ea03e9f0376a4446f44797ca19d9c46c36e352dc" @@ -2698,6 +2705,11 @@ typescript@^4.9.4: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.4.tgz#a2a3d2756c079abda241d75f149df9d561091e78" integrity sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg== +undici-types@~7.16.0: + version "7.16.0" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.16.0.tgz#ffccdff36aea4884cbfce9a750a0580224f58a46" + integrity sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw== + universal-user-agent@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-6.0.0.tgz#3381f8503b251c0d9cd21bc1de939ec9df5480ee" From 460db99c265dadadf7990c8f0402c42a2c94ef0c Mon Sep 17 00:00:00 2001 From: Stephen Mott Date: Sun, 24 May 2026 15:45:40 +0000 Subject: [PATCH 2/3] fix: ajv warnings ` strict mode: use allowUnionTypes to allow union type keyword at "#/properties/postStartCommand" (strictTypes)` --- src/utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils.ts b/src/utils.ts index 9c03ac3..0df271b 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -118,7 +118,7 @@ export async function ensureDevcontainerCliPresent(cliDebugMode = false): Promis } export async function validateFeatureSchema(pathToAFeatureDir: string): Promise { - const ajv = new Ajv(); + const ajv = new Ajv({ allowUnionTypes: true }); ajv.addSchema(devContainerFeatureSchema); const validate = ajv.compile(devContainerFeatureSchema); From 1e0a13c9f350916d07b0ed4b307ae4c84b70c5fe Mon Sep 17 00:00:00 2001 From: Stephen Mott Date: Sun, 24 May 2026 15:49:23 +0000 Subject: [PATCH 3/3] chore: update actions/checkout and actions/setup-node --- .github/workflows/publish.yml | 4 ++-- .github/workflows/test.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f74bd3e..3105cba 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -11,12 +11,12 @@ jobs: contents: write steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v6 with: ref: ${{ github.event.release.tag_name }} - name: Set Node.js 24.x - uses: actions/setup-node@v4 + uses: actions/setup-node@v6 with: node-version: 24.x diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bae5548..baeb8c2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,10 +8,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v6 - name: Set Node.js 24.x - uses: actions/setup-node@v4 + uses: actions/setup-node@v6 with: node-version: 24.x