npm - @tanstack/start-plugin-core - Versions diffs - 1.121.0-alpha.26 → 1.121.0-alpha.28 - Mend

@tanstack/start-plugin-core 1.121.0-alpha.26 → 1.121.0-alpha.28

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (157) hide show

package/dist/esm/{nitro-plugin/build-sitemap.d.ts → build-sitemap.d.ts} +3 -3
package/dist/esm/{nitro-plugin/build-sitemap.js → build-sitemap.js} +19 -24
package/dist/esm/build-sitemap.js.map +1 -0
package/dist/esm/compilers.d.ts +1 -1
package/dist/esm/compilers.js +6 -9
package/dist/esm/compilers.js.map +1 -1
package/dist/esm/constants.d.ts +6 -2
package/dist/esm/constants.js +7 -4
package/dist/esm/constants.js.map +1 -1
package/dist/esm/debug.js.map +1 -1
package/dist/esm/dev-server-plugin/extract-html-scripts.js.map +1 -1
package/dist/esm/dev-server-plugin/plugin.d.ts +5 -5
package/dist/esm/dev-server-plugin/plugin.js +118 -95
package/dist/esm/dev-server-plugin/plugin.js.map +1 -1
package/dist/esm/index.d.ts +1 -1
package/dist/esm/index.js +0 -4
package/dist/esm/index.js.map +1 -1
package/dist/esm/load-env-plugin/plugin.d.ts +2 -3
package/dist/esm/load-env-plugin/plugin.js +5 -8
package/dist/esm/load-env-plugin/plugin.js.map +1 -1
package/dist/esm/output-directory.d.ts +3 -0
package/dist/esm/output-directory.js +14 -0
package/dist/esm/output-directory.js.map +1 -0
package/dist/esm/plugin.d.ts +11 -286
package/dist/esm/plugin.js +171 -88
package/dist/esm/plugin.js.map +1 -1
package/dist/esm/post-server-build.d.ts +7 -0
package/dist/esm/post-server-build.js +55 -0
package/dist/esm/post-server-build.js.map +1 -0
package/dist/esm/prerender.d.ts +11 -0
package/dist/esm/{nitro-plugin/prerender.js → prerender.js} +88 -68
package/dist/esm/prerender.js.map +1 -0
package/dist/esm/{nitro-plugin/queue.js → queue.js} +7 -10
package/dist/esm/queue.js.map +1 -0
package/dist/esm/resolve-entries.d.ts +8 -0
package/dist/esm/resolve-entries.js +37 -0
package/dist/esm/resolve-entries.js.map +1 -0
package/dist/esm/schema.d.ts +1334 -6585
package/dist/esm/schema.js +54 -86
package/dist/esm/schema.js.map +1 -1
package/dist/esm/start-compiler-plugin.js +7 -3
package/dist/esm/start-compiler-plugin.js.map +1 -1
package/dist/esm/start-manifest-plugin/plugin.d.ts +6 -3
package/dist/esm/start-manifest-plugin/plugin.js +95 -125
package/dist/esm/start-manifest-plugin/plugin.js.map +1 -1
package/dist/esm/start-router-plugin/generator-plugins/routes-manifest-plugin.js +4 -5
package/dist/esm/start-router-plugin/generator-plugins/routes-manifest-plugin.js.map +1 -1
package/dist/esm/start-router-plugin/generator-plugins/server-routes-plugin.js +2 -4
package/dist/esm/start-router-plugin/generator-plugins/server-routes-plugin.js.map +1 -1
package/dist/esm/start-router-plugin/plugin.d.ts +1 -1
package/dist/esm/start-router-plugin/plugin.js +26 -2
package/dist/esm/start-router-plugin/plugin.js.map +1 -1
package/dist/esm/start-router-plugin/route-tree-client-plugin.js +2 -1
package/dist/esm/start-router-plugin/route-tree-client-plugin.js.map +1 -1
package/dist/esm/start-router-plugin/virtual-route-tree-plugin.d.ts +0 -1
package/dist/esm/start-router-plugin/virtual-route-tree-plugin.js +3 -4
package/dist/esm/start-router-plugin/virtual-route-tree-plugin.js.map +1 -1
package/dist/esm/utils.js.map +1 -1
package/package.json +14 -18
package/src/{nitro-plugin/build-sitemap.ts → build-sitemap.ts} +8 -8
package/src/compilers.ts +1 -1
package/src/constants.ts +12 -2
package/src/dev-server-plugin/plugin.ts +146 -124
package/src/index.ts +1 -5
package/src/load-env-plugin/plugin.ts +6 -11
package/src/output-directory.ts +18 -0
package/src/plugin.ts +227 -114
package/src/post-server-build.ts +73 -0
package/src/{nitro-plugin/prerender.ts → prerender.ts} +95 -79
package/src/resolve-entries.ts +52 -0
package/src/schema.ts +89 -121
package/src/start-compiler-plugin.ts +4 -0
package/src/start-manifest-plugin/plugin.ts +121 -165
package/src/start-router-plugin/generator-plugins/routes-manifest-plugin.ts +2 -2
package/src/start-router-plugin/plugin.ts +26 -2
package/src/start-router-plugin/route-tree-client-plugin.ts +2 -1
package/src/start-router-plugin/virtual-route-tree-plugin.ts +3 -4
package/dist/cjs/compilers.cjs +0 -416
package/dist/cjs/compilers.cjs.map +0 -1
package/dist/cjs/compilers.d.cts +0 -21
package/dist/cjs/constants.cjs +0 -14
package/dist/cjs/constants.cjs.map +0 -1
package/dist/cjs/constants.d.cts +0 -6
package/dist/cjs/debug.cjs +0 -5
package/dist/cjs/debug.cjs.map +0 -1
package/dist/cjs/debug.d.cts +0 -1
package/dist/cjs/dev-server-plugin/extract-html-scripts.cjs +0 -35
package/dist/cjs/dev-server-plugin/extract-html-scripts.cjs.map +0 -1
package/dist/cjs/dev-server-plugin/extract-html-scripts.d.cts +0 -4
package/dist/cjs/dev-server-plugin/plugin.cjs +0 -136
package/dist/cjs/dev-server-plugin/plugin.cjs.map +0 -1
package/dist/cjs/dev-server-plugin/plugin.d.cts +0 -5
package/dist/cjs/index.cjs +0 -11
package/dist/cjs/index.cjs.map +0 -1
package/dist/cjs/index.d.cts +0 -3
package/dist/cjs/load-env-plugin/plugin.cjs +0 -34
package/dist/cjs/load-env-plugin/plugin.cjs.map +0 -1
package/dist/cjs/load-env-plugin/plugin.d.cts +0 -3
package/dist/cjs/nitro-plugin/build-sitemap.cjs +0 -138
package/dist/cjs/nitro-plugin/build-sitemap.cjs.map +0 -1
package/dist/cjs/nitro-plugin/build-sitemap.d.cts +0 -31
package/dist/cjs/nitro-plugin/plugin.cjs +0 -181
package/dist/cjs/nitro-plugin/plugin.cjs.map +0 -1
package/dist/cjs/nitro-plugin/plugin.d.cts +0 -3
package/dist/cjs/nitro-plugin/prerender.cjs +0 -170
package/dist/cjs/nitro-plugin/prerender.cjs.map +0 -1
package/dist/cjs/nitro-plugin/prerender.d.cts +0 -8
package/dist/cjs/nitro-plugin/queue.cjs +0 -131
package/dist/cjs/nitro-plugin/queue.cjs.map +0 -1
package/dist/cjs/nitro-plugin/queue.d.cts +0 -32
package/dist/cjs/plugin.cjs +0 -191
package/dist/cjs/plugin.cjs.map +0 -1
package/dist/cjs/plugin.d.cts +0 -291
package/dist/cjs/resolve-virtual-entries-plugin/plugin.cjs +0 -66
package/dist/cjs/resolve-virtual-entries-plugin/plugin.cjs.map +0 -1
package/dist/cjs/resolve-virtual-entries-plugin/plugin.d.cts +0 -3
package/dist/cjs/schema.cjs +0 -157
package/dist/cjs/schema.cjs.map +0 -1
package/dist/cjs/schema.d.cts +0 -8779
package/dist/cjs/start-compiler-plugin.cjs +0 -74
package/dist/cjs/start-compiler-plugin.cjs.map +0 -1
package/dist/cjs/start-compiler-plugin.d.cts +0 -13
package/dist/cjs/start-manifest-plugin/plugin.cjs +0 -207
package/dist/cjs/start-manifest-plugin/plugin.cjs.map +0 -1
package/dist/cjs/start-manifest-plugin/plugin.d.cts +0 -3
package/dist/cjs/start-router-plugin/generator-plugins/routes-manifest-plugin.cjs +0 -39
package/dist/cjs/start-router-plugin/generator-plugins/routes-manifest-plugin.cjs.map +0 -1
package/dist/cjs/start-router-plugin/generator-plugins/routes-manifest-plugin.d.cts +0 -6
package/dist/cjs/start-router-plugin/generator-plugins/server-routes-plugin.cjs +0 -121
package/dist/cjs/start-router-plugin/generator-plugins/server-routes-plugin.cjs.map +0 -1
package/dist/cjs/start-router-plugin/generator-plugins/server-routes-plugin.d.cts +0 -2
package/dist/cjs/start-router-plugin/plugin.cjs +0 -21
package/dist/cjs/start-router-plugin/plugin.cjs.map +0 -1
package/dist/cjs/start-router-plugin/plugin.d.cts +0 -3
package/dist/cjs/start-router-plugin/route-tree-client-plugin.cjs +0 -72
package/dist/cjs/start-router-plugin/route-tree-client-plugin.cjs.map +0 -1
package/dist/cjs/start-router-plugin/route-tree-client-plugin.d.cts +0 -6
package/dist/cjs/start-router-plugin/virtual-route-tree-plugin.cjs +0 -30
package/dist/cjs/start-router-plugin/virtual-route-tree-plugin.cjs.map +0 -1
package/dist/cjs/start-router-plugin/virtual-route-tree-plugin.d.cts +0 -4
package/dist/cjs/utils.cjs +0 -18
package/dist/cjs/utils.cjs.map +0 -1
package/dist/cjs/utils.d.cts +0 -8
package/dist/esm/nitro-plugin/build-sitemap.js.map +0 -1
package/dist/esm/nitro-plugin/plugin.d.ts +0 -3
package/dist/esm/nitro-plugin/plugin.js +0 -181
package/dist/esm/nitro-plugin/plugin.js.map +0 -1
package/dist/esm/nitro-plugin/prerender.d.ts +0 -8
package/dist/esm/nitro-plugin/prerender.js.map +0 -1
package/dist/esm/nitro-plugin/queue.js.map +0 -1
package/dist/esm/resolve-virtual-entries-plugin/plugin.d.ts +0 -3
package/dist/esm/resolve-virtual-entries-plugin/plugin.js +0 -49
package/dist/esm/resolve-virtual-entries-plugin/plugin.js.map +0 -1
package/src/nitro-plugin/plugin.ts +0 -244
package/src/resolve-virtual-entries-plugin/plugin.ts +0 -63
/package/dist/esm/{nitro-plugin/queue.d.ts → queue.d.ts} +0 -0
/package/src/{nitro-plugin/queue.ts → queue.ts} +0 -0

package/src/dev-server-plugin/plugin.ts CHANGED Viewed

@@ -1,113 +1,136 @@
-import { createEvent, getHeader, sendWebResponse } from 'h3'
 import { isRunnableDevEnvironment } from 'vite'
-import { VITE_ENVIRONMENT_NAMES } from '../constants'
+import { VIRTUAL_MODULES } from '@tanstack/start-server-core'
+import { NodeRequest, sendNodeResponse } from 'srvx/node'
+import { ENTRY_POINTS, VITE_ENVIRONMENT_NAMES } from '../constants'
+import { resolveViteId } from '../utils'
 import { extractHtmlScripts } from './extract-html-scripts'
-import type { Connect, DevEnvironment, Plugin, ViteDevServer } from 'vite'
-declare global {
-  // eslint-disable-next-line no-var
-  var TSS_INJECTED_HEAD_SCRIPTS: string | undefined
-}
-export function devServerPlugin(): Plugin {
-  // let config: UserConfig
+import type { Connect, DevEnvironment, PluginOption } from 'vite'
+import type { TanStackStartOutputConfig } from '../schema'
+export function devServerPlugin({
+  startConfig,
+}: {
+  startConfig: TanStackStartOutputConfig
+}): PluginOption {
   let isTest = false
-  return {
-    name: 'start-dev-ssr-plugin',
-    config(userConfig, { mode }) {
-      // config = userConfig
-      isTest = isTest ? isTest : mode === 'test'
-    },
-    configureServer(viteDevServer) {
-      if (isTest) {
-        return
-      }
-      ;(globalThis as any).viteDevServer = viteDevServer
-      return () => {
-        remove_html_middlewares(viteDevServer.middlewares)
-        let cachedScripts: string | undefined
-        viteDevServer.middlewares.use(async (req, res) => {
-          // Create an H3Event to have it passed into the server entry
-          // i.e: event => defineEventHandler(event)
-          const event = createEvent(req, res)
+  let injectedHeadScripts: string | undefined
+  return [
+    {
+      name: 'tanstack-start-core:dev-server',
+      config(_userConfig, { mode }) {
+        isTest = isTest ? isTest : mode === 'test'
+      },
+      async configureServer(viteDevServer) {
+        if (isTest) {
+          return
+        }
+        // Extract the scripts that Vite plugins would inject into the initial HTML
+        const templateHtml = `<html><head></head><body></body></html>`
+        const transformedHtml = await viteDevServer.transformIndexHtml(
+          '/',
+          templateHtml,
+        )
+        const scripts = extractHtmlScripts(transformedHtml)
+        injectedHeadScripts = scripts
+          .flatMap((script) => script.content ?? [])
+          .join(';')
+        return () => {
           const serverEnv = viteDevServer.environments[
             VITE_ENVIRONMENT_NAMES.server
           ] as DevEnvironment | undefined
-          try {
-            if (!serverEnv) {
-              throw new Error(
-                `Server environment ${VITE_ENVIRONMENT_NAMES.server} not found`,
-              )
-            }
-            if (!isRunnableDevEnvironment(serverEnv)) {
-              throw new Error(
-                `Expected server environment ${VITE_ENVIRONMENT_NAMES.server} to be a RunnableDevEnvironment. This can be caused by multiple vite versions being installed in the project.`,
-              )
+          if (!serverEnv) {
+            throw new Error(
+              `Server environment ${VITE_ENVIRONMENT_NAMES.server} not found`,
+            )
+          }
+          const installMiddleware = startConfig.vite?.installDevServerMiddleware
+          if (installMiddleware === false) {
+            return
+          }
+          if (installMiddleware == undefined) {
+            // do not install middleware in middlewareMode by default
+            if (viteDevServer.config.server.middlewareMode) {
+              return
             }
-            // Extract the scripts that Vite plugins would inject into the initial HTML
-            if (cachedScripts === undefined) {
-              const templateHtml = `<html><head></head><body></body></html>`
-              const transformedHtml = await viteDevServer.transformIndexHtml(
-                req.url || '/',
-                templateHtml,
-              )
-              const scripts = extractHtmlScripts(transformedHtml)
-              globalThis.TSS_INJECTED_HEAD_SCRIPTS = scripts
-                .map((script) => script.content ?? '')
-                .join(';')
+            // do not install middleware if SSR env in case another plugin already did
+            if (
+              !isRunnableDevEnvironment(serverEnv) ||
+              // do not check via `isFetchableDevEnvironment` since nitro does implement the `FetchableDevEnvironment` interface but not via inheritance (which this helper checks)
+              'dispatchFetch' in serverEnv
+            ) {
+              return
             }
+          }
-            // Import and resolve the request by running the server entry point
-            // i.e export default defineEventHandler((event) => { ... })
-            const serverEntry = await serverEnv.runner.import(
-              '/~start/server-entry',
+          if (!isRunnableDevEnvironment(serverEnv)) {
+            throw new Error(
+              'cannot install vite dev server middleware for TanStack Start since the SSR environment is not a RunnableDevEnvironment',
             )
-            const response = await serverEntry['default'](event)
-            return sendWebResponse(event, response)
-          } catch (e) {
-            console.error(e)
-            viteDevServer.ssrFixStacktrace(e as Error)
+          }
-            if (
-              getHeader(event, 'content-type')?.includes('application/json')
-            ) {
-              return sendWebResponse(
-                event,
-                new Response(
-                  JSON.stringify(
+          viteDevServer.middlewares.use(async (req, res) => {
+            // fix the request URL to match the original URL
+            // otherwise, the request URL will '/index.html'
+            if (req.originalUrl) {
+              req.url = req.originalUrl
+            }
+            const webReq = new NodeRequest({ req, res })
+            try {
+              // Import and resolve the request by running the server request entry point
+              // this request entry point must implement the `fetch` API as follows:
+              /**
+               * export default {
+               *  fetch(req: Request): Promise<Response>
+               * }
+               */
+              const serverEntry = await serverEnv.runner.import(
+                ENTRY_POINTS.server,
+              )
+              const webRes = await serverEntry['default'].fetch(webReq)
+              return sendNodeResponse(res, webRes)
+            } catch (e) {
+              console.error(e)
+              viteDevServer.ssrFixStacktrace(e as Error)
+              if (
+                webReq.headers.get('content-type')?.includes('application/json')
+              ) {
+                return sendNodeResponse(
+                  res,
+                  new Response(
+                    JSON.stringify(
+                      {
+                        status: 500,
+                        error: 'Internal Server Error',
+                        message:
+                          'An unexpected error occurred. Please try again later.',
+                        timestamp: new Date().toISOString(),
+                      },
+                      null,
+                      2,
+                    ),
                     {
                       status: 500,
-                      error: 'Internal Server Error',
-                      message:
-                        'An unexpected error occurred. Please try again later.',
-                      timestamp: new Date().toISOString(),
+                      headers: {
+                        'Content-Type': 'application/json',
+                      },
                     },
-                    null,
-                    2,
                   ),
-                  {
-                    status: 500,
-                    headers: {
-                      'Content-Type': 'application/json',
-                    },
-                  },
-                ),
-              )
-            }
+                )
+              }
-            return sendWebResponse(
-              event,
-              new Response(
-                `
+              return sendNodeResponse(
+                res,
+                new Response(
+                  `
               <!DOCTYPE html>
               <html lang="en">
                 <head>
@@ -124,42 +147,41 @@ export function devServerPlugin(): Plugin {
                 </body>
               </html>
             `,
-                {
-                  status: 500,
-                  headers: {
-                    'Content-Type': 'text/html',
+                  {
+                    status: 500,
+                    headers: {
+                      'Content-Type': 'text/html',
+                    },
                   },
-                },
-              ),
-            )
-          }
-        })
-      }
+                ),
+              )
+            }
+          })
+        }
+      },
+    },
+    {
+      name: 'tanstack-start-core:dev-server:injected-head-scripts',
+      sharedDuringBuild: true,
+      applyToEnvironment: (env) => env.config.consumer === 'server',
+      resolveId: {
+        filter: { id: new RegExp(VIRTUAL_MODULES.injectedHeadScripts) },
+        handler(_id) {
+          return resolveViteId(VIRTUAL_MODULES.injectedHeadScripts)
+        },
+      },
+      load: {
+        filter: {
+          id: new RegExp(resolveViteId(VIRTUAL_MODULES.injectedHeadScripts)),
+        },
+        handler() {
+          const mod = `
+        export const injectedHeadScripts = ${JSON.stringify(injectedHeadScripts) || 'undefined'}`
+          return mod
+        },
+      },
     },
-  }
-}
-/**
- * Removes Vite internal middleware
- *
- * @param server
- */
-function remove_html_middlewares(server: ViteDevServer['middlewares']) {
-  const html_middlewares = [
-    'viteIndexHtmlMiddleware',
-    'vite404Middleware',
-    'viteSpaFallbackMiddleware',
   ]
-  for (let i = server.stack.length - 1; i > 0; i--) {
-    if (
-      html_middlewares.includes(
-        // @ts-expect-error
-        server.stack[i].handle.name,
-      )
-    ) {
-      server.stack.splice(i, 1)
-    }
-  }
 }
 /**

package/src/index.ts CHANGED Viewed

@@ -1,8 +1,4 @@
-export {
-  createTanStackConfig,
-  createTanStackStartOptionsSchema,
-  pageSchema,
-} from './schema'
+export type { TanStackStartInputConfig } from './schema'
 export { TanStackStartVitePluginCore } from './plugin'
 export { resolveViteId } from './utils'

package/src/load-env-plugin/plugin.ts CHANGED Viewed

@@ -1,17 +1,12 @@
-import * as vite from 'vite'
-import type { TanStackStartOutputConfig } from '../plugin'
+import { loadEnv } from 'vite'
+import type { Plugin } from 'vite'
-export function loadEnvPlugin(
-  startOpts: TanStackStartOutputConfig,
-): vite.Plugin {
+export function loadEnvPlugin(): Plugin {
   return {
-    name: 'tanstack-vite-plugin-nitro-load-env',
+    name: 'tanstack-start-core:load-env',
     enforce: 'pre',
-    config(userConfig, envConfig) {
-      Object.assign(
-        process.env,
-        vite.loadEnv(envConfig.mode, userConfig.root ?? startOpts.root, ''),
-      )
+    configResolved(config) {
+      Object.assign(process.env, loadEnv(config.mode, config.root))
     },
   }
 }

package/src/output-directory.ts ADDED Viewed

@@ -0,0 +1,18 @@
+import { join } from 'pathe'
+import { VITE_ENVIRONMENT_NAMES } from './constants'
+import type * as vite from 'vite'
+export function getClientOutputDirectory(userConfig: vite.UserConfig) {
+  return (
+    userConfig.environments?.[VITE_ENVIRONMENT_NAMES.client]?.build?.outDir ??
+    join(getServerOutputDirectory(userConfig), 'public')
+  )
+}
+export function getServerOutputDirectory(userConfig: vite.UserConfig) {
+  const rootOutputDirectory = userConfig.build?.outDir ?? 'dist'
+  return (
+    userConfig.environments?.[VITE_ENVIRONMENT_NAMES.server]?.build?.outDir ??
+    rootOutputDirectory
+  )
+}