fix(build): fix dist build

tomastrajan · tomastrajan · commit 77bfe2f98985 · 2015-10-04T18:27:10.000+02:00
- disable UglifyJsPlugin mangle
- add connect server for serving build / dist folders
- add npm server tasks
- code cleanup
diff --git a/package.json b/package.json
@@ -6,8 +6,10 @@
   "scripts": {
     "start": "webpack-dev-server --TARGET=DEV",
     "build": "webpack --display-chunks --display-reasons --display-error-details --display-modules",
-    "dist": "webpack -p --TARGET=DIST",
-    "test": "mocha --compilers js:mocha-babel ./src/**/*.test.js"
+    "dist": "webpack --TARGET=DIST",
+    "test": "mocha --compilers js:mocha-babel ./src/**/*.test.js",
+    "server_build": "node server.js",
+    "server_dist": "node server.js --TARGET=DIST"
   },
   "author": "tomas.trajan@gmail.com",
   "license": "ISC",
@@ -31,6 +33,7 @@
     "chai": "^3.2.0",
     "chalk": "^1.1.0",
     "clean-webpack-plugin": "^0.1.3",
+    "connect": "^3.4.0",
     "css-loader": "^0.15.6",
     "file-loader": "^0.8.4",
     "html-loader": "^0.3.0",
@@ -39,6 +42,7 @@
     "mocha": "^2.2.5",
     "mocha-babel": "^3.0.0",
     "ngtemplate-loader": "^1.3.0",
+    "serve-static": "^1.10.0",
     "sinon": "^1.17.1",
     "style-loader": "^0.12.3",
     "typescript": "^1.5.3",
diff --git a/server.js b/server.js
@@ -0,0 +1,18 @@
+var minimist = require('minimist');
+var connect = require('connect');
+var serveStatic = require('serve-static');
+
+
+var PORT = 8080;
+var TARGET_PATH_MAPPING = {
+    BUILD: './build',
+    DIST: './dist'
+};
+
+var TARGET = minimist(process.argv.slice(2)).TARGET || 'BUILD';
+
+connect()
+    .use(serveStatic(TARGET_PATH_MAPPING[TARGET]))
+    .listen(PORT);
+
+console.log('Created server for: ' + TARGET + ', listening on port ' + PORT);
diff --git a/src/feature-b/feature-b.config.js b/src/feature-b/feature-b.config.js
@@ -3,11 +3,6 @@ export function routing($stateProvider) {
     $stateProvider
         .state('app.feature-b', {
             url: '/feature-b',
-            template: '<div todo-component></div>',
-            resolve: {
-                initialTodos: function() {
-                    return [];
-                }
-            }
+            template: '<div todo-component></div>'
         });
 }
diff --git a/src/feature-b/feature-b.module.js b/src/feature-b/feature-b.module.js
@@ -2,7 +2,7 @@ import angular from 'angular';
 import uirouter from 'angular-ui-router';
 
 import { routing } from './feature-b.config.js';
-import { EMPTY_TODOS, DEFAULT_TODOS } from './feature-b.constants.js';
+import { DEFAULT_TODOS } from './feature-b.constants.js';
 
 import todoComponent from './todo-component/todo-component.directive';
 import TodoService from './services/todo.service';
diff --git a/src/index.html b/src/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
     <head>
         <meta charset="UTF-8">
-        <title>Component Pattern for Angular 1.X</title>
+        <title>Proper testing of Angular 1.X with ES6 modules</title>
         <base href="/">
 
         <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css">
diff --git a/src/main.js b/src/main.js
@@ -2,7 +2,7 @@
 import 'bootstrap/dist/css/bootstrap.min.css';
 import './main.css';
 
-// 3rd party libraries
+// 3rd party modules
 import bootstrap from 'bootstrap';
 import angular from 'angular';
 import angularAnimate from 'angular-animate';
@@ -15,7 +15,10 @@ import common from './common/common.module';
 import featureA from './feature-a/feature-a.module';
 import featureB from './feature-b/feature-b.module';
 
-angular.module('main', [angularAnimate, angularUiBootstrap, angularHighlightjs, app, common, featureA, featureB]);
+angular.module('main', [
+    angularAnimate, angularUiBootstrap, angularHighlightjs,
+    app, common, featureA, featureB
+]);
 
 angular.element(document).ready(function() {
     angular.bootstrap(document, ['main']);
diff --git a/webpack.config.js b/webpack.config.js
@@ -37,7 +37,10 @@ var paramsPerTarget = {
             path: './dist'
         },
         plugins: [
-            new CleanWebpackPlugin(['dist'])
+            new CleanWebpackPlugin(['dist']),
+            new webpack.optimize.UglifyJsPlugin({
+                mangle: false
+            })
         ]
     }
 };
@@ -62,7 +65,7 @@ module.exports = {
             {test: /\.js$/, loader: 'babel?optional[]=runtime&stage=1', exclude: /(\.test.js$|node_modules)/},
             {test: /\.css$/, loader: 'style!css'},
             {test: /\.tpl.html/, loader: 'html'},
-            {test: /\.(png|jpg|gif|svg|eot|ttf|woff|woff2)$/, loader: "url?limit=50000"}
+            {test: /\.(png|jpg|gif|svg|eot|ttf|woff|woff2)$/, loader: 'url?limit=50000'}
         ]
     },
     plugins: [
@@ -71,8 +74,8 @@ module.exports = {
             inject: 'body'
         }),
         new webpack.ProvidePlugin({
-            $: "jquery",
-            jQuery: "jquery"
+            $: 'jquery',
+            jQuery: 'jquery'
         })
     ].concat(params.plugins || []),
     devServer: {
