sku 16.5.0 → 16.6.0

package/dist/services/vite/ssr/skuContext.mjs

@@ -1,6 +1,6 @@
 import { jsx } from "react/jsx-runtime";
 import { createContext, useContext } from "react";
-//#region src/services/vite/ssr/skuContext.tsx
+// src/services/vite/ssr/skuContext.tsx
 const SkuProviderContext = createContext(null);
 const SkuProvider = ({ site, clientContext, reactContext, children }) => /* @__PURE__ */ jsx(SkuProviderContext.Provider, {
 	value: {
@@ -31,5 +31,4 @@ function createSkuContexts() {
 		useReactContext: () => useSkuProviderContext().reactContext
 	};
 }
-//#endregion
 export { SkuProvider, createSkuContexts };

package/dist/services/vite/ssr/ssrRequestContextMiddleware.mjs

@@ -1,5 +1,5 @@
 import { createSsrRequestContextStore } from "./createSsrRequestContextStore.mjs";
-//#region src/services/vite/ssr/ssrRequestContextMiddleware.ts
+// src/services/vite/ssr/ssrRequestContextMiddleware.ts
 const stores = /* @__PURE__ */ new WeakMap();
 /**
 * Lazily attaches request-scoped SSR context before consumer middleware:
@@ -14,5 +14,4 @@ const createSsrRequestContextMiddleware = () => (req, _res, next) => {
 	next();
 };
 const getRequestContextStore = (req) => stores.get(req);
-//#endregion
 export { createSsrRequestContextMiddleware, getRequestContextStore };

package/dist/services/vite/ssr/ssrServerShared.mjs

@@ -1,5 +1,4 @@
 import "./createWebRequest.mjs";
-import "./sendResponse.mjs";
 import { createHtmlRenderMiddleware } from "./createHtmlRenderMiddleware.mjs";
 import { listen, mountConsumerMiddleware, resolveBoundPort } from "./listen.mjs";
 export { createHtmlRenderMiddleware, listen, mountConsumerMiddleware, resolveBoundPort };

package/dist/services/vite/ssr/start.mjs

@@ -1,7 +1,7 @@
 import { allocateClientPort } from "../helpers/allocateClientPort.mjs";
 import { printServerUrls } from "../helpers/printServerUrls.mjs";
 import { createDevSsrServer } from "./createDevSsrServer.mjs";
-//#region src/services/vite/ssr/start.ts
+// src/services/vite/ssr/start.ts
 const startSsr = async ({ skuContext, environment }) => {
 	const { skuContext: skuContextOverride, port } = await allocateClientPort(skuContext);
 	const { vite } = await createDevSsrServer({
@@ -14,5 +14,4 @@ const startSsr = async ({ skuContext, environment }) => {
 	});
 	vite.bindCLIShortcuts({ print: true });
 };
-//#endregion
 export { startSsr };

package/dist/services/vite/ssr/startProductionSsrServer.mjs

@@ -1,12 +1,12 @@
-import { findEntryChunk, joinPublicPath } from "./resolveAssets.mjs";
 import exists from "../../../utils/exists.mjs";
 import { CLIENT_MANIFEST_RELATIVE_PATH } from "./clientManifestPath.mjs";
+import { findEntryChunk, joinPublicPath } from "./resolveAssets.mjs";
 import { listen } from "./listen.mjs";
 import "./ssrServerShared.mjs";
 import path from "node:path";
 import { readFile } from "node:fs/promises";
 import { fileURLToPath } from "node:url";
-//#region src/services/vite/ssr/startProductionSsrServer.ts
+// src/services/vite/ssr/startProductionSsrServer.ts
 const startProductionSsrServer = async ({ middleware, onListen, render }) => {
 	const serverDirectory = path.dirname(fileURLToPath(import.meta.url));
 	const bakedManifestPath = path.join(serverDirectory, CLIENT_MANIFEST_RELATIVE_PATH);
@@ -43,5 +43,4 @@ const startProductionSsrServer = async ({ middleware, onListen, render }) => {
 		cspReportOnlyReportTo: csp.reportOnlyReportTo
 	});
 };
-//#endregion
 export { startProductionSsrServer };

package/dist/services/vite/ssr/streamDocument.mjs

@@ -1,7 +1,7 @@
 import { abortReason } from "./abortReason.mjs";
 import { createDocumentAttempt } from "./createDocumentAttempt.mjs";
 import { getStaticContextFromError } from "./getStaticContextFromError.mjs";
-//#region src/services/vite/ssr/streamDocument.tsx
+// src/services/vite/ssr/streamDocument.tsx
 const DOCUMENT_RENDER_TIMEOUT_MS = 1e4;
 const isTimeoutError = (error) => error instanceof DOMException && error.name === "TimeoutError";
 const onDestinationEnd = (destination, listener) => {
@@ -64,5 +64,4 @@ const streamDocument = async ({ timeoutMs, ...attemptArgs }) => {
 		}
 	}
 };
-//#endregion
 export { DOCUMENT_RENDER_TIMEOUT_MS, streamDocument };

package/dist/services/vite/ssr/types.d.mts

@@ -6,7 +6,6 @@ import { ClientInstrumentation, HydrationState, RouteObject, RouterContextProvid
 import { Server } from "node:http";
 import { Server as Server$1 } from "node:https";
 import { Express, Request as Request$1, RequestHandler } from "express";
-//#region src/services/vite/ssr/types.d.ts
 interface DocumentAssets {
   css: string[];
   modulePreloads: string[];
@@ -202,5 +201,4 @@ declare module 'express-serve-static-core' {
     getCspNonce?: () => string;
   }
 }
-//#endregion
-export { CommitDocument, CommitDocumentOptions, DocumentAssets, DocumentDestination, JsonValue, MapRoutePath, MapRoutePathArgs, RenderAssets, RenderManifest, RenderOptions, RenderResult, RenderSuccess, type SiteOf, SkuClientEntry, SkuClientGetReactContext, SkuClientGetRouterContext, SkuGetLanguage, SkuGetSite, SkuMiddleware, SkuOnHydrate, SkuOnListen, SkuRouteObject, SkuServerEntry, SkuServerGetReactContext, SkuServerGetRouterContext };
+export { CommitDocument, DocumentAssets, DocumentDestination, JsonValue, MapRoutePath, MapRoutePathArgs, RenderAssets, RenderManifest, RenderOptions, RenderResult, RenderSuccess, type SiteOf, SkuClientEntry, SkuMiddleware, SkuOnHydrate, SkuOnListen, SkuRouteObject, SkuServerEntry };

package/dist/services/vite/ssr/wrapPipeWithInsertHtml.mjs

@@ -1,5 +1,5 @@
 import { createInsertHtmlTransform } from "./createInsertHtmlTransform.mjs";
-//#region src/services/vite/ssr/wrapPipeWithInsertHtml.ts
+// src/services/vite/ssr/wrapPipeWithInsertHtml.ts
 const wrapPipeWithInsertHtml = (pipe, queue, abort) => {
 	const wrappedPipe = (destination) => {
 		const transform = createInsertHtmlTransform(queue);
@@ -14,5 +14,4 @@ const wrapPipeWithInsertHtml = (pipe, queue, abort) => {
 	};
 	return wrappedPipe;
 };
-//#endregion
 export { wrapPipeWithInsertHtml };

package/dist/services/vite/static/build.mjs

@@ -1,16 +1,28 @@
+import { assertNoPublicHtmlFiles, cleanTargetDirectory, copyPublicFiles, ensureTargetDirectory } from "../../../utils/buildFileUtils.mjs";
 import { createOutDir } from "../helpers/bundleConfig.mjs";
-import { cleanTargetDirectory, copyPublicFiles } from "../../../utils/buildFileUtils.mjs";
 import { createConfig } from "../helpers/config/createConfig.mjs";
 import { prerenderConcurrently } from "../helpers/prerender/prerenderConcurrently.mjs";
+import path from "node:path";
 import { createBuilder } from "vite";
-//#region src/services/vite/static/build.ts
+// src/services/vite/static/build.ts
 const buildStatic = async (skuContext) => {
-	const outDir = createOutDir(skuContext.paths.target);
+	const { distSubfolders } = skuContext;
+	const outDir = createOutDir({
+		targetPath: skuContext.paths.target,
+		useSubfolders: distSubfolders
+	});
+	if (distSubfolders) {
+		await assertNoPublicHtmlFiles(skuContext);
+		await ensureTargetDirectory(skuContext.paths.target);
+		await cleanTargetDirectory(skuContext.paths.target);
+	}
 	await (await createBuilder(createConfig(skuContext))).buildApp();
 	if (skuContext.routes) await prerenderConcurrently(skuContext);
 	await cleanTargetDirectory(outDir.ssg, true);
-	await cleanTargetDirectory(outDir.join(".vite"), true);
-	await copyPublicFiles(skuContext);
+	await cleanTargetDirectory(path.join(outDir.distClient, ".vite"), true);
+	await copyPublicFiles({
+		paths: skuContext.paths,
+		destination: outDir.distClient
+	});
 };
-//#endregion
 export { buildStatic };

package/dist/services/vite/static/start.mjs

@@ -1,8 +1,8 @@
-import { createConfig } from "../helpers/config/createConfig.mjs";
 import { allocateClientPort } from "../helpers/allocateClientPort.mjs";
+import { createConfig } from "../helpers/config/createConfig.mjs";
 import { printServerUrls } from "../helpers/printServerUrls.mjs";
 import { createServer } from "vite";
-//#region src/services/vite/static/start.ts
+// src/services/vite/static/start.ts
 const startStatic = async ({ skuContext, environment }) => {
 	const { skuContext: skuContextOverride, port } = await allocateClientPort(skuContext);
 	const viteServer = await createServer(createConfig(skuContextOverride, environment));
@@ -13,5 +13,4 @@ const startStatic = async ({ skuContext, environment }) => {
 	});
 	viteServer.bindCLIShortcuts({ print: true });
 };
-//#endregion
 export { startStatic };

package/dist/services/vocab/config.mjs

@@ -1,6 +1,6 @@
 import { createDebug } from "obug";
 import { generator } from "@vocab/pseudo-localize";
-//#region src/services/vocab/config.ts
+// src/services/vocab/config.ts
 const log = createDebug("sku:vocab:config");
 const getVocabConfig = ({ languages }) => {
 	if (!languages) {
@@ -20,5 +20,4 @@ const getVocabConfig = ({ languages }) => {
 	log("Using Vocab options:", result);
 	return result;
 };
-//#endregion
 export { getVocabConfig };

package/dist/services/vocab/runVocab.mjs

@@ -1,6 +1,6 @@
 import { getVocabConfig } from "./config.mjs";
 import { compile } from "@vocab/core";
-//#region src/services/vocab/runVocab.ts
+// src/services/vocab/runVocab.ts
 const runVocabCompile = async (skuContext) => {
 	const vocabConfig = getVocabConfig(skuContext);
 	if (vocabConfig) {
@@ -15,5 +15,4 @@ const watchVocabCompile = async (skuContext) => {
 		await compile({ watch: true }, vocabConfig);
 	}
 };
-//#endregion
 export { runVocabCompile, watchVocabCompile };

package/dist/services/webpack/config/cache.mjs

@@ -1,5 +1,5 @@
 import isCI_default from "../../../utils/isCI.mjs";
-//#region src/services/webpack/config/cache.ts
+// src/services/webpack/config/cache.ts
 const disableCacheOverride = Boolean(process.env.SKU_DISABLE_CACHE);
 function getWebpackCacheSettings({ isDevServer, paths }) {
 	if (isDevServer && !isCI_default && !disableCacheOverride) return {
@@ -8,5 +8,4 @@ function getWebpackCacheSettings({ isDevServer, paths }) {
 	};
 	return false;
 }
-//#endregion
 export { getWebpackCacheSettings as default };

package/dist/services/webpack/config/plugins/bundleAnalyzer.mjs

@@ -1,12 +1,11 @@
 import { getPathFromCwd } from "../../../../private/utils/src/filesystem/cwd.mjs";
 import "../../../../private/utils/src/index.mjs";
 import { BundleAnalyzerPlugin } from "webpack-bundle-analyzer";
-//#region src/services/webpack/config/plugins/bundleAnalyzer.ts
+// src/services/webpack/config/plugins/bundleAnalyzer.ts
 const bundleReportFolder = "report";
 const bundleAnalyzerPlugin = ({ name }) => new BundleAnalyzerPlugin({
 	analyzerMode: "static",
 	openAnalyzer: false,
 	reportFilename: getPathFromCwd(`${bundleReportFolder}/${name}.html`)
 });
-//#endregion
 export { bundleAnalyzerPlugin, bundleReportFolder };

package/dist/services/webpack/config/plugins/createHtmlRenderPlugin.mjs

@@ -1,9 +1,10 @@
 import { getRouteWithLanguage, getValidLanguagesForRoute } from "../../../../utils/language-utils.mjs";
+import { getDistDirectories } from "../../../../utils/distDirectories.mjs";
 import { createDebug } from "obug";
 import { join } from "node:path";
 import memoize from "memoize";
 import { HtmlRenderPlugin } from "html-render-webpack-plugin";
-//#region src/services/webpack/config/plugins/createHtmlRenderPlugin.ts
+// src/services/webpack/config/plugins/createHtmlRenderPlugin.ts
 const log = createDebug("sku:html-render-plugin");
 const getClientStats = (webpackStats) => webpackStats.toJson();
 const getCachedClientStats = memoize(getClientStats);
@@ -83,7 +84,7 @@ const getBuildRoutes = ({ sites, routes, languages: skuLanguages, environments }
 };
 const startTransformPath = ({ site = "", route = "" }) => join(site, route);
 const createHtmlRenderPlugin = ({ isStartScript, skuContext }) => {
-	const { paths, routes, environments, sites, transformOutputPath, publicPath, languages } = skuContext;
+	const { paths, routes, environments, sites, transformOutputPath, publicPath, languages, distSubfolders } = skuContext;
 	const allRoutes = isStartScript ? getStartRoutes({
 		sites,
 		routes,
@@ -95,8 +96,12 @@ const createHtmlRenderPlugin = ({ isStartScript, skuContext }) => {
 		environments,
 		languages
 	});
+	const { distRendered } = getDistDirectories({
+		targetPath: paths.target,
+		useSubfolders: distSubfolders && !isStartScript
+	});
 	return new HtmlRenderPlugin({
-		renderDirectory: paths.target,
+		renderDirectory: distRendered,
 		routes: allRoutes,
 		skipAssets: isStartScript,
 		transformFilePath: isStartScript ? startTransformPath : transformOutputPath,
@@ -104,5 +109,4 @@ const createHtmlRenderPlugin = ({ isStartScript, skuContext }) => {
 		extraGlobals: { Date }
 	});
 };
-//#endregion
 export { createHtmlRenderPlugin as default, getBuildRoutes };

package/dist/services/webpack/config/plugins/metricsPlugin.mjs

@@ -2,7 +2,7 @@ import telemetry_default from "../../../telemetry/index.mjs";
 import { formatMs } from "../../../../utils/formatMs.mjs";
 import { createDebug } from "obug";
 import { performance } from "node:perf_hooks";
-//#region src/services/webpack/config/plugins/metricsPlugin.ts
+// src/services/webpack/config/plugins/metricsPlugin.ts
 const log = createDebug("sku:metrics");
 const smp = "sku-metrics-plugin";
 var MetricsPlugin = class {
@@ -39,5 +39,4 @@ var MetricsPlugin = class {
 		});
 	}
 };
-//#endregion
 export { MetricsPlugin };

package/dist/services/webpack/config/plugins/validateOptions.d.mts

@@ -1,4 +1,3 @@
-//#region src/services/webpack/config/plugins/validateOptions.d.ts
 type SkuWebpackPluginOptions = {
   target: 'node' | 'browser';
   MiniCssExtractPlugin: any;
@@ -12,5 +11,4 @@ type SkuWebpackPluginOptions = {
   browserslist?: string[];
   displayNamesProd?: boolean;
 };
-//#endregion
 export { SkuWebpackPluginOptions };

package/dist/services/webpack/config/plugins/validateOptions.mjs

@@ -4,7 +4,7 @@ import "../../../../private/utils/src/console/index.mjs";
 import browserslist from "browserslist";
 import { closest } from "fastest-levenshtein";
 import Validator from "fastest-validator";
-//#region src/services/webpack/config/plugins/validateOptions.ts
+// src/services/webpack/config/plugins/validateOptions.ts
 const validator = new Validator();
 const exitWithErrors = async (errors) => {
 	console.log(strong(critical("SkuWebpackPlugin: Invalid options")));
@@ -82,5 +82,4 @@ const validateOptions = (options) => {
 	}
 	if (errors.length > 0) exitWithErrors(errors);
 };
-//#endregion
 export { validateOptions };

package/dist/services/webpack/config/resolveModules.mjs

@@ -1,11 +1,10 @@
 import { createRequire } from "node:module";
 import { join } from "node:path";
-//#region src/services/webpack/config/resolveModules.ts
+// src/services/webpack/config/resolveModules.ts
 const require = createRequire(import.meta.url);
 const modules = ["node_modules"];
 try {
 	const skuPath = require.resolve("sku/package.json");
 	if (skuPath.includes(".pnpm")) modules.push(join(skuPath, "../.."));
 } catch {}
-//#endregion
 export { modules as default };

package/dist/services/webpack/config/sourceMaps.mjs

@@ -1,7 +1,6 @@
-//#region src/services/webpack/config/sourceMaps.ts
+// src/services/webpack/config/sourceMaps.ts
 function getSourceMapSetting({ isDevServer, sourceMapsProd }) {
 	if (isDevServer) return "eval-cheap-module-source-map";
 	return sourceMapsProd ? "source-map" : false;
 }
-//#endregion
 export { getSourceMapSetting as default };

package/dist/services/webpack/config/statsConfig.mjs

@@ -1,5 +1,5 @@
 import isCI_default from "../../../utils/isCI.mjs";
-//#region src/services/webpack/config/statsConfig.ts
+// src/services/webpack/config/statsConfig.ts
 const getStatsConfig = ({ stats, isStartScript = false } = {}) => {
 	return {
 		colors: !isCI_default,
@@ -8,5 +8,4 @@ const getStatsConfig = ({ stats, isStartScript = false } = {}) => {
 		errors: true
 	};
 };
-//#endregion
 export { getStatsConfig as default };

package/dist/services/webpack/config/utils/index.mjs

@@ -1,7 +1,7 @@
 import { extensions } from "../../../../config/fileResolutionExtensions.mjs";
 import { makeExternalCssLoaders, makeJsLoaders, makeSvgLoaders } from "./loaders.mjs";
 import { resolvePackage } from "./resolvePackage.mjs";
-//#region src/services/webpack/config/utils/index.ts
+// src/services/webpack/config/utils/index.ts
 const TYPESCRIPT = new RegExp(`\.(${extensions.ts.join("|")})$`);
 const JAVASCRIPT = new RegExp(`\.(${extensions.js.join("|")})$`);
 const IMAGE = [
@@ -13,5 +13,4 @@ const IMAGE = [
 	/\.avif$/
 ];
 const SVG = /\.svg$/;
-//#endregion
 export { IMAGE, JAVASCRIPT, SVG, TYPESCRIPT, makeExternalCssLoaders, makeJsLoaders, makeSvgLoaders, resolvePackage };

package/dist/services/webpack/config/utils/loaders.mjs

@@ -1,7 +1,7 @@
 import babel_default from "../../../../config/babel.mjs";
 import { createRequire } from "node:module";
 import lightningcssPlugin from "postcss-lightningcss";
-//#region src/services/webpack/config/utils/loaders.ts
+// src/services/webpack/config/utils/loaders.ts
 const require = createRequire(import.meta.url);
 const makeJsLoaders = (options) => [{
 	loader: require.resolve("babel-loader"),
@@ -35,5 +35,4 @@ const makeSvgLoaders = () => [{
 		params: { attributes: [{ focusable: false }] }
 	}] }
 }];
-//#endregion
 export { makeExternalCssLoaders, makeJsLoaders, makeSvgLoaders };

package/dist/services/webpack/config/utils/resolvePackage.mjs

@@ -6,7 +6,7 @@ import { createDebug } from "obug";
 import { dirname, join } from "node:path";
 import fs from "node:fs";
 import memoize from "memoize";
-//#region src/services/webpack/config/utils/resolvePackage.ts
+// src/services/webpack/config/utils/resolvePackage.ts
 const log = createDebug("sku:resolvePackage");
 const require = createRequire(import.meta.url);
 function getProjectDependencies(readFileSync) {
@@ -53,5 +53,4 @@ const createPackageResolver = (fs, resolve) => {
 	return memoize(resolvePackage);
 };
 const resolvePackage = createPackageResolver(fs, require.resolve);
-//#endregion
 export { createPackageResolver, resolvePackage };

package/dist/services/webpack/config/webpack.config.mjs

@@ -1,17 +1,18 @@
 import { cwd } from "../../../private/utils/src/filesystem/cwd.mjs";
-import "../../../private/utils/src/index.mjs";
 import { bundleAnalyzerPlugin } from "./plugins/bundleAnalyzer.mjs";
-import { resolvePackage } from "./utils/resolvePackage.mjs";
-import { JAVASCRIPT } from "./utils/index.mjs";
-import { browserslistNodeTarget } from "../../../config/targets.mjs";
 import { SkuWebpackPlugin } from "../../../webpack-plugin.mjs";
+import { resolvePackage } from "./utils/resolvePackage.mjs";
 import { MetricsPlugin } from "./plugins/metricsPlugin.mjs";
+import { JAVASCRIPT } from "./utils/index.mjs";
+import "../../../private/utils/src/index.mjs";
 import { getVocabConfig } from "../../vocab/config.mjs";
 import getStatsConfig from "./statsConfig.mjs";
 import getSourceMapSetting from "./sourceMaps.mjs";
 import getWebpackCacheSettings from "./cache.mjs";
 import modules from "./resolveModules.mjs";
+import { browserslistNodeTarget } from "../../../config/targets.mjs";
 import { resolvePolyfills } from "../../../utils/resolvePolyfills.mjs";
+import { getDistDirectories } from "../../../utils/distDirectories.mjs";
 import { createRequire } from "node:module";
 import path, { dirname } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -22,14 +23,18 @@ import LoadablePlugin from "@loadable/webpack-plugin";
 import ReactRefreshWebpackPlugin from "@pmmmwh/react-refresh-webpack-plugin";
 import TerserPlugin from "terser-webpack-plugin";
 import { VocabWebpackPlugin } from "@vocab/webpack";
-//#region src/services/webpack/config/webpack.config.ts
+// src/services/webpack/config/webpack.config.ts
 const require = createRequire(import.meta.url);
 const renderEntry = require.resolve("#webpack/render");
 const libraryRenderEntry = require.resolve("#webpack/library-render");
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const makeWebpackConfig = async ({ isIntegration = false, isDevServer = false, htmlRenderPlugin, metrics = false, hot = false, isStartScript = false, stats, skuContext }) => {
-	const { paths, webpackDecorator, polyfills, isLibrary, libraryName, libraryFile, supportedBrowsers, displayNamesProd, cspEnabled, cspExtraScriptSrcHosts, skipPackageCompatibilityCompilation, externalizeNodeModules, sourceMapsProd } = skuContext;
+	const { paths, webpackDecorator, polyfills, isLibrary, libraryName, libraryFile, supportedBrowsers, displayNamesProd, cspEnabled, cspExtraScriptSrcHosts, skipPackageCompatibilityCompilation, externalizeNodeModules, sourceMapsProd, distSubfolders } = skuContext;
 	const isProductionBuild = process.env.NODE_ENV === "production";
+	const { distClient } = getDistDirectories({
+		targetPath: paths.target,
+		useSubfolders: distSubfolders && !isStartScript
+	});
 	const webpackMode = isProductionBuild ? "production" : "development";
 	const vocabOptions = getVocabConfig(skuContext);
 	const resolvedPolyfills = resolvePolyfills(polyfills);
@@ -56,7 +61,7 @@ const makeWebpackConfig = async ({ isIntegration = false, isDevServer = false, h
 			sourceMapsProd
 		}),
 		output: {
-			path: paths.target,
+			path: distClient,
 			publicPath: isStartScript ? "/" : paths.publicPath,
 			filename: jsFileMask,
 			chunkFilename: jsChunkFileMask,
@@ -215,5 +220,4 @@ const makeWebpackConfig = async ({ isIntegration = false, isDevServer = false, h
 		infrastructureLogging: { level: "error" }
 	}].map(webpackDecorator);
 };
-//#endregion
 export { makeWebpackConfig };

package/dist/services/webpack/config/webpack.config.ssr.mjs

@@ -1,17 +1,18 @@
 import { requireFromCwd } from "../../../private/utils/src/filesystem/cwd.mjs";
-import "../../../private/utils/src/index.mjs";
-import { bundleAnalyzerPlugin } from "./plugins/bundleAnalyzer.mjs";
-import { resolvePackage } from "./utils/resolvePackage.mjs";
-import { JAVASCRIPT } from "./utils/index.mjs";
-import { browserslistNodeTarget } from "../../../config/targets.mjs";
 import { SkuWebpackPlugin } from "../../../webpack-plugin.mjs";
 import { MetricsPlugin } from "./plugins/metricsPlugin.mjs";
+import { resolvePackage } from "./utils/resolvePackage.mjs";
+import { bundleAnalyzerPlugin } from "./plugins/bundleAnalyzer.mjs";
+import { JAVASCRIPT } from "./utils/index.mjs";
+import "../../../private/utils/src/index.mjs";
 import { getVocabConfig } from "../../vocab/config.mjs";
 import getStatsConfig from "./statsConfig.mjs";
 import getSourceMapSetting from "./sourceMaps.mjs";
 import getWebpackCacheSettings from "./cache.mjs";
 import modules from "./resolveModules.mjs";
+import { browserslistNodeTarget } from "../../../config/targets.mjs";
 import { resolvePolyfills } from "../../../utils/resolvePolyfills.mjs";
+import { getDistDirectories } from "../../../utils/distDirectories.mjs";
 import { createRequire } from "node:module";
 import { dirname, join, sep } from "node:path";
 import * as find from "empathic/find";
@@ -23,12 +24,16 @@ import LoadablePlugin from "@loadable/webpack-plugin";
 import ReactRefreshWebpackPlugin from "@pmmmwh/react-refresh-webpack-plugin";
 import TerserPlugin from "terser-webpack-plugin";
 import { VocabWebpackPlugin } from "@vocab/webpack";
-//#region src/services/webpack/config/webpack.config.ssr.ts
+// src/services/webpack/config/webpack.config.ssr.ts
 const require = createRequire(import.meta.url);
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const makeWebpackConfig = async ({ serverPort, isDevServer = false, hot = false, isStartScript = false, stats, skuContext }) => {
-	const { paths, webpackDecorator, polyfills, supportedBrowsers, displayNamesProd, cspEnabled, cspExtraScriptSrcHosts, httpsDevServer, skipPackageCompatibilityCompilation, externalizeNodeModules, sourceMapsProd } = skuContext;
+	const { paths, webpackDecorator, polyfills, supportedBrowsers, displayNamesProd, cspEnabled, cspExtraScriptSrcHosts, httpsDevServer, skipPackageCompatibilityCompilation, externalizeNodeModules, sourceMapsProd, distSubfolders } = skuContext;
 	const isProductionBuild = process.env.NODE_ENV === "production";
+	const { distClient, distServer } = getDistDirectories({
+		targetPath: paths.target,
+		useSubfolders: distSubfolders && !isStartScript
+	});
 	const webpackMode = isProductionBuild ? "production" : "development";
 	const vocabOptions = getVocabConfig(skuContext);
 	const internalInclude = [join(__dirname, "../entry"), ...paths.src];
@@ -49,7 +54,7 @@ const makeWebpackConfig = async ({ serverPort, isDevServer = false, hot = false,
 			sourceMapsProd
 		}),
 		output: {
-			path: paths.target,
+			path: distClient,
 			publicPath,
 			filename: `${fileMask}.js`,
 			chunkFilename: `${fileMask}.js`
@@ -105,7 +110,7 @@ const makeWebpackConfig = async ({ serverPort, isDevServer = false, hot = false,
 		plugins: [
 			new LoadablePlugin({
 				filename: webpackStatsFilename,
-				writeToDisk: true,
+				writeToDisk: { filename: distServer },
 				outputAsset: false
 			}),
 			new MiniCssExtractPlugin({
@@ -151,7 +156,7 @@ const makeWebpackConfig = async ({ serverPort, isDevServer = false, hot = false,
 		target: "node",
 		node: { __dirname: false },
 		output: {
-			path: paths.target,
+			path: distServer,
 			publicPath,
 			filename: `server.${type === "module" ? "c" : ""}js`,
 			hotUpdateChunkFilename: `[id].[fullhash].hot-update.${type === "module" ? "c" : ""}js`,
@@ -199,5 +204,4 @@ const makeWebpackConfig = async ({ serverPort, isDevServer = false, hot = false,
 		})] : [])
 	}].map(webpackDecorator);
 };
-//#endregion
 export { makeWebpackConfig };

package/dist/services/webpack/entry/csp.mjs

@@ -1,7 +1,7 @@
 import { createHash, randomBytes } from "node:crypto";
 import { URL } from "node:url";
 import { parse, valid } from "node-html-parser";
-//#region src/services/webpack/entry/csp.ts
+// src/services/webpack/entry/csp.ts
 const scriptTypeIgnoreList = ["application/json", "application/ld+json"];
 const defaultBaseName = "http://relative-url";
 const hashScriptContents = (scriptContents) => createHash("sha256").update(scriptContents).digest("base64");
@@ -93,5 +93,4 @@ function createCSPHandler({ extraHosts = [], reportTo, reportOnlyExtraHosts = []
 		handleHtml
 	};
 }
-//#endregion
 export { createCSPHandler as default };

package/dist/services/webpack/entry/makeExtractor.mjs

@@ -1,7 +1,7 @@
 import defaultClientEntry_default from "../../../context/defaultClientEntry.mjs";
 import { jsx } from "react/jsx-runtime";
 import { ChunkExtractor, ChunkExtractorManager } from "@loadable/server";
-//#region src/services/webpack/entry/makeExtractor.tsx
+// src/services/webpack/entry/makeExtractor.tsx
 const getNewTags = ({ before, after }) => {
 	const beforeArr = before.split("\n");
 	return after.split("\n").filter((tag) => !beforeArr.includes(tag)).join("\n");
@@ -58,5 +58,4 @@ var makeExtractor_default = (stats, publicPath, csp) => {
 		extractor
 	};
 };
-//#endregion
 export { makeExtractor_default as default };

package/dist/services/webpack/entry/render/render-to-string.mjs

@@ -1,7 +1,7 @@
 import { createDebug } from "obug";
 import { Writable } from "node:stream";
 import { renderToPipeableStream } from "react-dom/server";
-//#region src/services/webpack/entry/render/render-to-string.ts
+// src/services/webpack/entry/render/render-to-string.ts
 const RENDER_TIMEOUT_MS = 5e3;
 const log = createDebug("sku:render:renderToStringAsync");
 /**
@@ -58,5 +58,4 @@ function renderToStringAsync(reactNode) {
 		}
 	});
 }
-//#endregion
 export { renderToStringAsync };

package/dist/services/webpack/entry/server/server.mjs

@@ -1,12 +1,12 @@
-import createCSPHandler from "../csp.mjs";
 import makeExtractor_default from "../makeExtractor.mjs";
+import createCSPHandler from "../csp.mjs";
 import { createRequire } from "node:module";
 import path from "node:path";
 import serverExports from "__sku_alias__serverEntry";
 import { getChunkName } from "@vocab/webpack/chunk-name";
 import express, { static as static$1 } from "express";
 import webpackStats from "__sku_alias__webpackStats";
-//#region src/services/webpack/entry/server/server.ts
+// src/services/webpack/entry/server/server.ts
 const publicPath = __SKU_PUBLIC_PATH__;
 const csp = __SKU_CSP__;
 const { middleware, onStart, renderCallback } = serverExports({ publicPath });
@@ -41,5 +41,4 @@ app.get("*", (...args) => {
 		createUnsafeNonce: cspHandler ? cspHandler.createUnsafeNonce : void 0
 	}, ...args);
 });
-//#endregion
 export { app, onStart };

package/dist/services/webpack/runWebpack.mjs

@@ -1,5 +1,5 @@
 import getStatsConfig from "./config/statsConfig.mjs";
-//#region src/services/webpack/runWebpack.ts
+// src/services/webpack/runWebpack.ts
 const run = async (compiler, { stats: statsOption } = {}) => new Promise((resolve, reject) => {
 	compiler.run((err, stats) => {
 		if (err) reject(err);
@@ -8,5 +8,4 @@ const run = async (compiler, { stats: statsOption } = {}) => new Promise((resolv
 		resolve();
 	});
 });
-//#endregion
 export { run };