Browse Source

更新 react、antd 等依赖框架;更新 electron 为 1.7.11 。

oldj 7 years ago
parent
commit
de8d36e6f6
12 changed files with 1276 additions and 1005 deletions
  1. 1 1
      app-ui/frame/PreferencesPrompt.less
  2. 333 446
      app-ui/styles/main.css
  3. 1 0
      app-ui/styles/main.less
  4. 497 192
      app/package-lock.json
  5. 6 6
      app/package.json
  6. 0 1
      app/ui/app.css
  7. 0 1
      app/ui/app.js
  8. 0 1
      app/ui/common.js
  9. 1 1
      app/version.js
  10. 1 1
      gulpfile.js
  11. 400 319
      package-lock.json
  12. 36 36
      package.json

+ 1 - 1
app-ui/frame/PreferencesPrompt.less

@@ -4,7 +4,7 @@
   .frame {
     .current-version {
       float: right;
-      margin-top: -50px;
+      margin-top: -61px;
       margin-right: 30px;
       color: #999;
 

File diff suppressed because it is too large
+ 333 - 446
app-ui/styles/main.css


+ 1 - 0
app-ui/styles/main.less

@@ -6,6 +6,7 @@
  */
 @border-radius-base: 2px;
 @border-radius-sm: 1px;
+@font-size-base: 12px;
 
 /**
  * 把 iconfont 地址改为本地,否则总是会从 alicdn 上读取

File diff suppressed because it is too large
+ 497 - 192
app/package-lock.json


+ 6 - 6
app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "switchhosts",
-  "version": "3.3.8",
+  "version": "3.3.9",
   "description": "Switch hosts quickly!",
   "main": "main.js",
   "scripts": {
@@ -10,10 +10,10 @@
   "license": "MIT",
   "dependencies": {
     "cheerio": "^0.22.0",
-    "express": "^4.15.2",
-    "js-beautify": "^1.6.12",
-    "md5-file": "^3.1.1",
-    "node-notifier": "^5.1.2",
-    "request": "^2.81.0"
+    "express": "^4.16.2",
+    "js-beautify": "^1.7.5",
+    "md5-file": "^3.2.3",
+    "node-notifier": "^5.2.1",
+    "request": "^2.83.0"
   }
 }

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


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


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


+ 1 - 1
app/version.js

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

+ 1 - 1
gulpfile.js

@@ -11,7 +11,7 @@
  * 也可手动从 https://github.com/electron/electron/releases 下载最新版本,放到 ~/.electron 目录下
  * 淘宝镜像:https://npm.taobao.org/mirrors/electron/
  */
-const ELECTRON_VERSION = '1.7.6'
+const ELECTRON_VERSION = '1.7.11'
 
 const fs = require('fs')
 const path = require('path')

File diff suppressed because it is too large
+ 400 - 319
package-lock.json


+ 36 - 36
package.json

@@ -1,6 +1,6 @@
 {
   "name": "switchhosts",
-  "version": "3.3.8",
+  "version": "3.3.9",
   "description": "Homepage: [https://oldj.github.io/SwitchHosts/](https://oldj.github.io/SwitchHosts/)",
   "main": "",
   "scripts": {
@@ -30,14 +30,13 @@
   },
   "homepage": "https://oldj.github.io/SwitchHosts/",
   "dependencies": {
-    "antd": "^2.13.1",
-    "codemirror": "^5.29.0",
-    "electron": "^1.7.6",
-    "express": "^4.15.4",
+    "antd": "^3.1.4",
+    "codemirror": "^5.33.0",
+    "express": "^4.16.2",
     "ramda": "^0.24.1",
-    "react": "^15.6.1",
+    "react": "^16.2.0",
     "react-codemirror": "^1.0.0",
-    "react-dom": "^15.6.1"
+    "react-dom": "^16.2.0"
   },
   "devDependencies": {
     "autoprefixer": "^6.7.2",
@@ -45,65 +44,66 @@
     "babel-core": "^6.26.0",
     "babel-eslint": "^7.1.1",
     "babel-loader": "^7.1.2",
-    "babel-plugin-import": "^1.2.0",
+    "babel-plugin-import": "^1.6.3",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-decorators-legacy": "^1.3.4",
     "babel-plugin-transform-object-assign": "^6.22.0",
     "babel-plugin-transform-runtime": "^6.23.0",
-    "babel-polyfill": "^6.23.0",
-    "babel-preset-env": "^1.2.1",
+    "babel-polyfill": "^6.26.0",
+    "babel-preset-env": "^1.6.1",
     "babel-preset-latest": "^6.24.0",
     "babel-preset-react": "^6.23.0",
     "babel-preset-stage-0": "^6.22.0",
     "babel-preset-stage-2": "^6.22.0",
-    "babel-register": "^6.22.0",
+    "babel-register": "^6.26.0",
     "chalk": "^1.1.3",
     "classnames": "^2.2.5",
-    "connect-history-api-fallback": "^1.3.0",
-    "copy-webpack-plugin": "^4.0.1",
-    "cross-env": "^5.0.0",
-    "css-loader": "^0.28.7",
-    "electron-packager": "^9.0.1",
+    "connect-history-api-fallback": "^1.5.0",
+    "copy-webpack-plugin": "^4.3.1",
+    "cross-env": "^5.1.3",
+    "css-loader": "^0.28.9",
+    "electron": "^1.8.1",
+    "electron-packager": "^9.1.0",
     "eslint": "^3.14.1",
     "eslint-config-standard": "^6.2.1",
     "eslint-friendly-formatter": "^2.0.7",
-    "eslint-loader": "^1.6.1",
+    "eslint-loader": "^1.9.0",
     "eslint-plugin-html": "^2.0.0",
-    "eslint-plugin-promise": "^3.4.0",
+    "eslint-plugin-promise": "^3.6.0",
     "eslint-plugin-react": "^6.10.3",
     "eslint-plugin-standard": "^2.0.1",
     "eventsource-polyfill": "^0.9.6",
-    "extract-text-webpack-plugin": "^3.0.0",
+    "extract-text-webpack-plugin": "^3.0.2",
     "file-loader": "^0.10.1",
     "friendly-errors-webpack-plugin": "^1.1.3",
-    "function-bind": "^1.1.0",
+    "function-bind": "^1.1.1",
     "gulp": "github:gulpjs/gulp#4.0",
-    "gulp-shell": "^0.6.3",
-    "html-webpack-plugin": "^2.28.0",
+    "gulp-shell": "^0.6.5",
+    "html-webpack-plugin": "^2.30.1",
     "http-proxy-middleware": "^0.17.3",
-    "js-beautify": "^1.6.12",
-    "less": "^2.7.2",
+    "js-beautify": "^1.7.5",
+    "less": "^2.7.3",
     "less-loader": "^4.0.5",
     "less-plugin-lists": "^1.1.1",
     "loader-utils": "^1.1.0",
-    "moment": "^2.18.1",
+    "moment": "^2.20.1",
     "nyc": "^10.1.2",
     "opn": "^4.0.2",
     "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",
+    "ora": "^1.3.0",
+    "rimraf": "^2.6.2",
+    "semver": "^5.5.0",
+    "sortablejs": "^1.7.0",
+    "spectron": "^3.7.2",
     "style-loader": "^0.16.1",
     "uglify-loader": "^2.0.0",
-    "url-loader": "^0.5.7",
-    "webpack": "^3.5.6",
-    "webpack-bundle-analyzer": "^2.2.1",
-    "webpack-dev-middleware": "^1.10.0",
-    "webpack-hot-middleware": "^2.16.1",
+    "url-loader": "^0.5.9",
+    "webpack": "^3.10.0",
+    "webpack-bundle-analyzer": "^2.9.2",
+    "webpack-dev-middleware": "^1.12.2",
+    "webpack-hot-middleware": "^2.21.0",
     "webpack-merge": "^2.6.1",
-    "webpack-notifier": "^1.5.0",
+    "webpack-notifier": "^1.5.1",
     "wheel-js": "^0.0.21",
     "yargs": "^6.5.0"
   },

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