feat(build): update angular-cli.json

Author: filipesilva

README.md

@@ -36,6 +36,7 @@ The generated project has dependencies that require **Node 4 or greater**.
 * [Creating a Build](#creating-a-build)
 * [Build Targets and Environment Files](#build-targets-and-environment-files)
 * [Bundling](#bundling)
+* [Adding extra files to the build](#adding-extra-files-to-the-build)
 * [Running Unit Tests](#running-unit-tests)
 * [Running End-to-End Tests](#running-end-to-end-tests)
 * [Deploying the App via GitHub Pages](#deploying-the-app-via-github-pages)
@@ -124,8 +125,8 @@ A build can specify both a build target (`development` or `production`) and an
 environment file to be used with that build. By default, the development build 
 target is used.
 
-At build time, `src/app/environments/environment.ts` will be replaced by
-`src/app/environments/environment.{NAME}.ts` where `NAME` is the argument 
+At build time, `src/environments/environment.ts` will be replaced by
+`src/environments/environment.NAME.ts` where `NAME` is the argument 
 provided to the `--environment` flag.
 
 These options also apply to the serve command. If you do not pass a value for `environment`,
@@ -143,14 +144,49 @@ ng build --dev
 ng build
 ```
 
-You can also add your own env files other than `dev` and `prod` by creating a
-`src/app/environments/environment.{NAME}.ts` and use them by using the `--env=NAME`
-flag on the build/serve commands.
+You can also add your own env files other than `dev` and `prod` by doing the following:
+- create a `src/environments/environment.NAME.ts`
+- add `{ NAME: 'src/environments/environment.NAME.ts' }` to the the `apps[0].environments` object in `angular-cli.json` 
+- use them by using the `--env=NAME` flag on the build/serve commands.
 
 ### Bundling
 
-Builds created with the `-prod` flag via `ng build -prod` or `ng serve -prod` bundle
-all dependencies into a single file, and make use of tree-shaking techniques.
+All builds make use of bundling, and using the `-prod` flag in  `ng build -prod` 
+or `ng serve -prod` will also make use of uglifying and tree-shaking functionality.
+
+### Adding extra files to the build
+
+The `apps[0].additionalEntries` array in `angular-cli.json` allows a user to add more files to the build.
+
+The `additionalEntries` array supports two kinds of entries, with different behaviours.
+- strings will be bundled together with the `main` bundle
+- objects with `input` and `output` properties will create a new bundle which is loaded before the `main` bundle.
+
+By default it looks like this:
+
+```
+apps: [
+  {
+    //...
+    "additionalEntries": [
+      { "input": "polyfills.ts", "output": "polyfills.js" },
+      "scripts.ts",
+      "styles.css"
+    ],
+  }
+]
+```
+
+These entries correspond to the following files in `src/`:
+- `polifills.ts` has browser polyfills needed for Angular 2. It will be 
+bundled separately as `polyfills.js` and loaded before everything else.
+- `styles.css` allows users to add global styles and supports 
+[CSS imports](https://developer.mozilla.org/en/docs/Web/CSS/@import). If the 
+project is created with the `--style=sass` option, this will be a `.sass` file 
+instead, and the same applies to `scss/less/styl`. It will be part of the main 
+bundle.
+- `scripts.ts` allows users to add global code outside of the Angular 2 app. It
+will also be part of the main bundle.
 
 ### Running unit tests
 

addon/ng2/blueprints/component/index.js

@@ -25,9 +25,9 @@ module.exports = {
 
     var defaultPrefix = '';
     if (this.project.ngConfig &&
-        this.project.ngConfig.defaults &&
-        this.project.ngConfig.defaults.prefix) {
-      defaultPrefix = this.project.ngConfig.defaults.prefix + '-';
+        this.project.ngConfig.apps[0] &&
+        this.project.ngConfig.apps[0].prefix) {
+      defaultPrefix = this.project.ngConfig.apps[0].prefix + '-';
     }
     var prefix = this.options.prefix ? defaultPrefix : '';
     this.selector = stringUtils.dasherize(prefix + parsedPath.name);
@@ -97,7 +97,7 @@ module.exports = {
             dir = dirParts.join(path.sep);
           }
         }
-        var srcDir = this.project.ngConfig.defaults.sourceDir;
+        var srcDir = this.project.ngConfig.apps[0].root;
         this.appDir = dir.substr(dir.indexOf(srcDir) + srcDir.length);
         this.generatePath = dir;
         return dir;

addon/ng2/blueprints/ng2/files/__path__/app/index.ts

@@ -1,3 +1,2 @@
-export * from './environments/environment';
 export * from './app.component';
 export * from './app.module';

addon/ng2/blueprints/ng2/files/public/.gitignore renamed to addon/ng2/blueprints/ng2/files/__path__/assets/.gitignore

@@ -1,6 +1,7 @@
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 import { enableProdMode } from '@angular/core';
-import { AppModule, environment } from './app/';
+import { environment } from './environments/environment';
+import { AppModule } from './app/';
 
 if (environment.production) {
   enableProdMode();

addon/ng2/blueprints/ng2/files/__path__/app/environments/environment.dev.ts renamed to addon/ng2/blueprints/ng2/files/__path__/environments/environment.dev.ts

@@ -1,4 +1,5 @@
-// Prefer CoreJS over the polyfills above
+// This file includes polyfills needed by Angular 2 and is loaded before
+// the app. You can add your own extra polyfills to this file.
 import 'core-js/es6/symbol';
 import 'core-js/es6/object';
 import 'core-js/es6/function';

addon/ng2/blueprints/ng2/files/__path__/app/environments/environment.prod.ts renamed to addon/ng2/blueprints/ng2/files/__path__/environments/environment.prod.ts

@@ -0,0 +1,2 @@
+// You can add additional imports to this file and 
+// they will be loaded before your app