瀏覽代碼

Reverted PWM port to 8080

Joe Hawkins 8 年之前
父節點
當前提交
e40df9b7ec
共有 4 個文件被更改,包括 4 次插入13 次删除
  1. 0 3
      pom.xml
  2. 1 1
      src/main/angular/package.json
  3. 3 1
      src/main/angular/webpack.common.js
  4. 0 8
      src/main/angular/webpack.dev.js

+ 0 - 3
pom.xml

@@ -117,9 +117,6 @@
                 <groupId>org.apache.tomcat.maven</groupId>
                 <artifactId>tomcat7-maven-plugin</artifactId>
                 <version>2.2</version>
-                <configuration>
-                    <port>8081</port>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

+ 1 - 1
src/main/angular/package.json

@@ -13,7 +13,7 @@
     "test": "karma start --NODE_ENV=test",
     "test-single-run": "karma start --NODE_ENV=test --singleRun --no-auto-watch",
     "start": "webpack-dev-server --config=webpack.dev.js --NODE_ENV=dev",
-    "sync": "concurrently \"webpack-dev-server --config=webpack.build.js --NODE_ENV=production\" \"cpx ./dist/*.js* ../webapp/public/resources/app -w -v\""
+    "sync": "concurrently \"webpack-dev-server --config=webpack.build.js --NODE_ENV=production\" \"cpx './dist/*.js*' ../webapp/public/resources/app --watch --verbose\""
   },
   "author": "",
   "license": "ISC",

+ 3 - 1
src/main/angular/webpack.common.js

@@ -9,7 +9,9 @@ var outDir = path.resolve(__dirname, 'dist');
 
 module.exports = {
     devServer: {
-        outputPath: outDir
+        contentBase: outDir,
+        outputPath: outDir,
+        port: 4000
     },
     devtool: 'cheap-module-source-map',
     // Externals copied to /dist via CopyWebpackPlugin

+ 0 - 8
src/main/angular/webpack.dev.js

@@ -1,15 +1,7 @@
 var commonConfig = require('./webpack.common.js');
-var path = require('path');
 var webpackMerge = require('webpack-merge');
-var WriteFileWebpackPlugin = require('write-file-webpack-plugin');
-
-var outDir = path.resolve(__dirname, 'dist');
 
 module.exports = webpackMerge(commonConfig, {
-    devServer: {
-        contentBase: outDir,
-        port: 4000
-    },
     entry: {
         'peoplesearch.ng': './src/main.dev'
     }