youseries 7 rokov pred
rodič
commit
573bb521b2

+ 21 - 25
urule-console-js/package.json

@@ -7,43 +7,39 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "Jacky.Gao",
-  "license": "GPL",
+  "license": "The Apache-2.0 License",
   "dependencies": {
     "bootbox": "^4.4.0",
     "bootstrap": "^3.3.6",
-    "codemirror": "^5.17.0",
+    "bootstrapvalidator": "^0.5.4",
+    "codemirror": "^5.33.0",
     "css": "^2.2.1",
     "events": "^1.1.0",
     "flowdesigner": "^1.1.55",
-    "flux": "^2.1.1",
     "font-awesome": "^4.6.1",
     "jquery": "^3.3.1",
-    "object-assign": "^4.1.0",
+    "object-assign": "^4.1.1",
     "raphael": "^2.2.1",
-    "react": "^15.4.1",
-    "react-dom": "^15.4.1",
-    "react-redux": "^4.4.6",
+    "react": "^16.3.1",
+    "react-dom": "^16.3.1",
+    "react-redux": "^5.0.7",
     "react-splitter": "^0.2.0",
-    "redux": "^3.6.0",
-    "redux-logger": "^2.7.4",
-    "redux-thunk": "^2.1.0"
+    "redux": "^3.7.2",
+    "redux-logger": "^3.0.6",
+    "redux-thunk": "^2.2.0"
   },
   "devDependencies": {
-    "babel-cli": "^6.9.0",
-    "babel-core": "^6.8.0",
-    "babel-loader": "^6.2.4",
-    "babel-preset-es2015": "^6.6.0",
-    "babel-preset-react": "^6.5.0",
-    "clean-webpack-plugin": "^0.1.10",
-    "css-loader": "^0.23.1",
-    "expose-loader": "^0.7.1",
-    "file-loader": "^0.8.5",
-    "redux-devtools": "^3.3.1",
-    "redux-devtools-dock-monitor": "^1.1.1",
-    "redux-devtools-log-monitor": "^1.0.11",
+    "babel-core": "^6.26.0",
+    "babel-loader": "^7.1.4",
+    "babel-preset-env": "^1.6.1",
+    "babel-preset-react": "^6.24.1",
+    "css-loader": "^0.28.11",
+    "expose-loader": "^0.7.5",
+    "file-loader": "^1.1.11",
+    "redux-devtools": "^3.4.1",
+    "redux-devtools-dock-monitor": "^1.1.3",
     "style-loader": "^0.13.1",
-    "url-loader": "^0.5.7",
-    "webpack": "^1.13.3",
-    "webpack-cleanup-plugin": "^0.2.0"
+    "uglifyjs-webpack-plugin": "^1.2.4",
+    "url-loader": "^0.5.7"
   }
 }

+ 27 - 17
urule-console-js/webpack.config.js

@@ -1,8 +1,10 @@
 /**
- * Created by Jacky.gao on 2016/5/17.
+ * Created by Jacky.Gao on 2018-04-23.
+ * Base on Webpack4
  */
-var webpack = require('webpack');
-module.exports = {
+const path=require('path');
+module.exports={
+    mode:'development',
     entry: {
         frame:'./src/frame/index.jsx',
         variableEditor:'./src/variable/index.jsx',
@@ -20,29 +22,37 @@ module.exports = {
         scoreCardTable:'./src/scorecard/index.jsx',
         permissionConfigEditor:'./src/permission/index.jsx'
     },
-    output: {
-        path: '../urule-console/src/main/resources/urule-asserts/js',
-        filename: '[name].bundle.js'
+    output:{
+        path:path.resolve('../urule-console/src/main/resources/urule-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
+                exclude: /node_modules/,
+                loader: "babel-loader",
+                options:{
+                    "presets": [
+                        "react","env"
+                    ]
                 }
             },
             {
-                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]'
+                use: [
+                    {
+                        loader: 'url-loader',
+                        options: {
+                            limit: 10000000
+                        }
+                    }
+                ]
             }
         ]
     }
-}
+};

+ 41 - 32
urule-console-js/webpack.config.min.js

@@ -1,9 +1,11 @@
 /**
- * Created by Jacky.gao on 2016/5/17.
+ * Created by Jacky.Gao on 2018-04-23.
+ * 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: {
         frame:'./src/frame/index.jsx',
         variableEditor:'./src/variable/index.jsx',
@@ -21,45 +23,52 @@ module.exports = {
         scoreCardTable:'./src/scorecard/index.jsx',
         permissionConfigEditor:'./src/permission/index.jsx'
     },
-    output: {
-        path: '../urule-console/src/main/resources/urule-asserts/js',
-        filename: '[name].bundle.js'
+    output:{
+        path:path.resolve('../urule-console/src/main/resources/urule-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
+                exclude: /node_modules/,
+                loader: "babel-loader",
+                options:{
+                    "presets": [
+                        "react","env"
+                    ]
                 }
             },
             {
-                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]'
+                use: [
+                    {
+                        loader: 'url-loader',
+                        options: {
+                            limit: 10000000
+                        }
+                    }
+                ]
             }
         ]
     }
-}
+};