@tanstack/start-plugin-core 1.121.27 → 1.121.29
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.
- package/dist/cjs/dev-server-plugin/plugin.cjs +7 -9
- package/dist/cjs/dev-server-plugin/plugin.cjs.map +1 -1
- package/dist/cjs/dev-server-plugin/plugin.d.cts +2 -1
- package/dist/esm/dev-server-plugin/plugin.d.ts +2 -1
- package/dist/esm/dev-server-plugin/plugin.js +7 -9
- package/dist/esm/dev-server-plugin/plugin.js.map +1 -1
- package/package.json +5 -5
- package/src/dev-server-plugin/plugin.ts +11 -12
|
@@ -15,11 +15,11 @@ function devServerPlugin() {
|
|
|
15
15
|
if (isTest) {
|
|
16
16
|
return;
|
|
17
17
|
}
|
|
18
|
-
globalThis.
|
|
18
|
+
globalThis.TSS_VITE_DEV_SERVER = viteDevServer;
|
|
19
|
+
globalThis.TSS_INJECTED_HEAD_SCRIPTS = void 0;
|
|
19
20
|
return () => {
|
|
20
21
|
remove_html_middlewares(viteDevServer.middlewares);
|
|
21
|
-
|
|
22
|
-
viteDevServer.middlewares.use(async (req, res) => {
|
|
22
|
+
viteDevServer.middlewares.use(async (req, res, next) => {
|
|
23
23
|
var _a;
|
|
24
24
|
const event = h3.createEvent(req, res);
|
|
25
25
|
const serverEnv = viteDevServer.environments[constants.VITE_ENVIRONMENT_NAMES.server];
|
|
@@ -29,12 +29,7 @@ function devServerPlugin() {
|
|
|
29
29
|
`Server environment ${constants.VITE_ENVIRONMENT_NAMES.server} not found`
|
|
30
30
|
);
|
|
31
31
|
}
|
|
32
|
-
if (
|
|
33
|
-
throw new Error(
|
|
34
|
-
`Expected server environment ${constants.VITE_ENVIRONMENT_NAMES.server} to be a RunnableDevEnvironment. This can be caused by multiple vite versions being installed in the project.`
|
|
35
|
-
);
|
|
36
|
-
}
|
|
37
|
-
if (cachedScripts === void 0) {
|
|
32
|
+
if (globalThis.TSS_INJECTED_HEAD_SCRIPTS === void 0) {
|
|
38
33
|
const templateHtml = `<html><head></head><body></body></html>`;
|
|
39
34
|
const transformedHtml = await viteDevServer.transformIndexHtml(
|
|
40
35
|
req.url || "/",
|
|
@@ -43,6 +38,9 @@ function devServerPlugin() {
|
|
|
43
38
|
const scripts = extractHtmlScripts.extractHtmlScripts(transformedHtml);
|
|
44
39
|
globalThis.TSS_INJECTED_HEAD_SCRIPTS = scripts.map((script) => script.content ?? "").join(";");
|
|
45
40
|
}
|
|
41
|
+
if (!vite.isRunnableDevEnvironment(serverEnv)) {
|
|
42
|
+
return next();
|
|
43
|
+
}
|
|
46
44
|
const serverEntry = await serverEnv.runner.import(
|
|
47
45
|
"/~start/server-entry"
|
|
48
46
|
);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.cjs","sources":["../../../src/dev-server-plugin/plugin.ts"],"sourcesContent":["import { createEvent, getHeader, sendWebResponse } from 'h3'\nimport { isRunnableDevEnvironment } from 'vite'\nimport { VITE_ENVIRONMENT_NAMES } from '../constants'\nimport { extractHtmlScripts } from './extract-html-scripts'\nimport type { Connect, DevEnvironment, Plugin, ViteDevServer } from 'vite'\n\
|
|
1
|
+
{"version":3,"file":"plugin.cjs","sources":["../../../src/dev-server-plugin/plugin.ts"],"sourcesContent":["import { createEvent, getHeader, sendWebResponse } from 'h3'\nimport { isRunnableDevEnvironment } from 'vite'\nimport { VITE_ENVIRONMENT_NAMES } from '../constants'\nimport { extractHtmlScripts } from './extract-html-scripts'\nimport type { Connect, DevEnvironment, Plugin, ViteDevServer } from 'vite'\n\n/* eslint-disable no-var */\ndeclare global {\n var TSS_INJECTED_HEAD_SCRIPTS: string | undefined\n var TSS_VITE_DEV_SERVER: ViteDevServer | undefined\n}\n\nexport function devServerPlugin(): Plugin {\n // let config: UserConfig\n let isTest = false\n\n return {\n name: 'start-dev-ssr-plugin',\n config(userConfig, { mode }) {\n // config = userConfig\n isTest = isTest ? isTest : mode === 'test'\n },\n configureServer(viteDevServer) {\n if (isTest) {\n return\n }\n\n globalThis.TSS_VITE_DEV_SERVER = viteDevServer\n // upon server restart, reset the injected scripts\n globalThis.TSS_INJECTED_HEAD_SCRIPTS = undefined\n return () => {\n remove_html_middlewares(viteDevServer.middlewares)\n\n viteDevServer.middlewares.use(async (req, res, next) => {\n // Create an H3Event to have it passed into the server entry\n // i.e: event => defineEventHandler(event)\n const event = createEvent(req, res)\n\n const serverEnv = viteDevServer.environments[\n VITE_ENVIRONMENT_NAMES.server\n ] as DevEnvironment | undefined\n\n try {\n if (!serverEnv) {\n throw new Error(\n `Server environment ${VITE_ENVIRONMENT_NAMES.server} not found`,\n )\n }\n\n // Extract the scripts that Vite plugins would inject into the initial HTML\n if (globalThis.TSS_INJECTED_HEAD_SCRIPTS === undefined) {\n const templateHtml = `<html><head></head><body></body></html>`\n const transformedHtml = await viteDevServer.transformIndexHtml(\n req.url || '/',\n templateHtml,\n )\n const scripts = extractHtmlScripts(transformedHtml)\n globalThis.TSS_INJECTED_HEAD_SCRIPTS = scripts\n .map((script) => script.content ?? '')\n .join(';')\n }\n\n if (!isRunnableDevEnvironment(serverEnv)) {\n return next()\n }\n\n // Import and resolve the request by running the server entry point\n // i.e export default defineEventHandler((event) => { ... })\n const serverEntry = await serverEnv.runner.import(\n '/~start/server-entry',\n )\n const response = await serverEntry['default'](event)\n\n return sendWebResponse(event, response)\n } catch (e) {\n console.error(e)\n viteDevServer.ssrFixStacktrace(e as Error)\n\n if (\n getHeader(event, 'content-type')?.includes('application/json')\n ) {\n return sendWebResponse(\n event,\n new Response(\n JSON.stringify(\n {\n status: 500,\n error: 'Internal Server Error',\n message:\n 'An unexpected error occurred. Please try again later.',\n timestamp: new Date().toISOString(),\n },\n null,\n 2,\n ),\n {\n status: 500,\n headers: {\n 'Content-Type': 'application/json',\n },\n },\n ),\n )\n }\n\n return sendWebResponse(\n event,\n new Response(\n `\n <!DOCTYPE html>\n <html lang=\"en\">\n <head>\n <meta charset=\"UTF-8\" />\n <title>Error</title>\n <script type=\"module\">\n import { ErrorOverlay } from '/@vite/client'\n document.body.appendChild(new ErrorOverlay(${JSON.stringify(\n prepareError(req, e),\n ).replace(/</g, '\\\\u003c')}))\n </script>\n </head>\n <body>\n </body>\n </html>\n `,\n {\n status: 500,\n headers: {\n 'Content-Type': 'text/html',\n },\n },\n ),\n )\n }\n })\n }\n },\n }\n}\n\n/**\n * Removes Vite internal middleware\n *\n * @param server\n */\nfunction remove_html_middlewares(server: ViteDevServer['middlewares']) {\n const html_middlewares = [\n 'viteIndexHtmlMiddleware',\n 'vite404Middleware',\n 'viteSpaFallbackMiddleware',\n ]\n for (let i = server.stack.length - 1; i > 0; i--) {\n if (\n html_middlewares.includes(\n // @ts-expect-error\n server.stack[i].handle.name,\n )\n ) {\n server.stack.splice(i, 1)\n }\n }\n}\n\n/**\n * Formats error for SSR message in error overlay\n * @param req\n * @param error\n * @returns\n */\nfunction prepareError(req: Connect.IncomingMessage, error: unknown) {\n const e = error as Error\n return {\n message: `An error occured while server rendering ${req.url}:\\n\\n\\t${\n typeof e === 'string' ? e : e.message\n } `,\n stack: typeof e === 'string' ? '' : e.stack,\n }\n}\n"],"names":["createEvent","VITE_ENVIRONMENT_NAMES","extractHtmlScripts","isRunnableDevEnvironment","sendWebResponse","getHeader"],"mappings":"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"}
|
|
@@ -13,11 +13,11 @@ function devServerPlugin() {
|
|
|
13
13
|
if (isTest) {
|
|
14
14
|
return;
|
|
15
15
|
}
|
|
16
|
-
globalThis.
|
|
16
|
+
globalThis.TSS_VITE_DEV_SERVER = viteDevServer;
|
|
17
|
+
globalThis.TSS_INJECTED_HEAD_SCRIPTS = void 0;
|
|
17
18
|
return () => {
|
|
18
19
|
remove_html_middlewares(viteDevServer.middlewares);
|
|
19
|
-
|
|
20
|
-
viteDevServer.middlewares.use(async (req, res) => {
|
|
20
|
+
viteDevServer.middlewares.use(async (req, res, next) => {
|
|
21
21
|
var _a;
|
|
22
22
|
const event = createEvent(req, res);
|
|
23
23
|
const serverEnv = viteDevServer.environments[VITE_ENVIRONMENT_NAMES.server];
|
|
@@ -27,12 +27,7 @@ function devServerPlugin() {
|
|
|
27
27
|
`Server environment ${VITE_ENVIRONMENT_NAMES.server} not found`
|
|
28
28
|
);
|
|
29
29
|
}
|
|
30
|
-
if (
|
|
31
|
-
throw new Error(
|
|
32
|
-
`Expected server environment ${VITE_ENVIRONMENT_NAMES.server} to be a RunnableDevEnvironment. This can be caused by multiple vite versions being installed in the project.`
|
|
33
|
-
);
|
|
34
|
-
}
|
|
35
|
-
if (cachedScripts === void 0) {
|
|
30
|
+
if (globalThis.TSS_INJECTED_HEAD_SCRIPTS === void 0) {
|
|
36
31
|
const templateHtml = `<html><head></head><body></body></html>`;
|
|
37
32
|
const transformedHtml = await viteDevServer.transformIndexHtml(
|
|
38
33
|
req.url || "/",
|
|
@@ -41,6 +36,9 @@ function devServerPlugin() {
|
|
|
41
36
|
const scripts = extractHtmlScripts(transformedHtml);
|
|
42
37
|
globalThis.TSS_INJECTED_HEAD_SCRIPTS = scripts.map((script) => script.content ?? "").join(";");
|
|
43
38
|
}
|
|
39
|
+
if (!isRunnableDevEnvironment(serverEnv)) {
|
|
40
|
+
return next();
|
|
41
|
+
}
|
|
44
42
|
const serverEntry = await serverEnv.runner.import(
|
|
45
43
|
"/~start/server-entry"
|
|
46
44
|
);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.js","sources":["../../../src/dev-server-plugin/plugin.ts"],"sourcesContent":["import { createEvent, getHeader, sendWebResponse } from 'h3'\nimport { isRunnableDevEnvironment } from 'vite'\nimport { VITE_ENVIRONMENT_NAMES } from '../constants'\nimport { extractHtmlScripts } from './extract-html-scripts'\nimport type { Connect, DevEnvironment, Plugin, ViteDevServer } from 'vite'\n\
|
|
1
|
+
{"version":3,"file":"plugin.js","sources":["../../../src/dev-server-plugin/plugin.ts"],"sourcesContent":["import { createEvent, getHeader, sendWebResponse } from 'h3'\nimport { isRunnableDevEnvironment } from 'vite'\nimport { VITE_ENVIRONMENT_NAMES } from '../constants'\nimport { extractHtmlScripts } from './extract-html-scripts'\nimport type { Connect, DevEnvironment, Plugin, ViteDevServer } from 'vite'\n\n/* eslint-disable no-var */\ndeclare global {\n var TSS_INJECTED_HEAD_SCRIPTS: string | undefined\n var TSS_VITE_DEV_SERVER: ViteDevServer | undefined\n}\n\nexport function devServerPlugin(): Plugin {\n // let config: UserConfig\n let isTest = false\n\n return {\n name: 'start-dev-ssr-plugin',\n config(userConfig, { mode }) {\n // config = userConfig\n isTest = isTest ? isTest : mode === 'test'\n },\n configureServer(viteDevServer) {\n if (isTest) {\n return\n }\n\n globalThis.TSS_VITE_DEV_SERVER = viteDevServer\n // upon server restart, reset the injected scripts\n globalThis.TSS_INJECTED_HEAD_SCRIPTS = undefined\n return () => {\n remove_html_middlewares(viteDevServer.middlewares)\n\n viteDevServer.middlewares.use(async (req, res, next) => {\n // Create an H3Event to have it passed into the server entry\n // i.e: event => defineEventHandler(event)\n const event = createEvent(req, res)\n\n const serverEnv = viteDevServer.environments[\n VITE_ENVIRONMENT_NAMES.server\n ] as DevEnvironment | undefined\n\n try {\n if (!serverEnv) {\n throw new Error(\n `Server environment ${VITE_ENVIRONMENT_NAMES.server} not found`,\n )\n }\n\n // Extract the scripts that Vite plugins would inject into the initial HTML\n if (globalThis.TSS_INJECTED_HEAD_SCRIPTS === undefined) {\n const templateHtml = `<html><head></head><body></body></html>`\n const transformedHtml = await viteDevServer.transformIndexHtml(\n req.url || '/',\n templateHtml,\n )\n const scripts = extractHtmlScripts(transformedHtml)\n globalThis.TSS_INJECTED_HEAD_SCRIPTS = scripts\n .map((script) => script.content ?? '')\n .join(';')\n }\n\n if (!isRunnableDevEnvironment(serverEnv)) {\n return next()\n }\n\n // Import and resolve the request by running the server entry point\n // i.e export default defineEventHandler((event) => { ... })\n const serverEntry = await serverEnv.runner.import(\n '/~start/server-entry',\n )\n const response = await serverEntry['default'](event)\n\n return sendWebResponse(event, response)\n } catch (e) {\n console.error(e)\n viteDevServer.ssrFixStacktrace(e as Error)\n\n if (\n getHeader(event, 'content-type')?.includes('application/json')\n ) {\n return sendWebResponse(\n event,\n new Response(\n JSON.stringify(\n {\n status: 500,\n error: 'Internal Server Error',\n message:\n 'An unexpected error occurred. Please try again later.',\n timestamp: new Date().toISOString(),\n },\n null,\n 2,\n ),\n {\n status: 500,\n headers: {\n 'Content-Type': 'application/json',\n },\n },\n ),\n )\n }\n\n return sendWebResponse(\n event,\n new Response(\n `\n <!DOCTYPE html>\n <html lang=\"en\">\n <head>\n <meta charset=\"UTF-8\" />\n <title>Error</title>\n <script type=\"module\">\n import { ErrorOverlay } from '/@vite/client'\n document.body.appendChild(new ErrorOverlay(${JSON.stringify(\n prepareError(req, e),\n ).replace(/</g, '\\\\u003c')}))\n </script>\n </head>\n <body>\n </body>\n </html>\n `,\n {\n status: 500,\n headers: {\n 'Content-Type': 'text/html',\n },\n },\n ),\n )\n }\n })\n }\n },\n }\n}\n\n/**\n * Removes Vite internal middleware\n *\n * @param server\n */\nfunction remove_html_middlewares(server: ViteDevServer['middlewares']) {\n const html_middlewares = [\n 'viteIndexHtmlMiddleware',\n 'vite404Middleware',\n 'viteSpaFallbackMiddleware',\n ]\n for (let i = server.stack.length - 1; i > 0; i--) {\n if (\n html_middlewares.includes(\n // @ts-expect-error\n server.stack[i].handle.name,\n )\n ) {\n server.stack.splice(i, 1)\n }\n }\n}\n\n/**\n * Formats error for SSR message in error overlay\n * @param req\n * @param error\n * @returns\n */\nfunction prepareError(req: Connect.IncomingMessage, error: unknown) {\n const e = error as Error\n return {\n message: `An error occured while server rendering ${req.url}:\\n\\n\\t${\n typeof e === 'string' ? e : e.message\n } `,\n stack: typeof e === 'string' ? '' : e.stack,\n }\n}\n"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tanstack/start-plugin-core",
|
|
3
|
-
"version": "1.121.
|
|
3
|
+
"version": "1.121.29",
|
|
4
4
|
"description": "Modern and scalable routing for React applications",
|
|
5
5
|
"author": "Tanner Linsley",
|
|
6
6
|
"license": "MIT",
|
|
@@ -63,12 +63,12 @@
|
|
|
63
63
|
"ufo": "^1.5.4",
|
|
64
64
|
"xmlbuilder2": "^3.1.1",
|
|
65
65
|
"zod": "^3.24.2",
|
|
66
|
-
"@tanstack/router-core": "1.121.27",
|
|
67
66
|
"@tanstack/router-generator": "1.121.27",
|
|
67
|
+
"@tanstack/router-plugin": "1.121.29",
|
|
68
68
|
"@tanstack/router-utils": "1.121.21",
|
|
69
|
-
"@tanstack/server-functions-plugin": "1.121.
|
|
70
|
-
"@tanstack/
|
|
71
|
-
"@tanstack/
|
|
69
|
+
"@tanstack/server-functions-plugin": "1.121.28",
|
|
70
|
+
"@tanstack/start-server-core": "1.121.27",
|
|
71
|
+
"@tanstack/router-core": "1.121.27"
|
|
72
72
|
},
|
|
73
73
|
"devDependencies": {
|
|
74
74
|
"vite": "^6.0.0"
|
|
@@ -4,9 +4,10 @@ import { VITE_ENVIRONMENT_NAMES } from '../constants'
|
|
|
4
4
|
import { extractHtmlScripts } from './extract-html-scripts'
|
|
5
5
|
import type { Connect, DevEnvironment, Plugin, ViteDevServer } from 'vite'
|
|
6
6
|
|
|
7
|
+
/* eslint-disable no-var */
|
|
7
8
|
declare global {
|
|
8
|
-
// eslint-disable-next-line no-var
|
|
9
9
|
var TSS_INJECTED_HEAD_SCRIPTS: string | undefined
|
|
10
|
+
var TSS_VITE_DEV_SERVER: ViteDevServer | undefined
|
|
10
11
|
}
|
|
11
12
|
|
|
12
13
|
export function devServerPlugin(): Plugin {
|
|
@@ -24,13 +25,13 @@ export function devServerPlugin(): Plugin {
|
|
|
24
25
|
return
|
|
25
26
|
}
|
|
26
27
|
|
|
27
|
-
|
|
28
|
-
|
|
28
|
+
globalThis.TSS_VITE_DEV_SERVER = viteDevServer
|
|
29
|
+
// upon server restart, reset the injected scripts
|
|
30
|
+
globalThis.TSS_INJECTED_HEAD_SCRIPTS = undefined
|
|
29
31
|
return () => {
|
|
30
32
|
remove_html_middlewares(viteDevServer.middlewares)
|
|
31
|
-
let cachedScripts: string | undefined
|
|
32
33
|
|
|
33
|
-
viteDevServer.middlewares.use(async (req, res) => {
|
|
34
|
+
viteDevServer.middlewares.use(async (req, res, next) => {
|
|
34
35
|
// Create an H3Event to have it passed into the server entry
|
|
35
36
|
// i.e: event => defineEventHandler(event)
|
|
36
37
|
const event = createEvent(req, res)
|
|
@@ -46,14 +47,8 @@ export function devServerPlugin(): Plugin {
|
|
|
46
47
|
)
|
|
47
48
|
}
|
|
48
49
|
|
|
49
|
-
if (!isRunnableDevEnvironment(serverEnv)) {
|
|
50
|
-
throw new Error(
|
|
51
|
-
`Expected server environment ${VITE_ENVIRONMENT_NAMES.server} to be a RunnableDevEnvironment. This can be caused by multiple vite versions being installed in the project.`,
|
|
52
|
-
)
|
|
53
|
-
}
|
|
54
|
-
|
|
55
50
|
// Extract the scripts that Vite plugins would inject into the initial HTML
|
|
56
|
-
if (
|
|
51
|
+
if (globalThis.TSS_INJECTED_HEAD_SCRIPTS === undefined) {
|
|
57
52
|
const templateHtml = `<html><head></head><body></body></html>`
|
|
58
53
|
const transformedHtml = await viteDevServer.transformIndexHtml(
|
|
59
54
|
req.url || '/',
|
|
@@ -65,6 +60,10 @@ export function devServerPlugin(): Plugin {
|
|
|
65
60
|
.join(';')
|
|
66
61
|
}
|
|
67
62
|
|
|
63
|
+
if (!isRunnableDevEnvironment(serverEnv)) {
|
|
64
|
+
return next()
|
|
65
|
+
}
|
|
66
|
+
|
|
68
67
|
// Import and resolve the request by running the server entry point
|
|
69
68
|
// i.e export default defineEventHandler((event) => { ... })
|
|
70
69
|
const serverEntry = await serverEnv.runner.import(
|