vitrify 0.5.3 → 0.5.6

package/dist/app-urls.js

@@ -1,5 +1,12 @@
 // import { resolve } from 'import-meta-resolve'
 import { existsSync } from 'fs';
+export const resolve = (packageName, base) => {
+    const packageUrl = new URL(`./node_modules/${packageName}/`, base);
+    if (existsSync(packageUrl.pathname)) {
+        return new URL('./', packageUrl);
+    }
+    throw new Error(`Package ${packageName} not found in ${base.pathname}.`);
+};
 export const getPkgJsonDir = (dir) => {
     const pkgJsonPath = new URL('package.json', dir);
     if (existsSync(pkgJsonPath.pathname)) {

package/dist/index.js

@@ -6,9 +6,9 @@ import path from 'path';
 import { pathToFileURL } from 'url';
 import { readFileSync } from 'fs';
 import builtinModules from 'builtin-modules';
-import { resolve } from 'import-meta-resolve';
+// import { resolve } from 'import-meta-resolve'
 import { visualizer } from 'rollup-plugin-visualizer';
-import { getPkgJsonDir } from './app-urls.js';
+import { getPkgJsonDir, resolve } from './app-urls.js';
 const internalServerModules = [
     'util',
     'vitrify',
@@ -16,6 +16,8 @@ const internalServerModules = [
     'vite',
     'fastify',
     '@fastify/static',
+    '@fastify/middie',
+    '@fastify',
     'node'
 ];
 const configPluginMap = {
@@ -130,12 +132,12 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
         console.log('No vitrify.config.(ts|js) file found, using defaults');
         vitrifyConfig = {};
     }
-    const localPackages = ['vue', 'vue-router'];
+    const localPackages = ['vue', 'vue-router', '@vue/server-renderer'];
     const cliPackages = [];
     const packageUrls = vitrifyConfig.vitrify?.urls?.packages || {};
     await (async () => {
         for (const val of localPackages)
-            packageUrls[val] = getPkgJsonDir(new URL(await resolve(val, appDir.href)));
+            packageUrls[val] = getPkgJsonDir(new URL(await resolve(val, appDir)));
     })();
     // await (async () => {
     //   for (const val of cliPackages)
@@ -375,7 +377,7 @@ export const baseConfig = async ({ ssr, appDir, publicDir, base = '/', command =
     if (command === 'test')
         alias.push({
             find: 'vitest',
-            replacement: new URL(await resolve('vitest', cliDir.href)).pathname
+            replacement: new URL(await resolve('vitest', cliDir)).pathname
         });
     let rollupOptions = {};
     let noExternal = [

package/dist/plugins/quasar.js

@@ -3,8 +3,7 @@ import Components from 'unplugin-vue-components/vite';
 // import { quasarDir as defaultQuasarDir } from '../app-urls.js'
 // import { QuasarResolver } from '../resolver.js';
 import { QuasarResolver } from 'unplugin-vue-components/resolvers';
-import { getPkgJsonDir } from '../app-urls.js';
-import { resolve } from 'import-meta-resolve';
+import { getPkgJsonDir, resolve } from '../app-urls.js';
 export const injectSsrContext = (html, ssrContext) => html
     .replace(/(<html[^>]*)(>)/i, (found, start, end) => {
     let matches;
@@ -59,7 +58,7 @@ export const QuasarPlugin = async ({ ssr = false, pwa = false }) => {
                 const localPackages = ['@quasar/extras', 'quasar'];
                 await (async () => {
                     for (const val of localPackages)
-                        urls.packages[val] = getPkgJsonDir(new URL(await resolve(val, urls.app.href)));
+                        urls.packages[val] = getPkgJsonDir(new URL(await resolve(val, urls.app)));
                 })();
                 const onMountedHooks = [
                     async (instance) => {

package/dist/types/app-urls.d.ts

@@ -1,3 +1,4 @@
+export declare const resolve: (packageName: string, base: URL) => URL;
 export declare const getPkgJsonDir: (dir: URL) => URL;
 export declare const getAppDir: () => URL;
 export declare const getCliDir: () => URL;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitrify",
-  "version": "0.5.3",
+  "version": "0.5.6",
   "license": "MIT",
   "author": "Stefan van Herwijnen",
   "description": "Pre-configured Vite CLI for your framework",
@@ -64,7 +64,6 @@
     "fastify": "^4.0.0",
     "glob": "^8.0.3",
     "happy-dom": "^5.2.0",
-    "local-pkg": "^0.4.1",
     "magic-string": "^0.26.2",
     "merge-deep": "^3.0.3",
     "readline": "^1.3.0",
@@ -82,7 +81,6 @@
     "@types/node": "^17.0.41",
     "@types/ws": "^8.5.3",
     "@vue/runtime-core": "^3.2.37",
-    "import-meta-resolve": "^2.0.3",
     "quasar": "^2.7.1",
     "rollup": "^2.75.6",
     "typescript": "^4.7.3",
@@ -93,7 +91,6 @@
   "peerDependencies": {
     "@fastify/static": "^6.4.0",
     "fastify": "^4.0.0",
-    "import-meta-resolve": "^2.0.3",
     "quasar": "^2.7.1",
     "vue": "^3.2.37",
     "vue-router": "^4.0.15"

package/src/node/app-urls.ts

@@ -1,6 +1,14 @@
 // import { resolve } from 'import-meta-resolve'
 import { existsSync } from 'fs'
 
+export const resolve = (packageName: string, base: URL) => {
+  const packageUrl = new URL(`./node_modules/${packageName}/`, base)
+  if (existsSync(packageUrl.pathname)) {
+    return new URL('./', packageUrl)
+  }
+  throw new Error(`Package ${packageName} not found in ${base.pathname}.`)
+}
+
 export const getPkgJsonDir = (dir: URL): URL => {
   const pkgJsonPath = new URL('package.json', dir)
   if (existsSync(pkgJsonPath.pathname)) {

package/src/node/index.ts

@@ -8,7 +8,7 @@ import path from 'path'
 import { pathToFileURL } from 'url'
 import { readFileSync } from 'fs'
 import builtinModules from 'builtin-modules'
-import { resolve } from 'import-meta-resolve'
+// import { resolve } from 'import-meta-resolve'
 import { visualizer } from 'rollup-plugin-visualizer'
 import type {
   StaticImports,
@@ -21,7 +21,7 @@ import type {
 } from './vitrify-config.js'
 import type { VitrifyContext } from './bin/run.js'
 import type { VitrifyPlugin } from './plugins/index.js'
-import { getPkgJsonDir } from './app-urls.js'
+import { getPkgJsonDir, resolve } from './app-urls.js'
 import type { ManualChunksOption, RollupOptions } from 'rollup'
 
 const internalServerModules = [
@@ -31,6 +31,8 @@ const internalServerModules = [
   'vite',
   'fastify',
   '@fastify/static',
+  '@fastify/middie',
+  '@fastify',
   'node'
 ]
 
@@ -192,15 +194,13 @@ export const baseConfig = async ({
     vitrifyConfig = {}
   }
 
-  const localPackages = ['vue', 'vue-router']
+  const localPackages = ['vue', 'vue-router', '@vue/server-renderer']
   const cliPackages = []
   const packageUrls: Record<string, URL> =
     vitrifyConfig.vitrify?.urls?.packages || {}
   await (async () => {
     for (const val of localPackages)
-      packageUrls[val] = getPkgJsonDir(
-        new URL(await resolve(val, appDir!.href))
-      )
+      packageUrls[val] = getPkgJsonDir(new URL(await resolve(val, appDir)))
   })()
 
   // await (async () => {
@@ -458,7 +458,7 @@ export const baseConfig = async ({
   if (command === 'test')
     alias.push({
       find: 'vitest',
-      replacement: new URL(await resolve('vitest', cliDir!.href)).pathname
+      replacement: new URL(await resolve('vitest', cliDir)).pathname
     })
 
   let rollupOptions: RollupOptions = {}

package/src/node/plugins/quasar.ts

@@ -12,9 +12,9 @@ import type {
 // import { QuasarResolver } from '../resolver.js';
 import { QuasarResolver } from 'unplugin-vue-components/resolvers'
 import type { VitrifyPlugin } from './index.js'
-import { getPkgJsonDir } from '../app-urls.js'
+import { getPkgJsonDir, resolve } from '../app-urls.js'
 
-import { resolve } from 'import-meta-resolve'
+// import { resolve } from 'import-meta-resolve'
 
 export interface QuasarConf {
   ctx: Record<string, any>
@@ -123,7 +123,7 @@ export const QuasarPlugin: VitrifyPlugin = async ({
         await (async () => {
           for (const val of localPackages)
             urls!.packages![val] = getPkgJsonDir(
-              new URL(await resolve(val, urls!.app!.href))
+              new URL(await resolve(val, urls!.app!))
             )
         })()
 

package/src/vite/vue/csr/app.ts

@@ -4,22 +4,21 @@ import { getAppDir } from '../../../node/app-urls.js'
 import { onRendered, onSetup } from 'virtual:vitrify-hooks'
 import { fastifyCsrPlugin } from './fastify-csr-plugin.js'
 import type { ViteDevServer } from 'vite'
-import * as imr from 'import-meta-resolve'
-const { resolve } = imr
+
 // const appDir = getPkgJsonDir(import.meta.url)
 const getString = (str?: string) => str
 let baseUrl = getString(__BASE_URL__)
 const appDir = getAppDir()
 
 export const setupApp = async () => {
-  const vitrifyDir = new URL('../', await resolve('vitrify', import.meta.url))
+  // const vitrifyDir = new URL('../', await resolve('vitrify', new URL(import.meta.url)))
   return createApp({
     onSetup,
     appDir,
     baseUrl,
     onRendered,
     fastifyPlugin: fastifyCsrPlugin,
-    vitrifyDir,
+    // vitrifyDir,
     mode: import.meta.env.MODE
   })
 }

package/src/vite/vue/ssr/app.ts

@@ -4,22 +4,21 @@ import { getAppDir } from '../../../node/app-urls.js'
 import { onRendered, onSetup } from 'virtual:vitrify-hooks'
 import { fastifySsrPlugin } from './fastify-ssr-plugin.js'
 import type { ViteDevServer } from 'vite'
-import * as imr from 'import-meta-resolve'
-const { resolve } = imr
+
 // const appDir = getPkgJsonDir(import.meta.url)
 const getString = (str?: string) => str
 let baseUrl = getString(__BASE_URL__)
 const appDir = getAppDir()
 
 export const setupApp = async () => {
-  const vitrifyDir = new URL('../', await resolve('vitrify', import.meta.url))
+  // const vitrifyDir = new URL('../', await resolve('vitrify', new URL(import.meta.url)))
   return createApp({
     onSetup,
     appDir,
     baseUrl,
     onRendered,
     fastifyPlugin: fastifySsrPlugin,
-    vitrifyDir,
+    // vitrifyDir,
     mode: import.meta.env.MODE
   })
 }

package/src/vite/vue/ssr/entry-server.ts

@@ -1,5 +1,5 @@
 import { createApp } from '../main.js'
-import { renderToString } from 'vue/server-renderer'
+import { renderToString } from '@vue/server-renderer'
 import type { FastifyInstance } from 'fastify'
 // import * as ApolloSSR from '@vue/apollo-ssr'
 // import { ApolloClients } from '@vue/apollo-composable'