sku 16.5.0 → 16.6.0

package/dist/types/types.d.mts

@@ -6,7 +6,6 @@ import { Server as Server$1 } from "node:https";
 import { Express, RequestHandler } from "express";
 import { Linter } from "eslint";
 import { TestUserConfig } from "vitest/node";
-//#region src/types/types.d.ts
 type ViteRenderFunction = (options: {
   createUnsafeNonce?: () => string;
   clientEntry: string;
@@ -83,6 +82,7 @@ interface SkuSiteObject {
   languages?: readonly string[];
 }
 type SkuSite = string | SkuSiteObject;
+/** @knipignore Must be exported for declaration emit of the default config */
 interface TransformOutputPathFunctionParams {
   environment: string | undefined;
   site: string | undefined;
@@ -212,6 +212,22 @@ interface SkuConfigBase {
    * @link https://seek-oss.github.io/sku/configuration#displaynamesprod
    */
   displayNamesProd?: boolean;
+  /**
+   * When `true`, build output is split into subfolders of `<target>` instead of being written to its root:
+   *
+   * - Static apps: `sku build` writes rendered HTML documents to `<target>/rendered`,
+   *   and all other output (including files from `public`) to `<target>/client`.
+   *   `public` must not contain `.html` files.
+   * - Webpack SSR apps: `sku build-ssr` writes client assets (including files from `public`) to `<target>/client`,
+   *   and the server bundle to `<target>/server`.
+   *
+   * Managed Data Mode output is always split into `<target>/client` and `<target>/server`,
+   * so this option isn't needed.
+   *
+   * @default false
+   * @link https://seek-oss.github.io/sku/configuration#distsubfolders
+   */
+  distSubfolders?: boolean;
   /**
    * **Only for static apps**
    *
@@ -601,5 +617,4 @@ type SkuConfig = SkuConfigBase & (({
 } & WebpackSkuConfig) | ({
   bundler: 'vite';
 } & ViteSkuConfig));
-//#endregion
-export { Render, RenderAppProps, RenderCallbackParams, RenderableRoute, Server$2 as Server, SkuConfig, SkuConfigBase, SkuLanguage, SkuProvider, SkuRoute, SkuRouteObject, SkuSiteObject, TransformOutputPathFunctionParams, ViteRenderFunction, ViteSkuConfig, WebpackSkuConfig };
+export { Render, RenderAppProps, RenderCallbackParams, RenderableRoute, Server$2 as Server, SkuConfig, SkuLanguage, SkuRoute, SkuRouteObject, SkuSiteObject, TransformOutputPathFunctionParams, ViteRenderFunction };

package/dist/utils/allocatePort.mjs

@@ -2,7 +2,7 @@ import { caution, strong } from "../private/utils/src/console/styles.mjs";
 import "../private/utils/src/console/index.mjs";
 import { createDebug } from "obug";
 import getPort from "get-port";
-//#region src/utils/allocatePort.ts
+// src/utils/allocatePort.ts
 const debug = createDebug("sku:allocatePort");
 const allocatePort = async ({ port, host, strictPort = false }) => {
 	debug(`Finding available port with request for ${port}`);
@@ -16,5 +16,4 @@ const allocatePort = async ({ port, host, strictPort = false }) => {
 	}
 	return actualPort;
 };
-//#endregion
 export { allocatePort as default };

package/dist/utils/buildFileUtils.mjs

@@ -1,11 +1,11 @@
 import { cwd } from "../private/utils/src/filesystem/cwd.mjs";
-import "../private/utils/src/index.mjs";
 import exists from "./exists.mjs";
 import { copyDirContents } from "./copyDirContents.mjs";
+import "../private/utils/src/index.mjs";
 import { join, relative } from "node:path";
 import { mkdir, rm } from "node:fs/promises";
 import { fdir } from "fdir";
-//#region src/utils/buildFileUtils.ts
+// src/utils/buildFileUtils.ts
 const cleanTargetDirectory = async (target, includeDirectory = false) => {
 	const files = await new fdir().withBasePath().withMaxDepth(1).withDirs().glob(includeDirectory ? "**/*" : `${target}/*`).crawl(target).withPromise();
 	for (const file of files) await rm(file, {
@@ -13,11 +13,11 @@ const cleanTargetDirectory = async (target, includeDirectory = false) => {
 		force: true
 	});
 };
-const copyPublicFiles = async ({ paths }) => {
+const copyPublicFiles = async ({ paths, destination = paths.target }) => {
 	if (!await exists(paths.public)) return;
 	const currentCwd = cwd();
-	console.log(`Copying public assets from "${relative(currentCwd, paths.public)}" to "${relative(currentCwd, paths.target)}"`);
-	await copyDirContents(join(paths.public), join(paths.target));
+	console.log(`Copying public assets from "${relative(currentCwd, paths.public)}" to "${relative(currentCwd, destination)}"`);
+	await copyDirContents(join(paths.public), join(destination));
 };
 const ensureTargetDirectory = async (target) => {
 	await mkdir(target, { recursive: true });
@@ -26,5 +26,15 @@ const cleanStaticRenderEntry = async ({ paths }) => {
 	const files = await new fdir().withBasePath().filter((file) => file.endsWith("render.js")).crawl(paths.target).withPromise();
 	for (const file of files) await rm(file);
 };
-//#endregion
-export { cleanStaticRenderEntry, cleanTargetDirectory, copyPublicFiles, ensureTargetDirectory };
+/**
+* Throws if the public folder (including nested folders) contains any `.html` files.
+*/
+const assertNoPublicHtmlFiles = async ({ paths }) => {
+	if (!await exists(paths.public)) return;
+	const htmlFiles = await new fdir().withRelativePaths().filter((file) => /\.html$/i.test(file)).crawl(paths.public).withPromise();
+	if (htmlFiles.length > 0) {
+		const relativePublic = relative(cwd(), paths.public);
+		throw new Error(`HTML files must not be in the public folder when 'distSubfolders' is enabled, but found: ${htmlFiles.map((file) => `"${join(relativePublic, file)}"`).join(", ")}`);
+	}
+};
+export { assertNoPublicHtmlFiles, cleanStaticRenderEntry, cleanTargetDirectory, copyPublicFiles, ensureTargetDirectory };

package/dist/utils/certificate.mjs

@@ -1,13 +1,13 @@
 import { getPathFromCwd } from "../private/utils/src/filesystem/cwd.mjs";
 import { accent } from "../private/utils/src/console/styles.mjs";
 import "../private/utils/src/index.mjs";
-import "../private/utils/src/console/index.mjs";
 import telemetry_default from "../services/telemetry/index.mjs";
 import exists from "./exists.mjs";
+import "../private/utils/src/console/index.mjs";
 import { mkdir, readFile, stat, unlink, writeFile } from "node:fs/promises";
 import { performance } from "node:perf_hooks";
 import { generate } from "selfsigned";
-//#region src/utils/certificate.ts
+// src/utils/certificate.ts
 const certificateTtl = 864e5;
 const createSelfSignedCertificate = ({ hosts }) => {
 	console.log(accent("Generating self-signed certificate"));
@@ -70,5 +70,4 @@ const getCertificate = async (certificateDirName = ".ssl", hosts) => {
 	}
 	return readFile(certificatePath, { encoding: "utf8" });
 };
-//#endregion
 export { getCertificate as default };

package/dist/utils/configure.mjs

@@ -1,9 +1,9 @@
-import { log } from "./debug.mjs";
-import { getPathFromCwd } from "../private/utils/src/filesystem/cwd.mjs";
 import "../private/utils/src/index.mjs";
+import { getPathFromCwd } from "../private/utils/src/filesystem/cwd.mjs";
 import { validatePeerDeps as validatePeerDeps$1 } from "./validatePeerDeps.mjs";
+import { log } from "./debug.mjs";
 import fs from "node:fs";
-//#region src/utils/configure.ts
+// src/utils/configure.ts
 let skipConfigure = false;
 let skipValidatePeerDeps = false;
 const packageJson = getPathFromCwd("./package.json");
@@ -27,5 +27,4 @@ const validatePeerDeps = (skuContext) => {
 	}
 	validatePeerDeps$1(skuContext);
 };
-//#endregion
 export { configureProject, validatePeerDeps };

package/dist/utils/configureApp.mjs

@@ -5,9 +5,10 @@ import "../private/utils/src/index.mjs";
 import { banner } from "../private/utils/src/console/banner.mjs";
 import "../private/utils/src/console/index.mjs";
 import options from "../config/prettier.mjs";
+import { createTSConfig } from "../services/typescript/tsconfig.mjs";
 import { bundleReportFolder } from "../services/webpack/config/plugins/bundleAnalyzer.mjs";
 import getCertificate from "./certificate.mjs";
-import { createTSConfig } from "../services/typescript/tsconfig.mjs";
+import { coverageFolder } from "./coverageFolder.mjs";
 import { validateSkuConfigFormat } from "./validateSkuConfigFormat.mjs";
 import { getPnpmConfigDependencies } from "../services/packageManager/getPnpmConfigDependencies.mjs";
 import { validatePnpmConfig } from "../services/packageManager/pnpmConfig.mjs";
@@ -17,8 +18,7 @@ import { existsSync, readFileSync } from "node:fs";
 import { rm } from "node:fs/promises";
 import dedent from "dedent";
 import ensureGitignore from "ensure-gitignore";
-//#region src/utils/configureApp.ts
-const coverageFolder = "coverage";
+// src/utils/configureApp.ts
 const convertToForwardSlashPaths = (pathStr) => pathStr.replace(/\\/g, "/");
 const addSep = (p) => `${p}${path.sep}`;
 const warnOnSkuDependency = () => {
@@ -85,5 +85,4 @@ var configureApp_default = async (skuContext) => {
 	}
 	warnOnLegacyReact();
 };
-//#endregion
 export { configureApp_default as default };

package/dist/utils/constants/clientContextKey.mjs

@@ -1,4 +1,3 @@
-//#region src/utils/constants/clientContextKey.ts
+// src/utils/constants/clientContextKey.ts
 var clientContextKey_default = "__SKU_CLIENT_CONTEXT__";
-//#endregion
 export { clientContextKey_default as default };

package/dist/utils/copyDirContents.mjs

@@ -1,6 +1,6 @@
 import { hasErrorCode } from "./error-guards.mjs";
 import { cp, stat } from "node:fs/promises";
-//#region src/utils/copyDirContents.ts
+// src/utils/copyDirContents.ts
 const copyDirContents = async (srcPath, destPath) => {
 	if (!(await stat(srcPath)).isDirectory()) throw new Error(`Source ${srcPath} is not a directory`);
 	try {
@@ -10,5 +10,4 @@ const copyDirContents = async (srcPath, destPath) => {
 	}
 	await cp(srcPath, destPath, { recursive: true });
 };
-//#endregion
 export { copyDirContents };

package/dist/utils/coverageFolder.mjs

@@ -0,0 +1,3 @@
+// src/utils/coverageFolder.ts
+const coverageFolder = "coverage";
+export { coverageFolder };

package/dist/utils/createServer.mjs

@@ -1,7 +1,7 @@
 import getCertificate from "./certificate.mjs";
 import { createServer } from "node:http";
 import { createServer as createServer$1 } from "node:https";
-//#region src/utils/createServer.ts
+// src/utils/createServer.ts
 const createServer$2 = async ({ requestListener, httpsDevServer, hosts }) => {
 	if (!httpsDevServer) return createServer(requestListener);
 	const pems = await getCertificate(".ssl", hosts);
@@ -10,5 +10,4 @@ const createServer$2 = async ({ requestListener, httpsDevServer, hosts }) => {
 		cert: pems
 	}, requestListener);
 };
-//#endregion
 export { createServer$2 as default };

package/dist/utils/csp.mjs

@@ -1,5 +1,5 @@
 import { createHash } from "node:crypto";
-//#region src/utils/csp.ts
+// src/utils/csp.ts
 const parseCspReportTo = (cspReportTo) => {
 	if (cspReportTo === void 0) return;
 	if (Array.isArray(cspReportTo)) {
@@ -16,5 +16,4 @@ const parseCspReportTo = (cspReportTo) => {
 	return { endpoint: cspReportTo };
 };
 const stringifyReportingEndpoints = (reportingEndpoints) => Array.from(new Set(reportingEndpoints.map(({ endpoint, url }) => `${endpoint}="${url ?? ""}"`))).join(", ");
-//#endregion
 export { parseCspReportTo, stringifyReportingEndpoints };

package/dist/utils/debug.mjs

@@ -1,9 +1,8 @@
 import { createDebug, enable } from "obug";
-//#region src/utils/debug.ts
+// src/utils/debug.ts
 const log = createDebug("sku:bin");
 const initDebug = () => {
 	process.env.DEBUG = `sku:*${`,${process.env.DEBUG}` || ""}`;
 	enable(process.env.DEBUG);
 };
-//#endregion
 export { initDebug, log };

package/dist/utils/detectUnnecessaryPolyfillsFromConfig.mjs

@@ -1,5 +1,5 @@
 import { getDeprecatedPolyfill } from "./polyfillDetector.mjs";
-//#region src/utils/detectUnnecessaryPolyfillsFromConfig.ts
+// src/utils/detectUnnecessaryPolyfillsFromConfig.ts
 /**
 * Detects unnecessary polyfills from the configured polyfills array
 * by matching package names against the registry.
@@ -13,5 +13,4 @@ const detectUnnecessaryPolyfillsFromConfig = (polyfills) => polyfills.reduce((ac
 	});
 	return acc;
 }, []);
-//#endregion
 export { detectUnnecessaryPolyfillsFromConfig };

package/dist/utils/detectUnnecessaryPolyfillsFromDependencies.mjs

@@ -2,7 +2,7 @@ import { getPathFromCwd } from "../private/utils/src/filesystem/cwd.mjs";
 import "../private/utils/src/index.mjs";
 import { getDeprecatedPolyfill } from "./polyfillDetector.mjs";
 import { readFileSync } from "node:fs";
-//#region src/utils/detectUnnecessaryPolyfillsFromDependencies.ts
+// src/utils/detectUnnecessaryPolyfillsFromDependencies.ts
 /**
 * Detects unnecessary polyfills from package.json dependencies
 * by matching package names against the registry.
@@ -33,5 +33,4 @@ const detectUnnecessaryPolyfillsFromDependencies = () => {
 		throw new Error(`Failed to read or parse package.json at ${packageJsonPath}: ${error instanceof Error ? error.message : "Unknown error"}`);
 	}
 };
-//#endregion
 export { detectUnnecessaryPolyfillsFromDependencies };

package/dist/utils/distDirectories.mjs

@@ -0,0 +1,17 @@
+import path from "node:path";
+// src/utils/distDirectories.ts
+/**
+* Resolves the output directories for a build target.
+*
+* - `distClient`: client assets and `public` files
+* - `distRendered`: rendered HTML and metadata (static builds only)
+* - `distServer`: the SSR server build
+*
+* With `useSubfolders` off, every directory is the target itself (the legacy layout).
+*/
+const getDistDirectories = ({ targetPath, useSubfolders }) => ({
+	distClient: useSubfolders ? path.join(targetPath, "client") : targetPath,
+	distRendered: useSubfolders ? path.join(targetPath, "rendered") : targetPath,
+	distServer: useSubfolders ? path.join(targetPath, "server") : targetPath
+});
+export { getDistDirectories };

package/dist/utils/error-guards.mjs

@@ -1,5 +1,4 @@
-//#region src/utils/error-guards.ts
+// src/utils/error-guards.ts
 const hasErrorCode = (e) => typeof e === "object" && e !== null && "code" in e && typeof e.code === "string";
 const hasErrorMessage = (e) => typeof e === "object" && e !== null && "message" in e && typeof e.message === "string";
-//#endregion
 export { hasErrorCode, hasErrorMessage };

package/dist/utils/execAsync.mjs

@@ -1,5 +1,5 @@
 import { exec } from "node:child_process";
-//#region src/utils/execAsync.ts
+// src/utils/execAsync.ts
 function execAsync(command, options) {
 	return new Promise((res, rej) => {
 		exec(command, options, (error, stdout) => {
@@ -8,5 +8,4 @@ function execAsync(command, options) {
 		});
 	});
 }
-//#endregion
 export { execAsync };

package/dist/utils/exists.mjs

@@ -1,5 +1,5 @@
 import { access } from "node:fs/promises";
-//#region src/utils/exists.ts
+// src/utils/exists.ts
 /**
 * Convenience wrapper for fs.access that returns `true` if the access check was successful and `false` otherwise
 */
@@ -11,5 +11,4 @@ const exists = async (path) => {
 		return false;
 	}
 };
-//#endregion
 export { exists as default };

package/dist/utils/formatMs.mjs

@@ -1,4 +1,4 @@
-//#region src/utils/formatMs.ts
+// src/utils/formatMs.ts
 const formatter = new Intl.DurationFormat("en", { style: "narrow" });
 /**
 * Formats a duration in milliseconds as a human-readable string (e.g. `500ms`, `1m 5s`).
@@ -18,5 +18,4 @@ const formatMs = (milliseconds) => {
 		milliseconds: ms
 	});
 };
-//#endregion
 export { formatMs };

package/dist/utils/isCI.mjs

@@ -1,4 +1,3 @@
-//#region src/utils/isCI.ts
+// src/utils/isCI.ts
 var isCI_default = Boolean(process.env.CI || process.env.BUILDKITE_BUILD_ID);
-//#endregion
 export { isCI_default as default };

package/dist/utils/language-utils.mjs

@@ -1,13 +1,15 @@
 import { routeMatcher } from "./routeMatcher.mjs";
 import { createDebug } from "obug";
-//#region src/utils/language-utils.ts
+// src/utils/language-utils.ts
 const log = createDebug("sku:language-middleware");
 function getValidLanguagesForRoute({ route, languages, sites }) {
 	const routeIsForSpecificSite = typeof route.siteIndex === "number";
 	let languagesToRender = [null];
-	if (languages) if (route.languages) languagesToRender = route.languages.slice();
-	else if (routeIsForSpecificSite) languagesToRender = sites[route.siteIndex ?? 0].languages?.slice() || languages;
-	else languagesToRender = languages;
+	if (languages) {
+		if (route.languages) languagesToRender = route.languages.slice();
+		else if (routeIsForSpecificSite) languagesToRender = sites[route.siteIndex ?? 0].languages?.slice() || languages;
+		else languagesToRender = languages;
+	}
 	const languageNames = languagesToRender.map((lang) => lang && typeof lang !== "string" ? lang.name : lang);
 	log(`Using languages ${languageNames.join(", ")} for route:`, route.name || route.route);
 	return languageNames;
@@ -54,5 +56,4 @@ function getLanguageFromRoute(path, route, skuConfig) {
 function getRouteWithLanguage(routePath, language) {
 	return routePath.replace(/(\$|\:)language/g, language || "");
 }
-//#endregion
 export { getLanguageFromRoute, getRouteWithLanguage, getValidLanguagesForRoute };

package/dist/utils/pathAliasImports.mjs

@@ -2,11 +2,11 @@ import { getPathFromCwd } from "../private/utils/src/filesystem/cwd.mjs";
 import { accentLight, secondary } from "../private/utils/src/console/styles.mjs";
 import "../private/utils/src/index.mjs";
 import { hasErrorMessage } from "./error-guards.mjs";
-import "../private/utils/src/console/index.mjs";
 import { suggestScript } from "./suggestScript.mjs";
+import "../private/utils/src/console/index.mjs";
 import { createDebug } from "obug";
 import { readFile, writeFile } from "node:fs/promises";
-//#region src/utils/pathAliasImports.ts
+// src/utils/pathAliasImports.ts
 const debug = createDebug("sku:path-alias-imports");
 const makeSyncedPackageJson = async (pathAliases) => {
 	const packageJsonPath = getPathFromCwd("package.json");
@@ -61,5 +61,4 @@ const assertPathAliasImports = async (pathAliases = {}) => {
 	suggestScript("format");
 	process.exit(1);
 };
-//#endregion
 export { assertPathAliasImports, checkPathAliasImports, syncPathAliasImports };

package/dist/utils/polyfillDetector.mjs

@@ -1,7 +1,7 @@
 import { POLYFILL_REGISTRY } from "./polyfillRegistry.mjs";
 import { detectUnnecessaryPolyfillsFromDependencies } from "./detectUnnecessaryPolyfillsFromDependencies.mjs";
 import { detectUnnecessaryPolyfillsFromConfig } from "./detectUnnecessaryPolyfillsFromConfig.mjs";
-//#region src/utils/polyfillDetector.ts
+// src/utils/polyfillDetector.ts
 /**
 * Gets the polyfill registry entry for a given polyfill name, or null if not deprecated
 */
@@ -22,5 +22,4 @@ const detectUnnecessaryPolyfills = (polyfills) => {
 	configPolyfills.forEach((polyfill) => polyfillMap.set(polyfill.polyfillName, polyfill));
 	return Array.from(polyfillMap.values());
 };
-//#endregion
 export { detectUnnecessaryPolyfills, getDeprecatedPolyfill };

package/dist/utils/polyfillRegistry.mjs

@@ -1,4 +1,4 @@
-//#region src/utils/polyfillRegistry.ts
+// src/utils/polyfillRegistry.ts
 /**
 * Registry of polyfills that are unnecessary for sku's supported browsers
 */
@@ -32,5 +32,4 @@ const POLYFILL_REGISTRY = {
 	"raf/polyfill": { reason: "requestAnimationFrame is well established and works across many devices and browser versions. It has been available across browsers since July 2015." },
 	"url-search-params-polyfill": { reason: "URLSearchParams is well established and works across many devices and browser versions. It has been available across browsers since April 2018." }
 };
-//#endregion
 export { POLYFILL_REGISTRY };

package/dist/utils/polyfillWarnings.mjs

@@ -1,8 +1,8 @@
 import { caution, critical, secondary, strong } from "../private/utils/src/console/styles.mjs";
-import "../private/utils/src/console/index.mjs";
-import telemetry_default from "../services/telemetry/index.mjs";
 import { detectUnnecessaryPolyfills } from "./polyfillDetector.mjs";
-//#region src/utils/polyfillWarnings.ts
+import telemetry_default from "../services/telemetry/index.mjs";
+import "../private/utils/src/console/index.mjs";
+// src/utils/polyfillWarnings.ts
 /**
 * Validates and displays warnings for unnecessary polyfills in a clean, formatted way
 */
@@ -28,5 +28,4 @@ const displayPolyfillWarning = (polyfill) => {
 	else console.log(secondary(`     Action: Remove from ${polyfill.dependencyType} in package.json`));
 	console.log();
 };
-//#endregion
 export { validatePolyfills };

package/dist/utils/resolvePolyfills.mjs

@@ -1,8 +1,7 @@
 import { cwd } from "../private/utils/src/filesystem/cwd.mjs";
 import "../private/utils/src/index.mjs";
 import { createRequire } from "node:module";
-//#region src/utils/resolvePolyfills.ts
+// src/utils/resolvePolyfills.ts
 const require = createRequire(import.meta.url);
 const resolvePolyfills = (polyfills) => polyfills.map((polyfill) => require.resolve(polyfill, { paths: [cwd()] }));
-//#endregion
 export { resolvePolyfills };

package/dist/utils/routeMatcher.mjs

@@ -1,7 +1,7 @@
 import { getSiteForHost } from "../context/getSiteForHost.mjs";
 import memoize from "memoize";
 import { match } from "path-to-regexp";
-//#region src/utils/routeMatcher.ts
+// src/utils/routeMatcher.ts
 /**
 * Finds the appropriate route for a given URL
 *
@@ -22,5 +22,4 @@ const createRouteMatcher = (route) => {
 	return match(normalisedRoute);
 };
 const routeMatcher = memoize(createRouteMatcher);
-//#endregion
 export { getMatchingRoute, routeMatcher };

package/dist/utils/runBin.mjs

@@ -1,7 +1,7 @@
 import { createRequire } from "node:module";
 import path from "node:path";
 import { x } from "tinyexec";
-//#region src/utils/runBin.ts
+// src/utils/runBin.ts
 const require = createRequire(import.meta.url);
 const resolveBin = (packageName, binName) => {
 	const packageJson = require(`${packageName}/package.json`);
@@ -13,5 +13,4 @@ const spawnPromise = async (commandPath, args, options) => {
 	return { exitCode };
 };
 const runBin = ({ packageName, binName, args, options }) => spawnPromise(resolveBin(packageName, binName), args, options);
-//#endregion
 export { runBin };

package/dist/utils/runLintChecks.mjs

@@ -1,4 +1,4 @@
-//#region src/utils/runLintChecks.ts
+// src/utils/runLintChecks.ts
 /**
 * Runs the provided lint checks sequentially, returning `true` if any
 * check exits with a non-zero exit code.
@@ -11,5 +11,4 @@ const runLintChecks = async (checks) => {
 	}
 	return hasFailure;
 };
-//#endregion
 export { runLintChecks };

package/dist/utils/suggestScript.mjs

@@ -3,7 +3,7 @@ import { accent, strong } from "../private/utils/src/console/styles.mjs";
 import { getExecuteCommand, getRunCommand } from "../private/utils/src/packageManager/packageManager.mjs";
 import "../private/utils/src/index.mjs";
 import "../private/utils/src/console/index.mjs";
-//#region src/utils/suggestScript.ts
+// src/utils/suggestScript.ts
 const findPackageScriptName = (scriptContents) => {
 	let pkg;
 	try {
@@ -23,5 +23,4 @@ const suggestScript = (scriptName, options) => {
 	const suggestedScript = getSuggestedScript(scriptName, options);
 	console.log(accent(`To fix this issue, run '${strong(suggestedScript)}'`));
 };
-//#endregion
 export { suggestScript };

package/dist/utils/validatePeerDeps.mjs

@@ -9,7 +9,7 @@ import { readFileSync } from "node:fs";
 import { readFile } from "node:fs/promises";
 import semver from "semver";
 import { fdir } from "fdir";
-//#region src/utils/validatePeerDeps.ts
+// src/utils/validatePeerDeps.ts
 const asyncMap = (list, fn) => Promise.all(list.map((item) => fn(item)));
 const singletonPackages = ["@vanilla-extract/css"];
 const validatePeerDeps = async ({ paths }) => {
@@ -64,5 +64,4 @@ const validatePeerDeps = async ({ paths }) => {
 		console.error(e);
 	}
 };
-//#endregion
 export { validatePeerDeps };

package/dist/utils/validateSkuConfigFormat.mjs

@@ -2,7 +2,7 @@ import { accent } from "../private/utils/src/console/styles.mjs";
 import { banner } from "../private/utils/src/console/banner.mjs";
 import "../private/utils/src/console/index.mjs";
 import { readFileSync } from "node:fs";
-//#region src/utils/validateSkuConfigFormat.ts
+// src/utils/validateSkuConfigFormat.ts
 /**
 * Matches a reference to the CommonJS `module.exports` anywhere in the file.
 * `module` is a restricted word in ESM, so `module.exports` should never
@@ -18,5 +18,4 @@ const validateSkuConfigFormat = (appSkuConfigPath) => {
 		process.exit(1);
 	}
 };
-//#endregion
 export { isCjsSkuConfig, validateSkuConfigFormat };

package/dist/utils/warnOnLegacyReact.mjs

@@ -5,7 +5,7 @@ import { banner } from "../private/utils/src/console/banner.mjs";
 import "../private/utils/src/console/index.mjs";
 import { createDebug } from "obug";
 import semver from "semver";
-//#region src/utils/warnOnLegacyReact.ts
+// src/utils/warnOnLegacyReact.ts
 const MIN_REACT_VERSION = "19.0.0";
 const debug = createDebug("sku:warnOnLegacyReact");
 const warnOnLegacyReact = () => {
@@ -17,5 +17,4 @@ const warnOnLegacyReact = () => {
 		debug("React not found, skipping warning");
 	}
 };
-//#endregion
 export { warnOnLegacyReact };

package/dist/vite/prerender-worker.mjs

@@ -1,20 +1,23 @@
-import { stringifyReportingEndpoints } from "../utils/csp.mjs";
-import { createPreRenderedHtml } from "../services/vite/helpers/html/createPreRenderedHtml.mjs";
 import { createOutDir, renderEntryChunkName } from "../services/vite/helpers/bundleConfig.mjs";
+import { createPreRenderedHtml } from "../services/vite/helpers/html/createPreRenderedHtml.mjs";
 import createCSPHandler from "../services/webpack/entry/csp.mjs";
 import { ensureTargetDirectory } from "../utils/buildFileUtils.mjs";
+import { stringifyReportingEndpoints } from "../utils/csp.mjs";
 import path from "node:path";
 import { writeFile } from "node:fs/promises";
 import { createCollector } from "@sku-lib/vite/collector";
 import { mockAdapter, setAdapter } from "@vanilla-extract/css/adapter";
 import { workerData } from "node:worker_threads";
-//#region src/services/vite/helpers/prerender/prerenderWorker.ts
+// src/services/vite/helpers/prerender/prerenderWorker.ts
 setAdapter(mockAdapter);
 const typedWorkerData = workerData;
 if (!typedWorkerData || typedWorkerData.jobs.length === 0) process.exit(0);
-const { sharedWorkerData: { cspEnabled, cspDelivery, cspExtraScriptSrcHosts, cspReportTo, cspReportOnlyEnabled, cspReportOnlyExtraScriptSrcHosts, cspReportOnlyReportTo, manifest, publicPath, targetPath }, jobs } = typedWorkerData;
+const { sharedWorkerData: { cspEnabled, cspDelivery, cspExtraScriptSrcHosts, cspReportTo, cspReportOnlyEnabled, cspReportOnlyExtraScriptSrcHosts, cspReportOnlyReportTo, manifest, publicPath, targetPath, distSubfolders }, jobs } = typedWorkerData;
 if (!targetPath) throw new Error("targetPath is required in workerData");
-const outDir = createOutDir(targetPath);
+const outDir = createOutDir({
+	targetPath,
+	useSubfolders: distSubfolders
+});
 let render;
 try {
 	render = (await import(path.join(outDir.ssg, renderEntryChunkName))).default;
@@ -88,5 +91,4 @@ await Promise.all(jobs.map(async ({ environment, filePath, site, route, routeNam
 		}
 	}
 }));
-//#endregion
 export {};

package/dist/webpack/client.mjs

@@ -2,7 +2,7 @@ import clientContextKey_default from "../utils/constants/clientContextKey.mjs";
 import { loadableReady } from "@loadable/component";
 import client from "__sku_alias__clientEntry";
 import dedent from "dedent";
-//#region src/services/webpack/entry/client/index.ts
+// src/services/webpack/entry/client/index.ts
 if (process.env.NODE_ENV === "development") {
 	if (typeof client !== "function") throw new Error(dedent`
       The sku client entry ('${__SKU_CLIENT_PATH__}') must export a function that calls hydrateRoot. e.g.
@@ -26,5 +26,4 @@ loadableReady(() => {
 	if (dataElement) clientContext = JSON.parse(dataElement.textContent || "{}");
 	client(clientContext);
 });
-//#endregion
 export {};

package/dist/webpack/library-render.d.mts

@@ -1,5 +1,3 @@
 import { RenderAppProps } from "../types/types.mjs";
-//#region src/services/webpack/entry/libraryRender/index.d.ts
 declare const _default: (renderParams: RenderAppProps) => any;
-//#endregion
 export { _default as default };

package/dist/webpack/library-render.mjs

@@ -1,5 +1,5 @@
 import render from "__sku_alias__renderEntry";
-//#region src/services/webpack/entry/libraryRender/index.ts
+// src/services/webpack/entry/libraryRender/index.ts
 const libraryName = __SKU_LIBRARY_NAME__;
 const libraryFile = __SKU_LIBRARY_FILE__;
 const libraryPath = `${__SKU_PUBLIC_PATH__}${libraryFile ?? libraryName}`;
@@ -15,5 +15,4 @@ var libraryRender_default = (renderParams) => {
 		bodyTags: `<script src="${libraryPath}.js"><\/script>`
 	});
 };
-//#endregion
 export { libraryRender_default as default };