@salesforce/storefront-next-dev 0.1.1 → 0.2.0-alpha.1

package/dist/index.js

@@ -1,7 +1,7 @@
 import path, { basename, extname, join, resolve } from "node:path";
 import fs from "fs-extra";
 import path$1, { dirname, join as join$1, relative, resolve as resolve$1 } from "path";
-import { URL as URL$1, fileURLToPath, pathToFileURL } from "url";
+import { fileURLToPath, pathToFileURL } from "url";
 import { parse } from "@babel/parser";
 import { isJSXAttribute, isJSXElement, isJSXFragment, isJSXIdentifier, jsxClosingElement, jsxClosingFragment, jsxElement, jsxFragment, jsxIdentifier, jsxOpeningElement, jsxOpeningFragment, jsxText } from "@babel/types";
 import { generate } from "@babel/generator";
@@ -9,22 +9,18 @@ import traverseModule from "@babel/traverse";
 import fs$1, { existsSync, readFileSync, writeFileSync } from "fs";
 import { glob } from "glob";
 import { Node, Project, ts } from "ts-morph";
-import os from "os";
-import archiver from "archiver";
-import { Minimatch, minimatch } from "minimatch";
-import { execSync } from "child_process";
-import dotenv from "dotenv";
-import chalk from "chalk";
+import fs$2, { existsSync as existsSync$1, readFileSync as readFileSync$1, unlinkSync } from "node:fs";
 import express from "express";
 import { createRequestHandler } from "@react-router/express";
-import { existsSync as existsSync$1, readFileSync as readFileSync$1, unlinkSync } from "node:fs";
 import { pathToFileURL as pathToFileURL$1 } from "node:url";
 import { createProxyMiddleware } from "http-proxy-middleware";
+import chalk from "chalk";
 import compression from "compression";
 import zlib from "node:zlib";
 import morgan from "morgan";
+import { minimatch } from "minimatch";
 import { access, mkdir, readFile, readdir, rm, writeFile } from "node:fs/promises";
-import { execSync as execSync$1 } from "node:child_process";
+import { execSync } from "node:child_process";
 import { tmpdir } from "node:os";
 import { randomUUID } from "node:crypto";
 import { npmRunPathEnv } from "npm-run-path";
@@ -62,6 +58,44 @@ function fixReactRouterManifestUrlsPlugin() {
 	};
 }
 
+//#endregion
+//#region src/utils/paths.ts
+/**
+* Copyright 2026 Salesforce, Inc.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+/**
+* Normalize a file path to use forward slashes.
+* On Windows, Node APIs return backslash-separated paths, but ESM import
+* specifiers and Vite module IDs require forward slashes.
+*/
+function toPosixPath(filePath) {
+	return filePath.replace(/\\/g, "/");
+}
+/**
+* Get the Commerce Cloud API URL from a short code
+*/
+function getCommerceCloudApiUrl(shortCode, proxyHost) {
+	return proxyHost || `https://${shortCode}.api.commercecloud.salesforce.com`;
+}
+/**
+* Get the bundle path for static assets
+*/
+function getBundlePath(bundleId) {
+	return `/mobify/bundle/${bundleId}/client/`;
+}
+
 //#endregion
 //#region src/plugins/readableChunkFileNames.ts
 /**
@@ -89,9 +123,6 @@ const readableChunkFileNames = (chunkInfo) => {
 	const defaultName = "assets/(chunk)-[name].[hash].js";
 	if (!moduleIds || moduleIds.length === 0) return defaultName;
 	const lastModuleId = moduleIds[moduleIds.length - 1];
-	const toPosixPath = (pathname) => {
-		return pathname.replace(/\\/g, "/");
-	};
 	const getFileName = (pathname) => {
 		const posixPath = toPosixPath(pathname);
 		return path$1.posix.parse(posixPath).base.split("?")[0].replace(/\.(tsx?|jsx?|mjs|js)$/, "");
@@ -279,18 +310,18 @@ const patchReactRouterPlugin = () => {
 };
 
 //#endregion
-//#region src/extensibility/plugin-utils.ts
+//#region src/extensibility/target-utils.ts
 const traverse = traverseModule.default || traverseModule;
-const PLUGIN_COMPONENT_TAG = "PluginComponent";
-const PLUGIN_PROVIDERS_TAG = "PluginProviders";
-const PLUGIN_ID_ATTRIBUTE = "pluginId";
+const TARGET_COMPONENT_TAG = "UITarget";
+const TARGET_PROVIDERS_TAG = "TargetProviders";
+const TARGET_ID_ATTRIBUTE = "targetId";
 /**
-* Find and replace the PluginProviders tags with the corresponding context providers
+* Find and replace the TargetProviders tags with the corresponding context providers
 * @param element - the AST element to replace
 * @param contextProviders - the context providers to replace
 */
 function findAndReplaceProviders(element, contextProviders) {
-	if (isJSXIdentifier(element.node.openingElement.name, { name: PLUGIN_PROVIDERS_TAG })) if (contextProviders.length > 0) {
+	if (isJSXIdentifier(element.node.openingElement.name, { name: TARGET_PROVIDERS_TAG })) if (contextProviders.length > 0) {
 		let nested = element.node.children;
 		for (let i = contextProviders.length - 1; i >= 0; i--) {
 			const componentName = contextProviders[i].componentName;
@@ -300,49 +331,49 @@ function findAndReplaceProviders(element, contextProviders) {
 	} else element.replaceWith(jsxFragment(jsxOpeningFragment(), jsxClosingFragment(), element.node.children));
 }
 /**
-* Find and replace the plugin component with the replacement code
+* Find and replace the target component with the replacement code
 * @param componentName - the name of the component to replace
 * @param element - the AST element as the replacement candidate
-* @param pluginRegistry - the plugin registry
-* @returns the pluginId that was replaced, or null if no replacement was found
+* @param targetRegistry - the target registry
+* @returns the targetId that was replaced, or null if no replacement was found
 */
-function findAndReplaceComponent(componentName, element, pluginRegistry) {
-	let pluginIdReplaced = null;
+function findAndReplaceComponent(componentName, element, targetRegistry) {
+	let targetIdReplaced = null;
 	if (isJSXIdentifier(element.node.openingElement.name, { name: componentName })) {
 		let replaced = false;
 		if (Array.isArray(element.node.openingElement.attributes)) {
-			const attr = element.node.openingElement.attributes.find((a) => isJSXAttribute(a) && isJSXIdentifier(a.name, { name: PLUGIN_ID_ATTRIBUTE }));
-			const pluginId = attr && isJSXAttribute(attr) && attr.value && "value" in attr.value ? attr.value.value : void 0;
-			if (pluginId == null) throw new Error(`PluginComponent must contain a pluginId attribute`);
-			if (pluginRegistry[pluginId] && pluginRegistry[pluginId].length > 0) {
-				const components = pluginRegistry[pluginId].map((pluginComponent) => {
-					return jsxElement(jsxOpeningElement(jsxIdentifier(pluginComponent.componentName), [], true), null, [], true);
+			const attr = element.node.openingElement.attributes.find((a) => isJSXAttribute(a) && isJSXIdentifier(a.name, { name: TARGET_ID_ATTRIBUTE }));
+			const targetId = attr && isJSXAttribute(attr) && attr.value && "value" in attr.value ? attr.value.value : void 0;
+			if (targetId == null) throw new Error(`UITarget must contain a targetId attribute`);
+			if (targetRegistry[targetId] && targetRegistry[targetId].length > 0) {
+				const components = targetRegistry[targetId].map((targetComponent) => {
+					return jsxElement(jsxOpeningElement(jsxIdentifier(targetComponent.componentName), [], true), null, [], true);
 				});
 				if (components.length > 1) element.replaceWith(jsxFragment(jsxOpeningFragment(), jsxClosingFragment(), components));
 				else element.replaceWith(components[0]);
-				pluginIdReplaced = pluginId;
+				targetIdReplaced = targetId;
 				replaced = true;
 			}
 		}
 		if (!replaced) if (element.node.children && element.node.children.length > 0) element.replaceWithMultiple(element.node.children);
 		else element.remove();
 	}
-	return pluginIdReplaced;
+	return targetIdReplaced;
 }
 /**
 * Run a replacement pass on the AST
 * @param ast - the AST to traverse
 * @param tagName - the name of the tag to replace
-* @param pluginRegistry - the plugin registry
+* @param targetRegistry - the target registry
 * @param contextProviders - the context providers to replace
-* @returns a set of pluginIds that were replaced
+* @returns a set of targetIds that were replaced
 */
-function runReplacementPass(ast, tagName, pluginRegistry = null, contextProviders = null) {
-	const pluginIdsReplaced = /* @__PURE__ */ new Set();
+function runReplacementPass(ast, tagName, targetRegistry = null, contextProviders = null) {
+	const targetIdsReplaced = /* @__PURE__ */ new Set();
 	const applyReplacement = (pathToReplace) => {
-		if (pluginRegistry) {
-			const replacedId = findAndReplaceComponent(tagName, pathToReplace, pluginRegistry);
-			if (replacedId) pluginIdsReplaced.add(replacedId);
+		if (targetRegistry) {
+			const replacedId = findAndReplaceComponent(tagName, pathToReplace, targetRegistry);
+			if (replacedId) targetIdsReplaced.add(replacedId);
 		} else if (contextProviders) findAndReplaceProviders(pathToReplace, contextProviders);
 	};
 	traverse(ast, {
@@ -370,24 +401,24 @@ function runReplacementPass(ast, tagName, pluginRegistry = null, contextProvider
 			} });
 		}
 	});
-	return pluginIdsReplaced;
+	return targetIdsReplaced;
 }
 /**
-* Build the import statements for the plugin components
-* @param pluginIds - the pluginIds that were replaced
-* @param pluginRegistry - the plugin registry
+* Build the import statements for the target components
+* @param targetIds - the targetIds that were replaced
+* @param targetRegistry - the target registry
 * @returns the import statements
 */
-function buildReplacementImportStatements(pluginIds, pluginRegistry) {
+function buildReplacementImportStatements(targetIds, targetRegistry) {
 	const importStatements = /* @__PURE__ */ new Set();
-	for (const pluginId of pluginIds) {
-		const pluginComponents = pluginRegistry[pluginId];
-		for (const pluginComponent of pluginComponents) importStatements.add(`import ${pluginComponent.componentName} from '@/${pluginComponent.path.replace(".tsx", "")}';`);
+	for (const targetId of targetIds) {
+		const targetComponents = targetRegistry[targetId];
+		for (const targetComponent of targetComponents) importStatements.add(`import ${targetComponent.componentName} from '@/${targetComponent.path.replace(".tsx", "")}';`);
 	}
 	return Array.from(importStatements).join("\n");
 }
-function transformPlugins(code, pluginRegistry, contextProviders) {
-	if (!code.includes(PLUGIN_COMPONENT_TAG) && !code.includes(PLUGIN_PROVIDERS_TAG)) return null;
+function transformTargets(code, targetRegistry, contextProviders) {
+	if (!code.includes(TARGET_COMPONENT_TAG) && !code.includes(TARGET_PROVIDERS_TAG)) return null;
 	const ast = parse(code, {
 		sourceType: "module",
 		plugins: [
@@ -396,30 +427,30 @@ function transformPlugins(code, pluginRegistry, contextProviders) {
 			"decorators-legacy"
 		]
 	});
-	if (code.includes(PLUGIN_COMPONENT_TAG)) {
-		const replacementImportStatements = buildReplacementImportStatements(runReplacementPass(ast, PLUGIN_COMPONENT_TAG, pluginRegistry, null), pluginRegistry);
+	if (code.includes(TARGET_COMPONENT_TAG)) {
+		const replacementImportStatements = buildReplacementImportStatements(runReplacementPass(ast, TARGET_COMPONENT_TAG, targetRegistry, null), targetRegistry);
 		traverse(ast, { ImportDeclaration(nodePath) {
-			if (nodePath.node.source.value.includes("@/plugins/plugin-component")) nodePath.replaceWith(jsxText(replacementImportStatements));
+			if (nodePath.node.source.value.includes("@/targets/ui-target")) nodePath.replaceWith(jsxText(replacementImportStatements));
 		} });
 	}
-	if (code.includes(PLUGIN_PROVIDERS_TAG)) {
+	if (code.includes(TARGET_PROVIDERS_TAG)) {
 		const importStatements = /* @__PURE__ */ new Set();
 		for (const contextProvider of contextProviders) importStatements.add(`import ${contextProvider.componentName} from '@/${contextProvider.path.replace(".tsx", "")}';`);
 		const replacementImportStatements = Array.from(importStatements).join("\n");
 		traverse(ast, { ImportDeclaration(nodePath) {
-			if (nodePath.node.source.value.includes("@/plugins/plugin-providers")) nodePath.replaceWith(jsxText(replacementImportStatements));
+			if (nodePath.node.source.value.includes("@/targets/target-providers")) nodePath.replaceWith(jsxText(replacementImportStatements));
 		} });
-		runReplacementPass(ast, PLUGIN_PROVIDERS_TAG, null, contextProviders);
+		runReplacementPass(ast, TARGET_PROVIDERS_TAG, null, contextProviders);
 	}
 	return generate(ast).code;
 }
 /**
-* Build the plugin registry from the extension directories
+* Build the target registry from the extension directories
 * @param rootDir - the root directory of the project
 * @param sourceDir - the source directory of the project
-* @returns the plugin registry
+* @returns the target registry
 */
-function buildPluginRegistry(rootDir) {
+function buildTargetRegistry(rootDir) {
 	const componentRegistry = {};
 	const contextProviders = [];
 	const extensionDirPath = path$1.join(rootDir, "extensions");
@@ -431,17 +462,18 @@ function buildPluginRegistry(rootDir) {
 			componentName: `${namespace}_${(filePath.split("/").pop()?.replace(".tsx", ""))?.split("-").map((word) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase()).join("")}`
 		};
 	};
+	const TARGET_CONFIG_FILENAME = "target-config.json";
 	for (const dir of extensionDirs) if (dir.isDirectory()) {
-		const configPath = path$1.join(extensionDirPath, dir.name, "plugin-config.json");
+		const configPath = path$1.join(extensionDirPath, dir.name, TARGET_CONFIG_FILENAME);
 		if (fs.existsSync(configPath)) {
-			const pluginConfig = fs.readJsonSync(configPath);
-			if (pluginConfig && pluginConfig.components) for (const pluginComponent of pluginConfig.components) {
-				const { pluginId, path: componentPath, order = 0 } = pluginComponent;
-				if (pluginId && componentPath) {
-					if (!componentRegistry[pluginId]) componentRegistry[pluginId] = [];
+			const extensionConfig = fs.readJsonSync(configPath);
+			if (extensionConfig && extensionConfig.components) for (const component of extensionConfig.components) {
+				const { targetId, path: componentPath, order = 0 } = component;
+				if (targetId && componentPath) {
+					if (!componentRegistry[targetId]) componentRegistry[targetId] = [];
 					const { namespace, componentName } = getNamespaceAndComponentName(dir, componentPath);
-					componentRegistry[pluginId].push({
-						pluginId,
+					componentRegistry[targetId].push({
+						targetId,
 						path: componentPath,
 						order,
 						namespace,
@@ -449,7 +481,7 @@ function buildPluginRegistry(rootDir) {
 					});
 				}
 			}
-			if (pluginConfig && pluginConfig.contextProviders) for (const contextProvider of pluginConfig.contextProviders) {
+			if (extensionConfig && extensionConfig.contextProviders) for (const contextProvider of extensionConfig.contextProviders) {
 				const { path: providerPath, order = 0 } = contextProvider;
 				if (providerPath) {
 					const { namespace, componentName } = getNamespaceAndComponentName(dir, providerPath);
@@ -463,7 +495,7 @@ function buildPluginRegistry(rootDir) {
 			}
 		}
 	}
-	for (const pluginId in componentRegistry) componentRegistry[pluginId].sort((a, b) => a.order - b.order);
+	for (const targetId in componentRegistry) componentRegistry[targetId].sort((a, b) => a.order - b.order);
 	contextProviders.sort((a, b) => a.order - b.order);
 	return {
 		componentRegistry,
@@ -472,30 +504,30 @@ function buildPluginRegistry(rootDir) {
 }
 
 //#endregion
-//#region src/plugins/transformPlugins.ts
-function transformPluginPlaceholderPlugin() {
+//#region src/plugins/transformTargets.ts
+function transformTargetPlaceholderPlugin() {
 	let componentRegistry;
 	let contextProviders;
 	let sourceDir;
 	return {
-		name: "odyssey:transform-plugin-placeholder",
+		name: "odyssey:transform-target-placeholder",
 		enforce: "pre",
 		configResolved(config) {
 			sourceDir = config.resolve.alias.find((alias) => alias.find === "@")?.replacement || path$1.resolve(__dirname, "./src");
 		},
 		buildStart() {
-			({componentRegistry, contextProviders} = buildPluginRegistry(sourceDir));
+			({componentRegistry, contextProviders} = buildTargetRegistry(sourceDir));
 		},
 		transform(code, id) {
 			try {
-				const transformedCode = transformPlugins(code, componentRegistry, contextProviders);
+				const transformedCode = transformTargets(code, componentRegistry, contextProviders);
 				if (transformedCode) return {
 					code: transformedCode,
 					map: null
 				};
 				return null;
 			} catch (err) {
-				console.error(`PluginComponent replace ERROR in ${id}: ${err instanceof Error ? err.stack : String(err)}`);
+				console.error(`UITarget replace ERROR in ${id}: ${err instanceof Error ? err.stack : String(err)}`);
 				throw err;
 			}
 		}
@@ -514,11 +546,11 @@ const watchConfigFilesPlugin = () => {
 		configureServer(server) {
 			const aliases = viteConfig.resolve.alias;
 			const root = Object.values(aliases).find((alias) => alias.find === "@")?.replacement || "src";
-			const glob$1 = path$1.posix.join(root, "extensions", "**", "plugin-config.json");
+			const glob$1 = path$1.posix.join(root, "extensions", "**", "target-config.json");
 			server.watcher.add(glob$1);
 			const onChange = (file) => {
-				if (file.endsWith("plugin-config.json")) {
-					console.log(`🔁 plugin-config.json changed: ${file}`);
+				if (file.endsWith("target-config.json")) {
+					console.log(`🔁 target-config.json changed: ${file}`);
 					server.restart();
 				}
 			};
@@ -639,8 +671,8 @@ async function scanComponents(project, projectRoot, componentPath, registryPath,
 				}
 			}
 		}
-	} catch (error$1) {
-		if (verbose$1) console.warn(`⚠️  Could not process ${filePath}:`, error$1.message);
+	} catch (error) {
+		if (verbose$1) console.warn(`⚠️  Could not process ${filePath}:`, error.message);
 	}
 	return components;
 }
@@ -705,8 +737,8 @@ export const registry = new ComponentRegistry();
 		existingContent = basicRegistryContent;
 	} else try {
 		existingContent = readFileSync(registryFilePath, "utf-8");
-	} catch (error$1) {
-		throw new Error(`Failed to read registry file: ${error$1.message}`);
+	} catch (error) {
+		throw new Error(`Failed to read registry file: ${error.message}`);
 	}
 	const startMarker = "// STATIC_REGISTRY_START";
 	const endMarker = "// STATIC_REGISTRY_END";
@@ -717,8 +749,8 @@ export const registry = new ComponentRegistry();
 	try {
 		writeFileSync(registryFilePath, updatedContent, "utf-8");
 		if (verbose$1) console.log(`💾 Updated registry file: ${registryFilePath}`);
-	} catch (error$1) {
-		throw new Error(`Failed to write registry file: ${error$1.message}`);
+	} catch (error) {
+		throw new Error(`Failed to write registry file: ${error.message}`);
 	}
 }
 /**
@@ -772,9 +804,9 @@ const staticRegistryPlugin = (config = {}) => {
 		async buildStart() {
 			try {
 				await runRegistryGeneration();
-			} catch (error$1) {
-				console.error(`❌ Static registry generation failed: ${error$1.message}`);
-				if (failOnError) throw error$1;
+			} catch (error) {
+				console.error(`❌ Static registry generation failed: ${error.message}`);
+				if (failOnError) throw error;
 				console.warn("⚠️  Continuing build without static registry...");
 			}
 		},
@@ -788,8 +820,8 @@ const staticRegistryPlugin = (config = {}) => {
 					const registryModule = server.moduleGraph.getModuleById(registryFilePath);
 					if (registryModule) await server.reloadModule(registryModule);
 					if (verbose$1) console.log("✅ Registry regenerated successfully!");
-				} catch (error$1) {
-					console.error(`❌ Failed to regenerate registry: ${error$1.message}`);
+				} catch (error) {
+					console.error(`❌ Failed to regenerate registry: ${error.message}`);
 				}
 				return [];
 			}
@@ -813,8 +845,8 @@ async function loadEngagementConfig(projectRoot, configPath, verbose$1) {
 			return null;
 		}
 		return engagement;
-	} catch (error$1) {
-		if (verbose$1) console.warn(`  ⚠️  Could not load config from ${configPath}: ${error$1.message}`);
+	} catch (error) {
+		if (verbose$1) console.warn(`  ⚠️  Could not load config from ${configPath}: ${error.message}`);
 		return null;
 	}
 }
@@ -858,8 +890,8 @@ async function scanForInstrumentedEvents(projectRoot, scanPaths, verbose$1) {
 			trackEventPattern.lastIndex = 0;
 			sendViewPagePattern.lastIndex = 0;
 			createEventPattern.lastIndex = 0;
-		} catch (error$1) {
-			if (verbose$1) console.warn(`    ⚠️  Could not read ${file}: ${error$1.message}`);
+		} catch (error) {
+			if (verbose$1) console.warn(`    ⚠️  Could not read ${file}: ${error.message}`);
 		}
 	}
 	return instrumentedEvents;
@@ -1020,7 +1052,208 @@ const buildMiddlewareRegistryPlugin = () => {
 };
 
 //#endregion
-//#region src/plugin.ts
+//#region src/plugins/platformEntry.ts
+/**
+* File extensions to search when detecting ejected entry files.
+* Matches React Router's `entryExts` in its findEntry function.
+*/
+const ENTRY_EXTENSIONS = [
+	".js",
+	".jsx",
+	".ts",
+	".tsx",
+	".mjs",
+	".mts"
+];
+/**
+* Query parameter appended to imports of ejected entry files within the
+* generated composition code. This creates a distinct module ID so Vite
+* treats it as a separate module from the one we intercept in `load`,
+* breaking what would otherwise be a circular import.
+*
+* Vite natively handles query parameters on file imports — it strips the
+* query for filesystem access but keeps it in the module ID for deduplication.
+*/
+const PASSTHROUGH_QUERY = "?platform-passthrough";
+/**
+* Finds a user-ejected entry file in the app directory.
+* Returns the absolute path if found, undefined otherwise.
+*/
+function findUserEntry(appDirectory, basename$1) {
+	for (const ext of ENTRY_EXTENSIONS) {
+		const filePath = path.resolve(appDirectory, basename$1 + ext);
+		if (fs$2.existsSync(filePath)) return filePath;
+	}
+}
+/**
+* Generates the virtual module code for the composed server entry.
+*
+* The generated module imports the app's entry (user-ejected or SDK default),
+* passes it through composeServerEntry(), and re-exports all ServerEntryModule
+* fields. This ensures platform features are always applied.
+*/
+function generateServerEntryCode(appEntryImportPath) {
+	const importPath = JSON.stringify(toPosixPath(appEntryImportPath));
+	return `
+import * as _app from ${importPath};
+import { composeServerEntry } from '@salesforce/storefront-next-dev/entry/server';
+
+const _composed = composeServerEntry(_app);
+
+// Forward all named exports from the app entry so that any future
+// React Router exports are passed through without requiring a plugin update.
+// Explicit exports below take precedence over star re-exports per ESM spec.
+export * from ${importPath};
+
+// Override with composed versions for exports the platform layer enhances.
+export default _composed.default;
+export const handleDataRequest = _composed.handleDataRequest;
+export const handleError = _composed.handleError;
+export const unstable_instrumentations = _composed.unstable_instrumentations;
+export const streamTimeout = _composed.streamTimeout;
+`.trim();
+}
+/**
+* Generates the virtual module code for the composed client entry.
+*
+* Imports the platform client setup as a side-effect (runs before the app entry),
+* then re-exports everything from the app's client entry.
+*/
+function generateClientEntryCode(appEntryImportPath) {
+	return `
+import '@salesforce/storefront-next-dev/entry/client';
+export * from ${JSON.stringify(toPosixPath(appEntryImportPath))};
+`.trim();
+}
+/**
+* Vite plugin that composes platform-level features into React Router entry files.
+*
+* This plugin uses the `load` hook to replace entry file contents with generated
+* composition code, while preserving the original file path as the module ID.
+* This is critical because React Router's post-build manifest lookup uses the
+* original entry file paths to find built chunks — changing the module ID (via
+* `resolveId`) would break that lookup.
+*
+* The plugin supports two modes:
+* - **Non-ejected:** No entry files in the app directory. The generated code
+*   imports SDK default entries from `@salesforce/storefront-next-dev/entry/defaults/`.
+* - **Ejected:** Customer has created their own entry file(s). The generated code
+*   imports the customer's file (with a `?platform-passthrough` query to avoid
+*   circular imports) and wraps it with the platform layer.
+*
+* In both cases, the platform composition layer is always present. New platform
+* features ship via `npm update` by modifying the composition functions, without
+* changes to the plugin or customer code.
+*/
+function platformEntryPlugin() {
+	let isTestMode = false;
+	let serverEntryFilePath;
+	let clientEntryFilePath;
+	let appDirectory;
+	let userServerEntryPath;
+	let userClientEntryPath;
+	return {
+		name: "odyssey:platform-entry",
+		enforce: "pre",
+		config(_config, { mode }) {
+			isTestMode = mode === "test";
+		},
+		configResolved(config) {
+			if (isTestMode) return;
+			const ctx = config.__reactRouterPluginContext;
+			if (!ctx) return;
+			appDirectory = ctx.reactRouterConfig.appDirectory;
+			serverEntryFilePath = ctx.entryServerFilePath;
+			clientEntryFilePath = ctx.entryClientFilePath;
+			userServerEntryPath = findUserEntry(appDirectory, "entry.server");
+			userClientEntryPath = findUserEntry(appDirectory, "entry.client");
+		},
+		load(id) {
+			if (isTestMode || !serverEntryFilePath || !clientEntryFilePath || !appDirectory) return null;
+			if (id.includes(PASSTHROUGH_QUERY)) return null;
+			const idWithoutQuery = id.split("?")[0];
+			if (path.normalize(idWithoutQuery) === path.normalize(serverEntryFilePath)) return generateServerEntryCode(userServerEntryPath ? userServerEntryPath + PASSTHROUGH_QUERY : serverEntryFilePath + PASSTHROUGH_QUERY);
+			if (path.normalize(idWithoutQuery) === path.normalize(clientEntryFilePath)) return generateClientEntryCode(userClientEntryPath ? userClientEntryPath + PASSTHROUGH_QUERY : clientEntryFilePath + PASSTHROUGH_QUERY);
+			return null;
+		},
+		configureServer(server) {
+			if (isTestMode || !appDirectory) return;
+			const appDir = appDirectory;
+			const watcher = server.watcher;
+			const checkEntryChange = (filePath) => {
+				const relative$1 = path.relative(appDir, filePath);
+				const basename$1 = path.basename(relative$1, path.extname(relative$1));
+				if (path.dirname(relative$1) !== "." || basename$1 !== "entry.server" && basename$1 !== "entry.client") return;
+				const ext = path.extname(relative$1);
+				if (!ENTRY_EXTENSIONS.includes(ext)) return;
+				const nowHasServer = findUserEntry(appDir, "entry.server") !== void 0;
+				const nowHasClient = findUserEntry(appDir, "entry.client") !== void 0;
+				if (nowHasServer !== (userServerEntryPath !== void 0) || nowHasClient !== (userClientEntryPath !== void 0)) server.restart();
+			};
+			watcher.on("add", checkEntryChange);
+			watcher.on("unlink", checkEntryChange);
+		}
+	};
+}
+
+//#endregion
+//#region src/plugins/workspace.ts
+/**
+* Vite plugin that automatically configures workspace-specific settings when
+* SCAPI_PROXY_HOST is set. This includes:
+* - Disabling DIS (Dynamic Imaging Service) via PUBLIC__app__images__enableDis
+* - Adding dev server proxy rules for image paths (/dw/image, /on/demandware.static)
+* - Allowing all hosts for the dev server (workspace proxies use dynamic hostnames)
+*
+* Environment variables:
+* - `SCAPI_PROXY_HOST` — (Required) Base URL of the SCAPI proxy in workspace environments.
+*    Enables workspace mode when set. Used as the proxy target for SCAPI requests and,
+*    if JWEB_TARGET is not set, for static asset/image paths.
+*    Example: `http://scw:25010`
+* - `JWEB_TARGET` — (Optional) Separate proxy target for JWeb static asset paths
+*    (`/dw/image`, `/on/demandware.static`). Falls back to SCAPI_PROXY_HOST if not set.
+*    Example: `http://jweb:8080`
+* - `PUBLIC__app__images__enableDis` — (Auto-set) Set to `'false'` when SCAPI_PROXY_HOST
+*    is present, unless already explicitly configured. Controls whether the template
+*    uses DIS for image format conversion and responsive srcsets.
+*
+* In workspace dev mode, this plugin also configures `optimizeDeps.entries` to scan all
+* source files upfront. Without this, Vite discovers deps lazily per-route and invalidates
+* the SSR module cache mid-session, leaving React in a partially-initialized state:
+*   TypeError: Cannot read properties of null (reading 'useContext'/'useMemo')
+*/
+const workspacePlugin = () => {
+	return {
+		name: "storefront-next-workspace",
+		config(_, { mode }) {
+			const scapiProxyHost = process.env.SCAPI_PROXY_HOST;
+			if (!scapiProxyHost) return;
+			process.env.PUBLIC__app__images__enableDis ??= "false";
+			if (mode !== "development") return;
+			const jwebTarget = process.env.JWEB_TARGET;
+			return {
+				server: {
+					allowedHosts: true,
+					proxy: Object.fromEntries(["/dw/image", "/on/demandware.static"].map((path$2) => [path$2, {
+						target: jwebTarget || scapiProxyHost,
+						changeOrigin: true,
+						secure: false
+					}]))
+				},
+				optimizeDeps: { entries: [
+					"./src/**/*.{ts,tsx}",
+					"!./src/**/*.{test,spec}.{ts,tsx}",
+					"!./src/**/*.stories.{ts,tsx}",
+					"!./src/**/*-snapshot.tsx",
+					"!./src/**/*.d.ts"
+				] }
+			};
+		}
+	};
+};
+
+//#endregion
+//#region src/storefront-next-targets.ts
 /**
 * Storefront Next Vite plugin that powers the React Router RSC app.
 * Supports building and optimizing for the managed runtime environment.
@@ -1031,16 +1264,16 @@ const buildMiddlewareRegistryPlugin = () => {
 * @example
 * // With default options
 * export default defineConfig({
-*   plugins: [storefrontNextPlugins()]
+*   plugins: [storefrontNextTargets()]
 * })
 *
 * @example
 * // Disable readable chunk names
 * export default defineConfig({
-*   plugins: [storefrontNextPlugins({ readableChunkNames: false })]
+*   plugins: [storefrontNextTargets({ readableChunkNames: false })]
 * })
 */
-function storefrontNextPlugins(config = {}) {
+function storefrontNextTargets(config = {}) {
 	const { readableChunkNames = false, staticRegistry = {
 		componentPath: "",
 		registryPath: "",
@@ -1052,10 +1285,12 @@ function storefrontNextPlugins(config = {}) {
 		verbose: false
 	} } = config;
 	const plugins = [
+		...process.env.SCAPI_PROXY_HOST ? [workspacePlugin()] : [],
 		managedRuntimeBundlePlugin(),
 		fixReactRouterManifestUrlsPlugin(),
 		patchReactRouterPlugin(),
-		transformPluginPlaceholderPlugin(),
+		platformEntryPlugin(),
+		transformTargetPlaceholderPlugin(),
 		watchConfigFilesPlugin(),
 		buildMiddlewareRegistryPlugin()
 	];
@@ -1065,447 +1300,6 @@ function storefrontNextPlugins(config = {}) {
 	return plugins;
 }
 
-//#endregion
-//#region package.json
-var version = "0.1.1";
-
-//#endregion
-//#region src/utils/logger.ts
-/**
-* Logger utilities
-*/
-const colors = {
-	warn: "yellow",
-	error: "red",
-	success: "cyan",
-	info: "green",
-	debug: "gray"
-};
-const fancyLog = (level, msg) => {
-	const colorFn = chalk[colors[level]];
-	console.log(`${colorFn(level)}: ${msg}`);
-};
-const info = (msg) => fancyLog("info", msg);
-const success = (msg) => fancyLog("success", msg);
-const warn = (msg) => fancyLog("warn", msg);
-const error = (msg) => fancyLog("error", msg);
-const debug = (msg, data) => {
-	if (process.env.DEBUG || process.env.NODE_ENV !== "production") {
-		fancyLog("debug", msg);
-		if (data) console.log(data);
-	}
-};
-
-//#endregion
-//#region src/utils.ts
-const DEFAULT_CLOUD_ORIGIN = "https://cloud.mobify.com";
-const getDefaultBuildDir = (targetDir) => path$1.join(targetDir, "build");
-const NODE_ENV = process.env.NODE_ENV || "development";
-/**
-* Get credentials file path based on cloud origin
-*/
-const getCredentialsFile = (cloudOrigin, credentialsFile) => {
-	if (credentialsFile) return credentialsFile;
-	const host = new URL(cloudOrigin).host;
-	const suffix = host === "cloud.mobify.com" ? "" : `--${host}`;
-	return path$1.join(os.homedir(), `.mobify${suffix}`);
-};
-/**
-* Read credentials from file
-*/
-const readCredentials = async (filepath) => {
-	try {
-		const data = await fs.readJSON(filepath);
-		return {
-			username: data.username,
-			api_key: data.api_key
-		};
-	} catch {
-		throw new Error(`Credentials file "${filepath}" not found.\nVisit https://runtime.commercecloud.com/account/settings for steps on authorizing your computer to push bundles.`);
-	}
-};
-/**
-* Get project package.json
-*/
-const getProjectPkg = (projectDir) => {
-	const packagePath = path$1.join(projectDir, "package.json");
-	try {
-		return fs.readJSONSync(packagePath);
-	} catch {
-		throw new Error(`Could not read project package at "${packagePath}"`);
-	}
-};
-/**
-* Load .env file from project directory
-*/
-const loadEnvFile = (projectDir) => {
-	const envPath = path$1.join(projectDir, ".env");
-	if (fs.existsSync(envPath)) dotenv.config({ path: envPath });
-	else warn("No .env file found");
-};
-/**
-* Get MRT configuration with priority logic: .env -> package.json -> defaults
-*/
-const getMrtConfig = (projectDir) => {
-	loadEnvFile(projectDir);
-	const pkg = getProjectPkg(projectDir);
-	const defaultMrtProject = process.env.MRT_PROJECT ?? pkg.name;
-	if (!defaultMrtProject || defaultMrtProject.trim() === "") throw new Error("Project name couldn't be determined. Do one of these options:\n  1. Set MRT_PROJECT in your .env file, or\n  2. Ensure package.json has a valid \"name\" field.");
-	const defaultMrtTarget = process.env.MRT_TARGET ?? void 0;
-	debug("MRT configuration resolved", {
-		projectDir,
-		envMrtProject: process.env.MRT_PROJECT,
-		envMrtTarget: process.env.MRT_TARGET,
-		packageName: pkg.name,
-		resolvedProject: defaultMrtProject,
-		resolvedTarget: defaultMrtTarget
-	});
-	return {
-		defaultMrtProject,
-		defaultMrtTarget
-	};
-};
-/**
-* Get project dependency tree (simplified version)
-*/
-const getProjectDependencyTree = (projectDir) => {
-	try {
-		const tmpFile = path$1.join(os.tmpdir(), `npm-ls-${Date.now()}.json`);
-		execSync(`npm ls --all --json > ${tmpFile}`, {
-			stdio: "ignore",
-			cwd: projectDir
-		});
-		const data = fs.readJSONSync(tmpFile);
-		fs.unlinkSync(tmpFile);
-		return data;
-	} catch {
-		return null;
-	}
-};
-/**
-* Get PWA Kit dependencies from dependency tree
-*/
-const getPwaKitDependencies = (dependencyTree) => {
-	if (!dependencyTree) return {};
-	const pwaKitDependencies = ["@salesforce/storefront-next-dev"];
-	const result = {};
-	const searchDeps = (tree) => {
-		if (tree.dependencies) for (const [name, dep] of Object.entries(tree.dependencies)) {
-			if (pwaKitDependencies.includes(name)) result[name] = dep.version || "unknown";
-			if (dep.dependencies) searchDeps({ dependencies: dep.dependencies });
-		}
-	};
-	searchDeps(dependencyTree);
-	return result;
-};
-/**
-* Get default commit message from git
-*/
-const getDefaultMessage = (projectDir) => {
-	try {
-		return `${execSync("git rev-parse --abbrev-ref HEAD", {
-			encoding: "utf8",
-			cwd: projectDir
-		}).trim()}: ${execSync("git rev-parse --short HEAD", {
-			encoding: "utf8",
-			cwd: projectDir
-		}).trim()}`;
-	} catch {
-		debug("Using default bundle message as no message was provided and not in a Git repo.");
-		return "PWA Kit Bundle";
-	}
-};
-
-//#endregion
-//#region src/bundle.ts
-/**
-* Create a bundle from the build directory
-*/
-const createBundle = async (options) => {
-	const { message, ssr_parameters, ssr_only, ssr_shared, buildDirectory, projectDirectory, projectSlug } = options;
-	const tmpDir = fs.mkdtempSync(path$1.join(os.tmpdir(), "storefront-next-dev-push-"));
-	const destination = path$1.join(tmpDir, "build.tar");
-	const filesInArchive = [];
-	if (!ssr_only || ssr_only.length === 0 || !ssr_shared || ssr_shared.length === 0) throw new Error("no ssrOnly or ssrShared files are defined");
-	return new Promise((resolve$2, reject) => {
-		const output = fs.createWriteStream(destination);
-		const archive = archiver("tar");
-		archive.pipe(output);
-		const newRoot = path$1.join(projectSlug, "bld", "");
-		const storybookExclusionMatchers = [
-			"**/*.stories.tsx",
-			"**/*.stories.ts",
-			"**/*-snapshot.tsx",
-			".storybook/**/*",
-			"storybook-static/**/*",
-			"**/__mocks__/**/*",
-			"**/__snapshots__/**/*"
-		].map((pattern) => new Minimatch(pattern, { nocomment: true }));
-		archive.directory(buildDirectory, "", (entry) => {
-			if (entry.name && storybookExclusionMatchers.some((matcher) => matcher.match(entry.name))) return false;
-			if (entry.stats?.isFile() && entry.name) filesInArchive.push(entry.name);
-			entry.prefix = newRoot;
-			return entry;
-		});
-		archive.on("error", reject);
-		output.on("finish", () => {
-			try {
-				const { dependencies = {}, devDependencies = {} } = getProjectPkg(projectDirectory);
-				const dependencyTree = getProjectDependencyTree(projectDirectory);
-				const pwaKitDeps = dependencyTree ? getPwaKitDependencies(dependencyTree) : {};
-				const bundle_metadata = { dependencies: {
-					...dependencies,
-					...devDependencies,
-					...pwaKitDeps
-				} };
-				const data = fs.readFileSync(destination);
-				const encoding = "base64";
-				fs.rmSync(tmpDir, { recursive: true });
-				const createGlobMatcher = (patterns) => {
-					const allPatterns = patterns.map((pattern) => new Minimatch(pattern, { nocomment: true })).filter((pattern) => !pattern.empty);
-					const positivePatterns = allPatterns.filter((pattern) => !pattern.negate);
-					const negativePatterns = allPatterns.filter((pattern) => pattern.negate);
-					return (filePath) => {
-						if (filePath) {
-							const positive = positivePatterns.some((pattern) => pattern.match(filePath));
-							const negative = negativePatterns.some((pattern) => !pattern.match(filePath));
-							return positive && !negative;
-						}
-						return false;
-					};
-				};
-				resolve$2({
-					message,
-					encoding,
-					data: data.toString(encoding),
-					ssr_parameters,
-					ssr_only: filesInArchive.filter(createGlobMatcher(ssr_only)),
-					ssr_shared: filesInArchive.filter(createGlobMatcher(ssr_shared)),
-					bundle_metadata
-				});
-			} catch (err) {
-				reject(err);
-			}
-		});
-		archive.finalize().catch(reject);
-	});
-};
-
-//#endregion
-//#region src/cloud-api.ts
-var CloudAPIClient = class {
-	credentials;
-	origin;
-	constructor({ credentials, origin }) {
-		this.credentials = credentials;
-		this.origin = origin;
-	}
-	getAuthHeader() {
-		const { username, api_key } = this.credentials;
-		return { Authorization: `Basic ${Buffer.from(`${username}:${api_key}`, "binary").toString("base64")}` };
-	}
-	getHeaders() {
-		return {
-			"User-Agent": `storefront-next-dev@${version}`,
-			...this.getAuthHeader()
-		};
-	}
-	/**
-	* Push bundle to Managed Runtime
-	*/
-	async push(bundle, projectSlug, target) {
-		const base = `api/projects/${projectSlug}/builds/`;
-		const pathname = target ? `${base}${target}/` : base;
-		const url = new URL$1(this.origin);
-		url.pathname = pathname;
-		const body = Buffer.from(JSON.stringify(bundle));
-		const headers = {
-			...this.getHeaders(),
-			"Content-Length": body.length.toString()
-		};
-		const res = await fetch(url.toString(), {
-			body,
-			method: "POST",
-			headers
-		});
-		if (res.status >= 400) {
-			const bodyText = await res.text();
-			let errorData;
-			try {
-				errorData = JSON.parse(bodyText);
-			} catch {
-				errorData = { message: bodyText };
-			}
-			throw new Error(`HTTP ${res.status}: ${errorData.message || bodyText}\nFor more information visit https://developer.salesforce.com/docs/commerce/pwa-kit-managed-runtime/guide/pushing-and-deploying-bundles.html`);
-		}
-		return await res.json();
-	}
-	/**
-	* Wait for deployment to complete
-	*/
-	async waitForDeploy(project, environment) {
-		return new Promise((resolve$2, reject) => {
-			const delay = 3e4;
-			const check = async () => {
-				const url = new URL$1(`/api/projects/${project}/target/${environment}`, this.origin);
-				const res = await fetch(url, { headers: this.getHeaders() });
-				if (!res.ok) {
-					const text = await res.text();
-					let json;
-					try {
-						if (text) json = JSON.parse(text);
-					} catch {}
-					const message = json?.detail ?? text;
-					const detail = message ? `: ${message}` : "";
-					throw new Error(`${res.status} ${res.statusText}${detail}`);
-				}
-				const data = await res.json();
-				if (typeof data.state !== "string") return reject(/* @__PURE__ */ new Error("An unknown state occurred when polling the deployment."));
-				switch (data.state) {
-					case "CREATE_IN_PROGRESS":
-					case "PUBLISH_IN_PROGRESS":
-						setTimeout(() => {
-							check().catch(reject);
-						}, delay);
-						return;
-					case "CREATE_FAILED":
-					case "PUBLISH_FAILED": return reject(/* @__PURE__ */ new Error("Deployment failed."));
-					case "ACTIVE": return resolve$2();
-					default: return reject(/* @__PURE__ */ new Error(`Unknown deployment state "${data.state}".`));
-				}
-			};
-			setTimeout(() => {
-				check().catch(reject);
-			}, delay);
-		});
-	}
-};
-
-//#endregion
-//#region src/config.ts
-const SFNEXT_BASE_CARTRIDGE_NAME = "app_storefrontnext_base";
-const SFNEXT_BASE_CARTRIDGE_OUTPUT_DIR = `${SFNEXT_BASE_CARTRIDGE_NAME}/cartridge/experience`;
-/**
-* Build MRT SSR configuration for bundle deployment
-*
-* Defines which files should be:
-* - Server-only (ssrOnly): Deployed only to Lambda functions
-* - Shared (ssrShared): Deployed to both Lambda and CDN
-*
-* @param buildDirectory - Path to the build output directory
-* @param projectDirectory - Path to the project root (reserved for future use)
-* @returns MRT SSR configuration with glob patterns
-*/
-const buildMrtConfig = (_buildDirectory, _projectDirectory) => {
-	const ssrEntryPoint = getMrtEntryFile("production");
-	return {
-		ssrOnly: [
-			"server/**/*",
-			"loader.js",
-			`${ssrEntryPoint}.{js,mjs,cjs}`,
-			`${ssrEntryPoint}.{js,mjs,cjs}.map`,
-			"!static/**/*",
-			"sfnext-server-*.mjs",
-			"!**/*.stories.tsx",
-			"!**/*.stories.ts",
-			"!**/*-snapshot.tsx",
-			"!.storybook/**/*",
-			"!storybook-static/**/*",
-			"!**/__mocks__/**/*",
-			"!**/__snapshots__/**/*"
-		],
-		ssrShared: [
-			"client/**/*",
-			"static/**/*",
-			"**/*.css",
-			"**/*.png",
-			"**/*.jpg",
-			"**/*.jpeg",
-			"**/*.gif",
-			"**/*.svg",
-			"**/*.ico",
-			"**/*.woff",
-			"**/*.woff2",
-			"**/*.ttf",
-			"**/*.eot",
-			"!**/*.stories.tsx",
-			"!**/*.stories.ts",
-			"!**/*-snapshot.tsx",
-			"!.storybook/**/*",
-			"!storybook-static/**/*",
-			"!**/__mocks__/**/*",
-			"!**/__snapshots__/**/*"
-		],
-		ssrParameters: { ssrFunctionNodeVersion: "24.x" }
-	};
-};
-
-//#endregion
-//#region src/commands/push.ts
-/**
-* Main function to push bundle to Managed Runtime
-*/
-async function push(options) {
-	const mrtConfig = getMrtConfig(options.projectDirectory);
-	const resolvedTarget = options.target ?? mrtConfig.defaultMrtTarget;
-	if (options.wait && !resolvedTarget) throw new Error("You must provide a target to deploy to when using --wait (via --target flag or .env MRT_TARGET)");
-	if (options.user && !options.key || !options.user && options.key) throw new Error("You must provide both --user and --key together, or neither");
-	if (!fs.existsSync(options.projectDirectory)) throw new Error(`Project directory "${options.projectDirectory}" does not exist!`);
-	const projectSlug = options.projectSlug ?? mrtConfig.defaultMrtProject;
-	if (!projectSlug || projectSlug.trim() === "") throw new Error("Project slug could not be determined from CLI, .env, or package.json");
-	const target = resolvedTarget;
-	const buildDirectory = options.buildDirectory ?? getDefaultBuildDir(options.projectDirectory);
-	if (!fs.existsSync(buildDirectory)) throw new Error(`Build directory "${buildDirectory}" does not exist!`);
-	try {
-		if (target) process.env.DEPLOY_TARGET = target;
-		let credentials;
-		if (options.user && options.key) credentials = {
-			username: options.user,
-			api_key: options.key
-		};
-		else credentials = await readCredentials(getCredentialsFile(options.cloudOrigin ?? DEFAULT_CLOUD_ORIGIN, options.credentialsFile));
-		const config = buildMrtConfig(buildDirectory, options.projectDirectory);
-		const message = options.message ?? getDefaultMessage(options.projectDirectory);
-		info(`Creating bundle for project: ${projectSlug}`);
-		if (options.projectSlug) debug("Using project slug from CLI argument");
-		else if (process.env.MRT_PROJECT) debug("Using project slug from .env MRT_PROJECT");
-		else debug("Using project slug from package.json name");
-		if (target) {
-			info(`Target environment: ${target}`);
-			if (options.target) debug("Using target from CLI argument");
-			else debug("Using target from .env");
-		}
-		debug("SSR shared files", config.ssrShared);
-		debug("SSR only files", config.ssrOnly);
-		const bundle = await createBundle({
-			message,
-			ssr_parameters: config.ssrParameters,
-			ssr_only: config.ssrOnly,
-			ssr_shared: config.ssrShared,
-			buildDirectory,
-			projectDirectory: options.projectDirectory,
-			projectSlug
-		});
-		const client = new CloudAPIClient({
-			credentials,
-			origin: options.cloudOrigin ?? DEFAULT_CLOUD_ORIGIN
-		});
-		info(`Beginning upload to ${options.cloudOrigin ?? DEFAULT_CLOUD_ORIGIN}`);
-		const data = await client.push(bundle, projectSlug, target);
-		debug("API response", data);
-		(data.warnings || []).forEach(warn);
-		if (options.wait && target) {
-			success("Bundle uploaded - waiting for deployment to complete");
-			await client.waitForDeploy(projectSlug, target);
-			success("Deployment complete!");
-		} else success("Bundle uploaded successfully!");
-		if (data.url) info(`Bundle URL: ${data.url}`);
-	} catch (err) {
-		error(err.message || err?.toString() || "Unknown error");
-		throw err;
-	}
-}
-
 //#endregion
 //#region src/server/ts-import.ts
 /**
@@ -1534,7 +1328,11 @@ function parseTsconfigPaths(tsconfigPath, projectDirectory) {
 			}
 		}
 	} catch {}
-	return alias;
+	const sortedAlias = {};
+	Object.keys(alias).sort((a, b) => b.length - a.length).forEach((key) => {
+		sortedAlias[key] = alias[key];
+	});
+	return sortedAlias;
 }
 /**
 * Import a TypeScript file using jiti with proper path alias resolution.
@@ -1571,16 +1369,18 @@ function loadConfigFromEnv() {
 	const clientId = process.env.PUBLIC__app__commerce__api__clientId;
 	const siteId = process.env.PUBLIC__app__commerce__api__siteId;
 	const proxy = process.env.PUBLIC__app__commerce__api__proxy || "/mobify/proxy/api";
-	if (!shortCode) throw new Error("Missing PUBLIC__app__commerce__api__shortCode environment variable.\nPlease set it in your .env file or environment.");
+	const proxyHost = process.env.SCAPI_PROXY_HOST;
+	if (!shortCode && !proxyHost) throw new Error("Missing PUBLIC__app__commerce__api__shortCode environment variable.\nPlease set it in your .env file or environment.");
 	if (!organizationId) throw new Error("Missing PUBLIC__app__commerce__api__organizationId environment variable.\nPlease set it in your .env file or environment.");
 	if (!clientId) throw new Error("Missing PUBLIC__app__commerce__api__clientId environment variable.\nPlease set it in your .env file or environment.");
 	if (!siteId) throw new Error("Missing PUBLIC__app__commerce__api__siteId environment variable.\nPlease set it in your .env file or environment.");
 	return { commerce: { api: {
-		shortCode,
+		shortCode: shortCode || "",
 		organizationId,
 		clientId,
 		siteId,
-		proxy
+		proxy,
+		proxyHost
 	} } };
 }
 /**
@@ -1600,49 +1400,21 @@ async function loadProjectConfig(projectDirectory) {
 	})).default;
 	if (!config?.app?.commerce?.api) throw new Error("Invalid config.server.ts: missing app.commerce.api configuration.\nPlease ensure your config.server.ts has the commerce API configuration.");
 	const api = config.app.commerce.api;
-	if (!api.shortCode) throw new Error("Missing shortCode in config.server.ts commerce.api configuration");
+	const proxyHost = process.env.SCAPI_PROXY_HOST;
+	if (!api.shortCode && !proxyHost) throw new Error("Missing shortCode in config.server.ts commerce.api configuration");
 	if (!api.organizationId) throw new Error("Missing organizationId in config.server.ts commerce.api configuration");
 	if (!api.clientId) throw new Error("Missing clientId in config.server.ts commerce.api configuration");
 	if (!api.siteId) throw new Error("Missing siteId in config.server.ts commerce.api configuration");
 	return { commerce: { api: {
-		shortCode: api.shortCode,
+		shortCode: api.shortCode || "",
 		organizationId: api.organizationId,
 		clientId: api.clientId,
 		siteId: api.siteId,
-		proxy: api.proxy || "/mobify/proxy/api"
+		proxy: api.proxy || "/mobify/proxy/api",
+		proxyHost
 	} } };
 }
 
-//#endregion
-//#region src/utils/paths.ts
-/**
-* Copyright 2026 Salesforce, Inc.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-/**
-* Get the Commerce Cloud API URL from a short code
-*/
-function getCommerceCloudApiUrl(shortCode) {
-	return `https://${shortCode}.api.commercecloud.salesforce.com`;
-}
-/**
-* Get the bundle path for static assets
-*/
-function getBundlePath(bundleId) {
-	return `/mobify/bundle/${bundleId}/client/`;
-}
-
 //#endregion
 //#region src/server/middleware/proxy.ts
 /**
@@ -1651,11 +1423,31 @@ function getBundlePath(bundleId) {
 */
 function createCommerceProxyMiddleware(config) {
 	return createProxyMiddleware({
-		target: getCommerceCloudApiUrl(config.commerce.api.shortCode),
-		changeOrigin: true
+		target: getCommerceCloudApiUrl(config.commerce.api.shortCode, config.commerce.api.proxyHost),
+		changeOrigin: true,
+		secure: !config.commerce.api.proxyHost
 	});
 }
 
+//#endregion
+//#region src/utils/logger.ts
+/**
+* Logger utilities
+*/
+const colors = {
+	warn: "yellow",
+	error: "red",
+	success: "cyan",
+	info: "green",
+	debug: "gray"
+};
+const fancyLog = (level, msg) => {
+	const colorFn = chalk[colors[level]];
+	console.log(`${colorFn(level)}: ${msg}`);
+};
+const info = (msg) => fancyLog("info", msg);
+const warn = (msg) => fancyLog("warn", msg);
+
 //#endregion
 //#region src/server/middleware/static.ts
 /**
@@ -1907,9 +1699,9 @@ async function createSSRHandler(mode, bundleId, vite, build, enableAssetUrlPatch
 					build: await ssrEnvironment.runner.import("virtual:react-router/server-build"),
 					mode: process.env.NODE_ENV
 				})(req, res, next);
-			} catch (error$1) {
-				vite.ssrFixStacktrace(error$1);
-				next(error$1);
+			} catch (error) {
+				vite.ssrFixStacktrace(error);
+				next(error);
 			}
 		};
 	} else if (build) {
@@ -1945,11 +1737,11 @@ function trimExtensions(directory, selectedExtensions, extensionConfig, verboseO
 	verbose = verboseOverride ?? false;
 	const configuredExtensions = extensionConfig?.extensions || {};
 	const extensions = {};
-	Object.keys(configuredExtensions).forEach((pluginKey) => {
-		extensions[pluginKey] = Boolean(selectedExtensions?.[pluginKey]) || false;
+	Object.keys(configuredExtensions).forEach((targetKey) => {
+		extensions[targetKey] = Boolean(selectedExtensions?.[targetKey]) || false;
 	});
 	if (Object.keys(extensions).length === 0) {
-		if (verbose) console.log("No plugins found, skipping trim");
+		if (verbose) console.log("No targets found, skipping trim");
 		return;
 	}
 	const processDirectory = (dir) => {
@@ -2000,8 +1792,8 @@ function processFile(filePath, extensions) {
 				fs$1.unlinkSync(filePath);
 				if (verbose) console.log(`Deleted file ${filePath}`);
 			} catch (e) {
-				const error$1 = e;
-				console.error(`Error deleting file ${filePath}: ${error$1.message}`);
+				const error = e;
+				console.error(`Error deleting file ${filePath}: ${error.message}`);
 				throw e;
 			}
 			return;
@@ -2053,8 +1845,8 @@ function processFile(filePath, extensions) {
 			fs$1.writeFileSync(filePath, newSource);
 			if (verbose) console.log(`Updated file ${filePath}`);
 		} catch (e) {
-			const error$1 = e;
-			console.error(`Error updating file ${filePath}: ${error$1.message}`);
+			const error = e;
+			console.error(`Error updating file ${filePath}: ${error.message}`);
 			throw e;
 		}
 	}
@@ -2080,9 +1872,9 @@ function deleteExtensionFolders(projectRoot, extensions, extensionConfig) {
 				});
 				if (verbose) console.log(`Deleted extension folder: ${extensionFolderPath}`);
 			} catch (err) {
-				const error$1 = err;
-				if (error$1.code === "EPERM") console.error(`Permission denied - cannot delete ${extensionFolderPath}. You may need to run with sudo or check permissions.`);
-				else console.error(`Error deleting ${extensionFolderPath}: ${error$1.message}`);
+				const error = err;
+				if (error.code === "EPERM") console.error(`Permission denied - cannot delete ${extensionFolderPath}. You may need to run with sudo or check permissions.`);
+				else console.error(`Error deleting ${extensionFolderPath}: ${error.message}`);
 			}
 		}
 	});
@@ -2094,7 +1886,7 @@ let isCliAvailable = null;
 function checkReactRouterCli(projectDirectory) {
 	if (isCliAvailable !== null) return isCliAvailable;
 	try {
-		execSync$1("react-router --version", {
+		execSync("react-router --version", {
 			cwd: projectDirectory,
 			env: npmRunPathEnv(),
 			stdio: "pipe"
@@ -2119,7 +1911,7 @@ function getReactRouterRoutes(projectDirectory) {
 	if (!checkReactRouterCli(projectDirectory)) throw new Error("React Router CLI is not available. Please make sure @react-router/dev is installed and accessible.");
 	const tempFile = join(tmpdir(), `react-router-routes-${randomUUID()}.json`);
 	try {
-		execSync$1(`react-router routes --json > "${tempFile}"`, {
+		execSync(`react-router routes --json > "${tempFile}"`, {
 			cwd: projectDirectory,
 			env: npmRunPathEnv(),
 			encoding: "utf-8",
@@ -2131,8 +1923,8 @@ function getReactRouterRoutes(projectDirectory) {
 		});
 		const output = readFileSync$1(tempFile, "utf-8");
 		return JSON.parse(output);
-	} catch (error$1) {
-		throw new Error(`Failed to get routes from React Router CLI: ${error$1.message}`);
+	} catch (error) {
+		throw new Error(`Failed to get routes from React Router CLI: ${error.message}`);
 	} finally {
 		try {
 			if (existsSync$1(tempFile)) unlinkSync(tempFile);
@@ -2276,8 +2068,8 @@ function parseNestedObject(objectLiteral) {
 			const initializer = property.getInitializer();
 			if (initializer) result[name] = parseExpression(initializer);
 		}
-	} catch (error$1) {
-		console.warn(`Warning: Could not parse nested object: ${error$1.message}`);
+	} catch (error) {
+		console.warn(`Warning: Could not parse nested object: ${error.message}`);
 		return result;
 	}
 	return result;
@@ -2287,8 +2079,8 @@ function parseArrayLiteral(arrayLiteral) {
 	try {
 		const elements = arrayLiteral.getElements();
 		for (const element of elements) result.push(parseExpression(element));
-	} catch (error$1) {
-		console.warn(`Warning: Could not parse array literal: ${error$1.message}`);
+	} catch (error) {
+		console.warn(`Warning: Could not parse array literal: ${error.message}`);
 	}
 	return result;
 }
@@ -2320,8 +2112,8 @@ function parseDecoratorArgs(decorator) {
 			}
 		}
 		return result;
-	} catch (error$1) {
-		console.warn(`Warning: Could not parse decorator arguments: ${error$1.message}`);
+	} catch (error) {
+		console.warn(`Warning: Could not parse decorator arguments: ${error.message}`);
 		return result;
 	}
 }
@@ -2349,8 +2141,8 @@ function extractAttributesFromSource(sourceFile, className) {
 			if (config.defaultValue !== void 0) attribute.default_value = config.defaultValue;
 			attributes.push(attribute);
 		}
-	} catch (error$1) {
-		console.warn(`Warning: Could not extract attributes from class ${className}: ${error$1.message}`);
+	} catch (error) {
+		console.warn(`Warning: Could not extract attributes from class ${className}: ${error.message}`);
 	}
 	return attributes;
 }
@@ -2384,8 +2176,8 @@ function extractRegionDefinitionsFromSource(sourceFile, className) {
 				}
 			}
 		}
-	} catch (error$1) {
-		console.warn(`Warning: Could not extract region definitions from class ${className}: ${error$1.message}`);
+	} catch (error) {
+		console.warn(`Warning: Could not extract region definitions from class ${className}: ${error.message}`);
 	}
 	return regionDefinitions;
 }
@@ -2418,12 +2210,12 @@ async function processComponentFile(filePath, _projectRoot) {
 				};
 				components.push(componentMetadata);
 			}
-		} catch (error$1) {
-			console.warn(`Warning: Could not process file ${filePath}:`, error$1.message);
+		} catch (error) {
+			console.warn(`Warning: Could not process file ${filePath}:`, error.message);
 		}
 		return components;
-	} catch (error$1) {
-		console.warn(`Warning: Could not read file ${filePath}:`, error$1.message);
+	} catch (error) {
+		console.warn(`Warning: Could not read file ${filePath}:`, error.message);
 		return [];
 	}
 }
@@ -2458,12 +2250,12 @@ async function processPageTypeFile(filePath, projectRoot) {
 				};
 				pageTypes.push(pageTypeMetadata);
 			}
-		} catch (error$1) {
-			console.warn(`Warning: Could not process file ${filePath}:`, error$1.message);
+		} catch (error) {
+			console.warn(`Warning: Could not process file ${filePath}:`, error.message);
 		}
 		return pageTypes;
-	} catch (error$1) {
-		console.warn(`Warning: Could not read file ${filePath}:`, error$1.message);
+	} catch (error) {
+		console.warn(`Warning: Could not read file ${filePath}:`, error.message);
 		return [];
 	}
 }
@@ -2489,8 +2281,8 @@ async function processAspectFile(filePath, _projectRoot) {
 			console.warn(`Warning: Could not parse JSON in file ${filePath}:`, parseError.message);
 		}
 		return aspects;
-	} catch (error$1) {
-		console.warn(`Warning: Could not read file ${filePath}:`, error$1.message);
+	} catch (error) {
+		console.warn(`Warning: Could not read file ${filePath}:`, error.message);
 		return [];
 	}
 }
@@ -2567,14 +2359,14 @@ async function generateAspectCartridge(aspect, outputDir, dryRun = false) {
 function lintGeneratedFiles(metadataDir, projectRoot) {
 	try {
 		console.log("🔧 Running ESLint --fix on generated JSON files...");
-		execSync$1(`npx eslint "${metadataDir}/**/*.json" --fix --no-error-on-unmatched-pattern`, {
+		execSync(`npx eslint "${metadataDir}/**/*.json" --fix --no-error-on-unmatched-pattern`, {
 			cwd: projectRoot,
 			stdio: "pipe",
 			encoding: "utf-8"
 		});
 		console.log("✅ JSON files formatted successfully");
-	} catch (error$1) {
-		const execError = error$1;
+	} catch (error) {
+		const execError = error;
 		if (execError.status === 2) {
 			const errMsg = execError.stderr || execError.stdout || "Unknown error";
 			console.warn(`⚠️  Warning: Could not run ESLint --fix: ${errMsg}`);
@@ -2620,11 +2412,11 @@ async function generateMetadata(projectDirectory, metadataDirectory, options) {
 				aspectsOutputDir
 			]) try {
 				await mkdir(outputDir, { recursive: true });
-			} catch (error$1) {
+			} catch (error) {
 				try {
 					await access(outputDir);
 				} catch {
-					console.error(`❌ Error: Failed to create output directory ${outputDir}: ${error$1.message}`);
+					console.error(`❌ Error: Failed to create output directory ${outputDir}: ${error.message}`);
 					process.exit(1);
 				}
 			}
@@ -2692,12 +2484,12 @@ async function generateMetadata(projectDirectory, metadataDirectory, options) {
 			aspectsGenerated: allAspects.length,
 			totalFiles: allComponents.length + allPageTypes.length + allAspects.length
 		};
-	} catch (error$1) {
-		console.error("❌ Error:", error$1.message);
+	} catch (error) {
+		console.error("❌ Error:", error.message);
 		process.exit(1);
 	}
 }
 
 //#endregion
-export { createServer, storefrontNextPlugins as default, generateMetadata, loadConfigFromEnv, loadProjectConfig, push, transformPluginPlaceholderPlugin, trimExtensions };
+export { createServer, storefrontNextTargets as default, generateMetadata, loadConfigFromEnv, loadProjectConfig, transformTargetPlaceholderPlugin, trimExtensions };
 //# sourceMappingURL=index.js.map