From 6bf463289ef4b03f84c92c30bf858a433b90b7cb Mon Sep 17 00:00:00 2001
From: AkiraFukushima
Date: Tue, 14 Jan 2020 01:24:59 +0900
Subject: [PATCH] refs #1226 Fix url-loader for loading icon
---
.electron-vue/webpack.renderer.config.js | 5 +++--
package-lock.json | 15 +--------------
2 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/.electron-vue/webpack.renderer.config.js b/.electron-vue/webpack.renderer.config.js
index 4e5edbc9..399f9c6c 100644
--- a/.electron-vue/webpack.renderer.config.js
+++ b/.electron-vue/webpack.renderer.config.js
@@ -93,9 +93,10 @@ let rendererConfig = {
test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
use: {
loader: 'url-loader',
- query: {
+ options: {
limit: 10000,
- name: 'imgs/[name]--[folder].[ext]'
+ name: 'imgs/[name]--[folder].[ext]',
+ esModule: false
}
}
},
diff --git a/package-lock.json b/package-lock.json
index 5090c683..b739d8c1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6666,7 +6666,7 @@
"dependencies": {
"resolve": {
"version": "1.1.7",
- "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
+ "resolved": "http://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
"integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
"dev": true
}
@@ -12023,19 +12023,6 @@
"requires": {
"loader-utils": "^1.0.2",
"schema-utils": "^1.0.0"
- },
- "dependencies": {
- "schema-utils": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
- "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
- "dev": true,
- "requires": {
- "ajv": "^6.1.0",
- "ajv-errors": "^1.0.0",
- "ajv-keywords": "^3.1.0"
- }
- }
}
},
"filename-regex": {