Merge branch 'master' into ngpackagr

eclipsesource · Jan 4, 2024 · 189aec3 · 189aec3
2 parents cfdee87 + 0e4f7ed
commit 189aec3
Show file tree

Hide file tree

Showing 21 changed files with 13,769 additions and 4,802 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -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: 16
-ARG VARIANT="16"
+# [Choice] Node.js version: 18
+ARG VARIANT="18"
 FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:1-${VARIANT}
 
 # Install chromium and point the CHROME_BIN environment variable to it

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -4,9 +4,9 @@
   "name": "Node.js",
   "build": {
     "dockerfile": "Dockerfile",
-    // Update 'VARIANT' to pick a Node version: 16
+    // Update 'VARIANT' to pick a Node version: 18
     "args": {
-      "VARIANT": "16"
+      "VARIANT": "18"
     }
   },
   // Set *default* container specific settings.json values on container create.

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -20,7 +20,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
 
       - uses: pnpm/[email protected]
         name: Install pnpm

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -38,7 +38,7 @@ jobs:
       - name: "Setup node"
         uses: "actions/setup-node@v3"
         with:
-          node-version: "16"
+          node-version: "18"
           registry-url: "https://registry.npmjs.org"
 
       - uses: "pnpm/[email protected]"

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v16.20.1
+v18.19.0
diff --git a/README.md b/README.md
@@ -30,7 +30,7 @@ See our [migration guide](https://github.com/eclipsesource/jsonforms/blob/master
 
 ### First time setup
 
-- Install [node.js](https://nodejs.org/) (only Node v16.13+ < 17 is currently supported)
+- Install [node.js](https://nodejs.org/) (only Node v18.19+ < 19 is currently supported)
 - Install pnpm: <https://pnpm.io/installation> (use pnpm 8.6.2+)
 - Clone this repository
 - Install dependencies: `pnpm i --frozen-lockfile`

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.2.0-alpha.4",
+  "version": "3.2.0-beta.0",
   "npmClient": "pnpm",
   "useWorkspaces": true
 }
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "jsonforms-monorepo",
   "engines": {
-    "node": "^16.14",
+    "node": "^18.19.0",
     "pnpm": ">=7.13.4"
   },
   "scripts": {

diff --git a/packages/angular-material/package.json b/packages/angular-material/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/angular-material",
-  "version": "3.2.0-alpha.4",
+  "version": "3.2.0-beta.0",
   "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": "^16.0.0 || ^17.0.0",
     "@angular/platform-browser": "^16.0.0 || ^17.0.0",
     "@angular/router": "^16.0.0 || ^17.0.0",
-    "@jsonforms/angular": "3.2.0-alpha.4",
-    "@jsonforms/core": "3.2.0-alpha.4",
+    "@jsonforms/angular": "v3.2.0-beta.0",
+    "@jsonforms/core": "v3.2.0-beta.0",
     "rxjs": "^6.6.0 || ^7.4.0"
   },
   "dependencies": {
@@ -102,7 +102,7 @@
     "@ngtools/webpack": "^16.0.0",
     "@types/jasmine": "~3.8.0",
     "@types/lodash": "4.14.149",
-    "@types/node": "^18.10.0",
+    "@types/node": "^18.19.4",
     "@typescript-eslint/eslint-plugin": "^5.54.1",
     "@typescript-eslint/parser": "^5.54.1",
     "babel-loader": "^8.0.6",

diff --git a/packages/angular-test/package.json b/packages/angular-test/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/angular-test",
-  "version": "3.2.0-alpha.4",
+  "version": "3.2.0-beta.0",
   "private": true,
   "module": "./lib/fesm2022/jsonforms-angular-test.mjs",
   "typings": "./lib/index.d.ts",

diff --git a/packages/angular/package.json b/packages/angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/angular",
-  "version": "3.2.0-alpha.4",
+  "version": "3.2.0-beta.0",
   "description": "Angular module of JSON Forms",
   "repository": "https://github.com/eclipsesource/jsonforms",
   "bugs": "https://github.com/eclipsesource/jsonforms/issues",
@@ -70,7 +70,7 @@
   "peerDependencies": {
     "@angular/core": "^16.0.0 || ^17.0.0",
     "@angular/forms": "^16.0.0 || ^17.0.0",
-    "@jsonforms/core": "3.2.0-alpha.4",
+    "@jsonforms/core": "v3.2.0-beta.0",
     "rxjs": "^6.6.0 || ^7.4.0"
   },
   "devDependencies": {

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/core",
-  "version": "3.2.0-alpha.4",
+  "version": "3.2.0-beta.0",
   "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
@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/examples-app",
-  "version": "3.2.0-alpha.4",
+  "version": "3.2.0-beta.0",
   "private": true,
   "license": "MIT",
   "type": "module",

diff --git a/packages/examples-react/package.json b/packages/examples-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/examples-react",
-  "version": "3.2.0-alpha.4",
+  "version": "3.2.0-beta.0",
   "private": true,
   "dependencies": {
     "@jsonforms/core": "workspace:*",

diff --git a/packages/examples/package.json b/packages/examples/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/examples",
-  "version": "3.2.0-alpha.4",
+  "version": "3.2.0-beta.0",
   "description": "JSON Forms Example Data",
   "repository": "https://github.com/eclipsesource/jsonforms",
   "bugs": "https://github.com/eclipsesource/jsonforms/issues",
@@ -47,11 +47,11 @@
     "lodash": "^4.17.21"
   },
   "peerDependencies": {
-    "@jsonforms/core": "3.2.0-alpha.4"
+    "@jsonforms/core": "v3.2.0-beta.0"
   },
   "devDependencies": {
     "@jsonforms/core": "workspace:*",
-    "@types/node": "^16.18.34",
+    "@types/node": "^18.19.4",
     "@typescript-eslint/eslint-plugin": "^5.54.1",
     "@typescript-eslint/parser": "^5.54.1",
     "eslint": "^7.32.0",

diff --git a/packages/material-renderers/package.json b/packages/material-renderers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/material-renderers",
-  "version": "3.2.0-alpha.4",
+  "version": "3.2.0-beta.0",
   "description": "Material Renderer Set for JSON Forms",
   "repository": "https://github.com/eclipsesource/jsonforms",
   "bugs": "https://github.com/eclipsesource/jsonforms/issues",
@@ -85,8 +85,8 @@
   "peerDependencies": {
     "@emotion/react": "^11.4.1",
     "@emotion/styled": "^11.3.0",
-    "@jsonforms/core": "3.2.0-alpha.4",
-    "@jsonforms/react": "3.2.0-alpha.4",
+    "@jsonforms/core": "v3.2.0-beta.0",
+    "@jsonforms/react": "v3.2.0-beta.0",
     "@mui/icons-material": "^5.11.16",
     "@mui/material": "^5.13.0",
     "@mui/x-date-pickers": "^6.0.0",

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/react",
-  "version": "3.2.0-alpha.4",
+  "version": "3.2.0-beta.0",
   "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.2.0-alpha.4",
+    "@jsonforms/core": "v3.2.0-beta.0",
     "react": "^16.12.0 || ^17.0.0 || ^18.0.0"
   },
   "optionalPeerDependencies": {

diff --git a/packages/vanilla-renderers/package.json b/packages/vanilla-renderers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/vanilla-renderers",
-  "version": "3.2.0-alpha.4",
+  "version": "3.2.0-beta.0",
   "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.2.0-alpha.4",
-    "@jsonforms/react": "3.2.0-alpha.4",
+    "@jsonforms/core": "v3.2.0-beta.0",
+    "@jsonforms/react": "v3.2.0-beta.0",
     "react": "^16.12.0 || ^17.0.0 || ^18.0.0"
   },
   "devDependencies": {

diff --git a/packages/vue-vanilla/package.json b/packages/vue-vanilla/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/vue-vanilla",
-  "version": "3.2.0-alpha.4",
+  "version": "3.2.0-beta.0",
   "description": "Vue 3 Vanilla renderers for JSON Forms",
   "repository": "https://github.com/eclipsesource/jsonforms",
   "bugs": "https://github.com/eclipsesource/jsonforms/issues",
@@ -60,7 +60,7 @@
     "@types/chai": "^4.2.11",
     "@types/jest": "^27.4.1",
     "@types/mocha": "^5.2.4",
-    "@types/node": "^16.18.34",
+    "@types/node": "^18.19.4",
     "@typescript-eslint/eslint-plugin": "^5.54.1",
     "@typescript-eslint/parser": "^5.54.1",
     "@vue/cli-plugin-babel": "~4.5.19",
@@ -94,8 +94,8 @@
     "vue-jest": "^5.0.0-0"
   },
   "peerDependencies": {
-    "@jsonforms/core": "3.2.0-alpha.4",
-    "@jsonforms/vue": "3.2.0-alpha.4",
+    "@jsonforms/core": "v3.2.0-beta.0",
+    "@jsonforms/vue": "v3.2.0-beta.0",
     "vue": "^3.2.26"
   }
 }
diff --git a/packages/vue/package.json b/packages/vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/vue",
-  "version": "3.2.0-alpha.4",
+  "version": "3.2.0-beta.0",
   "description": "Vue 3 module of JSON Forms",
   "repository": "https://github.com/eclipsesource/jsonforms",
   "bugs": "https://github.com/eclipsesource/jsonforms/issues",
@@ -53,7 +53,7 @@
     "@jsonforms/core": "workspace:*",
     "@rollup/plugin-alias": "^3.1.8",
     "@types/jest": "^27.4.1",
-    "@types/node": "^16.18.34",
+    "@types/node": "^18.19.4",
     "@typescript-eslint/eslint-plugin": "^5.54.1",
     "@typescript-eslint/parser": "^5.54.1",
     "@vue/cli-plugin-babel": "~4.5.19",
@@ -86,7 +86,7 @@
     "vue": "^3.2.26"
   },
   "peerDependencies": {
-    "@jsonforms/core": "3.2.0-alpha.4",
+    "@jsonforms/core": "v3.2.0-beta.0",
     "vue": "^3.2.26"
   }
 }