cleanup client build setup

Author: yyx990803

.babelrc

@@ -0,0 +1,3 @@
+{
+  "presets": ["env"]
+}

.eslintignore

@@ -0,0 +1 @@
+web_modules

.gitignore

@@ -1,8 +1,6 @@
 npm-debug.log
 node_modules
-/client/live.bundle.js
-/client/index.bundle.js
-/client/sockjs.bundle.js
+/client
 /coverage
 /ssl/*.pem
 .idea/

client/index.js client-src/default/index.js

@@ -0,0 +1,22 @@
+'use strict';
+
+const UglifyJSPlugin = require('uglifyjs-webpack-plugin');
+
+module.exports = {
+  module: {
+    rules: [
+      {
+        test: /\.js$/,
+        exclude: /node_modules|web_modules/,
+        use: [
+          {
+            loader: 'babel-loader'
+          }
+        ]
+      }
+    ]
+  },
+  plugins: [
+    new UglifyJSPlugin()
+  ]
+};

client/overlay.js client-src/default/overlay.js

@@ -4,7 +4,7 @@
 
 const $ = require('jquery');
 const stripAnsi = require('strip-ansi');
-const socket = require('./socket');
+const socket = require('../default/socket');
 require('./style.css');
 
 let hot = false;

client/socket.js client-src/default/socket.js

@@ -1,6 +1,8 @@
 'use strict';
 
+const path = require('path');
 const UglifyJSPlugin = require('uglifyjs-webpack-plugin');
+const CopyPlugin = require('copy-webpack-plugin');
 
 module.exports = {
   module: {
@@ -10,10 +12,7 @@ module.exports = {
         exclude: /node_modules|web_modules/,
         use: [
           {
-            loader: 'babel-loader',
-            options: {
-              presets: ['env']
-            }
+            loader: 'babel-loader'
           }
         ]
       },
@@ -33,6 +32,10 @@ module.exports = {
     ]
   },
   plugins: [
-    new UglifyJSPlugin()
+    new UglifyJSPlugin(),
+    new CopyPlugin([{
+      from: path.resolve(__dirname, 'live.html'),
+      to: path.resolve(__dirname, '../../client/live.html')
+    }])
   ]
 };

client-src/default/webpack.config.js

@@ -22,13 +22,14 @@
     "beautify": "npm run lint -- --fix",
     "ci": "npm run cover -- --report lcovonly && npm run test",
     "cover": "istanbul cover node_modules/mocha/bin/_mocha",
-    "lint": "eslint bin lib test examples client/{index,live,socket,sockjs,overlay,webpack.config}.js",
+    "lint": "eslint bin lib test examples client-src",
     "mocha": "mocha --full-trace --check-leaks",
-    "prepublish": "(rm ssl/*.pem || true) && npm run -s build:live && npm run -s build:index && npm run -s build:sockjs",
+    "prepare": "(rm ssl/*.pem || true) && npm run -s transpile:index && npm run -s build:live && npm run -s build:index && npm run -s build:sockjs",
     "test": "npm run lint && npm run mocha",
-    "build:live": "webpack ./client/live.js client/live.bundle.js --color --config client/webpack.config.js",
-    "build:index": "webpack ./client/index.js client/index.bundle.js --color --config client/webpack.config.js",
-    "build:sockjs": "webpack ./client/sockjs.js client/sockjs.bundle.js --color --config client/webpack.sockjs.config.js",
+    "transpile:index": "babel client-src/default --out-dir client --ignore *.config.js",
+    "build:index": "webpack ./client-src/default/index.js client/index.bundle.js --color --config client-src/default/webpack.config.js",
+    "build:live": "webpack ./client-src/live/index.js client/live.bundle.js --color --config client-src/live/webpack.config.js",
+    "build:sockjs": "webpack ./client-src/sockjs/index.js client/sockjs.bundle.js --color --config client-src/sockjs/webpack.config.js",
     "webpack-dev-server": "cd $INIT_CWD && node ../../../bin/webpack-dev-server.js"
   },
   "files": [
@@ -70,10 +71,12 @@
     "yargs": "6.6.0"
   },
   "devDependencies": {
+    "babel-cli": "^6.26.0",
     "babel-core": "^6.26.0",
     "babel-loader": "^7.1.2",
     "babel-preset-env": "^1.6.1",
     "codecov.io": "^0.1.6",
+    "copy-webpack-plugin": "^4.3.1",
     "css-loader": "^0.28.5",
     "eslint": "^4.5.0",
     "eslint-config-webpack": "^1.2.5",