@greendrake/vite-preset 0.1.0 → 0.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@greendrake/vite-preset",
-    "version": "0.1.0",
+    "version": "0.2.0",
     "description": "Vite config factory and build-env helpers for Vue 3 single-page apps: plugin set, strict dev port, alias, dedupe and source-package pre-bundling rules",
     "license": "MIT",
     "author": "Eugene Greendrake <eugene@greendrake.nz>",
@@ -38,7 +38,7 @@
     },
     "prettier": "@greendrake/dev-config/prettier",
     "dependencies": {
-        "@greendrake/util": "0.1.0",
+        "@greendrake/util": "0.2.0",
         "@vitejs/plugin-vue": "^6.0.7",
         "html-minifier-terser": "^7.2.0"
     },
@@ -46,7 +46,7 @@
         "vite": ">=8"
     },
     "devDependencies": {
-        "@greendrake/dev-config": "0.1.0",
+        "@greendrake/dev-config": "0.2.0",
         "@types/bun": "^1.3.5",
         "@types/html-minifier-terser": "^7.0.2",
         "@types/node": "^24.0.0",

package/src/apiTarget.ts

@@ -17,9 +17,11 @@
 export interface ApiTargetEnv {
     // True under `vite dev` (command === 'serve'); false in production builds.
     dev: boolean
-    apiPort?: string
-    publicFeHost?: string
-    publicApiHost?: string
+    // Undefined as readily as absent: each is an environment variable, which
+    // is either set or not.
+    apiPort?: string | undefined
+    publicFeHost?: string | undefined
+    publicApiHost?: string | undefined
     // Endpoint paths appended to the resolved origin (defaults /v1/api and
     // /v1/ws). A backend that routes POST at the host root sets apiPath: ''.
     apiPath?: string

package/src/html.ts

@@ -14,7 +14,8 @@ export const htmlPlaceholders = (map: Record<string, string>): Plugin => {
         name: 'greendrake-html-placeholders',
         transformIndexHtml: {
             order: 'pre',
-            handler: html => html.replace(pattern, match => map[match])
+            // The pattern is built from the map's own keys, so every match is one.
+            handler: html => html.replace(pattern, match => map[match]!)
         }
     }
 }

package/src/main.ts

@@ -23,7 +23,7 @@ export interface VueSpaOptions {
     // Compile-time globals; values are serialized automatically (strings become
     // string literals, booleans become true/false, objects become object
     // literals — e.g. the ApiTargetEnv carried by __API_TARGET_ENV__).
-    define?: Record<string, string | number | boolean | object | null | undefined>
+    define?: Record<string, string | number | boolean | object | null | undefined> | undefined
     // Extra scss @use resolution roots (e.g. the app's src/scss).
     scssLoadPaths?: string[]
     // 'env' (default): the strict VITE_PORT convention, required when the dev
@@ -48,10 +48,10 @@ export interface VueSpaOptions {
     // source-shipped by construction — an app with source packages of its own
     // names them here, and must name the @greendrake scope again if it uses
     // any.
-    sourcePackages?: string[]
+    sourcePackages?: string[] | undefined
     // Deep-merged last over the preset — the escape hatch for anything
     // app-specific (server.proxy, extra plugins, build tweaks).
-    overrides?: UserConfig
+    overrides?: UserConfig | undefined
 }
 
 // The libraries the app and every component package it renders must share one
@@ -89,11 +89,11 @@ export const vueSpa =
         // none (and never serves) must not be made to produce one.
         const portPin = command === 'serve' && options.port !== false ? { port: typeof options.port === 'number' ? options.port : requirePort(), strictPort: true } : undefined
         const base: UserConfig = {
-            define: options.define && Object.fromEntries(Object.entries(options.define).map(([key, value]) => [key, JSON.stringify(value)])),
+            ...(options.define && { define: Object.fromEntries(Object.entries(options.define).map(([key, value]) => [key, JSON.stringify(value)])) }),
             plugins: [vue(), hmrCircularImportGuard(), ...(options.staticRoots?.length ? [staticRootsPlugin(options.staticRoots)] : []), ...(options.htmlPlaceholders ? [htmlPlaceholders(options.htmlPlaceholders)] : []), ...(options.htmlMinify ? [htmlMinify()] : [])],
-            server:
-                command === 'serve'
-                    ? {
+            ...(command === 'serve'
+                ? {
+                      server: {
                           ...portPin,
                           // '..' reaches the workspace an app sits directly
                           // inside. Anything the dev server must read from
@@ -104,10 +104,11 @@ export const vueSpa =
                           // refused.
                           fs: { allow: ['..', ...(options.staticRoots ?? []).map(root => root.dir)] }
                       }
-                    : undefined,
+                  }
+                : {}),
             // vite preview also loads with command 'serve'; pin it to the same
             // port convention so E2E runs are deterministic.
-            preview: portPin,
+            ...(portPin && { preview: portPin }),
             resolve: {
                 alias: { '@': path.resolve(options.dirname, './src') },
                 dedupe: FRAMEWORK
@@ -131,13 +132,13 @@ export const vueSpa =
                 exclude: allDeps.filter(isSourcePackage),
                 include: [...new Set([...FRAMEWORK.filter(name => allDeps.includes(name)), ...nestedDependencies(options.dirname, deps, isSourcePackage)])]
             },
-            css: options.scssLoadPaths
-                ? {
-                      preprocessorOptions: {
-                          scss: { loadPaths: options.scssLoadPaths }
-                      }
-                  }
-                : undefined,
+            ...(options.scssLoadPaths && {
+                css: {
+                    preprocessorOptions: {
+                        scss: { loadPaths: options.scssLoadPaths }
+                    }
+                }
+            }),
             build: {
                 rolldownOptions: {
                     output: {

package/src/sourceDeps.ts

@@ -1,4 +1,4 @@
-import { existsSync, readFileSync } from 'node:fs'
+import { existsSync, readFileSync, realpathSync } from 'node:fs'
 import path from 'node:path'
 
 // The parts of a package.json this walk reads.
@@ -16,11 +16,14 @@ export interface DeclaredDependencies {
 }
 
 // Where the installer put a package: the nearest node_modules at or above
-// `from` holding it.
+// `from` holding it, as the real path behind whatever link reached it. That is
+// where its own dependencies are found from — an isolated install (bun's, pnpm's)
+// puts them beside the package's real directory, not beside the link an app's
+// node_modules holds — and it is what Node and Vite resolve from too.
 const packageDir = (from: string, name: string): string => {
     for (let dir = from; ; dir = path.dirname(dir)) {
         const candidate = path.join(dir, 'node_modules', name)
-        if (existsSync(path.join(candidate, 'package.json'))) return candidate
+        if (existsSync(path.join(candidate, 'package.json'))) return realpathSync(candidate)
         if (path.dirname(dir) === dir) throw new Error(`${name} is declared but not installed anywhere above ${from}`)
     }
 }

package/src/staticRoots.ts

@@ -42,7 +42,7 @@ export const staticRoots = (roots: StaticRoot[]): Plugin => ({
 
     configureServer(server) {
         server.middlewares.use((req, res, next) => {
-            const url = (req.url ?? '').split('?')[0]
+            const url = (req.url ?? '').replace(/\?.*/, '')
             const root = roots.find(r => url.startsWith(`${r.urlPath}/`))
             if (!root) {
                 next()