Skip to content
Open
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
8 changes: 8 additions & 0 deletions MIGRATION.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Migration guide

## Migrating to JSON Forms 3.7

### Angular support now targets Angular 19 and Angular 20

When using JSON Forms 3.7, your Angular application now needs to target Angular 19 or 20.

Use JSON Forms 3.6 if you need to stay on Angular 18.

## Migrating to JSON Forms 3.6

### UI schema type changes
Expand Down
2 changes: 0 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
"build:examples-app": "lerna run build:examples-app && node packages/examples-app/prepare-examples-app.js"
},
"devDependencies": {
"@angular/core": "^18.0.0",
"@angular/cli": "^18.0.0",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.5",
"@babel/plugin-proposal-optional-chaining": "^7.16.5",
"@istanbuljs/nyc-config-typescript": "^1.0.2",
Expand Down
24 changes: 13 additions & 11 deletions packages/angular-material/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ module.exports = {
'@angular-eslint/component-class-suffix': 'off',
'@angular-eslint/directive-class-suffix': 'off',
'@angular-eslint/no-conflicting-lifecycle': 'warn',
// Starting with Angular 19, non-standalone components produce a lint error. Reduce to warning until we migrate.
'@angular-eslint/prefer-standalone': 'warn',
'@typescript-eslint/no-explicit-any': 'off',
// Base rule must be disabled to avoid incorrect errors
'no-unused-vars': 'off',
Expand All @@ -35,19 +37,19 @@ module.exports = {
],
// workaround for
// https://github.com/import-js/eslint-plugin-import/issues/1810:
"import/no-unresolved": [
"error",
'import/no-unresolved': [
'error',
{
ignore: [
"@angular/cdk/.*",
"@angular/core/.*",
"@angular/material/.*",
"@angular/platform-browser/.*",
"@angular/platform-browser-dynamic/.*",
"core-js/es7/.*",
"zone.js/.*",
]
}
'@angular/cdk/.*',
'@angular/core/.*',
'@angular/material/.*',
'@angular/platform-browser/.*',
'@angular/platform-browser-dynamic/.*',
'core-js/es7/.*',
'zone.js/.*',
],
},
],
},
};
18 changes: 5 additions & 13 deletions packages/angular-material/angular.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "../../node_modules/@angular/cli/lib/config/schema.json",
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"newProjectRoot": ".",
"projects": {
Expand All @@ -20,28 +20,23 @@
"outputPath": "example/dist/",
"index": "example/index.html",
"main": "example/main.ts",
"polyfills": [
"zone.js"
],
"polyfills": ["zone.js"],
"tsConfig": "tsconfig.example.json",
"inlineStyleLanguage": "scss",
"assets": [],
"styles": [
"./node_modules/@angular/material/prebuilt-themes/indigo-pink.css"
],
"scripts": [],
"allowedCommonJsDependencies": [
"lodash",
"hammerjs"
],
"allowedCommonJsDependencies": ["lodash", "hammerjs"],
"optimization": false,
"buildOptimizer": false
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"buildTarget": "example:build"
"buildTarget": "example:build"
}
}
}
Expand Down Expand Up @@ -72,10 +67,7 @@
"options": {
"karmaConfig": "karma.conf.js",
"tsConfig": "tsconfig.spec.json",
"polyfills": [
"zone.js",
"zone.js/testing"
]
"polyfills": ["zone.js", "zone.js/testing"]
}
}
}
Expand Down
57 changes: 29 additions & 28 deletions packages/angular-material/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@
]
},
"peerDependencies": {
"@angular/animations": "^18.0.0 || ^19.0.0 || ^20.0.0",
"@angular/cdk": "^18.0.0 || ^19.0.0 || ^20.0.0",
"@angular/common": "^18.0.0 || ^19.0.0 || ^20.0.0",
"@angular/core": "^18.0.0 || ^19.0.0 || ^20.0.0",
"@angular/forms": "^18.0.0 || ^19.0.0 || ^20.0.0",
"@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",
"@angular/animations": "^19.0.0 || ^20.0.0 || ^21.0.0-rc.0",
"@angular/cdk": "^19.0.0 || ^20.0.0 || ^21.0.0-rc.0",
"@angular/common": "^19.0.0 || ^20.0.0 || ^21.0.0-rc.0",
"@angular/core": "^19.0.0 || ^20.0.0 || ^21.0.0-rc.0",
"@angular/forms": "^19.0.0 || ^20.0.0 || ^21.0.0-rc.0",
"@angular/material": "^19.0.0 || ^20.0.0 || ^21.0.0-rc.0",
"@angular/platform-browser": "^19.0.0 || ^20.0.0 || ^21.0.0-rc.0",
"@angular/router": "^19.0.0 || ^20.0.0 || ^21.0.0-rc.0",
"@jsonforms/angular": "3.7.0-alpha.2",
"@jsonforms/core": "3.7.0-alpha.2",
"dayjs": "^1.11.10",
Expand All @@ -82,29 +82,30 @@
"lodash": "^4.17.21"
},
"devDependencies": {
"@angular-devkit/build-angular": "^18.0.0",
"@angular-devkit/core": "^18.0.0",
"@angular-eslint/eslint-plugin": "^18.0.0",
"@angular-eslint/eslint-plugin-template": "^18.0.0",
"@angular-eslint/schematics": "^18.0.0",
"@angular-eslint/template-parser": "^18.0.0",
"@angular/animations": "^18.0.0",
"@angular/cdk": "^18.0.0",
"@angular/common": "^18.0.0",
"@angular/compiler": "^18.0.0",
"@angular/compiler-cli": "^18.0.0",
"@angular/core": "^18.0.0",
"@angular/forms": "^18.0.0",
"@angular/material": "^18.0.0",
"@angular/platform-browser": "^18.0.0",
"@angular/platform-browser-dynamic": "^18.0.0",
"@angular/router": "^18.0.0",
"@angular-devkit/build-angular": "^19.0.0",
"@angular-devkit/core": "^19.0.0",
"@angular-eslint/eslint-plugin": "^19.0.0",
"@angular-eslint/eslint-plugin-template": "^19.0.0",
"@angular-eslint/schematics": "^19.0.0",
"@angular-eslint/template-parser": "^19.0.0",
"@angular/animations": "^19.0.0",
"@angular/cdk": "^19.0.0",
"@angular/cli": "^19.0.0",
"@angular/common": "^19.0.0",
"@angular/compiler": "^19.0.0",
"@angular/compiler-cli": "^19.0.0",
"@angular/core": "^19.0.0",
"@angular/forms": "^19.0.0",
"@angular/material": "^19.0.0",
"@angular/platform-browser": "^19.0.0",
"@angular/platform-browser-dynamic": "^19.0.0",
"@angular/router": "^19.0.0",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.5",
"@babel/plugin-proposal-optional-chaining": "^7.16.5",
"@jsonforms/angular": "workspace:*",
"@jsonforms/core": "workspace:*",
"@jsonforms/examples": "workspace:*",
"@ngtools/webpack": "^18.0.0",
"@ngtools/webpack": "^19.0.0",
"@types/jasmine": "~3.8.0",
"@types/lodash": "4.14.149",
"@types/node": "^22.13.8",
Expand All @@ -128,7 +129,7 @@
"karma-jasmine-html-reporter": "^1.7.0",
"karma-sourcemap-loader": "^0.3.8",
"karma-webpack": "^5.0.0",
"ng-packagr": "^18.0.0",
"ng-packagr": "^19.0.0",
"null-loader": "^0.1.1",
"nyc": "^15.1.0",
"prettier": "^2.8.4",
Expand All @@ -141,6 +142,6 @@
"typescript": "~5.5.0",
"webpack": "^5.78.0",
"yargs": "^17.7.2",
"zone.js": "~0.14.10"
"zone.js": "~0.15.0"
}
}
2 changes: 2 additions & 0 deletions packages/angular/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ module.exports = {
'@angular-eslint/component-class-suffix': 'off',
'@angular-eslint/directive-class-suffix': 'off',
'@angular-eslint/no-conflicting-lifecycle': 'warn',
// Starting with Angular 19, non-standalone components produce a lint error. Reduce to warning until we migrate.
'@angular-eslint/prefer-standalone': 'warn',
'@typescript-eslint/no-explicit-any': 'off',
// Base rule must be disabled to avoid incorrect errors
'no-unused-vars': 'off',
Expand Down
22 changes: 11 additions & 11 deletions packages/angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,20 +71,20 @@
"lodash": "^4.17.21"
},
"peerDependencies": {
"@angular/core": "^18.0.0 || ^19.0.0 || ^20.0.0",
"@angular/forms": "^18.0.0 || ^19.0.0 || ^20.0.0",
"@angular/core": "^19.0.0 || ^20.0.0 || ^21.0.0-rc.0",
"@angular/forms": "^19.0.0 || ^20.0.0 || ^21.0.0-rc.0",
"@jsonforms/core": "3.7.0-alpha.2",
"rxjs": "^6.6.0 || ^7.4.0"
},
"devDependencies": {
"@angular-eslint/eslint-plugin": "^18.0.0",
"@angular-eslint/eslint-plugin-template": "^18.0.0",
"@angular-eslint/schematics": "^18.0.0",
"@angular-eslint/template-parser": "^18.0.0",
"@angular/compiler": "^18.0.0",
"@angular/compiler-cli": "^18.0.0",
"@angular/core": "^18.0.0",
"@angular/forms": "^18.0.0",
"@angular-eslint/eslint-plugin": "^19.0.0",
"@angular-eslint/eslint-plugin-template": "^19.0.0",
"@angular-eslint/schematics": "^19.0.0",
"@angular-eslint/template-parser": "^19.0.0",
"@angular/compiler": "^19.0.0",
"@angular/compiler-cli": "^19.0.0",
"@angular/core": "^19.0.0",
"@angular/forms": "^19.0.0",
"@jsonforms/core": "workspace:*",
"@typescript-eslint/eslint-plugin": "^5.54.1",
"@typescript-eslint/parser": "^5.54.1",
Expand All @@ -94,7 +94,7 @@
"eslint-config-prettier": "^8.7.0",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-prettier": "^4.2.1",
"ng-packagr": "^18.0.0",
"ng-packagr": "^19.0.0",
"nyc": "^15.1.0",
"prettier": "^2.8.4",
"rimraf": "^3.0.2",
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 @@ -109,7 +109,7 @@
"rollup-plugin-postcss": "^4.0.2",
"splitpanes": "^3.1.5",
"typedoc": "~0.25.3",
"typescript": "~5.4.0",
"typescript": "~5.5.0",
"vite": "^5.4.19",
"vite-plugin-dts": "^3.9.1",
"vite-plugin-node-polyfills": "^0.21.0",
Expand Down
Loading