Skip to content

Commit abd2a58

Browse files
filipesilvamatsko
filipesilva
authored and
matsko
committed
test: update Angular CLI deps for integration tests (angular#32957)
PR Close angular#32957
1 parent d7dc6cb commit abd2a58

File tree

14 files changed

+102
-83
lines changed

14 files changed

+102
-83
lines changed

‎integration/_payload-limits.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,12 @@
2929
"cli-hello-world-ivy-i18n": {
3030
"master": {
3131
"uncompressed": {
32-
"runtime": 1485,
33-
"main": 128254,
34-
"polyfills": 42102
32+
"runtime-es2015": 1485,
33+
"runtime-es5": 1485,
34+
"main-es2015": 128258,
35+
"main-es5": 150321,
36+
"polyfills-es2015": 42102,
37+
"polyfills-es5": 136343
3538
}
3639
}
3740
},

‎integration/bazel/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"@angular/platform-browser-dynamic": "file:../../dist/packages-dist/platform-browser-dynamic",
1515
"@angular/router": "file:../../dist/packages-dist/router",
1616
"reflect-metadata": "0.1.12",
17-
"rxjs": "6.5.3",
17+
"rxjs": "file:../../node_modules/rxjs",
1818
"tslib": "file:../../node_modules/tslib",
1919
"zone.js": "0.10.2"
2020
},

‎integration/cli-hello-world-ivy-compat/angular.json

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
"styles": [
2929
"src/styles.css"
3030
],
31-
"scripts": []
31+
"scripts": [],
32+
"progress": false
3233
},
3334
"configurations": {
3435
"production": {
@@ -95,7 +96,9 @@
9596
"assets": [
9697
"src/favicon.ico",
9798
"src/assets"
98-
]
99+
],
100+
"progress": false,
101+
"watch": false
99102
}
100103
},
101104
"lint": {
@@ -121,7 +124,8 @@
121124
"builder": "@angular-devkit/build-angular:protractor",
122125
"options": {
123126
"protractorConfig": "e2e/protractor.conf.js",
124-
"devServerTarget": "cli-hello-world-ivy-compat:serve"
127+
"devServerTarget": "cli-hello-world-ivy-compat:serve",
128+
"webdriverUpdate": false
125129
},
126130
"configurations": {
127131
"production": {

‎integration/cli-hello-world-ivy-compat/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"version": "0.0.0",
44
"license": "MIT",
55
"scripts": {
6-
"build": "ng build --prod --progress=false",
7-
"e2e": "ng e2e --webdriver-update=false",
6+
"build": "ng build --prod",
7+
"e2e": "ng e2e",
88
"lint": "ng lint",
99
"ng": "ng",
10-
"postinstall": "yarn update-webdriver && yarn ngcc --properties es2015 --create-ivy-entry-points",
10+
"postinstall": "yarn update-webdriver && ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points",
1111
"update-webdriver": "webdriver-manager update --gecko=false --standalone=false $CI_CHROMEDRIVER_VERSION_ARG",
1212
"start": "ng serve",
1313
"pretest": "ng version",
14-
"test": "ng test --progress=false --watch=false && yarn e2e --configuration=ci && yarn e2e --configuration=ci-production"
14+
"test": "ng test && yarn e2e --configuration=ci && yarn e2e --configuration=ci-production"
1515
},
1616
"private": true,
1717
"dependencies": {
@@ -29,7 +29,7 @@
2929
"zone.js": "file:../../node_modules/zone.js"
3030
},
3131
"devDependencies": {
32-
"@angular-devkit/build-angular": "^0.900.0-next.11",
32+
"@angular-devkit/build-angular": "0.900.0-next.12",
3333
"@angular/cli": "file:../../node_modules/@angular/cli",
3434
"@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
3535
"@angular/language-service": "file:../../dist/packages-dist/language-service",

‎integration/cli-hello-world-ivy-i18n/angular.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
"build": {
1717
"builder": "@angular-devkit/build-angular:browser",
1818
"options": {
19-
"progress": false,
2019
"outputPath": "dist",
2120
"index": "src/index.html",
2221
"main": "src/main.ts",
@@ -29,7 +28,8 @@
2928
"styles": [
3029
"src/styles.css"
3130
],
32-
"scripts": []
31+
"scripts": [],
32+
"progress": false
3333
},
3434
"configurations": {
3535
"view-engine": {
@@ -113,7 +113,9 @@
113113
"assets": [
114114
"src/favicon.ico",
115115
"src/assets"
116-
]
116+
],
117+
"progress": false,
118+
"watch": false
117119
}
118120
},
119121
"lint": {
@@ -140,7 +142,7 @@
140142
"options": {
141143
"protractorConfig": "e2e/runtime/protractor.conf.js",
142144
"devServerTarget": "cli-hello-world-ivy-compat:serve",
143-
"webdriverUpdate": true
145+
"webdriverUpdate": false
144146
},
145147
"configurations": {
146148
"production": {

‎integration/cli-hello-world-ivy-i18n/package.json

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,33 @@
33
"version": "0.0.0",
44
"license": "MIT",
55
"scripts": {
6-
"build": "ng build --prod --progress=false",
7-
"e2e": "ng e2e --webdriver-update=false",
6+
"build": "ng build --prod",
7+
"e2e": "ng e2e",
88
"lint": "ng lint",
99
"ng": "ng",
10-
"postinstall": "webdriver-manager update --gecko=false --standalone=false $CI_CHROMEDRIVER_VERSION_ARG",
10+
"postinstall": "yarn update-webdriver && ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points",
11+
"update-webdriver": "webdriver-manager update --gecko=false --standalone=false $CI_CHROMEDRIVER_VERSION_ARG",
1112
"start": "ng serve",
1213
"pretest": "ng version",
13-
"test": "ng test --progress=false --watch=false && yarn e2e --configuration=ci && yarn e2e --configuration=ci-production && yarn translated:test && yarn translated:legacy:test",
14+
"test": "ng test && yarn e2e --configuration=ci && yarn e2e --configuration=ci-production && yarn translated:test && yarn translated:legacy:test",
1415
"translate": "localize-translate -r \"dist/\" -s \"**/*\" -l \"en-US\" -t \"src/locales/messages.*\" -o \"tmp/translations/{{LOCALE}}\"",
1516

1617
"translated:test": "yarn build && yarn translate && yarn translated:fr:e2e && yarn translated:de:e2e && yarn translated:en:e2e",
1718

1819
"translated:fr:serve": "serve tmp/translations/fr --listen 4200",
19-
"translated:fr:e2e": "npm-run-all -p -r translated:fr:serve \"ng e2e --configuration=translated-fr --webdriver-update=false\"",
20+
"translated:fr:e2e": "npm-run-all -p -r translated:fr:serve \"ng e2e --configuration=translated-fr\"",
2021

2122
"translated:de:serve": "serve tmp/translations/de --listen 4200",
22-
"translated:de:e2e": "npm-run-all -p -r translated:de:serve \"ng e2e --configuration=translated-de --webdriver-update=false\"",
23+
"translated:de:e2e": "npm-run-all -p -r translated:de:serve \"ng e2e --configuration=translated-de\"",
2324

2425
"translated:en:serve": "serve tmp/translations/en-US --listen 4200",
25-
"translated:en:e2e": "npm-run-all -p -r translated:en:serve \"ng e2e --configuration=translated-en --webdriver-update=false\"",
26+
"translated:en:e2e": "npm-run-all -p -r translated:en:serve \"ng e2e --configuration=translated-en\"",
2627

2728
"translated:legacy:test": "yarn translated:legacy:extract-and-update && ng build --configuration=translated-legacy && yarn translated:legacy:translate && yarn translated:legacy:e2e",
2829
"translated:legacy:extract-and-update": "ng xi18n && sed -i.bak -e 's/source>/target>'/ -e 's/Hello/Bonjour/' -e 's/source-language=\"en-US\"/source-language=\"en-US\" target-language=\"legacy\"/' tmp/legacy-locales/messages.legacy.xlf",
2930
"translated:legacy:translate": "localize-translate -r \"dist/\" -s \"**/*\" -t \"tmp/legacy-locales/messages.legacy.xlf\" -o \"tmp/translations/{{LOCALE}}\"",
3031
"translated:legacy:serve": "serve tmp/translations/legacy --listen 4200",
31-
"translated:legacy:e2e": "npm-run-all -p -r translated:legacy:serve \"ng e2e --configuration=translated-legacy --webdriver-update=false\""
32+
"translated:legacy:e2e": "npm-run-all -p -r translated:legacy:serve \"ng e2e --configuration=translated-legacy\""
3233
},
3334
"private": true,
3435
"dependencies": {
@@ -49,7 +50,7 @@
4950
"zone.js": "file:../../node_modules/zone.js"
5051
},
5152
"devDependencies": {
52-
"@angular-devkit/build-angular": "^0.900.0-next.11",
53+
"@angular-devkit/build-angular": "0.900.0-next.12",
5354
"@angular/cli": "file:../../node_modules/@angular/cli",
5455
"@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
5556
"@angular/language-service": "file:../../dist/packages-dist/language-service",

‎integration/cli-hello-world-ivy-minimal/angular.json

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
"styles": [
2929
"src/styles.css"
3030
],
31-
"scripts": []
31+
"scripts": [],
32+
"progress": false
3233
},
3334
"configurations": {
3435
"production": {
@@ -95,7 +96,9 @@
9596
"assets": [
9697
"src/favicon.ico",
9798
"src/assets"
98-
]
99+
],
100+
"progress": false,
101+
"watch": false
99102
}
100103
},
101104
"lint": {
@@ -121,7 +124,8 @@
121124
"builder": "@angular-devkit/build-angular:protractor",
122125
"options": {
123126
"protractorConfig": "e2e/protractor.conf.js",
124-
"devServerTarget": "cli-hello-world-ivy-minimal:serve"
127+
"devServerTarget": "cli-hello-world-ivy-minimal:serve",
128+
"webdriverUpdate": false
125129
},
126130
"configurations": {
127131
"production": {

‎integration/cli-hello-world-ivy-minimal/package.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33
"version": "0.0.0",
44
"license": "MIT",
55
"scripts": {
6-
"build": "ng build --prod --progress=false",
7-
"e2e": "ng e2e --webdriver-update=false",
6+
"build": "ng build --prod",
7+
"e2e": "ng e2e",
88
"lint": "ng lint",
99
"ng": "ng",
10-
"postinstall": "webdriver-manager update --gecko=false --standalone=false $CI_CHROMEDRIVER_VERSION_ARG && yarn ngcc",
10+
"postinstall": "yarn update-webdriver && ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points",
11+
"update-webdriver": "webdriver-manager update --gecko=false --standalone=false $CI_CHROMEDRIVER_VERSION_ARG",
1112
"start": "ng serve",
1213
"pretest": "ng version",
13-
"test": "ng test --progress=false --watch=false && yarn e2e --configuration=ci && yarn e2e --configuration=ci-production"
14+
"test": "ng test && yarn e2e --configuration=ci && yarn e2e --configuration=ci-production"
1415
},
1516
"private": true,
1617
"dependencies": {
@@ -28,7 +29,7 @@
2829
"zone.js": "file:../../node_modules/zone.js"
2930
},
3031
"devDependencies": {
31-
"@angular-devkit/build-angular": "^0.900.0-next.11",
32+
"@angular-devkit/build-angular": "0.900.0-next.12",
3233
"@angular/cli": "file:../../node_modules/@angular/cli",
3334
"@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
3435
"@angular/language-service": "file:../../dist/packages-dist/language-service",

‎integration/cli-hello-world/angular.json

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@
3535
"input": "src/styles.css"
3636
}
3737
],
38-
"scripts": []
38+
"scripts": [],
39+
"progress": false
3940
},
4041
"configurations": {
4142
"dev": {
@@ -116,7 +117,9 @@
116117
"input": "/src",
117118
"output": "/"
118119
}
119-
]
120+
],
121+
"progress": false,
122+
"watch": false
120123
}
121124
},
122125
"lint": {
@@ -143,7 +146,8 @@
143146
"builder": "@angular-devkit/build-angular:protractor",
144147
"options": {
145148
"protractorConfig": "./protractor.conf.js",
146-
"devServerTarget": "cli-hello-world:serve"
149+
"devServerTarget": "cli-hello-world:serve",
150+
"webdriverUpdate": false
147151
},
148152
"configurations": {
149153
"production": {

‎integration/cli-hello-world/package.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33
"version": "0.0.0",
44
"license": "MIT",
55
"scripts": {
6-
"build": "ng build --prod --progress=false",
7-
"e2e": "ng e2e --webdriver-update=false",
6+
"build": "ng build --prod",
7+
"e2e": "ng e2e",
88
"lint": "ng lint",
99
"ng": "ng",
10-
"postinstall": "webdriver-manager update --gecko=false --standalone=false $CI_CHROMEDRIVER_VERSION_ARG",
10+
"postinstall": "yarn update-webdriver && ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points",
11+
"update-webdriver": "webdriver-manager update --gecko=false --standalone=false $CI_CHROMEDRIVER_VERSION_ARG",
1112
"start": "ng serve",
1213
"pretest": "ng version",
13-
"test": "ng test --progress=false --watch=false && yarn e2e --configuration=ci && yarn e2e --configuration=ci-production"
14+
"test": "ng test && yarn e2e --configuration=ci && yarn e2e --configuration=ci-production"
1415
},
1516
"private": true,
1617
"dependencies": {
@@ -28,7 +29,7 @@
2829
"zone.js": "file:../../node_modules/zone.js"
2930
},
3031
"devDependencies": {
31-
"@angular-devkit/build-angular": "^0.900.0-next.11",
32+
"@angular-devkit/build-angular": "0.900.0-next.12",
3233
"@angular/cli": "file:../../node_modules/@angular/cli",
3334
"@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
3435
"@angular/language-service": "file:../../dist/packages-dist/language-service",

‎integration/ng_update_migrations/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
"zone.js": "file:../../node_modules/zone.js"
2525
},
2626
"devDependencies": {
27-
"@angular-devkit/build-angular": "^0.900.0-next.11",
28-
"@angular/cli": "^9.0.0-next.9",
27+
"@angular-devkit/build-angular": "0.900.0-next.12",
28+
"@angular/cli": "file:../../node_modules/@angular/cli",
2929
"@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
3030
"@angular/language-service": "file:../../dist/packages-dist/language-service",
3131
"@types/jasmine": "~3.3.8",

‎integration/run_tests.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,9 @@ for testDir in ${TEST_DIRS}; do
5757
yarn install --cache-folder ../$cache
5858
yarn test || exit 1
5959

60-
# Track payload size for cli-hello-world, cli-hello-world-ivy-minimal, cli-hello-world-ivy-compat and
61-
# hello_world__closure
62-
if $CI && ([[ $testDir == cli-hello-world ]] || [[ $testDir == cli-hello-world-ivy-minimal ]] || [[ $testDir == cli-hello-world-ivy-compat ]] || [[ $testDir == hello_world__closure ]]); then
63-
if ([[ $testDir == cli-hello-world ]] || [[ $testDir == cli-hello-world-ivy-minimal ]] || [[ $testDir == cli-hello-world-ivy-compat ]]); then
60+
# Track payload size for cli-hello-world* tests, plus hello_world__closure
61+
if $CI && ([[ $testDir =~ cli-hello-world ]] || [[ $testDir == hello_world__closure ]]); then
62+
if ([[ $testDir =~ cli-hello-world ]]); then
6463
yarn build
6564
fi
6665

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
"// 2": "devDependencies are not used under Bazel. Many can be removed after test.sh is deleted.",
128128
"// 3": "when updating @bazel/bazel version you also need to update the RBE settings in .bazelrc (see https://github.com/angular/angular/pull/27935)",
129129
"devDependencies": {
130-
"@angular/cli": "^9.0.0-next.11",
130+
"@angular/cli": "9.0.0-next.12",
131131
"@bazel/bazel": "0.28.1",
132132
"@bazel/buildifier": "^0.26.0",
133133
"@bazel/ibazel": "^0.10.3",

0 commit comments

Comments
 (0)