张恒

提升依赖,准备合并分支

...@@ -105,7 +105,7 @@ let rendererConfig = { ...@@ -105,7 +105,7 @@ let rendererConfig = {
105 loader: 'url-loader', 105 loader: 'url-loader',
106 query: { 106 query: {
107 limit: 10000, 107 limit: 10000,
108 - // esModule: false, 108 + esModule: false,
109 name: 'imgs/[name]--[folder].[ext]' 109 name: 'imgs/[name]--[folder].[ext]'
110 } 110 }
111 }, 111 },
...@@ -115,6 +115,7 @@ let rendererConfig = { ...@@ -115,6 +115,7 @@ let rendererConfig = {
115 loader: 'url-loader', 115 loader: 'url-loader',
116 options: { 116 options: {
117 limit: 10000, 117 limit: 10000,
118 + esModule: false,
118 name: 'media/[name]--[folder].[ext]' 119 name: 'media/[name]--[folder].[ext]'
119 } 120 }
120 }, 121 },
...@@ -124,6 +125,7 @@ let rendererConfig = { ...@@ -124,6 +125,7 @@ let rendererConfig = {
124 loader: 'url-loader', 125 loader: 'url-loader',
125 query: { 126 query: {
126 limit: 10000, 127 limit: 10000,
128 + esModule: false,
127 name: 'fonts/[name]--[folder].[ext]' 129 name: 'fonts/[name]--[folder].[ext]'
128 } 130 }
129 } 131 }
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
61 }, 61 },
62 "dependencies": { 62 "dependencies": {
63 "axios": "^0.19.2", 63 "axios": "^0.19.2",
64 - "date-fns": "^2.9.0", 64 + "date-fns": "^2.12.0",
65 "element-ui": "^2.13.0", 65 "element-ui": "^2.13.0",
66 "js-cookie": "^2.2.1", 66 "js-cookie": "^2.2.1",
67 "nedb": "^1.8.0", 67 "nedb": "^1.8.0",
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
70 "vue": "^2.6.11", 70 "vue": "^2.6.11",
71 "vue-electron": "^1.0.6", 71 "vue-electron": "^1.0.6",
72 "vue-router": "^3.1.6", 72 "vue-router": "^3.1.6",
73 - "vuex": "^3.1.2", 73 + "vuex": "^3.1.3",
74 "vuex-electron": "^1.0.3" 74 "vuex-electron": "^1.0.3"
75 }, 75 },
76 "devDependencies": { 76 "devDependencies": {
...@@ -85,29 +85,29 @@ ...@@ -85,29 +85,29 @@
85 "babel-preset-stage-0": "^6.24.1", 85 "babel-preset-stage-0": "^6.24.1",
86 "babel-register": "^6.26.0", 86 "babel-register": "^6.26.0",
87 "babili-webpack-plugin": "^0.1.2", 87 "babili-webpack-plugin": "^0.1.2",
88 - "cfonts": "^2.8.0", 88 + "cfonts": "^2.8.1",
89 "chai": "^4.2.0", 89 "chai": "^4.2.0",
90 - "chalk": "^3.0.0", 90 + "chalk": "^4.0.0",
91 "clean-webpack-plugin": "^3.0.0", 91 "clean-webpack-plugin": "^3.0.0",
92 "copy-webpack-plugin": "^5.1.1", 92 "copy-webpack-plugin": "^5.1.1",
93 - "cross-env": "^7.0.0", 93 + "cross-env": "^7.0.2",
94 - "css-loader": "^3.4.2", 94 + "css-loader": "^3.5.2",
95 "del": "^5.1.0", 95 "del": "^5.1.0",
96 "devtron": "^1.4.0", 96 "devtron": "^1.4.0",
97 - "electron": "^7.1.14", 97 + "electron": "^7.2.1",
98 - "electron-builder": "^22.3.2", 98 + "electron-builder": "^22.4.1",
99 "electron-debug": "^3.0.1", 99 "electron-debug": "^3.0.1",
100 - "electron-devtools-installer": "^2.2.4", 100 + "electron-devtools-installer": "^3.0.0",
101 "eslint": "^4.19.1", 101 "eslint": "^4.19.1",
102 "eslint-config-standard": "^11.0.0", 102 "eslint-config-standard": "^11.0.0",
103 "eslint-friendly-formatter": "^4.0.1", 103 "eslint-friendly-formatter": "^4.0.1",
104 "eslint-loader": "^2.0.0", 104 "eslint-loader": "^2.0.0",
105 "eslint-plugin-html": "^4.0.3", 105 "eslint-plugin-html": "^4.0.3",
106 - "eslint-plugin-import": "^2.20.0", 106 + "eslint-plugin-import": "^2.20.2",
107 "eslint-plugin-node": "^6.0.1", 107 "eslint-plugin-node": "^6.0.1",
108 "eslint-plugin-promise": "^3.8.0", 108 "eslint-plugin-promise": "^3.8.0",
109 "eslint-plugin-standard": "^3.1.0", 109 "eslint-plugin-standard": "^3.1.0",
110 - "file-loader": "^4.2.0", 110 + "file-loader": "^6.0.0",
111 "html-webpack-plugin": "^3.2.0", 111 "html-webpack-plugin": "^3.2.0",
112 "inject-loader": "^4.0.1", 112 "inject-loader": "^4.0.1",
113 "karma": "^2.0.2", 113 "karma": "^2.0.2",
...@@ -127,14 +127,14 @@ ...@@ -127,14 +127,14 @@
127 "sass-loader": "^8.0.2", 127 "sass-loader": "^8.0.2",
128 "spectron": "^3.8.0", 128 "spectron": "^3.8.0",
129 "style-loader": "^1.1.3", 129 "style-loader": "^1.1.3",
130 - "svg-sprite-loader": "^4.2.1", 130 + "svg-sprite-loader": "^4.2.5",
131 "terser-webpack-plugin": "^2.3.5", 131 "terser-webpack-plugin": "^2.3.5",
132 - "url-loader": "^3.0.0", 132 + "url-loader": "^4.1.0",
133 "vue-html-loader": "^1.2.4", 133 "vue-html-loader": "^1.2.4",
134 - "vue-loader": "^15.9.0", 134 + "vue-loader": "^15.9.1",
135 "vue-style-loader": "^4.1.2", 135 "vue-style-loader": "^4.1.2",
136 "vue-template-compiler": "^2.6.11", 136 "vue-template-compiler": "^2.6.11",
137 - "webpack": "^4.42.0", 137 + "webpack": "^4.42.1",
138 "webpack-cli": "^3.3.11", 138 "webpack-cli": "^3.3.11",
139 "webpack-dev-server": "^3.10.3", 139 "webpack-dev-server": "^3.10.3",
140 "webpack-hot-middleware": "^2.25.0", 140 "webpack-hot-middleware": "^2.25.0",
......