y595705120 3 jaren geleden
bovenliggende
commit
8f0c14fff5
4 gewijzigde bestanden met toevoegingen van 52 en 24 verwijderingen
  1. 3 4
      build/webpack.base.conf.js
  2. 36 17
      package-lock.json
  3. 5 1
      package.json
  4. 8 2
      src/main.js

+ 3 - 4
build/webpack.base.conf.js

@@ -2,19 +2,18 @@
 const path = require('path')
 const utils = require('./utils')
 const config = require('../config')
-require("babel-polyfill")
 const vueLoaderConfig = require('./vue-loader.conf')
 
+require( 'babel-polyfill')
 function resolve (dir) {
   return path.join(__dirname, '..', dir)
 }
 
-
-
 module.exports = {
   context: path.resolve(__dirname, '../'),
   entry: {
-    app: './src/main.js'
+    // app: './src/main.js'
+    app: ["babel-polyfill", "./src/main.js"]
   },
   output: {
     path: config.build.assetsRoot,

+ 36 - 17
package-lock.json

@@ -4,6 +4,22 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@babel/polyfill": {
+      "version": "7.12.1",
+      "resolved": "https://registry.nlark.com/@babel/polyfill/download/@babel/polyfill-7.12.1.tgz",
+      "integrity": "sha1-Hy1jcdEmG72WHzxdWQkVDhLQvZY=",
+      "requires": {
+        "core-js": "^2.6.5",
+        "regenerator-runtime": "^0.13.4"
+      },
+      "dependencies": {
+        "regenerator-runtime": {
+          "version": "0.13.9",
+          "resolved": "https://registry.nlark.com/regenerator-runtime/download/regenerator-runtime-0.13.9.tgz?cache=0&sync_timestamp=1626993001371&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fregenerator-runtime%2Fdownload%2Fregenerator-runtime-0.13.9.tgz",
+          "integrity": "sha1-iSV0Kpj/2QgUmI11Zq0wyjsmO1I="
+        }
+      }
+    },
     "@types/json-schema": {
       "version": "7.0.5",
       "resolved": "https://registry.npm.taobao.org/@types/json-schema/download/@types/json-schema-7.0.5.tgz?cache=0&sync_timestamp=1591720965091&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fjson-schema%2Fdownload%2F%40types%2Fjson-schema-7.0.5.tgz",
@@ -16,6 +32,11 @@
       "integrity": "sha1-FZJUFOCtLNdlv+9YhC9+JqesyyQ=",
       "dev": true
     },
+    "@types/socket.io-client": {
+      "version": "1.4.36",
+      "resolved": "https://registry.nlark.com/@types/socket.io-client/download/@types/socket.io-client-1.4.36.tgz",
+      "integrity": "sha1-5PHKBl+Ewgk56YUOcCIiAr12/z8="
+    },
     "abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npm.taobao.org/abbrev/download/abbrev-1.1.1.tgz",
@@ -753,7 +774,6 @@
       "version": "7.1.5",
       "resolved": "https://registry.npm.taobao.org/babel-loader/download/babel-loader-7.1.5.tgz?cache=0&sync_timestamp=1584717315701&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbabel-loader%2Fdownload%2Fbabel-loader-7.1.5.tgz",
       "integrity": "sha1-4+4M1zlKpVfgE7AtPkkr/QeqbWg=",
-      "dev": true,
       "requires": {
         "find-cache-dir": "^1.0.0",
         "loader-utils": "^1.0.2",
@@ -2011,8 +2031,7 @@
     "commondir": {
       "version": "1.0.1",
       "resolved": "https://registry.npm.taobao.org/commondir/download/commondir-1.0.1.tgz",
-      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
-      "dev": true
+      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs="
     },
     "component-emitter": {
       "version": "1.3.0",
@@ -4295,7 +4314,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npm.taobao.org/find-cache-dir/download/find-cache-dir-1.0.0.tgz?cache=0&sync_timestamp=1583734591888&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffind-cache-dir%2Fdownload%2Ffind-cache-dir-1.0.0.tgz",
       "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=",
-      "dev": true,
       "requires": {
         "commondir": "^1.0.1",
         "make-dir": "^1.0.0",
@@ -4306,7 +4324,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npm.taobao.org/find-up/download/find-up-2.1.0.tgz",
       "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-      "dev": true,
       "requires": {
         "locate-path": "^2.0.0"
       }
@@ -5859,7 +5876,6 @@
       "version": "1.4.0",
       "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-1.4.0.tgz",
       "integrity": "sha1-xXm140yzSxp07cbB+za/o3HVphM=",
-      "dev": true,
       "requires": {
         "big.js": "^5.2.2",
         "emojis-list": "^3.0.0",
@@ -5870,7 +5886,6 @@
           "version": "1.0.1",
           "resolved": "https://registry.npm.taobao.org/json5/download/json5-1.0.1.tgz?cache=0&sync_timestamp=1586045693798&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjson5%2Fdownload%2Fjson5-1.0.1.tgz",
           "integrity": "sha1-d5+wAYYE+oVOrL9iUhgNg1Q+Pb4=",
-          "dev": true,
           "requires": {
             "minimist": "^1.2.0"
           }
@@ -5881,7 +5896,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npm.taobao.org/locate-path/download/locate-path-2.0.0.tgz",
       "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-      "dev": true,
       "requires": {
         "p-locate": "^2.0.0",
         "path-exists": "^3.0.0"
@@ -5973,7 +5987,6 @@
       "version": "1.3.0",
       "resolved": "https://registry.npm.taobao.org/make-dir/download/make-dir-1.3.0.tgz?cache=0&sync_timestamp=1587567576732&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmake-dir%2Fdownload%2Fmake-dir-1.3.0.tgz",
       "integrity": "sha1-ecEDO4BRW9bSTsmTPoYMp17ifww=",
-      "dev": true,
       "requires": {
         "pify": "^3.0.0"
       }
@@ -7123,7 +7136,6 @@
       "version": "1.3.0",
       "resolved": "https://registry.npm.taobao.org/p-limit/download/p-limit-1.3.0.tgz",
       "integrity": "sha1-uGvV8MJWkJEcdZD8v8IBDVSzzLg=",
-      "dev": true,
       "requires": {
         "p-try": "^1.0.0"
       }
@@ -7132,7 +7144,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npm.taobao.org/p-locate/download/p-locate-2.0.0.tgz",
       "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-      "dev": true,
       "requires": {
         "p-limit": "^1.1.0"
       }
@@ -7146,8 +7157,7 @@
     "p-try": {
       "version": "1.0.0",
       "resolved": "https://registry.npm.taobao.org/p-try/download/p-try-1.0.0.tgz",
-      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-      "dev": true
+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
     },
     "pac-proxy-agent": {
       "version": "3.0.1",
@@ -7337,13 +7347,13 @@
       "version": "2.2.2",
       "resolved": "https://registry.npm.taobao.org/picomatch/download/picomatch-2.2.2.tgz?cache=0&sync_timestamp=1584791212322&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpicomatch%2Fdownload%2Fpicomatch-2.2.2.tgz",
       "integrity": "sha1-IfMz6ba46v8CRo9RRupAbTRfTa0=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "pify": {
       "version": "3.0.0",
       "resolved": "https://registry.npm.taobao.org/pify/download/pify-3.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpify%2Fdownload%2Fpify-3.0.0.tgz",
-      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-      "dev": true
+      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
     },
     "pinkie": {
       "version": "2.0.4",
@@ -7367,7 +7377,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npm.taobao.org/pkg-dir/download/pkg-dir-2.0.0.tgz",
       "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
-      "dev": true,
       "requires": {
         "find-up": "^2.1.0"
       }
@@ -10698,6 +10707,14 @@
       "resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-3.2.0.tgz",
       "integrity": "sha1-2jUZX/43/fC+yfX49yeB0qdxiBU="
     },
+    "vue-socket.io-extended": {
+      "version": "4.2.0",
+      "resolved": "https://registry.nlark.com/vue-socket.io-extended/download/vue-socket.io-extended-4.2.0.tgz",
+      "integrity": "sha1-5mNVNmn9Pc2XhrGt1AsYWA02gW8=",
+      "requires": {
+        "@types/socket.io-client": "1.4.36"
+      }
+    },
     "vue-style-loader": {
       "version": "3.1.2",
       "resolved": "https://registry.npm.taobao.org/vue-style-loader/download/vue-style-loader-3.1.2.tgz",
@@ -10854,6 +10871,7 @@
           "resolved": "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-extendable": "^0.1.0"
           }
@@ -10920,6 +10938,7 @@
           "resolved": "https://registry.npm.taobao.org/is-number/download/is-number-3.0.0.tgz",
           "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
           "dev": true,
+          "optional": true,
           "requires": {
             "kind-of": "^3.0.2"
           }

+ 5 - 1
package.json

@@ -10,9 +10,12 @@
     "build": "node build/build.js"
   },
   "dependencies": {
+    "@babel/polyfill": "^7.12.1",
     "ali-oss": "^6.12.0",
     "axios": "^0.17.1",
+    "babel-loader": "^7.1.5",
     "element-ui": "^2.1.0",
+    "es6-promise": "^4.2.8",
     "js-md5": "^0.7.3",
     "node-sass": "^5.0.0",
     "sass-loader": "^10.1.0",
@@ -20,6 +23,7 @@
     "spark-md5": "^3.0.1",
     "vue": "^2.5.2",
     "vue-router": "^3.0.1",
+    "vue-socket.io-extended": "^4.2.0",
     "vue-video-player": "^5.0.2",
     "vuex": "^3.6.2",
     "vuex-persist": "^3.1.3"
@@ -28,7 +32,7 @@
     "autoprefixer": "^7.1.2",
     "babel-core": "^6.22.1",
     "babel-helper-vue-jsx-merge-props": "^2.0.3",
-    "babel-loader": "^7.1.1",
+    "babel-loader": "^7.1.5",
     "babel-plugin-syntax-jsx": "^6.18.0",
     "babel-plugin-transform-runtime": "^6.22.0",
     "babel-plugin-transform-vue-jsx": "^3.5.0",

+ 8 - 2
src/main.js

@@ -7,11 +7,17 @@ import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
 import './assets/css/base.css'
 import './assets/css/main.css'
-import 'babel-polyfill'
 import { store } from '@/store/index'
 import md5 from 'js-md5';
 Vue.prototype.$md5 = md5;
 
+import '@babel/polyfill'
+require('es6-promise').polyfill()
+
+import VueSocketIOExt from 'vue-socket.io-extended';
+const socket = io(process.env.VUE_APP_IO_URL);
+Vue.use(VueSocketIOExt, socket);
+
 
 
 Vue.config.productionTip = false
@@ -38,4 +44,4 @@ export default new Vue({
     render: h => h(App),
     router,
     store
-}).$mount('#app')
+}).$mount('#app')