rearranged code into appropriate task/command/models folders

TheLarkInn · TheLarkInn · commit 0136a8e80f5e · 2016-06-07T00:49:14.000-05:00
diff --git a/addon/ng2/blueprints/ng2/files/__path__/index.html b/addon/ng2/blueprints/ng2/files/__path__/index.html
@@ -26,6 +26,5 @@
 </head>
 <body>
   <<%= htmlComponentName %>-app>Loading...</<%= htmlComponentName %>-app>
-
 </body>
 </html>
diff --git a/addon/ng2/commands/build.ts b/addon/ng2/commands/build.ts
@@ -4,25 +4,7 @@ const win = require('ember-cli/lib/utilities/windows-admin');
 // const Build = require('../tasks/build');
 // const BuildWatch = require('../tasks/build-watch');
 
-// Webpack Configuration
-const webpack = require('webpack');
-const webpackConfig = require('../tasks/webpack-build-config');
-const webpackCompiler = webpack(webpackConfig);
-const ProgressPlugin = require('webpack/lib/ProgressPlugin');
-const webpackOutputOptions = {
-  colors: true,
-  chunks: true,
-  modules: false,
-  reasons: false,
-  chunkModules: false
-}
-
-let lastHash = null;
-
-webpackCompiler.apply(new ProgressPlugin({
-  profile: true
-}));
-
+const Build = require('../tasks/build-webpack');
 
 module.exports = Command.extend({
   name: 'build',
@@ -38,34 +20,9 @@ module.exports = Command.extend({
   ],
 
   run: function(commandOptions) {
-    return new Promise((resolve, reject) => {
-      webpackCompiler.run((err, stats) => {
-        // Don't keep cache
-        // TODO: Make conditional if using --watch
-        webpackCompiler.purgeInputFileSystem();
-
-        if(err) {
-          lastHash = null;
-          console.error(err.stack || err);
-          if(err.details) console.error(err.details);
-            reject(err.details);
-        }
-
-        if(stats.hash !== lastHash) {
-          lastHash = stats.hash;
-          process.stdout.write(stats.toString(webpackOutputOptions) + "\n");
-        }
-        resolve();
-      });
-    });
-  },
+    let buildTask = new Build({options: commandOptions});
 
-  taskFor: function(options) {
-    if (options.watch) {
-      return BuildWatch;
-    } else {
-      return Build;
-    }
+    return buildTask.run();
   }
 });
 
diff --git a/addon/ng2/models/webpack-build-config.ts b/addon/ng2/models/webpack-build-config.ts
@@ -1,6 +1,7 @@
 const webpack = require('webpack');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const path = require('path');
+const ClosureCompilerPlugin = require('webpack-closure-compiler');
 
 
 // Resolve to the generated applications
@@ -30,6 +31,14 @@ module.exports = {
       {
         test: /\.ts$/,
         loaders: [
+          {
+            loader: 'babel-loader',
+            query: {
+              presets: [
+                'babel-preset-es2015-webpack'
+              ].map(require.resolve)
+            }
+          }
           {
             loader: 'awesome-typescript-loader',
             query: {
@@ -76,6 +85,14 @@ module.exports = {
       test: /\.js$/,
       jsfile: true
     })
+    new ClosureCompilerPlugin({
+      compiler: {
+        language_in: 'ECMASCRIPT5',
+        language_out: 'ECMASCRIPT5',
+        compilation_level: 'SIMPLE'
+      },
+      concurrency: 3,
+    })
   ],
 
   // ts: {
diff --git a/addon/ng2/tasks/build-webpack-watch.ts b/addon/ng2/tasks/build-webpack-watch.ts
diff --git a/addon/ng2/tasks/build-webpack.ts b/addon/ng2/tasks/build-webpack.ts
@@ -0,0 +1,49 @@
+const Task     = require('ember-cli/lib/models/task');
+
+// Webpack Configuration
+const webpack = require('webpack');
+const webpackConfig = require('../models/webpack-build-config');
+const webpackCompiler = webpack(webpackConfig);
+const webpackOutputOptions = {
+  colors: true,
+  chunks: true,
+  modules: false,
+  reasons: false,
+  chunkModules: false
+}
+
+const ProgressPlugin = require('webpack/lib/ProgressPlugin');
+webpackCompiler.apply(new ProgressPlugin({
+  profile: true
+}));
+
+
+let lastHash = null;
+
+module.exports = Task.extend({
+  // Options: String outputPath
+  run: function() {
+    let commandOptions = this.options;
+
+    return new Promise((resolve, reject) => {
+      webpackCompiler.run((err, stats) => {
+        // Don't keep cache
+        // TODO: Make conditional if using --watch
+        webpackCompiler.purgeInputFileSystem();
+
+        if(err) {
+          lastHash = null;
+          console.error(err.stack || err);
+          if(err.details) console.error(err.details);
+            reject(err.details);
+        }
+
+        if(stats.hash !== lastHash) {
+          lastHash = stats.hash;
+          process.stdout.write(stats.toString(webpackOutputOptions) + "\n");
+        }
+        resolve();
+      });
+    });
+  }
+});
diff --git a/package.json b/package.json
@@ -32,6 +32,9 @@
   "dependencies": {
     "angular2-template-loader": "^0.2.0",
     "awesome-typescript-loader": "^0.19.0",
+    "babel-core": "^6.9.1",
+    "babel-loader": "^6.2.4",
+    "babel-preset-es2015-webpack": "^6.4.1",
     "broccoli": "^1.0.0-beta.7",
     "broccoli-caching-writer": "^2.2.1",
     "broccoli-concat": "^2.2.0",

-Original file line number
+Diff line change
 </head>
 <body>
   <<%= htmlComponentName %>-app>Loading...</<%= htmlComponentName %>-app>
+-
 </body>
 </html>