diff --git a/integration/cli-hello-world-ivy-i18n/.gitignore b/integration/cli-hello-world-ivy-i18n/.gitignore new file mode 100644 index 0000000000..86d943a9b2 --- /dev/null +++ b/integration/cli-hello-world-ivy-i18n/.gitignore @@ -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 diff --git a/integration/cli-hello-world-ivy-i18n/README.md b/integration/cli-hello-world-ivy-i18n/README.md index 85900831eb..d4654427b6 100644 --- a/integration/cli-hello-world-ivy-i18n/README.md +++ b/integration/cli-hello-world-ivy-i18n/README.md @@ -1,6 +1,6 @@ -# CliHelloWorldIvy +# CliHelloWorldIvyI18n -This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 7.2.0-rc.0. +This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 9.0.0-next.9. ## Development server diff --git a/integration/cli-hello-world-ivy-i18n/angular.json b/integration/cli-hello-world-ivy-i18n/angular.json index 348114339e..b378f28c32 100644 --- a/integration/cli-hello-world-ivy-i18n/angular.json +++ b/integration/cli-hello-world-ivy-i18n/angular.json @@ -1,17 +1,14 @@ { "$schema": "./node_modules/@angular/cli/lib/config/schema.json", "version": 1, - "cli": { - "packageManager": "yarn" - }, "newProjectRoot": "projects", "projects": { - "cli-hello-world-ivy-compat": { + "cli-hello-world-ivy-i18n": { + "projectType": "application", + "schematics": {}, "root": "", "sourceRoot": "src", - "projectType": "application", "prefix": "app", - "schematics": {}, "architect": { "build": { "builder": "@angular-devkit/build-angular:browser", @@ -20,7 +17,7 @@ "index": "src/index.html", "main": "src/main.ts", "polyfills": "src/polyfills.ts", - "tsConfig": "src/tsconfig.app.json", + "tsConfig": "tsconfig.app.json", "assets": [ "src/favicon.ico", "src/assets" @@ -33,7 +30,7 @@ }, "configurations": { "view-engine": { - "tsConfig": "src/tsconfig.view-engine.json" + "tsConfig": "tsconfig.view-engine.json" }, "production": { "fileReplacements": [ @@ -56,11 +53,16 @@ "type": "initial", "maximumWarning": "2mb", "maximumError": "5mb" + }, + { + "type": "anyComponentStyle", + "maximumWarning": "6kb", + "maximumError": "10kb" } ] }, "translated-legacy": { - "tsConfig": "src/tsconfig.legacy.json", + "tsConfig": "tsconfig.legacy.json", "optimization": true, "outputHashing": "all", "sourceMap": false, @@ -76,17 +78,17 @@ "serve": { "builder": "@angular-devkit/build-angular:dev-server", "options": { - "browserTarget": "cli-hello-world-ivy-compat:build" + "browserTarget": "cli-hello-world-ivy-i18n:build" }, "configurations": { "production": { - "browserTarget": "cli-hello-world-ivy-compat:build:production" + "browserTarget": "cli-hello-world-ivy-i18n:build:production" }, "ci": { "progress": false }, "ci-production": { - "browserTarget": "cli-hello-world-ivy-compat:build:production", + "browserTarget": "cli-hello-world-ivy-i18n:build:production", "progress": false } } @@ -94,7 +96,7 @@ "extract-i18n": { "builder": "@angular-devkit/build-angular:extract-i18n", "options": { - "browserTarget": "cli-hello-world-ivy-compat:build:view-engine", + "browserTarget": "cli-hello-world-ivy-i18n:build:view-engine", "outputPath": "../tmp/legacy-locales/", "outFile": "messages.legacy.xlf" } @@ -104,16 +106,16 @@ "options": { "main": "src/test.ts", "polyfills": "src/polyfills.ts", - "tsConfig": "src/tsconfig.spec.json", - "karmaConfig": "src/karma.conf.js", - "styles": [ - "src/styles.css" - ], - "scripts": [], + "tsConfig": "tsconfig.spec.json", + "karmaConfig": "karma.conf.js", "assets": [ "src/favicon.ico", "src/assets" ], + "styles": [ + "src/styles.css" + ], + "scripts": [], "progress": false, "watch": false } @@ -122,37 +124,31 @@ "builder": "@angular-devkit/build-angular:tslint", "options": { "tsConfig": [ - "src/tsconfig.app.json", - "src/tsconfig.spec.json" + "tsconfig.app.json", + "tsconfig.spec.json", + "e2e/tsconfig.json" ], "exclude": [ "**/node_modules/**" ] } - } - } - }, - "cli-hello-world-ivy-compat-e2e": { - "root": "e2e/", - "projectType": "application", - "prefix": "", - "architect": { + }, "e2e": { "builder": "@angular-devkit/build-angular:protractor", "options": { "protractorConfig": "e2e/runtime/protractor.conf.js", - "devServerTarget": "cli-hello-world-ivy-compat:serve", + "devServerTarget": "cli-hello-world-ivy-i18n:serve", "webdriverUpdate": false }, "configurations": { "production": { - "devServerTarget": "cli-hello-world-ivy-compat:serve:production" + "devServerTarget": "cli-hello-world-ivy-i18n:serve:production" }, "ci": { - "devServerTarget": "cli-hello-world-ivy-compat:serve:ci" + "devServerTarget": "cli-hello-world-ivy-i18n:serve:ci" }, "ci-production": { - "devServerTarget": "cli-hello-world-ivy-compat:serve:ci-production" + "devServerTarget": "cli-hello-world-ivy-i18n:serve:ci-production" }, "translated-legacy": { "devServerTarget": "", @@ -171,18 +167,8 @@ "protractorConfig": "e2e/de/protractor.conf.js" } } - }, - "lint": { - "builder": "@angular-devkit/build-angular:tslint", - "options": { - "tsConfig": "e2e/tsconfig.e2e.json", - "exclude": [ - "**/node_modules/**" - ] - } } } - } - }, - "defaultProject": "cli-hello-world-ivy-compat" + }}, + "defaultProject": "cli-hello-world-ivy-i18n" } diff --git a/integration/cli-hello-world-ivy-i18n/browserslist b/integration/cli-hello-world-ivy-i18n/browserslist new file mode 100644 index 0000000000..80848532e4 --- /dev/null +++ b/integration/cli-hello-world-ivy-i18n/browserslist @@ -0,0 +1,12 @@ +# This file is used by the build system to adjust CSS and JS output to support the specified browsers below. +# For additional information regarding the format and rule options, please see: +# https://github.com/browserslist/browserslist#queries + +# You can see what browsers were selected by your queries by running: +# npx browserslist + +> 0.5% +last 2 versions +Firefox ESR +not dead +not IE 9-11 # For IE 9-11 support, remove 'not'. \ No newline at end of file diff --git a/integration/cli-hello-world-ivy-i18n/e2e/protractor.conf.js b/integration/cli-hello-world-ivy-i18n/e2e/protractor.conf.js index 71baa5048b..b5fe2936d2 100644 --- a/integration/cli-hello-world-ivy-i18n/e2e/protractor.conf.js +++ b/integration/cli-hello-world-ivy-i18n/e2e/protractor.conf.js @@ -1,8 +1,12 @@ +// @ts-check // Protractor configuration file, see link for more information // https://github.com/angular/protractor/blob/master/lib/config.ts const { SpecReporter } = require('jasmine-spec-reporter'); +/** + * @type { import("protractor").Config } + */ exports.config = { allScriptsTimeout: 11000, specs: [ @@ -25,7 +29,7 @@ exports.config = { }, onPrepare() { require('ts-node').register({ - project: require('path').join(__dirname, './tsconfig.e2e.json') + project: require('path').join(__dirname, './tsconfig.json') }); jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } })); } diff --git a/integration/cli-hello-world-ivy-i18n/e2e/tsconfig.e2e.json b/integration/cli-hello-world-ivy-i18n/e2e/tsconfig.json similarity index 84% rename from integration/cli-hello-world-ivy-i18n/e2e/tsconfig.e2e.json rename to integration/cli-hello-world-ivy-i18n/e2e/tsconfig.json index a6dd622028..39b800f789 100644 --- a/integration/cli-hello-world-ivy-i18n/e2e/tsconfig.e2e.json +++ b/integration/cli-hello-world-ivy-i18n/e2e/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../tsconfig.json", "compilerOptions": { - "outDir": "../out-tsc/app", + "outDir": "../out-tsc/e2e", "module": "commonjs", "target": "es5", "types": [ @@ -10,4 +10,4 @@ "node" ] } -} \ No newline at end of file +} diff --git a/integration/cli-hello-world-ivy-i18n/src/karma.conf.js b/integration/cli-hello-world-ivy-i18n/karma.conf.js similarity index 81% rename from integration/cli-hello-world-ivy-i18n/src/karma.conf.js rename to integration/cli-hello-world-ivy-i18n/karma.conf.js index 375eb671d0..d8d068fb67 100644 --- a/integration/cli-hello-world-ivy-i18n/src/karma.conf.js +++ b/integration/cli-hello-world-ivy-i18n/karma.conf.js @@ -16,7 +16,7 @@ module.exports = function (config) { clearContext: false // leave Jasmine Spec Runner output visible in browser }, coverageIstanbulReporter: { - dir: require('path').join(__dirname, 'coverage'), + dir: require('path').join(__dirname, './coverage/latest-app'), reports: ['html', 'lcovonly', 'text-summary'], fixWebpackSourcePaths: true }, @@ -25,13 +25,8 @@ module.exports = function (config) { colors: true, logLevel: config.LOG_INFO, autoWatch: true, - browsers: ['CustomChrome'], + browsers: ['Chrome'], singleRun: false, - customLaunchers: { - CustomChrome: { - base: 'Chrome', - flags: ['--no-sandbox'] - } - } + restartOnFileChange: true }); }; diff --git a/integration/cli-hello-world-ivy-i18n/package.json b/integration/cli-hello-world-ivy-i18n/package.json index 6e758f2050..89b17898dd 100644 --- a/integration/cli-hello-world-ivy-i18n/package.json +++ b/integration/cli-hello-world-ivy-i18n/package.json @@ -12,23 +12,23 @@ "start": "ng serve", "pretest": "ng version", "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}}\"", + "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:serve": "serve ../tmp/translations/fr --listen 4200", "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:serve": "serve ../tmp/translations/de --listen 4200", "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:serve": "serve ../tmp/translations/en-US --listen 4200", "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: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\"" }, "private": true, @@ -54,19 +54,19 @@ "@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": "~2.8.8", + "@types/jasmine": "~3.4.0", "@types/jasminewd2": "~2.0.3", "@types/node": "file:../../node_modules/@types/node", - "codelyzer": "~4.5.0", - "jasmine-core": "~2.99.1", + "codelyzer": "^5.1.2", + "jasmine-core": "~3.5.0", "jasmine-spec-reporter": "~4.2.1", - "karma": "~3.1.1", - "karma-chrome-launcher": "~2.2.0", - "karma-coverage-istanbul-reporter": "~2.0.1", - "karma-jasmine": "~1.1.2", - "karma-jasmine-html-reporter": "^0.2.2", + "karma": "~4.3.0", + "karma-chrome-launcher": "~3.1.0", + "karma-coverage-istanbul-reporter": "~2.1.0", + "karma-jasmine": "~2.0.1", + "karma-jasmine-html-reporter": "^1.4.2", "protractor": "file:../../node_modules/protractor", - "ts-node": "~7.0.0", + "ts-node": "~8.3.0", "tslint": "~5.18.0", "typescript": "file:../../node_modules/typescript" } diff --git a/integration/cli-hello-world-ivy-i18n/src/browserslist b/integration/cli-hello-world-ivy-i18n/src/browserslist deleted file mode 100644 index 37371cb04b..0000000000 --- a/integration/cli-hello-world-ivy-i18n/src/browserslist +++ /dev/null @@ -1,11 +0,0 @@ -# This file is currently used by autoprefixer to adjust CSS to support the below specified browsers -# For additional information regarding the format and rule options, please see: -# https://github.com/browserslist/browserslist#queries -# -# For IE 9-11 support, please remove 'not' from the last line of the file and adjust as needed - -> 0.5% -last 2 versions -Firefox ESR -not dead -not IE 9-11 \ No newline at end of file diff --git a/integration/cli-hello-world-ivy-i18n/src/favicon.ico b/integration/cli-hello-world-ivy-i18n/src/favicon.ico index 8081c7ceaf..997406ad22 100644 Binary files a/integration/cli-hello-world-ivy-i18n/src/favicon.ico and b/integration/cli-hello-world-ivy-i18n/src/favicon.ico differ diff --git a/integration/cli-hello-world-ivy-i18n/src/index.html b/integration/cli-hello-world-ivy-i18n/src/index.html index 14112704fa..5df4a336a2 100644 --- a/integration/cli-hello-world-ivy-i18n/src/index.html +++ b/integration/cli-hello-world-ivy-i18n/src/index.html @@ -2,7 +2,7 @@
-