zudoku 0.34.0 → 0.34.2
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/app/entry.server.d.ts +4 -3
- package/dist/app/entry.server.js +6 -6
- package/dist/app/entry.server.js.map +1 -1
- package/dist/cli/cmds/dev.d.ts +1 -1
- package/dist/cli/cmds/dev.js +7 -1
- package/dist/cli/cmds/dev.js.map +1 -1
- package/dist/cli/dev/pagefind-command.d.ts +3 -0
- package/dist/cli/dev/pagefind-command.js +59 -0
- package/dist/cli/dev/pagefind-command.js.map +1 -0
- package/dist/config/common.d.ts +0 -1
- package/dist/config/loader.d.ts +2 -2
- package/dist/config/loader.js +14 -25
- package/dist/config/loader.js.map +1 -1
- package/dist/vite/build.js +7 -2
- package/dist/vite/build.js.map +1 -1
- package/dist/vite/config.js +6 -8
- package/dist/vite/config.js.map +1 -1
- package/dist/vite/create-pagefind-index.d.ts +4 -0
- package/dist/vite/create-pagefind-index.js +12 -0
- package/dist/vite/create-pagefind-index.js.map +1 -0
- package/dist/vite/dev-server.js +4 -4
- package/dist/vite/dev-server.js.map +1 -1
- package/dist/vite/plugin-api.js +19 -7
- package/dist/vite/plugin-api.js.map +1 -1
- package/dist/vite/prerender/prerender.js +14 -8
- package/dist/vite/prerender/prerender.js.map +1 -1
- package/dist/vite/prerender/worker.js +6 -7
- package/dist/vite/prerender/worker.js.map +1 -1
- package/package.json +3 -3
- package/src/app/entry.server.tsx +10 -9
- package/dist/vite/pagefind.d.ts +0 -4
- package/dist/vite/pagefind.js +0 -15
- package/dist/vite/pagefind.js.map +0 -1
|
@@ -1,15 +1,16 @@
|
|
|
1
1
|
import type express from "express";
|
|
2
|
+
import { type RouteObject } from "react-router";
|
|
2
3
|
import "virtual:zudoku-theme.css";
|
|
3
4
|
import "vite/modulepreload-polyfill";
|
|
4
|
-
import type { ZudokuConfig } from "../config/config.js";
|
|
5
5
|
import type { FileWritingResponse } from "../vite/prerender/FileWritingResponse.js";
|
|
6
6
|
import "./main.css";
|
|
7
7
|
import { getRoutesByConfig } from "./main.js";
|
|
8
8
|
export { getRoutesByConfig };
|
|
9
|
-
export declare const render: ({ template, request: baseRequest, response,
|
|
9
|
+
export declare const render: ({ template, request: baseRequest, response, routes, basePath, }: {
|
|
10
10
|
template: string;
|
|
11
11
|
request: express.Request | Request;
|
|
12
12
|
response: express.Response | FileWritingResponse;
|
|
13
|
-
|
|
13
|
+
routes: RouteObject[];
|
|
14
|
+
basePath?: string;
|
|
14
15
|
}) => Promise<void>;
|
|
15
16
|
export declare function createFetchRequest(req: express.Request, res: express.Response | FileWritingResponse): Request;
|
package/dist/app/entry.server.js
CHANGED
|
@@ -10,10 +10,9 @@ import { BootstrapStatic, ServerError } from "zudoku/components";
|
|
|
10
10
|
import "./main.css";
|
|
11
11
|
import { getRoutesByConfig } from "./main.js";
|
|
12
12
|
export { getRoutesByConfig };
|
|
13
|
-
export const render = async ({ template, request: baseRequest, response,
|
|
14
|
-
const routes = getRoutesByConfig(config);
|
|
13
|
+
export const render = async ({ template, request: baseRequest, response, routes, basePath, }) => {
|
|
15
14
|
const { query, dataRoutes } = createStaticHandler(routes, {
|
|
16
|
-
basename:
|
|
15
|
+
basename: basePath,
|
|
17
16
|
});
|
|
18
17
|
const queryClient = new QueryClient();
|
|
19
18
|
const request = baseRequest instanceof Request
|
|
@@ -23,7 +22,7 @@ export const render = async ({ template, request: baseRequest, response, config,
|
|
|
23
22
|
let status = 200;
|
|
24
23
|
if (context instanceof Response) {
|
|
25
24
|
if ([301, 302, 303, 307, 308].includes(context.status)) {
|
|
26
|
-
return response.redirect(context.status, context.headers.get("Location"));
|
|
25
|
+
return response.redirect(import.meta.env.PROD ? context.status : 307, context.headers.get("Location"));
|
|
27
26
|
}
|
|
28
27
|
throw context;
|
|
29
28
|
}
|
|
@@ -45,8 +44,6 @@ export const render = async ({ template, request: baseRequest, response, config,
|
|
|
45
44
|
const html = renderToStaticMarkup(_jsx(ServerError, { error: error }));
|
|
46
45
|
response.send(html);
|
|
47
46
|
},
|
|
48
|
-
// for SSG we could use onAllReady instead of onShellReady
|
|
49
|
-
// https://react.dev/reference/react-dom/server/renderToPipeableStream#waiting-for-all-content-to-load-for-crawlers-and-static-generation
|
|
50
47
|
onAllReady() {
|
|
51
48
|
response.set({ "Content-Type": "text/html" });
|
|
52
49
|
response.status(status);
|
|
@@ -74,6 +71,9 @@ export const render = async ({ template, request: baseRequest, response, config,
|
|
|
74
71
|
},
|
|
75
72
|
onError(error) {
|
|
76
73
|
status = 500;
|
|
74
|
+
if (import.meta.env.PROD) {
|
|
75
|
+
throw error;
|
|
76
|
+
}
|
|
77
77
|
logger.error(error);
|
|
78
78
|
},
|
|
79
79
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entry.server.js","sourceRoot":"","sources":["../../src/app/entry.server.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAG/D,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAChF,OAAO,EACL,mBAAmB,EACnB,kBAAkB,EAClB,oBAAoB,
|
|
1
|
+
{"version":3,"file":"entry.server.js","sourceRoot":"","sources":["../../src/app/entry.server.tsx"],"names":[],"mappings":"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"}
|
package/dist/cli/cmds/dev.d.ts
CHANGED
package/dist/cli/cmds/dev.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { captureEvent } from "../common/analytics/lib.js";
|
|
2
2
|
import { dev } from "../dev/handler.js";
|
|
3
|
+
import { pagefindCommand } from "../dev/pagefind-command.js";
|
|
3
4
|
export default {
|
|
4
5
|
desc: "Runs locally",
|
|
5
6
|
command: "dev",
|
|
@@ -25,7 +26,12 @@ export default {
|
|
|
25
26
|
type: "boolean",
|
|
26
27
|
describe: "Automatically open the browser",
|
|
27
28
|
default: false,
|
|
28
|
-
})
|
|
29
|
+
})
|
|
30
|
+
.command("pagefind", "Creates a search index for pagefind based on the current build", (yargs) => yargs.option("force-build", {
|
|
31
|
+
type: "boolean",
|
|
32
|
+
description: "Run build before generating pagefind index",
|
|
33
|
+
default: false,
|
|
34
|
+
}), pagefindCommand);
|
|
29
35
|
},
|
|
30
36
|
handler: async (argv) => {
|
|
31
37
|
await captureEvent({
|
package/dist/cli/cmds/dev.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../../src/cli/cmds/dev.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,
|
|
1
|
+
{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../../src/cli/cmds/dev.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAkB,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAE7D,eAAe;IACb,IAAI,EAAE,cAAc;IACpB,OAAO,EAAE,KAAK;IACd,OAAO,EAAE,CAAC,KAAW,EAAiB,EAAE;QACtC,OAAO,KAAK;aACT,MAAM,CAAC,KAAK,EAAE;YACb,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,uCAAuC;YACjD,OAAO,EAAE,GAAG;YACZ,SAAS,EAAE,IAAI;YACf,MAAM,EAAE,IAAI;SACb,CAAC;aACD,MAAM,CAAC,MAAM,EAAE;YACd,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,qCAAqC;SAChD,CAAC;aACD,MAAM,CAAC,KAAK,EAAE;YACb,IAAI,EAAE,SAAS;YACf,QAAQ,EAAE,8BAA8B;YACxC,OAAO,EAAE,IAAI;SACd,CAAC;aACD,MAAM,CAAC,MAAM,EAAE;YACd,IAAI,EAAE,SAAS;YACf,QAAQ,EAAE,gCAAgC;YAC1C,OAAO,EAAE,KAAK;SACf,CAAC;aACD,OAAO,CACN,UAAU,EACV,gEAAgE,EAChE,CAAC,KAAW,EAAE,EAAE,CACd,KAAK,CAAC,MAAM,CAAC,aAAa,EAAE;YAC1B,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,4CAA4C;YACzD,OAAO,EAAE,KAAK;SACf,CAAC,EACJ,eAAe,CAChB,CAAC;IACN,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,IAAa,EAAE,EAAE;QAC/B,MAAM,YAAY,CAAC;YACjB,IAAI;YACJ,KAAK,EAAE,YAAY;SACpB,CAAC,CAAC;QACH,MAAM,GAAG,CAAC,IAAiB,CAAC,CAAC;IAC/B,CAAC;CACF,CAAC"}
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
import { glob } from "glob";
|
|
2
|
+
import fs from "node:fs/promises";
|
|
3
|
+
import path from "node:path";
|
|
4
|
+
import colors from "picocolors";
|
|
5
|
+
import { runBuild } from "../../vite/build.js";
|
|
6
|
+
import { loadZudokuConfig } from "../../vite/config.js";
|
|
7
|
+
import { createPagefindIndex } from "../../vite/create-pagefind-index.js";
|
|
8
|
+
import { writeLine } from "../../vite/reporter.js";
|
|
9
|
+
import { logger } from "../common/logger.js";
|
|
10
|
+
const captureOutput = async (fn) => {
|
|
11
|
+
const stdout = process.stdout.write;
|
|
12
|
+
const stderr = process.stderr.write;
|
|
13
|
+
process.stdout.write = () => true;
|
|
14
|
+
process.stderr.write = () => true;
|
|
15
|
+
try {
|
|
16
|
+
return await fn();
|
|
17
|
+
}
|
|
18
|
+
finally {
|
|
19
|
+
process.stdout.write = stdout;
|
|
20
|
+
process.stderr.write = stderr;
|
|
21
|
+
}
|
|
22
|
+
};
|
|
23
|
+
export const pagefindCommand = async (argv) => {
|
|
24
|
+
const dir = process.cwd();
|
|
25
|
+
const dist = path.join(dir, "dist");
|
|
26
|
+
const { config } = await loadZudokuConfig({ mode: "production", command: "build" }, dir);
|
|
27
|
+
if (config.search?.type !== "pagefind") {
|
|
28
|
+
logger.warn(colors.yellow("Search is not configured to use pagefind."));
|
|
29
|
+
}
|
|
30
|
+
const message = argv.forceBuild
|
|
31
|
+
? "creating build and pagefind index..."
|
|
32
|
+
: "building pagefind index...";
|
|
33
|
+
writeLine(colors.blue(message));
|
|
34
|
+
if (argv.forceBuild) {
|
|
35
|
+
await captureOutput(() => runBuild({ dir }));
|
|
36
|
+
}
|
|
37
|
+
const outputPath = await createPagefindIndex({
|
|
38
|
+
dir: dist,
|
|
39
|
+
outDir: path.join(process.cwd(), "public"),
|
|
40
|
+
});
|
|
41
|
+
const successMessage = argv.forceBuild
|
|
42
|
+
? `✓ build created and pagefind index written to ${outputPath}`
|
|
43
|
+
: `✓ pagefind index written to ${outputPath}`;
|
|
44
|
+
writeLine(colors.blue(successMessage));
|
|
45
|
+
// find pagefind directory in dist with glob
|
|
46
|
+
const pagefindGlob = await glob("**/pagefind/", {
|
|
47
|
+
cwd: dist,
|
|
48
|
+
absolute: true,
|
|
49
|
+
});
|
|
50
|
+
const pagefindDir = pagefindGlob.at(0);
|
|
51
|
+
if (!pagefindDir) {
|
|
52
|
+
throw new Error(`pagefind directory not found in ${dist}.`);
|
|
53
|
+
}
|
|
54
|
+
// move from dist to public dir so it can be consumed in dev
|
|
55
|
+
const publicDir = path.join(dir, "public/pagefind");
|
|
56
|
+
await fs.rm(publicDir, { recursive: true, force: true });
|
|
57
|
+
await fs.rename(pagefindDir, publicDir);
|
|
58
|
+
};
|
|
59
|
+
//# sourceMappingURL=pagefind-command.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pagefind-command.js","sourceRoot":"","sources":["../../../src/cli/dev/pagefind-command.ts"],"names":[],"mappings":"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"}
|
package/dist/config/common.d.ts
CHANGED
package/dist/config/loader.d.ts
CHANGED
|
@@ -8,12 +8,12 @@ export declare function findConfigFilePath(rootDir: string): Promise<{
|
|
|
8
8
|
configPath: undefined;
|
|
9
9
|
configType: undefined;
|
|
10
10
|
}>;
|
|
11
|
-
|
|
11
|
+
declare function loadZudokuCodeConfig<TConfig>(configPath: string): Promise<{
|
|
12
12
|
dependencies: string[];
|
|
13
13
|
config: TConfig;
|
|
14
14
|
}>;
|
|
15
15
|
export type ConfigLoaderOverrides = {
|
|
16
|
-
loadZudokuCodeConfig?:
|
|
16
|
+
loadZudokuCodeConfig?: typeof loadZudokuCodeConfig;
|
|
17
17
|
};
|
|
18
18
|
export declare function tryLoadZudokuConfig<TConfig extends CommonConfig>(rootDir: string, moduleDir: string, envVars: Record<string, string | undefined>, overrides?: ConfigLoaderOverrides): Promise<ConfigWithMeta<TConfig>>;
|
|
19
19
|
export declare function findOutputPathOfServerConfig(output: RollupOutput | RollupOutput[] | RollupWatcher): string;
|
package/dist/config/loader.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { readFile, stat } from "node:fs/promises";
|
|
2
2
|
import path from "node:path";
|
|
3
|
-
import {
|
|
4
|
-
import { tsImport } from "tsx/esm/api";
|
|
3
|
+
import { runnerImport } from "vite";
|
|
5
4
|
import withZuplo from "../zuplo/with-zuplo.js";
|
|
6
5
|
import { validateCommonConfig, } from "./validators/common.js";
|
|
7
6
|
import { validateConfig } from "./validators/validate.js";
|
|
@@ -48,22 +47,18 @@ async function getConfigFilePath(rootDir) {
|
|
|
48
47
|
}
|
|
49
48
|
throw new Error(`No zudoku config file found in project root.`);
|
|
50
49
|
}
|
|
51
|
-
async function loadZudokuCodeConfig(
|
|
52
|
-
const
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
const path = fileURLToPath(file.startsWith("file://") ? file : pathToFileURL(file).href);
|
|
58
|
-
if (path.startsWith(rootDir)) {
|
|
59
|
-
dependencies.push(path);
|
|
60
|
-
}
|
|
50
|
+
async function loadZudokuCodeConfig(configPath) {
|
|
51
|
+
const { module, dependencies } = await runnerImport(configPath, {
|
|
52
|
+
server: {
|
|
53
|
+
// this allows us to 'load' CSS files in the config
|
|
54
|
+
// see https://github.com/vitejs/vite/pull/19577
|
|
55
|
+
perEnvironmentStartEndDuringDev: true,
|
|
61
56
|
},
|
|
62
|
-
})
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
57
|
+
});
|
|
58
|
+
return {
|
|
59
|
+
dependencies: [configPath, ...dependencies],
|
|
60
|
+
config: module.default,
|
|
61
|
+
};
|
|
67
62
|
}
|
|
68
63
|
async function loadDevPortalConfig(configPath, envVars) {
|
|
69
64
|
const json = await readFile(configPath, "utf-8");
|
|
@@ -111,8 +106,6 @@ obj, envVars) {
|
|
|
111
106
|
}
|
|
112
107
|
return obj;
|
|
113
108
|
}
|
|
114
|
-
// WARNING: If you change function signature, you must also change the
|
|
115
|
-
// corresponding type in packages/config/src/index.d.ts
|
|
116
109
|
export async function tryLoadZudokuConfig(rootDir, moduleDir, envVars, overrides) {
|
|
117
110
|
const { configPath, configType } = await getConfigFilePath(rootDir);
|
|
118
111
|
let config;
|
|
@@ -122,8 +115,8 @@ export async function tryLoadZudokuConfig(rootDir, moduleDir, envVars, overrides
|
|
|
122
115
|
dependencies = [];
|
|
123
116
|
}
|
|
124
117
|
else {
|
|
125
|
-
const
|
|
126
|
-
({ config, dependencies } = await
|
|
118
|
+
const loadConfig = overrides?.loadZudokuCodeConfig ?? loadZudokuCodeConfig;
|
|
119
|
+
({ config, dependencies } = await loadConfig(configPath));
|
|
127
120
|
// This is here instead of in the load function so that
|
|
128
121
|
// it works even if we are overriding the load function
|
|
129
122
|
validateConfig(config);
|
|
@@ -136,10 +129,6 @@ export async function tryLoadZudokuConfig(rootDir, moduleDir, envVars, overrides
|
|
|
136
129
|
mode: process.env.ZUDOKU_ENV,
|
|
137
130
|
dependencies,
|
|
138
131
|
configPath,
|
|
139
|
-
registerDependency: (...files) => {
|
|
140
|
-
const newFiles = files.filter((f) => !dependencies.includes(f));
|
|
141
|
-
dependencies.push(...newFiles);
|
|
142
|
-
},
|
|
143
132
|
},
|
|
144
133
|
};
|
|
145
134
|
return configWithMetadata;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../src/config/loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../src/config/loader.ts"],"names":[],"mappings":"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"}
|
package/dist/vite/build.js
CHANGED
|
@@ -1,13 +1,15 @@
|
|
|
1
1
|
import { mkdir, rename, rm, writeFile } from "node:fs/promises";
|
|
2
2
|
import path from "node:path";
|
|
3
|
+
import colors from "picocolors";
|
|
3
4
|
import { build as viteBuild } from "vite";
|
|
5
|
+
import { logger } from "../cli/common/logger.js";
|
|
4
6
|
import { findOutputPathOfServerConfig } from "../config/loader.js";
|
|
5
7
|
import invariant from "../lib/util/invariant.js";
|
|
6
8
|
import { joinUrl } from "../lib/util/joinUrl.js";
|
|
7
9
|
import { getViteConfig, loadZudokuConfig } from "./config.js";
|
|
10
|
+
import { createPagefindIndex } from "./create-pagefind-index.js";
|
|
8
11
|
import { getBuildHtml } from "./html.js";
|
|
9
12
|
import { writeOutput } from "./output.js";
|
|
10
|
-
import { runPagefind } from "./pagefind.js";
|
|
11
13
|
import { prerender } from "./prerender/prerender.js";
|
|
12
14
|
const DIST_DIR = "dist";
|
|
13
15
|
export async function runBuild(options) {
|
|
@@ -60,7 +62,10 @@ export async function runBuild(options) {
|
|
|
60
62
|
}
|
|
61
63
|
await rm(viteServerConfig.build.outDir, { recursive: true, force: true });
|
|
62
64
|
if (config.search?.type === "pagefind") {
|
|
63
|
-
await
|
|
65
|
+
const outputPath = await createPagefindIndex({
|
|
66
|
+
dir: viteClientConfig.build.outDir,
|
|
67
|
+
});
|
|
68
|
+
logger.info(colors.blue(`✓ pagefind index built: ${outputPath}`));
|
|
64
69
|
}
|
|
65
70
|
if (process.env.VERCEL) {
|
|
66
71
|
await mkdir(path.join(options.dir, ".vercel/output/static"), {
|
package/dist/vite/build.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/vite/build.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,KAAK,IAAI,SAAS,EAAE,MAAM,MAAM,CAAC;AAC1C,OAAO,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,SAAS,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/vite/build.ts"],"names":[],"mappings":"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"}
|
package/dist/vite/config.js
CHANGED
|
@@ -10,7 +10,6 @@ import { logger } from "../cli/common/logger.js";
|
|
|
10
10
|
import { tryLoadZudokuConfig } from "../config/loader.js";
|
|
11
11
|
import { CdnUrlSchema } from "../config/validators/common.js";
|
|
12
12
|
import { joinUrl } from "../lib/util/joinUrl.js";
|
|
13
|
-
import { ZuploEnv } from "../zuplo/env.js";
|
|
14
13
|
import vitePlugin from "./plugin.js";
|
|
15
14
|
const getDocsConfigFiles = (docsConfig, baseDir) => {
|
|
16
15
|
if (!docsConfig)
|
|
@@ -19,10 +18,7 @@ const getDocsConfigFiles = (docsConfig, baseDir) => {
|
|
|
19
18
|
return docsArray.map((doc) => path.posix.join(baseDir, doc.files));
|
|
20
19
|
};
|
|
21
20
|
function loadEnv(configEnv, rootDir) {
|
|
22
|
-
const envPrefix = [
|
|
23
|
-
...(ZuploEnv.isZuplo ? ["ZUPLO_PUBLIC_"] : []),
|
|
24
|
-
"ZUDOKU_PUBLIC_",
|
|
25
|
-
];
|
|
21
|
+
const envPrefix = ["ZUPLO_PUBLIC_", "ZUDOKU_PUBLIC_"];
|
|
26
22
|
const localEnv = viteLoadEnv(configEnv.mode, rootDir, envPrefix);
|
|
27
23
|
process.env = { ...localEnv, ...process.env };
|
|
28
24
|
const publicEnv = Object.entries(process.env).reduce((val, [key]) => {
|
|
@@ -43,7 +39,6 @@ export const getStandaloneConfig = (rootDir) => ({
|
|
|
43
39
|
mode: "standalone",
|
|
44
40
|
dependencies: [],
|
|
45
41
|
configPath: "",
|
|
46
|
-
registerDependency: () => { },
|
|
47
42
|
},
|
|
48
43
|
});
|
|
49
44
|
export async function loadZudokuConfig(configEnv, rootDir, forceReload) {
|
|
@@ -224,9 +219,12 @@ export async function getViteConfig(dir, configEnv, onConfigChange) {
|
|
|
224
219
|
},
|
|
225
220
|
};
|
|
226
221
|
// If the user has supplied a vite.config file, merge it with ours
|
|
227
|
-
const userConfig = await loadConfigFromFile(configEnv, undefined, dir);
|
|
222
|
+
const userConfig = await loadConfigFromFile(configEnv, undefined, dir, undefined, undefined, "runner");
|
|
228
223
|
if (userConfig) {
|
|
229
|
-
const merged = mergeConfig(userConfig.config,
|
|
224
|
+
const merged = mergeConfig(viteConfig, userConfig.config, true);
|
|
225
|
+
logger.info(colors.blue(`merged with custom user Vite config`), {
|
|
226
|
+
timestamp: true,
|
|
227
|
+
});
|
|
230
228
|
return merged;
|
|
231
229
|
}
|
|
232
230
|
return viteConfig;
|
package/dist/vite/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/vite/config.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,cAAc,CAAC;AACxC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,MAAM,MAAM,YAAY,CAAC;AAChC,OAAO,WAAW,MAAM,aAAa,CAAC;AACtC,OAAO,EAIL,kBAAkB,EAClB,WAAW,EACX,OAAO,IAAI,WAAW,GACvB,MAAM,MAAM,CAAC;AACd,OAAO,WAAW,MAAM,oBAAoB,CAAC,OAAO,IAAI,EAAE,MAAM,EAAE,CAAC;AACnE,OAAO,cAAc,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAEjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/vite/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import path from "node:path";
|
|
2
|
+
import invariant from "../lib/util/invariant.js";
|
|
3
|
+
export const createPagefindIndex = async (options) => {
|
|
4
|
+
const pagefind = await import("pagefind");
|
|
5
|
+
const { index, errors } = await pagefind.createIndex();
|
|
6
|
+
invariant(index, `Failed to create pagefind index: ${errors.join(", ")}`);
|
|
7
|
+
const outputPath = path.join(options.outDir ?? options.dir, "pagefind");
|
|
8
|
+
await index.addDirectory({ path: options.dir });
|
|
9
|
+
await index.writeFiles({ outputPath });
|
|
10
|
+
return outputPath;
|
|
11
|
+
};
|
|
12
|
+
//# sourceMappingURL=create-pagefind-index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"create-pagefind-index.js","sourceRoot":"","sources":["../../src/vite/create-pagefind-index.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,SAAS,MAAM,0BAA0B,CAAC;AAEjD,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EAAE,OAGzC,EAAE,EAAE;IACH,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC;IAC1C,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,QAAQ,CAAC,WAAW,EAAE,CAAC;IAEvD,SAAS,CAAC,KAAK,EAAE,oCAAoC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAE1E,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;IAExE,MAAM,KAAK,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAChD,MAAM,KAAK,CAAC,UAAU,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;IAEvC,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC"}
|
package/dist/vite/dev-server.js
CHANGED
|
@@ -101,13 +101,13 @@ export class DevServer {
|
|
|
101
101
|
if (!this.currentConfig) {
|
|
102
102
|
throw new Error("Error loading configuration.");
|
|
103
103
|
}
|
|
104
|
-
const
|
|
105
|
-
|
|
106
|
-
void render({
|
|
104
|
+
const server = await ssrEnvironment.runner.import(getAppServerEntryPath());
|
|
105
|
+
void server.render({
|
|
107
106
|
template,
|
|
108
107
|
request,
|
|
109
108
|
response,
|
|
110
|
-
|
|
109
|
+
routes: server.getRoutesByConfig(this.currentConfig),
|
|
110
|
+
basePath: this.currentConfig.basePath,
|
|
111
111
|
});
|
|
112
112
|
}
|
|
113
113
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-server.js","sourceRoot":"","sources":["../../src/vite/dev-server.ts"],"names":[],"mappings":"AAAA,OAAO,OAAyB,MAAM,SAAS,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAuB,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAqB,MAAM,WAAW,CAAC;AAC9C,OAAO,KAAK,MAAM,YAAY,CAAC;AAC/B,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EACL,YAAY,IAAI,gBAAgB,EAChC,wBAAwB,GAEzB,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"dev-server.js","sourceRoot":"","sources":["../../src/vite/dev-server.ts"],"names":[],"mappings":"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"}
|
package/dist/vite/plugin-api.js
CHANGED
|
@@ -5,6 +5,7 @@ import path from "node:path";
|
|
|
5
5
|
import { tsImport } from "tsx/esm/api";
|
|
6
6
|
import { getAllOperations, getAllTags, } from "../lib/oas/graphql/index.js";
|
|
7
7
|
import { generateCode } from "./api/schema-codegen.js";
|
|
8
|
+
import { reload } from "./plugin-config-reload.js";
|
|
8
9
|
const API_COUNT_THRESHOLD = 50;
|
|
9
10
|
const schemaMap = new Map();
|
|
10
11
|
const validateSchema = async (schema, filePath) => {
|
|
@@ -19,12 +20,11 @@ const validateSchema = async (schema, filePath) => {
|
|
|
19
20
|
}
|
|
20
21
|
return schema;
|
|
21
22
|
};
|
|
22
|
-
|
|
23
|
+
// We track all schema files to invalidate when changed (this includes external references as well)
|
|
24
|
+
const allSchemaFiles = new Set();
|
|
25
|
+
async function processSchemas(dir, config,
|
|
23
26
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
24
27
|
zuploProcessors = []) {
|
|
25
|
-
const tmpDir = path.posix.join(config.__meta.rootDir, "node_modules/.zudoku/processed");
|
|
26
|
-
await fs.rm(tmpDir, { recursive: true, force: true });
|
|
27
|
-
await fs.mkdir(tmpDir, { recursive: true });
|
|
28
28
|
if (!config.apis)
|
|
29
29
|
return {};
|
|
30
30
|
const apis = Array.isArray(config.apis) ? config.apis : [config.apis];
|
|
@@ -42,18 +42,19 @@ zuploProcessors = []) {
|
|
|
42
42
|
const inputs = Array.isArray(apiConfig.input)
|
|
43
43
|
? apiConfig.input
|
|
44
44
|
: [apiConfig.input];
|
|
45
|
+
allSchemaFiles.clear();
|
|
45
46
|
const inputFiles = await Promise.all(inputs.map(async (input) => {
|
|
46
47
|
const fullPath = path.resolve(config.__meta.rootDir, input);
|
|
47
48
|
const parser = new $RefParser();
|
|
48
49
|
const schema = await parser.bundle(fullPath);
|
|
49
|
-
|
|
50
|
+
parser.$refs.paths().forEach((file) => allSchemaFiles.add(file));
|
|
50
51
|
return validateSchema(schema, input);
|
|
51
52
|
}));
|
|
52
53
|
const processedInputs = await Promise.all(inputFiles.map(async (schema, index) => {
|
|
53
54
|
const processedSchema = await postProcessors.reduce(async (acc, postProcessor) => postProcessor(await acc), Promise.resolve(schema));
|
|
54
55
|
const inputPath = inputs[index];
|
|
55
56
|
const code = await generateCode(processedSchema);
|
|
56
|
-
const processedFilePath = path.posix.join(
|
|
57
|
+
const processedFilePath = path.posix.join(dir, `${path.basename(inputPath)}.js`);
|
|
57
58
|
await fs.writeFile(processedFilePath, code);
|
|
58
59
|
schemaMap.set(inputPath, processedFilePath);
|
|
59
60
|
return {
|
|
@@ -84,10 +85,21 @@ const viteApiPlugin = async (getConfig) => {
|
|
|
84
85
|
})
|
|
85
86
|
: [];
|
|
86
87
|
let processedSchemas;
|
|
88
|
+
const tmpDir = path.posix.join(initialConfig.__meta.rootDir, "node_modules/.zudoku/processed");
|
|
87
89
|
return {
|
|
88
90
|
name: "zudoku-api-plugins",
|
|
89
91
|
async buildStart() {
|
|
90
|
-
|
|
92
|
+
await fs.rm(tmpDir, { recursive: true, force: true });
|
|
93
|
+
await fs.mkdir(tmpDir, { recursive: true });
|
|
94
|
+
processedSchemas = await processSchemas(tmpDir, getConfig(), zuploProcessors);
|
|
95
|
+
},
|
|
96
|
+
configureServer(server) {
|
|
97
|
+
server.watcher.on("change", async (id) => {
|
|
98
|
+
if (!allSchemaFiles.has(id))
|
|
99
|
+
return;
|
|
100
|
+
processedSchemas = await processSchemas(tmpDir, getConfig(), zuploProcessors);
|
|
101
|
+
reload(server);
|
|
102
|
+
});
|
|
91
103
|
},
|
|
92
104
|
resolveId(id) {
|
|
93
105
|
if (id === virtualModuleId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-api.js","sourceRoot":"","sources":["../../src/vite/plugin-api.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,GAEX,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAGvC,OAAO,EACL,gBAAgB,EAChB,UAAU,GAEX,MAAM,6BAA6B,CAAC;AAKrC,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"plugin-api.js","sourceRoot":"","sources":["../../src/vite/plugin-api.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,GAEX,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAGvC,OAAO,EACL,gBAAgB,EAChB,UAAU,GAEX,MAAM,6BAA6B,CAAC;AAKrC,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AASnD,MAAM,mBAAmB,GAAG,EAAE,CAAC;AAE/B,MAAM,SAAS,GAAG,IAAI,GAAG,EAAkB,CAAC;AAE5C,MAAM,cAAc,GAAG,KAAK,EAAE,MAAkB,EAAE,QAAgB,EAAE,EAAE;IACpE,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,CAAC;IACzC,IAAI,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;QAC7B,sCAAsC;QACtC,OAAO,CAAC,IAAI,CAAC,sBAAsB,QAAQ,GAAG,CAAC,CAAC;QAChD,KAAK,MAAM,KAAK,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;YACrC,sCAAsC;YACtC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC;IACH,CAAC;IAED,OAAO,MAAyB,CAAC;AACnC,CAAC,CAAC;AAEF,mGAAmG;AACnG,MAAM,cAAc,GAAG,IAAI,GAAG,EAAU,CAAC;AAEzC,KAAK,UAAU,cAAc,CAC3B,GAAW,EACX,MAAoB;AACpB,8DAA8D;AAC9D,kBAAwD,EAAE;IAE1D,IAAI,CAAC,MAAM,CAAC,IAAI;QAAE,OAAO,EAAE,CAAC;IAE5B,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACtE,MAAM,gBAAgB,GAAsC,EAAE,CAAC;IAE/D,KAAK,MAAM,SAAS,IAAI,IAAI,EAAE,CAAC;QAC7B,IAAI,SAAS,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC;YACzD,SAAS;QACX,CAAC;QAED,MAAM,cAAc,GAAG;YACrB,8DAA8D;YAC9D,CAAC,MAAW,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,aAAa;YAC9C,GAAG,CAAC,SAAS,CAAC,cAAc,IAAI,EAAE,CAAC;YACnC,GAAG,eAAe;SACnB,CAAC;QAEF,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC;YAC3C,CAAC,CAAC,SAAS,CAAC,KAAK;YACjB,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAEtB,cAAc,CAAC,KAAK,EAAE,CAAC;QAEvB,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,GAAG,CAClC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;YACzB,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC5D,MAAM,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;YAChC,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAE7C,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;YAEjE,OAAO,cAAc,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACvC,CAAC,CAAC,CACH,CAAC;QAEF,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,GAAG,CACvC,UAAU,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE;YACrC,MAAM,eAAe,GAAG,MAAM,cAAc,CAAC,MAAM,CACjD,KAAK,EAAE,GAAG,EAAE,aAAa,EAAE,EAAE,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,EACtD,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CACxB,CAAC;YAEF,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAE,CAAC;YACjC,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,eAAe,CAAC,CAAC;YAEjD,MAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CACvC,GAAG,EACH,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK,CACjC,CAAC;YACF,MAAM,EAAE,CAAC,SAAS,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;YAC5C,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;YAE5C,OAAO;gBACL,MAAM,EAAE,eAAe;gBACvB,OAAO,EAAE,eAAe,CAAC,IAAI,CAAC,OAAO,IAAI,SAAS;gBAClD,SAAS;aACgB,CAAC;QAC9B,CAAC,CAAC,CACH,CAAC;QAEF,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACjC,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACrC,CAAC;QAED,gBAAgB,CAAC,SAAS,CAAC,YAAY,CAAC,GAAG,eAAe,CAAC;IAC7D,CAAC;IAED,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED,MAAM,aAAa,GAAG,KAAK,EACzB,SAA6B,EACZ,EAAE;IACnB,MAAM,eAAe,GAAG,4BAA4B,CAAC;IACrD,MAAM,uBAAuB,GAAG,IAAI,GAAG,eAAe,CAAC;IAEvD,MAAM,aAAa,GAAG,SAAS,EAAE,CAAC;IAElC,yDAAyD;IACzD,MAAM,eAAe,GAAG,aAAa,CAAC,OAAO;QAC3C,CAAC,CAAC,MAAM,QAAQ,CAAC,mCAAmC,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;aACjE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;aACpD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACX,sCAAsC;YACtC,OAAO,CAAC,IAAI,CAAC,iCAAiC,EAAE,CAAC,CAAC,CAAC;YACnD,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC;QACN,CAAC,CAAC,EAAE,CAAC;IAEP,IAAI,gBAAmD,CAAC;IACxD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAC5B,aAAa,CAAC,MAAM,CAAC,OAAO,EAC5B,gCAAgC,CACjC,CAAC;IAEF,OAAO;QACL,IAAI,EAAE,oBAAoB;QAC1B,KAAK,CAAC,UAAU;YACd,MAAM,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YACtD,MAAM,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAE5C,gBAAgB,GAAG,MAAM,cAAc,CACrC,MAAM,EACN,SAAS,EAAE,EACX,eAAe,CAChB,CAAC;QACJ,CAAC;QACD,eAAe,CAAC,MAAM;YACpB,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE;gBACvC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC;oBAAE,OAAO;gBAEpC,gBAAgB,GAAG,MAAM,cAAc,CACrC,MAAM,EACN,SAAS,EAAE,EACX,eAAe,CAChB,CAAC;gBACF,MAAM,CAAC,MAAM,CAAC,CAAC;YACjB,CAAC,CAAC,CAAC;QACL,CAAC;QACD,SAAS,CAAC,EAAE;YACV,IAAI,EAAE,KAAK,eAAe,EAAE,CAAC;gBAC3B,OAAO,uBAAuB,CAAC;YACjC,CAAC;QACH,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,EAAE;YACX,IAAI,EAAE,KAAK,uBAAuB;gBAAE,OAAO;YAE3C,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;YAE3B,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;gBACxC,OAAO;oBACL,yCAAyC;oBACzC,gDAAgD;iBACjD,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACf,CAAC;YAED,MAAM,gBAAgB,GAAG;gBACvB,OAAO,EAAE;oBACP,uBAAuB,EAAE,MAAM,CAAC,QAAQ,EAAE,gBAAgB;iBAC3D;aACF,CAAC;YAEF,MAAM,IAAI,GAAG;gBACX,6CAA6C;gBAC7C,kCAAkC;gBAClC,yCAAyC;gBACzC,4BAA4B,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,GAAG;aAChE,CAAC;YAEF,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;gBAChB,IAAI,CAAC,IAAI,CAAC,yDAAyD,CAAC,CAAC;gBAErE,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBACtE,MAAM,WAAW,GAAqB,EAAE,CAAC;gBACzC,MAAM,WAAW,GAA2C,EAAE,CAAC;gBAE/D,KAAK,MAAM,SAAS,IAAI,IAAI,EAAE,CAAC;oBAC7B,IAAI,SAAS,CAAC,IAAI,KAAK,MAAM,IAAI,SAAS,CAAC,YAAY,EAAE,CAAC;wBACxD,MAAM,OAAO,GAAG,gBAAgB,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;wBACzD,IAAI,CAAC,OAAO,EAAE,MAAM;4BAAE,SAAS;wBAC/B,MAAM,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC;wBACxC,IAAI,CAAC,YAAY,EAAE,IAAI;4BAAE,SAAS;wBAElC,WAAW,CAAC,IAAI,CAAC;4BACf,IAAI,EAAE,SAAS,CAAC,YAAY;4BAC5B,KAAK,EAAE,YAAY,CAAC,IAAI,CAAC,KAAK;4BAC9B,WAAW,EAAE,YAAY,CAAC,IAAI,CAAC,WAAW,IAAI,EAAE;4BAChD,UAAU,EAAE,SAAS,CAAC,UAAU,IAAI,EAAE;yBACvC,CAAC,CAAC;wBAEH,MAAM,UAAU,GAAG,MAAM,CAAC,WAAW,CACnC,OAAO,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC;4BACzB,SAAS,CAAC,OAAO;4BACjB,SAAS,CAAC,SAAS;yBACpB,CAAC,CACH,CAAC;wBAEF,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;4BACvC,WAAW,CAAC,SAAS,CAAC,YAAY,CAAC,GAAG,UAAU,CAAC;wBACnD,CAAC;oBACH,CAAC;gBACH,CAAC;gBAED,2BAA2B;gBAC3B,KAAK,MAAM,SAAS,IAAI,IAAI,EAAE,CAAC;oBAC7B,IAAI,SAAS,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;wBAC9B,IACE,CAAC,SAAS,CAAC,YAAY;4BACvB,CAAC,WAAW,CAAC,SAAS,CAAC,YAAY,CAAC,EACpC,CAAC;4BACD,SAAS;wBACX,CAAC;wBAED,MAAM,OAAO,GAAG,gBAAgB,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;wBACzD,IAAI,CAAC,OAAO,EAAE,MAAM;4BAAE,SAAS;wBAE/B,MAAM,IAAI,GAAG;4BACX,GAAG,IAAI,GAAG,CACR,OAAO;iCACJ,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;iCAC9C,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAC3B;yBACF,CAAC;wBAEF,MAAM,iBAAiB,GAAG,IAAI,CAAC,GAAG,CAChC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC;4BAC7B,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM;yBAC7C,CAAC,CACH,CAAC;wBAEF,0EAA0E;wBAC1E,MAAM,QAAQ,GACZ,SAAS,CAAC,QAAQ,IAAI,iBAAiB,GAAG,mBAAmB,CAAC;wBAEhE,IAAI,CAAC,IAAI,CACP,2CAA2C,EAC3C,wBAAwB,EACxB,iBAAiB,EACjB,YAAY,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,GAAG,EAClE,mBAAmB,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,YAAY,CAAC,GAAG,EAC5D,eAAe,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,EACtC,eAAe,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,EAC1C,oBAAoB,EACpB,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CACpC,CAAC,CAAC,GAAG,EAAE,UAAU,CAAC,EAAE,EAAE,CACpB,QAAQ,GAAG,oBAAoB,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,CACrE,EACD,MAAM,EACN,MAAM,CACP,CAAC;oBACJ,CAAC;yBAAM,CAAC;wBACN,IAAI,CAAC,IAAI,CACP,2CAA2C,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,SAAS,EAAE,GAAG,gBAAgB,EAAE,CAAC,KAAK,CACtG,CAAC;oBACJ,CAAC;gBACH,CAAC;gBAED,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;oBACpB,IAAI,CAAC,IAAI,CACP,gEAAgE,CACjE,CAAC;oBAEF,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC;wBAC7C,CAAC,CAAC,MAAM,CAAC,QAAQ;wBACjB,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;oBAEtB,MAAM,UAAU,GAAG,IAAI;yBACpB,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC;yBACtC,MAAM,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE;wBACvB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;4BAC5B,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,EAAE,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;wBACtD,CAAC;wBACD,KAAK,MAAM,GAAG,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;4BAC/B,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;wBACzC,CAAC;wBACD,OAAO,GAAG,CAAC;oBACb,CAAC,EAAE,IAAI,GAAG,EAAuB,CAAC,CAAC;oBAErC,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CACvD,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;wBAClB,KAAK;wBACL,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;qBACvB,CAAC,CACH,CAAC;oBAEF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;wBACzC,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;wBAC5B,IAAI,CAAC,OAAO,EAAE,CAAC;4BACb,SAAS;wBACX,CAAC;wBACD,MAAM,gBAAgB,GAA4B;4BAChD,GAAG,OAAO;4BACV,KAAK,EAAE,WAAW;4BAClB,KAAK,EAAE,OAAO,CAAC,KAAK;4BACpB,UAAU,EAAE,YAAY;4BACxB,kBAAkB,EAAE,OAAO,CAAC,WAAW;yBACxC,CAAC;wBAEF,IAAI,CAAC,IAAI,CACP,qDAAqD,EACrD,QAAQ,IAAI,CAAC,SAAS,CAAC,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,EACpD,sDAAsD,EACtD,yBAAyB,CAAC,eAAe,EACzC,oCAAoC,EACpC,MAAM,CACP,CAAC;oBACJ,CAAC;gBACH,CAAC;YACH,CAAC;YAED,IAAI,CAAC,IAAI,CACP,+DAA+D,CAChE,CAAC;YAEF,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzB,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,aAAa,CAAC"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
|
+
import os from "node:os";
|
|
1
2
|
import path from "node:path";
|
|
2
3
|
import { pathToFileURL } from "node:url";
|
|
3
4
|
import colors from "picocolors";
|
|
4
5
|
import PiscinaImport from "piscina";
|
|
6
|
+
import { logger } from "../../cli/common/logger.js";
|
|
5
7
|
import { isTTY, throttle, writeLine } from "../reporter.js";
|
|
6
8
|
import { generateSitemap } from "../sitemap.js";
|
|
7
9
|
const Piscina = PiscinaImport;
|
|
@@ -38,14 +40,14 @@ export const prerender = async ({ html, dir, basePath = "", serverConfigFilename
|
|
|
38
40
|
writeLine(`prerendering (${count}/${total}) ${colors.dim(urlPath)}`);
|
|
39
41
|
});
|
|
40
42
|
if (!isTTY()) {
|
|
41
|
-
|
|
42
|
-
console.log(`prerendering ${paths.length} routes...`);
|
|
43
|
+
logger.info(colors.dim(`prerendering ${paths.length} routes...`));
|
|
43
44
|
}
|
|
44
45
|
let completedCount = 0;
|
|
45
46
|
const serverOutDir = path.join(distDir, "server");
|
|
46
47
|
const pool = new Piscina({
|
|
47
48
|
filename: new URL("./worker.js", import.meta.url).href,
|
|
48
|
-
idleTimeout:
|
|
49
|
+
idleTimeout: 5_000,
|
|
50
|
+
maxThreads: Math.floor(os.cpus().length * 0.8),
|
|
49
51
|
workerData: {
|
|
50
52
|
template: html,
|
|
51
53
|
distDir,
|
|
@@ -62,17 +64,21 @@ export const prerender = async ({ html, dir, basePath = "", serverConfigFilename
|
|
|
62
64
|
}
|
|
63
65
|
else {
|
|
64
66
|
const now = performance.now();
|
|
65
|
-
if (now - lastLogTime >= LOG_INTERVAL_MS
|
|
66
|
-
completedCount
|
|
67
|
-
// eslint-disable-next-line no-console
|
|
68
|
-
console.log(`prerendered ${completedCount}/${paths.length} routes`);
|
|
67
|
+
if (now - lastLogTime >= LOG_INTERVAL_MS) {
|
|
68
|
+
logger.info(colors.blue(`prerendered ${completedCount}/${paths.length} routes`));
|
|
69
69
|
lastLogTime = now;
|
|
70
70
|
}
|
|
71
71
|
}
|
|
72
72
|
return result;
|
|
73
73
|
}));
|
|
74
74
|
const seconds = ((performance.now() - start) / 1000).toFixed(1);
|
|
75
|
-
|
|
75
|
+
const message = `✓ finished prerendering ${paths.length} routes in ${seconds} seconds`;
|
|
76
|
+
if (isTTY()) {
|
|
77
|
+
writeLine(colors.blue(message + "\n"));
|
|
78
|
+
}
|
|
79
|
+
else {
|
|
80
|
+
logger.info(colors.blue(message));
|
|
81
|
+
}
|
|
76
82
|
await generateSitemap({
|
|
77
83
|
basePath: config.basePath,
|
|
78
84
|
outputUrls: paths,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prerender.js","sourceRoot":"","sources":["../../../src/vite/prerender/prerender.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,MAAM,MAAM,YAAY,CAAC;AAChC,OAAO,aAAa,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"prerender.js","sourceRoot":"","sources":["../../../src/vite/prerender/prerender.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,15 @@
|
|
|
1
1
|
import path from "node:path";
|
|
2
|
-
import { pathToFileURL } from "node:url";
|
|
3
2
|
import Piscina from "piscina";
|
|
4
3
|
import { joinUrl } from "../../lib/util/joinUrl.js";
|
|
5
4
|
import { FileWritingResponse } from "./FileWritingResponse.js";
|
|
6
5
|
const { template, distDir, serverConfigPath, entryServerPath, writeRedirects } = Piscina.workerData;
|
|
7
|
-
const
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
6
|
+
const server = await import(entryServerPath);
|
|
7
|
+
const config = await import(serverConfigPath).then((m) => m.default);
|
|
8
|
+
const routes = server.getRoutesByConfig(config);
|
|
9
|
+
const { basePath } = config;
|
|
11
10
|
const renderPage = async ({ urlPath }) => {
|
|
12
11
|
const filename = urlPath === "/" ? "/index.html" : `${urlPath}.html`;
|
|
13
|
-
const pathname = joinUrl(
|
|
12
|
+
const pathname = joinUrl(basePath, urlPath);
|
|
14
13
|
const url = joinUrl("http://localhost", pathname);
|
|
15
14
|
const outputPath = path.join(distDir, filename);
|
|
16
15
|
const request = new Request(url);
|
|
@@ -18,7 +17,7 @@ const renderPage = async ({ urlPath }) => {
|
|
|
18
17
|
fileName: outputPath,
|
|
19
18
|
writeRedirects,
|
|
20
19
|
});
|
|
21
|
-
await render({ template, request, response,
|
|
20
|
+
await server.render({ template, request, response, routes, basePath });
|
|
22
21
|
await response.isSent();
|
|
23
22
|
if (response.statusCode >= 500) {
|
|
24
23
|
throw new Error(`SSR failed with status ${response.statusCode} for path: ${urlPath}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../../src/vite/prerender/worker.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,
|
|
1
|
+
{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../../src/vite/prerender/worker.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAgB/D,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,cAAc,EAAE,GAC5E,OAAO,CAAC,UAA8B,CAAC;AAEzC,MAAM,MAAM,GAAgB,MAAM,MAAM,CAAC,eAAe,CAAC,CAAC;AAC1D,MAAM,MAAM,GAAiB,MAAM,MAAM,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAC9D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CACjB,CAAC;AAEF,MAAM,MAAM,GAAG,MAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;AAChD,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;AAE5B,MAAM,UAAU,GAAG,KAAK,EAAE,EAAE,OAAO,EAAc,EAAyB,EAAE;IAC1E,MAAM,QAAQ,GAAG,OAAO,KAAK,GAAG,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,GAAG,OAAO,OAAO,CAAC;IACrE,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC5C,MAAM,GAAG,GAAG,OAAO,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC;IAClD,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAEhD,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC;IACjC,MAAM,QAAQ,GAAG,IAAI,mBAAmB,CAAC;QACvC,QAAQ,EAAE,UAAU;QACpB,cAAc;KACf,CAAC,CAAC;IAEH,MAAM,MAAM,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;IACvE,MAAM,QAAQ,CAAC,MAAM,EAAE,CAAC;IAExB,IAAI,QAAQ,CAAC,UAAU,IAAI,GAAG,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CACb,0BAA0B,QAAQ,CAAC,UAAU,cAAc,OAAO,EAAE,CACrE,CAAC;IACJ,CAAC;IAED,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY;QACpC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,CAAC,YAAY,EAAE;QAC/C,CAAC,CAAC,SAAS,CAAC;IAEd,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC;AAClC,CAAC,CAAC;AAEF,eAAe,UAAU,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "zudoku",
|
|
3
|
-
"version": "0.34.
|
|
3
|
+
"version": "0.34.2",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"homepage": "https://zudoku.dev",
|
|
6
6
|
"repository": {
|
|
@@ -194,7 +194,7 @@
|
|
|
194
194
|
"pagefind": "1.4.0-alpha.1",
|
|
195
195
|
"picocolors": "1.1.1",
|
|
196
196
|
"piscina": "5.0.0-alpha.1",
|
|
197
|
-
"postcss": "8.5.
|
|
197
|
+
"postcss": "8.5.3",
|
|
198
198
|
"posthog-node": "4.8.1",
|
|
199
199
|
"prism-react-renderer": "2.4.1",
|
|
200
200
|
"prismjs": "1.29.0",
|
|
@@ -227,7 +227,7 @@
|
|
|
227
227
|
"urql": "4.2.1",
|
|
228
228
|
"vaul": "1.1.2",
|
|
229
229
|
"vfile": "6.0.3",
|
|
230
|
-
"vite": "6.
|
|
230
|
+
"vite": "6.2.0",
|
|
231
231
|
"yaml": "2.7.0",
|
|
232
232
|
"yargs": "17.7.2",
|
|
233
233
|
"zod": "3.24.2",
|
package/src/app/entry.server.tsx
CHANGED
|
@@ -8,31 +8,31 @@ import {
|
|
|
8
8
|
createStaticHandler,
|
|
9
9
|
createStaticRouter,
|
|
10
10
|
isRouteErrorResponse,
|
|
11
|
+
type RouteObject,
|
|
11
12
|
} from "react-router";
|
|
12
13
|
import "virtual:zudoku-theme.css";
|
|
13
14
|
import "vite/modulepreload-polyfill";
|
|
14
15
|
import { BootstrapStatic, ServerError } from "zudoku/components";
|
|
15
|
-
import type { ZudokuConfig } from "../config/config.js";
|
|
16
16
|
import type { FileWritingResponse } from "../vite/prerender/FileWritingResponse.js";
|
|
17
17
|
import "./main.css";
|
|
18
18
|
import { getRoutesByConfig } from "./main.js";
|
|
19
|
-
|
|
20
19
|
export { getRoutesByConfig };
|
|
21
20
|
|
|
22
21
|
export const render = async ({
|
|
23
22
|
template,
|
|
24
23
|
request: baseRequest,
|
|
25
24
|
response,
|
|
26
|
-
|
|
25
|
+
routes,
|
|
26
|
+
basePath,
|
|
27
27
|
}: {
|
|
28
28
|
template: string;
|
|
29
29
|
request: express.Request | Request;
|
|
30
30
|
response: express.Response | FileWritingResponse;
|
|
31
|
-
|
|
31
|
+
routes: RouteObject[];
|
|
32
|
+
basePath?: string;
|
|
32
33
|
}) => {
|
|
33
|
-
const routes = getRoutesByConfig(config);
|
|
34
34
|
const { query, dataRoutes } = createStaticHandler(routes, {
|
|
35
|
-
basename:
|
|
35
|
+
basename: basePath,
|
|
36
36
|
});
|
|
37
37
|
const queryClient = new QueryClient();
|
|
38
38
|
|
|
@@ -47,7 +47,7 @@ export const render = async ({
|
|
|
47
47
|
if (context instanceof Response) {
|
|
48
48
|
if ([301, 302, 303, 307, 308].includes(context.status)) {
|
|
49
49
|
return response.redirect(
|
|
50
|
-
context.status,
|
|
50
|
+
import.meta.env.PROD ? context.status : 307,
|
|
51
51
|
context.headers.get("Location")!,
|
|
52
52
|
);
|
|
53
53
|
}
|
|
@@ -84,8 +84,6 @@ export const render = async ({
|
|
|
84
84
|
|
|
85
85
|
response.send(html);
|
|
86
86
|
},
|
|
87
|
-
// for SSG we could use onAllReady instead of onShellReady
|
|
88
|
-
// https://react.dev/reference/react-dom/server/renderToPipeableStream#waiting-for-all-content-to-load-for-crawlers-and-static-generation
|
|
89
87
|
onAllReady() {
|
|
90
88
|
response.set({ "Content-Type": "text/html" });
|
|
91
89
|
response.status(status);
|
|
@@ -129,6 +127,9 @@ export const render = async ({
|
|
|
129
127
|
},
|
|
130
128
|
onError(error) {
|
|
131
129
|
status = 500;
|
|
130
|
+
if (import.meta.env.PROD) {
|
|
131
|
+
throw error;
|
|
132
|
+
}
|
|
132
133
|
logger.error(error);
|
|
133
134
|
},
|
|
134
135
|
});
|
package/dist/vite/pagefind.d.ts
DELETED
package/dist/vite/pagefind.js
DELETED
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
import path from "node:path";
|
|
2
|
-
import colors from "picocolors";
|
|
3
|
-
import { logger } from "../cli/common/logger.js";
|
|
4
|
-
import invariant from "../lib/util/invariant.js";
|
|
5
|
-
export const runPagefind = async (options) => {
|
|
6
|
-
const pagefind = await import("pagefind");
|
|
7
|
-
const { index, errors } = await pagefind.createIndex();
|
|
8
|
-
invariant(index, `Failed to create pagefind index: ${errors.join(", ")}`);
|
|
9
|
-
await index.addDirectory({ path: options.dir });
|
|
10
|
-
await index.writeFiles({
|
|
11
|
-
outputPath: path.join(options.outDir ?? options.dir, "pagefind"),
|
|
12
|
-
});
|
|
13
|
-
logger.info(colors.blue(`✓ pagefind search index written`));
|
|
14
|
-
};
|
|
15
|
-
//# sourceMappingURL=pagefind.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"pagefind.js","sourceRoot":"","sources":["../../src/vite/pagefind.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,MAAM,MAAM,YAAY,CAAC;AAChC,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACjD,OAAO,SAAS,MAAM,0BAA0B,CAAC;AAEjD,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,EAAE,OAGjC,EAAE,EAAE;IACH,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC;IAC1C,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,QAAQ,CAAC,WAAW,EAAE,CAAC;IAEvD,SAAS,CAAC,KAAK,EAAE,oCAAoC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAE1E,MAAM,KAAK,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAChD,MAAM,KAAK,CAAC,UAAU,CAAC;QACrB,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC;KACjE,CAAC,CAAC;IAEH,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC,CAAC;AAC9D,CAAC,CAAC"}
|