feat(app-vite): tweaks on "quasar new" cmd

quasarframework · Dec 6, 2024 · 698687d · 698687d
1 parent f67bd66
commit 698687d
Show file tree

Hide file tree

Showing 17 changed files with 19 additions and 19 deletions.
diff --git a/app-vite/lib/cmd/new.js b/app-vite/lib/cmd/new.js
@@ -86,7 +86,7 @@ if (!argv.format) {
 
 /** @type {string[]} */
 const [ rawType, ...names ] = argv._
-/** @type {{ format: 'default'|'ts'|'ts-options'|'ts-class'|'ts-composition'|'ts-composition-setup'}} */
+/** @type {{ format: 'js'|'ts'}} */
 const { format } = argv
 
 const typeAliasMap = {
@@ -192,20 +192,19 @@ async function getAsset (type) {
 
     if (fs.existsSync(targetFolder) === false) {
       fse.ensureDir(targetFolder)
-      fse.copy(
-        appPaths.resolve.cli(`templates/store/${ storeProvider.name }/${ format }`),
-        targetFolder,
-        err => {
-          if (err) {
-            console.warn(err)
-            warn(`Could not generate ${ relativePath }.`, 'FAIL')
-            return
-          }
-
-          log(`Generated ${ relativePath }`)
-          log()
-        }
-      )
+      try {
+        fse.copySync(
+          appPaths.resolve.cli(`templates/store/${ storeProvider.name }/${ format }`),
+          targetFolder
+        )
+      }
+      catch (err) {
+        console.warn(err)
+        warn(`Could not generate ${ relativePath }.`, 'FAIL')
+        process.exit(1)
+      }
+
+      log(`Generated ${ relativePath }`)
     }
 
     return {

diff --git a/app-vite/lib/modes/bex/bex-installation.js b/app-vite/lib/modes/bex/bex-installation.js
@@ -20,7 +20,7 @@ export async function addMode ({
   fse.copySync(appPaths.resolve.cli('templates/bex/common'), appPaths.bexDir)
 
   const hasTypescript = await cacheProxy.getModule('hasTypescript')
-  const format = hasTypescript ? 'ts' : 'default'
+  const format = hasTypescript ? 'ts' : 'js'
   fse.copySync(appPaths.resolve.cli(`templates/bex/${ format }`), appPaths.bexDir)
 
   log('Browser Extension support was added')

diff --git a/app-vite/lib/modes/electron/electron-installation.js b/app-vite/lib/modes/electron/electron-installation.js
@@ -26,7 +26,7 @@ export async function addMode ({
 
   log('Creating Electron source folder...')
   const hasTypescript = await cacheProxy.getModule('hasTypescript')
-  const format = hasTypescript ? 'ts' : 'default'
+  const format = hasTypescript ? 'ts' : 'js'
   fse.copySync(
     appPaths.resolve.cli(`templates/electron/${ format }`),
     appPaths.electronDir

diff --git a/app-vite/lib/modes/pwa/pwa-installation.js b/app-vite/lib/modes/pwa/pwa-installation.js
@@ -44,7 +44,7 @@ export async function addMode ({
 
   const hasTypescript = await cacheProxy.getModule('hasTypescript')
   const { hasEslint } = await cacheProxy.getModule('eslint')
-  const format = hasTypescript ? 'ts' : 'default'
+  const format = hasTypescript ? 'ts' : 'js'
 
   fse.copySync(
     appPaths.resolve.cli(`templates/pwa/${ format }`),

diff --git a/app-vite/lib/modes/ssr/ssr-installation.js b/app-vite/lib/modes/ssr/ssr-installation.js
@@ -16,7 +16,7 @@ export async function addMode ({
 
   log('Creating SSR source folder...')
   const hasTypescript = await cacheProxy.getModule('hasTypescript')
-  const format = hasTypescript ? 'ts' : 'default'
+  const format = hasTypescript ? 'ts' : 'js'
   fse.copySync(
     appPaths.resolve.cli(`templates/ssr/${ format }`),
     appPaths.ssrDir

diff --git a/app-vite/templates/bex/default/background.js → app-vite/templates/bex/js/background.js b/app-vite/templates/bex/default/background.js → app-vite/templates/bex/js/background.js
diff --git a/app-vite/templates/bex/default/manifest.json → app-vite/templates/bex/js/manifest.json b/app-vite/templates/bex/default/manifest.json → app-vite/templates/bex/js/manifest.json
diff --git a/...emplates/bex/default/my-content-script.js → ...ite/templates/bex/js/my-content-script.js b/...emplates/bex/default/my-content-script.js → ...ite/templates/bex/js/my-content-script.js
diff --git a/...mplates/electron/default/electron-main.js → ...te/templates/electron/js/electron-main.js b/...mplates/electron/default/electron-main.js → ...te/templates/electron/js/electron-main.js
diff --git a/...ates/electron/default/electron-preload.js → ...templates/electron/js/electron-preload.js b/...ates/electron/default/electron-preload.js → ...templates/electron/js/electron-preload.js
diff --git a/...ates/pwa/default/custom-service-worker.js → ...templates/pwa/js/custom-service-worker.js b/...ates/pwa/default/custom-service-worker.js → ...templates/pwa/js/custom-service-worker.js
diff --git a/app-vite/templates/pwa/default/manifest.json → app-vite/templates/pwa/js/manifest.json b/app-vite/templates/pwa/default/manifest.json → app-vite/templates/pwa/js/manifest.json
diff --git a/...es/pwa/default/register-service-worker.js → ...mplates/pwa/js/register-service-worker.js b/...es/pwa/default/register-service-worker.js → ...mplates/pwa/js/register-service-worker.js
diff --git a/...mplates/ssr/default/middlewares/render.js → ...te/templates/ssr/js/middlewares/render.js b/...mplates/ssr/default/middlewares/render.js → ...te/templates/ssr/js/middlewares/render.js
diff --git a/app-vite/templates/ssr/default/server.js → app-vite/templates/ssr/js/server.js b/app-vite/templates/ssr/default/server.js → app-vite/templates/ssr/js/server.js
diff --git a/...te/templates/store/pinia/default/index.js → app-vite/templates/store/pinia/js/index.js b/...te/templates/store/pinia/default/index.js → app-vite/templates/store/pinia/js/index.js
diff --git a/app-vite/templates/store/pinia/ts/index.ts b/app-vite/templates/store/pinia/ts/index.ts
@@ -7,6 +7,7 @@ import { createPinia } from 'pinia'
  * @see https://pinia.vuejs.org/core-concepts/plugins.html#Typing-new-store-properties
  */
 declare module 'pinia' {
+  // eslint-disable-next-line @typescript-eslint/no-empty-object-type
   export interface PiniaCustomProperties {
     // add your custom properties here, if any
   }