Now build commands actually rimraf the dist folder, and assets truly land in root path of dist instead of dist/public

Author: TheLarkInn

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

@@ -4,7 +4,6 @@ const path = require('path');
 const ForkCheckerPlugin = require('awesome-typescript-loader').ForkCheckerPlugin;
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
-const DebugWebpackPlugin = require('debug-webpack-plugin');
 
 export const getWebpackCommonConfig = function(projectRoot: string) {
   return {
@@ -76,7 +75,7 @@ export const getWebpackCommonConfig = function(projectRoot: string) {
         filename: 'inline.js',
         sourceMapFilename: 'inline.map'
       }),
-      new CopyWebpackPlugin([{from: path.resolve(projectRoot, './public'), to: path.resolve(projectRoot, './dist/public')}])
+      new CopyWebpackPlugin([{from: path.resolve(projectRoot, './public'), to: path.resolve(projectRoot, './dist')}])
     ],
     node: {
       global: 'window',

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

@@ -13,7 +13,6 @@ const path = require('path');
 const ForkCheckerPlugin = require('awesome-typescript-loader').ForkCheckerPlugin;
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
-const DebugWebpackPlugin = require('debug-webpack-plugin');
 
 
 var components = [

addon/ng2/tasks/build-webpack-watch.ts

@@ -3,16 +3,21 @@ import {webpackOutputOptions} from '../models/';
 
 import {ServeTaskOptions} from '../commands/serve';
 
-var Task            = require('ember-cli/lib/models/task');
+  var Task            = require('ember-cli/lib/models/task');
 const webpack         = require('webpack');
 const ProgressPlugin  = require('webpack/lib/ProgressPlugin');
+const rimraf          = require('rimraf');
+const path          = require('path');
 
 let lastHash: any = null;
 
 module.exports = Task.extend({
   run: function(runTaskOptions: ServeTaskOptions) {
 
     var project = this.cliProject;
+
+    rimraf.sync(path.resolve(project.root, runTaskOptions.outputPath));
+
     const config = new NgCliWebpackConfig(project, runTaskOptions.environment).config;
     const webpackCompiler = webpack(config);
 

addon/ng2/tasks/build-webpack.ts

@@ -4,7 +4,9 @@ import {webpackOutputOptions} from '../models/'
 
 // Configure build and output;
 var Task            = require('ember-cli/lib/models/task');
-const webpack         = require('webpack');
+const webpack       = require('webpack');
+const rimraf        = require('rimraf');
+const path          = require('path');
 
 let lastHash = null;
 
@@ -13,6 +15,9 @@ module.exports = Task.extend({
   run: function(runTaskOptions: ServeTaskOptions) {
 
     var project = this.cliProject;
+
+    rimraf.sync(path.resolve(project.root, runTaskOptions.outputPath));
+
     var config = new NgCliWebpackConfig(project, runTaskOptions.environment).config;
     const webpackCompiler = webpack(config);
 

package.json

@@ -34,15 +34,11 @@
     "@types/webpack": "^1.12.22-alpha",
     "angular2-template-loader": "^0.4.0",
     "awesome-typescript-loader": "1.1.1",
-    "babel-core": "^6.9.1",
-    "babel-loader": "^6.2.4",
-    "babel-preset-es2015-webpack": "^6.4.1",
     "chalk": "^1.1.3",
     "compression-webpack-plugin": "^0.3.1",
     "copy-webpack-plugin": "^3.0.1",
     "core-js": "^2.4.0",
     "css-loader": "^0.23.1",
-    "debug-webpack-plugin": "^0.1.0",
     "ember-cli": "2.5.0",
     "ember-cli-string-utils": "^1.0.0",
     "exit": "^0.1.2",
@@ -53,7 +49,6 @@
     "glob": "^7.0.3",
     "handlebars": "^4.0.5",
     "html-webpack-plugin": "^2.19.0",
-    "http-server": "^0.9.0",
     "istanbul-instrumenter-loader": "^0.2.0",
     "json-loader": "^0.5.4",
     "karma": "^0.13.22",
@@ -69,8 +64,8 @@
     "less-loader": "^2.2.3",
     "lodash": "^4.11.1",
     "node-sass": "^3.7.0",
-    "offline-plugin": "^3.4.1",
     "npm": "3.10.2",
+    "offline-plugin": "^3.4.1",
     "opn": "4.0.1",
     "parse5": "^2.1.5",
     "phantomjs-polyfill": "0.0.2",
@@ -80,7 +75,7 @@
     "raw-loader": "^0.5.1",
     "remap-istanbul": "^0.6.4",
     "resolve": "^1.1.7",
-    "rimraf": "^2.5.2",
+    "rimraf": "^2.5.3",
     "sass-loader": "^3.2.0",
     "shelljs": "^0.7.0",
     "silent-error": "^1.0.0",
@@ -95,7 +90,7 @@
     "tslint": "^3.11.0",
     "tslint-loader": "^2.1.4",
     "typedoc": "^0.4.2",
-    "typescript": "^1.9.0-dev.20160627-1.0",
+    "typescript": "^2.0.0-dev.20160706",
     "typings": "^0.8.1",
     "url-loader": "^0.5.7",
     "webpack": "2.1.0-beta.15",