build: use webpack for building apps. #1325
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,44 @@ | ||
| import 'angular2-universal-polyfills'; | ||
| import { provide } from '@angular/core'; | ||
| import { APP_BASE_HREF } from '@angular/common'; | ||
| import { APP_SHELL_BUILD_PROVIDERS } from '@angular/app-shell'; | ||
| import { | ||
| REQUEST_URL, | ||
| ORIGIN_URL, | ||
| Bootloader, | ||
| BootloaderConfig, | ||
| AppConfig | ||
| } from 'angular2-universal'; | ||
| import { AppComponent } from './app/'; | ||
|
|
||
| const bootloaderConfig: BootloaderConfig = { | ||
| platformProviders: [ | ||
| APP_SHELL_BUILD_PROVIDERS, | ||
| provide(ORIGIN_URL, { | ||
| useValue: 'http://localhost:4200' // full urls are needed for node xhr | ||
| }), | ||
| provide(APP_BASE_HREF, { useValue: '/' }), | ||
| ], | ||
| async: true, | ||
| preboot: false | ||
| } | ||
|
|
||
| const appConfig: AppConfig = { | ||
| directives: [ | ||
| // The component that will become the main App Shell | ||
| AppComponent | ||
| ], | ||
| providers: [ | ||
| // What URL should Angular be treating the app as if navigating | ||
| provide(REQUEST_URL, { useValue: '/' }) | ||
| ] | ||
| } | ||
|
|
||
| export function getBootloader() : Bootloader { | ||
| return new Bootloader(bootloaderConfig); | ||
| } | ||
|
|
||
| export function serialize(bootloader: Bootloader, template: string) : string { | ||
| appConfig.template = template; | ||
| return bootloader.serializeApplication(appConfig); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| // Prefer CoreJS over the polyfills above | ||
| 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/set'; | ||
| import 'core-js/es6/reflect'; | ||
|
|
||
| import 'core-js/es7/reflect'; | ||
| import 'zone.js/dist/zone'; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
|
|
||
| /*global jasmine, __karma__, window*/ | ||
| import 'core-js/es6'; | ||
| import 'core-js/es7/reflect'; | ||
|
|
||
| // Typescript emit helpers polyfill | ||
| import 'ts-helpers'; | ||
|
|
||
| import 'zone.js/dist/zone'; | ||
| import 'zone.js/dist/long-stack-trace-zone'; | ||
| import 'zone.js/dist/jasmine-patch'; | ||
| import 'zone.js/dist/async-test'; | ||
| import 'zone.js/dist/fake-async-test'; | ||
| import 'zone.js/dist/sync-test'; | ||
|
|
||
| // RxJS | ||
| import 'rxjs/Rx'; | ||
|
|
||
| Promise.all([ | ||
| System.import('@angular/core/testing'), | ||
| System.import('@angular/platform-browser-dynamic/testing') | ||
| ]).then(function (providers) { | ||
| let testing = providers[0]; | ||
| let testingBrowser = providers[1]; | ||
|
|
||
| testing.setBaseTestProviders(testingBrowser.TEST_BROWSER_DYNAMIC_PLATFORM_PROVIDERS, | ||
| testingBrowser.TEST_BROWSER_DYNAMIC_APPLICATION_PROVIDERS); | ||
| }); | ||
|
|
||
| let testContext = require.context('../src', true, /\.spec\.ts/); | ||
|
There was a problem hiding this comment. ditto here - this is common/webpack specific code... There was a problem hiding this comment. I am not sure if there is an alternative for There was a problem hiding this comment.
There was a problem hiding this comment. Is there an alternative to bundling files in webpack for running in karma? |
||
|
|
||
| /* | ||
| * get all the files, for each file, call the context function | ||
| * that will require the file and load it up here. Context will | ||
| * loop and require those spec files here | ||
| */ | ||
| function requireAll(requireContext) { | ||
| return requireContext.keys().map(requireContext); | ||
| } | ||
|
|
||
| requireAll(testContext); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,25 @@ | ||
| { | ||
| "compilerOptions": { | ||
| "baseUrl":"./src", | ||
| "declaration": false, | ||
| "emitDecoratorMetadata": true, | ||
| "experimentalDecorators": true, | ||
| "module": "es6", | ||
|
There was a problem hiding this comment. What's going on here? We don't care about TypeScript maps? Even so, we probably want to support running There was a problem hiding this comment. Nvm, misread. Not sure why this is being taken off. There was a problem hiding this comment. Turns out it was further down, but misspelled. Fixed. |
||
| "moduleResolution": "node", | ||
| "outDir": "./dist/", | ||
| "rootDir": ".", | ||
| "sourceMap": true, | ||
| "target": "es5", | ||
| "mapRoot": "/", | ||
| "inlinesource": true | ||
| }, | ||
| "compileOnSave": false, | ||
| "buildOnSave": false, | ||
| "exclude": [ | ||
| "node_modules", | ||
| "bower_components" | ||
| ], | ||
| "includes": [ | ||
| "**.d.ts" | ||
| ] | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,16 @@ | ||
|
|
||
| // Typings reference file, see links for more information | ||
| // https://github.com/typings/typings | ||
| // https://www.typescriptlang.org/docs/handbook/writing-declaration-files.html | ||
|
|
||
| /// <reference path="<%= refToTypings %>/typings/index.d.ts" /> | ||
| /// <reference path="../node_modules/typescript/lib/lib.es2015.core.d.ts" /> | ||
| /// <reference path="../node_modules/typescript/lib/lib.es2015.collection.d.ts" /> | ||
| /// <reference path="../node_modules/typescript/lib/lib.es2015.promise.d.ts" /> | ||
|
|
||
| <% if(!isMobile) { %> | ||
| declare var System: any; | ||
| declare var module: { id: string }; | ||
| declare var require: any; | ||
| <% } %> | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| // Typescript emit helpers polyfill | ||
| import 'ts-helpers'; | ||
|
There was a problem hiding this comment. see previous note about ts-helpers. |
||
|
|
||
| import '@angular/core'; | ||
|
There was a problem hiding this comment. why are we using the side-effect-y version of there in a vendor.ts file? this forces inclusion of a bunch of code somebody may never use? There was a problem hiding this comment. By putting this imports at vendor we are able to extract a cached vendor file with all vendor dependencies. That way you can update your app bundle without having to load the vendors again. |
||
| import '@angular/common'; | ||
| import '@angular/compiler'; | ||
| import '@angular/http'; | ||
| import '@angular/router'; | ||
| import '@angular/platform-browser'; | ||
| import '@angular/platform-browser-dynamic'; | ||
|
|
||
| <% if(isMobile) { %> | ||
|
There was a problem hiding this comment. this is a weird thing to be doing dynamically? There was a problem hiding this comment. It's not dynamic, it's a template file. A project generated with |
||
| import '@angular/app-shell'; | ||
| <% } %> | ||
|
|
||
| import 'rxjs/add/operator/map'; | ||
| import 'rxjs/add/operator/mergeMap'; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| /// <reference path="../typings/index.d.ts" /> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,10 @@ | ||
| { | ||
| "globalDevDependencies": { | ||
| "angular-protractor": "registry:dt/angular-protractor#1.5.0+20160425143459", | ||
| "jasmine": "registry:dt/jasmine#2.2.0+20160412134438", | ||
| "selenium-webdriver": "registry:dt/selenium-webdriver#2.44.0+20160317120654" | ||
| }, | ||
| "globalDependencies": { | ||
| <% if (isMobile) {%>"node": "registry:dt/node#6.0.0+20160621231320" <% } %> | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i'm still not comfortable with this being import/require'd yet, there's an increasing number of Zone issues we're seeing with people require'ing Zone.