diff --git a/integration/hello_world__systemjs_umd/.gitignore b/integration/hello_world__systemjs_umd/.gitignore new file mode 100644 index 0000000000..8168095bad --- /dev/null +++ b/integration/hello_world__systemjs_umd/.gitignore @@ -0,0 +1,3 @@ +**/*.js +**/*.js.map +!src/systemjs.config.js \ No newline at end of file diff --git a/integration/hello_world__systemjs_umd/bs-config.e2e.json b/integration/hello_world__systemjs_umd/bs-config.e2e.json new file mode 100644 index 0000000000..042cbc2044 --- /dev/null +++ b/integration/hello_world__systemjs_umd/bs-config.e2e.json @@ -0,0 +1,14 @@ +{ + "open": false, + "logLevel": "silent", + "port": 8000, + "server": { + "baseDir": "src", + "routes": { + "/node_modules": "node_modules" + }, + "middleware": { + "0": null + } + } +} \ No newline at end of file diff --git a/integration/hello_world__systemjs_umd/e2e/app.e2e-spec.ts b/integration/hello_world__systemjs_umd/e2e/app.e2e-spec.ts new file mode 100644 index 0000000000..fc5341db26 --- /dev/null +++ b/integration/hello_world__systemjs_umd/e2e/app.e2e-spec.ts @@ -0,0 +1,8 @@ +import { browser, element, by } from 'protractor'; + +describe('Hello world E2E Tests', function () { + it('should display: Hello world!', function () { + browser.get(''); + expect(element(by.css('div')).getText()).toEqual('Hello world!'); + }); +}); \ No newline at end of file diff --git a/integration/hello_world__systemjs_umd/e2e/tsconfig.json b/integration/hello_world__systemjs_umd/e2e/tsconfig.json new file mode 100644 index 0000000000..dc9bfefe87 --- /dev/null +++ b/integration/hello_world__systemjs_umd/e2e/tsconfig.json @@ -0,0 +1,11 @@ +{ + "compilerOptions": { + "sourceMap": true, + "lib": [ "es2015", "dom" ], + "noImplicitAny": true, + "skipLibCheck": true, + "types": [ + "jasmine" + ] + } +} \ No newline at end of file diff --git a/integration/hello_world__systemjs_umd/package.json b/integration/hello_world__systemjs_umd/package.json new file mode 100644 index 0000000000..6615dc3dba --- /dev/null +++ b/integration/hello_world__systemjs_umd/package.json @@ -0,0 +1,31 @@ +{ + "name": "angular-integration", + "description": "Ensure SystemJS ^0.22 UMD compatibility via __esModule flag.", + "version": "0.0.0", + "license": "MIT", + "scripts": { + "test": "concurrently \"npm run serve\" \"npm run protractor\" --kill-others --success first", + "serve": "lite-server -c bs-config.e2e.json", + "preprotractor": "tsc -p e2e", + "protractor": "protractor protractor.config.js" + }, + "dependencies": { + "@angular/common": "file:../../dist/packages-dist/common", + "@angular/core": "file:../../dist/packages-dist/core", + "@angular/compiler": "file:../../dist/packages-dist/compiler", + "@angular/platform-browser": "file:../../dist/packages-dist/platform-browser", + "@angular/platform-browser-dynamic": "file:../../dist/packages-dist/platform-browser-dynamic", + "core-js": "2.4.1", + "plugin-typescript": "6.0.4", + "rxjs": "file:../../node_modules/rxjs", + "systemjs": "0.20.2", + "typescript": "2.1.6", + "zone.js": "0.7.6" + }, + "devDependencies": { + "@types/jasmine": "2.5.41", + "concurrently": "3.1.0", + "lite-server": "2.2.2", + "protractor": "file:../../node_modules/protractor" + } +} diff --git a/integration/hello_world__systemjs_umd/protractor.config.js b/integration/hello_world__systemjs_umd/protractor.config.js new file mode 100644 index 0000000000..906d87e2e1 --- /dev/null +++ b/integration/hello_world__systemjs_umd/protractor.config.js @@ -0,0 +1,16 @@ +exports.config = { + specs: [ + './e2e/**/*.e2e-spec.js' + ], + capabilities: { + browserName: 'chrome', + chromeOptions: { + 'args': ['--no-sandbox'], + 'binary': process.env.CHROME_BIN, + } + }, + directConnect: true, + baseUrl: 'http://localhost:8000/', + framework: 'jasmine', + useAllAngular2AppRoots: true, +}; diff --git a/integration/hello_world__systemjs_umd/src/app/app.ts b/integration/hello_world__systemjs_umd/src/app/app.ts new file mode 100644 index 0000000000..31ecac712b --- /dev/null +++ b/integration/hello_world__systemjs_umd/src/app/app.ts @@ -0,0 +1,11 @@ +import {HelloWorldComponent} from './hello-world.component'; + +import {NgModule} from '@angular/core'; +import {BrowserModule} from '@angular/platform-browser'; + +@NgModule({ + declarations: [HelloWorldComponent], + bootstrap: [HelloWorldComponent], + imports: [BrowserModule], +}) +export class AppModule {} diff --git a/integration/hello_world__systemjs_umd/src/app/hello-world.component.ts b/integration/hello_world__systemjs_umd/src/app/hello-world.component.ts new file mode 100644 index 0000000000..ce2f219a47 --- /dev/null +++ b/integration/hello_world__systemjs_umd/src/app/hello-world.component.ts @@ -0,0 +1,10 @@ +import {Component, Injectable} from '@angular/core'; + +@Component({ + selector: 'hello-world-app', + template: '
Hello {{ name }}!
', +}) +@Injectable() +export class HelloWorldComponent { + name: string = 'world'; +} diff --git a/integration/hello_world__systemjs_umd/src/index.html b/integration/hello_world__systemjs_umd/src/index.html new file mode 100644 index 0000000000..c28b092273 --- /dev/null +++ b/integration/hello_world__systemjs_umd/src/index.html @@ -0,0 +1,21 @@ + + + + + + Hello World + + + + + + + + + + Loading... + + + diff --git a/integration/hello_world__systemjs_umd/src/main.ts b/integration/hello_world__systemjs_umd/src/main.ts new file mode 100644 index 0000000000..3c618b1246 --- /dev/null +++ b/integration/hello_world__systemjs_umd/src/main.ts @@ -0,0 +1,4 @@ +import {platformBrowserDynamic} from '@angular/platform-browser-dynamic'; +import {AppModule} from './app/app'; + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/integration/hello_world__systemjs_umd/src/systemjs.config.js b/integration/hello_world__systemjs_umd/src/systemjs.config.js new file mode 100644 index 0000000000..82075dd829 --- /dev/null +++ b/integration/hello_world__systemjs_umd/src/systemjs.config.js @@ -0,0 +1,45 @@ +(function (global) { + SystemJS.typescriptOptions = { + "target": "es5", + "module": "system", + "moduleResolution": "node", + "sourceMap": true, + "emitDecoratorMetadata": true, + "experimentalDecorators": true, + "noImplicitAny": true, + "suppressImplicitAnyIndexErrors": true + }; + System.config({ + transpiler: 'ts', + meta: { + 'typescript': { + "exports": "ts" + } + }, + paths: { + 'npm:': 'node_modules/' + }, + map: { + app: 'app', + '@angular/core': 'npm:@angular/core/bundles/core.umd.min.js', + '@angular/common': 'npm:@angular/common/bundles/common.umd.min.js', + '@angular/compiler': 'npm:@angular/compiler/bundles/compiler.umd.min.js', + '@angular/platform-browser': + 'npm:@angular/platform-browser/bundles/platform-browser.umd.min.js', + '@angular/platform-browser-dynamic': + 'npm:@angular/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.min.js', + 'rxjs': 'npm:rxjs', + 'angular-in-memory-web-api': 'npm:angular-in-memory-web-api/bundles/in-memory-web-api.umd.js', + 'ts': 'npm:plugin-typescript/lib/plugin.js', + 'typescript': 'npm:typescript/lib/typescript.js', + }, + packages: { + app: { + defaultExtension: 'ts' + }, + rxjs: { + defaultExtension: 'js' + } + } + }); +})(this); \ No newline at end of file diff --git a/integration/hello_world__systemjs_umd/src/tsconfig.json b/integration/hello_world__systemjs_umd/src/tsconfig.json new file mode 100644 index 0000000000..afd210825f --- /dev/null +++ b/integration/hello_world__systemjs_umd/src/tsconfig.json @@ -0,0 +1,13 @@ +{ + "compilerOptions": { + "target": "es5", + "module": "system", + "moduleResolution": "node", + "sourceMap": true, + "emitDecoratorMetadata": true, + "experimentalDecorators": true, + "lib": [ "es2015", "dom" ], + "noImplicitAny": true, + "suppressImplicitAnyIndexErrors": true + } +} \ No newline at end of file diff --git a/packages/animations/browser/rollup.config.js b/packages/animations/browser/rollup.config.js index 96ab02a275..c3505f20f7 100644 --- a/packages/animations/browser/rollup.config.js +++ b/packages/animations/browser/rollup.config.js @@ -10,6 +10,7 @@ export default { entry: '../../../dist/packages-dist/animations/@angular/animations/browser.es5.js', dest: '../../../dist/packages-dist/animations/bundles/animations-browser.umd.js', format: 'umd', + exports: 'named', moduleName: 'ng.animations.browser', globals: { '@angular/core': 'ng.core', diff --git a/packages/animations/browser/testing/rollup.config.js b/packages/animations/browser/testing/rollup.config.js index bde5281dad..721699aa23 100644 --- a/packages/animations/browser/testing/rollup.config.js +++ b/packages/animations/browser/testing/rollup.config.js @@ -10,6 +10,7 @@ export default { entry: '../../../../dist/packages-dist/animations/@angular/animations/browser/testing.es5.js', dest: '../../../../dist/packages-dist/animations/bundles/animations-browser-testing.umd.js', format: 'umd', + exports: 'named', moduleName: 'ng.animations.browser.testing', globals: { '@angular/core': 'ng.core', diff --git a/packages/animations/rollup.config.js b/packages/animations/rollup.config.js index 89a45e93d9..dc9c8160f6 100644 --- a/packages/animations/rollup.config.js +++ b/packages/animations/rollup.config.js @@ -10,6 +10,7 @@ export default { entry: '../../dist/packages-dist/animations/@angular/animations.es5.js', dest: '../../dist/packages-dist/animations/bundles/animations.umd.js', format: 'umd', + exports: 'named', moduleName: 'ng.animations', globals: { '@angular/core': 'ng.core', diff --git a/packages/common/rollup.config.js b/packages/common/rollup.config.js index e8b1857b2e..31646788f4 100644 --- a/packages/common/rollup.config.js +++ b/packages/common/rollup.config.js @@ -10,6 +10,7 @@ export default { entry: '../../dist/packages-dist/common/@angular/common.es5.js', dest: '../../dist/packages-dist/common/bundles/common.umd.js', format: 'umd', + exports: 'named', moduleName: 'ng.common', globals: { '@angular/core': 'ng.core', diff --git a/packages/common/testing/rollup.config.js b/packages/common/testing/rollup.config.js index 08b5b71ce5..fbdfc07a13 100644 --- a/packages/common/testing/rollup.config.js +++ b/packages/common/testing/rollup.config.js @@ -10,6 +10,7 @@ export default { entry: '../../../dist/packages-dist/common/@angular/common/testing.es5.js', dest: '../../../dist/packages-dist/common/bundles/common-testing.umd.js', format: 'umd', + exports: 'named', moduleName: 'ng.common.testing', globals: { '@angular/core': 'ng.core', diff --git a/packages/compiler/rollup.config.js b/packages/compiler/rollup.config.js index 0ae559a46f..51958b81e3 100644 --- a/packages/compiler/rollup.config.js +++ b/packages/compiler/rollup.config.js @@ -10,6 +10,7 @@ export default { entry: '../../dist/packages-dist/compiler/@angular/compiler.es5.js', dest: '../../dist/packages-dist/compiler/bundles/compiler.umd.js', format: 'umd', + exports: 'named', moduleName: 'ng.compiler', globals: { '@angular/core': 'ng.core', diff --git a/packages/compiler/testing/rollup.config.js b/packages/compiler/testing/rollup.config.js index c98d14fb5e..4cdb6e5493 100644 --- a/packages/compiler/testing/rollup.config.js +++ b/packages/compiler/testing/rollup.config.js @@ -10,6 +10,7 @@ export default { entry: '../../../dist/packages-dist/compiler/@angular/compiler/testing.es5.js', dest: '../../../dist/packages-dist/compiler/bundles/compiler-testing.umd.js', format: 'umd', + exports: 'named', moduleName: 'ng.compiler.testing', globals: { '@angular/core': 'ng.core', diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js index 6a5457a8f0..9d3b71fcd6 100644 --- a/packages/core/rollup.config.js +++ b/packages/core/rollup.config.js @@ -10,6 +10,7 @@ export default { entry: '../../dist/packages-dist/core/@angular/core.es5.js', dest: '../../dist/packages-dist/core/bundles/core.umd.js', format: 'umd', + exports: 'named', moduleName: 'ng.core', globals: { 'rxjs/Observable': 'Rx', diff --git a/packages/core/testing/rollup.config.js b/packages/core/testing/rollup.config.js index 0dbbdf5fa1..48be373b1e 100644 --- a/packages/core/testing/rollup.config.js +++ b/packages/core/testing/rollup.config.js @@ -10,6 +10,7 @@ export default { entry: '../../../dist/packages-dist/core/@angular/core/testing.es5.js', dest: '../../../dist/packages-dist/core/bundles/core-testing.umd.js', format: 'umd', + exports: 'named', moduleName: 'ng.core.testing', globals: { '@angular/core': 'ng.core', diff --git a/packages/forms/rollup.config.js b/packages/forms/rollup.config.js index c3daf2711b..195b9141fe 100644 --- a/packages/forms/rollup.config.js +++ b/packages/forms/rollup.config.js @@ -10,6 +10,7 @@ export default { entry: '../../dist/packages-dist/forms/@angular/forms.es5.js', dest: '../../dist/packages-dist/forms/bundles/forms.umd.js', format: 'umd', + exports: 'named', moduleName: 'ng.forms', globals: { '@angular/core': 'ng.core', diff --git a/packages/http/rollup.config.js b/packages/http/rollup.config.js index da400b5329..60595953c2 100644 --- a/packages/http/rollup.config.js +++ b/packages/http/rollup.config.js @@ -10,6 +10,7 @@ export default { entry: '../../dist/packages-dist/http/@angular/http.es5.js', dest: '../../dist/packages-dist/http/bundles/http.umd.js', format: 'umd', + exports: 'named', moduleName: 'ng.http', globals: { '@angular/core': 'ng.core', diff --git a/packages/http/testing/rollup.config.js b/packages/http/testing/rollup.config.js index 81e57f4be1..83da7fd143 100644 --- a/packages/http/testing/rollup.config.js +++ b/packages/http/testing/rollup.config.js @@ -10,6 +10,7 @@ export default { entry: '../../../dist/packages-dist/http/@angular/http/testing.es5.js', dest: '../../../dist/packages-dist/http/bundles/http-testing.umd.js', format: 'umd', + exports: 'named', moduleName: 'ng.http.testing', globals: { '@angular/core': 'ng.core', diff --git a/packages/platform-browser-dynamic/rollup.config.js b/packages/platform-browser-dynamic/rollup.config.js index 90ad898e96..253a1f8cb0 100644 --- a/packages/platform-browser-dynamic/rollup.config.js +++ b/packages/platform-browser-dynamic/rollup.config.js @@ -11,6 +11,7 @@ export default { '../../dist/packages-dist/platform-browser-dynamic/@angular/platform-browser-dynamic.es5.js', dest: '../../dist/packages-dist/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js', format: 'umd', + exports: 'named', moduleName: 'ng.platformBrowserDynamic', globals: { '@angular/core': 'ng.core', diff --git a/packages/platform-browser-dynamic/testing/rollup.config.js b/packages/platform-browser-dynamic/testing/rollup.config.js index dac3e9e076..a6b0ebb95c 100644 --- a/packages/platform-browser-dynamic/testing/rollup.config.js +++ b/packages/platform-browser-dynamic/testing/rollup.config.js @@ -12,6 +12,7 @@ export default { dest: '../../../dist/packages-dist/platform-browser-dynamic/bundles/platform-browser-dynamic-testing.umd.js', format: 'umd', + exports: 'named', moduleName: 'ng.platformBrowserDynamic.testing', globals: { '@angular/core': 'ng.core', diff --git a/packages/platform-browser/animations/rollup.config.js b/packages/platform-browser/animations/rollup.config.js index e7207f22bb..cffa249e39 100644 --- a/packages/platform-browser/animations/rollup.config.js +++ b/packages/platform-browser/animations/rollup.config.js @@ -10,6 +10,7 @@ export default { entry: '../../../dist/packages-dist/platform-browser/@angular/platform-browser/animations.es5.js', dest: '../../../dist/packages-dist/platform-browser/bundles/platform-browser-animations.umd.js', format: 'umd', + exports: 'named', moduleName: 'ng.platformBrowser.animations', globals: { '@angular/core': 'ng.core', diff --git a/packages/platform-browser/rollup.config.js b/packages/platform-browser/rollup.config.js index 17810ca061..d094beb25e 100644 --- a/packages/platform-browser/rollup.config.js +++ b/packages/platform-browser/rollup.config.js @@ -10,6 +10,7 @@ export default { entry: '../../dist/packages-dist/platform-browser/@angular/platform-browser.es5.js', dest: '../../dist/packages-dist/platform-browser/bundles/platform-browser.umd.js', format: 'umd', + exports: 'named', moduleName: 'ng.platformBrowser', globals: { '@angular/core': 'ng.core', diff --git a/packages/platform-browser/testing/rollup.config.js b/packages/platform-browser/testing/rollup.config.js index 97fedec33b..1f966cce22 100644 --- a/packages/platform-browser/testing/rollup.config.js +++ b/packages/platform-browser/testing/rollup.config.js @@ -10,6 +10,7 @@ export default { entry: '../../../dist/packages-dist/platform-browser/@angular/platform-browser/testing.es5.js', dest: '../../../dist/packages-dist/platform-browser/bundles/platform-browser-testing.umd.js', format: 'umd', + exports: 'named', moduleName: 'ng.platformBrowser.testing', globals: { '@angular/core': 'ng.core', diff --git a/packages/platform-server/rollup.config.js b/packages/platform-server/rollup.config.js index 09254bf06d..e7d4ff5440 100644 --- a/packages/platform-server/rollup.config.js +++ b/packages/platform-server/rollup.config.js @@ -10,6 +10,7 @@ export default { entry: '../../dist/packages-dist/platform-server/@angular/platform-server.es5.js', dest: '../../dist/packages-dist/platform-server/bundles/platform-server.umd.js', format: 'umd', + exports: 'named', moduleName: 'ng.platformServer', globals: { '@angular/core': 'ng.core', diff --git a/packages/platform-server/testing/rollup.config.js b/packages/platform-server/testing/rollup.config.js index 23344e2af3..748ca15acd 100644 --- a/packages/platform-server/testing/rollup.config.js +++ b/packages/platform-server/testing/rollup.config.js @@ -10,6 +10,7 @@ export default { entry: '../../../dist/packages-dist/platform-server/@angular/platform-server/testing.es5.js', dest: '../../../dist/packages-dist/platform-server/bundles/platform-server-testing.umd.js', format: 'umd', + exports: 'named', moduleName: 'ng.platformServer.testing', globals: { '@angular/core': 'ng.core', diff --git a/packages/platform-webworker-dynamic/rollup.config.js b/packages/platform-webworker-dynamic/rollup.config.js index 1bde035401..efd9dc4061 100644 --- a/packages/platform-webworker-dynamic/rollup.config.js +++ b/packages/platform-webworker-dynamic/rollup.config.js @@ -12,6 +12,7 @@ export default { dest: '../../dist/packages-dist/platform-webworker-dynamic/bundles/platform-webworker-dynamic.umd.js', format: 'umd', + exports: 'named', moduleName: 'ng.platformWebworkerDynamic', globals: { '@angular/core': 'ng.core', diff --git a/packages/platform-webworker/rollup.config.js b/packages/platform-webworker/rollup.config.js index f8ebadec51..48217d2acb 100644 --- a/packages/platform-webworker/rollup.config.js +++ b/packages/platform-webworker/rollup.config.js @@ -10,6 +10,7 @@ export default { entry: '../../dist/packages-dist/platform-webworker/@angular/platform-webworker.es5.js', dest: '../../dist/packages-dist/platform-webworker/bundles/platform-webworker.umd.js', format: 'umd', + exports: 'named', moduleName: 'ng.platformWebworker', globals: { '@angular/core': 'ng.core', diff --git a/packages/router/rollup.config.js b/packages/router/rollup.config.js index 1417d0ec5e..ec245d1c95 100644 --- a/packages/router/rollup.config.js +++ b/packages/router/rollup.config.js @@ -10,6 +10,7 @@ export default { entry: '../../dist/packages-dist/router/@angular/router.es5.js', dest: '../../dist/packages-dist/router/bundles/router.umd.js', format: 'umd', + exports: 'named', moduleName: 'ng.router', globals: { '@angular/core': 'ng.core', diff --git a/packages/router/testing/rollup.config.js b/packages/router/testing/rollup.config.js index 56e20b80fe..326640c95e 100644 --- a/packages/router/testing/rollup.config.js +++ b/packages/router/testing/rollup.config.js @@ -10,6 +10,7 @@ export default { entry: '../../../dist/packages-dist/router/@angular/router/testing.es5.js', dest: '../../../dist/packages-dist/router/bundles/router-testing.umd.js', format: 'umd', + exports: 'named', moduleName: 'ng.router.testing', globals: { '@angular/core': 'ng.core', diff --git a/packages/router/upgrade/rollup.config.js b/packages/router/upgrade/rollup.config.js index 12f1b482ac..135f57cefd 100644 --- a/packages/router/upgrade/rollup.config.js +++ b/packages/router/upgrade/rollup.config.js @@ -10,6 +10,7 @@ export default { entry: '../../../dist/packages-dist/router/@angular/router/upgrade.es5.js', dest: '../../../dist/packages-dist/router/bundles/router-upgrade.umd.js', format: 'umd', + exports: 'named', moduleName: 'ng.router.upgrade', globals: { '@angular/core': 'ng.core', diff --git a/packages/upgrade/rollup.config.js b/packages/upgrade/rollup.config.js index 61a29de855..5d6ac0f0dc 100644 --- a/packages/upgrade/rollup.config.js +++ b/packages/upgrade/rollup.config.js @@ -10,6 +10,7 @@ export default { entry: '../../dist/packages-dist/upgrade/@angular/upgrade.es5.js', dest: '../../dist/packages-dist/upgrade/bundles/upgrade.umd.js', format: 'umd', + exports: 'named', moduleName: 'ng.upgrade', globals: { '@angular/core': 'ng.core', diff --git a/packages/upgrade/static/rollup.config.js b/packages/upgrade/static/rollup.config.js index ce5781dad6..826a9cfe4e 100644 --- a/packages/upgrade/static/rollup.config.js +++ b/packages/upgrade/static/rollup.config.js @@ -10,6 +10,7 @@ export default { entry: '../../../dist/packages-dist/upgrade/@angular/upgrade/static.es5.js', dest: '../../../dist/packages-dist/upgrade/bundles/upgrade-static.umd.js', format: 'umd', + exports: 'named', moduleName: 'ng.upgrade.static', globals: {'@angular/core': 'ng.core'} };