From 72ff9c880c01ec684306c3591779ea50bcff33fc Mon Sep 17 00:00:00 2001 From: Brandon Roberts Date: Mon, 8 Oct 2018 14:34:44 -0500 Subject: [PATCH] docs: sync boilerplate configuration with Angular CLI RC2 (#25892) Revers Jasmine version back to ~2.99.1 PR Close #25892 --- .../examples/shared/boilerplate/cli/angular.json | 9 ++++++++- .../examples/shared/boilerplate/cli/package.json | 2 +- .../shared/boilerplate/cli/src/polyfills.ts | 13 +++++++------ .../examples/shared/boilerplate/cli/tsconfig.json | 2 +- .../examples/shared/boilerplate/i18n/package.json | 4 ++-- .../shared/boilerplate/universal/package.json | 2 +- aio/tools/examples/shared/package.json | 2 +- aio/tools/examples/shared/yarn.lock | 8 ++++---- 8 files changed, 25 insertions(+), 17 deletions(-) diff --git a/aio/tools/examples/shared/boilerplate/cli/angular.json b/aio/tools/examples/shared/boilerplate/cli/angular.json index 976280e171..3735b82a1b 100644 --- a/aio/tools/examples/shared/boilerplate/cli/angular.json +++ b/aio/tools/examples/shared/boilerplate/cli/angular.json @@ -43,7 +43,14 @@ "aot": true, "extractLicenses": true, "vendorChunk": false, - "buildOptimizer": true + "buildOptimizer": true, + "budgets": [ + { + "type": "initial", + "maximumWarning": "2mb", + "maximumError": "5mb" + } + ] } } }, diff --git a/aio/tools/examples/shared/boilerplate/cli/package.json b/aio/tools/examples/shared/boilerplate/cli/package.json index fbcff96a96..b0ce24d3eb 100644 --- a/aio/tools/examples/shared/boilerplate/cli/package.json +++ b/aio/tools/examples/shared/boilerplate/cli/package.json @@ -36,7 +36,7 @@ "@types/jasminewd2": "~2.0.3", "@types/node": "~8.9.4", "codelyzer": "~4.3.0", - "jasmine-core": "^3.2.0", + "jasmine-core": "~2.99.1", "jasmine-marbles": "^0.4.0", "jasmine-spec-reporter": "~4.2.1", "karma": "~3.0.0", diff --git a/aio/tools/examples/shared/boilerplate/cli/src/polyfills.ts b/aio/tools/examples/shared/boilerplate/cli/src/polyfills.ts index 8fceb45d3b..5a9c31a99a 100644 --- a/aio/tools/examples/shared/boilerplate/cli/src/polyfills.ts +++ b/aio/tools/examples/shared/boilerplate/cli/src/polyfills.ts @@ -34,18 +34,19 @@ // import 'core-js/es6/weak-map'; // import 'core-js/es6/set'; +/** + * If the application will be indexed by Google Search, the following is required. + * Googlebot uses a renderer based on Chrome 41. + * https://developers.google.com/search/docs/guides/rendering + **/ +// import 'core-js/es6/array'; + /** 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'; - -/** Evergreen browsers require these. **/ -// Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove. -import 'core-js/es7/reflect'; - - /** * Web Animations `@angular/platform-browser/animations` * Only required if AnimationBuilder is used within the application and using IE/Edge or Safari. diff --git a/aio/tools/examples/shared/boilerplate/cli/tsconfig.json b/aio/tools/examples/shared/boilerplate/cli/tsconfig.json index 916247e4cb..46aeded1b2 100644 --- a/aio/tools/examples/shared/boilerplate/cli/tsconfig.json +++ b/aio/tools/examples/shared/boilerplate/cli/tsconfig.json @@ -14,7 +14,7 @@ "node_modules/@types" ], "lib": [ - "es2017", + "es2018", "dom" ] } diff --git a/aio/tools/examples/shared/boilerplate/i18n/package.json b/aio/tools/examples/shared/boilerplate/i18n/package.json index 9e8bcc55ca..9ddda064f2 100644 --- a/aio/tools/examples/shared/boilerplate/i18n/package.json +++ b/aio/tools/examples/shared/boilerplate/i18n/package.json @@ -6,7 +6,7 @@ "ng": "ng", "start": "ng serve", "start:fr": "ng serve --configuration=fr", - "build": "ng build --prod", + "build": "ng build", "build:fr": "ng build --configuration=production-fr", "test": "ng test", "lint": "ng lint", @@ -39,7 +39,7 @@ "@types/jasminewd2": "~2.0.3", "@types/node": "~8.9.4", "codelyzer": "~4.3.0", - "jasmine-core": "^3.2.0", + "jasmine-core": "~2.99.1", "jasmine-marbles": "^0.4.0", "jasmine-spec-reporter": "~4.2.1", "karma": "~3.0.0", diff --git a/aio/tools/examples/shared/boilerplate/universal/package.json b/aio/tools/examples/shared/boilerplate/universal/package.json index 29bbe289dd..8693953978 100644 --- a/aio/tools/examples/shared/boilerplate/universal/package.json +++ b/aio/tools/examples/shared/boilerplate/universal/package.json @@ -44,7 +44,7 @@ "@types/jasminewd2": "~2.0.3", "@types/node": "~8.9.4", "codelyzer": "~4.3.0", - "jasmine-core": "^3.2.0", + "jasmine-core": "~2.99.1", "jasmine-marbles": "^0.4.0", "jasmine-spec-reporter": "~4.2.1", "karma": "~3.0.0", diff --git a/aio/tools/examples/shared/package.json b/aio/tools/examples/shared/package.json index f98d6762bb..22ca863976 100644 --- a/aio/tools/examples/shared/package.json +++ b/aio/tools/examples/shared/package.json @@ -60,7 +60,7 @@ "canonical-path": "0.0.2", "concurrently": "^3.0.0", "http-server": "^0.9.0", - "jasmine-core": "^3.2.0", + "jasmine-core": "~2.99.1", "jasmine-marbles": "^0.4.0", "jasmine-spec-reporter": "~4.2.1", "karma": "~3.0.0", diff --git a/aio/tools/examples/shared/yarn.lock b/aio/tools/examples/shared/yarn.lock index fb8f76677f..bf1f1dacbd 100644 --- a/aio/tools/examples/shared/yarn.lock +++ b/aio/tools/examples/shared/yarn.lock @@ -4114,14 +4114,14 @@ istanbul@0.4.5: which "^1.1.1" wordwrap "^1.0.0" -jasmine-core@^3.2.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.2.1.tgz#8e4ff5b861603ee83343f2b49eee6a0ffe9650ce" - jasmine-core@~2.8.0: version "2.8.0" resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e" +jasmine-core@~2.99.1: + version "2.99.1" + resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.99.1.tgz#e6400df1e6b56e130b61c4bcd093daa7f6e8ca15" + jasmine-marbles@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/jasmine-marbles/-/jasmine-marbles-0.4.0.tgz#de72331d189d4968e4b1e78b638e51654040c755"