Skip to content

Commit

Permalink
Merge branch 'master' into angular-v15-no-flex-layout
Browse files Browse the repository at this point in the history
  • Loading branch information
JBBianchi committed Dec 16, 2023
2 parents 3ebb626 + da46b98 commit 6ec6c9d
Show file tree
Hide file tree
Showing 15 changed files with 143 additions and 141 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,14 @@ jobs:
contents: "write"
runs-on: "ubuntu-latest"
steps:
- uses: "actions/checkout@v3"
- uses: "actions/checkout@v4"
with:
token: "${{ secrets.JSONFORMS_PUBLISH_PAT }}"

- name: "Configure Git Credentials"
run: |
git config user.name "github-actions[bot]"
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
git config user.name "jsonforms-publish[bot]"
git config user.email "jsonforms-publish@eclipsesource.com"
- name: "Setup node"
uses: "actions/setup-node@v3"
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "3.2.0-alpha.3",
"version": "3.2.0-alpha.4",
"npmClient": "pnpm",
"useWorkspaces": true
}
8 changes: 4 additions & 4 deletions packages/angular-material/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jsonforms/angular-material",
"version": "3.2.0-alpha.3",
"version": "3.2.0-alpha.4",
"description": "Material Renderer Set for Angular module of JSON Forms",
"repository": "https://github.com/eclipsesource/jsonforms",
"bugs": "https://github.com/eclipsesource/jsonforms/issues",
Expand Down Expand Up @@ -69,9 +69,9 @@
"@angular/material": "^15.0.0 || ^16.0.0 || ^17.0.0",
"@angular/platform-browser": "^15.0.0 || ^16.0.0 || ^17.0.0",
"@angular/router": "^15.0.0 || ^16.0.0 || ^17.0.0",
"@jsonforms/angular": "3.2.0-alpha.3",
"@jsonforms/angular-test": "^3.2.0-alpha.3",
"@jsonforms/core": "3.2.0-alpha.3",
"@jsonforms/angular": "3.2.0-alpha.4",
"@jsonforms/angular-test": "^3.2.0-alpha.4",
"@jsonforms/core": "3.2.0-alpha.4",
"rxjs": "^6.6.0 || ^7.4.0"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/angular-test/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jsonforms/angular-test",
"version": "3.2.0-alpha.3",
"version": "3.2.0-alpha.4",
"private": true,
"main": "./lib/index.js",
"dependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/angular/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jsonforms/angular",
"version": "3.2.0-alpha.3",
"version": "3.2.0-alpha.4",
"description": "Angular module of JSON Forms",
"repository": "https://github.com/eclipsesource/jsonforms",
"bugs": "https://github.com/eclipsesource/jsonforms/issues",
Expand Down Expand Up @@ -71,7 +71,7 @@
"peerDependencies": {
"@angular/core": "^15.0.0 || ^16.0.0 || ^17.0.0",
"@angular/forms": "^15.0.0 || ^16.0.0 || ^17.0.0",
"@jsonforms/core": "3.2.0-alpha.3",
"@jsonforms/core": "3.2.0-alpha.4",
"rxjs": "^6.6.0 || ^7.4.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jsonforms/core",
"version": "3.2.0-alpha.3",
"version": "3.2.0-alpha.4",
"description": "Core module of JSON Forms",
"repository": "https://github.com/eclipsesource/jsonforms",
"bugs": "https://github.com/eclipsesource/jsonforms/issues",
Expand Down
2 changes: 1 addition & 1 deletion packages/examples-app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jsonforms/examples-app",
"version": "3.2.0-alpha.3",
"version": "3.2.0-alpha.4",
"private": true,
"license": "MIT",
"type": "module",
Expand Down
2 changes: 1 addition & 1 deletion packages/examples-react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jsonforms/examples-react",
"version": "3.2.0-alpha.3",
"version": "3.2.0-alpha.4",
"private": true,
"dependencies": {
"@jsonforms/core": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/examples/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jsonforms/examples",
"version": "3.2.0-alpha.3",
"version": "3.2.0-alpha.4",
"description": "JSON Forms Example Data",
"repository": "https://github.com/eclipsesource/jsonforms",
"bugs": "https://github.com/eclipsesource/jsonforms/issues",
Expand Down Expand Up @@ -47,7 +47,7 @@
"lodash": "^4.17.21"
},
"peerDependencies": {
"@jsonforms/core": "3.2.0-alpha.3"
"@jsonforms/core": "3.2.0-alpha.4"
},
"devDependencies": {
"@jsonforms/core": "workspace:*",
Expand Down
6 changes: 3 additions & 3 deletions packages/material-renderers/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jsonforms/material-renderers",
"version": "3.2.0-alpha.3",
"version": "3.2.0-alpha.4",
"description": "Material Renderer Set for JSON Forms",
"repository": "https://github.com/eclipsesource/jsonforms",
"bugs": "https://github.com/eclipsesource/jsonforms/issues",
Expand Down Expand Up @@ -85,8 +85,8 @@
"peerDependencies": {
"@emotion/react": "^11.4.1",
"@emotion/styled": "^11.3.0",
"@jsonforms/core": "3.2.0-alpha.3",
"@jsonforms/react": "3.2.0-alpha.3",
"@jsonforms/core": "3.2.0-alpha.4",
"@jsonforms/react": "3.2.0-alpha.4",
"@mui/icons-material": "^5.11.16",
"@mui/material": "^5.13.0",
"@mui/x-date-pickers": "^6.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jsonforms/react",
"version": "3.2.0-alpha.3",
"version": "3.2.0-alpha.4",
"description": "React module of JSON Forms",
"repository": "https://github.com/eclipsesource/jsonforms",
"bugs": "https://github.com/eclipsesource/jsonforms/issues",
Expand Down Expand Up @@ -86,7 +86,7 @@
"lodash": "^4.17.21"
},
"peerDependencies": {
"@jsonforms/core": "3.2.0-alpha.3",
"@jsonforms/core": "3.2.0-alpha.4",
"react": "^16.12.0 || ^17.0.0 || ^18.0.0"
},
"optionalPeerDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions packages/vanilla-renderers/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jsonforms/vanilla-renderers",
"version": "3.2.0-alpha.3",
"version": "3.2.0-alpha.4",
"description": "Default Renderer Set for JSON Forms",
"repository": "https://github.com/eclipsesource/jsonforms",
"bugs": "https://github.com/eclipsesource/jsonforms/issues",
Expand Down Expand Up @@ -47,8 +47,8 @@
"lodash": "^4.17.21"
},
"peerDependencies": {
"@jsonforms/core": "3.2.0-alpha.3",
"@jsonforms/react": "3.2.0-alpha.3",
"@jsonforms/core": "3.2.0-alpha.4",
"@jsonforms/react": "3.2.0-alpha.4",
"react": "^16.12.0 || ^17.0.0 || ^18.0.0"
},
"devDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions packages/vue-vanilla/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jsonforms/vue-vanilla",
"version": "3.2.0-alpha.3",
"version": "3.2.0-alpha.4",
"description": "Vue 3 Vanilla renderers for JSON Forms",
"repository": "https://github.com/eclipsesource/jsonforms",
"bugs": "https://github.com/eclipsesource/jsonforms/issues",
Expand Down Expand Up @@ -94,8 +94,8 @@
"vue-jest": "^5.0.0-0"
},
"peerDependencies": {
"@jsonforms/core": "3.2.0-alpha.3",
"@jsonforms/vue": "3.2.0-alpha.3",
"@jsonforms/core": "3.2.0-alpha.4",
"@jsonforms/vue": "3.2.0-alpha.4",
"vue": "^3.2.26"
}
}
4 changes: 2 additions & 2 deletions packages/vue/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jsonforms/vue",
"version": "3.2.0-alpha.3",
"version": "3.2.0-alpha.4",
"description": "Vue 3 module of JSON Forms",
"repository": "https://github.com/eclipsesource/jsonforms",
"bugs": "https://github.com/eclipsesource/jsonforms/issues",
Expand Down Expand Up @@ -86,7 +86,7 @@
"vue": "^3.2.26"
},
"peerDependencies": {
"@jsonforms/core": "3.2.0-alpha.3",
"@jsonforms/core": "3.2.0-alpha.4",
"vue": "^3.2.26"
}
}
Loading

0 comments on commit 6ec6c9d

Please sign in to comment.