Skip to content

Commit

Permalink
chore: upgrade Angular v17 and Formly v6
Browse files Browse the repository at this point in the history
Extraction of title and description to avoid reference problems
with the schema.

* Upgrades Angular to version 17.
* Upgrades ngx-formly to version 6.
* Fixes multicheckbox.
* Fixes tests.
* Updates formToWidget to use new props property.
* Fixes resolve$ref function if the properties is undefined.
* Uses ngx-formly primeng.
* Updates editor.
* Fixes eslint.
* Fixes title and description on the editor.
* Updates angular templates with new syntax.

Co-Authored-by: Bertrand Zuchuat <[email protected]>
Co-Authored-by: Johnny Mariethoz <[email protected]>
  • Loading branch information
3 people committed Feb 29, 2024
1 parent 36621b6 commit f8b7365
Show file tree
Hide file tree
Showing 157 changed files with 13,636 additions and 23,653 deletions.
3 changes: 2 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@
"style": "camelCase",
"type": "attribute"
}
]
],
"@angular-eslint/component-class-suffix": ["off"]
}
},
{
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ jobs:

strategy:
matrix:
node-version: [14.x, 16.x]
node-version: [18.x, 20.x]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- name: install package
run: |
npm install -g @angular/cli@14
npm install -g @angular/cli@17
npm ci
- name: run tests
run: |
Expand Down
21 changes: 14 additions & 7 deletions angular.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"defaultProject": "@rero/ng-core",
"projects": {
"@rero/ng-core": {
"projectType": "library",
Expand Down Expand Up @@ -51,6 +50,12 @@
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"allowedCommonJsDependencies": [
"crypto-js",
"easymde",
"js-generate-password",
"moment"
],
"outputPath": "dist/ng-core-tester",
"index": "projects/ng-core-tester/src/index.html",
"main": "projects/ng-core-tester/src/main.ts",
Expand All @@ -62,10 +67,12 @@
],
"styles": [
"projects/ng-core-tester/src/styles.scss",
"node_modules/ngx-bootstrap/datepicker/bs-datepicker.css",
"node_modules/primeicons/primeicons.css",
"node_modules/primeng/resources/themes/lara-light-blue/theme.css",
"node_modules/primeng/resources/primeng.min.css"
"node_modules/primeng/resources/primeng.min.css",
"node_modules/primeflex/primeflex.min.css",
"node_modules/primeicons/primeicons.css",
"node_modules/ngx-spinner/animations/ball-zig-zag.css",
"node_modules/ngx-bootstrap/datepicker/bs-datepicker.css"
],
"vendorChunk": true,
"extractLicenses": false,
Expand Down Expand Up @@ -107,7 +114,7 @@
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "ng-core-tester:build"
"buildTarget": "ng-core-tester:build"
},
"configurations": {
"localhost": {
Expand All @@ -117,14 +124,14 @@
"proxyConfig": "proxies/wiremockapi.json"
},
"production": {
"browserTarget": "ng-core-tester:build:production"
"buildTarget": "ng-core-tester:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "ng-core-tester:build"
"buildTarget": "ng-core-tester:build"
}
},
"test": {
Expand Down
Loading

0 comments on commit f8b7365

Please sign in to comment.