honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test: update Angular CLI deps for integration tests (#32957) 

PR Close #32957
This commit is contained in:
Filipe Silva 2019-10-02 12:28:23 +01:00 committed by Matias Niemelä
parent d7dc6cbc04
commit abd2a58c67
14 changed files with 102 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
integration/_payload-limits.json
View File

@ -29,9 +29,12 @@
"cli-hello-world-ivy-i18n": {
"master": {
"uncompressed": {
"runtime": 1485,
"main": 128254,
"polyfills": 42102
"runtime-es2015": 1485,
"runtime-es5": 1485,
"main-es2015": 128258,
"main-es5": 150321,
"polyfills-es2015": 42102,
"polyfills-es5": 136343
}
}
},

2
integration/bazel/package.json
View File

@ -14,7 +14,7 @@
"@angular/platform-browser-dynamic": "file:../../dist/packages-dist/platform-browser-dynamic",
"@angular/router": "file:../../dist/packages-dist/router",
"reflect-metadata": "0.1.12",
"rxjs": "6.5.3",
"rxjs": "file:../../node_modules/rxjs",
"tslib": "file:../../node_modules/tslib",
"zone.js": "0.10.2"
},

10
integration/cli-hello-world-ivy-compat/angular.json
View File

@ -28,7 +28,8 @@
"styles": [
"src/styles.css"
],
"scripts": []
"scripts": [],
"progress": false
},
"configurations": {
"production": {
@ -95,7 +96,9 @@
"assets": [
"src/favicon.ico",
"src/assets"
]
],
"progress": false,
"watch": false
}
},
"lint": {
@ -121,7 +124,8 @@
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "e2e/protractor.conf.js",
"devServerTarget": "cli-hello-world-ivy-compat:serve"
"devServerTarget": "cli-hello-world-ivy-compat:serve",
"webdriverUpdate": false
},
"configurations": {
"production": {

10
integration/cli-hello-world-ivy-compat/package.json
View File

@ -3,15 +3,15 @@
"version": "0.0.0",
"license": "MIT",
"scripts": {
"build": "ng build --prod --progress=false",
"e2e": "ng e2e --webdriver-update=false",
"build": "ng build --prod",
"e2e": "ng e2e",
"lint": "ng lint",
"ng": "ng",
"postinstall": "yarn update-webdriver && yarn ngcc --properties es2015 --create-ivy-entry-points",
"postinstall": "yarn update-webdriver && ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points",
"update-webdriver": "webdriver-manager update --gecko=false --standalone=false $CI_CHROMEDRIVER_VERSION_ARG",
"start": "ng serve",
"pretest": "ng version",
"test": "ng test --progress=false --watch=false && yarn e2e --configuration=ci && yarn e2e --configuration=ci-production"
"test": "ng test && yarn e2e --configuration=ci && yarn e2e --configuration=ci-production"
},
"private": true,
"dependencies": {
@ -29,7 +29,7 @@
"zone.js": "file:../../node_modules/zone.js"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.900.0-next.11",
"@angular-devkit/build-angular": "0.900.0-next.12",
"@angular/cli": "file:../../node_modules/@angular/cli",
"@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
"@angular/language-service": "file:../../dist/packages-dist/language-service",

10
integration/cli-hello-world-ivy-i18n/angular.json
View File

@ -16,7 +16,6 @@
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"progress": false,
"outputPath": "dist",
"index": "src/index.html",
"main": "src/main.ts",
@ -29,7 +28,8 @@
"styles": [
"src/styles.css"
],
"scripts": []
"scripts": [],
"progress": false
},
"configurations": {
"view-engine": {
@ -113,7 +113,9 @@
"assets": [
"src/favicon.ico",
"src/assets"
]
],
"progress": false,
"watch": false
}
},
"lint": {
@ -140,7 +142,7 @@
"options": {
"protractorConfig": "e2e/runtime/protractor.conf.js",
"devServerTarget": "cli-hello-world-ivy-compat:serve",
"webdriverUpdate": true
"webdriverUpdate": false
},
"configurations": {
"production": {

19
integration/cli-hello-world-ivy-i18n/package.json
View File

@ -3,32 +3,33 @@
"version": "0.0.0",
"license": "MIT",
"scripts": {
"build": "ng build --prod --progress=false",
"e2e": "ng e2e --webdriver-update=false",
"build": "ng build --prod",
"e2e": "ng e2e",
"lint": "ng lint",
"ng": "ng",
"postinstall": "webdriver-manager update --gecko=false --standalone=false $CI_CHROMEDRIVER_VERSION_ARG",
"postinstall": "yarn update-webdriver && ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points",
"update-webdriver": "webdriver-manager update --gecko=false --standalone=false $CI_CHROMEDRIVER_VERSION_ARG",
"start": "ng serve",
"pretest": "ng version",
"test": "ng test --progress=false --watch=false && yarn e2e --configuration=ci && yarn e2e --configuration=ci-production && yarn translated:test && yarn translated:legacy:test",
"test": "ng test && yarn e2e --configuration=ci && yarn e2e --configuration=ci-production && yarn translated:test && yarn translated:legacy:test",
"translate": "localize-translate -r \"dist/\" -s \"**/*\" -l \"en-US\" -t \"src/locales/messages.*\" -o \"tmp/translations/{{LOCALE}}\"",
"translated:test": "yarn build && yarn translate && yarn translated:fr:e2e && yarn translated:de:e2e && yarn translated:en:e2e",
"translated:fr:serve": "serve tmp/translations/fr --listen 4200",
"translated:fr:e2e": "npm-run-all -p -r translated:fr:serve \"ng e2e --configuration=translated-fr --webdriver-update=false\"",
"translated:fr:e2e": "npm-run-all -p -r translated:fr:serve \"ng e2e --configuration=translated-fr\"",
"translated:de:serve": "serve tmp/translations/de --listen 4200",
"translated:de:e2e": "npm-run-all -p -r translated:de:serve \"ng e2e --configuration=translated-de --webdriver-update=false\"",
"translated:de:e2e": "npm-run-all -p -r translated:de:serve \"ng e2e --configuration=translated-de\"",
"translated:en:serve": "serve tmp/translations/en-US --listen 4200",
"translated:en:e2e": "npm-run-all -p -r translated:en:serve \"ng e2e --configuration=translated-en --webdriver-update=false\"",
"translated:en:e2e": "npm-run-all -p -r translated:en:serve \"ng e2e --configuration=translated-en\"",
"translated:legacy:test": "yarn translated:legacy:extract-and-update && ng build --configuration=translated-legacy && yarn translated:legacy:translate && yarn translated:legacy:e2e",
"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",
"translated:legacy:translate": "localize-translate -r \"dist/\" -s \"**/*\" -t \"tmp/legacy-locales/messages.legacy.xlf\" -o \"tmp/translations/{{LOCALE}}\"",
"translated:legacy:serve": "serve tmp/translations/legacy --listen 4200",
"translated:legacy:e2e": "npm-run-all -p -r translated:legacy:serve \"ng e2e --configuration=translated-legacy --webdriver-update=false\""
"translated:legacy:e2e": "npm-run-all -p -r translated:legacy:serve \"ng e2e --configuration=translated-legacy\""
},
"private": true,
"dependencies": {
@ -49,7 +50,7 @@
"zone.js": "file:../../node_modules/zone.js"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.900.0-next.11",
"@angular-devkit/build-angular": "0.900.0-next.12",
"@angular/cli": "file:../../node_modules/@angular/cli",
"@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
"@angular/language-service": "file:../../dist/packages-dist/language-service",

10
integration/cli-hello-world-ivy-minimal/angular.json
View File

@ -28,7 +28,8 @@
"styles": [
"src/styles.css"
],
"scripts": []
"scripts": [],
"progress": false
},
"configurations": {
"production": {
@ -95,7 +96,9 @@
"assets": [
"src/favicon.ico",
"src/assets"
]
],
"progress": false,
"watch": false
}
},
"lint": {
@ -121,7 +124,8 @@
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "e2e/protractor.conf.js",
"devServerTarget": "cli-hello-world-ivy-minimal:serve"
"devServerTarget": "cli-hello-world-ivy-minimal:serve",
"webdriverUpdate": false
},
"configurations": {
"production": {

11
integration/cli-hello-world-ivy-minimal/package.json
View File

@ -3,14 +3,15 @@
"version": "0.0.0",
"license": "MIT",
"scripts": {
"build": "ng build --prod --progress=false",
"e2e": "ng e2e --webdriver-update=false",
"build": "ng build --prod",
"e2e": "ng e2e",
"lint": "ng lint",
"ng": "ng",
"postinstall": "webdriver-manager update --gecko=false --standalone=false $CI_CHROMEDRIVER_VERSION_ARG && yarn ngcc",
"postinstall": "yarn update-webdriver && ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points",
"update-webdriver": "webdriver-manager update --gecko=false --standalone=false $CI_CHROMEDRIVER_VERSION_ARG",
"start": "ng serve",
"pretest": "ng version",
"test": "ng test --progress=false --watch=false && yarn e2e --configuration=ci && yarn e2e --configuration=ci-production"
"test": "ng test && yarn e2e --configuration=ci && yarn e2e --configuration=ci-production"
},
"private": true,
"dependencies": {
@ -28,7 +29,7 @@
"zone.js": "file:../../node_modules/zone.js"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.900.0-next.11",
"@angular-devkit/build-angular": "0.900.0-next.12",
"@angular/cli": "file:../../node_modules/@angular/cli",
"@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
"@angular/language-service": "file:../../dist/packages-dist/language-service",

10
integration/cli-hello-world/angular.json
View File

@ -35,7 +35,8 @@
"input": "src/styles.css"
}
],
"scripts": []
"scripts": [],
"progress": false
},
"configurations": {
"dev": {
@ -116,7 +117,9 @@
"input": "/src",
"output": "/"
}
]
],
"progress": false,
"watch": false
}
},
"lint": {
@ -143,7 +146,8 @@
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "./protractor.conf.js",
"devServerTarget": "cli-hello-world:serve"
"devServerTarget": "cli-hello-world:serve",
"webdriverUpdate": false
},
"configurations": {
"production": {

11
integration/cli-hello-world/package.json
View File

@ -3,14 +3,15 @@
"version": "0.0.0",
"license": "MIT",
"scripts": {
"build": "ng build --prod --progress=false",
"e2e": "ng e2e --webdriver-update=false",
"build": "ng build --prod",
"e2e": "ng e2e",
"lint": "ng lint",
"ng": "ng",
"postinstall": "webdriver-manager update --gecko=false --standalone=false $CI_CHROMEDRIVER_VERSION_ARG",
"postinstall": "yarn update-webdriver && ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points",
"update-webdriver": "webdriver-manager update --gecko=false --standalone=false $CI_CHROMEDRIVER_VERSION_ARG",
"start": "ng serve",
"pretest": "ng version",
"test": "ng test --progress=false --watch=false && yarn e2e --configuration=ci && yarn e2e --configuration=ci-production"
"test": "ng test && yarn e2e --configuration=ci && yarn e2e --configuration=ci-production"
},
"private": true,
"dependencies": {
@ -28,7 +29,7 @@
"zone.js": "file:../../node_modules/zone.js"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.900.0-next.11",
"@angular-devkit/build-angular": "0.900.0-next.12",
"@angular/cli": "file:../../node_modules/@angular/cli",
"@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
"@angular/language-service": "file:../../dist/packages-dist/language-service",

4
integration/ng_update_migrations/package.json
View File

@ -24,8 +24,8 @@
"zone.js": "file:../../node_modules/zone.js"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.900.0-next.11",
"@angular/cli": "^9.0.0-next.9",
"@angular-devkit/build-angular": "0.900.0-next.12",
"@angular/cli": "file:../../node_modules/@angular/cli",
"@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
"@angular/language-service": "file:../../dist/packages-dist/language-service",
"@types/jasmine": "~3.3.8",

7
integration/run_tests.sh
View File

@ -57,10 +57,9 @@ for testDir in ${TEST_DIRS}; do
yarn install --cache-folder ../$cache
yarn test || exit 1
# Track payload size for cli-hello-world, cli-hello-world-ivy-minimal, cli-hello-world-ivy-compat and
# hello_world__closure
if $CI && ([[ $testDir == cli-hello-world ]] || [[ $testDir == cli-hello-world-ivy-minimal ]] || [[ $testDir == cli-hello-world-ivy-compat ]] || [[ $testDir == hello_world__closure ]]); then
if ([[ $testDir == cli-hello-world ]] || [[ $testDir == cli-hello-world-ivy-minimal ]] || [[ $testDir == cli-hello-world-ivy-compat ]]); then
# Track payload size for cli-hello-world* tests, plus hello_world__closure
if $CI && ([[ $testDir =~ cli-hello-world ]] || [[ $testDir == hello_world__closure ]]); then
if ([[ $testDir =~ cli-hello-world ]]); then
yarn build
fi

2
package.json
View File

@ -127,7 +127,7 @@
"// 2": "devDependencies are not used under Bazel. Many can be removed after test.sh is deleted.",
"// 3": "when updating @bazel/bazel version you also need to update the RBE settings in .bazelrc (see https://github.com/angular/angular/pull/27935)",
"devDependencies": {
"@angular/cli": "^9.0.0-next.11",
"@angular/cli": "9.0.0-next.12",
"@bazel/bazel": "0.28.1",
"@bazel/buildifier": "^0.26.0",
"@bazel/ibazel": "^0.10.3",

70
yarn.lock
View File

@ -2,12 +2,12 @@
# yarn lockfile v1
"@angular-devkit/architect@0.900.0-next.11":
version "0.900.0-next.11"
resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.900.0-next.11.tgz#c1b1f6b428903eedf70422b34471d80a1243a682"
integrity sha512-SHgxd0tou/xlBG5XTPa//l0h1czxV0CUzMQ/QoMNin0n11JXFCIBooUzg5kguR8g4LvwzTAhHIx3ZVpypTOMtQ==
"@angular-devkit/architect@0.900.0-next.12":
version "0.900.0-next.12"
resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.900.0-next.12.tgz#57d4c56c96784833b272c33932f177db22574062"
integrity sha512-WGUKwWK3Sc5GlSEgp18LE68iA/ms+OC+azi3Wdosam5VX9ovwFAjKXLkEWkf9OCnO038xEan9pjBUKl9/rF6EA==
dependencies:
"@angular-devkit/core" "9.0.0-next.11"
"@angular-devkit/core" "9.0.0-next.12"
rxjs "6.5.3"
"@angular-devkit/architect@^0.800.0-beta.15":
@ -49,10 +49,10 @@
rxjs "6.4.0"
source-map "0.7.3"
"@angular-devkit/core@9.0.0-next.11":
version "9.0.0-next.11"
resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-9.0.0-next.11.tgz#b8988c1fbfc3c42600dd5f9127cdfff4d14985b9"
integrity sha512-e95eStdGjt4waesu/E3D/J2T3AHucmovUXov/iURZCvzlzG6jCXvwWVsRh7Zk7OWqUBvyCZ5T1cn7lAPc5UW6A==
"@angular-devkit/core@9.0.0-next.12":
version "9.0.0-next.12"
resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-9.0.0-next.12.tgz#f5aecebbdffba58cac599d955ce93119aed4b225"
integrity sha512-dptS+nTrvDVvwNpBfcG65fr2U4AvHJrxpXIp4Wt1oKG4KpDZlk5C8NZVleGFzq2/Jz5GaJGerEQPDjcFldodQA==
dependencies:
ajv "6.10.2"
fast-json-stable-stringify "2.0.0"
@ -68,27 +68,27 @@
"@angular-devkit/core" "8.0.0-beta.15"
rxjs "6.4.0"
"@angular-devkit/schematics@9.0.0-next.11":
version "9.0.0-next.11"
resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-9.0.0-next.11.tgz#bb3659f1ee677db969ced806da7a8857a08633c8"
integrity sha512-853PB1+6dQLgNI6DSFmsFFR6H3ivWcEjyCQWyC74OvwtCGl8ZvrJuJLUy7TQB2f7ygkRqyaJMV7PhNpk3dw+vg==
"@angular-devkit/schematics@9.0.0-next.12":
version "9.0.0-next.12"
resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-9.0.0-next.12.tgz#a19a0705558f267c91e073b3617a948735049fe6"
integrity sha512-bDQRQU42CRyGpfbrT4HYMVPKb88Jg7mmIfO6NYl4kou/tK82scva+5bR4fzyLLB4qaVJvxQFj1jGHsGk0N6Sfw==
dependencies:
"@angular-devkit/core" "9.0.0-next.11"
"@angular-devkit/core" "9.0.0-next.12"
rxjs "6.5.3"
"@angular/bazel@file:./tools/npm/@angular_bazel":
version "0.0.0"
"@angular/cli@^9.0.0-next.11":
version "9.0.0-next.11"
resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-9.0.0-next.11.tgz#aa20668fdc6431b89c43532f567fbc9351cf9185"
integrity sha512-S31iYhtyRKt8zYCfapSWfIc1C9CLysaw/h4s6U6cmePxX1i/MNz3AiClIM7D5xqiTqv5YNrvcf0jOdC8DxYMvw==
"@angular/cli@9.0.0-next.12":
version "9.0.0-next.12"
resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-9.0.0-next.12.tgz#d0159033cc1886809c03ac0d0aa9582899149f2d"
integrity sha512-IPpp4QqBL12dIYJV+2+cc6gi8QuZbex1CsenEJ9+S5jT97WWuUWL7A5bkG76wCjhY5RAIUgq4a5hMJvW5OonVw==
dependencies:
"@angular-devkit/architect" "0.900.0-next.11"
"@angular-devkit/core" "9.0.0-next.11"
"@angular-devkit/schematics" "9.0.0-next.11"
"@schematics/angular" "9.0.0-next.11"
"@schematics/update" "0.900.0-next.11"
"@angular-devkit/architect" "0.900.0-next.12"
"@angular-devkit/core" "9.0.0-next.12"
"@angular-devkit/schematics" "9.0.0-next.12"
"@schematics/angular" "9.0.0-next.12"
"@schematics/update" "0.900.0-next.12"
"@yarnpkg/lockfile" "1.1.0"
ansi-colors "4.1.1"
debug "^4.1.1"
@ -544,13 +544,13 @@
resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=
"@schematics/angular@9.0.0-next.11":
version "9.0.0-next.11"
resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-9.0.0-next.11.tgz#166e7d8ef0d1992831dd88820c7a519ca5ab6c80"
integrity sha512-fAA2jnT4NzO286FtoqYjxugRe1wq69o1SpuKtFXbIvFGvPPQdv1/UlNGjDkuURT7SiNRuLLALOqyFXh2LC9vXg==
"@schematics/angular@9.0.0-next.12":
version "9.0.0-next.12"
resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-9.0.0-next.12.tgz#051bd81f0fd66fd43fbcbf3ecf58007b9fa3a7ed"
integrity sha512-JMulIIX364oKylS50QiYAA3ssBGjXlT3QM6fiKX3cLCpDMKh87NfoPySudxZ2JDgSDUgBBvE60atvR6EbKTQlA==
dependencies:
"@angular-devkit/core" "9.0.0-next.11"
"@angular-devkit/schematics" "9.0.0-next.11"
"@angular-devkit/core" "9.0.0-next.12"
"@angular-devkit/schematics" "9.0.0-next.12"
"@schematics/angular@^8.0.0-beta.15":
version "8.0.0-beta.15"
@ -560,13 +560,13 @@
"@angular-devkit/core" "8.0.0-beta.15"
"@angular-devkit/schematics" "8.0.0-beta.15"
"@schematics/update@0.900.0-next.11":
version "0.900.0-next.11"
resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.900.0-next.11.tgz#235c895e8ebbbf92d1e33fa2e1be5ece407c12cf"
integrity sha512-qZ/Ry3ckREcM0rCr0JUy+I076P9lSRZ8e3dgKb5lsehdP1YqNkDO+mRtbbsKD37+YlPFIOigA7OYkcol78862Q==
"@schematics/update@0.900.0-next.12":
version "0.900.0-next.12"
resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.900.0-next.12.tgz#3166e05a3372a7ddb46f62f2da788c8ea84c0eac"
integrity sha512-lpQVByLBnA9cE4yQYpF7LK5OXiYSnPytm1PVo/4Rd6bTs40VvPFTDPgDvba9l/G4G/ehi9/BKPFYKlYtHxiGAw==
dependencies:
"@angular-devkit/core" "9.0.0-next.11"
"@angular-devkit/schematics" "9.0.0-next.11"
"@angular-devkit/core" "9.0.0-next.12"
"@angular-devkit/schematics" "9.0.0-next.12"
"@yarnpkg/lockfile" "1.1.0"
ini "1.3.5"
pacote "9.5.8"