Skip to content

fix(build-manifest): import compiled JS from dist/clis/ instead of raw TS #926

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jackwener merged 2 commits into from
Apr 10, 2026
Merged

fix(build-manifest): import compiled JS from dist/clis/ instead of raw TS #926

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0141d16
fix(build-manifest): import compiled JS from dist/clis/ instead of ra…
jackwener Apr 10, 2026
0e2b574
fix: write manifest to dist/cli-manifest.json where runtime expects it
jackwener Apr 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 26 additions & 7 deletions src/build-manifest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ import { findPackageRoot, getCliManifestPath } from './package-paths.js';

const PACKAGE_ROOT = findPackageRoot(fileURLToPath(import.meta.url));
const CLIS_DIR = path.join(PACKAGE_ROOT, 'clis');
const OUTPUT = getCliManifestPath(CLIS_DIR);
const DIST_CLIS_DIR = path.join(PACKAGE_ROOT, 'dist', 'clis');
// Write manifest next to the directory the runtime actually scans (dist/clis/).
// main.ts resolves BUILTIN_CLIS to dist/clis/ (relative to dist/src/main.js),
// so the manifest must be at dist/cli-manifest.json for discoverClis() to find it.
const OUTPUT = getCliManifestPath(DIST_CLIS_DIR);

export interface ManifestEntry {
site: string;
Expand Down Expand Up @@ -132,6 +136,14 @@ export async function loadTsManifestEntries(
})
.map(([, cmd]) => cmd);

// Resolve sourceFile relative to clis/ (not dist/clis/).
// When scanning compiled JS from dist/clis/, map back to the original .ts path.
let sourceRelative = path.relative(CLIS_DIR, filePath);
if (filePath.startsWith(DIST_CLIS_DIR)) {
const distRelative = path.relative(DIST_CLIS_DIR, filePath);
sourceRelative = distRelative.replace(/\.js$/, '.ts');
}

const seen = new Set<string>();
return runtimeCommands
.filter((cmd) => {
Expand All @@ -141,7 +153,7 @@ export async function loadTsManifestEntries(
return true;
})
.sort((a, b) => a.name.localeCompare(b.name))
.map(cmd => toManifestEntry(cmd, modulePath, path.relative(CLIS_DIR, filePath)));
.map(cmd => toManifestEntry(cmd, modulePath, sourceRelative));
} catch (err) {
// If parsing fails, log a warning (matching scanYaml behaviour) and skip the entry.
process.stderr.write(`Warning: failed to scan ${filePath}: ${getErrorMessage(err)}\n`);
Expand All @@ -152,14 +164,21 @@ export async function loadTsManifestEntries(
export async function buildManifest(): Promise<ManifestEntry[]> {
const manifest = new Map<string, ManifestEntry>();

if (fs.existsSync(CLIS_DIR)) {
for (const site of fs.readdirSync(CLIS_DIR)) {
const siteDir = path.join(CLIS_DIR, site);
// Scan compiled JS in dist/clis/ instead of raw TS in clis/.
// Node's type stripping does not rewrite '.js' → '.ts' in import
// specifiers, so dynamically importing .ts source files fails whenever
// they contain relative imports like './utils.js'. Importing the
// tsc-compiled .js avoids this entirely.
const scanDir = fs.existsSync(DIST_CLIS_DIR) ? DIST_CLIS_DIR : CLIS_DIR;

if (fs.existsSync(scanDir)) {
for (const site of fs.readdirSync(scanDir)) {
const siteDir = path.join(scanDir, site);
if (!fs.statSync(siteDir).isDirectory()) continue;
for (const file of fs.readdirSync(siteDir)) {
if (
(file.endsWith('.ts') && !file.endsWith('.d.ts') && !file.endsWith('.test.ts') && file !== 'index.ts') ||
(file.endsWith('.js') && !file.endsWith('.d.js') && !file.endsWith('.test.js') && file !== 'index.js')
(file.endsWith('.js') && !file.endsWith('.d.js') && !file.endsWith('.test.js') && file !== 'index.js') ||
(scanDir === CLIS_DIR && file.endsWith('.ts') && !file.endsWith('.d.ts') && !file.endsWith('.test.ts') && file !== 'index.ts')
) {
const filePath = path.join(siteDir, file);
const entries = await loadTsManifestEntries(filePath, site);
Expand Down