fix(app-vite/app-webpack): quasar.config > framework > lang/iconSet p…

…arsing
quasarframework · May 7, 2024 · 8ca0684 · 8ca0684
1 parent d8c53b5
commit 8ca0684
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 12 deletions.
diff --git a/app-vite/lib/quasar-config-file.js b/app-vite/lib/quasar-config-file.js
@@ -108,6 +108,17 @@ function uniquePathFilter (value, index, self) {
   return self.map(obj => obj.path).indexOf(value.path) === index
 }
 
+const extRE = /\.[m|c]?[j|t]s$/
+function formatQuasarAssetPath (asset, type) {
+  return asset.indexOf('/') !== -1
+    ? (
+        extRE.test(asset) === true
+          ? asset
+          : `${ asset }.js`
+      )
+    : `quasar/${ type }/${ asset }.js`
+}
+
 let cachedExternalHost, addressRunning = false
 
 async function onAddress ({ host, port }, mode) {
@@ -670,15 +681,11 @@ export class QuasarConfigFile {
     const { lang, iconSet } = cfg.framework
 
     if (lang !== void 0) {
-      cfg.framework.lang = lang.indexOf('/') === true
-        ? lang
-        : `quasar/lang/${ lang }.js`
+      cfg.framework.lang = formatQuasarAssetPath(lang, 'lang')
     }
 
     if (iconSet !== void 0) {
-      cfg.framework.iconSet = iconSet.indexOf('/') === true
-        ? iconSet
-        : `quasar/icon-set/${ iconSet }.js`
+      cfg.framework.iconSet = formatQuasarAssetPath(iconSet, 'icon-set')
     }
 
     Object.assign(cfg.metaConf, {

diff --git a/app-webpack/lib/quasar-config-file.js b/app-webpack/lib/quasar-config-file.js
@@ -115,6 +115,17 @@ function uniqueRegexFilter (value, index, self) {
   return self.map(regex => regex.toString()).indexOf(value.toString()) === index
 }
 
+const extRE = /\.[m|c]?[j|t]s$/
+function formatQuasarAssetPath (asset, type) {
+  return asset.indexOf('/') !== -1
+    ? (
+        extRE.test(asset) === true
+          ? asset
+          : `${ asset }.js`
+      )
+    : `quasar/${ type }/${ asset }.js`
+}
+
 let cachedExternalHost, addressRunning = false
 
 async function onAddress ({ host, port }, mode) {
@@ -698,15 +709,11 @@ module.exports.QuasarConfigFile = class QuasarConfigFile {
     const { lang, iconSet } = cfg.framework
 
     if (lang !== void 0) {
-      cfg.framework.lang = lang.indexOf('/') === true
-        ? lang
-        : `quasar/lang/${ lang }.js`
+      cfg.framework.lang = formatQuasarAssetPath(lang, 'lang')
     }
 
     if (iconSet !== void 0) {
-      cfg.framework.iconSet = iconSet.indexOf('/') === true
-        ? iconSet
-        : `quasar/icon-set/${ iconSet }.js`
+      cfg.framework.iconSet = formatQuasarAssetPath(iconSet, 'icon-set')
     }
 
     Object.assign(cfg.metaConf, {