From d7bbdf0a1bc643c199693fdd0ac233446ccb91bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henry=20T=C3=A4schner?= <129834483+HenryT-CG@users.noreply.github.com> Date: Tue, 12 Nov 2024 13:06:43 +0100 Subject: [PATCH] fix: correct style import (#300) * fix: correct style import * fix: update webpack version --- angular.json | 11 ++--- package-lock.json | 101 +++++++++++++++++++++++++--------------------- package.json | 24 +++++------ src/styles.scss | 8 ++-- 4 files changed, 75 insertions(+), 69 deletions(-) diff --git a/angular.json b/angular.json index 046f9c5..6ab4a94 100644 --- a/angular.json +++ b/angular.json @@ -5,7 +5,7 @@ "projects": { "onecx-theme-ui": { "projectType": "application", - "schematics": {}, + "schematics": { "@schematics/angular:component": { "style": "scss" } }, "root": "", "sourceRoot": "src", "prefix": "app", @@ -29,14 +29,10 @@ "output": "/onecx-portal-lib/assets/" } ], - "styles": [ - "node_modules/primeicons/primeicons.css", - "node_modules/primeng/resources/primeng.min.css", - "node_modules/@onecx/portal-integration-angular/assets/styles.scss", - "src/styles.scss" - ], + "styles": ["src/styles.scss"], "scripts": ["node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"], "extraWebpackConfig": "webpack.config.js", + "outputHashing": "all", "commonChunk": false }, "configurations": { @@ -67,7 +63,6 @@ "with": "src/environments/environment.prod.ts" } ], - "outputHashing": "all", "extraWebpackConfig": "webpack.prod.config.js" } }, diff --git a/package-lock.json b/package-lock.json index 2ed220b..8aa1a33 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,17 +25,17 @@ "@ngrx/router-store": "^18.0.1", "@ngx-translate/core": "^15.0.0", "@ngx-translate/http-loader": "^8.0.0", - "@onecx/accelerator": "^5.23.3", - "@onecx/angular-accelerator": "^5.23.3", - "@onecx/angular-auth": "^5.23.3", - "@onecx/angular-integration-interface": "^5.23.3", - "@onecx/angular-remote-components": "^5.23.3", - "@onecx/angular-testing": "^5.23.3", - "@onecx/angular-webcomponents": "^5.23.3", - "@onecx/integration-interface": "^5.23.3", - "@onecx/keycloak-auth": "^5.23.3", - "@onecx/portal-integration-angular": "^5.23.3", - "@onecx/portal-layout-styles": "^5.23.3", + "@onecx/accelerator": "^5.23.4", + "@onecx/angular-accelerator": "^5.23.4", + "@onecx/angular-auth": "^5.23.4", + "@onecx/angular-integration-interface": "^5.23.4", + "@onecx/angular-remote-components": "^5.23.4", + "@onecx/angular-testing": "^5.23.4", + "@onecx/angular-webcomponents": "^5.23.4", + "@onecx/integration-interface": "^5.23.4", + "@onecx/keycloak-auth": "^5.23.4", + "@onecx/portal-integration-angular": "^5.23.4", + "@onecx/portal-layout-styles": "^5.23.4", "@webcomponents/webcomponentsjs": "^2.8.0", "file-saver": "^2.0.5", "keycloak-angular": "^16.0.1", @@ -92,7 +92,7 @@ "ts-node": "10.9.2", "typescript": "5.5.4", "url-loader": "^4.1.1", - "webpack": "^5.93.0", + "webpack": "^5.95.0", "webpack-merge": "^6.0.1" } }, @@ -6159,18 +6159,20 @@ } }, "node_modules/@onecx/accelerator": { - "version": "5.23.3", - "resolved": "https://registry.npmjs.org/@onecx/accelerator/-/accelerator-5.23.3.tgz", - "integrity": "sha512-IEPzkdpu7zjuhsYnSec1v6WspEq8igKpVptRtsoreo/vcEG1ePo1634J6ivwCLulK60n1z70LbwJlMb+KweLew==", + "version": "5.23.4", + "resolved": "https://registry.npmjs.org/@onecx/accelerator/-/accelerator-5.23.4.tgz", + "integrity": "sha512-7HWQOg8aFHNJ0dB4CAGZU9dcrKSZF09pjNC6Mb5PHoB786zb3NuVgLLolBVieQcqNUlpK0bxxWWhaxMXj2+55g==", + "license": "Apache-2.0", "peerDependencies": { "rxjs": "^7.8.1", "tslib": "^2.6.3" } }, "node_modules/@onecx/angular-accelerator": { - "version": "5.23.3", - "resolved": "https://registry.npmjs.org/@onecx/angular-accelerator/-/angular-accelerator-5.23.3.tgz", - "integrity": "sha512-tURqFOYup3Dw+9w9l1jAkVYON5ukV/WiKjO5e2o8vaW+RED2Oiw2OGlZQWEgtZRqNoKPNZoNHlDTQeujAVI6ng==", + "version": "5.23.4", + "resolved": "https://registry.npmjs.org/@onecx/angular-accelerator/-/angular-accelerator-5.23.4.tgz", + "integrity": "sha512-2J5y6gYt8C+H/v4cl7cv6zXriOcash3Q13fvW40bzHsVDCqlmCw7LpAdxxliJlYBPXQQpWH5OTZOz2KthqwXIA==", + "license": "Apache-2.0", "dependencies": { "tslib": "^2.3.0" }, @@ -6193,9 +6195,10 @@ } }, "node_modules/@onecx/angular-auth": { - "version": "5.23.3", - "resolved": "https://registry.npmjs.org/@onecx/angular-auth/-/angular-auth-5.23.3.tgz", - "integrity": "sha512-vY/RD5/6tdcFfo7mWna8ChIJIBnFptWotuKwVDIpNGHFJ00V5JVkx0VGoX3cVlO2jI110Ph2RgbcvyqY5lyr1Q==", + "version": "5.23.4", + "resolved": "https://registry.npmjs.org/@onecx/angular-auth/-/angular-auth-5.23.4.tgz", + "integrity": "sha512-9HrQ/H+5Ri7nTD65goM0L/7b7p/DmygourCt+sZNyBDbKcmRozjJp+oRNYMaazT0HxQg4ZbbCCFNhUjskOHMug==", + "license": "Apache-2.0", "dependencies": { "tslib": "^2.3.0" }, @@ -6211,9 +6214,10 @@ } }, "node_modules/@onecx/angular-integration-interface": { - "version": "5.23.3", - "resolved": "https://registry.npmjs.org/@onecx/angular-integration-interface/-/angular-integration-interface-5.23.3.tgz", - "integrity": "sha512-M3DTrzsGIMroakrnqSjAQgq4lySYspCY6Kz0Ymjk3Fe/1YvZ/WaRoCv/E5YeMsM8wwMXB/Q666Wxl/0PBSYZAw==", + "version": "5.23.4", + "resolved": "https://registry.npmjs.org/@onecx/angular-integration-interface/-/angular-integration-interface-5.23.4.tgz", + "integrity": "sha512-lyfDTFX7hALGkfVw1TNtIgHhrvuCFKD9LKtjczOaKdDQJp+tD4WzpctosnCa1xHHkkU96AkDVPgVCpf0kfoXKw==", + "license": "Apache-2.0", "dependencies": { "tslib": "^2.3.0" }, @@ -6224,9 +6228,10 @@ } }, "node_modules/@onecx/angular-remote-components": { - "version": "5.23.3", - "resolved": "https://registry.npmjs.org/@onecx/angular-remote-components/-/angular-remote-components-5.23.3.tgz", - "integrity": "sha512-BMENW3XD+L7AOgPOFdosDLhG5LwfYXotnpjp1/FtpptPyLKM1dDNhsGUFg3nWlOnbI19InNPl3iyeV4MyDznCQ==", + "version": "5.23.4", + "resolved": "https://registry.npmjs.org/@onecx/angular-remote-components/-/angular-remote-components-5.23.4.tgz", + "integrity": "sha512-RTLONNkxcLvghksYPdS9QJaDEQP2AVXbynHYhV3tc62qtn1TYpEyhPo36qYwFjE1K3/hkwoliopA7EGDRgIaoA==", + "license": "Apache-2.0", "dependencies": { "tslib": "^2.3.0" }, @@ -6240,9 +6245,10 @@ } }, "node_modules/@onecx/angular-testing": { - "version": "5.23.3", - "resolved": "https://registry.npmjs.org/@onecx/angular-testing/-/angular-testing-5.23.3.tgz", - "integrity": "sha512-Ge3aOOJJAxQ+xR6muQVYpZtTyTlT1E6NSDfvTigvFk7I824gjgSx26qYy1dTulwkdKSWnGtNZQisTDL3Y7ObRA==", + "version": "5.23.4", + "resolved": "https://registry.npmjs.org/@onecx/angular-testing/-/angular-testing-5.23.4.tgz", + "integrity": "sha512-IL50l3+ql94nlaM8sia7Jqe64Mhji6jA8qPJYJgXu770A7C9Ib7ImtLUaXbLkFR/AdJEGFCciJCBp2RRbg2uPw==", + "license": "Apache-2.0", "dependencies": { "tslib": "^2.3.0" }, @@ -6252,9 +6258,10 @@ } }, "node_modules/@onecx/angular-webcomponents": { - "version": "5.23.3", - "resolved": "https://registry.npmjs.org/@onecx/angular-webcomponents/-/angular-webcomponents-5.23.3.tgz", - "integrity": "sha512-ktNgi3J29nNKWUBYJ8REV9w9sPzA4cLaC6xCkxect6m6N+7bWElFMgAkfPAClfUE+owokkKubKOcoOEVYZi9aQ==", + "version": "5.23.4", + "resolved": "https://registry.npmjs.org/@onecx/angular-webcomponents/-/angular-webcomponents-5.23.4.tgz", + "integrity": "sha512-Ys4wVVIzK5gKWFc5aFJpyMOLIhLe4nQqS67PKVehscdSah/3zCQvDxS1cAvRbzhog9w6GDKzs5qiGdIcx0QsTQ==", + "license": "Apache-2.0", "dependencies": { "tslib": "^2.3.0" }, @@ -6269,9 +6276,10 @@ } }, "node_modules/@onecx/integration-interface": { - "version": "5.23.3", - "resolved": "https://registry.npmjs.org/@onecx/integration-interface/-/integration-interface-5.23.3.tgz", - "integrity": "sha512-xwU6C2LKCLWxzp8JsfxAvy5xxdcsLnB9YJLJ769auuwMb2iV2uIS3VdpKHOQLQ9aNwBSmgfTnYW5JowLyqC4PQ==", + "version": "5.23.4", + "resolved": "https://registry.npmjs.org/@onecx/integration-interface/-/integration-interface-5.23.4.tgz", + "integrity": "sha512-uDZBZMRF5zHGne53USEVFKQKTOYUwgFbXkZqWdCJaHeC5KhJxbwucOmk2vqT3EptqYzUqSujyeEG6r0PKP5Cjw==", + "license": "Apache-2.0", "peerDependencies": { "@onecx/accelerator": "^5", "rxjs": "^7.8.1", @@ -6279,9 +6287,10 @@ } }, "node_modules/@onecx/keycloak-auth": { - "version": "5.23.3", - "resolved": "https://registry.npmjs.org/@onecx/keycloak-auth/-/keycloak-auth-5.23.3.tgz", - "integrity": "sha512-xnmwSfL9ollakhCGUTNxxGQv/Gyjj0C6ouJIT7KRTnfM8GaHsY+c0JNr78pj5byAWVDxtqgkxAFAk2X5QJ+hag==", + "version": "5.23.4", + "resolved": "https://registry.npmjs.org/@onecx/keycloak-auth/-/keycloak-auth-5.23.4.tgz", + "integrity": "sha512-c76Q8poQz68qwZcfyPC9eUD9svMAVGkH5IdyRU7uOcMduCRtsA6ACaoO60zOkWkHPBhJXOzcRtCIjcMht0GSbw==", + "license": "Apache-2.0", "dependencies": { "tslib": "^2.3.0" }, @@ -6296,9 +6305,10 @@ } }, "node_modules/@onecx/portal-integration-angular": { - "version": "5.23.3", - "resolved": "https://registry.npmjs.org/@onecx/portal-integration-angular/-/portal-integration-angular-5.23.3.tgz", - "integrity": "sha512-d5FA6yki2GddIj7p+04nRz8MRNRfQ42Or/xSGWJlB6SG2RVhAEUw90R0BvV4kSLNbx//MY6Uy6hqedz7AG/FRg==", + "version": "5.23.4", + "resolved": "https://registry.npmjs.org/@onecx/portal-integration-angular/-/portal-integration-angular-5.23.4.tgz", + "integrity": "sha512-XjOYSmHUamEt/qiiMk2mgdziKbDnakg4XryKzov6X3rfKwXADuiN+g340am9Nec2P5szbIXRu9ECV6lJgkFn1g==", + "license": "Apache-2.0", "dependencies": { "tslib": "^2.3.0" }, @@ -6330,9 +6340,10 @@ } }, "node_modules/@onecx/portal-layout-styles": { - "version": "5.23.3", - "resolved": "https://registry.npmjs.org/@onecx/portal-layout-styles/-/portal-layout-styles-5.23.3.tgz", - "integrity": "sha512-QgRqQuTpKifyKdaMn2Ic1I4MbgzXetETJ9sbdWeW8Fr2n2zGe/xFaGdiFG2rxYFHncSMzv6rTAhrOeni4F3E2Q==", + "version": "5.23.4", + "resolved": "https://registry.npmjs.org/@onecx/portal-layout-styles/-/portal-layout-styles-5.23.4.tgz", + "integrity": "sha512-ySVgB4al+7WtzsV2GeWykko1bLoch9WTRGKV39SdfjUpIy1FTyHNUL04w+/M4n4OMT8kt7dXtUmZjYZ8ZbSRZg==", + "license": "Apache-2.0", "peerDependencies": { "tslib": "^2.6.3" } diff --git a/package.json b/package.json index 063836e..06f8939 100644 --- a/package.json +++ b/package.json @@ -51,17 +51,17 @@ "@ngrx/router-store": "^18.0.1", "@ngx-translate/core": "^15.0.0", "@ngx-translate/http-loader": "^8.0.0", - "@onecx/accelerator": "^5.23.3", - "@onecx/angular-accelerator": "^5.23.3", - "@onecx/angular-auth": "^5.23.3", - "@onecx/angular-integration-interface": "^5.23.3", - "@onecx/angular-remote-components": "^5.23.3", - "@onecx/angular-webcomponents": "^5.23.3", - "@onecx/angular-testing": "^5.23.3", - "@onecx/integration-interface": "^5.23.3", - "@onecx/keycloak-auth": "^5.23.3", - "@onecx/portal-integration-angular": "^5.23.3", - "@onecx/portal-layout-styles": "^5.23.3", + "@onecx/accelerator": "^5.23.4", + "@onecx/angular-accelerator": "^5.23.4", + "@onecx/angular-auth": "^5.23.4", + "@onecx/angular-integration-interface": "^5.23.4", + "@onecx/angular-remote-components": "^5.23.4", + "@onecx/angular-webcomponents": "^5.23.4", + "@onecx/angular-testing": "^5.23.4", + "@onecx/integration-interface": "^5.23.4", + "@onecx/keycloak-auth": "^5.23.4", + "@onecx/portal-integration-angular": "^5.23.4", + "@onecx/portal-layout-styles": "^5.23.4", "@webcomponents/webcomponentsjs": "^2.8.0", "file-saver": "^2.0.5", "keycloak-angular": "^16.0.1", @@ -118,7 +118,7 @@ "ts-node": "10.9.2", "typescript": "5.5.4", "url-loader": "^4.1.1", - "webpack": "^5.93.0", + "webpack": "^5.95.0", "webpack-merge": "^6.0.1" } } diff --git a/src/styles.scss b/src/styles.scss index 802c64d..9283412 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -1,7 +1,7 @@ /* global styles */ -@import '../node_modules/primeng/resources/primeng.min.css'; -@import '../node_modules/primeicons/primeicons.css'; +@import 'node_modules/primeicons/primeicons.css'; +@import 'node_modules/primeng/resources/primeng.min.css'; /* portal core */ -@import '../node_modules/@onecx/portal-layout-styles/src/styles/shell/shell.scss'; -@import '../node_modules/@onecx/portal-layout-styles/src/styles/primeng/theme-light.scss'; +@import 'node_modules/@onecx/portal-layout-styles/src/styles/shell/shell'; +@import 'node_modules/@onecx/portal-layout-styles/src/styles/primeng/theme-light.scss';