wirejs-scripts 3.0.182 → 3.0.184

package/bin.js

@@ -3,6 +3,7 @@
 import process from 'process';
 import { execSync, spawn } from 'child_process';
 import fs from 'fs';
+import { builtinModules } from 'module';
 import os from 'os';
 import path from 'path';
 import { fileURLToPath } from 'url';
@@ -32,6 +33,14 @@ let networkIp = null;
 let httpPort = 3000;
 let wsPort = 3001;
 
+const NODE_BUILTIN_EXTERNALS = Array.from(new Set(
+	builtinModules.flatMap(moduleName => {
+		if (moduleName.startsWith('_')) return [];
+		const bareName = moduleName.startsWith('node:') ? moduleName.slice(5) : moduleName;
+		return [bareName, `node:${bareName}`];
+	})
+));
+
 /** Tracks active node-cron tasks for CronJobs, keyed by absoluteId. */
 const activeCronTasks = new Map();
 
@@ -50,6 +59,53 @@ const logger = {
 	}
 };
 
+function normalizeExternalList(value) {
+	if (!value) return [];
+	if (typeof value === 'string') return [value];
+	if (Array.isArray(value)) return value.filter(item => typeof item === 'string');
+	return [];
+}
+
+let deploymentConfigPromise;
+
+async function loadDeploymentConfig() {
+	if (deploymentConfigPromise) return deploymentConfigPromise;
+
+	deploymentConfigPromise = (async () => {
+		const configPath = path.join(CWD, 'deployment-config.ts');
+		if (!fs.existsSync(configPath)) return {};
+
+		const result = await esbuild.build({
+			entryPoints: [configPath],
+			bundle: true,
+			platform: 'node',
+			format: 'esm',
+			write: false,
+			logLevel: 'silent',
+		});
+
+		const outputFile = result.outputFiles?.[0];
+		if (!outputFile) return {};
+
+		const compiledConfigPath = path.join(CWD, 'pre-dist', `.wirejs-deployment-config-${Date.now()}.mjs`);
+		await fs.promises.mkdir(path.dirname(compiledConfigPath), { recursive: true });
+		await fs.promises.writeFile(compiledConfigPath, outputFile.text, 'utf8');
+
+		try {
+			return (await import(`${compiledConfigPath}?t=${Date.now()}`)).default ?? {};
+		} finally {
+			await fs.promises.rm(compiledConfigPath, { force: true });
+		}
+	})();
+
+	return deploymentConfigPromise;
+}
+
+async function resolveSsgExternals() {
+	const config = await loadDeploymentConfig();
+	return normalizeExternalList(config?.ssgExternalModules);
+}
+
 const oldFetch = globalThis.fetch;
 globalThis.fetch = (url, ...args) => {
 	if (typeof url === 'string') {
@@ -272,51 +328,57 @@ async function compile(watch = false) {
 		if (ssgFiles.length === 0) return;
 
 		const preSsgDir = path.join(CWD, 'pre-dist', 'ssg');
+		const preDist = path.join(CWD, 'pre-dist');
+		const configuredSsgExternals = await resolveSsgExternals();
 
-		// 1. Build server-side bundles (ESM, for ssg.js import()) into pre-dist/ssg/
-		await esbuild.build({
-			entryPoints: ssgFiles,
-			outdir: preSsgDir,
-			outbase: ssgDir,
-			bundle: true,
-			platform: 'node',
-			format: 'esm',
-			conditions: ['wirejs:client'],
-		});
+		for (const ssgFile of ssgFiles) {
+			const external = configuredSsgExternals;
+			const browserExternal = Array.from(new Set([
+				...NODE_BUILTIN_EXTERNALS,
+				...configuredSsgExternals,
+			]));
 
-		// 2. Build browser-side bundles (IIFE, for client hydration) into dist/
-		//    These are referenced by <script src="..."> tags injected by ssg.js.
-		await esbuild.build({
-			entryPoints: ssgFiles,
-			outdir: distDir,
-			outbase: ssgDir,
-			bundle: true,
-			platform: 'browser',
-			format: 'iife',
-			conditions: ['wirejs:client'],
-			sourcemap: true,
-		});
+			// 1. Build server-side bundles (ESM, for ssg.js import()) into pre-dist/ssg/
+			await esbuild.build({
+				entryPoints: [ssgFile],
+				outdir: preSsgDir,
+				outbase: ssgDir,
+				bundle: true,
+				platform: 'node',
+				format: 'esm',
+				conditions: ['wirejs:client'],
+				external,
+			});
 
-		// 3. Run ssg.js on each server-side bundle to produce HTML.
-		//    Pass CWD/pre-dist as SRC_DIR so ssg.js strips the correct prefix
-		//    when building the hydration <script src="..."> path (e.g. /index.js).
-		const preDist = path.join(CWD, 'pre-dist');
-		const compiledSsgFiles = fs.readdirSync(preSsgDir, { recursive: true, withFileTypes: true })
-			.filter(e => e.isFile() && e.name.endsWith('.js'))
-			.map(e => path.join(e.parentPath ?? e.path, e.name));
+			// 2. Build browser-side bundles (IIFE, for client hydration) into dist/
+			//    These are referenced by <script src="..."> tags injected by ssg.js.
+			await esbuild.build({
+				entryPoints: [ssgFile],
+				outdir: distDir,
+				outbase: ssgDir,
+				bundle: true,
+				platform: 'browser',
+				format: 'iife',
+				conditions: ['wirejs:client'],
+				external: browserExternal,
+				sourcemap: true,
+			});
 
-		for (const ssgFile of compiledSsgFiles) {
+			// 3. Run ssg.js on each server-side bundle to produce HTML.
+			//    Pass CWD/pre-dist as SRC_DIR so ssg.js strips the correct prefix
+			//    when building the hydration <script src="..."> path (e.g. /index.js).
+			const compiledSsgFile = path.join(preSsgDir, path.relative(ssgDir, ssgFile)).replace(/\.[^.]+$/, '.js');
 			try {
 				const html = execSync(
-					`node ${path.join(__dirname, 'ssg.js')} ${preDist} ${ssgFile}`,
+					`node ${path.join(__dirname, 'ssg.js')} ${preDist} ${compiledSsgFile}`,
 					{ stdio: ['pipe', 'pipe', 'pipe'] }
 				).toString();
-				const relative = path.relative(preSsgDir, ssgFile).replace(/\.js$/, '.html');
+				const relative = path.relative(preSsgDir, compiledSsgFile).replace(/\.js$/, '.html');
 				const htmlOut = path.join(distDir, relative);
 				await fs.promises.mkdir(path.dirname(htmlOut), { recursive: true });
 				await fs.promises.writeFile(htmlOut, html);
 			} catch (err) {
-				logger.error(`Could not generate SSG page ${ssgFile}`, err);
+				logger.error(`Could not generate SSG page ${compiledSsgFile}`, err);
 			}
 		}
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wirejs-scripts",
-	"version": "3.0.182",
+	"version": "3.0.184",
 	"description": "Basic build and start commands for wirejs apps",
 	"type": "module",
 	"bin": {
@@ -28,7 +28,7 @@
 		"node-cron": "^4.2.1",
 		"rimraf": "^6.0.1",
 		"wirejs-dom": "^1.0.44",
-		"wirejs-hosting": "^0.1.184",
-		"wirejs-resources": "^0.1.184"
+		"wirejs-hosting": "^0.1.186",
+		"wirejs-resources": "^0.1.186"
 	}
 }