diff --git a/.dockerignore b/.dockerignore index 09d5041..6f0ed47 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,14 +1,20 @@ -# See http://help.github.com/ignore-files/ for more about ignoring files. +# Copy of .gitignore AND removed "dist" directory # compiled output -/tmp -/out-tsc +# dist +tmp +out-tsc +reports # dependencies -/node_modules +node_modules + +# profiling files +chrome-profiler-events*.json +speed-measure-plugin*.json # IDEs and editors -/.idea +.idea .project .classpath .c9/ @@ -22,20 +28,20 @@ !.vscode/tasks.json !.vscode/launch.json !.vscode/extensions.json +.history/* # misc +.angular +.eslintcache +.husky/_ .sass-cache .gitlab* .scannerwork connect.lock -reports typings *.log - -# e2e -/e2e/*.js -/e2e/*.map +*.sh # System Files .DS_Store -Thumbs.db \ No newline at end of file +Thumbs.db diff --git a/.eslintrc.json b/.eslintrc.json index 112ecbd..3d57842 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -10,8 +10,7 @@ "helm/**", "node_modules/**", "src/app/shared/generated/**", - "src/app/api/*", - "src/app/model/*", + "src/assets/api/*", "src/**/*.ico", "src/**/*.svg" ], diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f30be86..4e9c741 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -6,6 +6,21 @@ updates: interval: daily labels: - dependencies + groups: + angular: + applies-to: version-updates + patterns: + - "@angular*" + update-types: + - "minor" + - "patch" + onecx: + applies-to: version-updates + patterns: + - "@onecx*" + update-types: + - "minor" + - "patch" - package-ecosystem: "docker" directory: "/" schedule: diff --git a/.gitignore b/.gitignore index 2f1a578..bd4b4ce 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,13 @@ # See http://help.github.com/ignore-files/ for more about ignoring files. # compiled output -/dist -/tmp -/out-tsc -# Only exists if Bazel was run -/bazel-out +dist +tmp +out-tsc +reports # dependencies -/node_modules +node_modules # profiling files chrome-profiler-events*.json @@ -32,13 +31,13 @@ speed-measure-plugin*.json .history/* # misc -.angular/cache -.sass-cache +.angular .eslintcache +.husky/_ +.sass-cache .gitlab* .scannerwork connect.lock -reports typings *.log *.sh diff --git a/.husky/commit-msg b/.husky/commit-msg new file mode 100755 index 0000000..fd2bf70 --- /dev/null +++ b/.husky/commit-msg @@ -0,0 +1 @@ +npx --no-install commitlint --edit $1 diff --git a/Dockerfile b/Dockerfile index b571cda..15955b1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/onecx/docker-spa-base:1.5.0 +FROM ghcr.io/onecx/docker-spa-base:1.6.0 # Copy nginx configuration COPY nginx/locations.conf $DIR_LOCATION/locations.conf diff --git a/angular.json b/angular.json index 11db38f..046f9c5 100644 --- a/angular.json +++ b/angular.json @@ -76,7 +76,7 @@ "serve": { "builder": "ngx-build-plus:dev-server", "options": { - "browserTarget": "onecx-theme-ui:build", + "buildTarget": "onecx-theme-ui:build", "port": 4200, "publicHost": "http://localhost:4200", "extraWebpackConfig": "webpack.config.js", @@ -84,10 +84,10 @@ }, "configurations": { "development": { - "browserTarget": "onecx-theme-ui:build:development" + "buildTarget": "onecx-theme-ui:build:development" }, "production": { - "browserTarget": "onecx-theme-ui:build:production", + "buildTarget": "onecx-theme-ui:build:production", "extraWebpackConfig": "webpack.prod.config.js" } } @@ -95,7 +95,7 @@ "extract-i18n": { "builder": "ngx-build-plus:extract-i18n", "options": { - "browserTarget": "onecx-theme-ui:build", + "buildTarget": "onecx-theme-ui:build", "extraWebpackConfig": "webpack.config.js" } }, diff --git a/package-lock.json b/package-lock.json index d546fc1..0f1d137 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,17 +27,17 @@ "@ngrx/router-store": "^18.0.1", "@ngx-translate/core": "^15.0.0", "@ngx-translate/http-loader": "^8.0.0", - "@onecx/accelerator": "^5.3.1", - "@onecx/angular-accelerator": "^5.3.1", - "@onecx/angular-auth": "^5.3.1", - "@onecx/angular-integration-interface": "^5.3.1", - "@onecx/angular-remote-components": "^5.3.1", - "@onecx/angular-testing": "^5.3.1", - "@onecx/angular-webcomponents": "^5.3.1", - "@onecx/integration-interface": "^5.3.1", - "@onecx/keycloak-auth": "^5.3.1", - "@onecx/portal-integration-angular": "^5.3.1", - "@onecx/portal-layout-styles": "^5.3.1", + "@onecx/accelerator": "^5.4.0", + "@onecx/angular-accelerator": "^5.4.0", + "@onecx/angular-auth": "^5.4.0", + "@onecx/angular-integration-interface": "^5.4.0", + "@onecx/angular-remote-components": "^5.4.0", + "@onecx/angular-testing": "^5.4.0", + "@onecx/angular-webcomponents": "^5.4.0", + "@onecx/integration-interface": "^5.4.0", + "@onecx/keycloak-auth": "^5.4.0", + "@onecx/portal-integration-angular": "^5.4.0", + "@onecx/portal-layout-styles": "^5.4.0", "@webcomponents/webcomponentsjs": "^2.8.0", "file-saver": "^2.0.5", "i18n-iso-countries": "^7.11.3", @@ -72,7 +72,7 @@ "@svgr/webpack": "^8.1.0", "@swc-node/register": "^1.10.9", "@swc/cli": "~0.4.0", - "@swc/core": "^1.7.1", + "@swc/core": "^1.7.14", "@swc/helpers": "0.5.12", "@types/jasmine": "~5.1.4", "@types/node": "20.14.12", @@ -6422,18 +6422,18 @@ } }, "node_modules/@onecx/accelerator": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/@onecx/accelerator/-/accelerator-5.3.1.tgz", - "integrity": "sha512-pNWO/sV5JekZasxhU2E/3IzQSZQzc0S4CorDUQ+ecUhwMVF6e2R20DPSKyRaAbhvs8ZJRqy4tU0KTHPLAZ0yuQ==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@onecx/accelerator/-/accelerator-5.4.0.tgz", + "integrity": "sha512-pEC9fSpSK4oaFWDIWwL5wVBc50JTLQvdNv5mUVvuPKmLPbLxC9P93VzylW/fP7AZII1nUO4w9Y3GdokzDqQH1Q==", "peerDependencies": { "rxjs": "7.8.1", "tslib": "^2.6.3" } }, "node_modules/@onecx/angular-accelerator": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/@onecx/angular-accelerator/-/angular-accelerator-5.3.1.tgz", - "integrity": "sha512-s7DF882nWVepVv68V4c/MXUOaGh2T4N836kMOMo0S1i/Ja6vU4vHhljOK1DP+IQVRUeu/vYueG+h/quEG0dSeg==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@onecx/angular-accelerator/-/angular-accelerator-5.4.0.tgz", + "integrity": "sha512-3Fre2+SnMz+qTjfrIVtRAmtmJv0WZbqy19r+d5OFkmdTBfXySYF0DU2Oyxlc7XeroGeq8wz7J0jXblb1TmoXsQ==", "dependencies": { "tslib": "^2.3.0" }, @@ -6455,9 +6455,9 @@ } }, "node_modules/@onecx/angular-auth": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/@onecx/angular-auth/-/angular-auth-5.3.1.tgz", - "integrity": "sha512-GAT75Ya/lKwOBcnkwdOBMpqBooeEQn3Ol1a9xWHitEkXohGqoKki2RuCdRYEbRcdYselAf29LD/QvXvItj5b8Q==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@onecx/angular-auth/-/angular-auth-5.4.0.tgz", + "integrity": "sha512-EyhOcTr0k7BaYTt6yvbKS9bpSqbdA75PsZpxHH1SHzoAVesJh0mhKsZX54oG33KEZD0sFsbZJvQq4hPpXZLCoQ==", "dependencies": { "tslib": "^2.3.0" }, @@ -6473,9 +6473,9 @@ } }, "node_modules/@onecx/angular-integration-interface": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/@onecx/angular-integration-interface/-/angular-integration-interface-5.3.1.tgz", - "integrity": "sha512-wiK4dJFY83GlT75wWFqLsSnkpnlGoy72/zxwgUpIQucEuc1xH4CPZOxCnADZagzMfJLE6mZ/6OEjL4pgBe0Apg==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@onecx/angular-integration-interface/-/angular-integration-interface-5.4.0.tgz", + "integrity": "sha512-POVrNWg4p0bLx5hqTo2DjyyL7E105QcGqZ/sP6yFlnJKIwlXfuIWgIH0ZwmPr95seyG93zq4yapksExsLBEnHA==", "dependencies": { "tslib": "^2.3.0" }, @@ -6486,9 +6486,9 @@ } }, "node_modules/@onecx/angular-remote-components": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/@onecx/angular-remote-components/-/angular-remote-components-5.3.1.tgz", - "integrity": "sha512-e4UyRDp6gPxulqISNDhdWEphzgj0fLQZbIGhqlzklw/OR93wB2QGBkdX2yf04zfGyEOhmyilgN10EdCo68/dkA==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@onecx/angular-remote-components/-/angular-remote-components-5.4.0.tgz", + "integrity": "sha512-nVbZDN5TbQLV/e4h0oNcWbg3XiQI0tdbwcxcbjrk8Jlkwo0H7g8w6lwTAd+98vTULbq8oobEIb2XnvSShzTTsA==", "dependencies": { "tslib": "^2.3.0" }, @@ -6503,9 +6503,9 @@ } }, "node_modules/@onecx/angular-testing": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/@onecx/angular-testing/-/angular-testing-5.3.1.tgz", - "integrity": "sha512-EsR62UvDdKy4YYnMc8Ng2IjKls2rb2jG9gVofmqsEpWXNYbN1OrvtLBVxPXtnzH9AOrqMx6/Sc19nbkhBS5MMg==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@onecx/angular-testing/-/angular-testing-5.4.0.tgz", + "integrity": "sha512-EIzSPP0/q6SDQsdKyR5WedLRdfVveqthgulH75+LrVKaT2Yr/V9dJOO3XBxIB13mV5l7PERssoTu0ge/B1v7sw==", "dependencies": { "tslib": "^2.3.0" }, @@ -6515,9 +6515,9 @@ } }, "node_modules/@onecx/angular-webcomponents": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/@onecx/angular-webcomponents/-/angular-webcomponents-5.3.1.tgz", - "integrity": "sha512-8hPPOHP7SEXO5lcwt06+IUic7+aYjl/4VkfCZWJVAeZY+ianTsjFxhO/SiZ3Y5JlzDjjbuciwPqmXorXxyH30Q==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@onecx/angular-webcomponents/-/angular-webcomponents-5.4.0.tgz", + "integrity": "sha512-4tx6vU6WkWPGhllJZchYfv1GglPU66ecNCLaTTICXLcDLD5hsEJqa0zM33m/cvZwkcPbGDEbwy3gCg0TVH9koA==", "dependencies": { "tslib": "^2.3.0" }, @@ -6532,9 +6532,9 @@ } }, "node_modules/@onecx/integration-interface": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/@onecx/integration-interface/-/integration-interface-5.3.1.tgz", - "integrity": "sha512-f7K3Wo+eJiN0acVX5CZfa6fS++RWGxhQZXr5KDDLF7lZzp+xyZPnBBScbAWSdgrjMbTjPzu5GiReaOiCARiD3g==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@onecx/integration-interface/-/integration-interface-5.4.0.tgz", + "integrity": "sha512-zujaWSjld/QrTRH6YqUp8n5IqI7Q9d/XB6pPHvHdcIvY/J+Eh0ngyb6wp26ayaIF+rAJ00PLDnRF+2B++vUdLg==", "peerDependencies": { "@onecx/accelerator": "^5", "rxjs": "7.8.1", @@ -6542,9 +6542,9 @@ } }, "node_modules/@onecx/keycloak-auth": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/@onecx/keycloak-auth/-/keycloak-auth-5.3.1.tgz", - "integrity": "sha512-qVFLMiNozy63kYvAcS7P4RovWADG7AbHgr8kWPeFMFA1KHgnP3lYiznVsqe6Fa6d9fTVxEfw2XLk5UZPozUjgg==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@onecx/keycloak-auth/-/keycloak-auth-5.4.0.tgz", + "integrity": "sha512-vazfV1nSpKST+EhPN8alR9OQNTndhtZsu5AhAeRaZo/CbMadbUgFg2s9ArH6lgUDyCzcDMZdnfBgcfIKFeTVnw==", "dependencies": { "tslib": "^2.3.0" }, @@ -6559,9 +6559,9 @@ } }, "node_modules/@onecx/portal-integration-angular": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/@onecx/portal-integration-angular/-/portal-integration-angular-5.3.1.tgz", - "integrity": "sha512-K2NV3K5fZ6g5BZoKENRtpRf9F8L8DiTaHOmXKFu4I4ZX9GDWcjUo7Mpw87aRmEXIFn27rVOrQfTDuQWvyiIDFw==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@onecx/portal-integration-angular/-/portal-integration-angular-5.4.0.tgz", + "integrity": "sha512-LuyoEZJcU1htv9V1nutfjMb3fb654lbvfnyxxL609MejNSsMekohjCT1olkju9DdVdNPmVsR5u19sH4knL6Lgg==", "dependencies": { "tslib": "^2.3.0" }, @@ -6593,9 +6593,9 @@ } }, "node_modules/@onecx/portal-layout-styles": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/@onecx/portal-layout-styles/-/portal-layout-styles-5.3.1.tgz", - "integrity": "sha512-pohgWxQgCVCJ2EZTAzqdBFur6AJF8NOf/6Cr24xTxHE24cOaDkoOu5vEkgYyGKn3UU5m7/WY2pDziJPrnVrSuw==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@onecx/portal-layout-styles/-/portal-layout-styles-5.4.0.tgz", + "integrity": "sha512-XDHset45XexQdtDNcI5hFRszVtsZobokhqlIx4/XK4ibFbk8qxDGzAoTFO8eazzhGQnd3rFpyPI0qjXcSd3FcA==", "peerDependencies": { "tslib": "^2.6.3" } @@ -8446,9 +8446,9 @@ } }, "node_modules/@swc/core": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.7.3.tgz", - "integrity": "sha512-HHAlbXjWI6Kl9JmmUW1LSygT1YbblXgj2UvvDzMkTBPRzYMhW6xchxdO8HbtMPtFYRt/EQq9u1z7j4ttRSrFsA==", + "version": "1.7.14", + "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.7.14.tgz", + "integrity": "sha512-9aeXeifnyuvc2pcuuhPQgVUwdpGEzZ+9nJu0W8/hNl/aESFsJGR5i9uQJRGu0atoNr01gK092fvmqMmQAPcKow==", "dev": true, "hasInstallScript": true, "license": "Apache-2.0", @@ -8464,16 +8464,16 @@ "url": "https://opencollective.com/swc" }, "optionalDependencies": { - "@swc/core-darwin-arm64": "1.7.3", - "@swc/core-darwin-x64": "1.7.3", - "@swc/core-linux-arm-gnueabihf": "1.7.3", - "@swc/core-linux-arm64-gnu": "1.7.3", - "@swc/core-linux-arm64-musl": "1.7.3", - "@swc/core-linux-x64-gnu": "1.7.3", - "@swc/core-linux-x64-musl": "1.7.3", - "@swc/core-win32-arm64-msvc": "1.7.3", - "@swc/core-win32-ia32-msvc": "1.7.3", - "@swc/core-win32-x64-msvc": "1.7.3" + "@swc/core-darwin-arm64": "1.7.14", + "@swc/core-darwin-x64": "1.7.14", + "@swc/core-linux-arm-gnueabihf": "1.7.14", + "@swc/core-linux-arm64-gnu": "1.7.14", + "@swc/core-linux-arm64-musl": "1.7.14", + "@swc/core-linux-x64-gnu": "1.7.14", + "@swc/core-linux-x64-musl": "1.7.14", + "@swc/core-win32-arm64-msvc": "1.7.14", + "@swc/core-win32-ia32-msvc": "1.7.14", + "@swc/core-win32-x64-msvc": "1.7.14" }, "peerDependencies": { "@swc/helpers": "*" @@ -8484,10 +8484,95 @@ } } }, + "node_modules/@swc/core-darwin-arm64": { + "version": "1.7.14", + "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.7.14.tgz", + "integrity": "sha512-V0OUXjOH+hdGxDYG8NkQzy25mKOpcNKFpqtZEzLe5V/CpLJPnpg1+pMz70m14s9ZFda9OxsjlvPbg1FLUwhgIQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "Apache-2.0 AND MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=10" + } + }, + "node_modules/@swc/core-darwin-x64": { + "version": "1.7.14", + "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.7.14.tgz", + "integrity": "sha512-9iFvUnxG6FC3An5ogp5jbBfQuUmTTwy8KMB+ZddUoPB3NR1eV+Y9vOh/tfWcenSJbgOKDLgYC5D/b1mHAprsrQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "Apache-2.0 AND MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=10" + } + }, + "node_modules/@swc/core-linux-arm-gnueabihf": { + "version": "1.7.14", + "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.7.14.tgz", + "integrity": "sha512-zGJsef9qPivKSH8Vv4F/HiBXBTHZ5Hs3ZjVGo/UIdWPJF8fTL9OVADiRrl34Q7zOZEtGXRwEKLUW1SCQcbDvZA==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=10" + } + }, + "node_modules/@swc/core-linux-arm64-gnu": { + "version": "1.7.14", + "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.7.14.tgz", + "integrity": "sha512-AxV3MPsoI7i4B8FXOew3dx3N8y00YoJYvIPfxelw07RegeCEH3aHp2U2DtgbP/NV1ugZMx0TL2Z2DEvocmA51g==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "Apache-2.0 AND MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=10" + } + }, + "node_modules/@swc/core-linux-arm64-musl": { + "version": "1.7.14", + "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.7.14.tgz", + "integrity": "sha512-JDLdNjUj3zPehd4+DrQD8Ltb3B5lD8D05IwePyDWw+uR/YPc7w/TX1FUVci5h3giJnlMCJRvi1IQYV7K1n7KtQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "Apache-2.0 AND MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=10" + } + }, "node_modules/@swc/core-linux-x64-gnu": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.7.3.tgz", - "integrity": "sha512-IrFY48C356Z2dU2pjYg080yvMXzmSV3Lmm/Wna4cfcB1nkVLjWsuYwwRAk9CY7E19c+q8N1sMNggubAUDYoX2g==", + "version": "1.7.14", + "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.7.14.tgz", + "integrity": "sha512-Siy5OvPCLLWmMdx4msnEs8HvEVUEigSn0+3pbLjv78iwzXd0qSBNHUPZyC1xeurVaUbpNDxZTpPRIwpqNE2+Og==", "cpu": [ "x64" ], @@ -8502,9 +8587,9 @@ } }, "node_modules/@swc/core-linux-x64-musl": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.7.3.tgz", - "integrity": "sha512-qoLgxBlBnnyUEDu5vmRQqX90h9jldU1JXI96e6eh2d1gJyKRA0oSK7xXmTzorv1fGHiHulv9qiJOUG+g6uzJWg==", + "version": "1.7.14", + "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.7.14.tgz", + "integrity": "sha512-FtEGm9mwtRYQNK43WMtUIadxHs/ja2rnDurB99os0ZoFTGG2IHuht2zD97W0wB8JbqEabT1XwSG9Y5wmN+ciEQ==", "cpu": [ "x64" ], @@ -8518,6 +8603,57 @@ "node": ">=10" } }, + "node_modules/@swc/core-win32-arm64-msvc": { + "version": "1.7.14", + "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.7.14.tgz", + "integrity": "sha512-Jp8KDlfq7Ntt2/BXr0y344cYgB1zf0DaLzDZ1ZJR6rYlAzWYSccLYcxHa97VGnsYhhPspMpmCvHid97oe2hl4A==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "Apache-2.0 AND MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=10" + } + }, + "node_modules/@swc/core-win32-ia32-msvc": { + "version": "1.7.14", + "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.7.14.tgz", + "integrity": "sha512-I+cFsXF0OU0J9J4zdWiQKKLURO5dvCujH9Jr8N0cErdy54l9d4gfIxdctfTF+7FyXtWKLTCkp+oby9BQhkFGWA==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "Apache-2.0 AND MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=10" + } + }, + "node_modules/@swc/core-win32-x64-msvc": { + "version": "1.7.14", + "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.7.14.tgz", + "integrity": "sha512-NNrprQCK6d28mG436jVo2TD+vACHseUECacEBGZ9Ef0qfOIWS1XIt2MisQKG0Oea2VvLFl6tF/V4Lnx/H0Sn3Q==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "Apache-2.0 AND MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=10" + } + }, "node_modules/@swc/counter": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/@swc/counter/-/counter-0.1.3.tgz", diff --git a/package.json b/package.json index 21171c7..547cd03 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "version": "0.0.0", "license": "Apache-2.0", "contributors": [ - "OneCX Development Team " + "OneCX Development Team " ], "config": { "openapiYaml": "src/assets/api/openapi-bff.yaml", @@ -12,13 +12,14 @@ }, "scripts": { "build": "ng build", + "check": "ng lint --cache=true && npx prettier -c --cache .", "clean": "npm cache clean --force && ng cache clean && rm -f .eslintcache && rm -f ./node_modules/.cache/prettier/.prettier-cache", - "start": "ng serve --configuration=development --proxy-config=proxy.conf.js", - "prepare": "husky", "lint": "ng lint --cache=true", - "eslint": "eslint --quiet --ext .js,.ts src", "format": "ng lint --fix", + "eslint": "eslint --quiet --ext .js,.ts src", "browser": "npx browserslist", + "prepare": "husky || true", + "start": "ng serve --configuration=development --proxy-config=proxy.conf.js", "test": "ng test", "test:ci": "ng test --watch=false --browsers=ChromeHeadless --code-coverage", "karma": "rm -rf reports && npm run test:ci", @@ -52,17 +53,17 @@ "@ngrx/router-store": "^18.0.1", "@ngx-translate/core": "^15.0.0", "@ngx-translate/http-loader": "^8.0.0", - "@onecx/accelerator": "^5.3.1", - "@onecx/angular-accelerator": "^5.3.1", - "@onecx/angular-auth": "^5.3.1", - "@onecx/angular-integration-interface": "^5.3.1", - "@onecx/angular-remote-components": "^5.3.1", - "@onecx/angular-webcomponents": "^5.3.1", - "@onecx/angular-testing": "^5.3.1", - "@onecx/integration-interface": "^5.3.1", - "@onecx/keycloak-auth": "^5.3.1", - "@onecx/portal-integration-angular": "^5.3.1", - "@onecx/portal-layout-styles": "^5.3.1", + "@onecx/accelerator": "^5.4.0", + "@onecx/angular-accelerator": "^5.4.0", + "@onecx/angular-auth": "^5.4.0", + "@onecx/angular-integration-interface": "^5.4.0", + "@onecx/angular-remote-components": "^5.4.0", + "@onecx/angular-webcomponents": "^5.4.0", + "@onecx/angular-testing": "^5.4.0", + "@onecx/integration-interface": "^5.4.0", + "@onecx/keycloak-auth": "^5.4.0", + "@onecx/portal-integration-angular": "^5.4.0", + "@onecx/portal-layout-styles": "^5.4.0", "@webcomponents/webcomponentsjs": "^2.8.0", "file-saver": "^2.0.5", "i18n-iso-countries": "^7.11.3", @@ -97,7 +98,7 @@ "@svgr/webpack": "^8.1.0", "@swc-node/register": "^1.10.9", "@swc/cli": "~0.4.0", - "@swc/core": "^1.7.1", + "@swc/core": "^1.7.14", "@swc/helpers": "0.5.12", "@types/jasmine": "~5.1.4", "@types/node": "20.14.12", diff --git a/proxy.conf.js b/proxy.conf.js index cb58a57..19f93e4 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -5,7 +5,7 @@ const logFn = function (req, res) { //console.log(new Date().toISOString() + `: bypassing ${req.method} ${req.url} `) } -const bypassFn = function (req, res) { +const onProxyRes = function (proxyRes, req, res) { logFn(req, res) if (req.method.toUpperCase() === 'OPTIONS') { res.setHeader('Allow', 'GET, POST, HEAD, PUT, DELETE, OPTIONS') @@ -25,7 +25,7 @@ const PROXY_CONFIG = { }, changeOrigin: true, logLevel: 'debug', - bypass: bypassFn + onProxyRes: onProxyRes } }