Home Explore Help
Register Sign In
Apq
/
SwitchHosts
mirror of https://github.com/oldj/SwitchHosts.git
1
0
Fork 0
Files Issues 0 Wiki
Browse Source

修复一处样式问题。

oldj 8 years ago
parent
8149b2952b
commit
72cedec760
13 changed files with 417 additions and 100 deletions
Split View Show Diff Stats
  1. 1 0
      app-ui/content/Content.jsx
  2. 6 0
      app-ui/content/Content.less
  3. 1 0
      app/ui/app.css
  4. 1 0
      app/ui/app.js
  5. 0 1
      app/ui/bundle.js
  6. 1 0
      app/ui/common.js
  7. 3 2
      app/ui/index.html
  8. 0 1
      app/ui/lib.js
  9. 1 1
      app/version.js
  10. 370 81
      package-lock.json
  11. 5 4
      package.json
  12. 2 2
      scripts/webpack.dll.js
  13. 26 8
      webpack.config.js

+ 1 - 0
app-ui/content/Content.jsx
View File 

@@ -11,6 +11,7 @@ import classnames from 'classnames'
 
 import SearchBar from './SearchBar'
 
 import Agent from '../Agent'
 
 import Editor from './Editor'
 
+
 
 import styles from './Content.less'
 
 
 export default class Content extends React.Component {

+ 6 - 0
app-ui/content/Content.less
View File 

@@ -35,6 +35,12 @@
 
       display: inline-block;
 
     }
 
   }
 
+
 
+}
 
+
 
+.loading {
 
+  color: #f00;
 
+  padding: 10px;
 
 }
 
 
 .errorMessage {

File diff suppressed because it is too large
+ 1 - 0
app/ui/app.css


File diff suppressed because it is too large
+ 1 - 0
app/ui/app.js


File diff suppressed because it is too large
+ 0 - 1
app/ui/bundle.js


File diff suppressed because it is too large
+ 1 - 0
app/ui/common.js


+ 3 - 2
app/ui/index.html
View File 

@@ -4,10 +4,11 @@
 
 	<meta charset="UTF-8">
 
 	<title>SwitchHosts!</title>
 
 	<link rel="stylesheet" href="iconfont/iconfont.css">
 
+	<link rel="stylesheet" href="app.css">
 
 </head>
 
 <body>
 
 <div id="app"></div>
 
-<script src="./lib.js"></script>
 
-<script src="./bundle.js"></script>
 
+<script src="./common.js"></script>
 
+<script src="./app.js"></script>
 
 </body>
 
 </html>

File diff suppressed because it is too large
+ 0 - 1
app/ui/lib.js


+ 1 - 1
app/version.js
View File 

@@ -1 +1 @@
 
-exports.version = [3,3,8,5328];
 
+exports.version = [3,3,8,5338];

+ 370 - 81
package-lock.json
View File 

@@ -2842,9 +2842,9 @@
 
       "dev": true
 
     },
 
     "clap": {
 
-      "version": "1.1.3",
 
-      "resolved": "https://registry.npmjs.org/clap/-/clap-1.1.3.tgz",
 
-      "integrity": "sha1-s7026T3Uy/s5WjwmiWNSRFJlwFs=",
 
+      "version": "1.2.0",
 
+      "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.0.tgz",
 
+      "integrity": "sha1-WckP4+E3EEdG/xlGmiemNP9oyFc=",
 
       "dev": true,
 
       "requires": {
 
         "chalk": "1.1.3"
 
@@ -3037,9 +3037,9 @@
 
       }
 
     },
 
     "coa": {
 
-      "version": "1.0.2",
 
-      "resolved": "https://registry.npmjs.org/coa/-/coa-1.0.2.tgz",
 
-      "integrity": "sha1-K6n+w7SqQ9eknX5sNWHpIGG2vOw=",
 
+      "version": "1.0.4",
 
+      "resolved": "https://registry.npmjs.org/coa/-/coa-1.0.4.tgz",
 
+      "integrity": "sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=",
 
       "dev": true,
 
       "requires": {
 
         "q": "1.5.0"
 
@@ -3594,14 +3594,15 @@
 
       "dev": true
 
     },
 
     "css-loader": {
 
-      "version": "0.26.4",
 
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.26.4.tgz",
 
-      "integrity": "sha1-th6eMNuUMD5v/IkvEOzQmtAlof0=",
 
+      "version": "0.28.7",
 
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.7.tgz",
 
+      "integrity": "sha512-GxMpax8a/VgcfRrVy0gXD6yLd5ePYbXX/5zGgTVYp4wXtJklS8Z2VaUArJgc//f6/Dzil7BaJObdSv8eKKCPgg==",
 
       "dev": true,
 
       "requires": {
 
         "babel-code-frame": "6.22.0",
 
         "css-selector-tokenizer": "0.7.0",
 
         "cssnano": "3.10.0",
 
+        "icss-utils": "2.1.0",
 
         "loader-utils": "1.1.0",
 
         "lodash.camelcase": "4.3.0",
 
         "object-assign": "4.1.1",
 
@@ -3610,7 +3611,8 @@
 
         "postcss-modules-local-by-default": "1.2.0",
 
         "postcss-modules-scope": "1.1.0",
 
         "postcss-modules-values": "1.3.0",
 
-        "source-list-map": "0.1.8"
 
+        "postcss-value-parser": "3.3.0",
 
+        "source-list-map": "2.0.0"
 
       }
 
     },
 
     "css-parse": {
 
@@ -3654,7 +3656,20 @@
 
       "requires": {
 
         "cssesc": "0.1.0",
 
         "fastparse": "1.1.1",
 
-        "regexpu-core": "2.0.0"
 
+        "regexpu-core": "1.0.0"
 
+      },
 
+      "dependencies": {
 
+        "regexpu-core": {
 
+          "version": "1.0.0",
 
+          "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz",
 
+          "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=",
 
+          "dev": true,
 
+          "requires": {
 
+            "regenerate": "1.3.2",
 
+            "regjsgen": "0.2.0",
 
+            "regjsparser": "0.1.5"
 
+          }
 
+        }
 
       }
 
     },
 
     "css-value": {
 
@@ -3721,7 +3736,7 @@
 
       "integrity": "sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U=",
 
       "dev": true,
 
       "requires": {
 
-        "clap": "1.1.3",
 
+        "clap": "1.2.0",
 
         "source-map": "0.5.6"
 
       }
 
     },
 
@@ -5152,28 +5167,15 @@
 
       }
 
     },
 
     "extract-text-webpack-plugin": {
 
-      "version": "2.1.0",
 
-      "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.1.0.tgz",
 
-      "integrity": "sha1-aTFbiF+Hbb+W04Gfap8cynrr8Vk=",
 
+      "version": "3.0.0",
 
+      "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.0.tgz",
 
+      "integrity": "sha1-kMqnkHvESfM1AF46x1MrQbAN5hI=",
 
       "dev": true,
 
       "requires": {
 
-        "ajv": "4.11.8",
 
         "async": "2.4.1",
 
         "loader-utils": "1.1.0",
 
-        "webpack-sources": "0.1.5"
 
-      },
 
-      "dependencies": {
 
-        "loader-utils": {
 
-          "version": "1.1.0",
 
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
 
-          "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
 
-          "dev": true,
 
-          "requires": {
 
-            "big.js": "3.1.3",
 
-            "emojis-list": "2.1.0",
 
-            "json5": "0.5.1"
 
-          }
 
-        }
 
+        "schema-utils": "0.3.0",
 
+        "webpack-sources": "1.0.1"
 
       }
 
     },
 
     "extract-zip": {
 
@@ -7280,6 +7282,69 @@
 
       "integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=",
 
       "dev": true
 
     },
 
+    "icss-utils": {
 
+      "version": "2.1.0",
 
+      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-2.1.0.tgz",
 
+      "integrity": "sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=",
 
+      "dev": true,
 
+      "requires": {
 
+        "postcss": "6.0.11"
 
+      },
 
+      "dependencies": {
 
+        "ansi-styles": {
 
+          "version": "3.2.0",
 
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
 
+          "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
 
+          "dev": true,
 
+          "requires": {
 
+            "color-convert": "1.9.0"
 
+          }
 
+        },
 
+        "chalk": {
 
+          "version": "2.1.0",
 
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz",
 
+          "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==",
 
+          "dev": true,
 
+          "requires": {
 
+            "ansi-styles": "3.2.0",
 
+            "escape-string-regexp": "1.0.5",
 
+            "supports-color": "4.4.0"
 
+          }
 
+        },
 
+        "has-flag": {
 
+          "version": "2.0.0",
 
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
 
+          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
 
+          "dev": true
 
+        },
 
+        "postcss": {
 
+          "version": "6.0.11",
 
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.11.tgz",
 
+          "integrity": "sha512-DsnIzznNRQprsGTALpkC0xjDygo+QcOd+qVjP9+RjyzrPiyYOXBGOwoJ4rAiiE4lu6JggQ/jW4niY24WLxuncg==",
 
+          "dev": true,
 
+          "requires": {
 
+            "chalk": "2.1.0",
 
+            "source-map": "0.5.7",
 
+            "supports-color": "4.4.0"
 
+          }
 
+        },
 
+        "source-map": {
 
+          "version": "0.5.7",
 
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
 
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
 
+          "dev": true
 
+        },
 
+        "supports-color": {
 
+          "version": "4.4.0",
 
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
 
+          "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
 
+          "dev": true,
 
+          "requires": {
 
+            "has-flag": "2.0.0"
 
+          }
 
+        }
 
+      }
 
+    },
 
     "ieee754": {
 
       "version": "1.1.8",
 
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz",
 
@@ -8018,6 +8083,16 @@
 
         "graceful-fs": "4.1.11"
 
       }
 
     },
 
+    "last-call-webpack-plugin": {
 
+      "version": "2.1.2",
 
+      "resolved": "https://registry.npmjs.org/last-call-webpack-plugin/-/last-call-webpack-plugin-2.1.2.tgz",
 
+      "integrity": "sha512-CZc+m2xZm51J8qSwdODeiiNeqh8CYkKEq6Rw8IkE4i/4yqf2cJhjQPsA6BtAV970ePRNhwEOXhy2U5xc5Jwh9Q==",
 
+      "dev": true,
 
+      "requires": {
 
+        "lodash": "4.17.4",
 
+        "webpack-sources": "1.0.1"
 
+      }
 
+    },
 
     "last-line-stream": {
 
       "version": "1.0.0",
 
       "resolved": "https://registry.npmjs.org/last-line-stream/-/last-line-stream-1.0.0.tgz",
 
@@ -8102,20 +8177,15 @@
 
           "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz",
 
           "integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=",
 
           "dev": true
 
-        },
 
-        "loader-utils": {
 
-          "version": "1.1.0",
 
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
 
-          "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
 
-          "dev": true,
 
-          "requires": {
 
-            "big.js": "3.1.3",
 
-            "emojis-list": "2.1.0",
 
-            "json5": "0.5.1"
 
-          }
 
         }
 
       }
 
     },
 
+    "less-plugin-lists": {
 
+      "version": "1.1.1",
 
+      "resolved": "https://registry.npmjs.org/less-plugin-lists/-/less-plugin-lists-1.1.1.tgz",
 
+      "integrity": "sha1-bmJFvNp1tCTb/ntJ17KkCbn/HBc=",
 
+      "dev": true
 
+    },
 
     "levn": {
 
       "version": "0.3.0",
 
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
 
@@ -10825,14 +10895,13 @@
 
       }
 
     },
 
     "optimize-css-assets-webpack-plugin": {
 
-      "version": "1.3.2",
 
-      "resolved": "https://registry.npmjs.org/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-1.3.2.tgz",
 
-      "integrity": "sha1-6ydFbiHu+9gIDzHoNoxZaE5YWiw=",
 
+      "version": "3.2.0",
 
+      "resolved": "https://registry.npmjs.org/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-3.2.0.tgz",
 
+      "integrity": "sha512-Fjn7wyyadPAriuH2DHamDQw5B8GohEWbroBkKoPeP+vSF2PIAPI7WDihi8WieMRb/At4q7Ea7zTKaMDuSoIAAg==",
 
       "dev": true,
 
       "requires": {
 
         "cssnano": "3.10.0",
 
-        "underscore": "1.8.3",
 
-        "webpack-sources": "0.1.5"
 
+        "last-call-webpack-plugin": "2.1.2"
 
       }
 
     },
 
     "option-chain": {
 
@@ -11409,7 +11478,61 @@
 
       "integrity": "sha1-thTJcgvmgW6u41+zpfqh26agXds=",
 
       "dev": true,
 
       "requires": {
 
-        "postcss": "5.2.17"
 
+        "postcss": "6.0.11"
 
+      },
 
+      "dependencies": {
 
+        "ansi-styles": {
 
+          "version": "3.2.0",
 
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
 
+          "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
 
+          "dev": true,
 
+          "requires": {
 
+            "color-convert": "1.9.0"
 
+          }
 
+        },
 
+        "chalk": {
 
+          "version": "2.1.0",
 
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz",
 
+          "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==",
 
+          "dev": true,
 
+          "requires": {
 
+            "ansi-styles": "3.2.0",
 
+            "escape-string-regexp": "1.0.5",
 
+            "supports-color": "4.4.0"
 
+          }
 
+        },
 
+        "has-flag": {
 
+          "version": "2.0.0",
 
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
 
+          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
 
+          "dev": true
 
+        },
 
+        "postcss": {
 
+          "version": "6.0.11",
 
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.11.tgz",
 
+          "integrity": "sha512-DsnIzznNRQprsGTALpkC0xjDygo+QcOd+qVjP9+RjyzrPiyYOXBGOwoJ4rAiiE4lu6JggQ/jW4niY24WLxuncg==",
 
+          "dev": true,
 
+          "requires": {
 
+            "chalk": "2.1.0",
 
+            "source-map": "0.5.7",
 
+            "supports-color": "4.4.0"
 
+          }
 
+        },
 
+        "source-map": {
 
+          "version": "0.5.7",
 
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
 
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
 
+          "dev": true
 
+        },
 
+        "supports-color": {
 
+          "version": "4.4.0",
 
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
 
+          "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
 
+          "dev": true,
 
+          "requires": {
 
+            "has-flag": "2.0.0"
 
+          }
 
+        }
 
       }
 
     },
 
     "postcss-modules-local-by-default": {
 
@@ -11419,7 +11542,61 @@
 
       "dev": true,
 
       "requires": {
 
         "css-selector-tokenizer": "0.7.0",
 
-        "postcss": "5.2.17"
 
+        "postcss": "6.0.11"
 
+      },
 
+      "dependencies": {
 
+        "ansi-styles": {
 
+          "version": "3.2.0",
 
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
 
+          "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
 
+          "dev": true,
 
+          "requires": {
 
+            "color-convert": "1.9.0"
 
+          }
 
+        },
 
+        "chalk": {
 
+          "version": "2.1.0",
 
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz",
 
+          "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==",
 
+          "dev": true,
 
+          "requires": {
 
+            "ansi-styles": "3.2.0",
 
+            "escape-string-regexp": "1.0.5",
 
+            "supports-color": "4.4.0"
 
+          }
 
+        },
 
+        "has-flag": {
 
+          "version": "2.0.0",
 
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
 
+          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
 
+          "dev": true
 
+        },
 
+        "postcss": {
 
+          "version": "6.0.11",
 
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.11.tgz",
 
+          "integrity": "sha512-DsnIzznNRQprsGTALpkC0xjDygo+QcOd+qVjP9+RjyzrPiyYOXBGOwoJ4rAiiE4lu6JggQ/jW4niY24WLxuncg==",
 
+          "dev": true,
 
+          "requires": {
 
+            "chalk": "2.1.0",
 
+            "source-map": "0.5.7",
 
+            "supports-color": "4.4.0"
 
+          }
 
+        },
 
+        "source-map": {
 
+          "version": "0.5.7",
 
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
 
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
 
+          "dev": true
 
+        },
 
+        "supports-color": {
 
+          "version": "4.4.0",
 
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
 
+          "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
 
+          "dev": true,
 
+          "requires": {
 
+            "has-flag": "2.0.0"
 
+          }
 
+        }
 
       }
 
     },
 
     "postcss-modules-scope": {
 
@@ -11429,7 +11606,61 @@
 
       "dev": true,
 
       "requires": {
 
         "css-selector-tokenizer": "0.7.0",
 
-        "postcss": "5.2.17"
 
+        "postcss": "6.0.11"
 
+      },
 
+      "dependencies": {
 
+        "ansi-styles": {
 
+          "version": "3.2.0",
 
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
 
+          "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
 
+          "dev": true,
 
+          "requires": {
 
+            "color-convert": "1.9.0"
 
+          }
 
+        },
 
+        "chalk": {
 
+          "version": "2.1.0",
 
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz",
 
+          "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==",
 
+          "dev": true,
 
+          "requires": {
 
+            "ansi-styles": "3.2.0",
 
+            "escape-string-regexp": "1.0.5",
 
+            "supports-color": "4.4.0"
 
+          }
 
+        },
 
+        "has-flag": {
 
+          "version": "2.0.0",
 
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
 
+          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
 
+          "dev": true
 
+        },
 
+        "postcss": {
 
+          "version": "6.0.11",
 
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.11.tgz",
 
+          "integrity": "sha512-DsnIzznNRQprsGTALpkC0xjDygo+QcOd+qVjP9+RjyzrPiyYOXBGOwoJ4rAiiE4lu6JggQ/jW4niY24WLxuncg==",
 
+          "dev": true,
 
+          "requires": {
 
+            "chalk": "2.1.0",
 
+            "source-map": "0.5.7",
 
+            "supports-color": "4.4.0"
 
+          }
 
+        },
 
+        "source-map": {
 
+          "version": "0.5.7",
 
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
 
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
 
+          "dev": true
 
+        },
 
+        "supports-color": {
 
+          "version": "4.4.0",
 
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
 
+          "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
 
+          "dev": true,
 
+          "requires": {
 
+            "has-flag": "2.0.0"
 
+          }
 
+        }
 
       }
 
     },
 
     "postcss-modules-values": {
 
@@ -11439,7 +11670,61 @@
 
       "dev": true,
 
       "requires": {
 
         "icss-replace-symbols": "1.1.0",
 
-        "postcss": "5.2.17"
 
+        "postcss": "6.0.11"
 
+      },
 
+      "dependencies": {
 
+        "ansi-styles": {
 
+          "version": "3.2.0",
 
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
 
+          "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
 
+          "dev": true,
 
+          "requires": {
 
+            "color-convert": "1.9.0"
 
+          }
 
+        },
 
+        "chalk": {
 
+          "version": "2.1.0",
 
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz",
 
+          "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==",
 
+          "dev": true,
 
+          "requires": {
 
+            "ansi-styles": "3.2.0",
 
+            "escape-string-regexp": "1.0.5",
 
+            "supports-color": "4.4.0"
 
+          }
 
+        },
 
+        "has-flag": {
 
+          "version": "2.0.0",
 
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
 
+          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
 
+          "dev": true
 
+        },
 
+        "postcss": {
 
+          "version": "6.0.11",
 
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.11.tgz",
 
+          "integrity": "sha512-DsnIzznNRQprsGTALpkC0xjDygo+QcOd+qVjP9+RjyzrPiyYOXBGOwoJ4rAiiE4lu6JggQ/jW4niY24WLxuncg==",
 
+          "dev": true,
 
+          "requires": {
 
+            "chalk": "2.1.0",
 
+            "source-map": "0.5.7",
 
+            "supports-color": "4.4.0"
 
+          }
 
+        },
 
+        "source-map": {
 
+          "version": "0.5.7",
 
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
 
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
 
+          "dev": true
 
+        },
 
+        "supports-color": {
 
+          "version": "4.4.0",
 
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
 
+          "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
 
+          "dev": true,
 
+          "requires": {
 
+            "has-flag": "2.0.0"
 
+          }
 
+        }
 
       }
 
     },
 
     "postcss-normalize-charset": {
 
@@ -12749,11 +13034,34 @@
 
       }
 
     },
 
     "sax": {
 
-      "version": "1.2.2",
 
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.2.tgz",
 
-      "integrity": "sha1-/YYxojvHgmvvXYcb24c3jJVkeCg=",
 
+      "version": "1.2.4",
 
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
 
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
 
       "dev": true
 
     },
 
+    "schema-utils": {
 
+      "version": "0.3.0",
 
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz",
 
+      "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=",
 
+      "dev": true,
 
+      "requires": {
 
+        "ajv": "5.2.2"
 
+      },
 
+      "dependencies": {
 
+        "ajv": {
 
+          "version": "5.2.2",
 
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.2.tgz",
 
+          "integrity": "sha1-R8aNaehvXZUxA7AHSpQw3GPaXjk=",
 
+          "dev": true,
 
+          "requires": {
 
+            "co": "4.6.0",
 
+            "fast-deep-equal": "1.0.0",
 
+            "json-schema-traverse": "0.3.1",
 
+            "json-stable-stringify": "1.0.1"
 
+          }
 
+        }
 
+      }
 
+    },
 
     "semver": {
 
       "version": "5.3.0",
 
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
 
@@ -12934,9 +13242,9 @@
 
       "dev": true
 
     },
 
     "source-list-map": {
 
-      "version": "0.1.8",
 
-      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz",
 
-      "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=",
 
+      "version": "2.0.0",
 
+      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz",
 
+      "integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==",
 
       "dev": true
 
     },
 
     "source-map": {
 
@@ -13223,19 +13531,6 @@
 
       "dev": true,
 
       "requires": {
 
         "loader-utils": "1.1.0"
 
-      },
 
-      "dependencies": {
 
-        "loader-utils": {
 
-          "version": "1.1.0",
 
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
 
-          "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
 
-          "dev": true,
 
-          "requires": {
 
-            "big.js": "3.1.3",
 
-            "emojis-list": "2.1.0",
 
-            "json5": "0.5.1"
 
-          }
 
-        }
 
       }
 
     },
 
     "sumchecker": {
 
@@ -13262,12 +13557,12 @@
 
       "integrity": "sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U=",
 
       "dev": true,
 
       "requires": {
 
-        "coa": "1.0.2",
 
+        "coa": "1.0.4",
 
         "colors": "1.1.2",
 
         "csso": "2.3.2",
 
         "js-yaml": "3.7.0",
 
         "mkdirp": "0.5.1",
 
-        "sax": "1.2.2",
 
+        "sax": "1.2.4",
 
         "whet.extend": "0.9.9"
 
       }
 
     },
 
@@ -13756,12 +14051,6 @@
 
       "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
 
       "dev": true
 
     },
 
-    "underscore": {
 
-      "version": "1.8.3",
 
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
 
-      "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=",
 
-      "dev": true
 
-    },
 
     "undertaker": {
 
       "version": "1.1.0",
 
       "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.1.0.tgz",
 
@@ -14468,12 +14757,12 @@
 
       }
 
     },
 
     "webpack-sources": {
 
-      "version": "0.1.5",
 
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.1.5.tgz",
 
-      "integrity": "sha1-qh86vw8NdNtxEcQOUAuE+WZkB1A=",
 
+      "version": "1.0.1",
 
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.1.tgz",
 
+      "integrity": "sha512-05tMxipUCwHqYaVS8xc7sYPTly8PzXayRCB4dTxLhWTqlKUiwH6ezmEe0OSreL1c30LAuA3Zqmc+uEBUGFJDjw==",
 
       "dev": true,
 
       "requires": {
 
-        "source-list-map": "0.1.8",
 
+        "source-list-map": "2.0.0",
 
         "source-map": "0.5.6"
 
       }
 
     },

+ 5 - 4
package.json
View File 

@@ -62,7 +62,7 @@
 
     "connect-history-api-fallback": "^1.3.0",
 
     "copy-webpack-plugin": "^4.0.1",
 
     "cross-env": "^5.0.0",
 
-    "css-loader": "^0.26.4",
 
+    "css-loader": "^0.28.7",
 
     "electron-packager": "^9.0.1",
 
     "eslint": "^3.14.1",
 
     "eslint-config-standard": "^6.2.1",
 
@@ -73,7 +73,7 @@
 
     "eslint-plugin-react": "^6.10.3",
 
     "eslint-plugin-standard": "^2.0.1",
 
     "eventsource-polyfill": "^0.9.6",
 
-    "extract-text-webpack-plugin": "^2.0.0",
 
+    "extract-text-webpack-plugin": "^3.0.0",
 
     "file-loader": "^0.10.1",
 
     "friendly-errors-webpack-plugin": "^1.1.3",
 
     "function-bind": "^1.1.0",
 
@@ -84,17 +84,18 @@
 
     "js-beautify": "^1.6.12",
 
     "less": "^2.7.2",
 
     "less-loader": "^4.0.5",
 
+    "less-plugin-lists": "^1.1.1",
 
     "loader-utils": "^1.1.0",
 
     "moment": "^2.18.1",
 
     "nyc": "^10.1.2",
 
     "opn": "^4.0.2",
 
-    "optimize-css-assets-webpack-plugin": "^1.3.0",
 
+    "optimize-css-assets-webpack-plugin": "^3.2.0",
 
     "ora": "^1.1.0",
 
     "rimraf": "^2.6.0",
 
     "semver": "^5.3.0",
 
     "sortablejs": "^1.5.1",
 
     "spectron": "^3.6.0",
 
-    "style-loader": "^0.16.0",
 
+    "style-loader": "^0.16.1",
 
     "uglify-loader": "^2.0.0",
 
     "url-loader": "^0.5.7",
 
     "webpack": "^3.5.6",

+ 2 - 2
scripts/webpack.dll.js
View File 

@@ -17,7 +17,7 @@ const vendors = [
 
 
 module.exports = {
 
   entry: {
 
-    'lib': vendors
 
+    'common': vendors
 
   },
 
   output: {
 
     path: path.join(basedir, 'app', 'ui'),
 
@@ -39,6 +39,6 @@ module.exports = {
 
       name: '[name]',
 
       context: basedir
 
     }),
 
-    new webpack.BannerPlugin(`SwitchHosts! lib.js, ${moment().format('YYYY-MM-DD HH:mm:ss')}`)
 
+    new webpack.BannerPlugin(`SwitchHosts! common.js, ${moment().format('YYYY-MM-DD HH:mm:ss')}`)
 
   ]
 
 }

+ 26 - 8
webpack.config.js
View File 

@@ -9,6 +9,8 @@ const path = require('path')
 
 const webpack = require('webpack')
 
 const moment = require('moment')
 
 const WebpackNotifierPlugin = require('webpack-notifier')
 
+const ExtractTextPlugin = require('extract-text-webpack-plugin')
 
+const LSSPluginLists = require('less-plugin-lists')
 
 const version = require('./app/version').version.join('.')
 
 
 module.exports = {
 
@@ -19,8 +21,8 @@ module.exports = {
 
   devtool: 'source-map',
 
   output: {
 
     path: path.join(__dirname, 'app', 'ui')
 
-    , filename: 'bundle.js'
 
-    , sourceMapFilename: 'bundle.js.map'
 
+    , filename: '[name].js'
 
+    , sourceMapFilename: '[name].js.map'
 
   },
 
   resolve: {
 
     extensions: ['.js', '.jsx']
 
@@ -34,14 +36,26 @@ module.exports = {
 
       }, {
 
         test: /\.less$/,
 
         //exclude: [/node_modules/, /antd/],
 
-        use: [
 
-          'style-loader',
 
-          'css-loader?minimize&modules&sourceMap&localIdentName=[name]--[local]--[hash:base64:5]',
 
-          'less-loader'
 
-        ]
 
+        loader: ExtractTextPlugin.extract({
 
+          fallback: 'style-loader',
 
+          use: [
 
+            'css-loader?minimize&modules&sourceMap&localIdentName=[name]--[local]--[hash:base64:5]',
 
+            {
 
+              loader: 'less-loader?outputStyle=expanded',
 
+              options: {
 
+                plugins: [
 
+                  new LSSPluginLists({advanced: true})
 
+                ]
 
+              }
 
+            }
 
+          ]
 
+        })
 
       }, {
 
         test: /\.css$/,
 
-        use: ['style-loader', 'css-loader']
 
+        loader: ExtractTextPlugin.extract({
 
+          fallback: 'style-loader',
 
+          use: 'css-loader?importLoaders=1&minimize&sourceMap'
 
+        })
 
       }, {
 
         test: /\.(eot|woff|woff2|ttf|svg|png|jpg)$/,
 
         use: 'url-loader?limit=30000&name=[name]-[hash].[ext]'
 
@@ -66,6 +80,10 @@ module.exports = {
 
         comments: false
 
       }
 
     })
 
+    , new ExtractTextPlugin({
 
+      filename: '[name].css',
 
+      allChunks: true
 
+    })
 
     , new webpack.DllReferencePlugin({
 
       context: __dirname,
 
       manifest: require('./tmp/manifest.json')

Some files were not shown because too many files changed in this diff