Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/upgrade to angular 19 #2395

Closed
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
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
"build:examples-app": "lerna run build:examples-app && node packages/examples-app/prepare-examples-app.js"
},
"devDependencies": {
"@angular/core": "^17.0.0",
"@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 All @@ -44,7 +45,7 @@
"ts-loader": "^9.5.1",
"ts-node": "^10.4.0",
"tslib": "^2.5.0",
"typescript": "~5.2.2",
"typescript": "~5.5.0",
"webpack": "^5.78.0",
"webpack-merge": "^5.10.0"
}
Expand Down
81 changes: 81 additions & 0 deletions packages/angular-material/angular.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
{
"$schema": "../../node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"newProjectRoot": ".",
"projects": {
"example": {
"projectType": "application",
"schematics": {
"@schematics/angular:component": {
"style": "scss"
}
},
"root": "example",
"sourceRoot": "example",
"prefix": "app",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
lucas-koehler marked this conversation as resolved.
Show resolved Hide resolved
"outputPath": "example/dist/",
"index": "example/index.html",
"main": "example/main.ts",
"polyfills": [
"zone.js"
],
"tsConfig": "tsconfig.example.json",
"inlineStyleLanguage": "scss",
"assets": [],
"styles": [
"./node_modules/@angular/material/prebuilt-themes/indigo-pink.css"
],
"scripts": [],
"allowedCommonJsDependencies": [
"lodash",
"hammerjs"
],
"optimization": false,
"buildOptimizer": false
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server"
}
}
},
"angular-material": {
"projectType": "library",
"root": ".",
"sourceRoot": ".",
"prefix": "lib",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:ng-packagr",
"options": {
"project": "ng-package.json"
},
"configurations": {
"production": {
"tsConfig": "tsconfig.json"
},
"development": {
"tsConfig": "tsconfig.json"
}
},
"defaultConfiguration": "production"
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"karmaConfig": "karma.conf.js",
"tsConfig": "tsconfig.spec.json",
"polyfills": [
"zone.js",
"zone.js/testing"
]
}
}
}
}
}
}
73 changes: 0 additions & 73 deletions packages/angular-material/build-example.js

This file was deleted.

11 changes: 0 additions & 11 deletions packages/angular-material/build-package.js

This file was deleted.

1 change: 1 addition & 0 deletions packages/angular-material/example/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ const itemTester: UISchemaTester = (_schema, schemaPath, _path) => {
[readonly]="readonly"
></jsonforms>
`,
standalone: false,
})
export class AppComponent {
readonly renderers = angularMaterialRenderers;
Expand Down
2 changes: 1 addition & 1 deletion packages/angular-material/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ module.exports = function (config) {
},
reporters: ['progress', 'kjhtml', 'dots'],

browsers: [ config.singleRun ? 'ChromeHeadlessNoSandbox' : 'Chrome' ],
browsers: [ 'ChromeHeadlessNoSandbox' ],
customLaunchers: {
ChromeHeadlessNoSandbox: {
base: 'ChromeHeadless',
Expand Down
72 changes: 36 additions & 36 deletions packages/angular-material/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,18 +37,18 @@
"module": "./lib/fesm2022/jsonforms-angular-material.mjs",
"typings": "./lib/index.d.ts",
"scripts": {
"build": "node ./build-package.js",
"build:examples-app": "pnpm run build && node ./build-example.js",
"build": "ng build",
"build:examples-app": "pnpm run build && ng build --project=example",
"dev": "pnpm run build:examples-app && npx http-server ./example/dist/ -c-1 -o",
"clean": "rimraf lib coverage dist .nyc_output 2> /dev/null",
"clean": "rimraf lib coverage example/dist .nyc_output 2> /dev/null",
"lint": "eslint .",
"lint:fix": "eslint --fix .",
"report": "nyc report --reporter=html",
"doc": "typedoc --name 'JSON Forms Angular Material Renderers' --out docs src",
"test-dbg": "node ./test-runner",
"test": "node ./test-runner --single-run",
"test-ci": "node ./test-runner --single-run",
"test-cov": "node ./test-runner --coverage --single-run",
"test-dbg": "ng test",
"test": "ng test --watch=false",
"test-ci": "ng test --watch=false --browsers ChromeHeadlessNoSandbox",
"test-cov": "ng test --watch=false --code-coverage --browsers ChromeHeadlessNoSandbox",
"e2e": "npm run e2e-update && npm run e2e-test",
"e2e-test": "protractor ./test-config/protractor.conf.js",
"e2e-update": "webdriver-manager update --standalone false --gecko false"
Expand All @@ -60,14 +60,14 @@
]
},
"peerDependencies": {
lucas-koehler marked this conversation as resolved.
Show resolved Hide resolved
"@angular/animations": "^17.0.0 || ^18.0.0",
"@angular/cdk": "^17.0.0 || ^18.0.0",
"@angular/common": "^17.0.0 || ^18.0.0",
"@angular/core": "^17.0.0 || ^18.0.0",
"@angular/forms": "^17.0.0 || ^18.0.0",
"@angular/material": "^17.0.0 || ^18.0.0",
"@angular/platform-browser": "^17.0.0 || ^18.0.0",
"@angular/router": "^17.0.0 || ^18.0.0",
"@angular/animations": "^18.0.0 || ^19.0.0",
"@angular/cdk": "^18.0.0 || ^19.0.0",
"@angular/common": "^18.0.0 || ^19.0.0",
"@angular/core": "^18.0.0 || ^19.0.0",
"@angular/forms": "^18.0.0 || ^19.0.0",
"@angular/material": "^18.0.0 || ^19.0.0",
"@angular/platform-browser": "^18.0.0 || ^19.0.0",
"@angular/router": "^18.0.0 || ^19.0.0",
"@jsonforms/angular": "3.4.1",
"@jsonforms/core": "3.4.1",
"dayjs": "^1.11.10",
Expand All @@ -78,29 +78,29 @@
"lodash": "^4.17.21"
},
"devDependencies": {
"@angular-devkit/build-angular": "^17.0.0",
"@angular-devkit/core": "^17.0.0",
"@angular-eslint/eslint-plugin": "^17.0.0",
"@angular-eslint/eslint-plugin-template": "^17.0.0",
"@angular-eslint/schematics": "^17.0.0",
"@angular-eslint/template-parser": "^17.0.0",
"@angular/animations": "^17.0.0",
"@angular/cdk": "^17.0.0",
"@angular/common": "^17.0.0",
"@angular/compiler": "^17.0.0",
"@angular/compiler-cli": "^17.0.0",
"@angular/core": "^17.0.0",
"@angular/forms": "^17.0.0",
"@angular/material": "^17.0.0",
"@angular/platform-browser": "^17.0.0",
"@angular/platform-browser-dynamic": "^17.0.0",
"@angular/router": "^17.0.0",
"@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",
"@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": "^17.0.0",
"@ngtools/webpack": "^18.0.0",
"@types/jasmine": "~3.8.0",
"@types/lodash": "4.14.149",
"@types/node": "^18.19.4",
Expand All @@ -124,7 +124,7 @@
"karma-jasmine-html-reporter": "^1.7.0",
"karma-sourcemap-loader": "^0.3.8",
"karma-webpack": "^5.0.0",
"ng-packagr": "^17.0.0",
"ng-packagr": "^18.0.0",
"null-loader": "^0.1.1",
"nyc": "^15.1.0",
"prettier": "^2.8.4",
Expand All @@ -134,9 +134,9 @@
"ts-loader": "^9.5.1",
"tslib": "^2.5.0",
"typedoc": "~0.25.3",
"typescript": "~5.2.2",
"typescript": "~5.5.0",
"webpack": "^5.78.0",
"yargs": "^17.7.2",
"zone.js": "~0.14.0"
"zone.js": "~0.14.10"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ import { map, startWith } from 'rxjs/operators';
`,
],
changeDetection: ChangeDetectionStrategy.OnPush,
standalone: false,
})
export class AutocompleteControlRenderer
extends JsonFormsControl
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ import { isBooleanControl, RankedTester, rankWith } from '@jsonforms/core';
`,
],
changeDetection: ChangeDetectionStrategy.OnPush,
standalone: false,
})
export class BooleanControlRenderer extends JsonFormsControl {
constructor(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ import { MatDatepicker } from '@angular/material/datepicker';
useClass: MyFormat,
},
],
standalone: false,
})
export class DateControlRenderer extends JsonFormsControl {
focused = false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ import merge from 'lodash/merge';
`,
],
changeDetection: ChangeDetectionStrategy.OnPush,
standalone: false,
})
export class NumberControlRenderer extends JsonFormsControl {
private readonly MAXIMUM_FRACTIONAL_DIGITS = 20;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ import { isRangeControl, RankedTester, rankWith } from '@jsonforms/core';
`,
],
changeDetection: ChangeDetectionStrategy.OnPush,
standalone: false,
})
export class RangeControlRenderer extends JsonFormsControl {
min: number;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ import { isStringControl, RankedTester, rankWith } from '@jsonforms/core';
`,
],
changeDetection: ChangeDetectionStrategy.OnPush,
standalone: false,
})
export class TextControlRenderer extends JsonFormsControl {
focused = false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ import { isMultiLineControl, RankedTester, rankWith } from '@jsonforms/core';
`,
],
changeDetection: ChangeDetectionStrategy.OnPush,
standalone: false,
})
export class TextAreaRenderer extends JsonFormsControl {
focused = false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ import {
</div>
`,
changeDetection: ChangeDetectionStrategy.OnPush,
standalone: false,
})
export class ToggleControlRenderer extends JsonFormsControl {
constructor(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ import {
`,
],
changeDetection: ChangeDetectionStrategy.OnPush,
standalone: false,
})
export class ArrayLayoutRenderer
extends JsonFormsAbstractControl<StatePropsOfArrayLayout>
Expand Down
Loading