张恒

更新依赖,修正依赖带来的负面效果

...@@ -108,6 +108,7 @@ let rendererConfig = { ...@@ -108,6 +108,7 @@ let rendererConfig = {
108 use: { 108 use: {
109 loader: 'url-loader', 109 loader: 'url-loader',
110 query: { 110 query: {
111 + esModule: false,
111 limit: 10000, 112 limit: 10000,
112 name: 'imgs/[name]--[folder].[ext]' 113 name: 'imgs/[name]--[folder].[ext]'
113 } 114 }
...@@ -117,6 +118,7 @@ let rendererConfig = { ...@@ -117,6 +118,7 @@ let rendererConfig = {
117 test: /\.(mp4|webm|ogg|mp3|wav|flac|aac)(\?.*)?$/, 118 test: /\.(mp4|webm|ogg|mp3|wav|flac|aac)(\?.*)?$/,
118 loader: 'url-loader', 119 loader: 'url-loader',
119 options: { 120 options: {
121 + esModule: false,
120 limit: 10000, 122 limit: 10000,
121 name: 'media/[name]--[folder].[ext]' 123 name: 'media/[name]--[folder].[ext]'
122 } 124 }
...@@ -126,6 +128,7 @@ let rendererConfig = { ...@@ -126,6 +128,7 @@ let rendererConfig = {
126 use: { 128 use: {
127 loader: 'url-loader', 129 loader: 'url-loader',
128 query: { 130 query: {
131 + esModule: false,
129 limit: 10000, 132 limit: 10000,
130 name: 'fonts/[name]--[folder].[ext]' 133 name: 'fonts/[name]--[folder].[ext]'
131 } 134 }
......
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
75 "electron-updater": "^4.2.5", 75 "electron-updater": "^4.2.5",
76 "element-ui": "^2.13.0", 76 "element-ui": "^2.13.0",
77 "express": "^4.17.1", 77 "express": "^4.17.1",
78 - "fs-extra": "^8.1.0", 78 + "fs-extra": "^9.0.0",
79 "js-cookie": "^2.2.1", 79 "js-cookie": "^2.2.1",
80 "nedb": "^1.8.0", 80 "nedb": "^1.8.0",
81 "nprogress": "^0.2.0", 81 "nprogress": "^0.2.0",
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
86 "vuex-electron": "^1.0.3" 86 "vuex-electron": "^1.0.3"
87 }, 87 },
88 "devDependencies": { 88 "devDependencies": {
89 - "@babel/core": "^7.8.7", 89 + "@babel/core": "^7.9.0",
90 "@babel/plugin-proposal-class-properties": "^7.8.3", 90 "@babel/plugin-proposal-class-properties": "^7.8.3",
91 "@babel/plugin-proposal-decorators": "^7.8.3", 91 "@babel/plugin-proposal-decorators": "^7.8.3",
92 "@babel/plugin-proposal-do-expressions": "^7.8.3", 92 "@babel/plugin-proposal-do-expressions": "^7.8.3",
...@@ -98,19 +98,19 @@ ...@@ -98,19 +98,19 @@
98 "@babel/plugin-proposal-logical-assignment-operators": "^7.8.3", 98 "@babel/plugin-proposal-logical-assignment-operators": "^7.8.3",
99 "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3", 99 "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3",
100 "@babel/plugin-proposal-numeric-separator": "^7.8.3", 100 "@babel/plugin-proposal-numeric-separator": "^7.8.3",
101 - "@babel/plugin-proposal-optional-chaining": "^7.8.3", 101 + "@babel/plugin-proposal-optional-chaining": "^7.9.0",
102 "@babel/plugin-proposal-pipeline-operator": "^7.8.3", 102 "@babel/plugin-proposal-pipeline-operator": "^7.8.3",
103 "@babel/plugin-proposal-throw-expressions": "^7.8.3", 103 "@babel/plugin-proposal-throw-expressions": "^7.8.3",
104 "@babel/plugin-syntax-dynamic-import": "^7.8.3", 104 "@babel/plugin-syntax-dynamic-import": "^7.8.3",
105 "@babel/plugin-syntax-import-meta": "^7.8.3", 105 "@babel/plugin-syntax-import-meta": "^7.8.3",
106 - "@babel/plugin-transform-runtime": "^7.8.3", 106 + "@babel/plugin-transform-runtime": "^7.9.0",
107 "@babel/polyfill": "^7.8.7", 107 "@babel/polyfill": "^7.8.7",
108 - "@babel/preset-env": "^7.8.7", 108 + "@babel/preset-env": "^7.9.0",
109 - "@babel/register": "^7.8.6", 109 + "@babel/register": "^7.9.0",
110 - "@babel/runtime": "^7.8.7", 110 + "@babel/runtime": "^7.9.2",
111 "ajv": "^6.12.0", 111 "ajv": "^6.12.0",
112 "babel-eslint": "^9.0.0", 112 "babel-eslint": "^9.0.0",
113 - "babel-loader": "^8.0.6", 113 + "babel-loader": "^8.1.0",
114 "babel-minify-webpack-plugin": "^0.3.1", 114 "babel-minify-webpack-plugin": "^0.3.1",
115 "cfonts": "^2.8.1", 115 "cfonts": "^2.8.1",
116 "chalk": "^3.0.0", 116 "chalk": "^3.0.0",
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
123 "electron-builder": "^22.4.1", 123 "electron-builder": "^22.4.1",
124 "electron-devtools-installer": "^2.2.4", 124 "electron-devtools-installer": "^2.2.4",
125 "eslint": "^6.8.0", 125 "eslint": "^6.8.0",
126 - "eslint-config-standard": "^14.1.0", 126 + "eslint-config-standard": "^14.1.1",
127 "eslint-friendly-formatter": "^4.0.1", 127 "eslint-friendly-formatter": "^4.0.1",
128 "eslint-loader": "^3.0.3", 128 "eslint-loader": "^3.0.3",
129 "eslint-plugin-html": "^6.0.0", 129 "eslint-plugin-html": "^6.0.0",
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
131 "eslint-plugin-node": "^9.2.0", 131 "eslint-plugin-node": "^9.2.0",
132 "eslint-plugin-promise": "^4.2.1", 132 "eslint-plugin-promise": "^4.2.1",
133 "eslint-plugin-standard": "^4.0.0", 133 "eslint-plugin-standard": "^4.0.0",
134 - "file-loader": "^5.1.0", 134 + "file-loader": "^6.0.0",
135 "happypack": "^5.0.1", 135 "happypack": "^5.0.1",
136 "hard-source-webpack-plugin": "^0.13.1", 136 "hard-source-webpack-plugin": "^0.13.1",
137 "html-webpack-plugin": "^3.2.0", 137 "html-webpack-plugin": "^3.2.0",
...@@ -146,9 +146,9 @@ ...@@ -146,9 +146,9 @@
146 "svg-sprite-loader": "^4.2.1", 146 "svg-sprite-loader": "^4.2.1",
147 "terser-webpack-plugin": "^2.3.5", 147 "terser-webpack-plugin": "^2.3.5",
148 "through2-filter": "^3.0.0", 148 "through2-filter": "^3.0.0",
149 - "url-loader": "^3.0.0", 149 + "url-loader": "^4.0.0",
150 "vue-html-loader": "^1.2.4", 150 "vue-html-loader": "^1.2.4",
151 - "vue-loader": "^15.9.0", 151 + "vue-loader": "^15.9.1",
152 "vue-style-loader": "^4.1.2", 152 "vue-style-loader": "^4.1.2",
153 "vue-template-compiler": "^2.6.11", 153 "vue-template-compiler": "^2.6.11",
154 "webpack": "^4.42.0", 154 "webpack": "^4.42.0",
......
...@@ -64,7 +64,7 @@ export default { ...@@ -64,7 +64,7 @@ export default {
64 name: "yyy", 64 name: "yyy",
65 age: "12" 65 age: "12"
66 }, 66 },
67 - logo: require("@/assets/logo.png").default, 67 + logo: require("@/assets/logo.png"),
68 textarray: [], 68 textarray: [],
69 percentage: 0, 69 percentage: 0,
70 colors: [ 70 colors: [
......
...@@ -55,7 +55,7 @@ export default { ...@@ -55,7 +55,7 @@ export default {
55 }, 55 },
56 data: () => ({ 56 data: () => ({
57 time: "", 57 time: "",
58 - userImage: require("@/assets/user.png").default 58 + userImage: require("@/assets/user.png")
59 }), 59 }),
60 mounted() { 60 mounted() {
61 this.set_time(); 61 this.set_time();
......