Added asset copying onto page. WIPWIPWIP

Author: Sean Larkin

addon/ng2/commands/build.ts

@@ -7,7 +7,7 @@ const win = require('ember-cli/lib/utilities/windows-admin');
 const WebpackBuild = require('../tasks/build-webpack');
 const WebpackBuildWatch = require('../tasks/build-webpack-watch');
 
-interface IBuildOptions {
+interface BuildOptions {
   environment?: string;
   outputPath?: string;
   watch?: boolean;
@@ -25,10 +25,13 @@ module.exports = Command.extend({
     { name: 'output-path',    type: 'Path',  default: 'dist/',       aliases: ['o'] },
     { name: 'watch',          type: Boolean, default: false,         aliases: ['w'] },
     { name: 'watcher',        type: String },
-    { name: 'suppress-sizes', type: Boolean, default: false }
+    { name: 'suppress-sizes', type: Boolean, default: false },
+
+    // Experimental webpack build for material team
+    { name: 'm2', type: Boolean, default: false}
   ],
 
-  run: function(commandOptions: IBuildOptions) {
+  run: function(commandOptions: BuildOptions) {
     let buildTask = commandOptions.watch ? new WebpackBuildWatch({options: commandOptions}) : new WebpackBuild({options: commandOptions});
 
     return buildTask.run();

addon/ng2/models/save-for-later.ts

@@ -46,3 +46,37 @@
 //   template:'./src/index.html',
 //   chunksSortMode: "dependency"
 // })
+//
+//
+// export const materialEntryConfig: {[key: string]: any} = {
+//   demoMain: [ngAppResolve('./src/demo-app/main.ts')],
+//   e2eMain: [ngAppResolve('./src/e2e-app/main.ts')],
+//   core: [ngAppResolve('./src/core/core.ts')],
+//   vendor: [
+//     "@angular/common",
+//     "@angular/compiler",
+//     "@angular/core",
+//     "@angular/http",
+//     "@angular/platform-browser",
+//     "@angular/platform-browser-dynamic",
+//     "@angular/router",
+//   ],
+//   polyfills: [
+//     "core-js",
+//     "hammerjs",
+//     "rxjs",
+//     "systemjs",
+//     "zone.js"
+//   ]
+// }
+
+// export const materialPluginsConfig: any[] = [
+//     new webpack.optimize.CommonsChunkPlugin({
+//       name: ['polyfills', 'vendor'].reverse()
+//     }),
+//     new HtmlWebpackPlugin({
+//       template: ngAppResolve('./demo-app/index.html'),
+//       chunksSortMode: 'dependency'
+//     })
+// ];
+

addon/ng2/models/webpack-build-config.ts

@@ -1,10 +1,11 @@
 const webpack = require('webpack');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
+const CopyWebpackPlugin = require('copy-webpack-plugin');
 const path = require('path');
 const ClosureCompilerPlugin = require('webpack-closure-compiler');
 const autoprefixer = require('autoprefixer');
 const cssnano = require('cssnano');
-
+const ForkCheckerPlugin = require('awesome-typescript-loader').ForkCheckerPlugin;
 
 // Resolve to the generated applications
 function ngAppResolve(resolvePath: string): string {
@@ -67,22 +68,24 @@ export const webpackCommonConfig = {
       {
         test: /\.ts$/,
         loaders: [
-          {
-            loader: 'babel-loader', //TODO: Remove Babel once support for lib: for typescript@next
-            query: {
-              presets: [
-                'babel-preset-es2015-webpack'
-              ].map(require.resolve)
-            }
-          },
+          // {
+          //   loader: 'babel-loader', //TODO: Remove Babel once support for lib: for typescript@next
+          //   query: {
+          //     presets: [
+          //       'babel-preset-es2015-webpack'
+          //     ].map(require.resolve)
+          //   }
+          // },
           {
             loader: 'awesome-typescript-loader',
             query: {
               useWebpackText: true,
               tsconfig: ngAppResolve('./src/tsconfig.json'),
               resolveGlobs: false,
               module: "es2015",
-              target: "es5"
+              target: "es5",
+              library: 'es6',
+              useForkChecker: true
             }
           },
           {
@@ -95,44 +98,38 @@ export const webpackCommonConfig = {
         test: /\.json$/,
         loader: 'json-loader'
       },
-      // TODO: https://github.com/webpack/css-loader#sourcemaps
-      // Style sourcemaps create a runtime and bundle overhead.
-      // Do we want this?
-
-      // We pass sourcemap flag (on external builds [not from my dev] this will not work because of)
-      // https://github.com/webpack/raw-loader/pull/8
       {
         test: /\.css$/,
         loaders: ['raw-loader', 'postcss-loader']
       },
       {
         test:/\.styl$/,
-        loaders: ['raw-loader', 'postcss-loader', 'stylus-loader?sourceMap']
+        loaders: ['raw-loader', 'postcss-loader', 'stylus-loader']
       },
       {
         test:/\.less$/,
-        loaders: ['raw-loader', 'postcss-loader', 'less-loader?sourceMap']
+        loaders: ['raw-loader', 'postcss-loader', 'less-loader']
       },
       {
         test:/\.scss$/,
-        loaders: ['raw-loader', 'postcss-loader', 'sass-loader?sourceMap']
+        loaders: ['raw-loader', 'postcss-loader', 'sass-loader']
       },
+      //
       // Asset loaders
       //
       {
         test: /\.(jpg|png)$/,
         loader: 'url-loader?limit=25000', // Only inline for sizes <= 25000
-        include: PATHS.images
       },
       {
         test: /\.(jpg|png)$/,
         loader: 'file-loader?name=[path][name].[hash].[ext]',
-        include: PATHS.images
+        include: ngAppResolve('./public')
       },
       {
         test: /\.svg$/,
         loader: 'file-loader',
-        include: PATHS.images
+        include: ngAppResolve('./public')
       }
       {
         test: /\.html$/,
@@ -142,25 +139,20 @@ export const webpackCommonConfig = {
   },
   postcss: () => {
       return {
-        defaults: [cssnano, autoprefixer]
+        defaults: [autoprefixer]
       };
   },
   plugins: [
+    new ForkCheckerPlugin(),
     new webpack.optimize.CommonsChunkPlugin({
       name: ['polyfills', 'vendor'].reverse()
     }),
-    new HtmlWebpackPlugin(baseHtmlTemplateConfig)
+    new HtmlWebpackPlugin(baseHtmlTemplateConfig),
+    new CopyWebpackPlugin([{from: ngAppResolve('./public'), to: ngAppResolve('./dist/public')}])
   ],
   resolve: {
     extensions: ['', '.ts', '.js'],
     root: ngAppResolve('./src')
     // modulesDirectories: ['node_modules']
-  },
-  node: {
-    global: 'window',
-    crypto: 'empty',
-    module: false,
-    clearImmediate: false,
-    setImmediate: false
   }
 };

package.json

@@ -30,6 +30,7 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
+    "@angular/compiler-cli": "^0.2.0",
     "angular2-template-loader": "^0.4.0",
     "awesome-typescript-loader": "^1.0.0",
     "babel-core": "^6.9.1",
@@ -87,7 +88,7 @@
     "tslint": "^3.11.0",
     "tslint-loader": "^2.1.4",
     "typedoc": "^0.4.2",
-    "typescript": "^1.9.0-dev.20160614-1.0",
+    "typescript": "^1.9.0-dev.20160615-1.0",
     "typings": "^0.8.1",
     "url-loader": "^0.5.7",
     "webpack": "2.1.0-beta.13",