Merge pull request #149 from rhinel/test

update v2.5.2

.babelrc

@@ -1,15 +1,7 @@
 {
-  "presets": [
-    ["@babel/env", {
-      "modules": false,
-      "targets": {
-        "ie": "11"
-      },
-      "useBuiltIns": "usage"
-    }]
-  ],
+  "presets": ["@babel/preset-env"],
   "plugins": [
-    "@babel/transform-runtime",
+    "@babel/plugin-transform-runtime",
     "@babel/plugin-syntax-dynamic-import",
     ["component", {
       "libraryName": "element-ui",
@@ -23,7 +15,7 @@
   "comments": false,
   "env": {
     "test": {
-      "presets": ["@babel/env"],
+      "presets": ["@babel/preset-env"],
       "plugins": ["istanbul"]
     }
   }

build/webpack.base.conf.js

@@ -136,9 +136,7 @@ module.exports = {
       loaders: [{
         loader: 'babel-loader',
         options: {
-          cacheDirectory: true,
-          presets: ['@babel/preset-env'],
-          plugins: ['@babel/plugin-transform-runtime']
+          cacheDirectory: true
         }
       }],
       threadPool: happyThreadPool,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rent-manager",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "description": "rent-manager for ying",
   "author": "rhinel <[email protected]>",
   "private": true,
@@ -47,7 +47,7 @@
     "got": "^9.6.0",
     "log4js": "^4.3.2",
     "md5": "^2.2.1",
-    "mongoose": "^5.6.0",
+    "mongoose": "^5.6.1",
     "redis": "^2.8.0",
     "superagent": "^5.1.0"
   },
@@ -70,6 +70,7 @@
     "compression-webpack-plugin": "^3.0.0",
     "connect-history-api-fallback": "^1.6.0",
     "copy-webpack-plugin": "^5.0.3",
+    "core-js": "^3.1.4",
     "css-loader": "^3.0.0",
     "cz-conventional-changelog-chinese": "^2.3.0",
     "element-ui": "^2.9.2",
@@ -103,6 +104,7 @@
     "portfinder": "^1.0.20",
     "preload-webpack-plugin": "^3.0.0-beta.3",
     "progress-bar-webpack-plugin": "^1.12.1",
+    "regenerator-runtime": "^0.13.2",
     "register-service-worker": "^1.6.2",
     "rimraf": "^2.6.3",
     "sass-loader": "^7.1.0",

src/pcside/js/indexCanvas/indexCanvas.js

@@ -1,4 +1,4 @@
-module.exports = function() {
+export default function() {
 
     var width, height, largeHeader, canvas, ctx, points, target, animateHeader = true;
 
@@ -187,4 +187,4 @@ module.exports = function() {
         return Math.pow(p1.x - p2.x, 2) + Math.pow(p1.y - p2.y, 2);
     }
 
-};
+};

src/pcside/js/main.js

@@ -1,3 +1,6 @@
+import 'core-js/stable'
+import 'regenerator-runtime/runtime'
+
 // 加载应用层
 import Vue from 'vue'
 import Vuex from 'vuex'

yarn.lock

@@ -2298,6 +2298,11 @@ core-js@^2.4.0, core-js@^2.5.0, core-js@^2.5.7:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.9.tgz#6b4b214620c834152e179323727fc19741b084f2"
   integrity sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==
 
+core-js@^3.1.4:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.1.4.tgz#3a2837fc48e582e1ae25907afcd6cf03b0cc7a07"
+  integrity sha512-YNZN8lt82XIMLnLirj9MhKDFZHalwzzrL9YLt6eb0T5D0EDl4IQ90IGkua8mHbnxNrkj1d8hbdizMc0Qmg1WnQ==
+
 [email protected], core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@@ -5742,10 +5747,10 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/mongoose-legacy-pluralize/-/mongoose-legacy-pluralize-1.0.2.tgz#3ba9f91fa507b5186d399fb40854bff18fb563e4"
   integrity sha512-Yo/7qQU4/EyIS8YDFSeenIvXxZN+ld7YdV9LqFVQJzTLye8unujAWPZ4NWKfFA+RNjh+wvTWKY9Z3E5XM6ZZiQ==
 
-mongoose@^5.6.0:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-5.6.0.tgz#6c3984d2330bc3b28ae800d8b8025a0686d1e450"
-  integrity sha512-bhevx8u4NfZf2Un+CcKWRsiNekrLH7dSI8mBC49FcY2SUXQPZf3w+Yby+cgDrpZA46nkqRW9Qaqhs7PT0XCtYQ==
+mongoose@^5.6.1:
+  version "5.6.1"
+  resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-5.6.1.tgz#4efc3373b8121fdac4192896e303bb8cc572907b"
+  integrity sha512-/EBoXS+fZv8dYf0VKMXwhTEVYUI+6EbmVhmV2DzO9BGacTSgStQprU09rZYfVxe8EmLhmTrSV5eCIRLBYuXGag==
   dependencies:
     async "2.6.2"
     bson "~1.1.1"