@simplysm/sd-cli 14.0.44 → 14.0.46

package/dist/workers/server-watch-manager.js

@@ -27,7 +27,7 @@ export async function startServerWatchLoop(config) {
                 // package.json이 변경된 경우에만 외부 모듈 재수집
                 const hasPackageJsonChange = changes.some((c) => c.path.endsWith("package.json"));
                 if (hasPackageJsonChange) {
-                    cachedExternal = collectAllExternals(info.pkgDir, info.externals);
+                    cachedExternal = collectAllExternals(info.pkgDir, info.externals).bundleExternals;
                 }
                 if (info.output.js) {
                     await esbuildCtx.recreateContext({

package/dist/workers/server-watch-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"server-watch-manager.js","sourceRoot":"","sources":["../../src/workers/server-watch-manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"server-watch-manager.js","sourceRoot":"","sources":["../../src/workers/server-watch-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,GAAG,IAAI,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EACL,aAAa,EACb,qBAAqB,GACtB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,mBAAmB,EAAE,MAAM,kDAAkD,CAAC;AACvF,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,KAAK,UAAU,MAAM,0BAA0B,CAAC;AAqBvD;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,MAA6B;IACtE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAC5C,IAAI,cAAc,GAAG,CAAC,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC;IAElD,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAElD,OAAO,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;QACjD,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;YAEhD,IAAI,WAAW,EAAE,CAAC;gBAChB,MAAM,CAAC,YAAY,EAAE,CAAC;gBAEtB,sBAAsB;gBACtB,MAAM,eAAe,GAAG,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACnD,MAAM,cAAc,GAAG,qBAAqB,CAAC,IAAI,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;gBAE3E,mCAAmC;gBACnC,MAAM,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC9C,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAChC,CAAC;gBACF,IAAI,oBAAoB,EAAE,CAAC;oBACzB,cAAc,GAAG,mBAAmB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,eAAe,CAAC;gBACpF,CAAC;gBAED,IAAI,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;oBACnB,MAAM,UAAU,CAAC,eAAe,CAAC;wBAC/B,MAAM,EAAE,IAAI,CAAC,MAAM;wBACnB,WAAW,EAAE,cAAc;wBAC3B,GAAG,EAAE,IAAI,CAAC,GAAG;wBACb,QAAQ,EAAE,cAAc;qBACzB,CAAC,CAAC;gBACL,CAAC;gBAED,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;gBACtC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;gBACvB,OAAO;YACT,CAAC;YAED,8BAA8B;YAC9B,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,EAAE,CAAC;gBAC7B,MAAM,CAAC,YAAY,EAAE,CAAC;gBACtB,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;gBACtC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;gBACvB,OAAO;YACT,CAAC;YAED,MAAM,eAAe,GAAG,UAAU,CAAC,WAAW,EAAE,CAAC;YACjD,IAAI,eAAe,IAAI,IAAI,EAAE,CAAC;gBAC5B,MAAM,CAAC,YAAY,EAAE,CAAC;gBACtB,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;gBACtC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;gBACvB,OAAO;YACT,CAAC;YAED,qBAAqB;YACrB,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAC9B,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CACpF,CAAC;YAEF,MAAM,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC3C,IAAI,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;oBAAE,OAAO,IAAI,CAAC;gBAC9C,8CAA8C;gBAC9C,IAAI,CAAC;oBACH,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;oBACtD,OAAO,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;gBACxC,CAAC;gBAAC,MAAM,CAAC;oBACP,OAAO,KAAK,CAAC;gBACf,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,IAAI,iBAAiB,EAAE,CAAC;gBACtB,MAAM,CAAC,YAAY,EAAE,CAAC;gBACtB,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;gBACtC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACzB,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;YAC9C,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;QACrC,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC;AACjB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simplysm/sd-cli",
-  "version": "14.0.44",
+  "version": "14.0.46",
   "description": "Simplysm package - CLI tool",
   "author": "simplysm",
   "license": "Apache-2.0",
@@ -27,6 +27,7 @@
     "acorn-walk": "^8.3.5",
     "browserslist-to-esbuild": "^2.1.1",
     "consola": "^3.4.2",
+    "es-module-lexer": "^2.0.0",
     "esbuild": "^0.28.0",
     "eslint": "^9.39.4",
     "glob": "^13.0.6",
@@ -37,13 +38,15 @@
     "sass": "^1.99.0",
     "semver": "^7.7.4",
     "sharp": "^0.34.5",
+    "smol-toml": "^1.6.1",
     "ssh2": "^1.17.0",
     "typescript": "^5.9.3",
     "ws": "^8.20.0",
+    "yaml": "^2.8.3",
     "yargs": "^18.0.0",
-    "@simplysm/core-common": "14.0.44",
-    "@simplysm/core-node": "14.0.44",
-    "@simplysm/storage": "14.0.44"
+    "@simplysm/core-common": "14.0.46",
+    "@simplysm/core-node": "14.0.46",
+    "@simplysm/storage": "14.0.46"
   },
   "devDependencies": {
     "@types/semver": "^7.7.1",

package/src/deps/server-externals/server-production-files.ts

@@ -1,6 +1,8 @@
 import type { ServerBuildInfo } from "../../workers/server-build.worker";
 import path from "path";
 import fs from "fs";
+import YAML from "yaml";
+import TOML from "smol-toml";
 import { cpx } from "@simplysm/core-node";
 import { consola } from "consola";
 import { collectAllDependencyExternals } from "../../esbuild/esbuild-config";
@@ -8,21 +10,29 @@ import { collectAllDependencyExternals } from "../../esbuild/esbuild-config";
 const logger = consola.withTag("sd:cli:server-production-files");
 
 /**
- * 세 가지 소스에서 외부 모듈을 수집하고 병합한다.
- * collectAllDependencyExternals를 통한 단일 패스 의존성 트리 순회를 사용한다.
+ * 외부 모듈을 두 용도로 분리하여 수집한다.
+ * - bundleExternals: esbuild external — 번들에서 제외할 패키지
+ * - prodDependencies: dist/package.json dependencies — 런타임에 실제 설치되어야 하는 패키지
+ *
+ * 미설치 optional peer는 번들 제외만 필요할 뿐 런타임에 쓰이지 않으므로 prodDependencies에 포함하지 않는다.
  */
-export function collectAllExternals(pkgDir: string, manualExternals?: string[]): string[] {
+export function collectAllExternals(
+  pkgDir: string,
+  manualExternals?: string[],
+): { bundleExternals: string[]; prodDependencies: string[] } {
   logger.debug("의존성 트리 스캔 중...");
   const { optionalPeerDeps, nativeModules } = collectAllDependencyExternals(pkgDir);
 
   const manual = manualExternals ?? [];
-  return [...new Set([...optionalPeerDeps, ...nativeModules, ...manual])];
+  return {
+    bundleExternals: [...new Set([...optionalPeerDeps, ...nativeModules, ...manual])],
+    prodDependencies: [...new Set([...nativeModules, ...manual])],
+  };
 }
 
 /**
  * pnpm-lock.yaml의 packages 섹션을 파싱하여 name→version 맵을 생성한다.
- * Lockfile v9 형식: `packages:` 섹션의 `'name@version':` 키를 파싱한다.
- * YAML 파서 의존성을 피하기 위해 단순 라인 기반 파싱을 사용한다.
+ * 키 형태: "name@version" · "@scope/name@version" · "name@version(peer@ver)..."
  */
 export function parseLockfileVersions(cwd: string): Map<string, string> {
   const lockfilePath = path.join(cwd, "pnpm-lock.yaml");
@@ -31,30 +41,19 @@ export function parseLockfileVersions(cwd: string): Map<string, string> {
   }
 
   const content = fs.readFileSync(lockfilePath, "utf-8");
+  const parsed = YAML.parse(content) as { packages?: Record<string, unknown> };
   const map = new Map<string, string>();
 
-  // "packages:" 섹션을 찾고 "'@scope/name@1.2.3':" 또는 "'name@1.2.3':" 형태의 항목을 파싱
-  const lines = content.split("\n");
-  let inPackages = false;
-  for (const line of lines) {
-    if (line === "packages:") {
-      inPackages = true;
-      continue;
-    }
-    if (inPackages && line.length > 0 && !line.startsWith(" ") && !line.startsWith("'")) {
-      break; // 다음 최상위 섹션
-    }
-    if (!inPackages) continue;
-
-    // "'@scope/name@version':" 또는 "'name@version':" 매칭
-    const match = /^\s{2}'(.+)@(\d[^']*)':\s*$/.exec(line);
-    if (match != null) {
-      const name = match[1];
-      const version = match[2];
-      // 첫 번째 항목 유지 (lockfile은 각 버전을 한 번만 기록)
-      if (!map.has(name)) {
-        map.set(name, version);
-      }
+  for (const key of Object.keys(parsed.packages ?? {})) {
+    // 첫 번째 @숫자 기준으로 name / version 분리 (scope 패키지의 선두 @ 보존)
+    const m = /^(.+?)@(\d.+)$/.exec(key);
+    if (m == null) continue;
+    const name = m[1];
+    // peerDep suffix "(peer@ver)..." 제거
+    const parenIdx = m[2].indexOf("(");
+    const version = parenIdx === -1 ? m[2] : m[2].substring(0, parenIdx);
+    if (!map.has(name)) {
+      map.set(name, version);
     }
   }
 
@@ -112,9 +111,10 @@ export function generateProductionFiles(
     let nodeVersion = "20";
     if (fs.existsSync(rootMiseTomlPath)) {
       const miseContent = fs.readFileSync(rootMiseTomlPath, "utf-8");
-      const match = /node\s*=\s*"([^"]+)"/.exec(miseContent);
-      if (match != null) {
-        nodeVersion = match[1];
+      // mise.toml은 저장소에서 관리되는 설정 파일이므로, 파싱 실패 시 폴백하지 않고 예외를 전파하여 설정 오류를 즉시 드러낸다.
+      const miseConfig = TOML.parse(miseContent) as { tools?: { node?: string } };
+      if (miseConfig.tools?.node != null) {
+        nodeVersion = miseConfig.tools.node;
       }
     }
     fs.writeFileSync(path.join(distDir, "mise.toml"), `[tools]\nnode = "${nodeVersion}"\n`);

package/src/esbuild/esbuild-angular-compiler-plugin.ts

@@ -5,15 +5,15 @@ import ts from "typescript";
 import type esbuild from "esbuild";
 import { consola } from "consola";
 import { JavaScriptTransformer, Cache as AngularCache } from "@angular/build/private";
-import type { AngularSourceFileCache } from "../angular/angular-compiler.js";
-import type { SerializedDiagnostic } from "../typecheck/typecheck-serialization.js";
-import { SdTsCompiler } from "../ts-compiler/SdTsCompiler.js";
-import type { ISdTsCompilerResult } from "../ts-compiler/sd-ts-compiler-result.js";
-import { FileReferenceTracker } from "./file-reference-tracker.js";
-import { LmdbCacheStore } from "./lmdb-cache-store.js";
-import { createCachedLoad, type LoadResultCache } from "./load-result-cache.js";
-import { collectHmrCandidates, HMR_MODIFIED_FILE_LIMIT } from "../angular/hmr-candidates.js";
-import { createWorkerTransformer } from "../angular/web-worker-transformer.js";
+import type { AngularSourceFileCache } from "../angular/angular-compiler";
+import type { SerializedDiagnostic } from "../typecheck/typecheck-serialization";
+import { SdTsCompiler } from "../ts-compiler/SdTsCompiler";
+import type { ISdTsCompilerResult } from "../ts-compiler/sd-ts-compiler-result";
+import { FileReferenceTracker } from "./file-reference-tracker";
+import { LmdbCacheStore } from "./lmdb-cache-store";
+import { createCachedLoad, type LoadResultCache } from "./load-result-cache";
+import { collectHmrCandidates, HMR_MODIFIED_FILE_LIMIT } from "../angular/hmr-candidates";
+import { transformWorkerPatterns } from "./esbuild-worker-plugin";
 
 const logger = consola.withTag("sd:cli:angular-plugin");
 
@@ -48,12 +48,6 @@ export interface AngularCompilerPluginOptions {
   stylesheetErrors?: string[];
 }
 
-interface AdditionalResult {
-  outputFiles?: esbuild.OutputFile[];
-  metafile?: esbuild.Metafile;
-  errors?: esbuild.PartialMessage[];
-}
-
 //#endregion
 
 //#region compilerOptions 변환
@@ -158,46 +152,6 @@ export function convertSerializedDiagnosticToEsbuild(
 
 //#endregion
 
-//#region bundleWebWorker
-
-/**
- * Worker 파일을 esbuild.buildSync()로 별도 ESM 번들로 빌드한다.
- * TypeScript transformer 내에서 동기적으로 호출되므로 sync API를 사용한다.
- */
-export function bundleWebWorker(
-  build: esbuild.PluginBuild,
-  sourcemap: boolean,
-  workerFile: string,
-): esbuild.BuildResult {
-  try {
-    return build.esbuild.buildSync({
-      ...build.initialOptions,
-      platform: "browser",
-      write: false,
-      bundle: true,
-      metafile: true,
-      format: "esm",
-      entryNames: "worker-[hash]",
-      entryPoints: [workerFile],
-      sourcemap,
-      supported: undefined,
-      plugins: undefined,
-    });
-  } catch (error) {
-    if (
-      error != null &&
-      typeof error === "object" &&
-      "errors" in error &&
-      "warnings" in error
-    ) {
-      return error as esbuild.BuildResult;
-    }
-    throw error;
-  }
-}
-
-//#endregion
-
 //#region onLoad 헬퍼
 
 const POTENTIAL_METADATA_REGEX =
@@ -288,7 +242,12 @@ export function createAngularCompilerPlugin(
       // ── 내부 상태 ──
       const typeScriptFileCache: Map<string, string | Uint8Array> =
         pluginOptions.typeScriptFileCache ?? new Map();
-      const additionalResults = new Map<string, AdditionalResult>();
+      // containingFile별 Worker 번들 결과. 증분 빌드에서 변경된 파일만 선택적으로
+      // 제거하여, 변경되지 않은 Worker metafile/outputFiles가 유지되도록 함.
+      const workerResultsByContainingFile = new Map<
+        string,
+        { outputFiles?: esbuild.OutputFile[]; metafile?: esbuild.Metafile }
+      >();
       const referencedFileTracker = new FileReferenceTracker();
       let sdTsCompiler: SdTsCompiler | undefined;
       let lastResult: ISdTsCompilerResult | undefined;
@@ -308,58 +267,6 @@ export function createAngularCompilerPlugin(
         return sideEffects;
       }
 
-      // ── 서브함수: WebWorker 프로세서 생성 ──
-      function createWebWorkerProcessor(
-        errors: esbuild.PartialMessage[],
-        warnings: esbuild.PartialMessage[],
-      ): (workerFile: string, containingFile: string) => string {
-        return (workerFile: string, containingFile: string): string => {
-          const fullWorkerPath = path.join(path.dirname(containingFile), workerFile);
-          const workerResult = bundleWebWorker(build, pluginOptions.sourcemap, fullWorkerPath);
-
-          warnings.push(...workerResult.warnings);
-
-          if (workerResult.errors.length > 0) {
-            errors.push(...workerResult.errors);
-            // 에러 파일 경로 추적 (rebuild 허용)
-            referencedFileTracker.add(
-              containingFile,
-              workerResult.errors
-                .map((e) => e.location?.file)
-                .filter((f): f is string => f != null)
-                .map((f) => path.join(cwd, f)),
-            );
-            additionalResults.set(fullWorkerPath, { errors: workerResult.errors });
-            return workerFile;
-          }
-
-          additionalResults.set(fullWorkerPath, {
-            outputFiles: workerResult.outputFiles,
-            metafile: workerResult.metafile,
-          });
-
-          // metafile.inputs → FileReferenceTracker
-          if (workerResult.metafile != null) {
-            referencedFileTracker.add(
-              containingFile,
-              Object.keys(workerResult.metafile.inputs).map((input) => path.join(cwd, input)),
-            );
-          }
-
-          // worker-[HASH].js 파일 찾기
-          const workerCodeFile = workerResult.outputFiles?.find((file) =>
-            /^worker-[A-Z0-9]{8}\.[cm]?js$/.test(path.basename(file.path)),
-          );
-          if (workerCodeFile == null) {
-            errors.push({ text: `Web Worker bundled code file not found: ${fullWorkerPath}`, location: null });
-            return workerFile;
-          }
-          const outdir = build.initialOptions.outdir ?? "";
-          const workerCodePath = path.relative(outdir, workerCodeFile.path);
-          return workerCodePath.replaceAll("\\", "/");
-        };
-      }
-
       // ── onStart ──
       build.onStart(async () => {
         const result: esbuild.OnStartResult = {};
@@ -402,9 +309,10 @@ export function createAngularCompilerPlugin(
               sourceFileCache.modifiedFiles,
             );
 
-            // stale additionalResults 제거
+            // 변경된 파일의 Worker 결과만 선택적 제거 (변경되지 않은 파일의
+            // Worker metafile은 유지되어 onEnd에서 재병합됨)
             for (const file of expandedModifiedFiles) {
-              additionalResults.delete(file);
+              workerResultsByContainingFile.delete(file);
             }
           }
 
@@ -424,19 +332,39 @@ export function createAngularCompilerPlugin(
             });
           }
 
-          // ── processWebWorker + workerTransformer ──
-          const processWebWorker = createWebWorkerProcessor(errors, warnings);
-          const workerTransformer = createWorkerTransformer(processWebWorker);
-
           // ── compileAsync ──
           const compileResult = await sdTsCompiler.compileAsync(
             isIncremental ? expandedModifiedFiles : undefined,
-            { additionalTransformers: { before: [workerTransformer] } },
           );
 
-          // ── emitResults → typeScriptFileCache ──
+          // ── emitResults → typeScriptFileCache (Worker 패턴 처리 포함) ──
           for (const { contents, sourceFileName } of compileResult.emitResults ?? []) {
-            typeScriptFileCache.set(path.normalize(sourceFileName), contents);
+            const normalized = path.normalize(sourceFileName);
+            const workerResult = transformWorkerPatterns(contents, normalized, build);
+            if (workerResult != null) {
+              typeScriptFileCache.set(normalized, workerResult.contents);
+              errors.push(...workerResult.errors);
+              warnings.push(...workerResult.warnings);
+              if (workerResult.workerMetafile != null) {
+                referencedFileTracker.add(
+                  normalized,
+                  Object.keys(workerResult.workerMetafile.inputs).map((input) =>
+                    path.join(cwd, input),
+                  ),
+                );
+              }
+              if (
+                workerResult.workerMetafile != null ||
+                workerResult.workerOutputFiles != null
+              ) {
+                workerResultsByContainingFile.set(normalized, {
+                  outputFiles: workerResult.workerOutputFiles,
+                  metafile: workerResult.workerMetafile,
+                });
+              }
+            } else {
+              typeScriptFileCache.set(normalized, contents);
+            }
           }
 
           // ── onLoad 플래그 결정 (첫 빌드에서만) ──
@@ -612,6 +540,37 @@ export function createAngularCompilerPlugin(
             false, // skipLinker
             sideEffects,
           );
+
+          // Worker 패턴 처리 (D2)
+          const textContents = new TextDecoder().decode(contents);
+          const workerResult = transformWorkerPatterns(textContents, request, build);
+          if (workerResult != null) {
+            if (workerResult.workerMetafile != null) {
+              referencedFileTracker.add(
+                request,
+                Object.keys(workerResult.workerMetafile.inputs).map((input) =>
+                  path.join(cwd, input),
+                ),
+              );
+            }
+            if (
+              workerResult.workerMetafile != null ||
+              workerResult.workerOutputFiles != null
+            ) {
+              workerResultsByContainingFile.set(request, {
+                outputFiles: workerResult.workerOutputFiles,
+                metafile: workerResult.workerMetafile,
+              });
+            }
+            return {
+              contents: workerResult.contents,
+              loader: "js" as const,
+              resolveDir: path.dirname(request),
+              errors: workerResult.errors.length > 0 ? workerResult.errors : undefined,
+              warnings: workerResult.warnings.length > 0 ? workerResult.warnings : undefined,
+            };
+          }
+
           return {
             contents,
             loader: "js" as const,
@@ -622,13 +581,13 @@ export function createAngularCompilerPlugin(
 
       // ── onEnd ──
       build.onEnd((result: esbuild.BuildResult) => {
-        for (const { outputFiles, metafile } of additionalResults.values()) {
-          if (outputFiles != null && outputFiles.length > 0) {
-            result.outputFiles?.push(...outputFiles);
+        for (const wr of workerResultsByContainingFile.values()) {
+          if (wr.outputFiles != null && wr.outputFiles.length > 0) {
+            result.outputFiles?.push(...wr.outputFiles);
           }
-          if (result.metafile != null && metafile != null) {
-            Object.assign(result.metafile.inputs, metafile.inputs);
-            Object.assign(result.metafile.outputs, metafile.outputs);
+          if (result.metafile != null && wr.metafile != null) {
+            Object.assign(result.metafile.inputs, wr.metafile.inputs);
+            Object.assign(result.metafile.outputs, wr.metafile.outputs);
           }
         }
       });

package/src/esbuild/esbuild-config.ts

@@ -4,6 +4,7 @@ import fs from "fs/promises";
 import { createRequire } from "module";
 import type esbuild from "esbuild";
 import { consola } from "consola";
+import { addJsExtensionToImports } from "../utils/output-path-rewriter";
 
 const logger = consola.withTag("sd:cli:esbuild-config");
 
@@ -19,13 +20,7 @@ export async function writeChangedOutputFiles(outputFiles: esbuild.OutputFile[])
   await Promise.all(
     outputFiles.map(async (file) => {
       const finalText = file.path.endsWith(".js")
-        ? file.text.replace(
-            /((?:from|import)\s*["'])(\.\.?\/[^"']*?)(["'])/g,
-            (_match, prefix: string, importPath: string, suffix: string) => {
-              if (/\.(js|mjs|cjs|json|css|wasm|node)$/i.test(importPath)) return _match;
-              return `${prefix}${importPath}.js${suffix}`;
-            },
-          )
+        ? addJsExtensionToImports(file.text)
         : file.text;
 
       try {