Merge branch 'release/0.3.0'

emyann · emyann · commit 63b92cd69289 · 2017-01-31T17:31:49.000-05:00
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,6 @@ branches:
 
 language: node_js
 node_js:
-  - '6.1'
+  - '6.7'
 
 script: true
diff --git a/README.md b/README.md
@@ -8,9 +8,11 @@
 - [x] [Typescript 2](https://blogs.msdn.microsoft.com/typescript/2016/07/11/announcing-typescript-2-0-beta/)
 - [x] [Webpack Dashboard](https://github.com/FormidableLabs/webpack-dashboard)
 ![Imgur](http://i.imgur.com/pETTX85.png)
+
 # Getting started
 
 ## Clone Typescript Webpack Starter
+
 ```bash
 git clone https://github.com/emyann/typescript-webpack-starter.git
 cd typescript-webpack-starter
@@ -19,17 +21,25 @@ npm install
 ```
 
 ## Run
-Run a Webpack dev server 
+
+Start a Webpack dev server 
+```bash
+npm start
+```
+
+Start a Webpack server with the production configuration 
 ```bash
-npm run server
+npm run server:prod
 ```
 
+
 ## Build Only
 Build a development release
 ```bash
 npm run build
 ```
 
+
 Build a production release
 ```bash
 npm run build:prod
diff --git a/config/webpack/webpack.prod.js b/config/webpack/webpack.prod.js
diff --git a/package.json b/package.json
@@ -4,18 +4,15 @@
   "description": "A damn simple starter for Typescript and Webpack",
   "main": "src/index.ts",
   "scripts": {
-    "rimraf": "rimraf",
-    "webpack": "webpack",
-    "webpack-dev-server": "webpack-dev-server",
-    "build": "npm run build:dev",
-    "prebuild:dev": "npm run rimraf -- dist",
-    "build:dev": "webpack --config config/webpack/webpack.dev.js --progress --profile --color --display-error-details --display-cached",
-    "prebuild:prod": "npm run rimraf -- dist",
-    "build:prod": "webpack --config config/webpack/webpack.prod.js  --progress --profile --color --display-error-details --display-cached --bail",
+    "start": "npm run server:dev",
     "server": "npm run server:dev",
-    "server:dev": "webpack-dashboard -- webpack-dev-server --config config/webpack/webpack.dev.js --port 3000 --host 0.0.0.0 --hot --inline --progress --profile --watch --content-base dist/",
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "postinstall": "typings i"
+    "server:dev": "webpack-dashboard -- webpack-dev-server --config ./webpack.config.js --port 3000 --host 0.0.0.0 --hot --inline --progress --profile --watch --content-base dist/",
+    "server:prod": "cross-env NODE_ENV=production webpack-dashboard -- webpack-dev-server --config ./webpack.config.js --port 3000 --host 0.0.0.0 --hot --inline --progress --profile --watch --content-base dist/",
+    "build": "npm run build:dev",
+    "build:dev": "webpack --config ./webpack.config.js --progress --profile --color --display-error-details --display-cached",
+    "build:prod": "cross-env NODE_ENV=production webpack --config ./webpack.config.js  --progress --profile --color --display-error-details --display-cached --bail",
+    "clean": "npm cache clear && rimraf -- dist",
+    "test": "echo \"Error: no test specified\" && exit 1"
   },
   "repository": {
     "type": "git",
@@ -24,23 +21,25 @@
   "author": "yrenaudin",
   "license": "ISC",
   "devDependencies": {
-    "css-loader": "^0.25.0",
+    "@types/lodash": "^4.14.50",
+    "cross-env": "^3.1.4",
+    "css-loader": "^0.26.1",
     "ejs-loader": "^0.3.0",
+    "eslint": "^3.14.0",
     "expose-loader": "^0.7.1",
     "html-loader": "^0.4.4",
-    "html-webpack-plugin": "^2.22.0",
+    "html-webpack-plugin": "^2.26.0",
     "rimraf": "^2.5.4",
     "style-loader": "^0.13.1",
-    "ts-loader": "^0.8.2",
-    "tslint": "^3.15.1",
-    "tslint-loader": "^2.1.5",
-    "typescript": "^2.0.0",
-    "typings": "^1.3.3",
+    "ts-loader": "^2.0.0",
+    "tslint": "^4.3.1",
+    "tslint-loader": "^3.3.0",
+    "typescript": "^2.1.5",
     "webpack": "^2.1.0-beta.22",
-    "webpack-dashboard": "^0.1.8",
-    "webpack-dev-server": "^1.15.2"
+    "webpack-dashboard": "^0.2.1",
+    "webpack-dev-server": "2.2.0"
   },
   "dependencies": {
-    "lodash": "^4.15.0"
+    "lodash": "^4.17.4"
   }
-}
+}
diff --git a/src/index.html b/src/index.html
@@ -1,17 +1,21 @@
 <!DOCTYPE html>
 <html lang="">
+
 <head>
   <meta charset="utf-8">
   <meta http-equiv="x-ua-compatible" content="ie=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
 
-  <title><%= htmlWebpackPlugin.options.title %></title>
+  <title>
+    <%= htmlWebpackPlugin.options.title %>
+  </title>
 
   <meta name="description" content="<%= htmlWebpackPlugin.options.title %>">
 
 </head>
 
 <body>
-    <div> You have successfully started your Typescript application using Webpack</div>
+  <div> You have successfully started your Typescript application using Webpack. By <a href="https://twitter.com/renaudin_yann">@renaudin_yann</a>    </div>
 </body>
+
 </html>
diff --git a/webpack.config.js b/webpack.config.js
@@ -2,9 +2,11 @@ const webpack = require('webpack');
 const path = require('path');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const DashboardPlugin = require('webpack-dashboard/plugin');
+const nodeEnv = process.env.NODE_ENV || 'development';
+const isProd = nodeEnv === 'production';
 
 var config = {
-    devtool: 'cheap-eval-source-map',
+    devtool: isProd ? 'hidden-source-map' : 'cheap-eval-source-map',
     context: path.resolve('./src'),
     entry: {
         app: './index.ts',
@@ -19,20 +21,22 @@ var config = {
         }
     },
     module: {
-        preLoaders: [
-            { test: /\.ts$/, exclude: ["node_modules"], loader: "tslint" }
-        ],
-        loaders: [
-            { test: /\.ts$/, exclude: ["node_modules"], loader: 'ts-loader' },
+        rules: [
+            { enforce: 'pre', test: /\.ts$/, exclude: ["node_modules"], loader: 'ts-loader' },
             { test: /\.html$/, loader: "html" },
             { test: /\.css$/, loaders: ['style', 'css'] }
         ]
     },
     resolve: {
-        extensions: ["", ".ts", ".js"],
+        extensions: [".ts", ".js"],
         modules: [path.resolve('./src'), 'node_modules']
     },
     plugins: [
+        new webpack.DefinePlugin({
+            'process.env': { // eslint-disable-line quote-props
+                NODE_ENV: JSON.stringify(nodeEnv)
+            }
+        }),
         new HtmlWebpackPlugin({
             title: 'Typescript Webpack Starter',
             template: '!!ejs-loader!src/index.html'
@@ -43,16 +47,20 @@ var config = {
             filename: 'vendor.bundle.js'
         }),
         new webpack.optimize.UglifyJsPlugin({
-            compress: {warnings: false},
-            output: {comments: false},
+            compress: { warnings: false },
+            output: { comments: false },
             sourceMap: false
         }),
-         new DashboardPlugin()
-    ],
-    tslint: {
-        emitErrors: false,
-        failOnHint: false
-    },
+        new DashboardPlugin(),
+        new webpack.LoaderOptionsPlugin({
+            options: {
+                tslint: {
+                    emitErrors: true,
+                    failOnHint: true
+                }
+            }
+        })
+    ]
 };
 
-module.exports = config;
+module.exports = config;
