zudoku 0.29.1 → 0.30.1
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/lib/plugins/markdown/resolver.d.ts +0 -6
- package/dist/lib/plugins/markdown/resolver.js +0 -29
- package/dist/lib/plugins/markdown/resolver.js.map +1 -1
- package/dist/lib/plugins/openapi/index.js +2 -2
- package/dist/lib/plugins/openapi/index.js.map +1 -1
- package/dist/vite/build.js +4 -1
- package/dist/vite/build.js.map +1 -1
- package/dist/vite/prerender/prerender.d.ts +1 -1
- package/dist/vite/prerender/prerender.js +53 -20
- package/dist/vite/prerender/prerender.js.map +1 -1
- package/dist/vite/prerender/worker.d.ts +6 -4
- package/dist/vite/prerender/worker.js +13 -19
- package/dist/vite/prerender/worker.js.map +1 -1
- package/dist/vite/reporter.d.ts +3 -0
- package/dist/vite/reporter.js +33 -0
- package/dist/vite/reporter.js.map +1 -0
- package/lib/{OperationList-B3VX94x4.js → OperationList-CnYOgwBj.js} +259 -257
- package/lib/OperationList-CnYOgwBj.js.map +1 -0
- package/lib/{index-P0YUtHIb.js → index-CnKeVT2S.js} +5 -5
- package/lib/{index-P0YUtHIb.js.map → index-CnKeVT2S.js.map} +1 -1
- package/lib/zudoku.plugin-markdown.js +23 -44
- package/lib/zudoku.plugin-markdown.js.map +1 -1
- package/lib/zudoku.plugin-openapi.js +1 -1
- package/package.json +2 -2
- package/src/lib/plugins/markdown/resolver.ts +0 -33
- package/src/lib/plugins/openapi/index.tsx +2 -2
- package/lib/OperationList-B3VX94x4.js.map +0 -1
- package/lib/__vite-browser-external-BYRIRx8p.js +0 -9
- package/lib/__vite-browser-external-BYRIRx8p.js.map +0 -1
|
@@ -16,12 +16,6 @@ export declare class DocResolver {
|
|
|
16
16
|
disablePager?: boolean | undefined;
|
|
17
17
|
} | undefined;
|
|
18
18
|
}[];
|
|
19
|
-
/**
|
|
20
|
-
* Resolves the first matching file system path for a given docId
|
|
21
|
-
* @param docId - The docId to resolve
|
|
22
|
-
* @returns
|
|
23
|
-
*/
|
|
24
|
-
resolveFilePath(docId: string): string | undefined;
|
|
25
19
|
/**
|
|
26
20
|
* Gets the root directory from a files glob
|
|
27
21
|
*/
|
|
@@ -1,8 +1,4 @@
|
|
|
1
|
-
import fs from "fs";
|
|
2
|
-
import path from "path";
|
|
3
1
|
const DEFAULT_DOCS_FILES = "/pages/**/*.{md,mdx}";
|
|
4
|
-
// TODO: This should be dynamic based on the glob selector
|
|
5
|
-
const SUPPORTED_EXTENSIONS = [".md", ".mdx"];
|
|
6
2
|
/**
|
|
7
3
|
* Utilities for resolving markdown file paths and routes
|
|
8
4
|
*/
|
|
@@ -23,31 +19,6 @@ export class DocResolver {
|
|
|
23
19
|
: [{ files: DEFAULT_DOCS_FILES }];
|
|
24
20
|
return docsConfigs;
|
|
25
21
|
}
|
|
26
|
-
/**
|
|
27
|
-
* Resolves the first matching file system path for a given docId
|
|
28
|
-
* @param docId - The docId to resolve
|
|
29
|
-
* @returns
|
|
30
|
-
*/
|
|
31
|
-
resolveFilePath(docId) {
|
|
32
|
-
const docsConfigs = this.getDocsConfigs();
|
|
33
|
-
let fsPath;
|
|
34
|
-
docsConfigs.forEach(({ files: fileGlob }) => {
|
|
35
|
-
if (fsPath) {
|
|
36
|
-
return;
|
|
37
|
-
}
|
|
38
|
-
const rootDir = DocResolver.getRootDir(fileGlob);
|
|
39
|
-
for (const ext of SUPPORTED_EXTENSIONS) {
|
|
40
|
-
if (fsPath) {
|
|
41
|
-
return;
|
|
42
|
-
}
|
|
43
|
-
const checkPath = path.join(rootDir, `${docId}${ext}`);
|
|
44
|
-
if (fs.existsSync(checkPath)) {
|
|
45
|
-
fsPath = checkPath;
|
|
46
|
-
}
|
|
47
|
-
}
|
|
48
|
-
});
|
|
49
|
-
return fsPath;
|
|
50
|
-
}
|
|
51
22
|
/**
|
|
52
23
|
* Gets the root directory from a files glob
|
|
53
24
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../../../../src/lib/plugins/markdown/resolver.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../../../../src/lib/plugins/markdown/resolver.ts"],"names":[],"mappings":"AAGA,MAAM,kBAAkB,GAAG,sBAAsB,CAAC;AAElD;;GAEG;AACH,MAAM,OAAO,WAAW;IACF;IAApB,YAAoB,MAAoB;QAApB,WAAM,GAAN,MAAM,CAAc;IAAG,CAAC;IAE5C,OAAO,GAAG,IAAI,GAAG,EAAkB,CAAC;IAEpC;;OAEG;IACH,cAAc;QACZ,MAAM,WAAW,GAAuB,IAAI,CAAC,MAAM,CAAC,IAAI;YACtD,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;gBAC/B,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI;gBAClB,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;YACtB,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,kBAAkB,EAAE,CAAC,CAAC;QAEpC,OAAO,WAAW,CAAC;IACrB,CAAC;IAED;;OAEG;IACK,MAAM,CAAC,UAAU,CAAC,SAAiB;QACzC,IAAI,OAAO,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QACvC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;QACrE,CAAC;QACD,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACtC,OAAO,OAAO,CAAC;IACjB,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,gBAAgB,CAAC,EACtB,SAAS,EACT,MAAM,GAIP;QACC,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAC3C,MAAM,EAAE,GAAG,IAAI,MAAM,CAAC,IAAI,OAAO,WAAW,CAAC,CAAC;QAC9C,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC/B,MAAM,SAAS,GAAG,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QAC/B,OAAO,SAAS,CAAC;IACnB,CAAC;CACF"}
|
|
@@ -153,13 +153,13 @@ export const openApiPlugin = (config) => {
|
|
|
153
153
|
}
|
|
154
154
|
},
|
|
155
155
|
getRoutes: () => {
|
|
156
|
-
const versionsInPath = [null, ...versions];
|
|
156
|
+
const versionsInPath = versions.length > 1 ? [null, ...versions] : [null];
|
|
157
157
|
const tagPages = (config.tagPages ?? []).map((tag) => ({
|
|
158
158
|
tag,
|
|
159
159
|
path: slugify(tag),
|
|
160
160
|
}));
|
|
161
161
|
return versionsInPath.map((version) => {
|
|
162
|
-
const versionPath = joinUrl(basePath, version
|
|
162
|
+
const versionPath = joinUrl(basePath, version);
|
|
163
163
|
return {
|
|
164
164
|
path: versionPath,
|
|
165
165
|
async lazy() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/plugins/openapi/index.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/plugins/openapi/index.tsx"],"names":[],"mappings":"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"}
|
package/dist/vite/build.js
CHANGED
|
@@ -21,7 +21,10 @@ export async function runBuild(options) {
|
|
|
21
21
|
});
|
|
22
22
|
// Don't run in parallel because it might overwrite itself
|
|
23
23
|
const clientResult = await viteBuild(viteClientConfig);
|
|
24
|
-
const serverResult = await viteBuild(
|
|
24
|
+
const serverResult = await viteBuild({
|
|
25
|
+
...viteServerConfig,
|
|
26
|
+
logLevel: "silent",
|
|
27
|
+
});
|
|
25
28
|
if (Array.isArray(clientResult)) {
|
|
26
29
|
throw new Error("Build failed");
|
|
27
30
|
}
|
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,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAErD,MAAM,QAAQ,GAAG,MAAM,CAAC;AAExB,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,OAAwB;IACrD,0DAA0D;IAC1D,MAAM,gBAAgB,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,GAAG,EAAE;QACxD,IAAI,EAAE,YAAY;QAClB,OAAO,EAAE,OAAO;KACjB,CAAC,CAAC;IACH,MAAM,gBAAgB,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,GAAG,EAAE;QACxD,IAAI,EAAE,YAAY;QAClB,OAAO,EAAE,OAAO;QAChB,UAAU,EAAE,IAAI;KACjB,CAAC,CAAC;IAEH,0DAA0D;IAC1D,MAAM,YAAY,GAAG,MAAM,SAAS,CAAC,gBAAgB,CAAC,CAAC;IACvD,MAAM,YAAY,GAAG,MAAM,SAAS,CAAC,gBAAgB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/vite/build.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import path from "node:path";
|
|
2
2
|
import { pathToFileURL } from "node:url";
|
|
3
|
+
import colors from "picocolors";
|
|
3
4
|
import PiscinaImport from "piscina";
|
|
5
|
+
import { isTTY, throttle, writeLine } from "../reporter.js";
|
|
4
6
|
import { generateSitemap } from "../sitemap.js";
|
|
5
7
|
const Piscina = PiscinaImport;
|
|
6
8
|
const routesToPaths = (routes) => {
|
|
@@ -23,40 +25,71 @@ const routesToPaths = (routes) => {
|
|
|
23
25
|
return paths;
|
|
24
26
|
};
|
|
25
27
|
export const prerender = async ({ html, dir, basePath = "", serverConfigFilename, }) => {
|
|
26
|
-
// eslint-disable-next-line no-console
|
|
27
|
-
console.log("Prerendering...");
|
|
28
28
|
const distDir = path.join(dir, "dist", basePath);
|
|
29
29
|
const config = await import(pathToFileURL(path.join(distDir, "server", serverConfigFilename)).href).then((m) => m.default);
|
|
30
30
|
const module = await import(pathToFileURL(path.join(distDir, "server/entry.server.js")).href);
|
|
31
31
|
const getRoutes = module.getRoutesByConfig;
|
|
32
32
|
const routes = getRoutes(config);
|
|
33
33
|
const paths = routesToPaths(routes);
|
|
34
|
-
const pool = new Piscina({
|
|
35
|
-
filename: new URL("./worker.js", import.meta.url).href,
|
|
36
|
-
});
|
|
37
34
|
const start = performance.now();
|
|
35
|
+
const LOG_INTERVAL_MS = 30_000; // Log every 30 seconds
|
|
36
|
+
const INACTIVITY_TIMEOUT_MS = 10_000; // Timeout after 10 seconds of inactivity
|
|
37
|
+
let lastLogTime = start;
|
|
38
|
+
let lastActivityTime = start;
|
|
39
|
+
const writeProgress = throttle((count, total, urlPath) => {
|
|
40
|
+
writeLine(`prerendering (${count}/${total}) ${colors.dim(urlPath)}`);
|
|
41
|
+
});
|
|
42
|
+
if (!isTTY()) {
|
|
43
|
+
// eslint-disable-next-line no-console
|
|
44
|
+
console.log(`prerendering ${paths.length} routes...`);
|
|
45
|
+
}
|
|
38
46
|
let completedCount = 0;
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
const
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
47
|
+
let timeoutId;
|
|
48
|
+
const inactivityTimeout = new Promise((_, reject) => {
|
|
49
|
+
const checkInactivity = () => {
|
|
50
|
+
const inactiveTime = performance.now() - lastActivityTime;
|
|
51
|
+
if (inactiveTime >= INACTIVITY_TIMEOUT_MS) {
|
|
52
|
+
clearTimeout(timeoutId);
|
|
53
|
+
reject(new Error(`Prerender timed out after ${INACTIVITY_TIMEOUT_MS}ms of inactivity`));
|
|
54
|
+
return;
|
|
55
|
+
}
|
|
56
|
+
timeoutId = setTimeout(checkInactivity, 1000);
|
|
57
|
+
};
|
|
58
|
+
timeoutId = setTimeout(checkInactivity, 1000);
|
|
59
|
+
});
|
|
60
|
+
const serverOutDir = path.join(distDir, "server");
|
|
61
|
+
const pool = new Piscina({
|
|
62
|
+
filename: new URL("./worker.js", import.meta.url).href,
|
|
63
|
+
idleTimeout: 1000,
|
|
64
|
+
workerData: {
|
|
45
65
|
template: html,
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
66
|
+
distDir,
|
|
67
|
+
serverConfigPath: path.join(serverOutDir, serverConfigFilename),
|
|
68
|
+
entryServerPath: path.join(serverOutDir, "entry.server.js"),
|
|
69
|
+
},
|
|
70
|
+
});
|
|
71
|
+
const prerenderTasks = Promise.all(paths.map(async (urlPath) => {
|
|
72
|
+
const outputPath = await pool.run({ urlPath });
|
|
51
73
|
completedCount++;
|
|
52
|
-
|
|
53
|
-
|
|
74
|
+
lastActivityTime = performance.now();
|
|
75
|
+
if (isTTY()) {
|
|
76
|
+
writeProgress(completedCount, paths.length, urlPath);
|
|
77
|
+
}
|
|
78
|
+
else {
|
|
79
|
+
const now = performance.now();
|
|
80
|
+
if (now - lastLogTime >= LOG_INTERVAL_MS ||
|
|
81
|
+
completedCount === paths.length) {
|
|
82
|
+
// eslint-disable-next-line no-console
|
|
83
|
+
console.log(`prerendered ${completedCount}/${paths.length} routes`);
|
|
84
|
+
lastLogTime = now;
|
|
85
|
+
}
|
|
54
86
|
}
|
|
55
87
|
return outputPath;
|
|
56
88
|
}));
|
|
89
|
+
const writtenFiles = await Promise.race([prerenderTasks, inactivityTimeout]);
|
|
90
|
+
clearTimeout(timeoutId);
|
|
57
91
|
const seconds = ((performance.now() - start) / 1000).toFixed(1);
|
|
58
|
-
|
|
59
|
-
await pool.destroy();
|
|
92
|
+
writeLine(`prerendered ${paths.length} routes in ${seconds} seconds\n`);
|
|
60
93
|
await generateSitemap({
|
|
61
94
|
basePath: config.basePath,
|
|
62
95
|
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,aAAa,MAAM,SAAS,CAAC;AAGpC,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAGhD,MAAM,OAAO,GAAG,aAAwD,CAAC;AAEzE,MAAM,aAAa,GAAG,CAAC,MAA4C,EAAE,EAAE;IACrE,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,MAAM,QAAQ,GAAG,CAAC,MAA4C,EAAE,EAAE;QAChE,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,wBAAwB;YACxB,IAAI,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC9B,SAAS;YACX,CAAC;YAED,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;gBACf,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;YACzE,CAAC;YACD,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;gBACnB,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAC3B,CAAC;QACH,CAAC;IACH,CAAC,CAAC;IACF,QAAQ,CAAC,MAAM,CAAC,CAAC;IACjB,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,EAAE,EAC9B,IAAI,EACJ,GAAG,EACH,QAAQ,GAAG,EAAE,EACb,oBAAoB,GAMrB,EAAE,EAAE;IACH,
|
|
1
|
+
{"version":3,"file":"prerender.js","sourceRoot":"","sources":["../../../src/vite/prerender/prerender.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
|
-
export type
|
|
1
|
+
export type StaticWorkerData = {
|
|
2
2
|
template: string;
|
|
3
|
-
|
|
4
|
-
url: string;
|
|
3
|
+
distDir: string;
|
|
5
4
|
serverConfigPath: string;
|
|
6
5
|
entryServerPath: string;
|
|
7
6
|
};
|
|
8
|
-
|
|
7
|
+
export type WorkerData = {
|
|
8
|
+
urlPath: string;
|
|
9
|
+
};
|
|
10
|
+
declare const renderPage: ({ urlPath }: WorkerData) => Promise<string>;
|
|
9
11
|
export default renderPage;
|
|
@@ -1,27 +1,21 @@
|
|
|
1
|
+
import path from "node:path";
|
|
1
2
|
import { pathToFileURL } from "node:url";
|
|
3
|
+
import Piscina from "piscina";
|
|
2
4
|
import { FileWritingResponse } from "./FileWritingResponse.js";
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
const
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
]);
|
|
13
|
-
renderFn = module.render;
|
|
14
|
-
config = configModule.default;
|
|
15
|
-
initialized = true;
|
|
16
|
-
};
|
|
17
|
-
const renderPage = async (data) => {
|
|
18
|
-
await initialize(data);
|
|
19
|
-
const { url, template, outputPath } = data;
|
|
5
|
+
const { template, distDir, serverConfigPath, entryServerPath } = Piscina.workerData;
|
|
6
|
+
const [render, config] = (await Promise.all([
|
|
7
|
+
import(pathToFileURL(entryServerPath).href).then((m) => m.render),
|
|
8
|
+
import(pathToFileURL(serverConfigPath).href).then((m) => m.default),
|
|
9
|
+
]));
|
|
10
|
+
const renderPage = async ({ urlPath }) => {
|
|
11
|
+
const filename = urlPath === "/" ? "/index.html" : `${urlPath}.html`;
|
|
12
|
+
const url = `http://localhost${config.basePath ?? ""}${urlPath}`;
|
|
13
|
+
const outputPath = path.join(distDir, filename);
|
|
20
14
|
const request = new Request(url);
|
|
21
15
|
const response = new FileWritingResponse(outputPath);
|
|
22
|
-
await
|
|
16
|
+
await render({ template, request, response, config });
|
|
23
17
|
await response.isSent();
|
|
24
|
-
return
|
|
18
|
+
return outputPath;
|
|
25
19
|
};
|
|
26
20
|
export default renderPage;
|
|
27
21
|
//# sourceMappingURL=worker.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../../src/vite/prerender/worker.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../../src/vite/prerender/worker.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,OAAO,MAAM,SAAS,CAAC;AAG9B,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAW/D,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,GAC5D,OAAO,CAAC,UAA8B,CAAC;AAEzC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC;IAC1C,MAAM,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;IACjE,MAAM,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;CACpE,CAAC,CAAwC,CAAC;AAE3C,MAAM,UAAU,GAAG,KAAK,EAAE,EAAE,OAAO,EAAc,EAAmB,EAAE;IACpE,MAAM,QAAQ,GAAG,OAAO,KAAK,GAAG,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,GAAG,OAAO,OAAO,CAAC;IACrE,MAAM,GAAG,GAAG,mBAAmB,MAAM,CAAC,QAAQ,IAAI,EAAE,GAAG,OAAO,EAAE,CAAC;IACjE,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAChD,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC;IACjC,MAAM,QAAQ,GAAG,IAAI,mBAAmB,CAAC,UAAU,CAAC,CAAC;IAErD,MAAM,MAAM,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;IACtD,MAAM,QAAQ,CAAC,MAAM,EAAE,CAAC;IAExB,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AAEF,eAAe,UAAU,CAAC"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
// Source: https://github.com/vitejs/vite/blob/e1fa067e65a11e422b6fd94d4ce916a675ebb9a5/packages/vite/src/node/plugins/reporter.ts#L49
|
|
2
|
+
export function writeLine(output) {
|
|
3
|
+
clearLine();
|
|
4
|
+
if (output.length < process.stdout.columns) {
|
|
5
|
+
process.stdout.write(output);
|
|
6
|
+
}
|
|
7
|
+
else {
|
|
8
|
+
process.stdout.write(output.substring(0, process.stdout.columns - 1));
|
|
9
|
+
}
|
|
10
|
+
}
|
|
11
|
+
export function isTTY() {
|
|
12
|
+
return process.stdout.isTTY && !process.env.CI;
|
|
13
|
+
}
|
|
14
|
+
function clearLine() {
|
|
15
|
+
if (isTTY()) {
|
|
16
|
+
process.stdout.clearLine(0);
|
|
17
|
+
process.stdout.cursorTo(0);
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
|
|
21
|
+
export function throttle(fn) {
|
|
22
|
+
let timerHandle = null;
|
|
23
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
24
|
+
return (...args) => {
|
|
25
|
+
if (timerHandle)
|
|
26
|
+
return;
|
|
27
|
+
fn(...args);
|
|
28
|
+
timerHandle = setTimeout(() => {
|
|
29
|
+
timerHandle = null;
|
|
30
|
+
}, 100);
|
|
31
|
+
};
|
|
32
|
+
}
|
|
33
|
+
//# sourceMappingURL=reporter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"reporter.js","sourceRoot":"","sources":["../../src/vite/reporter.ts"],"names":[],"mappings":"AAAA,sIAAsI;AAEtI,MAAM,UAAU,SAAS,CAAC,MAAc;IACtC,SAAS,EAAE,CAAC;IACZ,IAAI,MAAM,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QAC3C,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC;IACxE,CAAC;AACH,CAAC;AAED,MAAM,UAAU,KAAK;IACnB,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;AACjD,CAAC;AAED,SAAS,SAAS;IAChB,IAAI,KAAK,EAAE,EAAE,CAAC;QACZ,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAC5B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC7B,CAAC;AACH,CAAC;AAED,sEAAsE;AACtE,MAAM,UAAU,QAAQ,CAAC,EAAY;IACnC,IAAI,WAAW,GAA0B,IAAI,CAAC;IAC9C,8DAA8D;IAC9D,OAAO,CAAC,GAAG,IAAW,EAAE,EAAE;QACxB,IAAI,WAAW;YAAE,OAAO;QACxB,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;QACZ,WAAW,GAAG,UAAU,CAAC,GAAG,EAAE;YAC5B,WAAW,GAAG,IAAI,CAAC;QACrB,CAAC,EAAE,GAAG,CAAC,CAAC;IACV,CAAC,CAAC;AACJ,CAAC"}
|