create-vitrify 0.6.5 → 0.7.0

package/dist/templates.js

@@ -8,11 +8,11 @@ const getLatestVersions = async (dependencies) => {
     return deps;
 };
 export const templates = {
-    quasar: {
-        name: 'quasar',
-        fullName: 'Quasar Project',
-        description: 'Quasar Framework project',
-        url: new URL('../templates/quasar/', import.meta.url),
+    vue: {
+        name: 'vue',
+        fullName: 'Vue Project',
+        description: 'Plain Vue project',
+        url: new URL('../templates/vue/', import.meta.url),
         pkgJson: {
             scripts: {
                 dev: 'vitrify dev',
@@ -21,6 +21,9 @@ export const templates = {
                 'build:csr': 'vitrify build',
                 'build:ssr': 'vitrify build -m ssr',
                 'build:ssg': 'vitrify build -m ssg',
+                'minify:csr': 'vitrify minify ./dist/csr',
+                'minify:ssr': 'vitrify minify ./dist/ssr',
+                'minify:ssg': 'vitrify minify ./dist/static',
                 test: 'vitrify test',
                 lint: 'eslint --ext .vue --ext .ts src',
                 'lint:fix': 'eslint --ext .vue --ext .ts src --fix',
@@ -29,39 +32,34 @@ export const templates = {
             },
             dependencies: await getLatestVersions([
                 '@fastify/middie',
-                '@fastify/static',
-                '@quasar/extras',
-                'quasar',
-                'vite-plugin-pwa',
-                'vue',
-                'vue-router'
+                '@fastify/static'
             ]),
             devDependencies: await getLatestVersions([
-                '@vitejs/plugin-vue',
                 '@typescript-eslint/eslint-plugin',
                 '@typescript-eslint/parser',
                 '@types/node',
+                '@vitejs/plugin-vue',
                 '@vue/reactivity',
                 '@vue/runtime-core',
                 '@vue/runtime-dom',
                 '@vue/server-renderer',
                 '@vue/shared',
-                '@unocss/reset',
-                'animated-unocss',
                 'beasties',
+                'devcert',
                 'eslint',
                 'eslint-config-prettier',
                 'eslint-plugin-prettier',
                 'eslint-plugin-vue',
-                'vue-eslint-parser',
-                'typescript-eslint',
-                'devcert',
                 'fastify',
                 'npm-run-all',
                 'typescript',
-                'unocss',
+                'typescript-eslint',
                 'vite',
+                'vite-plugin-pwa',
                 'vitrify',
+                'vue',
+                'vue-eslint-parser',
+                'vue-router',
                 'workbox-window'
             ]),
             exports: {
@@ -91,66 +89,294 @@ export const templates = {
             ]
         }
     },
-    uiPlugin: {
-        name: 'vite-ui-plugin',
-        fullName: 'Vite UI plugin',
-        description: 'A Vite plugin for UI components',
-        url: new URL('../templates/vite-ui-plugin/', import.meta.url),
+    quasar: {
+        name: 'quasar',
+        fullName: 'Quasar Project',
+        description: 'Quasar Framework project',
+        url: new URL('../templates/quasar/', import.meta.url),
         pkgJson: {
+            scripts: {
+                dev: 'vitrify dev',
+                'dev:ssr': 'vitrify dev -m ssr',
+                build: 'run-s build:csr',
+                'build:csr': 'vitrify build',
+                'build:ssr': 'vitrify build -m ssr',
+                'build:ssg': 'vitrify build -m ssg',
+                'minify:csr': 'vitrify minify ./dist/csr',
+                'minify:ssr': 'vitrify minify ./dist/ssr',
+                'minify:ssg': 'vitrify minify ./dist/static',
+                test: 'vitrify test',
+                lint: 'eslint --ext .vue --ext .ts src',
+                'lint:fix': 'eslint --ext .vue --ext .ts src --fix',
+                'format:check': 'prettier --check .',
+                'format:write': 'prettier --write .'
+            },
+            dependencies: await getLatestVersions([
+                '@fastify/middie',
+                '@fastify/static'
+            ]),
+            devDependencies: await getLatestVersions([
+                '@quasar/extras',
+                '@typescript-eslint/eslint-plugin',
+                '@typescript-eslint/parser',
+                '@types/node',
+                '@vitejs/plugin-vue',
+                '@vue/reactivity',
+                '@vue/runtime-core',
+                '@vue/runtime-dom',
+                '@vue/server-renderer',
+                '@vue/shared',
+                'beasties',
+                'devcert',
+                'eslint',
+                'eslint-config-prettier',
+                'eslint-plugin-prettier',
+                'eslint-plugin-vue',
+                'fastify',
+                'npm-run-all',
+                'quasar',
+                'typescript',
+                'typescript-eslint',
+                'unocss-preset-quasar',
+                'vite',
+                'vite-plugin-pwa',
+                'vitrify',
+                'vue',
+                'vue-eslint-parser',
+                'vue-router',
+                'workbox-window'
+            ]),
             exports: {
                 '.': {
                     types: './dist/types/index.d.ts',
-                    import: './dist/index.js',
-                    src: './src/ui/index.ts'
+                    import: './dist/index.js'
                 },
-                './css': {
-                    import: './dist/style.css'
+                './fastify-ssr-plugin': {
+                    import: './dist/ssr/server/fastify-ssr-plugin.mjs'
                 },
-                './vite-plugin': {
-                    types: './dist/vite-plugin.d.ts',
-                    import: './dist/vite-plugin.js',
-                    src: './src/vite-plugin.ts'
+                './hooks': {
+                    import: './dist/ssr/server/virtual_vitrify-hooks.mjs'
                 }
+            }
+        },
+        tsconfigJson: {
+            paths: {
+                src: ['./src']
             },
+            types: ['vite/client', 'vitrify/client'],
+            include: [
+                'vitrify.config.ts',
+                'src/**/*.ts',
+                'src/**/*.d.ts',
+                'src/**/*.tsx',
+                'src/**/*.vue'
+            ]
+        }
+    },
+    quasarmd3: {
+        name: 'quasarmd3',
+        fullName: 'Quasar MD3 (alpha)',
+        description: 'Quasar Framework Material Design 3 project',
+        url: new URL('../templates/quasarmd3/', import.meta.url),
+        pkgJson: {
             scripts: {
-                'build:plugin': 'vite build',
-                'build:vite-plugin': 'tsc -p tsconfig.build.plugin.json',
-                'generate:types': 'vue-tsc -p tsconfig.types.json',
-                'clean:buildinfo': 'rimraf tsconfig.build.plugin.tsbuildinfo',
-                clean: 'run-s clean:buildinfo',
-                build: 'run-s clean build:plugin build:vite-plugin generate:types',
+                dev: 'vitrify dev',
+                'dev:ssr': 'vitrify dev -m ssr',
+                build: 'run-s build:csr',
+                'build:csr': 'vitrify build',
+                'build:ssr': 'vitrify build -m ssr',
+                'build:ssg': 'vitrify build -m ssg',
+                'minify:csr': 'vitrify minify ./dist/csr',
+                'minify:ssr': 'vitrify minify ./dist/ssr',
+                'minify:ssg': 'vitrify minify ./dist/static',
+                test: 'vitrify test',
                 lint: 'eslint --ext .vue --ext .ts src',
                 'lint:fix': 'eslint --ext .vue --ext .ts src --fix',
                 'format:check': 'prettier --check .',
                 'format:write': 'prettier --write .'
             },
-            dependencies: await getLatestVersions(['unplugin-vue-components']),
+            dependencies: await getLatestVersions([
+                '@fastify/middie',
+                '@fastify/static'
+            ]),
             devDependencies: await getLatestVersions([
+                '@iconify-json/mdi',
+                '@quasar/extras',
+                '@simsustech/quasar-components',
+                '@typescript-eslint/eslint-plugin',
+                '@typescript-eslint/parser',
                 '@types/node',
-                '@types/ws',
                 '@vitejs/plugin-vue',
+                '@vue/reactivity',
+                '@vue/runtime-core',
+                '@vue/runtime-dom',
                 '@vue/server-renderer',
-                '@typescript-eslint/eslint-plugin',
-                '@typescript-eslint/parser',
+                '@vue/shared',
+                'beasties',
+                'devcert',
                 'eslint',
                 'eslint-config-prettier',
-                'eslint-plugin-prettier-vue',
+                'eslint-plugin-prettier',
                 'eslint-plugin-vue',
+                'fastify',
                 'npm-run-all',
                 'quasar',
                 'typescript',
-                'rimraf',
+                'typescript-eslint',
+                'unocss-preset-quasar',
                 'vite',
+                'vite-plugin-pwa',
                 'vitrify',
                 'vue',
+                'vue-eslint-parser',
                 'vue-router',
-                'vue-tsc'
-            ])
+                'workbox-window'
+            ]),
+            exports: {
+                '.': {
+                    types: './dist/types/index.d.ts',
+                    import: './dist/index.js'
+                },
+                './fastify-ssr-plugin': {
+                    import: './dist/ssr/server/fastify-ssr-plugin.mjs'
+                },
+                './hooks': {
+                    import: './dist/ssr/server/virtual_vitrify-hooks.mjs'
+                }
+            }
         },
         tsconfigJson: {
-            types: ['vite/client']
+            paths: {
+                src: ['./src']
+            },
+            types: ['vite/client', 'vitrify/client'],
+            include: [
+                'vitrify.config.ts',
+                'src/**/*.ts',
+                'src/**/*.d.ts',
+                'src/**/*.tsx',
+                'src/**/*.vue'
+            ]
+        }
+    },
+    fastify: {
+        name: 'fastify',
+        fullName: 'Fastify server',
+        description: 'Fastify server with HMR',
+        url: new URL('../templates/fastify/', import.meta.url),
+        pkgJson: {
+            scripts: {
+                dev: 'vitrify dev -m fastify',
+                'dev:ssr': 'vitrify dev -m fastify',
+                build: 'vitrify build -m fastify',
+                minify: 'vitrify minify ./dist/server',
+                test: 'vitrify test',
+                lint: 'eslint --ext .vue --ext .ts src',
+                'lint:fix': 'eslint --ext .vue --ext .ts src --fix',
+                'format:check': 'prettier --check .',
+                'format:write': 'prettier --write .'
+            },
+            dependencies: await getLatestVersions([
+                '@fastify/middie',
+                '@fastify/static'
+            ]),
+            devDependencies: await getLatestVersions([
+                '@typescript-eslint/eslint-plugin',
+                '@typescript-eslint/parser',
+                '@types/node',
+                'devcert',
+                'eslint',
+                'eslint-config-prettier',
+                'eslint-plugin-prettier',
+                'eslint-plugin-vue',
+                'fastify',
+                'npm-run-all',
+                'typescript',
+                'typescript-eslint',
+                'vite',
+                'vitrify'
+            ]),
+            exports: {
+                '.': {
+                    types: './dist/types/index.d.ts',
+                    import: './dist/index.js'
+                }
+            }
+        },
+        tsconfigJson: {
+            paths: {
+                src: ['./src']
+            },
+            types: ['vite/client', 'vitrify/client'],
+            include: [
+                'vitrify.config.ts',
+                'src/**/*.ts',
+                'src/**/*.d.ts',
+                'src/**/*.tsx',
+                'src/**/*.vue'
+            ]
         }
     }
+    // uiPlugin: {
+    //   name: 'vite-ui-plugin',
+    //   fullName: 'Vite UI plugin',
+    //   description: 'A Vite plugin for UI components',
+    //   url: new URL('../templates/vite-ui-plugin/', import.meta.url),
+    //   pkgJson: {
+    //     exports: {
+    //       '.': {
+    //         types: './dist/types/index.d.ts',
+    //         import: './dist/index.js',
+    //         src: './src/ui/index.ts'
+    //       },
+    //       './css': {
+    //         import: './dist/style.css'
+    //       },
+    //       './vite-plugin': {
+    //         types: './dist/vite-plugin.d.ts',
+    //         import: './dist/vite-plugin.js',
+    //         src: './src/vite-plugin.ts'
+    //       }
+    //     },
+    //     scripts: {
+    //       'build:plugin': 'vite build',
+    //       'build:vite-plugin': 'tsc -p tsconfig.build.plugin.json',
+    //       'generate:types': 'vue-tsc -p tsconfig.types.json',
+    //       'clean:buildinfo': 'rimraf tsconfig.build.plugin.tsbuildinfo',
+    //       clean: 'run-s clean:buildinfo',
+    //       build: 'run-s clean build:plugin build:vite-plugin generate:types',
+    //       lint: 'eslint --ext .vue --ext .ts src',
+    //       'lint:fix': 'eslint --ext .vue --ext .ts src --fix',
+    //       'format:check': 'prettier --check .',
+    //       'format:write': 'prettier --write .'
+    //     },
+    //     dependencies: await getLatestVersions(['unplugin-vue-components']),
+    //     devDependencies: await getLatestVersions([
+    //       '@types/node',
+    //       '@types/ws',
+    //       '@vitejs/plugin-vue',
+    //       '@vue/server-renderer',
+    //       '@typescript-eslint/eslint-plugin',
+    //       '@typescript-eslint/parser',
+    //       'eslint',
+    //       'eslint-config-prettier',
+    //       'eslint-plugin-prettier-vue',
+    //       'eslint-plugin-vue',
+    //       'npm-run-all',
+    //       'quasar',
+    //       'typescript',
+    //       'rimraf',
+    //       'vite',
+    //       'vitrify',
+    //       'vue',
+    //       'vue-router',
+    //       'vue-tsc'
+    //     ])
+    //   },
+    //   tsconfigJson: {
+    //     types: ['vite/client']
+    //   }
+    // }
     // plugin: {
     //   name: 'quasar-plugin',
     //   fullName: 'Quasar Plugin',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-vitrify",
-  "version": "0.6.5",
+  "version": "0.7.0",
   "license": "MIT",
   "author": "Stefan van Herwijnen",
   "type": "module",
@@ -21,17 +21,17 @@
   },
   "homepage": "https://github.com/simsustech/vitrify/tree/main/packages/create-vitrify#readme",
   "dependencies": {
-    "@vitrify/tools": "^0.4.0",
     "handlebars": "^4.7.8",
-    "@inquirer/prompts": "^7.3.1",
+    "@inquirer/prompts": "^7.5.0",
     "latest-version": "^9.0.0",
-    "minimist": "^1.2.8"
+    "minimist": "^1.2.8",
+    "@vitrify/tools": "0.4.1"
   },
   "devDependencies": {
     "@types/minimist": "^1.2.5",
-    "@types/node": "^22.13.1",
-    "typescript": "^5.7.3",
-    "vite": "^6.0.11",
+    "@types/node": "^22.15.3",
+    "typescript": "^5.8.3",
+    "vite": "^6.3.4",
     "vue": "^3.5.13"
   },
   "files": [

package/templates/fastify/_gitignore

@@ -0,0 +1,3 @@
+node_modules
+dist
+*.local

package/templates/fastify/_prettierignore

@@ -0,0 +1,3 @@
+dist/
+node_modules/
+pnpm-lock.yaml

package/templates/fastify/_prettierrc.json

@@ -0,0 +1,22 @@
+{
+  "semi": false,
+  "tabWidth": 2,
+  "singleQuote": true,
+  "printWidth": 80,
+  "trailingComma": "none",
+  "overrides": [
+    {
+      "files": ["*.json5"],
+      "options": {
+        "singleQuote": false,
+        "quoteProps": "preserve"
+      }
+    },
+    {
+      "files": ["*.yml"],
+      "options": {
+        "singleQuote": false
+      }
+    }
+  ]
+}

package/templates/fastify/eslint.config.js

@@ -0,0 +1,27 @@
+import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended'
+import pluginVue from 'eslint-plugin-vue'
+import typescriptEslint from 'typescript-eslint'
+import vueParser from 'vue-eslint-parser'
+
+export default typescriptEslint.config(
+  ...typescriptEslint.configs.recommended,
+  ...pluginVue.configs['flat/recommended'],
+
+  {
+    files: ['**/*.vue'],
+    languageOptions: {
+      parser: vueParser,
+      parserOptions: {
+        sourceType: 'module',
+        parser: {
+          ts: typescriptEslint.parser
+        }
+      }
+    }
+  },
+
+  /**
+   * end
+   */
+  eslintPluginPrettierRecommended
+)

package/templates/fastify/src/setup.ts

@@ -0,0 +1,12 @@
+import type { FastifyInstance } from 'fastify'
+
+/**
+ * Only used in SSR/SSG
+ */
+export default async function (fastify: FastifyInstance) {
+  console.log('Running setup function....')
+
+  fastify.get('/', (request, reply) => {
+    reply.send('Hello world!')
+  })
+}

package/templates/fastify/vitrify.config.ts

@@ -0,0 +1,21 @@
+import type { VitrifyConfig } from 'vitrify'
+import { certificateFor } from 'devcert'
+
+export default async function ({ mode, command }): Promise<VitrifyConfig> {
+  const config: VitrifyConfig = {
+    vitrify: {
+      hooks: {
+        onSetup: [new URL('src/setup.ts', import.meta.url)]
+      },
+      ssr: {
+        serverModules: []
+      }
+    }
+  }
+  if (mode === 'development') {
+    config.server = {
+      https: await certificateFor('vitrify.test')
+    }
+  }
+  return config
+}

package/templates/quasar/eslint.config.js

@@ -0,0 +1,27 @@
+import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended'
+import pluginVue from 'eslint-plugin-vue'
+import typescriptEslint from 'typescript-eslint'
+import vueParser from 'vue-eslint-parser'
+
+export default typescriptEslint.config(
+  ...typescriptEslint.configs.recommended,
+  ...pluginVue.configs['flat/recommended'],
+
+  {
+    files: ['**/*.vue'],
+    languageOptions: {
+      parser: vueParser,
+      parserOptions: {
+        sourceType: 'module',
+        parser: {
+          ts: typescriptEslint.parser
+        }
+      }
+    }
+  },
+
+  /**
+   * end
+   */
+  eslintPluginPrettierRecommended
+)

package/templates/quasar/src/pages/IndexPage.vue

@@ -11,5 +11,5 @@ export default {
 </scirpt>
 
 <script setup lang="ts">
-import HelloWorld from 'src/components/HelloWorld.vue'
+import HelloWorld from '../components/HelloWorld.vue'
 </script>

package/templates/quasar/src/router/routes.ts

@@ -3,8 +3,8 @@ import { RouteRecordRaw } from 'vue-router'
 const routes: RouteRecordRaw[] = [
   {
     path: '/',
-    component: () => import('src/layouts/MainLayout.vue'),
-    children: [{ path: '', component: () => import('src/pages/IndexPage.vue') }]
+    component: () => import('../layouts/MainLayout.vue'),
+    children: [{ path: '', component: () => import('../pages/IndexPage.vue') }]
   },
 
   // Always leave this as last one,
@@ -12,7 +12,7 @@ const routes: RouteRecordRaw[] = [
   {
     path: '/404',
     alias: '/:catchAll(.*)*',
-    component: () => import('src/pages/Error404Page.vue')
+    component: () => import('../pages/Error404Page.vue')
   }
 ]
 

package/templates/quasar/src/setup.ts

@@ -4,5 +4,6 @@ import type { FastifyInstance } from 'fastify'
  * Only used in SSR/SSG
  */
 export default async function (fastify: FastifyInstance) {
-  console.log('Running setup function....')
+  fastify.log('Running setup function...')
+  console.log('Running setup function...')
 }

package/templates/quasar/vitrify.config.ts

@@ -1,8 +1,8 @@
 import type { VitrifyConfig } from 'vitrify'
 import { certificateFor } from 'devcert'
-import { QuasarPreset, type QuasarConf } from 'vitrify'
+import { QuasarPlugin, type QuasarPluginOptions } from 'vitrify/plugins'
 
-const quasarConf: QuasarConf = {
+const quasarConf: QuasarPluginOptions = {
   // extras: ['material-icons'],
   framework: {
     components: [
@@ -20,19 +20,15 @@ const quasarConf: QuasarConf = {
 export default async function ({ mode, command }): Promise<VitrifyConfig> {
   const config: VitrifyConfig = {
     vitrify: {
+      plugins: [
+        {
+          plugin: QuasarPlugin,
+          options: quasarConf
+        }
+      ],
       hooks: {
         onSetup: [new URL('src/setup.ts', import.meta.url)]
       },
-      /*
-       * Experimental
-       */
-      // unocss: {
-      //   presets: [
-      //     QuasarPreset({
-      //       plugins: quasarConf['framework']['plugins']
-      //     })
-      //   ]
-      // },
       sass: {
         variables: {
           $primary: '#000000'
@@ -41,8 +37,7 @@ export default async function ({ mode, command }): Promise<VitrifyConfig> {
       ssr: {
         serverModules: []
       }
-    },
-    quasar: quasarConf
+    }
   }
   if (mode === 'development') {
     config.server = {

package/templates/quasarmd3/.vscode/extensions.json

@@ -0,0 +1,3 @@
+{
+  "recommendations": ["vue.volar", "dbaeumer.vscode-eslint"]
+}

package/templates/quasarmd3/_gitignore

@@ -0,0 +1,3 @@
+node_modules
+dist
+*.local

package/templates/quasarmd3/_prettierignore

@@ -0,0 +1,3 @@
+dist/
+node_modules/
+pnpm-lock.yaml