Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.191.1/containers/javascript-node/.devcontainer/base.Dockerfile

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

# Install chromium and point the CHROME_BIN environment variable to it
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ jobs:
- windows-latest
name: Run on ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 22

- uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
name: Install pnpm
Expand Down
70 changes: 35 additions & 35 deletions .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
@@ -1,66 +1,66 @@
name: "Publish"
name: 'Publish'

on:
workflow_dispatch:
inputs:
next_version:
type: "string"
description: "version (e.g. 3.4.0-alpha.0)"
type: 'string'
description: 'version (e.g. 3.4.0-alpha.0)'
required: true
skip_publish:
type: "boolean"
description: "mark in case only the version update shall be executed, skipping the release to npm"
type: 'boolean'
description: 'mark in case only the version update shall be executed, skipping the release to npm'
required: true
skip_push:
type: "boolean"
description: "mark in case the version update shall not be pushed back to the repository"
type: 'boolean'
description: 'mark in case the version update shall not be pushed back to the repository'
required: true
stable_release:
type: "boolean"
description: "mark in case this is a full stable release (flag is ignored in case publish is skipped)"
type: 'boolean'
description: 'mark in case this is a full stable release (flag is ignored in case publish is skipped)'
required: true

jobs:
publish:
permissions:
contents: "write"
id-token: "write"
runs-on: "ubuntu-latest"
contents: 'write'
id-token: 'write'
runs-on: 'ubuntu-latest'
steps:
- uses: "actions/checkout@v4"
- uses: 'actions/checkout@v4'
with:
token: "${{ secrets.JSONFORMS_PUBLISH_PAT }}"
token: '${{ secrets.JSONFORMS_PUBLISH_PAT }}'

- name: "Configure Git Credentials"
- name: 'Configure Git Credentials'
run: |
git config user.name "jsonforms-publish[bot]"
git config user.email "[email protected]"

- name: "Setup node"
uses: "actions/setup-node@v3"
- name: 'Setup node'
uses: 'actions/setup-node@v4'
with:
node-version: "18"
registry-url: "https://registry.npmjs.org"
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: "Install Packages"
run: "pnpm i --frozen-lockfile"
- name: 'Install Packages'
run: 'pnpm i --frozen-lockfile'

- name: "Build"
run: "pnpm run build"
- name: 'Build'
run: 'pnpm run build'

- name: "Test"
run: "pnpm run test"
- name: 'Test'
run: 'pnpm run test'

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

- name: "Adjust PeerDependencies"
- name: 'Adjust PeerDependencies'
run: |
cd packages/angular && pnpm pkg set peerDependencies.@jsonforms/core="${{ github.event.inputs.next_version }}"
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 }}"
Expand All @@ -72,20 +72,20 @@ jobs:
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 }}"
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 }}"

- name: "Tag and Commit"
- name: 'Tag and Commit'
run: |
git add -A && git commit --amend --no-edit
git tag v${{ github.event.inputs.next_version }} -f

- name: "push"
if: "github.event.inputs.skip_push == 'false'"
- name: 'push'
if: github.event.inputs.skip_push == 'false'
run: |
git push
git push origin v${{ github.event.inputs.next_version }}

- name: "Publish to npm"
if: "github.event.inputs.skip_publish == 'false'"
- name: 'Publish to npm'
if: github.event.inputs.skip_publish == 'false'
run: "pnpm publish --recursive ${{ github.event.inputs.stable_release == 'true' && ' ' || '--tag next' }}"
env:
NODE_AUTH_TOKEN: "${{ secrets.NPM_TOKEN }}"
NPM_CONFIG_PROVENANCE: "true"
NODE_AUTH_TOKEN: '${{ secrets.NPM_TOKEN }}'
NPM_CONFIG_PROVENANCE: 'true'
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Independently of the assigned milestone, contributions are always accepted and a

### First time setup

- Install [node.js](https://nodejs.org/) (only Node v18.19+ < 19 is currently supported)
- Install [node.js](https://nodejs.org/) (only Node v22+ < 23 is currently supported)
- 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
- Clone this repository
- Install dependencies: `pnpm i --frozen-lockfile`
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "jsonforms-monorepo",
"engines": {
"node": "^18.19.0",
"node": "^22",
"pnpm": "^10.4.1"
},
"packageManager": "pnpm@10.4.1+sha256.4b702887986995933d4300836b04d6d02a43bc72b52e4f7e93a4ca608b959197",
"packageManager": "pnpm@10.5.2+sha512.da9dc28cd3ff40d0592188235ab25d3202add8a207afbedc682220e4a0029ffbff4562102b9e6e46b4e3f9e8bd53e6d05de48544b0c57d4b0179e22c76d1199b",
"scripts": {
"lerna": "lerna",
"preparePublish": "git clean -dfx && pnpm i --frozen-lockfile && pnpm run clean && pnpm run build && pnpm run doc && pnpm run test",
Expand Down
2 changes: 1 addition & 1 deletion packages/angular-material/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
"@ngtools/webpack": "^18.0.0",
"@types/jasmine": "~3.8.0",
"@types/lodash": "4.14.149",
"@types/node": "^18.19.4",
"@types/node": "^22.13.8",
"@typescript-eslint/eslint-plugin": "^5.54.1",
"@typescript-eslint/parser": "^5.54.1",
"babel-loader": "^8.0.6",
Expand Down
2 changes: 1 addition & 1 deletion packages/examples/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
},
"devDependencies": {
"@jsonforms/core": "workspace:*",
"@types/node": "^18.19.4",
"@types/node": "^22.13.8",
"@typescript-eslint/eslint-plugin": "^5.54.1",
"@typescript-eslint/parser": "^5.54.1",
"eslint": "^8.56.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/vue-vanilla/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"@types/chai": "^4.2.11",
"@types/jest": "^27.4.1",
"@types/mocha": "^5.2.4",
"@types/node": "^18.19.4",
"@types/node": "^22.13.8",
"@typescript-eslint/eslint-plugin": "^5.54.1",
"@typescript-eslint/parser": "^5.54.1",
"@vue/cli-plugin-babel": "~5.0.8",
Expand Down
2 changes: 1 addition & 1 deletion packages/vue-vuetify/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"@tsconfig/node20": "^20.1.4",
"@types/jsdom": "^21.1.6",
"@types/lodash": "^4.14.172",
"@types/node": "^20.12.5",
"@types/node": "^22.13.8",
"@types/splitpanes": "^2.2.6",
"@vitejs/plugin-vue": "^5.0.4",
"@vitest/coverage-v8": "^1.6.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"@jsonforms/core": "workspace:*",
"@rollup/plugin-alias": "^3.1.8",
"@types/jest": "^27.4.1",
"@types/node": "^18.19.4",
"@types/node": "^22.13.8",
"@typescript-eslint/eslint-plugin": "^5.54.1",
"@typescript-eslint/parser": "^5.54.1",
"@vue/cli-plugin-babel": "~5.0.8",
Expand Down
Loading