polen 0.10.0-next.9 → 0.11.0-next.1

package/src/api/static/rebase.ts

@@ -1,18 +1,18 @@
 import { TinyGlobby } from '#dep/tiny-globby/index'
 import { Fs, Path } from '@wollybeard/kit'
 import { Err } from '@wollybeard/kit'
-import { buildManifest, type PolenBuildManifest } from './manifest.ts'
+import { buildManifest, type PolenBuildManifest } from './manifest.js'
 
 export type RebasePlan = RebaseOverwritePlan | RebaseCopyPlan
 
 export interface RebaseOverwritePlan {
-  changeMode: 'mutate'
+  changeMode: `mutate`
   newBasePath: string
   sourcePath: string
 }
 
 export interface RebaseCopyPlan {
-  changeMode: 'copy'
+  changeMode: `copy`
   newBasePath: string
   sourcePath: string
   targetPath: string
@@ -22,7 +22,7 @@ export const rebase = async (plan: RebasePlan): Promise<void> => {
   // 1. Validate source is a Polen build
   const manifestResult = await buildManifest.read(plan.sourcePath)
   if (Err.is(manifestResult)) {
-    throw new Error(`Polen build manifest not found at: ${Path.join(plan.sourcePath, '.polen', 'build.json')}`)
+    throw new Error(`Polen build manifest not found at: ${Path.join(plan.sourcePath, `.polen`, `build.json`)}`)
   }
   const manifest = manifestResult
 
@@ -33,7 +33,7 @@ export const rebase = async (plan: RebasePlan): Promise<void> => {
 
   // 3. Handle copy vs mutate
   let workingPath: string
-  if (plan.changeMode === 'copy') {
+  if (plan.changeMode === `copy`) {
     if (await Fs.exists(plan.targetPath)) {
       const isEmpty = await Fs.isEmptyDir(plan.targetPath)
       if (!isEmpty) {
@@ -64,8 +64,8 @@ export const rebase = async (plan: RebasePlan): Promise<void> => {
 // TODO: this is very generic, factor out to kit-temp
 const isValidUrlPath = (path: string): boolean => {
   // URL path should start with / and not contain invalid characters
-  if (!path.startsWith('/')) return false
-  if (!path.endsWith('/')) return false
+  if (!path.startsWith(`/`)) return false
+  if (!path.endsWith(`/`)) return false
 
   // Basic validation - no spaces, proper URL characters
   const urlPathRegex = /^\/[a-zA-Z0-9\-._~:/?#[\]@!$&'()*+,;=%]*\/$/
@@ -82,7 +82,7 @@ const updateHtmlFiles = async (buildPath: string, oldBasePath: string, newBasePa
 }
 
 const findHtmlFiles = async (dir: string): Promise<string[]> => {
-  return await TinyGlobby.glob('**/*.html', {
+  return await TinyGlobby.glob(`**/*.html`, {
     absolute: true,
     cwd: dir,
     onlyFiles: true,
@@ -108,10 +108,10 @@ const updateHtmlFile = async (filePath: string, oldBasePath: string, newBasePath
   } else {
     // Insert new base tag in head
     const headRegex = /<head[^>]*>/i
-    const headMatch = content.match(headRegex)
+    const headMatch = headRegex.exec(content)
 
     if (headMatch) {
-      const insertPosition = headMatch.index! + headMatch[0].length
+      const insertPosition = headMatch.index + headMatch[0].length
       updatedContent = content.slice(0, insertPosition)
         + `\n  <base href="${newBasePath}">`
         + content.slice(insertPosition)
@@ -124,7 +124,7 @@ const updateHtmlFile = async (filePath: string, oldBasePath: string, newBasePath
 }
 
 const updateManifest = async (buildPath: string, updates: Partial<PolenBuildManifest>): Promise<void> => {
-  const manifestPath = Path.join(buildPath, '.polen', 'build.json')
+  const manifestPath = Path.join(buildPath, `.polen`, `build.json`)
   const manifestResult = await buildManifest.read(buildPath)
   if (Err.is(manifestResult)) {
     throw new Error(`Polen build manifest not found at: ${manifestPath}`)

package/src/api/static/static.ts

@@ -1,2 +1,2 @@
-export * from './manifest.ts'
-export * from './rebase.ts'
+export * from './manifest.js'
+export * from './rebase.js'

package/src/api/utils/asset-url/asset-url.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from 'vitest'
-import { assetUrl, faviconUrl, joinPaths, pageUrl } from './asset-url.ts'
+import { assetUrl, faviconUrl, joinPaths, pageUrl } from './asset-url.js'
 
 describe('asset-url helpers', () => {
   describe('joinPaths', () => {

package/src/api/utils/asset-url/index.ts

@@ -1 +1 @@
-export * from './asset-url.ts'
+export * from './asset-url.js'

package/src/api/vite/logger.ts

@@ -10,12 +10,12 @@ export const createLogger = (config: Config.Config): Vite.Logger => {
     ...baseLogger,
     info(msg, options) {
       // Filter out optimization-related messages
-      const msgString = typeof msg === 'string' ? msg : String(msg)
+      const msgString = typeof msg === `string` ? msg : String(msg)
       if (
-        msgString.includes('new dependencies optimized')
-        || msgString.includes('optimized dependencies changed')
-        || msgString.includes('Re-optimizing dependencies')
-        || msgString.includes('Forced re-optimization')
+        msgString.includes(`new dependencies optimized`)
+        || msgString.includes(`optimized dependencies changed`)
+        || msgString.includes(`Re-optimizing dependencies`)
+        || msgString.includes(`Forced re-optimization`)
       ) {
         return
       }

package/src/api/vite/plugins/{branding/index.ts → branding.ts}

@@ -6,7 +6,7 @@ import { debugPolen } from '#singletons/debug'
 import { Fs } from '@wollybeard/kit'
 import type { Plugin } from 'vite'
 
-const viLogo = polenVirtual(['project', 'assets', 'logo.svg'])
+const viLogo = polenVirtual([`project`, `assets`, `logo.svg`])
 
 const generateDefaultLogo = async () => {
   return `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128" width="128" height="128">
@@ -15,12 +15,12 @@ const generateDefaultLogo = async () => {
 }
 
 export function Branding(config: Config.Config): Plugin {
-  const debug = debugPolen.sub('vite-plugin:branding')
-  debug('initialized')
+  const debug = debugPolen.sub(`vite-plugin:branding`)
+  debug(`initialized`)
 
   return {
-    name: 'polen:branding',
-    enforce: 'pre',
+    name: `polen:branding`,
+    enforce: `pre`,
 
     async buildStart() {
       this.addWatchFile(config.paths.project.absolute.public.logo)
@@ -46,7 +46,7 @@ export function Branding(config: Config.Config): Plugin {
       if (id === viLogo.resolved) {
         const logoFileContent = await Fs.read(config.paths.project.absolute.public.logo)
         const content = logoFileContent ? logoFileContent : await generateDefaultLogo()
-        const dataUrl = `data:image/svg+xml;base64,${Buffer.from(content).toString('base64')}`
+        const dataUrl = `data:image/svg+xml;base64,${Buffer.from(content).toString(`base64`)}`
         return `export default ${JSON.stringify(dataUrl)}`
       }
     },
@@ -63,7 +63,7 @@ interface HandleWatchedFileChangeParams {
 
 const handleWatchedFileChange = async (
   params: HandleWatchedFileChangeParams,
-): Promise<Array<Vite.ModuleNode> | void> => {
+): Promise<Vite.ModuleNode[] | void> => {
   const { watchedFile, changedFile, moduleId, server, debug } = params
 
   // Check if change is for watched file
@@ -93,8 +93,8 @@ const handleWatchedFileChange = async (
     case MutationType.Create:
       // Full reload needed - module never existed
       server.ws.send({
-        type: 'full-reload',
-        path: '*',
+        type: `full-reload`,
+        path: `*`,
       })
       break
 

package/src/api/vite/plugins/build.ts

@@ -2,118 +2,124 @@ import type { Config } from '#api/config/index'
 import type { PolenBuildManifest } from '#api/static/manifest'
 import { Vite } from '#dep/vite/index'
 import { ViteVirtual } from '#lib/vite-virtual/index'
+import { debugPolen } from '#singletons/debug'
 import { Fs, Path } from '@wollybeard/kit'
 import packageJson from '../../../../package.json' with { type: 'json' }
-import { isKitUnusedExternalImport, isRadixModuleLevelDirective } from '../log-filters.ts'
-import { polenVirtual } from '../vi.ts'
+import { isKitUnusedExternalImport, isRadixModuleLevelDirective } from '../log-filters.js'
+import { polenVirtual } from '../vi.js'
 
 export const Build = (config: Config.Config): Vite.Plugin[] => {
+  const debug = debugPolen.sub(`vite-build`)
+  debug(`construct`)
   // let viteConfigResolved: Vite.ResolvedConfig
 
   // const outDir = Path.join(config.paths.project.rootDir, `dist`)
 
-  return [Manifest(config), BuildManifest(config), {
-    name: `polen:build-client`,
-    apply: `build`,
-    applyToEnvironment: Vite.isEnvironmentClient,
-    // HACK: For some reason the ?url import doesn't lead to a rewrite in the build.
-    // Furthermore we need to rely on the manifest to get its final name because it is
-    // generated by the client build before the server build.
-    // However, we still need the asset in development.
-    // But we cannot exclude the import in build.
-    // So this does that for us but it is really hacky.
-    // FIXME
-    // 1. Raise issue about having ?url lead to expected build path rewrite?
-    // 2. And: Move asset generation to server build?
-    // 3. And/or: Use Vite Environments API?
-    generateBundle(_, bundle, isWrite) {
-      if (isWrite) {
-        for (const chunkOrAsset of Object.values(bundle)) {
-          if (chunkOrAsset.type === `asset` && chunkOrAsset.names.includes(`entry.client.jsx`)) {
-            // eslint-disable-next-line
-            delete bundle[chunkOrAsset.fileName]
+  return [
+    Manifest(config),
+    BuildManifest(config),
+    {
+      name: `polen:build-client`,
+      apply: `build`,
+      applyToEnvironment: Vite.isEnvironmentClient,
+      // HACK: For some reason the ?url import doesn't lead to a rewrite in the build.
+      // Furthermore we need to rely on the manifest to get its final name because it is
+      // generated by the client build before the server build.
+      // However, we still need the asset in development.
+      // But we cannot exclude the import in build.
+      // So this does that for us but it is really hacky.
+      // FIXME
+      // 1. Raise issue about having ?url lead to expected build path rewrite?
+      // 2. And: Move asset generation to server build?
+      // 3. And/or: Use Vite Environments API?
+      generateBundle(_, bundle, isWrite) {
+        if (isWrite) {
+          for (const chunkOrAsset of Object.values(bundle)) {
+            if (chunkOrAsset.type === `asset` && chunkOrAsset.names.includes(`entry.client.jsx`)) {
+              delete bundle[chunkOrAsset.fileName]
+            }
           }
         }
-      }
-    },
-    onLog(_, message) {
-      if (isRadixModuleLevelDirective(message)) return
-      if (isKitUnusedExternalImport(message)) return
-    },
-    config() {
-      return {
-        environments: {
-          client: {
-            build: {
-              manifest: true,
-              rollupOptions: {
-                input: [config.paths.framework.template.client.entrypoint],
-                external: id => id.startsWith(`node:`),
-                onwarn(message) {
-                  if (isKitUnusedExternalImport(message)) return
+      },
+      onLog(_, message) {
+        if (isRadixModuleLevelDirective(message)) return
+        if (isKitUnusedExternalImport(message)) return
+      },
+      config() {
+        return {
+          environments: {
+            client: {
+              build: {
+                manifest: true,
+                rollupOptions: {
+                  input: [config.paths.framework.template.absolute.client.entrypoint],
+                  external: id => id.startsWith(`node:`),
+                  onwarn(message) {
+                    if (isKitUnusedExternalImport(message)) return
+                  },
                 },
               },
             },
           },
-        },
-      }
+        }
+      },
     },
-  }, {
-    name: `polen-ssr-build`,
-    apply: `build`,
-    applyToEnvironment: Vite.isEnvironmentSsr,
-    config() {
-      return {
-        // Have to configure this here??
-        // @see https://github.com/vitejs/vite/issues/20098
-        ssr: {
-          noExternal: true,
-        },
-        environments: {
+
+    {
+      name: `polen-ssr-build`,
+      apply: `build`,
+      applyToEnvironment: Vite.isEnvironmentSsr,
+      config() {
+        return {
+          // Have to configure this here??
+          // @see https://github.com/vitejs/vite/issues/20098
           ssr: {
-            build: {
-              // NO EFFECT (see above)
-              // Bundle all dependencies instead of externalizing them
-              // noExternal: true,
-              // The SSR build will follow the client build, and emptying the dir would lose the output of the client build.
-              emptyOutDir: false,
-              rollupOptions: {
-                input: [config.paths.framework.template.server.entrypoint],
-                output: {
-                  entryFileNames: config.paths.project.relative.build.relative.serverEntrypoint,
+            noExternal: true,
+          },
+          environments: {
+            ssr: {
+              build: {
+                // NO EFFECT (see above)
+                // Bundle all dependencies instead of externalizing them
+                // noExternal: true,
+                // The SSR build will follow the client build, and emptying the dir would lose the output of the client build.
+                emptyOutDir: false,
+                rollupOptions: {
+                  input: [config.paths.framework.template.absolute.server.entrypoint],
+                  output: {
+                    entryFileNames: config.paths.project.relative.build.relative.serverEntrypoint,
+                  },
                 },
               },
             },
           },
-        },
-      }
-    },
-
-    onLog(_, message) {
-      if (isKitUnusedExternalImport(message)) return
-    },
-    // generateBundle(_, bundle, isWrite) {
-    //   if (isWrite) {
-    //     for (const chunkOrAsset of Object.values(bundle)) {
-    //       console.log(chunkOrAsset)
-    //       if (chunkOrAsset.type === `chunk`) {
-    //         if (chunkOrAsset.facadeModuleId === viClientManifest.resolved) {
-    //           // eslint-disable-next-line
-    //           delete bundle[chunkOrAsset.fileName]
-    //         }
-    //       }
-    //     }
-    //   }
-    // },
-    async closeBundle() {
-      /**
-       * clean up the manifest. Was generated by client. For server build. Not needed after (unless debugging).
-       */
-      if (!config.advanced.debug) {
-        await Fs.remove(Path.join(config.paths.project.absolute.build.root, `.vite`))
-      }
+        }
+      },
+      onLog(_, message) {
+        if (isKitUnusedExternalImport(message)) return
+      },
+      // generateBundle(_, bundle, isWrite) {
+      //   if (isWrite) {
+      //     for (const chunkOrAsset of Object.values(bundle)) {
+      //       console.log(chunkOrAsset)
+      //       if (chunkOrAsset.type === `chunk`) {
+      //         if (chunkOrAsset.facadeModuleId === viClientManifest.resolved) {
+      //           delete bundle[chunkOrAsset.fileName]
+      //         }
+      //       }
+      //     }
+      //   }
+      // },
+      async closeBundle() {
+        /**
+         * clean up the manifest. Was generated by client. For server build. Not needed after (unless debugging).
+         */
+        if (!config.advanced.debug) {
+          await Fs.remove(Path.join(config.paths.project.absolute.build.root, `.vite`))
+        }
+      },
     },
-  }]
+  ]
 }
 
 const viClientManifest = polenVirtual([`vite`, `client`, `manifest`])
@@ -149,20 +155,20 @@ const Manifest = (config: Config.Config): Vite.Plugin => {
 
 const BuildManifest = (config: Config.Config): Vite.Plugin => {
   return {
-    name: 'polen:build-manifest',
-    apply: 'build',
+    name: `polen:build-manifest`,
+    apply: `build`,
     applyToEnvironment: Vite.isEnvironmentClient,
     async generateBundle() {
       const manifest: PolenBuildManifest = {
-        type: config.build.architecture === 'ssr' ? 'ssr' : 'ssg',
+        type: config.build.architecture === `ssr` ? `ssr` : `ssg`,
         version: packageJson.version,
-        basePath: config.build.base || '/',
+        basePath: config.build.base ?? `/`,
       }
 
       // Emit the manifest as an asset
       this.emitFile({
-        type: 'asset',
-        fileName: '.polen/build.json',
+        type: `asset`,
+        fileName: `.polen/build.json`,
         source: JSON.stringify(manifest, null, 2),
       })
     },