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

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

@@ -0,0 +1 @@
+/* You can add add global styles to this file, and also import other style files */

addon/ng2/blueprints/ng2/files/__path__/main.ts

@@ -5,9 +5,25 @@
   },
   "apps": [
     {
-      "main": "<%= sourceDir %>/main.ts",
-      "tsconfig": "<%= sourceDir %>/tsconfig.json",
-      "mobile": <%= isMobile %>
+      "root": "<%= sourceDir %>",
+      "outDir": "dist",
+      "assets": "assets",
+      "index": "index.html",
+      "main": "main.ts",
+      "test": "test.ts",
+      "tsconfig": "tsconfig.json",
+      "prefix": "<%= prefix %>",
+      "mobile": <%= isMobile %>,
+      "additionalEntries": [
+        { "input": "polyfills.ts", "output": "polyfills.js" },
+        "scripts.ts",
+        "styles.<%= styleExt %>"
+      ],
+      "environments": {
+        "source": "environments/environment.ts",
+        "prod": "environments/environment.prod.ts",
+        "dev": "environments/environment.dev.ts"
+      }
     }
   ],
   "addons": [],
@@ -23,8 +39,6 @@
     }
   },
   "defaults": {
-    "prefix": "<%= prefix %>",
-    "sourceDir": "<%= sourceDir %>",
     "styleExt": "<%= styleExt %>",
     "prefixInterfaces": false,
     "lazyRoutePrefix": "+"

addon/ng2/blueprints/ng2/files/__path__/polyfills.ts

@@ -5,23 +5,53 @@ import * as webpack from 'webpack';
 import { ForkCheckerPlugin } from 'awesome-typescript-loader';
 import { CliConfig } from './config';
 
-export function getWebpackCommonConfig(projectRoot: string, sourceDir: string) {
+export function getWebpackCommonConfig(projectRoot: string, environment: string, appConfig: any) {
+
+  const appRoot = path.resolve(projectRoot, appConfig.root);
+  const appMain = path.resolve(appRoot, appConfig.main);
+
+  const bundledWithMain = appConfig.additionalEntries
+    .filter(entry => typeof entry === "string")
+    .map(filename => path.resolve(appRoot, filename));
+
+  const separateBundles = appConfig.additionalEntries.filter(entry => typeof entry === "object");
+  const entries = Object.assign(
+    { main: [appMain, ...bundledWithMain] },
+    separateBundles.reduce((obj, entry) =>
+      Object.assign(obj, { [entry.output]: path.resolve(appRoot, entry.input) }),
+      {})
+  );
+
+  const additionalFiles = separateBundles
+    .map(entry => path.resolve(appRoot, entry.input))
+    .concat(bundledWithMain);
+
   return {
     devtool: 'source-map',
     resolve: {
       extensions: ['', '.ts', '.js'],
-      root: path.resolve(projectRoot, `./${sourceDir}`)
+      root: appRoot
     },
     context: path.resolve(__dirname, './'),
-    entry: {
-      main: [path.resolve(projectRoot, `./${sourceDir}/main.ts`)],
-      polyfills: path.resolve(projectRoot, `./${sourceDir}/polyfills.ts`)
-    },
+    entry: entries,
     output: {
-      path: path.resolve(projectRoot, './dist'),
+      path: path.resolve(projectRoot, appConfig.outDir),
       filename: '[name].bundle.js'
     },
     module: {
+<<<<<<< 504a497963252326cf9f2cbccb93e9eb8aab6dfa
+=======
+      preLoaders: [
+        {
+          test: /\.js$/,
+          loader: 'source-map-loader',
+          exclude: [
+            path.resolve(appRoot, 'node_modules/rxjs'),
+            path.resolve(appRoot, 'node_modules/@angular'),
+          ]
+        }
+      ],
+>>>>>>> feat(build): update angular-cli.json
       loaders: [
         {
           test: /\.ts$/,
@@ -30,7 +60,7 @@ export function getWebpackCommonConfig(projectRoot: string, sourceDir: string) {
               loader: 'awesome-typescript-loader',
               query: {
                 useForkChecker: true,
-                tsconfig: path.resolve(projectRoot, `./${sourceDir}/tsconfig.json`)
+                tsconfig: path.resolve(appRoot, appConfig.tsconfig)
               }
             },
             {
@@ -39,23 +69,47 @@ export function getWebpackCommonConfig(projectRoot: string, sourceDir: string) {
           ],
           exclude: [/\.(spec|e2e)\.ts$/]
         },
-        { test: /\.json$/, loader: 'json-loader'},
-        { test: /\.css$/,  loaders: ['raw-loader', 'postcss-loader'] },
-        { test: /\.styl$/, loaders: ['raw-loader', 'postcss-loader', 'stylus-loader'] },
-        { test: /\.less$/, loaders: ['raw-loader', 'postcss-loader', 'less-loader'] },
-        { test: /\.scss$|\.sass$/, loaders: ['raw-loader', 'postcss-loader', 'sass-loader'] },
-        { test: /\.(jpg|png)$/, loader: 'url-loader?limit=128000'},
-        { test: /\.html$/, loader: 'raw-loader' }
+
+        // in main, load css as raw text
+        { exclude: additionalFiles, test: /\.css$/, loaders: ['raw-loader', 'postcss-loader'] },
+        { exclude: additionalFiles, test: /\.styl$/, loaders: ['raw-loader', 'postcss-loader', 'stylus-loader'] },
+        { exclude: additionalFiles, test: /\.less$/, loaders: ['raw-loader', 'postcss-loader', 'less-loader'] },
+        { exclude: additionalFiles, test: /\.scss$|\.sass$/, loaders: ['raw-loader', 'postcss-loader', 'sass-loader'] },
+
+        // outside of main, load it via style-loader
+        { include: additionalFiles, test: /\.css$/, loaders: ['style-loader', 'css-loader', 'postcss-loader'] },
+        { include: additionalFiles, test: /\.styl$/, loaders: ['style-loader', 'css-loader', 'postcss-loader', 'stylus-loader'] },
+        { include: additionalFiles, test: /\.less$/, loaders: ['style-loader', 'css-loader', 'postcss-loader', 'less-loader'] },
+        { include: additionalFiles, test: /\.scss$|\.sass$/, loaders: ['style-loader', 'css-loader', 'postcss-loader', 'sass-loader'] },
+
+        { test: /\.json$/, loader: 'json-loader' },
+        { test: /\.(jpg|png)$/, loader: 'url-loader?limit=10000' },
+        { test: /\.html$/, loader: 'raw-loader' },
+
+        { test: /\.(woff|woff2)(\?v=\d+\.\d+\.\d+)?$/, loader: 'url?limit=10000&mimetype=application/font-woff' },
+        { test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: 'url?limit=10000&mimetype=application/octet-stream' },
+        { test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: 'file' },
+        { test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: 'url?limit=10000&mimetype=image/svg+xml' }
       ]
     },
     plugins: [
       new ForkCheckerPlugin(),
       new HtmlWebpackPlugin({
-        template: path.resolve(projectRoot, `./${sourceDir}/index.html`),
+        template: path.resolve(appRoot, appConfig.index),
         chunksSortMode: 'dependency'
       }),
+      new webpack.NormalModuleReplacementPlugin(
+        // escape the path to make a regex
+        // TODO: this isn't working!
+        new RegExp(path.resolve(appRoot, appConfig.environments.source)
+          .replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&")),
+        path.resolve(appRoot, appConfig.environments[environment])
+      ),
       new webpack.optimize.CommonsChunkPlugin({
-        name: ['polyfills']
+        name: separateBundles
+          .concat('main')
+          .map(bundle => bundle.output)
+          .reverse()
       }),
       new webpack.optimize.CommonsChunkPlugin({
         minChunks: Infinity,
@@ -64,9 +118,9 @@ export function getWebpackCommonConfig(projectRoot: string, sourceDir: string) {
         sourceMapFilename: 'inline.map'
       }),
       new CopyWebpackPlugin([{
-        context: path.resolve(projectRoot, './public'),
+        context: path.resolve(appRoot, appConfig.assets),
         from: '**/*',
-        to: path.resolve(projectRoot, './dist')
+        to: path.resolve(projectRoot, appConfig.outDir, appConfig.assets)
       }])
     ],
     node: {
@@ -79,3 +133,4 @@ export function getWebpackCommonConfig(projectRoot: string, sourceDir: string) {
     }
   }
 };
+

addon/ng2/blueprints/ng2/files/__path__/scripts.ts

@@ -1,7 +1,7 @@
 import { CliConfig } from './config';
 const path = require('path')
 
-export const getWebpackDevConfigPartial = function(projectRoot: string, sourceDir: string) {
+export const getWebpackDevConfigPartial = function(projectRoot: string, appConfig: any) {
   return {
     debug: true,
     devtool: 'source-map',
@@ -22,7 +22,7 @@ export const getWebpackDevConfigPartial = function(projectRoot: string, sourceDi
     tslint: {
       emitErrors: false,
       failOnHint: false,
-      resourcePath: path.resolve(projectRoot, `./${sourceDir}`)
+      resourcePath: path.resolve(projectRoot, appConfig.root)
     },
     node: {
       fs: 'empty',

addon/ng2/blueprints/ng2/files/__path__/styles.__styleext__

@@ -5,23 +5,25 @@ import * as CopyWebpackPlugin from 'copy-webpack-plugin';
 import { PrerenderWebpackPlugin } from '../utilities/prerender-webpack-plugin.ts';
 import { CliConfig } from './config';
 
-export const getWebpackMobileConfigPartial = function (projectRoot: string, sourceDir: string) {
+export const getWebpackMobileConfigPartial = function (projectRoot: string, appConfig: any) {
+  // Hardcoded files and paths here should be part of appConfig when
+  // reworking the mobile app functionality
   return {
     plugins: [
       new CopyWebpackPlugin([
-        {from: path.resolve(projectRoot, `./${sourceDir}/icons`), to: path.resolve(projectRoot, './dist/icons')},
-        {from: path.resolve(projectRoot, `./${sourceDir}/manifest.webapp`), to: path.resolve(projectRoot, './dist')}
+        {from: path.resolve(projectRoot, appConfig.root, 'icons'), to: path.resolve(projectRoot, appConfig.outDir, 'icons')},
+        {from: path.resolve(projectRoot, appConfig.root, 'manifest.webapp'), to: path.resolve(projectRoot, appConfig.outDir)}
       ]),
       new PrerenderWebpackPlugin({
         templatePath: 'index.html',
-        configPath: path.resolve(projectRoot, `./${sourceDir}/main-app-shell.ts`),
-        appPath: path.resolve(projectRoot, `./${sourceDir}`)
+        configPath: path.resolve(projectRoot, appConfig.root, 'main-app-shell.ts'),
+        appPath: path.resolve(projectRoot, appConfig.root)
       })
     ]
   }
 };
 
-export const getWebpackMobileProdConfigPartial = function (projectRoot: string, sourceDir: string) {
+export const getWebpackMobileProdConfigPartial = function (projectRoot: string, appConfig: any) {
   return {
     entry: {
       'sw-install': path.resolve(__dirname, '../utilities/sw-install.js')

addon/ng2/blueprints/ng2/files/angular-cli.json

@@ -5,7 +5,7 @@ import * as CompressionPlugin from 'compression-webpack-plugin';
 import * as webpack from 'webpack';
 import { CliConfig } from './config';
 
-export const getWebpackProdConfigPartial = function(projectRoot: string, sourceDir: string) {
+export const getWebpackProdConfigPartial = function(projectRoot: string, appConfig: any) {
   return {
     debug: false,
     devtool: 'source-map',
@@ -47,7 +47,7 @@ export const getWebpackProdConfigPartial = function(projectRoot: string, sourceD
     tslint: {
       emitErrors: true,
       failOnHint: true,
-      resourcePath: path.resolve(projectRoot, `./${sourceDir}`)
+      resourcePath: path.resolve(projectRoot, appConfig.root)
     },
     htmlLoader: {
       minimize: true,