From 799733fbdd4e0a9df51b76be959c7c59c718288f Mon Sep 17 00:00:00 2001 From: Lucas Koehler Date: Thu, 23 Oct 2025 16:14:36 +0200 Subject: [PATCH 1/2] Revert "v3.7.0-alpha.2" This reverts commit b816fb134d5f8dbc934a46b21d10cf1d7570041a. --- lerna.json | 2 +- packages/angular-material/package.json | 6 +++--- packages/angular/package.json | 4 ++-- packages/core/package.json | 2 +- packages/examples-app/package.json | 2 +- packages/examples-react/package.json | 2 +- packages/examples/package.json | 4 ++-- packages/material-renderers/package.json | 6 +++--- packages/react/package.json | 4 ++-- packages/vanilla-renderers/package.json | 6 +++--- packages/vue-vanilla/package.json | 6 +++--- packages/vue-vuetify/package.json | 6 +++--- packages/vue/package.json | 4 ++-- 13 files changed, 27 insertions(+), 27 deletions(-) diff --git a/lerna.json b/lerna.json index 6a2fd7d7c..667860d1c 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "3.7.0-alpha.2", + "version": "3.7.0-alpha.1", "npmClient": "pnpm", "useWorkspaces": true } diff --git a/packages/angular-material/package.json b/packages/angular-material/package.json index 094621eba..e4d839d4e 100644 --- a/packages/angular-material/package.json +++ b/packages/angular-material/package.json @@ -1,6 +1,6 @@ { "name": "@jsonforms/angular-material", - "version": "3.7.0-alpha.2", + "version": "3.7.0-alpha.1", "description": "Material Renderer Set for Angular module of JSON Forms", "repository": "https://github.com/eclipsesource/jsonforms", "bugs": "https://github.com/eclipsesource/jsonforms/issues", @@ -68,8 +68,8 @@ "@angular/material": "^18.0.0 || ^19.0.0 || ^20.0.0", "@angular/platform-browser": "^18.0.0 || ^19.0.0 || ^20.0.0", "@angular/router": "^18.0.0 || ^19.0.0 || ^20.0.0", - "@jsonforms/angular": "3.7.0-alpha.2", - "@jsonforms/core": "3.7.0-alpha.2", + "@jsonforms/angular": "3.7.0-alpha.1", + "@jsonforms/core": "3.7.0-alpha.1", "dayjs": "^1.11.10", "rxjs": "^6.6.0 || ^7.4.0" }, diff --git a/packages/angular/package.json b/packages/angular/package.json index 512888834..c68df098d 100644 --- a/packages/angular/package.json +++ b/packages/angular/package.json @@ -1,6 +1,6 @@ { "name": "@jsonforms/angular", - "version": "3.7.0-alpha.2", + "version": "3.7.0-alpha.1", "description": "Angular module of JSON Forms", "repository": "https://github.com/eclipsesource/jsonforms", "bugs": "https://github.com/eclipsesource/jsonforms/issues", @@ -69,7 +69,7 @@ "peerDependencies": { "@angular/core": "^18.0.0 || ^19.0.0 || ^20.0.0", "@angular/forms": "^18.0.0 || ^19.0.0 || ^20.0.0", - "@jsonforms/core": "3.7.0-alpha.2", + "@jsonforms/core": "3.7.0-alpha.1", "rxjs": "^6.6.0 || ^7.4.0" }, "devDependencies": { diff --git a/packages/core/package.json b/packages/core/package.json index a4b8ec7e3..7260297df 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@jsonforms/core", - "version": "3.7.0-alpha.2", + "version": "3.7.0-alpha.1", "description": "Core module of JSON Forms", "repository": "https://github.com/eclipsesource/jsonforms", "bugs": "https://github.com/eclipsesource/jsonforms/issues", diff --git a/packages/examples-app/package.json b/packages/examples-app/package.json index 06c6dbf2c..4528bcf99 100644 --- a/packages/examples-app/package.json +++ b/packages/examples-app/package.json @@ -1,6 +1,6 @@ { "name": "@jsonforms/examples-app", - "version": "3.7.0-alpha.2", + "version": "3.7.0-alpha.1", "private": true, "license": "MIT", "type": "module", diff --git a/packages/examples-react/package.json b/packages/examples-react/package.json index 84bc2c1a3..c36451961 100644 --- a/packages/examples-react/package.json +++ b/packages/examples-react/package.json @@ -1,6 +1,6 @@ { "name": "@jsonforms/examples-react", - "version": "3.7.0-alpha.2", + "version": "3.7.0-alpha.1", "private": true, "dependencies": { "@jsonforms/core": "workspace:*", diff --git a/packages/examples/package.json b/packages/examples/package.json index 84f671320..11b82432c 100644 --- a/packages/examples/package.json +++ b/packages/examples/package.json @@ -1,6 +1,6 @@ { "name": "@jsonforms/examples", - "version": "3.7.0-alpha.2", + "version": "3.7.0-alpha.1", "description": "JSON Forms Example Data", "repository": "https://github.com/eclipsesource/jsonforms", "bugs": "https://github.com/eclipsesource/jsonforms/issues", @@ -47,7 +47,7 @@ "lodash": "^4.17.21" }, "peerDependencies": { - "@jsonforms/core": "3.7.0-alpha.2" + "@jsonforms/core": "3.7.0-alpha.1" }, "devDependencies": { "@jsonforms/core": "workspace:*", diff --git a/packages/material-renderers/package.json b/packages/material-renderers/package.json index 3d6f6a421..687233164 100644 --- a/packages/material-renderers/package.json +++ b/packages/material-renderers/package.json @@ -1,6 +1,6 @@ { "name": "@jsonforms/material-renderers", - "version": "3.7.0-alpha.2", + "version": "3.7.0-alpha.1", "description": "Material Renderer Set for JSON Forms", "repository": "https://github.com/eclipsesource/jsonforms", "bugs": "https://github.com/eclipsesource/jsonforms/issues", @@ -86,8 +86,8 @@ "peerDependencies": { "@emotion/react": "^11.5.0", "@emotion/styled": "^11.3.0", - "@jsonforms/core": "3.7.0-alpha.2", - "@jsonforms/react": "3.7.0-alpha.2", + "@jsonforms/core": "3.7.0-alpha.1", + "@jsonforms/react": "3.7.0-alpha.1", "@mui/icons-material": "^7.0.0", "@mui/material": "^7.0.0", "@mui/x-date-pickers": "^8.0.0", diff --git a/packages/react/package.json b/packages/react/package.json index e04f2aed9..9d1b0beb6 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -1,6 +1,6 @@ { "name": "@jsonforms/react", - "version": "3.7.0-alpha.2", + "version": "3.7.0-alpha.1", "description": "React module of JSON Forms", "repository": "https://github.com/eclipsesource/jsonforms", "bugs": "https://github.com/eclipsesource/jsonforms/issues", @@ -86,7 +86,7 @@ "lodash": "^4.17.21" }, "peerDependencies": { - "@jsonforms/core": "3.7.0-alpha.2", + "@jsonforms/core": "3.7.0-alpha.1", "react": "^16.12.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" }, "optionalPeerDependencies": { diff --git a/packages/vanilla-renderers/package.json b/packages/vanilla-renderers/package.json index d9b74754b..e3f57ff0d 100644 --- a/packages/vanilla-renderers/package.json +++ b/packages/vanilla-renderers/package.json @@ -1,6 +1,6 @@ { "name": "@jsonforms/vanilla-renderers", - "version": "3.7.0-alpha.2", + "version": "3.7.0-alpha.1", "description": "Default Renderer Set for JSON Forms", "repository": "https://github.com/eclipsesource/jsonforms", "bugs": "https://github.com/eclipsesource/jsonforms/issues", @@ -47,8 +47,8 @@ "lodash": "^4.17.21" }, "peerDependencies": { - "@jsonforms/core": "3.7.0-alpha.2", - "@jsonforms/react": "3.7.0-alpha.2", + "@jsonforms/core": "3.7.0-alpha.1", + "@jsonforms/react": "3.7.0-alpha.1", "react": "^16.12.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" }, "devDependencies": { diff --git a/packages/vue-vanilla/package.json b/packages/vue-vanilla/package.json index fbdf8620a..5b9036ec9 100644 --- a/packages/vue-vanilla/package.json +++ b/packages/vue-vanilla/package.json @@ -1,6 +1,6 @@ { "name": "@jsonforms/vue-vanilla", - "version": "3.7.0-alpha.2", + "version": "3.7.0-alpha.1", "description": "Vue 3 Vanilla renderers for JSON Forms", "repository": "https://github.com/eclipsesource/jsonforms", "bugs": "https://github.com/eclipsesource/jsonforms/issues", @@ -93,8 +93,8 @@ "vue-jest": "^5.0.0-0" }, "peerDependencies": { - "@jsonforms/core": "3.7.0-alpha.2", - "@jsonforms/vue": "3.7.0-alpha.2", + "@jsonforms/core": "3.7.0-alpha.1", + "@jsonforms/vue": "3.7.0-alpha.1", "vue": "^3.5.0" } } diff --git a/packages/vue-vuetify/package.json b/packages/vue-vuetify/package.json index 3c0dd6ec8..b020f96c5 100644 --- a/packages/vue-vuetify/package.json +++ b/packages/vue-vuetify/package.json @@ -1,6 +1,6 @@ { "name": "@jsonforms/vue-vuetify", - "version": "3.7.0-alpha.2", + "version": "3.7.0-alpha.1", "description": "Vue Vuetify renderers for JSON Forms", "repository": "https://github.com/eclipsesource/jsonforms", "bugs": "https://github.com/eclipsesource/jsonforms/issues", @@ -58,8 +58,8 @@ "type-check": "vue-tsc --build --force" }, "peerDependencies": { - "@jsonforms/core": "3.7.0-alpha.2", - "@jsonforms/vue": "3.7.0-alpha.2", + "@jsonforms/core": "3.7.0-alpha.1", + "@jsonforms/vue": "3.7.0-alpha.1", "ajv": "^8.6.1", "dayjs": "^1.10.6", "lodash": "^4.17.21", diff --git a/packages/vue/package.json b/packages/vue/package.json index 0f33c4bb0..77c6a7d3c 100644 --- a/packages/vue/package.json +++ b/packages/vue/package.json @@ -1,6 +1,6 @@ { "name": "@jsonforms/vue", - "version": "3.7.0-alpha.2", + "version": "3.7.0-alpha.1", "description": "Vue 3 module of JSON Forms", "repository": "https://github.com/eclipsesource/jsonforms", "bugs": "https://github.com/eclipsesource/jsonforms/issues", @@ -85,7 +85,7 @@ "vue": "^3.5.17" }, "peerDependencies": { - "@jsonforms/core": "3.7.0-alpha.2", + "@jsonforms/core": "3.7.0-alpha.1", "vue": "^3.5.0" } } From 783eff564b3f88dd96f6ad83d1f0b1128d97bc68 Mon Sep 17 00:00:00 2001 From: Lucas Koehler Date: Thu, 23 Oct 2025 16:27:09 +0200 Subject: [PATCH 2/2] ci: Add npm scope and move up pnpm setup in publish workflow Authentication via OIDC for NPM's trusted publishing may need to explicitly define scope if it doesn't match the repository owner. This is the case here because the repository owner is eclipsesource. Move pnpm setup before node setup to avoid pnpm overriding .npmrc changes done by node setup for trusted publishing --- .github/workflows/publish.yaml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 31046aa9b..f4164262b 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -36,18 +36,19 @@ jobs: git config user.name "jsonforms-publish[bot]" git config user.email "jsonforms-publish@eclipsesource.com" - - name: 'Setup node' - uses: 'actions/setup-node@v4' - with: - node-version: '22' - registry-url: 'https://registry.npmjs.org' - - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0 name: Install pnpm id: pnpm-install with: run_install: false + - name: 'Setup node' + uses: 'actions/setup-node@v4' + with: + node-version: '22' + registry-url: 'https://registry.npmjs.org' + scope: '@jsonforms' # ensure OIDC token is tied to the scope + - name: 'Install Packages' run: 'pnpm i --frozen-lockfile'