From 9fe63635758bb0119b1bc55cd2545fd60e3eba90 Mon Sep 17 00:00:00 2001 From: Peter Bacon Darwin Date: Wed, 4 Oct 2017 12:34:28 +0100 Subject: [PATCH] docs(aio): fix aot-compiler example to work with Angular v5 (#19511) PR Close #19511 --- aio/content/examples/.gitignore | 10 +++------- aio/content/examples/aot-compiler/rollup-config.js | 2 +- aio/content/examples/aot-compiler/src/main.ts | 2 +- aio/content/examples/aot-compiler/tsconfig-aot.json | 8 ++++---- aio/tools/examples/run-example-e2e.js | 2 -- 5 files changed, 9 insertions(+), 15 deletions(-) diff --git a/aio/content/examples/.gitignore b/aio/content/examples/.gitignore index 5a298caef9..50e978c89f 100644 --- a/aio/content/examples/.gitignore +++ b/aio/content/examples/.gitignore @@ -29,11 +29,7 @@ # built files *.map _test-output -protractor-helpers.js -*/e2e-spec.js **/*.js -**/ts/**/*.js -**/js-es6*/**/*.js dist/ @@ -57,10 +53,10 @@ dist/ **/app/**/*.ajs.js # aot -*/aot/**/* -!*/aot/bs-config.json -!*/aot/index.html +**/*.ngsummary.json !rollup-config.js +aot-compiler/**/*.d.ts +aot-compiler/**/*.factory.d.ts # i18n !i18n/src/systemjs-text-plugin.js diff --git a/aio/content/examples/aot-compiler/rollup-config.js b/aio/content/examples/aot-compiler/rollup-config.js index 37a41a5e6f..135e516f0b 100644 --- a/aio/content/examples/aot-compiler/rollup-config.js +++ b/aio/content/examples/aot-compiler/rollup-config.js @@ -7,7 +7,7 @@ import uglify from 'rollup-plugin-uglify'; export default { entry: 'src/main.js', dest: 'src/build.js', // output a single application bundle - sourceMap: false, + sourceMap: true, format: 'iife', onwarn: function(warning) { // Skip certain warnings diff --git a/aio/content/examples/aot-compiler/src/main.ts b/aio/content/examples/aot-compiler/src/main.ts index 4446bc07d1..22298fab9c 100644 --- a/aio/content/examples/aot-compiler/src/main.ts +++ b/aio/content/examples/aot-compiler/src/main.ts @@ -1,6 +1,6 @@ // #docregion import { platformBrowser } from '@angular/platform-browser'; -import { AppModuleNgFactory } from '../aot/src/app/app.module.ngfactory'; +import { AppModuleNgFactory } from './app/app.module.ngfactory'; console.log('Running AOT compiled'); platformBrowser().bootstrapModuleFactory(AppModuleNgFactory); diff --git a/aio/content/examples/aot-compiler/tsconfig-aot.json b/aio/content/examples/aot-compiler/tsconfig-aot.json index ea56eb7067..49566f7c84 100644 --- a/aio/content/examples/aot-compiler/tsconfig-aot.json +++ b/aio/content/examples/aot-compiler/tsconfig-aot.json @@ -7,7 +7,6 @@ "emitDecoratorMetadata": true, "experimentalDecorators": true, "lib": ["es2015", "dom"], - "noImplicitAny": true, "suppressImplicitAnyIndexErrors": true, "typeRoots": [ "./node_modules/@types/" @@ -20,7 +19,8 @@ ], "angularCompilerOptions": { - "genDir": "aot", - "skipMetadataEmit" : true - } + "annotationsAs": "decorators", + "genDir": ".", + "skipMetadataEmit" : true + } } diff --git a/aio/tools/examples/run-example-e2e.js b/aio/tools/examples/run-example-e2e.js index b2716784c8..509d791681 100644 --- a/aio/tools/examples/run-example-e2e.js +++ b/aio/tools/examples/run-example-e2e.js @@ -13,8 +13,6 @@ const SJS_SPEC_FILENAME = 'e2e-spec.ts'; const CLI_SPEC_FILENAME = 'e2e/app.e2e-spec.ts'; const EXAMPLE_CONFIG_FILENAME = 'example-config.json'; const IGNORED_EXAMPLES = [ // temporary ignores - 'aot-compiler', // Temporarily disabled until we figure out how to make it pass with the latest ngc. - 'toh-', 'quickstart', 'http',