Skip to content

Commit 6b863d9

Browse files
authored
Merge branch 'master' into mixed-support
2 parents 0e1577b + 0628b99 commit 6b863d9

File tree

11 files changed

+781
-2431
lines changed

11 files changed

+781
-2431
lines changed

.devcontainer/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.191.1/containers/javascript-node/.devcontainer/base.Dockerfile
22

3-
# [Choice] Node.js version: 18
4-
ARG VARIANT="18"
3+
# [Choice] Node.js version: 22
4+
ARG VARIANT="22"
55
FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:1-${VARIANT}
66

77
# Install chromium and point the CHROME_BIN environment variable to it

.github/workflows/ci.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ jobs:
2121
- windows-latest
2222
name: Run on ${{ matrix.os }}
2323
steps:
24-
- uses: actions/checkout@v3
24+
- uses: actions/checkout@v4
2525

2626
- name: Setup node
27-
uses: actions/setup-node@v3
27+
uses: actions/setup-node@v4
2828
with:
29-
node-version: 18
29+
node-version: 22
3030

3131
- uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
3232
name: Install pnpm

.github/workflows/publish.yaml

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,66 @@
1-
name: "Publish"
1+
name: 'Publish'
22

33
on:
44
workflow_dispatch:
55
inputs:
66
next_version:
7-
type: "string"
8-
description: "version (e.g. 3.4.0-alpha.0)"
7+
type: 'string'
8+
description: 'version (e.g. 3.4.0-alpha.0)'
99
required: true
1010
skip_publish:
11-
type: "boolean"
12-
description: "mark in case only the version update shall be executed, skipping the release to npm"
11+
type: 'boolean'
12+
description: 'mark in case only the version update shall be executed, skipping the release to npm'
1313
required: true
1414
skip_push:
15-
type: "boolean"
16-
description: "mark in case the version update shall not be pushed back to the repository"
15+
type: 'boolean'
16+
description: 'mark in case the version update shall not be pushed back to the repository'
1717
required: true
1818
stable_release:
19-
type: "boolean"
20-
description: "mark in case this is a full stable release (flag is ignored in case publish is skipped)"
19+
type: 'boolean'
20+
description: 'mark in case this is a full stable release (flag is ignored in case publish is skipped)'
2121
required: true
2222

2323
jobs:
2424
publish:
2525
permissions:
26-
contents: "write"
27-
id-token: "write"
28-
runs-on: "ubuntu-latest"
26+
contents: 'write'
27+
id-token: 'write'
28+
runs-on: 'ubuntu-latest'
2929
steps:
30-
- uses: "actions/checkout@v4"
30+
- uses: 'actions/checkout@v4'
3131
with:
32-
token: "${{ secrets.JSONFORMS_PUBLISH_PAT }}"
32+
token: '${{ secrets.JSONFORMS_PUBLISH_PAT }}'
3333

34-
- name: "Configure Git Credentials"
34+
- name: 'Configure Git Credentials'
3535
run: |
3636
git config user.name "jsonforms-publish[bot]"
3737
git config user.email "jsonforms-publish@eclipsesource.com"
3838
39-
- name: "Setup node"
40-
uses: "actions/setup-node@v3"
39+
- name: 'Setup node'
40+
uses: 'actions/setup-node@v4'
4141
with:
42-
node-version: "18"
43-
registry-url: "https://registry.npmjs.org"
42+
node-version: '22'
43+
registry-url: 'https://registry.npmjs.org'
4444

4545
- uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
4646
name: Install pnpm
4747
id: pnpm-install
4848
with:
4949
run_install: false
5050

51-
- name: "Install Packages"
52-
run: "pnpm i --frozen-lockfile"
51+
- name: 'Install Packages'
52+
run: 'pnpm i --frozen-lockfile'
5353

54-
- name: "Build"
55-
run: "pnpm run build"
54+
- name: 'Build'
55+
run: 'pnpm run build'
5656

57-
- name: "Test"
58-
run: "pnpm run test"
57+
- name: 'Test'
58+
run: 'pnpm run test'
5959

60-
- name: "Versioning"
61-
run: "pnpm exec lerna version ${{ github.event.inputs.next_version }} --no-push --force-publish --yes"
60+
- name: 'Versioning'
61+
run: 'pnpm exec lerna version ${{ github.event.inputs.next_version }} --no-push --force-publish --yes'
6262

63-
- name: "Adjust PeerDependencies"
63+
- name: 'Adjust PeerDependencies'
6464
run: |
6565
cd packages/angular && pnpm pkg set peerDependencies.@jsonforms/core="${{ github.event.inputs.next_version }}"
6666
cd ../angular-material && pnpm pkg set peerDependencies.@jsonforms/core="${{ github.event.inputs.next_version }}" && pnpm pkg set peerDependencies.@jsonforms/angular="${{ github.event.inputs.next_version }}"
@@ -72,20 +72,20 @@ jobs:
7272
cd ../vue-vanilla && pnpm pkg set peerDependencies.@jsonforms/core="${{ github.event.inputs.next_version }}" && pnpm pkg set peerDependencies.@jsonforms/vue="${{ github.event.inputs.next_version }}"
7373
cd ../vue-vuetify && pnpm pkg set peerDependencies.@jsonforms/core="${{ github.event.inputs.next_version }}" && pnpm pkg set peerDependencies.@jsonforms/vue="${{ github.event.inputs.next_version }}"
7474
75-
- name: "Tag and Commit"
75+
- name: 'Tag and Commit'
7676
run: |
7777
git add -A && git commit --amend --no-edit
7878
git tag v${{ github.event.inputs.next_version }} -f
7979
80-
- name: "push"
81-
if: "github.event.inputs.skip_push == 'false'"
80+
- name: 'push'
81+
if: github.event.inputs.skip_push == 'false'
8282
run: |
8383
git push
8484
git push origin v${{ github.event.inputs.next_version }}
8585
86-
- name: "Publish to npm"
87-
if: "github.event.inputs.skip_publish == 'false'"
86+
- name: 'Publish to npm'
87+
if: github.event.inputs.skip_publish == 'false'
8888
run: "pnpm publish --recursive ${{ github.event.inputs.stable_release == 'true' && ' ' || '--tag next' }}"
8989
env:
90-
NODE_AUTH_TOKEN: "${{ secrets.NPM_TOKEN }}"
91-
NPM_CONFIG_PROVENANCE: "true"
90+
NODE_AUTH_TOKEN: '${{ secrets.NPM_TOKEN }}'
91+
NPM_CONFIG_PROVENANCE: 'true'

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Independently of the assigned milestone, contributions are always accepted and a
4343

4444
### First time setup
4545

46-
- Install [node.js](https://nodejs.org/) (only Node v18.19+ < 19 is currently supported)
46+
- Install [node.js](https://nodejs.org/) (only Node v22+ < 23 is currently supported)
4747
- Install pnpm: <https://pnpm.io/installation> (use pnpm 10.4.1+) or use [corepack](https://nodejs.org/docs/latest-v18.x/api/corepack.html) to enable the recommended version
4848
- Clone this repository
4949
- Install dependencies: `pnpm i --frozen-lockfile`

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"name": "jsonforms-monorepo",
33
"engines": {
4-
"node": "^18.19.0",
4+
"node": "^22",
55
"pnpm": "^10.4.1"
66
},
7-
"packageManager": "pnpm@10.4.1+sha256.4b702887986995933d4300836b04d6d02a43bc72b52e4f7e93a4ca608b959197",
7+
"packageManager": "pnpm@10.5.2+sha512.da9dc28cd3ff40d0592188235ab25d3202add8a207afbedc682220e4a0029ffbff4562102b9e6e46b4e3f9e8bd53e6d05de48544b0c57d4b0179e22c76d1199b",
88
"scripts": {
99
"lerna": "lerna",
1010
"preparePublish": "git clean -dfx && pnpm i --frozen-lockfile && pnpm run clean && pnpm run build && pnpm run doc && pnpm run test",

packages/angular-material/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
"@ngtools/webpack": "^18.0.0",
104104
"@types/jasmine": "~3.8.0",
105105
"@types/lodash": "4.14.149",
106-
"@types/node": "^18.19.4",
106+
"@types/node": "^22.13.8",
107107
"@typescript-eslint/eslint-plugin": "^5.54.1",
108108
"@typescript-eslint/parser": "^5.54.1",
109109
"babel-loader": "^8.0.6",

packages/examples/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
},
5252
"devDependencies": {
5353
"@jsonforms/core": "workspace:*",
54-
"@types/node": "^18.19.4",
54+
"@types/node": "^22.13.8",
5555
"@typescript-eslint/eslint-plugin": "^5.54.1",
5656
"@typescript-eslint/parser": "^5.54.1",
5757
"eslint": "^8.56.0",

packages/vue-vanilla/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"@types/chai": "^4.2.11",
6161
"@types/jest": "^27.4.1",
6262
"@types/mocha": "^5.2.4",
63-
"@types/node": "^18.19.4",
63+
"@types/node": "^22.13.8",
6464
"@typescript-eslint/eslint-plugin": "^5.54.1",
6565
"@typescript-eslint/parser": "^5.54.1",
6666
"@vue/cli-plugin-babel": "~5.0.8",

packages/vue-vuetify/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
"@tsconfig/node20": "^20.1.4",
7878
"@types/jsdom": "^21.1.6",
7979
"@types/lodash": "^4.14.172",
80-
"@types/node": "^20.12.5",
80+
"@types/node": "^22.13.8",
8181
"@types/splitpanes": "^2.2.6",
8282
"@vitejs/plugin-vue": "^5.0.4",
8383
"@vitest/coverage-v8": "^1.6.0",

packages/vue/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"@jsonforms/core": "workspace:*",
5454
"@rollup/plugin-alias": "^3.1.8",
5555
"@types/jest": "^27.4.1",
56-
"@types/node": "^18.19.4",
56+
"@types/node": "^22.13.8",
5757
"@typescript-eslint/eslint-plugin": "^5.54.1",
5858
"@typescript-eslint/parser": "^5.54.1",
5959
"@vue/cli-plugin-babel": "~5.0.8",

0 commit comments

Comments
 (0)