From 0a34905ff00c3f6359e28966cfc5292c331b32b7 Mon Sep 17 00:00:00 2001 From: sebastien Date: Mon, 27 Jan 2025 10:40:43 +0100 Subject: [PATCH] fix tinypool windows bug? --- packages/docusaurus/src/ssg/ssgExecutor.ts | 8 +++----- .../src/ssg/{ssgWorkerThread.mts => ssgWorkerThread.ts} | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) rename packages/docusaurus/src/ssg/{ssgWorkerThread.mts => ssgWorkerThread.ts} (88%) diff --git a/packages/docusaurus/src/ssg/ssgExecutor.ts b/packages/docusaurus/src/ssg/ssgExecutor.ts index 285c69f19bf9..4c2a8efd55b8 100644 --- a/packages/docusaurus/src/ssg/ssgExecutor.ts +++ b/packages/docusaurus/src/ssg/ssgExecutor.ts @@ -19,9 +19,7 @@ import type {Props, RouterType} from '@docusaurus/types'; import type {SiteCollectedData} from '../common'; import type {SSGParams} from './ssgParams'; import type {SSGGlobalResult} from './ssgGlobalResult'; - -// @ts-expect-error: with resolution -import type {ExecuteSSGWorkerThreadTask} from './ssgWorkerThread.mts'; +import type {ExecuteSSGWorkerThreadTask} from './ssgWorkerThread'; type SSGExecutor = { run: () => Promise; @@ -118,12 +116,12 @@ const createPooledSSGExecutor: CreateSSGExecutor = async ({ const Tinypool = await import('tinypool').then((m) => m.default); const workerURL = pathToFileURL( - path.resolve(__dirname, 'ssgWorkerThread.mjs'), + path.resolve(__dirname, 'ssgWorkerThread.js'), ); console.log('workerURL', workerURL); return new Tinypool({ - filename: workerURL.href, + filename: workerURL.pathname, minThreads: numberOfThreads, maxThreads: numberOfThreads, concurrentTasksPerWorker: 1, diff --git a/packages/docusaurus/src/ssg/ssgWorkerThread.mts b/packages/docusaurus/src/ssg/ssgWorkerThread.ts similarity index 88% rename from packages/docusaurus/src/ssg/ssgWorkerThread.mts rename to packages/docusaurus/src/ssg/ssgWorkerThread.ts index cd512b7d3fd1..14fe78e2e30d 100644 --- a/packages/docusaurus/src/ssg/ssgWorkerThread.mts +++ b/packages/docusaurus/src/ssg/ssgWorkerThread.ts @@ -23,7 +23,7 @@ if (!params) { throw new Error(`SSG Worker Thread workerData params missing`); } -const WorkerLogPrefix = `SSG Worker ${logger.default.name(workerId)}`; +const WorkerLogPrefix = `SSG Worker ${logger.name(workerId)}`; // We only load once the SSG rendered (expensive), NOT once per worker task // TODO check potential memory leak? @@ -46,9 +46,9 @@ export default async function executeSSGWorkerThreadTask( const appRenderer = await appRendererPromise; const ssgResults = await PerfLogger.async( - `${WorkerLogPrefix} - Task ${logger.default.name( + `${WorkerLogPrefix} - Task ${logger.name( task.id, - )} - Rendering ${logger.default.cyan(task.pathnames.length)} pathnames`, + )} - Rendering ${logger.cyan(task.pathnames.length)} pathnames`, () => appRenderer.renderPathnames(task.pathnames), );