From faef40938b2ad025b47da131178706f06f2b5372 Mon Sep 17 00:00:00 2001 From: Tim Paine <3105306+timkpaine@users.noreply.github.com> Date: Wed, 27 May 2026 12:11:23 -0400 Subject: [PATCH] Move to pnpm 11, fix for unused node version var --- .gitignore | 3 +++ cppjswasm/.github/workflows/build.yaml.jinja | 4 ++-- cppjswasm/js/pnpm-workspace.yaml | 2 ++ js/.github/workflows/build.yaml.jinja | 4 ++-- js/js/pnpm-workspace.yaml | 2 ++ jupyter/.github/workflows/build.yaml.jinja | 4 ++-- jupyter/js/package.json.jinja | 7 +------ jupyter/js/pnpm-workspace.yaml | 6 ++++++ rustjswasm/.github/workflows/build.yaml.jinja | 4 ++-- rustjswasm/js/pnpm-workspace.yaml | 2 ++ 10 files changed, 24 insertions(+), 14 deletions(-) create mode 100644 cppjswasm/js/pnpm-workspace.yaml create mode 100644 js/js/pnpm-workspace.yaml create mode 100644 jupyter/js/pnpm-workspace.yaml create mode 100644 rustjswasm/js/pnpm-workspace.yaml diff --git a/.gitignore b/.gitignore index c317064..f63a234 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ AGENTS.md +ROADMAP.md +actions-ext + diff --git a/cppjswasm/.github/workflows/build.yaml.jinja b/cppjswasm/.github/workflows/build.yaml.jinja index 42975bf..75e9586 100644 --- a/cppjswasm/.github/workflows/build.yaml.jinja +++ b/cppjswasm/.github/workflows/build.yaml.jinja @@ -32,7 +32,7 @@ jobs: os: [ubuntu-latest, macos-latest, windows-latest] python-version: ["{{ python_version_primary }}"] cibuildwheel: ["cp{{python_version_primary.replace('.', '')}}"] - node-version: [20.x] + node-version: [22.x] steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 @@ -43,7 +43,7 @@ jobs: - uses: actions-ext/node/setup@main with: - version: 22.x + version: {% raw %}${{ matrix.node-version }}{% endraw %} - uses: mymindstorm/setup-emsdk@v16 diff --git a/cppjswasm/js/pnpm-workspace.yaml b/cppjswasm/js/pnpm-workspace.yaml new file mode 100644 index 0000000..5ed0b5a --- /dev/null +++ b/cppjswasm/js/pnpm-workspace.yaml @@ -0,0 +1,2 @@ +allowBuilds: + esbuild: true diff --git a/js/.github/workflows/build.yaml.jinja b/js/.github/workflows/build.yaml.jinja index 1c0eccc..d2cb3e0 100644 --- a/js/.github/workflows/build.yaml.jinja +++ b/js/.github/workflows/build.yaml.jinja @@ -31,7 +31,7 @@ jobs: matrix: os: [ubuntu-latest] python-version: ["{{ python_version_primary }}"] - node-version: [20.x] + node-version: [22.x] steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 @@ -42,7 +42,7 @@ jobs: - uses: actions-ext/node/setup@main with: - version: 22.x + version: {% raw %}${{ matrix.node-version }}{% endraw %} - name: Install dependencies run: make develop diff --git a/js/js/pnpm-workspace.yaml b/js/js/pnpm-workspace.yaml new file mode 100644 index 0000000..5ed0b5a --- /dev/null +++ b/js/js/pnpm-workspace.yaml @@ -0,0 +1,2 @@ +allowBuilds: + esbuild: true diff --git a/jupyter/.github/workflows/build.yaml.jinja b/jupyter/.github/workflows/build.yaml.jinja index 877e20d..680c015 100644 --- a/jupyter/.github/workflows/build.yaml.jinja +++ b/jupyter/.github/workflows/build.yaml.jinja @@ -31,7 +31,7 @@ jobs: matrix: os: [ubuntu-latest] python-version: ["{{ python_version_primary }}"] - node-version: [20.x] + node-version: [22.x] steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 @@ -42,7 +42,7 @@ jobs: - uses: actions-ext/node/setup@main with: - version: 22.x + version: {% raw %}${{ matrix.node-version }}{% endraw %} - name: Install dependencies run: make develop diff --git a/jupyter/js/package.json.jinja b/jupyter/js/package.json.jinja index 25068e7..ff1028b 100644 --- a/jupyter/js/package.json.jinja +++ b/jupyter/js/package.json.jinja @@ -73,10 +73,5 @@ "mkdirp": "^3.0.1", "prettier": "^3.8.1", "rimraf": "^6.1.3" - }, - "pnpm": { - "overrides": { - "webpack": "5.76.1" - } } -} +} \ No newline at end of file diff --git a/jupyter/js/pnpm-workspace.yaml b/jupyter/js/pnpm-workspace.yaml new file mode 100644 index 0000000..b8f6850 --- /dev/null +++ b/jupyter/js/pnpm-workspace.yaml @@ -0,0 +1,6 @@ +allowBuilds: + "@fortawesome/fontawesome-free": true + unrs-resolver: true + +overrides: + webpack: "5.76.1" \ No newline at end of file diff --git a/rustjswasm/.github/workflows/build.yaml.jinja b/rustjswasm/.github/workflows/build.yaml.jinja index 0e600f2..5597231 100644 --- a/rustjswasm/.github/workflows/build.yaml.jinja +++ b/rustjswasm/.github/workflows/build.yaml.jinja @@ -32,7 +32,7 @@ jobs: os: [ubuntu-latest, macos-latest, windows-latest] python-version: ["{{ python_version_primary }}"] cibuildwheel: ["cp{{python_version_primary.replace('.', '')}}"] - node-version: [20.x] + node-version: [22.x] steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 @@ -45,7 +45,7 @@ jobs: - uses: actions-ext/node/setup@main with: - version: 22.x + version: {% raw %}${{ matrix.node-version }}{% endraw %} - name: Install dependencies run: make develop diff --git a/rustjswasm/js/pnpm-workspace.yaml b/rustjswasm/js/pnpm-workspace.yaml new file mode 100644 index 0000000..5ed0b5a --- /dev/null +++ b/rustjswasm/js/pnpm-workspace.yaml @@ -0,0 +1,2 @@ +allowBuilds: + esbuild: true