From 3ae72dccfb88f59ba1959819df691344bb3d055f Mon Sep 17 00:00:00 2001 From: Filipe Silva Date: Wed, 16 Oct 2019 13:04:33 +0100 Subject: [PATCH] test: update integration/cli-hello-world-ivy-i18n project structure (#33175) PR Close #33175 --- .../cli-hello-world-ivy-i18n/.gitignore | 46 +++++++ .../cli-hello-world-ivy-i18n/README.md | 4 +- .../cli-hello-world-ivy-i18n/angular.json | 76 +++++------ .../cli-hello-world-ivy-i18n/browserslist | 12 ++ .../e2e/protractor.conf.js | 6 +- .../e2e/{tsconfig.e2e.json => tsconfig.json} | 4 +- .../{src => }/karma.conf.js | 11 +- .../cli-hello-world-ivy-i18n/package.json | 32 ++--- .../cli-hello-world-ivy-i18n/src/browserslist | 11 -- .../cli-hello-world-ivy-i18n/src/favicon.ico | Bin 5430 -> 948 bytes .../cli-hello-world-ivy-i18n/src/index.html | 2 +- .../cli-hello-world-ivy-i18n/src/polyfills.ts | 28 +--- .../src/tsconfig.app.json | 14 -- .../src/tsconfig.spec.json | 21 --- .../cli-hello-world-ivy-i18n/src/tslint.json | 17 --- .../tsconfig.app.json | 14 ++ .../cli-hello-world-ivy-i18n/tsconfig.json | 10 +- .../{src => }/tsconfig.legacy.json | 0 .../tsconfig.spec.json | 18 +++ .../{src => }/tsconfig.view-engine.json | 0 .../cli-hello-world-ivy-i18n/tslint.json | 125 ++++++------------ 21 files changed, 202 insertions(+), 249 deletions(-) create mode 100644 integration/cli-hello-world-ivy-i18n/.gitignore create mode 100644 integration/cli-hello-world-ivy-i18n/browserslist rename integration/cli-hello-world-ivy-i18n/e2e/{tsconfig.e2e.json => tsconfig.json} (84%) rename integration/cli-hello-world-ivy-i18n/{src => }/karma.conf.js (81%) delete mode 100644 integration/cli-hello-world-ivy-i18n/src/browserslist delete mode 100644 integration/cli-hello-world-ivy-i18n/src/tsconfig.app.json delete mode 100644 integration/cli-hello-world-ivy-i18n/src/tsconfig.spec.json delete mode 100644 integration/cli-hello-world-ivy-i18n/src/tslint.json create mode 100644 integration/cli-hello-world-ivy-i18n/tsconfig.app.json rename integration/cli-hello-world-ivy-i18n/{src => }/tsconfig.legacy.json (100%) create mode 100644 integration/cli-hello-world-ivy-i18n/tsconfig.spec.json rename integration/cli-hello-world-ivy-i18n/{src => }/tsconfig.view-engine.json (100%) 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 8081c7ceaf2be08bf59010158c586170d9d2d517..997406ad22c29aae95893fb3d666c30258a09537 100644 GIT binary patch literal 948 zcmV;l155mgP)CBYU7IjCFmI-B}4sMJt3^s9NVg!P0 z6hDQy(L`XWMkB@zOLgN$4KYz;j0zZxq9KKdpZE#5@k0crP^5f9KO};h)ZDQ%ybhht z%t9#h|nu0K(bJ ztIkhEr!*UyrZWQ1k2+YkGqDi8Z<|mIN&$kzpKl{cNP=OQzXHz>vn+c)F)zO|Bou>E z2|-d_=qY#Y+yOu1a}XI?cU}%04)zz%anD(XZC{#~WreV!a$7k2Ug`?&CUEc0EtrkZ zL49MB)h!_K{H(*l_93D5tO0;BUnvYlo+;yss%n^&qjt6fZOa+}+FDO(~2>G z2dx@=JZ?DHP^;b7*Y1as5^uphBsh*s*z&MBd?e@I>-9kU>63PjP&^#5YTOb&x^6Cf z?674rmSHB5Fk!{Gv7rv!?qX#ei_L(XtwVqLX3L}$MI|kJ*w(rhx~tc&L&xP#?cQow zX_|gx$wMr3pRZIIr_;;O|8fAjd;1`nOeu5K(pCu7>^3E&D2OBBq?sYa(%S?GwG&_0-s%_v$L@R!5H_fc)lOb9ZoOO#p`Nn`KU z3LTTBtjwo`7(HA6 z7gmO$yTR!5L>Bsg!X8616{JUngg_@&85%>W=mChTR;x4`P=?PJ~oPuy5 zU-L`C@_!34D21{fD~Y8NVnR3t;aqZI3fIhmgmx}$oc-dKDC6Ap$Gy>a!`A*x2L1v0 WcZ@i?LyX}70000}`90e12m8T*36WoeDLA&SD_hw{H^wM!cl_RWcVA!I+x87ee975; z@4kD^=bYPn&pmG@(+JZ`rqQEKxW<}RzhW}I!|ulN=fmjVi@x{p$cC`)5$a!)X&U+blKNvN5tg=uLvuLnuqRM;Yc*swiexsoh#XPNu{9F#c`G zQLe{yWA(Y6(;>y|-efAy11k<09(@Oo1B2@0`PtZSkqK&${ zgEY}`W@t{%?9u5rF?}Y7OL{338l*JY#P!%MVQY@oqnItpZ}?s z!r?*kwuR{A@jg2Chlf0^{q*>8n5Ir~YWf*wmsh7B5&EpHfd5@xVaj&gqsdui^spyL zB|kUoblGoO7G(MuKTfa9?pGH0@QP^b#!lM1yHWLh*2iq#`C1TdrnO-d#?Oh@XV2HK zKA{`eo{--^K&MW66Lgsktfvn#cCAc*(}qsfhrvOjMGLE?`dHVipu1J3Kgr%g?cNa8 z)pkmC8DGH~fG+dlrp(5^-QBeEvkOvv#q7MBVLtm2oD^$lJZx--_=K&Ttd=-krx(Bb zcEoKJda@S!%%@`P-##$>*u%T*mh+QjV@)Qa=Mk1?#zLk+M4tIt%}wagT{5J%!tXAE;r{@=bb%nNVxvI+C+$t?!VJ@0d@HIyMJTI{vEw0Ul ze(ha!e&qANbTL1ZneNl45t=#Ot??C0MHjjgY8%*mGisN|S6%g3;Hlx#fMNcL<87MW zZ>6moo1YD?P!fJ#Jb(4)_cc50X5n0KoDYfdPoL^iV`k&o{LPyaoqMqk92wVM#_O0l z09$(A-D+gVIlq4TA&{1T@BsUH`Bm=r#l$Z51J-U&F32+hfUP-iLo=jg7Xmy+WLq6_tWv&`wDlz#`&)Jp~iQf zZP)tu>}pIIJKuw+$&t}GQuqMd%Z>0?t%&BM&Wo^4P^Y z)c6h^f2R>X8*}q|bblAF?@;%?2>$y+cMQbN{X$)^R>vtNq_5AB|0N5U*d^T?X9{xQnJYeU{ zoZL#obI;~Pp95f1`%X3D$Mh*4^?O?IT~7HqlWguezmg?Ybq|7>qQ(@pPHbE9V?f|( z+0xo!#m@Np9PljsyxBY-UA*{U*la#8Wz2sO|48_-5t8%_!n?S$zlGe+NA%?vmxjS- zHE5O3ZarU=X}$7>;Okp(UWXJxI%G_J-@IH;%5#Rt$(WUX?6*Ux!IRd$dLP6+SmPn= z8zjm4jGjN772R{FGkXwcNv8GBcZI#@Y2m{RNF_w8(Z%^A*!bS*!}s6sh*NnURytky humW;*g7R+&|Ledvc- - CliHelloWorldIvyCompat + CliHelloWorldIvyI18n diff --git a/integration/cli-hello-world-ivy-i18n/src/polyfills.ts b/integration/cli-hello-world-ivy-i18n/src/polyfills.ts index 109e874544..22f517dff1 100644 --- a/integration/cli-hello-world-ivy-i18n/src/polyfills.ts +++ b/integration/cli-hello-world-ivy-i18n/src/polyfills.ts @@ -18,31 +18,9 @@ * BROWSER POLYFILLS */ -/** IE9, IE10, IE11, and Chrome <55 requires all of the following polyfills. - * This also includes Android Emulators with older versions of Chrome and Google Search/Googlebot - */ - -// import 'core-js/es6/symbol'; -// import 'core-js/es6/object'; -// import 'core-js/es6/function'; -// import 'core-js/es6/parse-int'; -// import 'core-js/es6/parse-float'; -// import 'core-js/es6/number'; -// import 'core-js/es6/math'; -// import 'core-js/es6/string'; -// import 'core-js/es6/date'; -// import 'core-js/es6/array'; -// import 'core-js/es6/regexp'; -// import 'core-js/es6/map'; -// import 'core-js/es6/weak-map'; -// import 'core-js/es6/set'; - /** IE10 and IE11 requires the following for NgClass support on SVG elements */ // import 'classlist.js'; // Run `npm install --save classlist.js`. -/** IE10 and IE11 requires the following for the Reflect API. */ -// import 'core-js/es6/reflect'; - /** * Web Animations `@angular/platform-browser/animations` * Only required if AnimationBuilder is used within the application and using IE/Edge or Safari. @@ -63,11 +41,9 @@ * * The following flags will work for all browsers. * - * (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch - * requestAnimationFrame + * (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame * (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick - * (window as any).__zone_symbol__BLACK_LISTED_EVENTS = ['scroll', 'mousemove']; // disable patch - * specified eventNames + * (window as any).__zone_symbol__UNPATCHED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames * * in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js * with the following flag, it will bypass `zone.js` patch for IE/Edge diff --git a/integration/cli-hello-world-ivy-i18n/src/tsconfig.app.json b/integration/cli-hello-world-ivy-i18n/src/tsconfig.app.json deleted file mode 100644 index a5831fdc4a..0000000000 --- a/integration/cli-hello-world-ivy-i18n/src/tsconfig.app.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "extends": "../tsconfig.json", - "compilerOptions": { - "outDir": "../out-tsc/app", - "types": [] - }, - "exclude": [ - "test.ts", - "**/*.spec.ts" - ], - "angularCompilerOptions": { - "enableIvy": "ngtsc" - } -} diff --git a/integration/cli-hello-world-ivy-i18n/src/tsconfig.spec.json b/integration/cli-hello-world-ivy-i18n/src/tsconfig.spec.json deleted file mode 100644 index 76ed180262..0000000000 --- a/integration/cli-hello-world-ivy-i18n/src/tsconfig.spec.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "extends": "../tsconfig.json", - "compilerOptions": { - "outDir": "../out-tsc/spec", - "types": [ - "jasmine", - "node" - ] - }, - "files": [ - "test.ts", - "polyfills.ts" - ], - "include": [ - "**/*.spec.ts", - "**/*.d.ts" - ], - "angularCompilerOptions": { - "enableIvy": "ngtsc" - } -} diff --git a/integration/cli-hello-world-ivy-i18n/src/tslint.json b/integration/cli-hello-world-ivy-i18n/src/tslint.json deleted file mode 100644 index 52e2c1a5a7..0000000000 --- a/integration/cli-hello-world-ivy-i18n/src/tslint.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "extends": "../tslint.json", - "rules": { - "directive-selector": [ - true, - "attribute", - "app", - "camelCase" - ], - "component-selector": [ - true, - "element", - "app", - "kebab-case" - ] - } -} diff --git a/integration/cli-hello-world-ivy-i18n/tsconfig.app.json b/integration/cli-hello-world-ivy-i18n/tsconfig.app.json new file mode 100644 index 0000000000..f758d9820d --- /dev/null +++ b/integration/cli-hello-world-ivy-i18n/tsconfig.app.json @@ -0,0 +1,14 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "./out-tsc/app", + "types": [] + }, + "files": [ + "src/main.ts", + "src/polyfills.ts" + ], + "include": [ + "src/**/*.d.ts" + ] +} diff --git a/integration/cli-hello-world-ivy-i18n/tsconfig.json b/integration/cli-hello-world-ivy-i18n/tsconfig.json index 0ae10d576f..30956ae7ea 100644 --- a/integration/cli-hello-world-ivy-i18n/tsconfig.json +++ b/integration/cli-hello-world-ivy-i18n/tsconfig.json @@ -5,10 +5,10 @@ "outDir": "./dist/out-tsc", "sourceMap": true, "declaration": false, - "module": "es2015", - "moduleResolution": "node", - "emitDecoratorMetadata": true, + "downlevelIteration": true, "experimentalDecorators": true, + "module": "esnext", + "moduleResolution": "node", "importHelpers": true, "target": "es2015", "typeRoots": [ @@ -18,5 +18,9 @@ "es2018", "dom" ] + }, + "angularCompilerOptions": { + "fullTemplateTypeCheck": true, + "strictInjectionParameters": true } } diff --git a/integration/cli-hello-world-ivy-i18n/src/tsconfig.legacy.json b/integration/cli-hello-world-ivy-i18n/tsconfig.legacy.json similarity index 100% rename from integration/cli-hello-world-ivy-i18n/src/tsconfig.legacy.json rename to integration/cli-hello-world-ivy-i18n/tsconfig.legacy.json diff --git a/integration/cli-hello-world-ivy-i18n/tsconfig.spec.json b/integration/cli-hello-world-ivy-i18n/tsconfig.spec.json new file mode 100644 index 0000000000..6400fde7d5 --- /dev/null +++ b/integration/cli-hello-world-ivy-i18n/tsconfig.spec.json @@ -0,0 +1,18 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "./out-tsc/spec", + "types": [ + "jasmine", + "node" + ] + }, + "files": [ + "src/test.ts", + "src/polyfills.ts" + ], + "include": [ + "src/**/*.spec.ts", + "src/**/*.d.ts" + ] +} diff --git a/integration/cli-hello-world-ivy-i18n/src/tsconfig.view-engine.json b/integration/cli-hello-world-ivy-i18n/tsconfig.view-engine.json similarity index 100% rename from integration/cli-hello-world-ivy-i18n/src/tsconfig.view-engine.json rename to integration/cli-hello-world-ivy-i18n/tsconfig.view-engine.json diff --git a/integration/cli-hello-world-ivy-i18n/tslint.json b/integration/cli-hello-world-ivy-i18n/tslint.json index 4370015671..c8d70f1520 100644 --- a/integration/cli-hello-world-ivy-i18n/tslint.json +++ b/integration/cli-hello-world-ivy-i18n/tslint.json @@ -1,32 +1,32 @@ { - "rulesDirectory": [ - "codelyzer" - ], + "extends": "tslint:recommended", "rules": { - "arrow-return-shorthand": true, - "callable-types": true, - "class-name": true, - "comment-format": [ - true, - "check-space" - ], - "curly": true, + "array-type": false, + "arrow-parens": false, "deprecation": { - "severity": "warn" + "severity": "warning" }, - "eofline": true, - "forin": true, + "component-class-suffix": true, + "contextual-lifecycle": true, + "directive-class-suffix": true, + "directive-selector": [ + true, + "attribute", + "app", + "camelCase" + ], + "component-selector": [ + true, + "element", + "app", + "kebab-case" + ], "import-blacklist": [ true, "rxjs/Rx" ], - "import-spacing": true, - "indent": [ - true, - "spaces" - ], - "interface-over-type-literal": true, - "label-position": true, + "interface-name": false, + "max-classes-per-file": false, "max-line-length": [ true, 140 @@ -43,8 +43,7 @@ ] } ], - "no-arg": true, - "no-bitwise": true, + "no-consecutive-blank-lines": false, "no-console": [ true, "debug", @@ -53,78 +52,40 @@ "timeEnd", "trace" ], - "no-construct": true, - "no-debugger": true, - "no-duplicate-super": true, "no-empty": false, - "no-empty-interface": true, - "no-eval": true, "no-inferrable-types": [ true, "ignore-params" ], - "no-misused-new": true, "no-non-null-assertion": true, "no-redundant-jsdoc": true, - "no-shadowed-variable": true, - "no-string-literal": false, - "no-string-throw": true, "no-switch-case-fall-through": true, - "no-trailing-whitespace": true, - "no-unnecessary-initializer": true, - "no-unused-expression": true, - "no-var-keyword": true, - "object-literal-sort-keys": false, - "one-line": [ + "no-var-requires": false, + "object-literal-key-quotes": [ true, - "check-open-brace", - "check-catch", - "check-else", - "check-whitespace" + "as-needed" ], - "prefer-const": true, + "object-literal-sort-keys": false, + "ordered-imports": false, "quotemark": [ true, "single" ], - "radix": true, - "semicolon": [ - true, - "always" - ], - "triple-equals": [ - true, - "allow-null-check" - ], - "typedef-whitespace": [ - true, - { - "call-signature": "nospace", - "index-signature": "nospace", - "parameter": "nospace", - "property-declaration": "nospace", - "variable-declaration": "nospace" - } - ], - "unified-signatures": true, - "variable-name": false, - "whitespace": [ - true, - "check-branch", - "check-decl", - "check-operator", - "check-separator", - "check-type" - ], - "no-output-on-prefix": true, - "use-input-property-decorator": true, - "use-output-property-decorator": true, - "use-host-property-decorator": true, + "trailing-comma": false, + "no-conflicting-lifecycle": true, + "no-host-metadata-property": true, "no-input-rename": true, + "no-inputs-metadata-property": true, + "no-output-native": true, + "no-output-on-prefix": true, "no-output-rename": true, - "use-life-cycle-interface": true, - "use-pipe-transform-interface": true, - "component-class-suffix": true, - "directive-class-suffix": true - } -} + "no-outputs-metadata-property": true, + "template-banana-in-box": true, + "template-no-negated-async": true, + "use-lifecycle-interface": true, + "use-pipe-transform-interface": true + }, + "rulesDirectory": [ + "codelyzer" + ] +} \ No newline at end of file