Merge remote-tracking branch 'origin/main' into renovate/major-angular-monorepo
# Conflicts: # bun.lock
This commit is contained in:
commit
f119dd5dda
4 files changed
+481
-292
No files matched your search
+10
-4
@@ -45,8 +45,12 @@ type-check:
|
||||
# -- Test Stage --
|
||||
|
||||
test:
|
||||
image: node:22.23.2
|
||||
extends: .node_setup
|
||||
stage: test
|
||||
before_script:
|
||||
- npm install --global bun@1.4.2
|
||||
- bun install --frozen-lockfile
|
||||
script:
|
||||
- bun run test --watch=false --coverage
|
||||
artifacts:
|
||||
@@ -62,11 +66,13 @@ test:
|
||||
# -- Build Stage --
|
||||
|
||||
build:
|
||||
image: oven/bun:latest
|
||||
image: node:22.23.2
|
||||
extends: .node_setup
|
||||
stage: build
|
||||
before_script:
|
||||
- npm install --global bun@1.4.2
|
||||
- bun install --frozen-lockfile
|
||||
script:
|
||||
- apt-get update && apt-get install -y nodejs
|
||||
- bun run build -- --configuration production
|
||||
artifacts:
|
||||
paths:
|
||||
@@ -96,9 +102,9 @@ trivy_scan:
|
||||
|
||||
docker-build:
|
||||
stage: docker
|
||||
image: docker:24.0.9
|
||||
image: docker:29.8.2
|
||||
services:
|
||||
- docker:24.0.9-dind
|
||||
- docker:29.8.2-dind
|
||||
before_script:
|
||||
- echo "$CI_REGISTRY_PASSWORD" | docker login $CI_REGISTRY -u $CI_REGISTRY_USER --password-stdin
|
||||
script:
|
||||
|
||||
+10
-10
@@ -53,25 +53,25 @@
|
||||
"@angular/cli": "21.2.24",
|
||||
"@angular/compiler-cli": "22.2.1",
|
||||
"@eslint/js": "^10.0.1",
|
||||
"@nx/devkit": "^22.7.5",
|
||||
"@nx/vite": "^22.0.0",
|
||||
"@nx/devkit": "^23.0.0",
|
||||
"@nx/vite": "^23.0.0",
|
||||
"@types/express": "^5.0.6",
|
||||
"@types/jest": "^30.0.0",
|
||||
"@types/node": "^26.0.0",
|
||||
"@vitest/coverage-istanbul": "^4.1.7",
|
||||
"@vitest/coverage-v8": "^4.0.0",
|
||||
"@vitest/ui": "^4.0.0",
|
||||
"@vitest/coverage-istanbul": "^5.0.0",
|
||||
"@vitest/coverage-v8": "^5.0.0",
|
||||
"@vitest/ui": "^5.0.0",
|
||||
"eslint": "^10.4.1",
|
||||
"eslint-config-prettier": "^10.1.8",
|
||||
"eslint-plugin-prettier": "^5.5.6",
|
||||
"jest": "^30.4.2",
|
||||
"jest-preset-angular": "^16.1.5",
|
||||
"jsdom": "^22.0.0",
|
||||
"jest-preset-angular": "^17.0.0",
|
||||
"jsdom": "^30.0.0",
|
||||
"prettier": "^3.8.3",
|
||||
"typescript": "~6.0.3",
|
||||
"typescript-eslint": "^8.60.0",
|
||||
"vite": "^7.0.0",
|
||||
"vite-tsconfig-paths": "^4.2.0",
|
||||
"vitest": "^4.0.0"
|
||||
"vite": "^8.0.0",
|
||||
"vite-tsconfig-paths": "^6.0.0",
|
||||
"vitest": "^5.0.0"
|
||||
}
|
||||
}
|
||||
@@ -9,7 +9,6 @@ import { routes } from './app.routes';
|
||||
import {
|
||||
provideClientHydration,
|
||||
withEventReplay,
|
||||
withIncrementalHydration,
|
||||
} from '@angular/platform-browser';
|
||||
|
||||
export const appConfig: ApplicationConfig = {
|
||||
@@ -17,6 +16,6 @@ export const appConfig: ApplicationConfig = {
|
||||
provideBrowserGlobalErrorListeners(),
|
||||
provideZonelessChangeDetection(),
|
||||
provideRouter(routes),
|
||||
provideClientHydration(withEventReplay(), withIncrementalHydration()),
|
||||
provideClientHydration(withEventReplay()),
|
||||
],
|
||||
};
|
||||
Reference in new issue
Block a user