Skip to content

Commit

Permalink
Merge pull request #312 from erikmom/feat-support-angular-18
Browse files Browse the repository at this point in the history
feat: Upgrades to Angular 18
  • Loading branch information
maxime1992 committed Jun 9, 2024
2 parents bc97dd8 + b8a181d commit 2aa7406
Show file tree
Hide file tree
Showing 6 changed files with 3,585 additions and 3,205 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 20.x
node-version: 20.14.x
- name: Install dependencies
run: yarn --frozen-lockfile --non-interactive --no-progress
- name: Lint Demo
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ npm i ngx-sub-form
| `15.x` | `8.0.0` |
| `16.x` | `9.0.0` |
| `17.x` | `10.0.0` |
| `18.x` | `11.0.0` |

# API

Expand Down
48 changes: 24 additions & 24 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,16 @@
},
"private": true,
"dependencies": {
"@angular/animations": "17.0.4",
"@angular/cdk": "17.0.1",
"@angular/common": "17.0.4",
"@angular/compiler": "17.0.4",
"@angular/core": "17.0.4",
"@angular/forms": "17.0.4",
"@angular/material": "17.0.1",
"@angular/platform-browser": "17.0.4",
"@angular/platform-browser-dynamic": "17.0.4",
"@angular/router": "17.0.4",
"@angular/animations": "18.0.1",
"@angular/cdk": "18.0.1",
"@angular/common": "18.0.1",
"@angular/compiler": "18.0.1",
"@angular/core": "18.0.1",
"@angular/forms": "18.0.1",
"@angular/material": "18.0.1",
"@angular/platform-browser": "18.0.1",
"@angular/platform-browser-dynamic": "18.0.1",
"@angular/router": "18.0.1",
"@types/uuid": "9.0.0",
"commitizen": "4.2.6",
"core-js": "3.23.1",
Expand All @@ -60,26 +60,26 @@
"zone.js": "0.14.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "17.0.3",
"@angular-eslint/builder": "17.1.0",
"@angular-eslint/eslint-plugin": "17.1.0",
"@angular-eslint/eslint-plugin-template": "17.1.0",
"@angular-eslint/schematics": "17.1.0",
"@angular-eslint/template-parser": "17.1.0",
"@angular/cli": "17.0.3",
"@angular/compiler-cli": "17.0.4",
"@angular/language-service": "17.0.4",
"@angular-devkit/build-angular": "18.0.2",
"@angular-eslint/builder": "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/cli": "18.0.2",
"@angular/compiler-cli": "18.0.1",
"@angular/language-service": "18.0.1",
"@types/jasmine": "4.3.1",
"@types/jasminewd2": "2.0.10",
"@types/lodash": "4.14.191",
"@types/lodash-es": "4.17.6",
"@types/node": "18.11.11",
"@typescript-eslint/eslint-plugin": "6.11.0",
"@typescript-eslint/parser": "6.11.0",
"@typescript-eslint/eslint-plugin": "7.11.0",
"@typescript-eslint/parser": "7.11.0",
"cypress": "12.0.2",
"cz-conventional-changelog": "3.3.0",
"embedme": "1.22.1",
"eslint": "8.54.0",
"eslint": "9.3.0",
"eslint-config-prettier": "9.0.0",
"eslint-plugin-import": "2.29.0",
"eslint-plugin-jsdoc": "46.9.0",
Expand All @@ -92,13 +92,13 @@
"karma-coverage-istanbul-reporter": "3.0.3",
"karma-jasmine": "5.1.0",
"karma-jasmine-html-reporter": "2.0.0",
"ng-packagr": "17.0.2",
"ng-packagr": "18.0.0",
"prettier": "2.7.1",
"semantic-release": "19.0.5",
"ts-node": "10.9.1",
"tsconfig-paths-webpack-plugin": "3.5.2",
"tsdef": "0.0.14",
"typescript": "5.2.2"
"typescript": "5.4.5"
},
"repository": {
"type": "git",
Expand Down
6 changes: 3 additions & 3 deletions projects/ngx-sub-form/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
"tslib": "^2.0.0"
},
"peerDependencies": {
"@angular/common": "^17.0.0",
"@angular/core": "^17.0.0",
"@angular/forms": "^17.0.0",
"@angular/common": "^18.0.0",
"@angular/core": "^18.0.0",
"@angular/forms": "^18.0.0",
"fast-deep-equal": "^3.1.3",
"lodash-es": "^4.17.21",
"ngx-observable-lifecycle": "^2.2.1",
Expand Down
6 changes: 3 additions & 3 deletions src/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

@include mat.core();

$my-primary: mat.define-palette(mat.$indigo-palette, 500);
$my-accent: mat.define-palette(mat.$pink-palette, A200, A100, A400);
$my-primary: mat.m2-define-palette(mat.$m2-indigo-palette, 500);
$my-accent: mat.m2-define-palette(mat.$m2-pink-palette, A200, A100, A400);

$my-theme: mat.define-light-theme(
$my-theme: mat.m2-define-light-theme(
(
color: (
primary: $my-primary,
Expand Down
Loading

0 comments on commit 2aa7406

Please sign in to comment.