sku 16.5.0 → 16.6.0

package/dist/services/vite/helpers/prerender/prerenderConcurrently.mjs

@@ -1,11 +1,12 @@
 import { success } from "../../../../private/utils/src/console/styles.mjs";
-import "../../../../private/utils/src/console/index.mjs";
 import { getBuildRoutes } from "../../../webpack/config/plugins/createHtmlRenderPlugin.mjs";
+import "../../../../private/utils/src/console/index.mjs";
+import { createOutDir } from "../bundleConfig.mjs";
 import path from "node:path";
 import { readFile } from "node:fs/promises";
 import os from "node:os";
 import { Worker } from "node:worker_threads";
-//#region src/services/vite/helpers/prerender/prerenderConcurrently.ts
+// src/services/vite/helpers/prerender/prerenderConcurrently.ts
 var PrerenderWorkerError = class extends Error {
 	constructor(message, options) {
 		super(message, options);
@@ -32,15 +33,21 @@ const runJobs = (jobs, sharedWorkerData) => {
 	});
 };
 const getFileName = (skuContext, skuRoute) => {
-	let renderDirectory = skuContext.paths.target;
+	const { distRendered } = createOutDir({
+		targetPath: skuContext.paths.target,
+		useSubfolders: skuContext.distSubfolders
+	});
+	const renderDirectory = path.resolve(distRendered);
 	const relativeFilePath = skuContext.transformOutputPath(skuRoute);
-	const includesHtmlInFilePath = relativeFilePath.endsWith(".html");
-	if (!path.isAbsolute(renderDirectory)) renderDirectory = path.resolve(renderDirectory);
-	return includesHtmlInFilePath ? path.join(renderDirectory, relativeFilePath) : path.join(renderDirectory, relativeFilePath, "index.html");
+	return relativeFilePath.endsWith(".html") ? path.join(renderDirectory, relativeFilePath) : path.join(renderDirectory, relativeFilePath, "index.html");
 };
 const prerenderConcurrently = async (skuContext) => {
 	const routes = getBuildRoutes(skuContext);
 	const targetPath = skuContext.paths.target;
+	const { distClient } = createOutDir({
+		targetPath,
+		useSubfolders: skuContext.distSubfolders
+	});
 	const jobs = routes.map((route) => ({
 		route: route.route,
 		routeName: route.routeName,
@@ -49,7 +56,7 @@ const prerenderConcurrently = async (skuContext) => {
 		environment: route.environment,
 		language: route.language
 	}));
-	const rawManifest = await readFile(path.resolve(path.join(targetPath, ".vite/manifest.json")), "utf-8");
+	const rawManifest = await readFile(path.resolve(path.join(distClient, ".vite/manifest.json")), "utf-8");
 	const sharedWorkerData = {
 		publicPath: skuContext.publicPath,
 		cspEnabled: skuContext.cspEnabled,
@@ -60,6 +67,7 @@ const prerenderConcurrently = async (skuContext) => {
 		cspReportOnlyExtraScriptSrcHosts: skuContext.cspReportOnlyExtraScriptSrcHosts,
 		cspReportOnlyReportTo: skuContext.cspReportOnlyReportTo,
 		targetPath,
+		distSubfolders: skuContext.distSubfolders,
 		manifest: JSON.parse(rawManifest)
 	};
 	const cores = Math.min(os.availableParallelism(), jobs.length);
@@ -67,5 +75,4 @@ const prerenderConcurrently = async (skuContext) => {
 	await Promise.all(Array.from({ length: cores }, (_, i) => runJobs(jobs.slice(i * chunkSize, (i + 1) * chunkSize), sharedWorkerData)));
 	console.log(success(`Finished pre-rendering ${routes.length} pages`));
 };
-//#endregion
 export { PrerenderWorkerError, prerenderConcurrently };

package/dist/services/vite/helpers/printServerUrls.mjs

@@ -1,7 +1,7 @@
 import { serverUrls } from "../../../private/utils/src/serverUrls.mjs";
-import "../../../private/utils/src/index.mjs";
 import { getAppHosts } from "../../../context/hosts.mjs";
-//#region src/services/vite/helpers/printServerUrls.ts
+import "../../../private/utils/src/index.mjs";
+// src/services/vite/helpers/printServerUrls.ts
 const printServerUrls = ({ skuContext, port }) => {
 	const hosts = getAppHosts(skuContext);
 	console.log("Starting development server...");
@@ -14,5 +14,4 @@ const printServerUrls = ({ skuContext, port }) => {
 	if (skuContext.listUrls) urls.printAll();
 	else urls.print();
 };
-//#endregion
 export { printServerUrls };

package/dist/services/vite/helpers/resolveManifestModuleId.mjs

@@ -1,6 +1,6 @@
 import { dirname, extname, parse, relative, resolve } from "node:path";
 import { readdirSync } from "node:fs";
-//#region src/services/vite/helpers/resolveManifestModuleId.ts
+// src/services/vite/helpers/resolveManifestModuleId.ts
 const stripViteQuery = (filePath) => filePath.split("?")[0] ?? filePath;
 const toPosixPath = (filePath) => filePath.replace(/\\/g, "/");
 /**
@@ -26,5 +26,4 @@ const resolveManifestModuleId = ({ importerId, importPath, cwd = process.cwd() }
 	if (!found) return null;
 	return toPosixPath(relative(cwd, resolve(directory, found)));
 };
-//#endregion
 export { resolveManifestModuleId };

package/dist/services/vite/helpers/serializeConfig.mjs

@@ -1,6 +1,5 @@
 import clientContextKey_default from "../../../utils/constants/clientContextKey.mjs";
 import serializeJavascript from "serialize-javascript";
-//#region src/services/vite/helpers/serializeConfig.ts
+// src/services/vite/helpers/serializeConfig.ts
 const serializeConfig = (config) => `<script id="${clientContextKey_default}" type="application/json">${serializeJavascript(config, { isJSON: true })}<\/script>`;
-//#endregion
 export { serializeConfig };

package/dist/services/vite/index.mjs

@@ -2,7 +2,7 @@ import { buildSsr } from "./ssr/build.mjs";
 import { startSsr } from "./ssr/start.mjs";
 import { buildStatic } from "./static/build.mjs";
 import { startStatic } from "./static/start.mjs";
-//#region src/services/vite/index.ts
+// src/services/vite/index.ts
 const viteService = {
 	build: async (skuContext) => {
 		if (skuContext.buildType === "ssr") return buildSsr(skuContext);
@@ -19,5 +19,4 @@ const viteService = {
 		});
 	}
 };
-//#endregion
 export { viteService };

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

@@ -1,8 +1,8 @@
-import { assetsInlineLimitBytes } from "../../bundlerConstants.mjs";
-import { makePluginName } from "../helpers/makePluginName.mjs";
 import browserslistToEsbuild from "../helpers/browserslist-to-esbuild.mjs";
+import { makePluginName } from "../helpers/makePluginName.mjs";
+import { assetsInlineLimitBytes } from "../../bundlerConstants.mjs";
 import { createVocabChunks } from "@vocab/vite/chunks";
-//#region src/services/vite/plugins/build.ts
+// src/services/vite/plugins/build.ts
 const buildPlugin = ({ skuContext }) => ({
 	name: makePluginName("build"),
 	apply: "build",
@@ -16,14 +16,16 @@ const buildPlugin = ({ skuContext }) => ({
 				entryFileNames: "[name]-[hash].js",
 				chunkFileNames: "[name]-[hash].chunk.js",
 				assetFileNames: "[name]-[hash][extname]",
-				codeSplitting: { groups: [{ name: (id, ctx) => {
-					const languageChunkName = createVocabChunks(id, ctx);
-					if (languageChunkName) return languageChunkName;
-					return null;
-				} }] }
+				codeSplitting: { groups: [{
+					debugName: "vocab-language-chunks",
+					name: (id, ctx) => {
+						const languageChunkName = createVocabChunks(id, ctx);
+						if (languageChunkName) return languageChunkName;
+						return null;
+					}
+				}] }
 			} }
 		}
 	})
 });
-//#endregion
 export { buildPlugin };

package/dist/services/vite/plugins/bundleAnalyzer.mjs

@@ -1,7 +1,7 @@
 import { getPathFromCwd, requireFromCwd } from "../../../private/utils/src/filesystem/cwd.mjs";
 import "../../../private/utils/src/index.mjs";
 import { visualizer } from "rollup-plugin-visualizer";
-//#region src/services/vite/plugins/bundleAnalyzer.ts
+// src/services/vite/plugins/bundleAnalyzer.ts
 const bundleAnalyzerPlugin = () => ({
 	...visualizer({
 		filename: getPathFromCwd("report/client.html"),
@@ -12,5 +12,4 @@ const bundleAnalyzerPlugin = () => ({
 	apply: "build",
 	applyToEnvironment: (environment) => environment.name === "client"
 });
-//#endregion
 export { bundleAnalyzerPlugin };

package/dist/services/vite/plugins/config.mjs

@@ -1,7 +1,7 @@
-import { makePluginName } from "../helpers/makePluginName.mjs";
 import { fixViteVanillaExtractDepScanPlugin } from "./esbuild/fixViteVanillaExtractDepScanPlugin.mjs";
+import { makePluginName } from "../helpers/makePluginName.mjs";
 import { createRequire } from "node:module";
-//#region src/services/vite/plugins/config.ts
+// src/services/vite/plugins/config.ts
 const require = createRequire(import.meta.url);
 /**
 * Specifiers Vite must not clone into `.vite/deps`. Keeps app `sku/runtime`
@@ -31,5 +31,4 @@ const configPlugin = ({ skuContext }) => ({
 		ssr: { external: ["@sku-lib/vite"] }
 	})
 });
-//#endregion
 export { SKU_VITE_OPTIMIZE_DEPS_EXCLUDE, configPlugin, getViteOptimizeDepsExclude };

package/dist/services/vite/plugins/dangerouslySetViteConfig.mjs

@@ -1,5 +1,5 @@
 import { makePluginName } from "../helpers/makePluginName.mjs";
-//#region src/services/vite/plugins/dangerouslySetViteConfig.ts
+// src/services/vite/plugins/dangerouslySetViteConfig.ts
 function dangerouslySetViteConfigPlugin(skuContext) {
 	return {
 		name: makePluginName("dangerously-set-vite-config"),
@@ -7,5 +7,4 @@ function dangerouslySetViteConfigPlugin(skuContext) {
 		config: skuContext.viteDecorator
 	};
 }
-//#endregion
 export { dangerouslySetViteConfigPlugin };

package/dist/services/vite/plugins/devServer.mjs

@@ -1,9 +1,9 @@
 import { serverUrls } from "../../../private/utils/src/serverUrls.mjs";
 import "../../../private/utils/src/index.mjs";
+import { getAppHosts } from "../../../context/hosts.mjs";
 import isCI_default from "../../../utils/isCI.mjs";
 import { makePluginName } from "../helpers/makePluginName.mjs";
-import { getAppHosts } from "../../../context/hosts.mjs";
-//#region src/services/vite/plugins/devServer.ts
+// src/services/vite/plugins/devServer.ts
 const shouldOpenTab = process.env.OPEN_TAB !== "false" && !isCI_default;
 const disableWatch = Boolean(process.env.SKU_VITE_DISABLE_WATCH);
 const devServerPlugin = ({ skuContext }) => ({
@@ -21,5 +21,4 @@ const devServerPlugin = ({ skuContext }) => ({
 		}).first()
 	} })
 });
-//#endregion
 export { devServerPlugin };

package/dist/services/vite/plugins/entrySideEffects.mjs

@@ -1,9 +1,9 @@
 import { cwd } from "../../../private/utils/src/filesystem/cwd.mjs";
+import { exactRegex } from "../../../node_modules/.pnpm/rolldown@1.2.16/node_modules/rolldown/dist/filter-index.mjs";
 import "../../../private/utils/src/index.mjs";
 import { makePluginName } from "../helpers/makePluginName.mjs";
-import { exactRegex } from "../../../node_modules/.pnpm/rolldown@1.2.2/node_modules/rolldown/dist/filter-index.mjs";
 import { createRequire } from "node:module";
-//#region src/services/vite/plugins/entrySideEffects.ts
+// src/services/vite/plugins/entrySideEffects.ts
 const require = createRequire(import.meta.url);
 const ENTRY_SIDE_EFFECTS_VIRTUAL_ID = "virtual:sku/entry-side-effects";
 const isFileSpecifier = (specifier) => specifier.startsWith(".") || specifier.startsWith("/");
@@ -31,5 +31,4 @@ const entrySideEffectsPlugin = (skuContext) => {
 		}
 	};
 };
-//#endregion
 export { ENTRY_SIDE_EFFECTS_VIRTUAL_ID, entrySideEffectsPlugin, loadEntrySideEffectsModule };

package/dist/services/vite/plugins/esbuild/convertLoadableDepOptimizePlugin.mjs

@@ -1,9 +1,9 @@
 import { caution } from "../../../../private/utils/src/console/styles.mjs";
-import "../../../../private/utils/src/console/index.mjs";
 import { makePluginName } from "../../helpers/makePluginName.mjs";
 import { WEBPACK_LOADABLE_IMPORT } from "../preloadPlugin/helpers/constants.mjs";
 import { createWebpackLoadableImportDependencyMessage, rewriteWebpackLoadableImports } from "../preloadPlugin/helpers/rewriteWebpackLoadableImports.mjs";
-//#region src/services/vite/plugins/esbuild/convertLoadableDepOptimizePlugin.ts
+import "../../../../private/utils/src/console/index.mjs";
+// src/services/vite/plugins/esbuild/convertLoadableDepOptimizePlugin.ts
 const convertLoadableDepOptimizePlugin = ({ convertFromWebpack } = {}) => {
 	const warnedModules = /* @__PURE__ */ new Set();
 	const warn = (id) => {
@@ -30,5 +30,4 @@ const convertLoadableDepOptimizePlugin = ({ convertFromWebpack } = {}) => {
 		}
 	};
 };
-//#endregion
 export { convertLoadableDepOptimizePlugin };

package/dist/services/vite/plugins/esbuild/fixViteVanillaExtractDepScanPlugin.mjs

@@ -1,7 +1,7 @@
 import { makePluginName } from "../../helpers/makePluginName.mjs";
 import { createDebug } from "obug";
 import { cssFileFilter } from "@vanilla-extract/integration";
-//#region src/services/vite/plugins/esbuild/fixViteVanillaExtractDepScanPlugin.ts
+// src/services/vite/plugins/esbuild/fixViteVanillaExtractDepScanPlugin.ts
 const debug = createDebug("sku:fix-vanilla-extract-dep-scan");
 const cssSpecifierFilter = /\.css(\.(js|cjs|mjs|jsx|ts|tsx))?(\?used)?$/;
 const fixViteVanillaExtractDepScanPlugin = () => ({
@@ -22,5 +22,4 @@ const fixViteVanillaExtractDepScanPlugin = () => ({
 		}
 	}
 });
-//#endregion
 export { fixViteVanillaExtractDepScanPlugin };

package/dist/services/vite/plugins/httpsDevServer.mjs

@@ -1,7 +1,7 @@
 import { getAppHosts } from "../../../context/hosts.mjs";
 import path from "node:path";
 import basicSsl from "@vitejs/plugin-basic-ssl";
-//#region src/services/vite/plugins/httpsDevServer.ts
+// src/services/vite/plugins/httpsDevServer.ts
 const httpsDevServerPlugin = (skuContext) => {
 	if (!skuContext.httpsDevServer) return [];
 	const certDir = path.join(process.cwd(), ".ssl");
@@ -10,5 +10,4 @@ const httpsDevServerPlugin = (skuContext) => {
 		certDir
 	})];
 };
-//#endregion
 export { httpsDevServerPlugin };

package/dist/services/vite/plugins/lazyRouteModuleId/injectLazyRouteModuleId.mjs

@@ -3,7 +3,7 @@ import _traverse from "@babel/traverse";
 import _generate from "@babel/generator";
 import * as t from "@babel/types";
 import { parse } from "@babel/parser";
-//#region src/services/vite/plugins/lazyRouteModuleId/injectLazyRouteModuleId.ts
+// src/services/vite/plugins/lazyRouteModuleId/injectLazyRouteModuleId.ts
 const traverse = _traverse.default ?? _traverse;
 const generate = _generate.default ?? _generate;
 const getPropertyName = (key, computed) => {
@@ -79,5 +79,4 @@ const injectLazyRouteModuleId = ({ code, id, cwd }) => {
 		injected: true
 	};
 };
-//#endregion
 export { injectLazyRouteModuleId };

package/dist/services/vite/plugins/lazyRouteModuleId/lazyRouteModuleIdPlugin.mjs

@@ -1,6 +1,6 @@
 import { makePluginName } from "../../helpers/makePluginName.mjs";
 import { injectLazyRouteModuleId } from "./injectLazyRouteModuleId.mjs";
-//#region src/services/vite/plugins/lazyRouteModuleId/lazyRouteModuleIdPlugin.ts
+// src/services/vite/plugins/lazyRouteModuleId/lazyRouteModuleIdPlugin.ts
 const include = /\.(jsx?|tsx?)$/;
 /**
 * Auto-derive `handle.moduleId` for idiomatic React Router lazy routes:
@@ -27,5 +27,4 @@ function lazyRouteModuleIdPlugin() {
 		}
 	};
 }
-//#endregion
 export { lazyRouteModuleIdPlugin };

package/dist/services/vite/plugins/middleware.mjs

@@ -1,12 +1,12 @@
 import { stringifyReportingEndpoints } from "../../../utils/csp.mjs";
-import { makePluginName } from "../helpers/makePluginName.mjs";
-import createCSPHandler from "../../webpack/entry/csp.mjs";
-import { metricsMeasurers } from "../../telemetry/metricsMeasurers.mjs";
 import { getMatchingRoute } from "../../../utils/routeMatcher.mjs";
 import { getLanguageFromRoute, getRouteWithLanguage } from "../../../utils/language-utils.mjs";
+import { metricsMeasurers } from "../../telemetry/metricsMeasurers.mjs";
+import createCSPHandler from "../../webpack/entry/csp.mjs";
+import { makePluginName } from "../helpers/makePluginName.mjs";
 import { createRequire } from "node:module";
 import { createDebug } from "obug";
-//#region src/services/vite/plugins/middleware.ts
+// src/services/vite/plugins/middleware.ts
 const log = createDebug("sku:middleware:vite");
 const require = createRequire(import.meta.url);
 const renderEntry = require.resolve("#entries/vite-render");
@@ -105,5 +105,4 @@ const middlewarePlugin = ({ skuContext, environment }) => ({
 		};
 	}
 });
-//#endregion
 export { middlewarePlugin };

package/dist/services/vite/plugins/polyfills.mjs

@@ -1,7 +1,7 @@
+import { exactRegex } from "../../../node_modules/.pnpm/rolldown@1.2.16/node_modules/rolldown/dist/filter-index.mjs";
 import { resolvePolyfills } from "../../../utils/resolvePolyfills.mjs";
 import { makePluginName } from "../helpers/makePluginName.mjs";
-import { exactRegex } from "../../../node_modules/.pnpm/rolldown@1.2.2/node_modules/rolldown/dist/filter-index.mjs";
-//#region src/services/vite/plugins/polyfills.ts
+// src/services/vite/plugins/polyfills.ts
 const polyfillsPlugin = (skuContext) => {
 	const virtualModuleId = "virtual:sku/polyfills";
 	const resolvedVirtualModuleId = `\0${virtualModuleId}`;
@@ -22,5 +22,4 @@ const polyfillsPlugin = (skuContext) => {
 		}
 	};
 };
-//#endregion
 export { polyfillsPlugin };

package/dist/services/vite/plugins/preloadPlugin/helpers/constants.mjs

@@ -1,6 +1,5 @@
-//#region src/services/vite/plugins/preloadPlugin/helpers/constants.ts
+// src/services/vite/plugins/preloadPlugin/helpers/constants.ts
 const WEBPACK_LOADABLE_IMPORT = "sku/@loadable/component";
 const VITE_LOADABLE_IMPORT = "@sku-lib/vite/loadable";
 const VITE_LOADABLE_NAME = "loadable";
-//#endregion
 export { VITE_LOADABLE_IMPORT, VITE_LOADABLE_NAME, WEBPACK_LOADABLE_IMPORT };

package/dist/services/vite/plugins/preloadPlugin/helpers/convertWebpackToViteImport.mjs

@@ -1,6 +1,6 @@
 import { VITE_LOADABLE_IMPORT, VITE_LOADABLE_NAME, WEBPACK_LOADABLE_IMPORT } from "./constants.mjs";
 import * as t from "@babel/types";
-//#region src/services/vite/plugins/preloadPlugin/helpers/convertWebpackToViteImport.ts
+// src/services/vite/plugins/preloadPlugin/helpers/convertWebpackToViteImport.ts
 const convertWebpackToViteImport = (importPath, localName) => {
 	const viteImport = t.importDeclaration([t.importSpecifier(t.identifier(localName), t.identifier(VITE_LOADABLE_NAME))], t.stringLiteral(VITE_LOADABLE_IMPORT));
 	const remainingSpecifiers = importPath.node.specifiers.filter((specifier) => !t.isImportDefaultSpecifier(specifier));
@@ -10,5 +10,4 @@ const convertWebpackToViteImport = (importPath, localName) => {
 	}
 	importPath.replaceWithMultiple([t.importDeclaration(remainingSpecifiers, t.stringLiteral(WEBPACK_LOADABLE_IMPORT)), viteImport]);
 };
-//#endregion
 export { convertWebpackToViteImport };

package/dist/services/vite/plugins/preloadPlugin/helpers/getViteLoadableSpecifierName.mjs

@@ -1,9 +1,8 @@
 import { VITE_LOADABLE_NAME } from "./constants.mjs";
 import * as t from "@babel/types";
-//#region src/services/vite/plugins/preloadPlugin/helpers/getViteLoadableSpecifierName.ts
+// src/services/vite/plugins/preloadPlugin/helpers/getViteLoadableSpecifierName.ts
 const getViteLoadableSpecifierName = (importPath) => {
 	for (const specifier of importPath.node.specifiers) if (t.isImportSpecifier(specifier) && t.isIdentifier(specifier.imported, { name: "loadable" })) return specifier.local.name;
 	return VITE_LOADABLE_NAME;
 };
-//#endregion
 export { getViteLoadableSpecifierName };

package/dist/services/vite/plugins/preloadPlugin/helpers/getWebpackLoadableSpecifierName.mjs

@@ -1,6 +1,5 @@
-//#region src/services/vite/plugins/preloadPlugin/helpers/getWebpackLoadableSpecifierName.ts
+// src/services/vite/plugins/preloadPlugin/helpers/getWebpackLoadableSpecifierName.ts
 const getWebpackLoadableSpecifierName = (importPath) => {
 	return importPath.get("specifiers").find((specifier) => specifier.isImportDefaultSpecifier())?.node.local.name;
 };
-//#endregion
 export { getWebpackLoadableSpecifierName };

package/dist/services/vite/plugins/preloadPlugin/helpers/injectModuleID.mjs

@@ -1,6 +1,6 @@
 import { resolveManifestModuleId } from "../../../helpers/resolveManifestModuleId.mjs";
 import * as t from "@babel/types";
-//#region src/services/vite/plugins/preloadPlugin/helpers/injectModuleID.ts
+// src/services/vite/plugins/preloadPlugin/helpers/injectModuleID.ts
 const injectModuleID = ({ callPath, id }) => {
 	let injected = false;
 	const loadableFunctionArgsPath = callPath.get("arguments");
@@ -26,5 +26,4 @@ const injectModuleID = ({ callPath, id }) => {
 	} });
 	return injected;
 };
-//#endregion
 export { injectModuleID };

package/dist/services/vite/plugins/preloadPlugin/helpers/rewriteWebpackLoadableImports.mjs

@@ -7,7 +7,7 @@ import _traverse from "@babel/traverse";
 import _generate from "@babel/generator";
 import * as t from "@babel/types";
 import { parse } from "@babel/parser";
-//#region src/services/vite/plugins/preloadPlugin/helpers/rewriteWebpackLoadableImports.ts
+// src/services/vite/plugins/preloadPlugin/helpers/rewriteWebpackLoadableImports.ts
 const traverse = _traverse.default ?? _traverse;
 const generate = _generate.default ?? _generate;
 const parseLoadableSource = (code) => parse(code, {
@@ -43,5 +43,4 @@ const rewriteWebpackLoadableImports = (code, id = "unknown") => {
 	rewriteWebpackLoadableImportsInAst(ast);
 	return generate(ast, {}, code);
 };
-//#endregion
 export { assertSingleLoadableRuntime, createWebpackLoadableImportDependencyMessage, createWebpackLoadableImportMessage, parseLoadableSource, rewriteWebpackLoadableImports, rewriteWebpackLoadableImportsInAst };

package/dist/services/vite/plugins/preloadPlugin/preloadPlugin.mjs

@@ -1,13 +1,13 @@
-import { makePluginName } from "../../helpers/makePluginName.mjs";
 import "./helpers/constants.mjs";
 import { getViteLoadableSpecifierName } from "./helpers/getViteLoadableSpecifierName.mjs";
 import { injectModuleID } from "./helpers/injectModuleID.mjs";
 import { assertSingleLoadableRuntime, createWebpackLoadableImportDependencyMessage, createWebpackLoadableImportMessage, parseLoadableSource, rewriteWebpackLoadableImportsInAst } from "./helpers/rewriteWebpackLoadableImports.mjs";
+import { makePluginName } from "../../helpers/makePluginName.mjs";
 import { convertLoadableDepOptimizePlugin } from "../esbuild/convertLoadableDepOptimizePlugin.mjs";
 import _traverse from "@babel/traverse";
 import _generate from "@babel/generator";
 import * as t from "@babel/types";
-//#region src/services/vite/plugins/preloadPlugin/preloadPlugin.ts
+// src/services/vite/plugins/preloadPlugin/preloadPlugin.ts
 const traverse = _traverse.default ?? _traverse;
 const generate = _generate.default ?? _generate;
 const include = /\.[cm]?[jt]sx?$/;
@@ -97,5 +97,4 @@ function preloadPlugin({ debug, convertFromWebpack, commandName } = {}) {
 		}
 	};
 }
-//#endregion
 export { preloadPlugin };

package/dist/services/vite/plugins/setNoExternal.mjs

@@ -1,6 +1,6 @@
-import { makePluginName } from "../helpers/makePluginName.mjs";
 import { extractDependencyGraph, getSsrExternalsForCompiledDependency } from "../helpers/config/dependencyGraph.mjs";
-//#region src/services/vite/plugins/setNoExternal.ts
+import { makePluginName } from "../helpers/makePluginName.mjs";
+// src/services/vite/plugins/setNoExternal.ts
 function setNoExternalPlugin(skuContext) {
 	return {
 		name: makePluginName("set-no-external"),
@@ -12,5 +12,4 @@ function setNoExternalPlugin(skuContext) {
 		}
 	};
 }
-//#endregion
 export { setNoExternalPlugin };

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

@@ -1,20 +1,23 @@
-import { makePluginName } from "../helpers/makePluginName.mjs";
-import { SSR_CLIENT_CHUNK_NAME } from "../ssr/resolveAssets.mjs";
 import { createOutDir } from "../helpers/bundleConfig.mjs";
-import { ENTRY_SIDE_EFFECTS_VIRTUAL_ID } from "./entrySideEffects.mjs";
+import { makePluginName } from "../helpers/makePluginName.mjs";
 import { CLIENT_MANIFEST_RELATIVE_PATH } from "../ssr/clientManifestPath.mjs";
+import { SSR_CLIENT_CHUNK_NAME } from "../ssr/resolveAssets.mjs";
 import { resolveConfigSiteNames } from "../ssr/resolveConfigSiteNames.mjs";
 import { lazyRouteModuleIdPlugin } from "./lazyRouteModuleId/lazyRouteModuleIdPlugin.mjs";
+import { ENTRY_SIDE_EFFECTS_VIRTUAL_ID } from "./entrySideEffects.mjs";
 import { vitePluginSsrCss } from "./ssrCss/plugin.mjs";
 import { telemetryPlugin } from "./telemetry.mjs";
 import { createRequire } from "node:module";
-//#region src/services/vite/plugins/ssr.ts
+// src/services/vite/plugins/ssr.ts
 const require = createRequire(import.meta.url);
 const ssrClientEntry = require.resolve("#entries/ssr-client");
 const ssrClientDevEntry = require.resolve("#entries/ssr-client.dev");
 const ssrServerEntry = require.resolve("#entries/ssr-server");
 const ssrPlugins = (skuContext) => {
-	const outDir = createOutDir(skuContext.paths.target);
+	const outDir = createOutDir({
+		targetPath: skuContext.paths.target,
+		useSubfolders: true
+	});
 	const siteNames = resolveConfigSiteNames(skuContext.sites);
 	return [
 		{
@@ -51,7 +54,7 @@ const ssrPlugins = (skuContext) => {
 				},
 				environments: {
 					client: { build: {
-						outDir: outDir.ssrClient,
+						outDir: outDir.distClient,
 						manifest: CLIENT_MANIFEST_RELATIVE_PATH,
 						sourcemap: skuContext.sourceMapsProd,
 						rolldownOptions: { input: { [SSR_CLIENT_CHUNK_NAME]: ssrClientEntry } }
@@ -59,7 +62,7 @@ const ssrPlugins = (skuContext) => {
 					ssr: { build: {
 						sourcemap: "inline",
 						ssr: true,
-						outDir: outDir.ssr,
+						outDir: outDir.distServer,
 						rolldownOptions: {
 							input: ssrServerEntry,
 							output: { entryFileNames: "server.js" }
@@ -85,5 +88,4 @@ const ssrPlugins = (skuContext) => {
 		})
 	];
 };
-//#endregion
 export { ssrPlugins };

package/dist/services/vite/plugins/ssrCss/collect.mjs

@@ -1,4 +1,4 @@
-//#region src/services/vite/plugins/ssrCss/collect.ts
+// src/services/vite/plugins/ssrCss/collect.ts
 async function collectStyle(server, entries) {
 	const urls = await collectStyleUrls(server, entries);
 	return (await Promise.all(urls.map(async (url) => {
@@ -21,5 +21,4 @@ async function collectStyleUrls(server, entries) {
 	return [...visited].filter((url) => url.match(CSS_LANGS_RE));
 }
 const CSS_LANGS_RE = /\.(css|less|sass|scss|styl|stylus|pcss|postcss|sss)(?:$|\?)/;
-//#endregion
 export { collectStyle };

package/dist/services/vite/plugins/ssrCss/constants.mjs

@@ -1,6 +1,5 @@
-//#region src/services/vite/plugins/ssrCss/constants.ts
+// src/services/vite/plugins/ssrCss/constants.ts
 const SSR_CSS_VIRTUAL_ENTRY = "virtual:ssr-css.css";
 /** Dev-server URL for the collected SSR stylesheet (sku hoist / transformIndexHtml). */
 const SSR_CSS_VIRTUAL_HREF = `/@id/__x00__${SSR_CSS_VIRTUAL_ENTRY}`;
-//#endregion
 export { SSR_CSS_VIRTUAL_ENTRY, SSR_CSS_VIRTUAL_HREF };

package/dist/services/vite/plugins/ssrCss/plugin.mjs

@@ -1,6 +1,6 @@
 import { collectStyle } from "./collect.mjs";
 import { SSR_CSS_VIRTUAL_ENTRY, SSR_CSS_VIRTUAL_HREF } from "./constants.mjs";
-//#region src/services/vite/plugins/ssrCss/plugin.ts
+// src/services/vite/plugins/ssrCss/plugin.ts
 const PLUGIN_NAME = "vite-plugin-ssr-css";
 /**
 * This plugin provides virtual:ssr-css.css to collect styles reachable from entries.
@@ -20,7 +20,7 @@ function vitePluginSsrCss(pluginOpts) {
 		configureServer(server_) {
 			server = server_;
 			server.middlewares.use((req, _res, next) => {
-				if (req.url === SSR_CSS_VIRTUAL_HREF) invalidateModule(server, `\0${SSR_CSS_VIRTUAL_ENTRY}?direct`);
+				if (req.url === "/@id/__x00__virtual:ssr-css.css") invalidateModule(server, `\0${SSR_CSS_VIRTUAL_ENTRY}?direct`);
 				next();
 			});
 		},
@@ -65,5 +65,4 @@ function invalidateModule(server, id) {
 	const mod = server.moduleGraph.getModuleById(id);
 	if (mod) server.moduleGraph.invalidateModule(mod);
 }
-//#endregion
 export { vitePluginSsrCss };

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

@@ -1,16 +1,19 @@
-import { makePluginName } from "../helpers/makePluginName.mjs";
 import { createOutDir, renderEntryChunkName } from "../helpers/bundleConfig.mjs";
+import { makePluginName } from "../helpers/makePluginName.mjs";
 import { ENTRY_SIDE_EFFECTS_VIRTUAL_ID } from "./entrySideEffects.mjs";
 import { vitePluginSsrCss } from "./ssrCss/plugin.mjs";
-import { telemetryPlugin } from "./telemetry.mjs";
 import { middlewarePlugin } from "./middleware.mjs";
+import { telemetryPlugin } from "./telemetry.mjs";
 import { createRequire } from "node:module";
-//#region src/services/vite/plugins/static.ts
+// src/services/vite/plugins/static.ts
 const require = createRequire(import.meta.url);
 const renderEntry = require.resolve("#entries/vite-render");
 const clientEntry = require.resolve("#entries/vite-client");
 const staticPlugins = ({ skuContext, environment }) => {
-	const outDir = createOutDir(skuContext.paths.target);
+	const outDir = createOutDir({
+		targetPath: skuContext.paths.target,
+		useSubfolders: skuContext.distSubfolders
+	});
 	return [
 		{
 			name: makePluginName("static"),
@@ -27,7 +30,7 @@ const staticPlugins = ({ skuContext, environment }) => {
 			apply: "build",
 			config: () => ({ environments: {
 				client: { build: {
-					outDir: outDir.client,
+					outDir: outDir.distClient,
 					manifest: true,
 					sourcemap: skuContext.sourceMapsProd,
 					rolldownOptions: { input: clientEntry }
@@ -54,5 +57,4 @@ const staticPlugins = ({ skuContext, environment }) => {
 		})
 	];
 };
-//#endregion
 export { staticPlugins };

package/dist/services/vite/plugins/stripServerConfig.mjs

@@ -1,5 +1,5 @@
 import { makePluginName } from "../helpers/makePluginName.mjs";
-//#region src/services/vite/plugins/stripServerConfig.ts
+// src/services/vite/plugins/stripServerConfig.ts
 /**
 * Conditionally strips `server.watch` config during builds. This prevents the Vanilla Extract
 * compiler's internal Vite dev server from instantiating a persistent chokidar watcher that
@@ -26,5 +26,4 @@ function stripServerConfigPlugin({ apply }) {
 		}
 	};
 }
-//#endregion
 export { stripServerConfigPlugin };