优化代码压缩，减小压缩后JS体积

6年前 · faa1df0cf5
--- a/ureport2-console/pom.xml
+++ b/ureport2-console/pom.xml
@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.bstek.ureport</groupId>
 		<artifactId>ureport2-parent</artifactId>
-		<version>2.0.5</version>
+		<version>2.0.6</version>
 	</parent>
 	<dependencies>
 		<dependency>
--- a/ureport2-console/src/main/resources/ureport-asserts/js/designer.bundle.js
+++ b/ureport2-console/src/main/resources/ureport-asserts/js/designer.bundle.js
--- a/ureport2-console/src/main/resources/ureport-asserts/js/preview.bundle.js
+++ b/ureport2-console/src/main/resources/ureport-asserts/js/preview.bundle.js
--- a/ureport2-console/src/main/resources/ureport-asserts/js/searchform.bundle.js
+++ b/ureport2-console/src/main/resources/ureport-asserts/js/searchform.bundle.js
--- a/ureport2-console/src/main/resources/ureport-html/designer.html
+++ b/ureport2-console/src/main/resources/ureport-html/designer.html
@ -2,6 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
+<link href="${contextPath}/ureport/res/ureport-asserts/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
 <title>UReport2 Designer</title>
 <script type="text/javascript" src="${contextPath}/ureport/res/ureport-asserts/venderjs/jquery.min.js"></script>
 <script type="text/javascript" src="${contextPath}/ureport/res/ureport-asserts/venderjs/jquery.contextMenu.min.js"></script>
--- a/ureport2-console/src/main/resources/ureport-html/html-preview.html
+++ b/ureport2-console/src/main/resources/ureport-html/html-preview.html
@ -2,6 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
+<link href="${contextPath}/ureport/res/ureport-asserts/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
 <meta name="renderer" content="webkit">
 <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
 <meta http-equiv="Cache-Control" content="no-siteapp" />
--- a/ureport2-console/src/main/resources/ureport-html/searchform.html
+++ b/ureport2-console/src/main/resources/ureport-html/searchform.html
@ -2,6 +2,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
+<link href="${contextPath}/ureport/res/ureport-asserts/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
 <title>UReport2 Designer</title>
 <script type="text/javascript" src="${contextPath}/ureport/res/ureport-asserts/venderjs/jquery.min.js"></script>
 <script type="text/javascript" src="${contextPath}/ureport/res/ureport-asserts/venderjs/jquery-ui.min.js"></script>
--- a/ureport2-core/pom.xml
+++ b/ureport2-core/pom.xml
@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.bstek.ureport</groupId>
 		<artifactId>ureport2-parent</artifactId>
-		<version>2.0.5</version>
+		<version>2.0.6</version>
 	</parent>
 	<dependencies>
 		<dependency>
--- a/ureport2-js/package.json
+++ b/ureport2-js/package.json
@ -14,7 +14,7 @@
    "email": "jacky.gao@bstek.com",
    "url": "http://www.bstek.com"
  },
-  "license": "Apache-2.0",
+  "license": "The Apache-2.0 License",
  "dependencies": {
    "bootbox": "^4.4.0",
    "bootstrap": "^3.3.7",
@ -22,31 +22,24 @@
    "chart.js": "^2.6.0",
    "codemirror": "^5.23.0",
    "completer": "^0.1.3",
-    "handsontable": "^0.32.0-beta2",
+    "handsontable": "^2.0.0",
    "jquery": "^3.1.1",
    "jquery-contextmenu": "^2.4.2",
    "node-uuid": "^1.4.7",
    "raphael": "^2.2.7",
-    "save-svg-as-png": "^1.2.0",
+    "save-svg-as-png": "^1.3.2",
    "undo-manager": "^1.0.5"
  },
  "devDependencies": {
-    "babel-cli": "^6.18.0",
-    "babel-core": "^6.18.2",
-    "babel-loader": "^6.2.8",
-    "babel-preset-es2015": "^6.18.0",
-    "babel-preset-react": "^6.16.0",
-    "clean-webpack-plugin": "^0.1.14",
-    "css-loader": "^0.26.1",
+    "babel-cli": "^6.26.0",
+    "babel-core": "^6.26.0",
+    "babel-loader": "^7.1.4",
+    "babel-preset-env": "^1.6.1",
+    "css-loader": "^0.28.11",
    "expose-loader": "^0.7.1",
    "file-loader": "^0.9.0",
-    "json-loader": "^0.5.7",
-    "redux-devtools": "^3.3.1",
-    "redux-devtools-dock-monitor": "^1.1.1",
-    "redux-devtools-log-monitor": "^1.1.1",
    "style-loader": "^0.13.1",
-    "url-loader": "^0.5.7",
-    "webpack": "^1.13.3",
-    "webpack-cleanup-plugin": "^0.4.1"
+    "uglifyjs-webpack-plugin": "^1.2.4",
+    "url-loader": "^0.5.7"
  }
 }
--- a/ureport2-js/src/form/FormBuilder.js
+++ b/ureport2-js/src/form/FormBuilder.js
@ -5,8 +5,6 @@ import './css/iconfont.css';
 import './css/form.css';
 import './external/jquery-ui.css';
 import './external/bootstrap-datetimepicker.css';
-import '../../node_modules/bootstrap/dist/css/bootstrap.css';
-import '../../node_modules/bootstrap/dist/js/bootstrap.js';
 import Utils from './Utils.js';
 import CanvasContainer from './container/CanvasContainer.js';
 import Toolbar from './Toolbar.js';
--- a/ureport2-js/src/index.js
+++ b/ureport2-js/src/index.js
@ -4,7 +4,6 @@
 import '../node_modules/jquery-contextmenu/dist/jquery.contextMenu.min.css';
 import '../node_modules/completer/dist/completer.min.css';
 import '../node_modules/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css';
-import '../node_modules/bootstrap/dist/css/bootstrap.min.css';
 import '../node_modules/handsontable/dist/handsontable.full.min.css';
 import '../node_modules/codemirror/lib/codemirror.css';
 import '../node_modules/codemirror/addon/hint/show-hint.css';
--- a/ureport2-js/src/preview.js
+++ b/ureport2-js/src/preview.js
@ -2,7 +2,6 @@
 * Created by Jacky.Gao on 2017-03-17.
 */
 import Chart from "chart.js";
-import '../node_modules/bootstrap/dist/css/bootstrap.min.css';
 import './form/external/bootstrap-datetimepicker.css';
 import {getParameter,pointToMM,showLoading,hideLoading} from './Utils.js';
 import {alert} from './MsgBox.js';
--- a/ureport2-js/webpack.config.js
+++ b/ureport2-js/webpack.config.js
@ -1,39 +1,40 @@
 /**
- * Created by Jacky.gao on 2016/5/17.
+ * Created by Jacky.Gao on 2018-04-15.
+ * Base on Webpack4
 */
-var webpack = require('webpack');
-module.exports = {
+const path=require('path');
+module.exports={
+    mode:'development',
    entry: {
        designer:'./src/index.js',
        searchform:'./src/form/index.js',
        preview:'./src/preview.js'
    },
-    output: {
-        path: '../ureport2-console/src/main/resources/ureport-asserts/js',
-        filename: '[name].bundle.js'
+    output:{
+        path:path.resolve('../ureport2-console/src/main/resources/ureport-asserts/js'),
+        filename:'[name].bundle.js'
    },
-    module: {
-        loaders: [
+    module:{
+        rules:[
            {
-                test: /\.(jsx|js)?$/,
-                exclude: /(node_modules|bower_components)/,
-                loader: 'babel',
-                query: {
-                    presets: ['react', 'es2015'],
-                    compact:true
-                }
+                test: /\.js$/,
+                exclude: /node_modules/,
+                loader: "babel-loader"
            },
            {
-                test: /\.css$/,
-                loader: "style-loader!css-loader"
+                test:/\.css$/,
+                use: [{ loader: 'style-loader' }, { loader: 'css-loader' }]
            },
            {
                test: /\.(eot|woff|woff2|ttf|svg|png|jpg)$/,
-                loader: 'url-loader?limit=1000000&name=[name]-[hash].[ext]'
-            },
-            {
-                test: /\.json$/,
-                loader: 'json-loader'
+                use: [
+                    {
+                        loader: 'url-loader',
+                        options: {
+                            limit: 10000000
+                        }
+                    }
+                ]
            }
        ]
    }
--- a/ureport2-js/webpack.config.min.js
+++ b/ureport2-js/webpack.config.min.js
@ -1,57 +1,57 @@
 /**
- * Created by Jacky.gao on 2016/5/17.
+ * Created by Jacky.Gao on 2018-04-15.
+ * Base on Webpack4
 */
-var webpack = require('webpack');
-var WebpackCleanupPlugin = require('webpack-cleanup-plugin');
-module.exports = {
+const path=require('path');
+const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
+module.exports={
+    mode:'production',
    entry: {
        designer:'./src/index.js',
        searchform:'./src/form/index.js',
        preview:'./src/preview.js'
    },
-    output: {
-        path: '../ureport2-console/src/main/resources/ureport-asserts/js',
-        filename: '[name].bundle.js'
+    output:{
+        path:path.resolve('../ureport2-console/src/main/resources/ureport-asserts/js'),
+        filename:'[name].bundle.js'
    },
-    plugins: [
-        new webpack.optimize.UglifyJsPlugin({
-            compress: {
-                warnings: false
-            },
-            output: {
-                comments: false
-            }
-        }),
-        new webpack.DefinePlugin({
-            'process.env':{
-                'NODE_ENV': JSON.stringify('production')
+    plugins:[
+        new UglifyJsPlugin(
+            {
+                uglifyOptions: {
+                    warnings: false,
+                    output: {
+                        comments: false
+                    },
+                    compress: {
+                        drop_console: true
+                    }
+                }
            }
-        }),
-        new WebpackCleanupPlugin()
+        )
    ],
-    module: {
-        loaders: [
+    module:{
+        rules:[
            {
-                test: /\.(jsx|js)?$/,
-                exclude: /(node_modules|bower_components)/,
-                loader: 'babel',
-                query: {
-                    presets: ['react', 'es2015'],
-                    compact:true
-                }
+                test: /\.js$/,
+                exclude: /node_modules/,
+                loader: "babel-loader"
            },
            {
-                test: /\.css$/,
-                loader: "style-loader!css-loader"
+                test:/\.css$/,
+                use: [{ loader: 'style-loader' }, { loader: 'css-loader' }]
            },
            {
                test: /\.(eot|woff|woff2|ttf|svg|png|jpg)$/,
-                loader: 'url-loader?limit=1000000&name=[name]-[hash].[ext]'
-            },
-            {
-                test: /\.json$/,
-                loader: 'json-loader'
+                use: [
+                    {
+                        loader: 'url-loader',
+                        options: {
+                            limit: 10000000
+                        }
+                    }
+                ]
            }
        ]
    }
-}
+};
--- a/ureport2-parent/pom.xml
+++ b/ureport2-parent/pom.xml
@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.bstek.ureport</groupId>
 	<artifactId>ureport2-parent</artifactId>
-	<version>2.0.5</version>
+	<version>2.0.6</version>
 	<packaging>pom</packaging>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@ -88,6 +88,7 @@
 					<include>**/*.TTF</include>
 					<include>**/*.TTC</include>
 					<include>**/*.woff</include>
+					<include>**/*.woff2</include>
 					<include>**/*.md</include>
 					<include>**/*.template</include>
 				</includes>