From 532e4cc7e3e8f23c15f31c7ce66b3d089ba5bde0 Mon Sep 17 00:00:00 2001 From: Loris Leiva Date: Thu, 10 Oct 2024 11:01:34 +0100 Subject: [PATCH 1/2] Use Node 20 --- .changeset/wise-poems-think.md | 5 +++++ .github/workflows/main.yml | 2 +- package.json | 2 +- template/base/package.json | 3 +++ template/clients/js/clients/js/package.json.njk | 4 ---- 5 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 .changeset/wise-poems-think.md diff --git a/.changeset/wise-poems-think.md b/.changeset/wise-poems-think.md new file mode 100644 index 0000000..eb8b5cd --- /dev/null +++ b/.changeset/wise-poems-think.md @@ -0,0 +1,5 @@ +--- +"create-solana-program": patch +--- + +Use Node v20 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e91dcce..861ada2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -113,7 +113,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 20 cache: "pnpm" - name: Install Dependencies run: pnpm install --frozen-lockfile diff --git a/package.json b/package.json index bf09106..ac2f428 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "template" ], "engines": { - "node": ">=v18.0.0" + "node": ">=v20.0.0" }, "scripts": { "build": "./scripts/build.mjs", diff --git a/template/base/package.json b/template/base/package.json index 882841a..966d265 100644 --- a/template/base/package.json +++ b/template/base/package.json @@ -16,5 +16,8 @@ "typescript": "^5.5.2", "zx": "^7.2.3" }, + "engines": { + "node": ">=v20.0.0" + }, "packageManager": "pnpm@9.1.0" } diff --git a/template/clients/js/clients/js/package.json.njk b/template/clients/js/clients/js/package.json.njk index 2b7f4df..93f875d 100644 --- a/template/clients/js/clients/js/package.json.njk +++ b/template/clients/js/clients/js/package.json.njk @@ -50,16 +50,12 @@ "rimraf": "^5.0.5", "tsup": "^8.1.2", "typedoc": "^0.25.12", - "typedoc-plugin-missing-exports": "^2.2.0", "typescript": "^5.5.3" }, "ava": { "nodeArguments": [ "--no-warnings" ], - "require": [ - "@solana/webcrypto-ed25519-polyfill" - ], "typescript": { "compile": false, "rewritePaths": { From b78d1036777070c901574c3c3cf77bae4ef8efa4 Mon Sep 17 00:00:00 2001 From: Loris Leiva Date: Thu, 10 Oct 2024 11:10:09 +0100 Subject: [PATCH 2/2] Update more versions in CI --- .github/workflows/main.yml | 7 ++++--- template/base/.github/actions/setup/action.yml.njk | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 861ada2..dd00ffa 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,6 +8,7 @@ on: env: ANCHOR_VERSION: 0.30.0 + NODE_VERSION : 20 SOLANA_VERSION: 1.18.18 TOOLCHAIN: 1.75.0 @@ -23,7 +24,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v4 with: - node-version: 18 + node-version: ${{ env.NODE_VERSION }} cache: "pnpm" - name: Install dependencies run: pnpm install --frozen-lockfile @@ -54,7 +55,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v4 with: - node-version: 18 + node-version: ${{ env.NODE_VERSION }} cache: "pnpm" - name: Install dependencies run: pnpm install --frozen-lockfile @@ -113,7 +114,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v4 with: - node-version: 20 + node-version: ${{ env.NODE_VERSION }} cache: "pnpm" - name: Install Dependencies run: pnpm install --frozen-lockfile diff --git a/template/base/.github/actions/setup/action.yml.njk b/template/base/.github/actions/setup/action.yml.njk index 0c17c8b..bdbd118 100644 --- a/template/base/.github/actions/setup/action.yml.njk +++ b/template/base/.github/actions/setup/action.yml.njk @@ -34,7 +34,7 @@ runs: - name: Setup Node.js uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 20 cache: 'pnpm' - name: Install Dependencies