diff --git a/integration/cli-hello-world-ivy-i18n/angular.json b/integration/cli-hello-world-ivy-i18n/angular.json index d86da96275..a40b8d0b9c 100644 --- a/integration/cli-hello-world-ivy-i18n/angular.json +++ b/integration/cli-hello-world-ivy-i18n/angular.json @@ -54,6 +54,19 @@ "maximumError": "5mb" } ] + }, + "legacy-id-mode": { + "tsConfig": "src/tsconfig.legacy-id-mode.json", + "polyfills": "src/polyfills.legacy-id-mode.ts", + "optimization": true, + "outputHashing": "all", + "sourceMap": false, + "extractCss": true, + "namedChunks": false, + "aot": true, + "extractLicenses": true, + "vendorChunk": false, + "buildOptimizer": true, } } }, @@ -72,6 +85,10 @@ "ci-production": { "browserTarget": "cli-hello-world-ivy-compat:build:production", "progress": false + }, + "legacy-id-mode": { + "browserTarget": "cli-hello-world-ivy-compat:build:legacy-id-mode", + "progress": false } } }, @@ -132,6 +149,9 @@ }, "ci-production": { "devServerTarget": "cli-hello-world-ivy-compat:serve:ci-production" + }, + "legacy-id-mode": { + "devServerTarget": "cli-hello-world-ivy-compat:serve:legacy-id-mode" } } }, diff --git a/integration/cli-hello-world-ivy-i18n/package.json b/integration/cli-hello-world-ivy-i18n/package.json index 9a66221631..67d1c42a80 100644 --- a/integration/cli-hello-world-ivy-i18n/package.json +++ b/integration/cli-hello-world-ivy-i18n/package.json @@ -10,7 +10,7 @@ "postinstall": "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 --progress=false --watch=false && yarn e2e --configuration=ci && yarn e2e --configuration=ci-production && yarn e2e --configuration=legacy-id-mode" }, "private": true, "dependencies": { diff --git a/integration/cli-hello-world-ivy-i18n/src/polyfills.legacy-id-mode.ts b/integration/cli-hello-world-ivy-i18n/src/polyfills.legacy-id-mode.ts new file mode 100644 index 0000000000..5420103f35 --- /dev/null +++ b/integration/cli-hello-world-ivy-i18n/src/polyfills.legacy-id-mode.ts @@ -0,0 +1,104 @@ +/** + * This file includes polyfills needed by Angular and is loaded before the app. + * You can add your own extra polyfills to this file. + * + * This file is divided into 2 sections: + * 1. Browser polyfills. These are applied before loading ZoneJS and are sorted by browsers. + * 2. Application imports. Files imported after ZoneJS that should be loaded before your main + * file. + * + * The current setup is for so-called "evergreen" browsers; the last versions of browsers that + * automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera), + * Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile. + * + * Learn more in https://angular.io/guide/browser-support + */ + +/*************************************************************************************************** + * 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. + * Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0). + */ +// import 'web-animations-js'; // Run `npm install --save web-animations-js`. + +/** + * By default, zone.js will patch all possible macroTask and DomEvents + * user can disable parts of macroTask/DomEvents patch by setting following flags + * because those flags need to be set before `zone.js` being loaded, and webpack + * will put import in the top of bundle, so user need to create a separate file + * in this directory (for example: zone-flags.ts), and put the following flags + * into that file, and then add the following code before importing zone.js. + * import './zone-flags.ts'; + * + * The flags allowed in zone-flags.ts are listed here. + * + * The following flags will work for all browsers. + * + * (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 + * + * 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 + * + * (window as any).__Zone_enable_cross_context_check = true; + * + */ + +/*************************************************************************************************** + * Zone JS is required by default for Angular itself. + */ +import 'zone.js/dist/zone'; // Included with Angular CLI. + +/*************************************************************************************************** + * Load `$localize` onto the global scope - used if i18n tags appear in Angular templates. + */ +import '@angular/localize/init'; + +// Note that `computeMsgId` is a private API at this stage. It will probably be exported directly +// from `@angular/localize` at some point. +import {computeMsgId} from '@angular/compiler'; +import {loadTranslations} from '@angular/localize'; + +// Load some runtime translations +loadTranslations({ + // This message is in a template so it uses the legacy message id + ['2f8d6ae7ef7b0a53392bc23d0968d074ae02a318']: 'Bonjour {$INTERPOLATION}!', + // This message is in application code so it uses the normal message id + [computeMsgId('Welcome to the i18n app.')]: 'Bienvenue sur l\'application i18n.', +}); + +/*************************************************************************************************** + * APPLICATION IMPORTS + */ diff --git a/integration/cli-hello-world-ivy-i18n/src/tsconfig.legacy-id-mode.json b/integration/cli-hello-world-ivy-i18n/src/tsconfig.legacy-id-mode.json new file mode 100644 index 0000000000..2c34ebff0d --- /dev/null +++ b/integration/cli-hello-world-ivy-i18n/src/tsconfig.legacy-id-mode.json @@ -0,0 +1,7 @@ +{ + "extends": "./tsconfig.app.json", + "angularCompilerOptions": { + "enableIvy": true, + "i18nLegacyMessageIdFormat": "xlf" + } +} diff --git a/integration/cli-hello-world-ivy-i18n/yarn.lock b/integration/cli-hello-world-ivy-i18n/yarn.lock index 3ab9db4d2e..25ffde56a0 100644 --- a/integration/cli-hello-world-ivy-i18n/yarn.lock +++ b/integration/cli-hello-world-ivy-i18n/yarn.lock @@ -109,7 +109,7 @@ rxjs "6.4.0" "@angular/animations@file:../../dist/packages-dist/animations": - version "9.0.0-next.1" + version "9.0.0-next.9" dependencies: tslib "^1.9.0" @@ -138,12 +138,12 @@ uuid "^3.3.2" "@angular/common@file:../../dist/packages-dist/common": - version "9.0.0-next.1" + version "9.0.0-next.9" dependencies: tslib "^1.9.0" "@angular/compiler-cli@file:../../dist/packages-dist/compiler-cli": - version "9.0.0-next.1" + version "9.0.0-next.9" dependencies: canonical-path "1.0.0" chokidar "^2.1.1" @@ -157,38 +157,38 @@ yargs "13.1.0" "@angular/compiler@file:../../dist/packages-dist/compiler": - version "9.0.0-next.1" + version "9.0.0-next.9" dependencies: tslib "^1.9.0" "@angular/core@file:../../dist/packages-dist/core": - version "9.0.0-next.1" + version "9.0.0-next.9" dependencies: tslib "^1.9.0" "@angular/forms@file:../../dist/packages-dist/forms": - version "9.0.0-next.1" + version "9.0.0-next.9" dependencies: tslib "^1.9.0" "@angular/language-service@file:../../dist/packages-dist/language-service": - version "9.0.0-next.1" + version "9.0.0-next.9" "@angular/localize@file:../../dist/packages-dist/localize": - version "9.0.0-next.1" + version "9.0.0-next.9" "@angular/platform-browser-dynamic@file:../../dist/packages-dist/platform-browser-dynamic": - version "9.0.0-next.1" + version "9.0.0-next.9" dependencies: tslib "^1.9.0" "@angular/platform-browser@file:../../dist/packages-dist/platform-browser": - version "9.0.0-next.1" + version "9.0.0-next.9" dependencies: tslib "^1.9.0" "@angular/router@file:../../dist/packages-dist/router": - version "9.0.0-next.1" + version "9.0.0-next.9" dependencies: tslib "^1.9.0" @@ -6580,8 +6580,10 @@ run-queue@^1.0.0, run-queue@^1.0.3: dependencies: aproba "^1.1.1" -rxjs@6.4.0, "rxjs@file:../../node_modules/rxjs": +rxjs@6.4.0: version "6.4.0" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504" + integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw== dependencies: tslib "^1.9.0" @@ -6592,6 +6594,11 @@ rxjs@^6.4.0: dependencies: tslib "^1.9.0" +"rxjs@file:../../node_modules/rxjs": + version "6.5.3" + dependencies: + tslib "^1.9.0" + safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" @@ -8192,4 +8199,4 @@ yn@^2.0.0: integrity sha1-5a2ryKz0CPY4X8dklWhMiOavaJo= "zone.js@file:../../node_modules/zone.js": - version "0.9.1" + version "0.10.2"