Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 11 additions & 27 deletions integration/harness-e2e-cli/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"newProjectRoot": "projects",
"cli": {
"cache": {
"enabled": false
}
},
"projects": {
"harness-e2e-cli": {
"projectType": "application",
Expand All @@ -18,16 +23,16 @@
"prefix": "app",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"builder": "@angular/build:application",
"options": {
"outputPath": "dist/harness-e2e-cli",
"polyfills": ["zone.js"],
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"browser": "src/main.ts",
"tsConfig": "tsconfig.app.json",
"inlineStyleLanguage": "scss",
"inlineStyleLanguage": "css",
"assets": ["src/favicon.ico", "src/assets"],
"styles": ["src/styles.scss"],
"styles": ["src/styles.css"],
"scripts": []
},
"configurations": {
Expand All @@ -53,9 +58,7 @@
"outputHashing": "all"
},
"development": {
"buildOptimizer": false,
"optimization": false,
"vendorChunk": true,
"extractLicenses": false,
"sourceMap": true,
"namedChunks": true
Expand All @@ -64,7 +67,7 @@
"defaultConfiguration": "production"
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"builder": "@angular/build:dev-server",
"configurations": {
"production": {
"buildTarget": "harness-e2e-cli:build:production"
Expand All @@ -74,25 +77,6 @@
}
},
"defaultConfiguration": "development"
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"buildTarget": "harness-e2e-cli:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "src/test.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.spec.json",
"karmaConfig": "karma.conf.js",
"inlineStyleLanguage": "scss",
"assets": ["src/favicon.ico", "src/assets"],
"styles": ["src/styles.scss"],
"scripts": []
}
}
}
}
Expand Down
41 changes: 0 additions & 41 deletions integration/harness-e2e-cli/karma.conf.js

This file was deleted.

14 changes: 4 additions & 10 deletions integration/harness-e2e-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"watch": "ng build --watch --configuration development",
"test": "ng test",
"run-e2e-specs": "node --loader ts-node/esm node_modules/jasmine/bin/jasmine --config=e2e/jasmine.json",
"wait-and-run-e2e": "wait-on http://localhost:4200 && pnpm run-e2e-specs",
"e2e": "concurrently -s first -k 'pnpm ng serve' 'pnpm wait-and-run-e2e'"
"wait-and-run-e2e": "for i in {1..25}; do curl -s --fail http://localhost:4200 > /dev/null && break || (echo 'Waiting for server... attempt '$i' of 25'; sleep 2); done; pnpm run run-e2e-specs",
"e2e": "concurrently -s first -k 'pnpm run ng serve' 'pnpm run wait-and-run-e2e'"
},
"private": true,
"dependencies": {
Expand All @@ -26,7 +26,7 @@
"zone.js": "~0.15.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "20.2.0",
"@angular/build": "20.2.0",
"@angular/cli": "20.2.0",
"@angular/compiler-cli": "20.2.0",
"@types/jasmine": "5.1.8",
Expand All @@ -35,14 +35,8 @@
"concurrently": "^9.0.0",
"jasmine": "5.8.0",
"jasmine-core": "5.8.0",
"karma": "6.4.4",
"karma-chrome-launcher": "~3.2.0",
"karma-coverage": "~2.2.0",
"karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "~2.1.0",
"selenium-webdriver": "3.6.0",
"ts-node": "~10.9.1",
"typescript": "5.8.3",
"wait-on": "^8.0.0"
"typescript": "5.8.3"
}
}
Loading
Loading