From 7bbf877452a4143a9f87835fefc1e1932ea2844d Mon Sep 17 00:00:00 2001
From: "zhongqing.lin" <zhongqing.lin@zkteco.com>
Date: Wed, 20 Sep 2017 14:14:38 +0800
Subject: [PATCH] upgrade package version

---
 package.json      | 30 +++++++++++++++---------------
 webpack.config.js | 21 +++++++++++++++------
 2 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/package.json b/package.json
index c1c1569f6..f670ecb5f 100644
--- a/package.json
+++ b/package.json
@@ -20,36 +20,36 @@
   },
   "homepage": "https://github.com/preboot/angularjs-webpack",
   "dependencies": {
-    "angular": "^1.5.0"
+    "angular": "^1.6.6"
   },
   "devDependencies": {
     "angular-mocks": "^1.5.0",
-    "autoprefixer": "^6.0.3",
+    "autoprefixer": "^7.1.4",
     "babel-core": "^6.2.1",
-    "babel-loader": "^6.2.0",
+    "babel-loader": "^7.1.2",
     "babel-preset-es2015": "^6.1.18",
-    "copy-webpack-plugin": "4.0.1",
-    "css-loader": "0.26.1",
-    "extract-text-webpack-plugin": "2.0.0-beta.5",
-    "file-loader": "^0.9.0",
+    "copy-webpack-plugin": "^4.0.1",
+    "css-loader": "^0.28.7",
+    "extract-text-webpack-plugin": "^3.0.0",
+    "file-loader": "^0.11.2",
     "html-webpack-plugin": "^2.7.1",
-    "istanbul-instrumenter-loader": "^1.0.0",
+    "istanbul-instrumenter-loader": "^3.0.0",
     "jasmine-core": "^2.3.4",
     "karma": "^1.1.0",
     "karma-coverage": "^1.0.0",
     "karma-jasmine": "^1.0.2",
     "karma-phantomjs-launcher": "^1.0.0",
     "karma-sourcemap-loader": "^0.3.7",
-    "karma-spec-reporter": "0.0.26",
-    "karma-webpack": "2.0.1",
-    "node-libs-browser": "2.0.0",
+    "karma-spec-reporter": "^0.0.31",
+    "karma-webpack": "^2.0.4",
+    "node-libs-browser": "^2.0.0",
     "null-loader": "^0.1.1",
     "phantomjs-prebuilt": "^2.1.4",
-    "postcss-loader": "1.2.2",
+    "postcss-loader": "^2.0.6",
     "raw-loader": "^0.5.1",
     "rimraf": "^2.5.1",
-    "style-loader": "^0.13.0",
-    "webpack": "2.2.0",
-    "webpack-dev-server": "2.2.0"
+    "style-loader": "^0.18.2",
+    "webpack": "^3.6.0",
+    "webpack-dev-server": "^2.8.2"
   }
 }
diff --git a/webpack.config.js b/webpack.config.js
index 0178162d6..04234f427 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -14,6 +14,7 @@ var CopyWebpackPlugin = require('copy-webpack-plugin');
 var ENV = process.env.npm_lifecycle_event;
 var isTest = ENV === 'test' || ENV === 'test-watch';
 var isProd = ENV === 'build';
+var port = 9990;
 
 module.exports = function makeWebpackConfig() {
   /**
@@ -45,7 +46,7 @@ module.exports = function makeWebpackConfig() {
 
     // Output path from the view of the page
     // Uses webpack-dev-server in development
-    publicPath: isProd ? '/' : 'http://localhost:8080/',
+    publicPath: isProd ? '/' : 'http://localhost/'+port+'/',
 
     // Filename for entry points
     // Only adds hash in build mode
@@ -103,11 +104,11 @@ module.exports = function makeWebpackConfig() {
       // Use style-loader in development.
 
       loader: isTest ? 'null-loader' : ExtractTextPlugin.extract({
-        fallbackLoader: 'style-loader',
-        loader: [
+        fallback: 'style-loader',
+        use: [
           {loader: 'css-loader', query: {sourceMap: true}},
           {loader: 'postcss-loader'}
-        ],
+        ]
       })
     }, {
       // ASSET LOADER
@@ -217,8 +218,16 @@ module.exports = function makeWebpackConfig() {
    */
   config.devServer = {
     contentBase: './src/public',
-    stats: 'minimal'
-  };
+    historyApiFallback: true,
+        stats: {
+            modules: false,
+            cached: false,
+            colors: true,
+            chunk: false
+        },
+        host: '0.0.0.0',
+        port: port
+  }
 
   return config;
 }();