From 40b8f040ffb0e0b3eb2bc1c928a32ddd64376f51 Mon Sep 17 00:00:00 2001 From: Michael HENKENS Date: Mon, 8 Jan 2024 13:53:00 +0100 Subject: [PATCH] fix(demo): fix wrong version of @angular/material The vervsion of angular and angular material din't allign. --- demo-app/ng13/package-lock.json | 41 ++++++++++--------- demo-app/ng13/package.json | 6 +-- .../src/app/components/card/card.theme.scss | 2 +- .../language-selector.theme.scss | 2 +- .../navigation/navigation.theme.scss | 2 +- demo-app/ng13/src/styles/_app.theme.scss | 4 +- 6 files changed, 29 insertions(+), 28 deletions(-) diff --git a/demo-app/ng13/package-lock.json b/demo-app/ng13/package-lock.json index 5976ade..1b11def 100644 --- a/demo-app/ng13/package-lock.json +++ b/demo-app/ng13/package-lock.json @@ -9,12 +9,12 @@ "version": "0.0.0", "dependencies": { "@angular/animations": "^13.4.0", - "@angular/cdk": "^12.2.13", + "@angular/cdk": "^13.3.9", "@angular/common": "^13.4.0", "@angular/compiler": "^13.4.0", "@angular/core": "^13.4.0", "@angular/forms": "^13.4.0", - "@angular/material": "^12.2.13", + "@angular/material": "^13.3.9", "@angular/platform-browser": "^13.4.0", "@angular/platform-browser-dynamic": "^13.4.0", "@angular/router": "^13.4.0", @@ -53,7 +53,7 @@ }, "../../dist": { "name": "@nationalbankbelgium/ngx-form-errors", - "version": "1.1.0", + "version": "2.0.0-rc.0", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -428,19 +428,19 @@ } }, "node_modules/@angular/cdk": { - "version": "12.2.13", - "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-12.2.13.tgz", - "integrity": "sha512-zSKRhECyFqhingIeyRInIyTvYErt4gWo+x5DQr0b7YLUbU8DZSwWnG4w76Ke2s4U8T7ry1jpJBHoX/e8YBpGMg==", + "version": "13.3.9", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-13.3.9.tgz", + "integrity": "sha512-XCuCbeuxWFyo3EYrgEYx7eHzwl76vaWcxtWXl00ka8d+WAOtMQ6Tf1D98ybYT5uwF9889fFpXAPw98mVnlo3MA==", "dependencies": { - "tslib": "^2.2.0" + "tslib": "^2.3.0" }, "optionalDependencies": { "parse5": "^5.0.0" }, "peerDependencies": { - "@angular/common": "^12.0.0 || ^13.0.0-0", - "@angular/core": "^12.0.0 || ^13.0.0-0", - "rxjs": "^6.5.3 || ^7.0.0" + "@angular/common": "^13.0.0 || ^14.0.0-0", + "@angular/core": "^13.0.0 || ^14.0.0-0", + "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/cli": { @@ -677,19 +677,20 @@ } }, "node_modules/@angular/material": { - "version": "12.2.13", - "resolved": "https://registry.npmjs.org/@angular/material/-/material-12.2.13.tgz", - "integrity": "sha512-6g2GyN4qp2D+DqY2AwrQuPB3cd9gybvQVXvNRbTPXEulHr+LgGei00ySdFHFp6RvdGSMZ4i3LM1Fq3VkFxhCfQ==", + "version": "13.3.9", + "resolved": "https://registry.npmjs.org/@angular/material/-/material-13.3.9.tgz", + "integrity": "sha512-FU8lcMgo+AL8ckd27B4V097ZPoIZNRHiCe3wpgkImT1qC0YwcyXZVn0MqQTTFSdC9a/aI8wPm3AbTClJEVw5Vw==", "dependencies": { - "tslib": "^2.2.0" + "tslib": "^2.3.0" }, "peerDependencies": { - "@angular/animations": "^12.0.0 || ^13.0.0-0", - "@angular/cdk": "12.2.13", - "@angular/common": "^12.0.0 || ^13.0.0-0", - "@angular/core": "^12.0.0 || ^13.0.0-0", - "@angular/forms": "^12.0.0 || ^13.0.0-0", - "rxjs": "^6.5.3 || ^7.0.0" + "@angular/animations": "^13.0.0 || ^14.0.0-0", + "@angular/cdk": "13.3.9", + "@angular/common": "^13.0.0 || ^14.0.0-0", + "@angular/core": "^13.0.0 || ^14.0.0-0", + "@angular/forms": "^13.0.0 || ^14.0.0-0", + "@angular/platform-browser": "^13.0.0 || ^14.0.0-0", + "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/platform-browser": { diff --git a/demo-app/ng13/package.json b/demo-app/ng13/package.json index 9c52ace..ef738fc 100644 --- a/demo-app/ng13/package.json +++ b/demo-app/ng13/package.json @@ -15,12 +15,12 @@ "private": true, "dependencies": { "@angular/animations": "^13.4.0", - "@angular/cdk": "^12.2.13", + "@angular/cdk": "^13.3.9", "@angular/common": "^13.4.0", "@angular/compiler": "^13.4.0", "@angular/core": "^13.4.0", "@angular/forms": "^13.4.0", - "@angular/material": "^12.2.13", + "@angular/material": "^13.3.9", "@angular/platform-browser": "^13.4.0", "@angular/platform-browser-dynamic": "^13.4.0", "@angular/router": "^13.4.0", @@ -56,4 +56,4 @@ "tslint-config-prettier": "^1.17.0", "typescript": "~4.6.4" } -} +} \ No newline at end of file diff --git a/demo-app/ng13/src/app/components/card/card.theme.scss b/demo-app/ng13/src/app/components/card/card.theme.scss index 183b662..29a2d45 100644 --- a/demo-app/ng13/src/app/components/card/card.theme.scss +++ b/demo-app/ng13/src/app/components/card/card.theme.scss @@ -1,4 +1,4 @@ -@use "~@angular/material" as mat; +@use "@angular/material" as mat; @mixin card-theme($theme) { $primary: map-get($theme, primary); $accent: map-get($theme, accent); diff --git a/demo-app/ng13/src/app/components/language-selector/language-selector.theme.scss b/demo-app/ng13/src/app/components/language-selector/language-selector.theme.scss index 7ee9205..4473fa0 100644 --- a/demo-app/ng13/src/app/components/language-selector/language-selector.theme.scss +++ b/demo-app/ng13/src/app/components/language-selector/language-selector.theme.scss @@ -1,4 +1,4 @@ -@use "~@angular/material" as mat; +@use "@angular/material" as mat; @mixin language-selector-theme($theme) { $primary: map-get($theme, primary); diff --git a/demo-app/ng13/src/app/components/navigation/navigation.theme.scss b/demo-app/ng13/src/app/components/navigation/navigation.theme.scss index 2c37122..dd2ad82 100644 --- a/demo-app/ng13/src/app/components/navigation/navigation.theme.scss +++ b/demo-app/ng13/src/app/components/navigation/navigation.theme.scss @@ -1,4 +1,4 @@ -@use "~@angular/material" as mat; +@use "@angular/material" as mat; @mixin app-navigation-theme($theme) { $primary: map-get($theme, primary); $accent: map-get($theme, accent); diff --git a/demo-app/ng13/src/styles/_app.theme.scss b/demo-app/ng13/src/styles/_app.theme.scss index 6facc97..409cab7 100644 --- a/demo-app/ng13/src/styles/_app.theme.scss +++ b/demo-app/ng13/src/styles/_app.theme.scss @@ -1,5 +1,5 @@ -@use "~@angular/material" as mat; -@import "~@angular/material/theming"; +@use "@angular/material" as mat; +@import "@angular/material/theming"; @import "../app/components/navigation/navigation.theme"; @import "../app/components/language-selector/language-selector.theme"; @import "../app/components/card/card.theme";