diff --git a/demo-shell/src/custom-style-dev.scss b/demo-shell/src/custom-style-dev.scss index 332c9c8a54..c35d1e11ef 100644 --- a/demo-shell/src/custom-style-dev.scss +++ b/demo-shell/src/custom-style-dev.scss @@ -1,4 +1,4 @@ -@use '~@angular/material' as mat; +@use '@angular/material' as mat; @import '../../lib/core/styles/index'; @include mat.core($alfresco-typography); diff --git a/demo-shell/src/custom-style.scss b/demo-shell/src/custom-style.scss index 33bcdb4932..c7cc6f98fd 100644 --- a/demo-shell/src/custom-style.scss +++ b/demo-shell/src/custom-style.scss @@ -1,4 +1,4 @@ -@use '~@angular/material' as mat; +@use '@angular/material' as mat; @import '~@alfresco/adf-core/theming'; @include mat.core($alfresco-typography); diff --git a/lib/content-services/src/lib/search/components/search-control.component.scss b/lib/content-services/src/lib/search/components/search-control.component.scss index a7db0d06cb..a3115a577e 100644 --- a/lib/content-services/src/lib/search/components/search-control.component.scss +++ b/lib/content-services/src/lib/search/components/search-control.component.scss @@ -1,4 +1,4 @@ -@use '~@angular/material' as mat; +@use '@angular/material' as mat; $mat-menu-overlay-min-width: 112px !default; // 56 * 2 $mat-menu-overlay-max-width: 280px !default; // 56 * 5 diff --git a/lib/content-services/src/lib/search/components/search-filter-chips/search-filter-chips.component.scss b/lib/content-services/src/lib/search/components/search-filter-chips/search-filter-chips.component.scss index 64f606d825..95231da64d 100644 --- a/lib/content-services/src/lib/search/components/search-filter-chips/search-filter-chips.component.scss +++ b/lib/content-services/src/lib/search/components/search-filter-chips/search-filter-chips.component.scss @@ -1,4 +1,4 @@ -@use '~@angular/material' as mat; +@use '@angular/material' as mat; .adf-search-filter-chip { &.mat-chip { diff --git a/lib/content-services/src/lib/search/components/search-form/search-form.component.scss b/lib/content-services/src/lib/search/components/search-form/search-form.component.scss index be84e53e0a..32a6efea66 100644 --- a/lib/content-services/src/lib/search/components/search-form/search-form.component.scss +++ b/lib/content-services/src/lib/search/components/search-form/search-form.component.scss @@ -1,4 +1,4 @@ -@use '~@angular/material' as mat; +@use '@angular/material' as mat; .adf-search-form { &.mat-button { diff --git a/lib/core/datatable/components/datatable/datatable.component.scss b/lib/core/datatable/components/datatable/datatable.component.scss index 0fdfa77fbe..df12228104 100644 --- a/lib/core/datatable/components/datatable/datatable.component.scss +++ b/lib/core/datatable/components/datatable/datatable.component.scss @@ -1,5 +1,5 @@ /* stylelint-disable no-descending-specificity */ -@use '~@angular/material' as mat; +@use '@angular/material' as mat; @import '../../../styles/mixins'; $data-table-header-font-size: var(--theme-caption-font-size) !default; diff --git a/lib/core/directives/tooltip-card/tooltip-card.component.scss b/lib/core/directives/tooltip-card/tooltip-card.component.scss index 07b4bfcca8..d973dad8fd 100644 --- a/lib/core/directives/tooltip-card/tooltip-card.component.scss +++ b/lib/core/directives/tooltip-card/tooltip-card.component.scss @@ -1,4 +1,4 @@ -@use '~@angular/material' as mat; +@use '@angular/material' as mat; :host { display: block; diff --git a/lib/core/layout/components/sidebar-action/sidebar-action-menu.component.scss b/lib/core/layout/components/sidebar-action/sidebar-action-menu.component.scss index 4f8e14edca..771263a905 100644 --- a/lib/core/layout/components/sidebar-action/sidebar-action-menu.component.scss +++ b/lib/core/layout/components/sidebar-action/sidebar-action-menu.component.scss @@ -1,4 +1,4 @@ -@use '~@angular/material' as mat; +@use '@angular/material' as mat; .adf { &-sidebar-action-menu { diff --git a/lib/core/layout/components/sidenav-layout/sidenav-layout.component.scss b/lib/core/layout/components/sidenav-layout/sidenav-layout.component.scss index 7b6a63f250..0561a129c9 100644 --- a/lib/core/layout/components/sidenav-layout/sidenav-layout.component.scss +++ b/lib/core/layout/components/sidenav-layout/sidenav-layout.component.scss @@ -1,4 +1,4 @@ -@import '~@angular/flex-layout/mq'; +@import '@angular/flex-layout/mq'; @import '../../../styles/mixins'; .adf-sidenav-layout { diff --git a/lib/core/pagination/pagination.component.scss b/lib/core/pagination/pagination.component.scss index 89a714eadd..358dc216bc 100644 --- a/lib/core/pagination/pagination.component.scss +++ b/lib/core/pagination/pagination.component.scss @@ -1,4 +1,4 @@ -@import '~@angular/flex-layout/mq'; +@import '@angular/flex-layout/mq'; $adf-pagination-height: 48px !default; $adf-pagination-icon-button-size: 32px !default; diff --git a/lib/core/styles/_index.scss b/lib/core/styles/_index.scss index f024dc6266..51997d5618 100644 --- a/lib/core/styles/_index.scss +++ b/lib/core/styles/_index.scss @@ -1,5 +1,5 @@ /* stylelint-disable value-keyword-case */ -@use '~@angular/material' as mat; +@use '@angular/material' as mat; /* stylelint-disable value-list-max-empty-lines */ /* stylelint-disable scss/no-global-function-names */ /* stylelint-disable scss/at-import-partial-extension */ diff --git a/lib/core/styles/_theming.scss b/lib/core/styles/_theming.scss index dc17537aad..1924af119a 100644 --- a/lib/core/styles/_theming.scss +++ b/lib/core/styles/_theming.scss @@ -1,4 +1,4 @@ -@import '~@angular/flex-layout/mq'; +@import '@angular/flex-layout/mq'; @import './colors'; @import './mixins'; @import './typography'; diff --git a/lib/core/styles/_typography.scss b/lib/core/styles/_typography.scss index b4f6200a3d..43b6244fa0 100644 --- a/lib/core/styles/_typography.scss +++ b/lib/core/styles/_typography.scss @@ -1,4 +1,4 @@ -@use '~@angular/material' as mat; +@use '@angular/material' as mat; $alfresco-typography: mat.define-typography-config( $font-family: 'Muli, Roboto, "Helvetica Neue", sans-serif', diff --git a/lib/core/styles/prebuilt/adf-blue-orange.scss b/lib/core/styles/prebuilt/adf-blue-orange.scss index 5410fa7fb2..6c4adf74d7 100644 --- a/lib/core/styles/prebuilt/adf-blue-orange.scss +++ b/lib/core/styles/prebuilt/adf-blue-orange.scss @@ -1,4 +1,4 @@ -@use '~@angular/material' as mat; +@use '@angular/material' as mat; @import '../theming'; @import './all-theme'; @include mat.core($alfresco-typography); diff --git a/lib/core/styles/prebuilt/adf-blue-purple.scss b/lib/core/styles/prebuilt/adf-blue-purple.scss index 896acc7780..45dc967cf4 100644 --- a/lib/core/styles/prebuilt/adf-blue-purple.scss +++ b/lib/core/styles/prebuilt/adf-blue-purple.scss @@ -1,4 +1,4 @@ -@use '~@angular/material' as mat; +@use '@angular/material' as mat; @import '../theming'; @import './all-theme'; @include mat.core($alfresco-typography); diff --git a/lib/core/styles/prebuilt/adf-cyan-orange.scss b/lib/core/styles/prebuilt/adf-cyan-orange.scss index 648052bcb0..6bc36a0a3f 100644 --- a/lib/core/styles/prebuilt/adf-cyan-orange.scss +++ b/lib/core/styles/prebuilt/adf-cyan-orange.scss @@ -1,4 +1,4 @@ -@use '~@angular/material' as mat; +@use '@angular/material' as mat; @import '../theming'; @import './all-theme'; @include mat.core($alfresco-typography); diff --git a/lib/core/styles/prebuilt/adf-cyan-purple.scss b/lib/core/styles/prebuilt/adf-cyan-purple.scss index b4f711f3cc..9389d1e1fd 100644 --- a/lib/core/styles/prebuilt/adf-cyan-purple.scss +++ b/lib/core/styles/prebuilt/adf-cyan-purple.scss @@ -1,4 +1,4 @@ -@use '~@angular/material' as mat; +@use '@angular/material' as mat; @import '../theming'; @import './all-theme'; @include mat.core($alfresco-typography); diff --git a/lib/core/styles/prebuilt/adf-green-orange.scss b/lib/core/styles/prebuilt/adf-green-orange.scss index f416222c83..fd75c8a49d 100644 --- a/lib/core/styles/prebuilt/adf-green-orange.scss +++ b/lib/core/styles/prebuilt/adf-green-orange.scss @@ -1,4 +1,4 @@ -@use '~@angular/material' as mat; +@use '@angular/material' as mat; @import '../theming'; @import './all-theme'; @include mat.core($alfresco-typography); diff --git a/lib/core/styles/prebuilt/adf-green-purple.scss b/lib/core/styles/prebuilt/adf-green-purple.scss index ce4c721e4e..648f3ad600 100644 --- a/lib/core/styles/prebuilt/adf-green-purple.scss +++ b/lib/core/styles/prebuilt/adf-green-purple.scss @@ -1,4 +1,4 @@ -@use '~@angular/material' as mat; +@use '@angular/material' as mat; @import '../theming'; @import './all-theme'; @include mat.core($alfresco-typography); diff --git a/lib/core/styles/prebuilt/adf-indigo-pink.scss b/lib/core/styles/prebuilt/adf-indigo-pink.scss index cd73dd98e4..4b627f4d02 100644 --- a/lib/core/styles/prebuilt/adf-indigo-pink.scss +++ b/lib/core/styles/prebuilt/adf-indigo-pink.scss @@ -1,5 +1,5 @@ /* stylelint-disable value-keyword-case */ -@use '~@angular/material' as mat; +@use '@angular/material' as mat; @import '../theming'; @import './all-theme'; @include mat.core($alfresco-typography); diff --git a/lib/core/styles/prebuilt/adf-pink-bluegrey.scss b/lib/core/styles/prebuilt/adf-pink-bluegrey.scss index cc4d3fb819..7a45856f5c 100644 --- a/lib/core/styles/prebuilt/adf-pink-bluegrey.scss +++ b/lib/core/styles/prebuilt/adf-pink-bluegrey.scss @@ -1,5 +1,5 @@ /* stylelint-disable value-keyword-case */ -@use '~@angular/material' as mat; +@use '@angular/material' as mat; @import '../theming'; @import './all-theme'; @include mat.core($alfresco-typography); diff --git a/lib/core/styles/prebuilt/adf-purple-green.scss b/lib/core/styles/prebuilt/adf-purple-green.scss index cf9ed1e392..aa1b89e6cb 100644 --- a/lib/core/styles/prebuilt/adf-purple-green.scss +++ b/lib/core/styles/prebuilt/adf-purple-green.scss @@ -1,5 +1,5 @@ /* stylelint-disable value-keyword-case */ -@use '~@angular/material' as mat; +@use '@angular/material' as mat; @import '../theming'; @import './all-theme'; @include mat.core($alfresco-typography); diff --git a/package-lock.json b/package-lock.json index 5536456d05..764747d8c1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2329,12 +2329,12 @@ } }, "@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.2.3", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-13.2.3.tgz", + "integrity": "sha512-X7FH0eGwfK2HcAroYBrE7O9ehZ50k9+DoDV98xm1NRgezNfiQ2QxIdLQKhJv0bnnID+pGk4Tnb44RXUmgk5idw==", "requires": { "parse5": "^5.0.0", - "tslib": "^2.2.0" + "tslib": "^2.3.0" } }, "@angular/cli": { @@ -2765,19 +2765,19 @@ } }, "@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.2.3", + "resolved": "https://registry.npmjs.org/@angular/material/-/material-13.2.3.tgz", + "integrity": "sha512-io9NzL32QKBngSpNbnIGRN0/qhkGpyfZHnpW+IOsYa4gMlXqi0JMV5Ygi+O1Dvd57TXzbb3e2eggdZyAWe7IDA==", "requires": { - "tslib": "^2.2.0" + "tslib": "^2.3.0" } }, "@angular/material-moment-adapter": { - "version": "12.2.13", - "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-12.2.13.tgz", - "integrity": "sha512-0XhkAhBalvNvIfvi9t5qDKaTBtOuIqd1cABfotyaTecWmw57VoH0KoJtNekXjxDcx71S0LaqeYXfqTo4m+duSA==", + "version": "13.2.3", + "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-13.2.3.tgz", + "integrity": "sha512-OHsF5wOKfWYr+0HtSgsLBpKV4bqQT3WDpcQEAf7hQxddutx9pOOvIxQI4w7c/u8HJAEAl/eASNOpv3+v9CtCnw==", "requires": { - "tslib": "^2.2.0" + "tslib": "^2.3.0" } }, "@angular/platform-browser": { diff --git a/package.json b/package.json index af12ec884f..12cabd2234 100644 --- a/package.json +++ b/package.json @@ -71,14 +71,14 @@ "dependencies": { "@alfresco/js-api": "4.8.0", "@angular/animations": "^13.2.3", - "@angular/cdk": "12.2.13", + "@angular/cdk": "13.2.3", "@angular/common": "^13.2.3", "@angular/compiler": "^13.2.3", "@angular/core": "^13.2.3", "@angular/flex-layout": "^10.0.0-beta.32", "@angular/forms": "^13.2.3", - "@angular/material": "^12.2.13", - "@angular/material-moment-adapter": "^12.2.13", + "@angular/material": "^13.2.3", + "@angular/material-moment-adapter": "^13.2.3", "@angular/platform-browser": "^13.2.3", "@angular/platform-browser-dynamic": "^13.2.3", "@angular/router": "^13.2.3",