vitrify 0.13.1 → 0.14.0

package/dist/bin/cli.js

@@ -80,7 +80,7 @@ cli
             prerender({
                 outDir: fileURLToPath(new URL('static/', baseOutDir)),
                 templatePath: fileURLToPath(new URL('static/index.html', baseOutDir)),
-                manifestPath: fileURLToPath(new URL('static/ssr-manifest.json', baseOutDir)),
+                manifestPath: fileURLToPath(new URL('static/.vite/ssr-manifest.json', baseOutDir)),
                 entryServerPath: new URL('ssr/server/entry-server.mjs', baseOutDir),
                 onRendered
             });

package/dist/bin/dev.js

@@ -52,7 +52,7 @@ ssr, framework = 'vue', host, appDir, publicDir, base }) {
         // middlewareMode: mode === 'ssr' ? 'ssr' : undefined,
         middlewareMode: ssr ? true : false,
         fs: {
-            strict: false,
+            strict: false, // https://github.com/vitejs/vite/issues/8175
             allow: [
                 searchForWorkspaceRoot(process.cwd()),
                 searchForWorkspaceRoot(fileURLToPath(appDir)),
@@ -138,7 +138,7 @@ ssr, framework = 'vue', host, appDir, publicDir, vite }) {
                 if (vite && app) {
                     await app.ready();
                     await app.close();
-                    ({ app, server } = await createServer({
+                    ({ app, server, vite } = await createServer({
                         ssr: 'fastify',
                         host: host,
                         appDir,

package/dist/frameworks/vue/fastify-ssr-plugin.js

@@ -113,7 +113,7 @@ const fastifySsrPlugin = async (fastify, options, done) => {
                 provide
             };
             const template = readFileSync(fileURLToPath(new URL('./dist/ssr/client/index.html', options.appDir))).toString();
-            const manifest = JSON.parse(readFileSync(new URL('./dist/ssr/client/ssr-manifest.json', options.appDir)).toString());
+            const manifest = JSON.parse(readFileSync(new URL('./dist/ssr/client/.vite/ssr-manifest.json', options.appDir)).toString());
             const render = (await import(fileURLToPath(new URL('./dist/ssr/server/entry-server.mjs', options.appDir)))).render;
             const [appHtml, preloadLinks] = await render(url, manifest, ssrContext);
             if (!ssrContext.initialState)

package/dist/index.js

@@ -1,5 +1,5 @@
 import vuePlugin from '@vitejs/plugin-vue';
-import { resolvePackageData } from 'vite';
+import { findDepPkgJsonPath } from 'vitefu';
 import { mergeConfig } from 'vite';
 import { build } from 'esbuild';
 import fs from 'fs';
@@ -190,9 +190,9 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
     const packageUrls = vitrifyConfig.vitrify?.urls?.packages || {};
     await (async () => {
         for (const val of localPackages) {
-            const pkg = resolvePackageData(val, fileURLToPath(appDir));
-            if (pkg)
-                packageUrls[val] = new URL(`file://${pkg.dir}/`);
+            const pkgDir = await findDepPkgJsonPath(val, fileURLToPath(appDir));
+            if (pkgDir)
+                packageUrls[val] = new URL(`file://${pkgDir}`);
         }
     })();
     // await (async () => {
@@ -250,10 +250,10 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
             name: 'vitrify-transforms',
             enforce: 'pre',
             transform: (code, id) => {
-                // if (['main.ts', 'vitrify'].every((val) => id.includes(val))) {
-                //   code =
-                //     `${globalCss.map((css) => `import '${css}'`).join('\n')}\n` + code
-                // }
+                if (['main.ts', 'vitrify'].every((val) => id.includes(val))) {
+                    if (!isPwa)
+                        code = code.replace(/\/\/ @vitrify-pwa-only((.|\n)*)\/\/ @vitrify-pwa-only-end/, '');
+                }
                 if (['RootComponent.vue', 'vitrify'].every((val) => id.includes(val))) {
                     const css = `${globalCss
                         .map((css) => `@import '${css}';`)
@@ -384,8 +384,8 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
             name: 'html-transform',
             enforce: 'pre',
             transformIndexHtml: {
-                enforce: 'pre',
-                transform: (html) => {
+                order: 'pre',
+                handler: (html) => {
                     let entry;
                     switch (ssr) {
                         case 'ssg':
@@ -466,11 +466,7 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
     let noExternal = [
         new RegExp(`^(?!(${[...builtinModules, ...serverModules].join('|')}))`)
     ];
-    const external = [
-        ...builtinModules,
-        ...serverModules,
-        'virtual:pwa-register/vue'
-    ];
+    const external = [...builtinModules, ...serverModules];
     if (ssr === 'server') {
         rollupOptions = {
             ...rollupOptions,

package/dist/plugins/quasar.js

@@ -1,5 +1,5 @@
-import { resolvePackageData } from 'vite';
 import { fileURLToPath } from 'url';
+import { findDepPkgJsonPath } from 'vitefu';
 export const injectSsrContext = (html, ssrContext) => html
     .replace(/(<html[^>]*)(>)/i, (found, start, end) => {
     let matches;
@@ -52,9 +52,9 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
                 // const localPackages: string[] = []
                 await (async () => {
                     for (const val of localPackages) {
-                        const pkg = resolvePackageData(val, fileURLToPath(config.vitrify.urls.app));
-                        if (pkg)
-                            urls.packages[val] = new URL(`file://${pkg.dir}/`);
+                        const pkgDir = await findDepPkgJsonPath(val, fileURLToPath(config.vitrify.urls.app));
+                        if (pkgDir)
+                            urls.packages[val] = new URL(`file://${pkgDir}`);
                     }
                 })();
                 const onMountedHooks = [

package/dist/types/bin/dev.d.ts

@@ -47,8 +47,8 @@ export declare function createServer({ port, logLevel, ssr, framework, host, app
         resolve: Required<import("vite").ResolveOptions> & {
             alias: import("vite").Alias[];
         };
-        plugins: readonly import("vite").Plugin[];
-        css: import("vite").ResolvedCSSOptions | undefined;
+        plugins: readonly import("vite").Plugin<any>[];
+        css: import("vite").ResolvedCSSOptions;
         esbuild: false | import("vite").ESBuildOptions;
         server: import("vite").ResolvedServerOptions;
         build: import("vite").ResolvedBuildOptions;
@@ -58,7 +58,7 @@ export declare function createServer({ port, logLevel, ssr, framework, host, app
         logger: import("vite").Logger;
         createResolver: (options?: Partial<import("vite").InternalResolveOptions> | undefined) => import("vite").ResolveFn;
         optimizeDeps: import("vite").DepOptimizationOptions;
-        worker: import("vite").ResolveWorkerOptions;
+        worker: import("vite").ResolvedWorkerOptions;
         appType: import("vite").AppType;
         experimental: import("vite").ExperimentalOptions;
     } & import("vite").PluginHookUtils>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitrify",
-  "version": "0.13.1",
+  "version": "0.14.0",
   "license": "MIT",
   "author": "Stefan van Herwijnen",
   "description": "Vite as your Full Stack development tool",
@@ -48,45 +48,46 @@
     "test": "vitest test/"
   },
   "dependencies": {
-    "@fastify/middie": "^8.2.0",
-    "@fastify/static": "^6.10.1",
-    "@quasar/extras": "^1.16.3",
-    "@vitejs/plugin-vue": "^4.2.1",
+    "@fastify/middie": "^8.3.0",
+    "@fastify/static": "^6.12.0",
+    "@quasar/extras": "^1.16.8",
+    "@vitejs/plugin-vue": "^4.5.0",
     "ajv": "^8.12.0",
     "builtin-modules": "^3.3.0",
     "cac": "^6.7.14",
-    "chalk": "^5.2.0",
-    "critters": "^0.0.16",
+    "chalk": "^5.3.0",
+    "critters": "^0.0.20",
     "cross-env": "^7.0.3",
-    "esbuild": "^0.17.18",
-    "fastify": "^4.17.0",
-    "glob": "^10.2.2",
-    "happy-dom": "^9.10.7",
+    "esbuild": "^0.19.8",
+    "fastify": "^4.24.3",
+    "glob": "^10.3.10",
+    "happy-dom": "^12.10.3",
     "is-port-reachable": "^4.0.0",
-    "magic-string": "^0.30.0",
+    "magic-string": "^0.30.5",
     "merge-deep": "^3.0.3",
     "readline": "^1.3.0",
-    "rollup-plugin-visualizer": "^5.9.0",
-    "sass": "1.62.1",
+    "rollup-plugin-visualizer": "^5.9.3",
+    "sass": "1.69.5",
     "ts-node": "^10.9.1",
-    "unplugin-vue-components": "^0.24.1",
-    "vite": "^4.3.4",
-    "vite-plugin-pwa": "^0.16.5",
-    "vitest": "^0.30.1",
+    "unplugin-vue-components": "^0.25.2",
+    "vite": "^5.0.2",
+    "vite-plugin-pwa": "^0.17.2",
+    "vitefu": "^0.2.5",
+    "vitest": "^0.34.6",
     "workbox-window": "^7.0.0"
   },
   "devDependencies": {
-    "@types/connect": "^3.4.35",
+    "@types/connect": "^3.4.38",
     "@types/glob": "^8.1.0",
-    "@types/merge-deep": "^3.0.0",
-    "@types/node": "^18.16.3",
-    "@types/ws": "^8.5.4",
-    "@vue/runtime-core": "^3.2.47",
-    "quasar": "^2.11.10",
-    "rollup": "^3.21.3",
-    "typescript": "^5.0.4",
-    "vue": "^3.2.47",
-    "vue-router": "^4.1.6"
+    "@types/merge-deep": "^3.0.3",
+    "@types/node": "^20.10.0",
+    "@types/ws": "^8.5.10",
+    "@vue/runtime-core": "^3.3.9",
+    "quasar": "^2.14.0",
+    "rollup": "^4.6.0",
+    "typescript": "^5.3.2",
+    "vue": "^3.3.9",
+    "vue-router": "^4.2.5"
   },
   "peerDependencies": {
     "@fastify/static": "^6.5.0",

package/src/node/bin/cli.ts

@@ -96,7 +96,7 @@ cli
           outDir: fileURLToPath(new URL('static/', baseOutDir)),
           templatePath: fileURLToPath(new URL('static/index.html', baseOutDir)),
           manifestPath: fileURLToPath(
-            new URL('static/ssr-manifest.json', baseOutDir)
+            new URL('static/.vite/ssr-manifest.json', baseOutDir)
           ),
           entryServerPath: new URL('ssr/server/entry-server.mjs', baseOutDir),
           onRendered

package/src/node/bin/dev.ts

@@ -205,7 +205,7 @@ export async function createServer({
         if (vite && app) {
           await app.ready()
           await app.close()
-          ;({ app, server } = await createServer({
+          ;({ app, server, vite } = await createServer({
             ssr: 'fastify',
             host: host,
             appDir,

package/src/node/frameworks/vue/fastify-ssr-plugin.ts

@@ -174,7 +174,7 @@ const fastifySsrPlugin: FastifyPluginCallback<FastifySsrOptions> = async (
       ).toString()
       const manifest = JSON.parse(
         readFileSync(
-          new URL('./dist/ssr/client/ssr-manifest.json', options.appDir)
+          new URL('./dist/ssr/client/.vite/ssr-manifest.json', options.appDir)
         ).toString()
       )
       const render = (

package/src/node/index.ts

@@ -1,6 +1,6 @@
 import vuePlugin from '@vitejs/plugin-vue'
 import type { Alias, InlineConfig, UserConfig } from 'vite'
-import { resolvePackageData } from 'vite'
+import { findDepPkgJsonPath } from 'vitefu'
 import { mergeConfig } from 'vite'
 import { build } from 'esbuild'
 import fs from 'fs'
@@ -261,8 +261,8 @@ export const baseConfig = async ({
     vitrifyConfig.vitrify?.urls?.packages || {}
   await (async () => {
     for (const val of localPackages) {
-      const pkg = resolvePackageData(val, fileURLToPath(appDir))
-      if (pkg) packageUrls![val] = new URL(`file://${pkg.dir}/`)
+      const pkgDir = await findDepPkgJsonPath(val, fileURLToPath(appDir))
+      if (pkgDir) packageUrls![val] = new URL(`file://${pkgDir}`)
     }
   })()
 
@@ -327,10 +327,13 @@ export const baseConfig = async ({
       name: 'vitrify-transforms',
       enforce: 'pre',
       transform: (code, id) => {
-        // if (['main.ts', 'vitrify'].every((val) => id.includes(val))) {
-        //   code =
-        //     `${globalCss.map((css) => `import '${css}'`).join('\n')}\n` + code
-        // }
+        if (['main.ts', 'vitrify'].every((val) => id.includes(val))) {
+          if (!isPwa)
+            code = code.replace(
+              /\/\/ @vitrify-pwa-only((.|\n)*)\/\/ @vitrify-pwa-only-end/,
+              ''
+            )
+        }
         if (['RootComponent.vue', 'vitrify'].every((val) => id.includes(val))) {
           const css = `${globalCss
             .map((css) => `@import '${css}';`)
@@ -472,8 +475,8 @@ export const baseConfig = async ({
       name: 'html-transform',
       enforce: 'pre',
       transformIndexHtml: {
-        enforce: 'pre',
-        transform: (html) => {
+        order: 'pre',
+        handler: (html) => {
           let entry: string
           switch (ssr) {
             case 'ssg':
@@ -564,11 +567,7 @@ export const baseConfig = async ({
   let noExternal: RegExp[] | string[] = [
     new RegExp(`^(?!(${[...builtinModules, ...serverModules].join('|')}))`)
   ]
-  const external = [
-    ...builtinModules,
-    ...serverModules,
-    'virtual:pwa-register/vue'
-  ]
+  const external = [...builtinModules, ...serverModules]
 
   if (ssr === 'server') {
     rollupOptions = {

package/src/node/plugins/quasar.ts

@@ -1,13 +1,12 @@
 import type { Plugin } from 'vite'
-import { resolvePackageData } from 'vite'
 import { fileURLToPath } from 'url'
-import Components from 'unplugin-vue-components/vite'
 import type {
   OnBootHook,
   OnMountedHook,
   VitrifyConfig
 } from '../vitrify-config.js'
 import type { VitrifyPlugin } from './index.js'
+import { findDepPkgJsonPath } from 'vitefu'
 export interface QuasarConf {
   ctx?: Record<string, any>
   css?: string[]
@@ -114,11 +113,11 @@ export const QuasarPlugin: VitrifyPlugin = async ({
         // const localPackages: string[] = []
         await (async () => {
           for (const val of localPackages) {
-            const pkg = resolvePackageData(
+            const pkgDir = await findDepPkgJsonPath(
               val,
               fileURLToPath(config.vitrify!.urls!.app!)
             )
-            if (pkg) urls!.packages![val] = new URL(`file://${pkg.dir}/`)
+            if (pkgDir) urls!.packages![val] = new URL(`file://${pkgDir}`)
           }
         })()
 

package/src/vite/vue/main.ts

@@ -78,10 +78,14 @@ export async function createApp(
     await fn({ app, ssrContext, staticImports })
   }
 
-  if (__IS_PWA__ && typeof window !== 'undefined') {
-    const { registerPWA } = await import('./pwa.js')
-    registerPWA(router)
+  // @vitrify-pwa-only
+  if (__IS_PWA__) {
+    if (typeof window !== 'undefined') {
+      const { registerPWA } = await import('./pwa.js')
+      registerPWA(router)
+    }
   }
+  // @vitrify-pwa-only-end
 
   return { app, router, routes }
 }