diff --git a/aio/tools/examples/run-example-e2e.js b/aio/tools/examples/run-example-e2e.js index d45a8acea240d..63320c5b6729a 100644 --- a/aio/tools/examples/run-example-e2e.js +++ b/aio/tools/examples/run-example-e2e.js @@ -147,7 +147,7 @@ function runProtractorSystemJS(prepPromise, appDir, appRunSpawnInfo, outputFile) let transpileError = false; // Start protractor. - + console.log(`\n\n=========== Running aio example tests for: ${appDir}`); const spawnInfo = spawnExt('yarn', ['protractor', PROTRACTOR_CONFIG_FILENAME, `--specs=${specFilename}`, @@ -199,6 +199,7 @@ function runProtractorAoT(appDir, outputFile) { // All protractor output is appended to the outputFile. // CLI version function runE2eTestsCLI(appDir, outputFile) { + console.log(`\n\n=========== Running aio example tests for: ${appDir}`); // `--preserve-symlinks` is needed due the symlinked `node_modules/` in each example. // `--no-webdriver-update` is needed to preserve the ChromeDriver version already installed. const args = ['e2e', '--preserve-symlinks', '--no-webdriver-update']; diff --git a/modules/rollup-test/hello-world.html b/modules/rollup-test/hello-world.html deleted file mode 100644 index a704403f4afd7..0000000000000 --- a/modules/rollup-test/hello-world.html +++ /dev/null @@ -1 +0,0 @@ -hello remote world! diff --git a/modules/rollup-test/hello_world.js b/modules/rollup-test/hello_world.js deleted file mode 100644 index a187d9e5c3d18..0000000000000 --- a/modules/rollup-test/hello_world.js +++ /dev/null @@ -1,19 +0,0 @@ -/** - * @license - * Copyright Google Inc. All Rights Reserved. - * - * Use of this source code is governed by an MIT-style license that can be - * found in the LICENSE file at https://angular.io/license - */ - -var HelloWorldComponent = ng.core.Component({ - selector: 'hello-world', - //template: 'hello world!!!' - templateUrl: 'hello-world.html' -}).Class({ - constructor: function() {} -}); - - - -ng.platformBrowserDynamic.bootstrap(HelloWorldComponent); diff --git a/modules/rollup-test/hello_world.ts b/modules/rollup-test/hello_world.ts deleted file mode 100644 index 832361d203d8a..0000000000000 --- a/modules/rollup-test/hello_world.ts +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @license - * Copyright Google Inc. All Rights Reserved. - * - * Use of this source code is governed by an MIT-style license that can be - * found in the LICENSE file at https://angular.io/license - */ - -import {Component, NgModule} from '@angular/core'; -import {platformBrowserDynamic} from '@angular/platform-browser-dynamic'; -import {BrowserModule} from '@angular/platform-browser'; - -@Component({selector: 'hello-world', template: 'hello world!!!'}) -class HelloWorldComponent { -} - -@NgModule({ - declarations: [HelloWorldComponent], - bootstrap: [HelloWorldComponent], - imports: [BrowserModule] -}) -class ExampleModule {} - -platformBrowserDynamic().bootstrapModule(ExampleModule); \ No newline at end of file diff --git a/modules/rollup-test/index-bundle.html b/modules/rollup-test/index-bundle.html deleted file mode 100644 index c9f273fbf22cf..0000000000000 --- a/modules/rollup-test/index-bundle.html +++ /dev/null @@ -1,16 +0,0 @@ - - - - -loading.. - - - - - - - - - - - diff --git a/modules/rollup-test/index-systemjs.html b/modules/rollup-test/index-systemjs.html deleted file mode 100644 index 1a2cef3e2284a..0000000000000 --- a/modules/rollup-test/index-systemjs.html +++ /dev/null @@ -1,31 +0,0 @@ - - - - -loading.. - - - - - - - diff --git a/modules/rollup-test/index.html b/modules/rollup-test/index.html deleted file mode 100644 index aaf5739ad1280..0000000000000 --- a/modules/rollup-test/index.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - -loading.. - - - - - diff --git a/modules/rollup-test/package.json b/modules/rollup-test/package.json deleted file mode 100644 index 9c85f88073900..0000000000000 --- a/modules/rollup-test/package.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "name": "rollup-test", - "version": "1.0.0", - "description": "", - "main": "index.js", - "scripts": { - "compile": "tsc -p tsconfig.json", - "compile-system": "tsc -p tsconfig-system.json", - "bundle": "rollup -f iife -c rollup.config.js -o dist/bundle.es2015.js", - "es5": "tsc --out dist/bundle.js --target es5 --allowJs dist/bundle.es2015.js", - "minify": "uglifyjs --screw-ie8 --compress --mangle --in-source-map ./dist/bundle.js.map --source-map ./dist/bindle.min.js.map --source-map-include-sources --output ./dist/bundle.min.js ./dist/bundle.js", - "build": "npm run compile && npm run bundle && npm run es5 && npm run minify", - "serve": "python -m SimpleHTTPServer 8000" - }, - "author": "", - "license": "ISC", - "dependencies": { - "@igorminar/md-button": "^1.1.0", - "@igorminar/platform-browser": "^0.1.0" - }, - "devDependencies": { - "rollup": "^0.26.0", - "rollup-plugin-node-resolve": "^1.5.0", - "rollup-plugin-typescript": "^0.7.3", - "rollup-plugin-uglify": "^0.3.1", - "rxjs-es": "^5.0.0-rc.4", - "typescript": "^1.9.0-dev.20160423", - "uglify-js": "^2.6.2" - }, - "repository": { - "type": "git", - "url": "https://github.com/angular/angular.git" - } -} diff --git a/modules/rollup-test/rollup.config.js b/modules/rollup-test/rollup.config.js deleted file mode 100644 index be89d0546eb0f..0000000000000 --- a/modules/rollup-test/rollup.config.js +++ /dev/null @@ -1,42 +0,0 @@ -/** - * @license - * Copyright Google Inc. All Rights Reserved. - * - * Use of this source code is governed by an MIT-style license that can be - * found in the LICENSE file at https://angular.io/license - */ - -// import typescript from 'rollup-plugin-typescript'; -// import tsc from 'typescript' - -import nodeResolve from 'rollup-plugin-node-resolve'; - -class RollupNG2 { - constructor(options){ - this.options = options; - } - resolveId(id, from){ - //console.log(id, from); - // if(id.startsWith('angular2/')){ - // return `${__dirname}/vendor/angular2/${id.split('angular2/').pop()}.js`; - // } - if(id.startsWith('rxjs/')){ - return `${__dirname}/node_modules/rxjs-es/${id.replace('rxjs/', '')}.js`; - } - } -} - - -const rollupNG2 = (config) => new RollupNG2(config); - - -export default { - entry: 'dist/hello_world.js', - //entry: 'hello_world.ts', - sourceMap: true, - plugins: [ - //typescript({typescript: tsc, target: 'es5', declaration: false}), - rollupNG2(), - nodeResolve({ jsnext: true, main: true }), - ] -}; diff --git a/modules/rollup-test/tsconfig-system.json b/modules/rollup-test/tsconfig-system.json deleted file mode 100644 index a8a7ec2e6dd4f..0000000000000 --- a/modules/rollup-test/tsconfig-system.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "compilerOptions": { - "baseUrl": ".", - "declaration": true, - "emitDecoratorMetadata": true, - "experimentalDecorators": true, - "module": "system", - "moduleResolution": "node", - "outDir": "./dist/", - "rootDir": ".", - "sourceMap": true, - "sourceRoot": ".", - "target": "es5" - }, - "files": [ - "hello_world.ts", - "../@angular/typings/es6-collections/es6-collections.d.ts", - "../@angular/typings/es6-promise/es6-promise.d.ts" - ] -} diff --git a/modules/rollup-test/tsconfig.json b/modules/rollup-test/tsconfig.json deleted file mode 100644 index e89d4dff0b0f6..0000000000000 --- a/modules/rollup-test/tsconfig.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "compilerOptions": { - "baseUrl": ".", - "declaration": true, - "emitDecoratorMetadata": true, - "experimentalDecorators": true, - "module": "es2015", - "moduleResolution": "node", - "outDir": "./dist/", - "rootDir": ".", - "sourceMap": true, - "sourceRoot": ".", - "target": "es2015" - }, - "files": [ - "hello_world.ts" - ] -} diff --git a/modules/tsconfig.json b/modules/tsconfig.json index 0c680709d2b22..d5992a365aab0 100644 --- a/modules/tsconfig.json +++ b/modules/tsconfig.json @@ -28,8 +28,7 @@ "benchmarks/src/old", "benchmarks/src/**/index_aot.ts", "benchmarks_external", - "payload_tests", - "rollup-test" + "payload_tests" ], "angularCompilerOptions": { "skipTemplateCodegen": true diff --git a/packages/core/src/render3/component.ts b/packages/core/src/render3/component.ts index c2cceba0c12f6..00550faa80ee3 100644 --- a/packages/core/src/render3/component.ts +++ b/packages/core/src/render3/component.ts @@ -136,7 +136,8 @@ export function renderComponent( // Create element node at index 0 in data array elementNode = hostElement(hostNode, componentDef); // Create directive instance with n() and store at index 1 in data array (el is 0) - component = rootContext.component = baseDirectiveCreate(1, componentDef.factory(), componentDef) as T; + component = rootContext.component = + baseDirectiveCreate(1, componentDef.factory(), componentDef) as T; initChangeDetectorIfExisting(elementNode.nodeInjector, component); } finally { // We must not use leaveView here because it will set creationMode to false too early, diff --git a/yarn.lock b/yarn.lock index e60b2d5f8f96b..3606e83ce6817 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7958,5 +7958,5 @@ zip-stream@~0.6.0: readable-stream "~1.0.26" zone.js@^0.8.12: - version "0.8.17" - resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.8.17.tgz#4c5e5185a857da8da793daf3919371c5a36b2a0b" + version "0.8.20" + resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.8.20.tgz#a218c48db09464b19ff6fc8f0d4bb5b1046e185d"