polen 0.10.0-next.14 → 0.10.0-next.3

package/src/api/vite/plugins/branding/index.ts

@@ -2,7 +2,7 @@ import type { Config } from '#api/api'
 import { polenVirtual } from '#api/vite/vi'
 import type { Vite } from '#dep/vite/index'
 import { type ExistenceDiff, getMutationType, MutationType } from '#lib/mutation-type'
-import { debugPolen } from '#singletons/debug'
+import { debug } from '#singletons/debug'
 import { Fs } from '@wollybeard/kit'
 import type { Plugin } from 'vite'
 
@@ -15,8 +15,8 @@ const generateDefaultLogo = async () => {
 }
 
 export function Branding(config: Config.Config): Plugin {
-  const debug = debugPolen.sub('vite-plugin:branding')
-  debug('initialized')
+  const _debug = debug.sub('vite-plugin:branding')
+  _debug('initialized')
 
   return {
     name: 'polen:branding',
@@ -32,7 +32,7 @@ export function Branding(config: Config.Config): Plugin {
         changedFile: file,
         moduleId: viLogo.resolved,
         server,
-        debug: debug,
+        debug: _debug,
       })
     },
 

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

@@ -1,127 +1,117 @@
 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'
 
 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), {
+    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]
           }
         }
-      },
-      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.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
+  }, {
+    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: {
           ssr: {
-            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.server.entrypoint],
-                  output: {
-                    entryFileNames: config.paths.project.relative.build.relative.serverEntrypoint,
-                  },
+            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,
                 },
               },
             },
           },
-        }
-      },
-      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) {
+    //           // 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`))
+      }
     },
-  ]
+  }]
 }
 
 const viClientManifest = polenVirtual([`vite`, `client`, `manifest`])
@@ -154,25 +144,3 @@ const Manifest = (config: Config.Config): Vite.Plugin => {
     ),
   }
 }
-
-const BuildManifest = (config: Config.Config): Vite.Plugin => {
-  return {
-    name: 'polen:build-manifest',
-    apply: 'build',
-    applyToEnvironment: Vite.isEnvironmentClient,
-    async generateBundle() {
-      const manifest: PolenBuildManifest = {
-        type: config.build.architecture === 'ssr' ? 'ssr' : 'ssg',
-        version: packageJson.version,
-        basePath: config.build.base || '/',
-      }
-
-      // Emit the manifest as an asset
-      this.emitFile({
-        type: 'asset',
-        fileName: '.polen/build.json',
-        source: JSON.stringify(manifest, null, 2),
-      })
-    },
-  }
-}

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

@@ -6,22 +6,24 @@ import type { Vite } from '#dep/vite/index'
 import { VitePluginJson } from '#lib/vite-plugin-json/index'
 import { VitePluginReactiveData } from '#lib/vite-plugin-reactive-data/index'
 import { ViteVirtual } from '#lib/vite-virtual/index'
-import { debugPolen } from '#singletons/debug'
+import { debug } from '#singletons/debug'
 import { superjson } from '#singletons/superjson'
 import { Json, Str } from '@wollybeard/kit'
-import type { ProjectData } from '../../../project-data.ts'
+import type { ProjectData } from '../../../project-data.js'
 import { SchemaAugmentation } from '../../schema-augmentation/index.ts'
 import { Schema } from '../../schema/index.ts'
 import { createLogger } from '../logger.ts'
 import { polenVirtual } from '../vi.ts'
 import { Pages } from './pages.ts'
 
+const _debug = debug.sub(`vite-plugin-core`)
+
 const viTemplateVariables = polenVirtual([`template`, `variables`])
 const viTemplateSchemaAugmentations = polenVirtual([`template`, `schema-augmentations`])
 const viProjectData = polenVirtual([`project`, `data.jsonsuper`], { allowPluginProcessing: true })
 
-export interface ProjectRoutesModule {
-  routes: ReactRouter.RouteObject[]
+export interface ProjectPagesModule {
+  pages: ReactRouter.RouteObject[]
 }
 
 export const Core = (config: Config.Config): Vite.PluginOption[] => {
@@ -57,7 +59,7 @@ export const Core = (config: Config.Config): Vite.PluginOption[] => {
     }))
   }
 
-  const jsonsuper = VitePluginJson.create({
+  const json = VitePluginJson.create({
     codec: {
       validate: superjson,
       importPath: import.meta.resolve('#singletons/superjson'),
@@ -85,7 +87,7 @@ export const Core = (config: Config.Config): Vite.PluginOption[] => {
       name: `polen:internal-import-alias`,
       enforce: 'pre' as const,
       resolveId(id, importer) {
-        // const debug = debugPolen.sub(`vite-plugin:internal-import-alias`)
+        const d = debug.sub(`vite-plugin:internal-import-alias`)
 
         const isPolenImporter = Boolean(
           importer
@@ -107,24 +109,25 @@ export const Core = (config: Config.Config): Vite.PluginOption[] => {
         )
 
         if (!isPolenImporter) return null
-        // debug(`check candidate`, { id, importer, isPolenImporter })
+        d(`check candidate`, { id, importer, isPolenImporter })
 
         const find = Str.pattern<{ groups: [`path`] }>(/^#(?<path>.+)/)
         const match = Str.match(id, find)
         if (!match) return null
 
         const to = `${config.paths.framework.sourceDir}/${match.groups.path}${config.paths.framework.sourceExtension}`
-        // debug(`did resolve`, { from: id, to })
+        d(`did resolve`, { from: id, to })
 
         return to
       },
     },
-    jsonsuper,
+    json,
     VitePluginReactiveData.create({
-      moduleId: `virtual:polen/project/data/navbar.jsonsuper`,
-      codec: superjson,
+      moduleId: `virtual:polen/project/data/navbar`,
       data: navbarData.value,
+      codec: superjson,
       name: `polen-navbar`,
+      moduleType: 'jsonsuper',
     }),
     ...Pages({
       config,
@@ -180,18 +183,13 @@ export const Core = (config: Config.Config): Vite.PluginOption[] => {
         {
           identifier: viProjectData,
           async loader() {
-            const debug = debugPolen.sub(`module-project-data`)
-
-            debug('load', { id: viProjectData.id })
-
+            _debug(`loadingViProjectDataVirtualModule`)
             const schema = await readSchema()
 
             // ━ Schema presence causes adding some navbar items
+            const schemaNavbar = navbarData.get('schema')
+            schemaNavbar.length = 0 // Clear existing
             if (schema) {
-              const schemaNavbar = navbarData.get('schema')
-              schemaNavbar.length = 0 // Clear existing
-              debug('update navbar', { message: 'for schema' })
-
               // IMPORTANT: Always ensure paths start with '/' for React Router compatibility.
               // Without the leading slash, React Router treats paths as relative, which causes
               // hydration mismatches between SSR (where base path is prepended) and client