feat(icongenie): support for upcoming @quasar/app-vite generated projects

rstoenescu · rstoenescu · commit ba017357147e · 2022-02-27T23:36:11.000+02:00
diff --git a/app-vite/lib/create-vite-config.js b/app-vite/lib/create-vite-config.js
@@ -88,10 +88,7 @@ module.exports = function (quasarConf, quasarRunMode) {
     clearScreen: false,
     logLevel: 'warn',
     mode: ctx.dev === true ? 'development' : 'production',
-    cacheDir: appPaths.resolve.app(
-      'node_modules/.cache/vite/'
-      + (quasarRunMode || quasarConf.ctx.modeName)
-    ),
+    cacheDir: `node_modules/.vite/${ quasarRunMode || quasarConf.ctx.modeName }`,
 
     resolve: build.resolve,
     define: parseEnv(build.env, build.rawDefine),
@@ -100,7 +97,7 @@ module.exports = function (quasarConf, quasarRunMode) {
       target: quasarRunMode === 'ssr-server'
         ? build.target.node
         : build.target.browser,
-      polyfillModulePreload: false,
+      polyfillModulePreload: build.polyfillModulePreload,
       emptyOutDir: false,
       sourcemap: build.sourcemap === true
         ? 'inline'
@@ -132,7 +129,8 @@ module.exports = function (quasarConf, quasarRunMode) {
     'reportCompressedSize',
     'chunkSizeWarningLimit',
     'assetsInlineLimit',
-    'cssCodeSplit'
+    'cssCodeSplit',
+    'assetsDir'
   ])
 
   if (
diff --git a/app-vite/lib/helpers/app-files-validations.js b/app-vite/lib/helpers/app-files-validations.js
@@ -9,18 +9,18 @@ module.exports = function (cfg) {
   let content
   let error = false
 
-  file = appPaths.resolve.app(cfg.build.htmlFilename)
+  file = appPaths.resolve.app('index.html')
   content = fs.readFileSync(file, 'utf-8')
 
   if (content.indexOf(attachMarkup) !== -1) {
     warn(`Please remove ${ attachMarkup } from
-    /${ cfg.build.htmlFilename } inside of <body>\n`)
+    /index.html inside of <body>\n`)
     error = true
   }
 
   if (content.indexOf(entryPointMarkup) === -1) {
     warn(`Please add ${ entryPointMarkup } to
-    /${ cfg.build.htmlFilename } inside of <body>\n`)
+    /index.html inside of <body>\n`)
     error = true
   }
 
diff --git a/app-vite/lib/quasar-conf-file.js b/app-vite/lib/quasar-conf-file.js
@@ -409,6 +409,8 @@ class QuasarConfFile {
       },
 
       vueOptionsAPI: true,
+      polyfillModulePreload: false,
+      distDir: path.join('dist', this.ctx.modeName),
 
       rawDefine: {
         // vue
@@ -436,8 +438,6 @@ class QuasarConfFile {
 
       productName: appPkg.productName,
       productDescription: appPkg.description,
-      distDir: path.join('dist', this.ctx.modeName),
-      htmlFilename: 'index.html',
       ssrPwaHtmlFilename: 'offline.html', // do NOT use index.html as name!
                                           // will mess up SSR
       vueRouterMode: 'hash',
@@ -458,7 +458,6 @@ class QuasarConfFile {
     }
     else if (this.ctx.mode.cordova || this.ctx.mode.capacitor || this.ctx.mode.electron || this.ctx.mode.bex) {
       Object.assign(cfg.build, {
-        htmlFilename: 'index.html',
         vueRouterMode: 'hash'
       })
     }
@@ -617,11 +616,7 @@ class QuasarConfFile {
     }
 
     if (this.ctx.dev) {
-      const urlPath = cfg.build.vueRouterMode === 'hash'
-        ? (cfg.build.htmlFilename !== 'index.html' ? (cfg.build.publicPath ? '' : '/') + cfg.build.htmlFilename : '')
-        : ''
-
-      const getUrl = hostname => `http${cfg.devServer.https ? 's' : ''}://${hostname}:${cfg.devServer.port}${cfg.build.publicPath}${urlPath}`
+      const getUrl = hostname => `http${cfg.devServer.https ? 's' : ''}://${hostname}:${cfg.devServer.port}${cfg.build.publicPath}`
       const hostname = cfg.devServer.host === '0.0.0.0'
         ? 'localhost'
         : cfg.devServer.host
diff --git a/icongenie/lib/mount/mount-tag.js b/icongenie/lib/mount/mount-tag.js
@@ -8,7 +8,7 @@ module.exports.mountTag = function mountTag (files) {
   }
 
   console.log()
-  log(`You will need the following tags in your /src/index.template.html:\n`)
+  log(`You will need the following tags in your /index.html or /src/index.template.html:\n`)
   tagFiles.forEach(file => {
     console.log(file.tag)
   })
diff --git a/icongenie/lib/utils/app-paths.js b/icongenie/lib/utils/app-paths.js
@@ -5,7 +5,10 @@ function getAppDir () {
   let dir = process.cwd()
 
   while (dir.length && dir[dir.length - 1] !== sep) {
-    if (existsSync(join(dir, 'quasar.conf.js'))) {
+    if (
+      existsSync(join(dir, 'quasar.conf.js')) ||
+      existsSync(join(dir, 'quasar.config.js'))
+    ) {
       return dir
     }
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ module.exports.mountTag = function mountTag (files) {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`console.log()`
`11`		- log(`You will need the following tags in your /src/index.template.html:\n`)
	`11`	+ log(`You will need the following tags in your /index.html or /src/index.template.html:\n`)
`12`	`12`	`tagFiles.forEach(file => {`
`13`	`13`	`console.log(file.tag)`
`14`	`14`	`})`