Skip to content

Update Angular CLI packages, and add CLI lazy chunks and ngDevMode integration test #32957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
filipesilva wants to merge 3 commits into from
Closed

Update Angular CLI packages, and add CLI lazy chunks and ngDevMode integration test #32957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
935c5c8
test: update Angular CLI deps for integration tests
filipesilva Oct 2, 2019
37f401b
test: add integration test for lazy chunks and ngDevMode in cli apps
filipesilva Oct 2, 2019
3396ba5
test: add integration test for lazy chunks in cli apps using experime…
filipesilva Oct 15, 2019
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
37 changes: 34 additions & 3 deletions integration/_payload-limits.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,40 @@
"cli-hello-world-ivy-i18n": {

@filipesilva filipesilva Oct 17, 2019

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sizes for this test changed because they weren't actually being tracked. When I changed run_tests.sh to run over all cli-hello-world* tests, they started being tracked.

"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
}
}
},
"cli-hello-world-lazy": {
"master": {
"uncompressed": {
"runtime-es2015": 2289,
"runtime-es5": 2286,
"main-es2015": 262844,
"main-es5": 309747,
"polyfills-es2015": 36808,
"polyfills-es5": 127499,
"5-es2015": 751,
"5-es5": 1234
}
}
},
"cli-hello-world-lazy-rollup": {
"master": {
"uncompressed": {
"runtime-es2015": 2289,
"runtime-es5": 2286,
"main-es2015": 225584,
"main-es5": 269438,
"polyfills-es2015": 36808,
"polyfills-es5": 127675,
"5-es2015": 779,
"5-es5": 1304
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion integration/bazel/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
10 changes: 7 additions & 3 deletions integration/cli-hello-world-ivy-compat/angular.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
"styles": [
"src/styles.css"
],
"scripts": []
"scripts": [],
"progress": false
},
"configurations": {
"production": {
Expand Down Expand Up @@ -95,7 +96,9 @@
"assets": [
"src/favicon.ico",
"src/assets"
]
],
"progress": false,
"watch": false
}
},
"lint": {
Expand All @@ -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": {
Expand Down
10 changes: 5 additions & 5 deletions integration/cli-hello-world-ivy-compat/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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",
Expand Down
10 changes: 6 additions & 4 deletions integration/cli-hello-world-ivy-i18n/angular.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"progress": false,
"outputPath": "dist",
"index": "src/index.html",
"main": "src/main.ts",
Expand All @@ -29,7 +28,8 @@
"styles": [
"src/styles.css"
],
"scripts": []
"scripts": [],
"progress": false
},
"configurations": {
"view-engine": {
Expand Down Expand Up @@ -113,7 +113,9 @@
"assets": [
"src/favicon.ico",
"src/assets"
]
],
"progress": false,
"watch": false
}
},
"lint": {
Expand All @@ -140,7 +142,7 @@
"options": {
"protractorConfig": "e2e/runtime/protractor.conf.js",
"devServerTarget": "cli-hello-world-ivy-compat:serve",
"webdriverUpdate": true
"webdriverUpdate": false
},
"configurations": {
"production": {
Expand Down
19 changes: 10 additions & 9 deletions integration/cli-hello-world-ivy-i18n/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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",
Expand Down
10 changes: 7 additions & 3 deletions integration/cli-hello-world-ivy-minimal/angular.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
"styles": [
"src/styles.css"
],
"scripts": []
"scripts": [],
"progress": false
},
"configurations": {
"production": {
Expand Down Expand Up @@ -95,7 +96,9 @@
"assets": [
"src/favicon.ico",
"src/assets"
]
],
"progress": false,
"watch": false
}
},
"lint": {
Expand All @@ -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": {
Expand Down
11 changes: 6 additions & 5 deletions integration/cli-hello-world-ivy-minimal/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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",
Expand Down
13 changes: 13 additions & 0 deletions integration/cli-hello-world-lazy-rollup/.editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Editor configuration, see https://editorconfig.org
root = true

[*]
charset = utf-8
indent_style = space
indent_size = 2
insert_final_newline = true
trim_trailing_whitespace = true

[*.md]
max_line_length = off
trim_trailing_whitespace = false
46 changes: 46 additions & 0 deletions integration/cli-hello-world-lazy-rollup/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# 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

# dependencies
/node_modules

# profiling files
chrome-profiler-events*.json
speed-measure-plugin*.json

# IDEs and editors
/.idea
.project
.classpath
.c9/
*.launch
.settings/
*.sublime-workspace

# IDE - VSCode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
.history/*

# misc
/.sass-cache
/connect.lock
/coverage
/libpeerconnection.log
npm-debug.log
yarn-error.log
testem.log
/typings

# System Files
.DS_Store
Thumbs.db
5 changes: 5 additions & 0 deletions integration/cli-hello-world-lazy-rollup/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# CliHelloWorldLazyRollup

This test checks bundle sizes when there is a lazy module and experimentalRollupPass is used. It also checks if the `ngDevMode` global variable and string references in `packages/core/src/util/ng_dev_mode.ts` are correctly removed.

This test contains a lazy route to ensure `ngDevMode` removal happens even across chunks, and a payload size check in `../_payload-limits.json` to ensure extra code is not retained accidentally.
Loading