Skip to content

Commit 8fd7b76

Browse files
committed
fix: Compiled with warning (#26),
1 parent 9cf0d8f commit 8fd7b76

File tree

3 files changed

+5
-18
lines changed

3 files changed

+5
-18
lines changed

demo/quasar.conf.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,9 @@ module.exports = function (ctx) {
104104

105105
chainWebpack (chain) {
106106
chain.resolve.alias.merge({
107+
'@quasar/quasar-ui-qiconpicker': path.resolve(__dirname, '../ui'),
107108
'ui': path.resolve(__dirname, '../ui/src/index.js'),
108-
'q-icon-picker': path.resolve(__dirname, '../ui/src'),
109+
'sass': path.resolve(__dirname, '../ui/src/index.sass'),
109110
'api': path.resolve(__dirname, '../ui/dist/api/QIconPicker.json')
110111
})
111112
}

ui/dev/quasar.conf.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ module.exports = function (ctx) {
6161

6262
chainWebpack (chain) {
6363
chain.resolve.alias.merge({
64-
'ui': path.resolve(__dirname, '../src/index.js')
64+
'ui': path.resolve(__dirname, '../src/index.js'),
65+
'@quasar/quasar-ui-qiconpicker': path.resolve(__dirname, '..'),
6566
})
6667
}
6768
},

ui/src/components/QIconPicker.js

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -173,22 +173,7 @@ export default {
173173
const iconsSet = require(`@quasar/quasar-ui-qiconpicker/src/components/icon-set/${set}.js`).default
174174
this.iconsList = iconsSet.icons
175175
} catch (e) {
176-
try {
177-
const iconsSet = require(`../src/components/icon-set/${set}.js`).default
178-
this.iconsList = iconsSet.icons
179-
} catch (e) {
180-
try {
181-
const iconsSet = require(`./icon-set/${set}.js`).default
182-
this.iconsList = iconsSet.icons
183-
} catch (e) {
184-
try {
185-
const iconsSet = require(`q-icon-picker/components/icon-set/${set}.js`).default
186-
this.iconsList = iconsSet.icons
187-
} catch (e) {
188-
console.error(`QIconPicker: cannot find icon set found called '${set}'`)
189-
}
190-
}
191-
}
176+
console.error(`QIconPicker: cannot find icon set found called '${set}'`)
192177
}
193178
}
194179
}

0 commit comments

Comments
 (0)