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

package/dist/server.js

@@ -0,0 +1,425 @@
+import { c as warn, r as info } from "./logger.js";
+import path from "path";
+import chalk from "chalk";
+import express from "express";
+import { createRequestHandler } from "@react-router/express";
+import { existsSync, readFileSync } from "node:fs";
+import { resolve } from "node:path";
+import { pathToFileURL } from "node:url";
+import { createProxyMiddleware } from "http-proxy-middleware";
+import compression from "compression";
+import zlib from "node:zlib";
+import morgan from "morgan";
+import { minimatch } from "minimatch";
+
+//#region src/server/ts-import.ts
+/**
+* Parse TypeScript paths from tsconfig.json and convert to jiti alias format.
+*
+* @param tsconfigPath - Path to tsconfig.json
+* @param projectDirectory - Project root directory for resolving relative paths
+* @returns Record of alias mappings for jiti
+*
+* @example
+* // tsconfig.json: { "compilerOptions": { "paths": { "@/*": ["./src/*"] } } }
+* // Returns: { "@/": "/absolute/path/to/src/" }
+*/
+function parseTsconfigPaths(tsconfigPath, projectDirectory) {
+	const alias = {};
+	if (!existsSync(tsconfigPath)) return alias;
+	try {
+		const tsconfigContent = readFileSync(tsconfigPath, "utf-8");
+		const tsconfig = JSON.parse(tsconfigContent);
+		const paths = tsconfig.compilerOptions?.paths;
+		const baseUrl = tsconfig.compilerOptions?.baseUrl || ".";
+		if (paths) {
+			for (const [key, values] of Object.entries(paths)) if (values && values.length > 0) {
+				const aliasKey = key.replace(/\/\*$/, "/");
+				alias[aliasKey] = resolve(projectDirectory, baseUrl, values[0].replace(/\/\*$/, "/").replace(/^\.\//, ""));
+			}
+		}
+	} catch {}
+	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.
+* This is a cross-platform alternative to tsx that works on Windows.
+*
+* @param filePath - Absolute path to the TypeScript file to import
+* @param options - Import options including project directory
+* @returns The imported module
+*/
+async function importTypescript(filePath, options) {
+	const { projectDirectory, tsconfigPath = resolve(projectDirectory, "tsconfig.json") } = options;
+	const { createJiti } = await import("jiti");
+	const alias = parseTsconfigPaths(tsconfigPath, projectDirectory);
+	return createJiti(import.meta.url, {
+		fsCache: false,
+		interopDefault: true,
+		alias
+	}).import(filePath);
+}
+
+//#endregion
+//#region src/server/config.ts
+/**
+* This is a temporary function before we move the config implementation from
+* template-retail-rsc-app to the SDK.
+*
+* @ TODO: Remove this function after we move the config implementation from
+* template-retail-rsc-app to the SDK.
+*
+*/
+function loadConfigFromEnv() {
+	const shortCode = process.env.PUBLIC__app__commerce__api__shortCode;
+	const organizationId = process.env.PUBLIC__app__commerce__api__organizationId;
+	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";
+	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 || "",
+		organizationId,
+		clientId,
+		siteId,
+		proxy,
+		proxyHost
+	} } };
+}
+/**
+* Load storefront-next project configuration from config.server.ts.
+* Requires projectDirectory to be provided.
+*
+* @param projectDirectory - Project directory to load config.server.ts from
+* @throws Error if config.server.ts is not found or invalid
+*/
+async function loadProjectConfig(projectDirectory) {
+	const configPath = resolve(projectDirectory, "config.server.ts");
+	const tsconfigPath = resolve(projectDirectory, "tsconfig.json");
+	if (!existsSync(configPath)) throw new Error(`config.server.ts not found at ${configPath}.\nPlease ensure config.server.ts exists in your project root.`);
+	const config = (await importTypescript(configPath, {
+		projectDirectory,
+		tsconfigPath
+	})).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;
+	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 || "",
+		organizationId: api.organizationId,
+		clientId: api.clientId,
+		siteId: api.siteId,
+		proxy: api.proxy || "/mobify/proxy/api",
+		proxyHost
+	} } };
+}
+
+//#endregion
+//#region src/utils/paths.ts
+/**
+* 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/server/middleware/proxy.ts
+/**
+* Create proxy middleware for Commerce Cloud API
+* Proxies requests from /mobify/proxy/api to the Commerce Cloud API
+*/
+function createCommerceProxyMiddleware(config) {
+	return createProxyMiddleware({
+		target: getCommerceCloudApiUrl(config.commerce.api.shortCode, config.commerce.api.proxyHost),
+		changeOrigin: true,
+		secure: !config.commerce.api.proxyHost
+	});
+}
+
+//#endregion
+//#region src/server/middleware/static.ts
+/**
+* Create static file serving middleware for client assets
+* Serves files from build/client at /mobify/bundle/{BUNDLE_ID}/client/
+*/
+function createStaticMiddleware(bundleId, projectDirectory) {
+	const bundlePath = getBundlePath(bundleId);
+	const clientBuildDir = path.join(projectDirectory, "build", "client");
+	info(`Serving static assets from ${clientBuildDir} at ${bundlePath}`);
+	return express.static(clientBuildDir, { setHeaders: (res) => {
+		res.setHeader("Cache-Control", "public, max-age=31536000, immutable");
+		res.setHeader("x-local-static-cache-control", "1");
+	} });
+}
+
+//#endregion
+//#region src/server/middleware/compression.ts
+/**
+* Parse and validate COMPRESSION_LEVEL environment variable
+* @returns Valid compression level (0-9) or default compression level
+*/
+function getCompressionLevel() {
+	const raw = process.env.COMPRESSION_LEVEL;
+	const DEFAULT = zlib.constants.Z_DEFAULT_COMPRESSION;
+	if (raw == null || raw.trim() === "") return DEFAULT;
+	const level = Number(raw);
+	if (!(Number.isInteger(level) && level >= 0 && level <= 9)) {
+		warn(`[compression] Invalid COMPRESSION_LEVEL="${raw}". Using default (${DEFAULT}).`);
+		return DEFAULT;
+	}
+	return level;
+}
+/**
+* Create compression middleware for gzip/brotli compression
+* Used in preview mode to optimize response sizes
+*/
+function createCompressionMiddleware() {
+	return compression({
+		filter: (req, res) => {
+			if (req.headers["x-no-compression"]) return false;
+			return compression.filter(req, res);
+		},
+		level: getCompressionLevel()
+	});
+}
+
+//#endregion
+//#region src/server/middleware/logging.ts
+/**
+* Patterns for URLs to skip logging (static assets and Vite internals)
+*/
+const SKIP_PATTERNS = [
+	"/@vite/**",
+	"/@id/**",
+	"/@fs/**",
+	"/@react-router/**",
+	"/src/**",
+	"/node_modules/**",
+	"**/*.js",
+	"**/*.css",
+	"**/*.ts",
+	"**/*.tsx",
+	"**/*.js.map",
+	"**/*.css.map"
+];
+/**
+* Create request logging middleware
+* Used in dev and preview modes for request visibility
+*/
+function createLoggingMiddleware() {
+	morgan.token("status-colored", (req, res) => {
+		const status = res.statusCode;
+		let color = chalk.green;
+		if (status >= 500) color = chalk.red;
+		else if (status >= 400) color = chalk.yellow;
+		else if (status >= 300) color = chalk.cyan;
+		return color(String(status));
+	});
+	morgan.token("method-colored", (req) => {
+		const method = req.method;
+		const colors = {
+			GET: chalk.green,
+			POST: chalk.blue,
+			PUT: chalk.yellow,
+			DELETE: chalk.red,
+			PATCH: chalk.magenta
+		};
+		return (method && colors[method] || chalk.white)(method);
+	});
+	return morgan((tokens, req, res) => {
+		return [
+			chalk.gray("["),
+			tokens["method-colored"](req, res),
+			chalk.gray("]"),
+			tokens.url(req, res),
+			"-",
+			tokens["status-colored"](req, res),
+			chalk.gray(`(${tokens["response-time"](req, res)}ms)`)
+		].join(" ");
+	}, { skip: (req) => {
+		return SKIP_PATTERNS.some((pattern) => minimatch(req.url, pattern, { dot: true }));
+	} });
+}
+
+//#endregion
+//#region src/server/middleware/host-header.ts
+/**
+* Normalizes the X-Forwarded-Host header to support React Router's CSRF validation features.
+*
+* NOTE: This middleware performs header manipulation as a temporary, internal
+* solution for MRT/Lambda environments. It may be updated or removed if React Router
+* introduces a first-class configuration for validating against forwarded headers.
+*
+* React Router v7.12+ uses the X-Forwarded-Host header (preferring it over Host)
+* to validate request origins for security. In Managed Runtime (MRT) with a vanity
+* domain, the eCDN automatically sets the X-Forwarded-Host to the vanity domain.
+* React Router handles cases where this header contains multiple comma-separated
+* values by prioritizing the first entry.
+*
+* This middleware ensures that X-Forwarded-Host is always present by falling back
+* to a configured public domain if the header is missing (e.g., local development).
+* By only modifying X-Forwarded-Host, we provide a consistent environment for
+* React Router's security checks without modifying the internal 'Host' header,
+* which is required for environment-specific routing logic (e.g., Hybrid Proxy).
+*
+* Priority order:
+* 1. X-Forwarded-Host: Automatically set by eCDN for vanity domains.
+* 2. EXTERNAL_DOMAIN_NAME: Fallback environment variable for the public domain
+*    used when no forwarded headers are present (e.g., local development).
+*/
+function createHostHeaderMiddleware() {
+	return (req, _res, next) => {
+		if (!req.get("x-forwarded-host") && process.env.EXTERNAL_DOMAIN_NAME) req.headers["x-forwarded-host"] = process.env.EXTERNAL_DOMAIN_NAME;
+		next();
+	};
+}
+
+//#endregion
+//#region src/server/utils.ts
+/**
+* Patch React Router build to rewrite asset URLs with the correct bundle path
+* This is needed because the build output uses /assets/ but we preview at /mobify/bundle/{BUNDLE_ID}/client/assets/
+*/
+function patchReactRouterBuild(build, bundleId) {
+	const bundlePath = getBundlePath(bundleId);
+	const patchedAssetsJson = JSON.stringify(build.assets).replace(/"\/assets\//g, `"${bundlePath}assets/`);
+	const newAssets = JSON.parse(patchedAssetsJson);
+	return Object.assign({}, build, {
+		publicPath: bundlePath,
+		assets: newAssets
+	});
+}
+
+//#endregion
+//#region src/server/modes.ts
+/**
+* Default feature configuration for each server mode
+*/
+const ServerModeFeatureMap = {
+	development: {
+		enableProxy: true,
+		enableStaticServing: false,
+		enableCompression: false,
+		enableLogging: true,
+		enableAssetUrlPatching: false
+	},
+	preview: {
+		enableProxy: true,
+		enableStaticServing: true,
+		enableCompression: true,
+		enableLogging: true,
+		enableAssetUrlPatching: true
+	},
+	production: {
+		enableProxy: false,
+		enableStaticServing: false,
+		enableCompression: true,
+		enableLogging: true,
+		enableAssetUrlPatching: true
+	}
+};
+
+//#endregion
+//#region src/server/index.ts
+/** Relative path to the middleware registry TypeScript source (development). Must match appDirectory + server dir + filename used by buildMiddlewareRegistry plugin. */
+const RELATIVE_MIDDLEWARE_REGISTRY_SOURCE = "src/server/middleware-registry.ts";
+/** Extensions to try for the built middlewares module (ESM first, then CJS for backwards compatibility). */
+const MIDDLEWARE_REGISTRY_BUILT_EXTENSIONS = [
+	".mjs",
+	".js",
+	".cjs"
+];
+/** All paths to try when loading the built middlewares (base + extension). */
+const RELATIVE_MIDDLEWARE_REGISTRY_BUILT_PATHS = ["bld/server/middleware-registry", "build/server/middleware-registry"].flatMap((base) => MIDDLEWARE_REGISTRY_BUILT_EXTENSIONS.map((ext) => `${base}${ext}`));
+/**
+* Create a unified Express server for development, preview, or production mode
+*/
+async function createServer(options) {
+	const { mode, projectDirectory = process.cwd(), config: providedConfig, vite, build, streaming = false, enableProxy = ServerModeFeatureMap[mode].enableProxy, enableStaticServing = ServerModeFeatureMap[mode].enableStaticServing, enableCompression = ServerModeFeatureMap[mode].enableCompression, enableLogging = ServerModeFeatureMap[mode].enableLogging, enableAssetUrlPatching = ServerModeFeatureMap[mode].enableAssetUrlPatching } = options;
+	if (mode === "development" && !vite) throw new Error("Vite dev server instance is required for development mode");
+	if ((mode === "preview" || mode === "production") && !build) throw new Error("React Router server build is required for preview/production mode");
+	const config = providedConfig ?? loadConfigFromEnv();
+	const bundleId = process.env.BUNDLE_ID ?? "local";
+	const app = express();
+	app.disable("x-powered-by");
+	if (enableLogging) app.use(createLoggingMiddleware());
+	if (enableCompression && !streaming) app.use(createCompressionMiddleware());
+	if (enableStaticServing && build) {
+		const bundlePath = getBundlePath(bundleId);
+		app.use(bundlePath, createStaticMiddleware(bundleId, projectDirectory));
+	}
+	let registry = null;
+	if (mode === "development") {
+		const middlewareRegistryPath = resolve(projectDirectory, RELATIVE_MIDDLEWARE_REGISTRY_SOURCE);
+		if (existsSync(middlewareRegistryPath)) registry = await importTypescript(middlewareRegistryPath, { projectDirectory });
+	} else {
+		const possiblePaths = RELATIVE_MIDDLEWARE_REGISTRY_BUILT_PATHS.map((p) => resolve(projectDirectory, p));
+		let builtRegistryPath = null;
+		for (const path$1 of possiblePaths) if (existsSync(path$1)) {
+			builtRegistryPath = path$1;
+			break;
+		}
+		if (builtRegistryPath) registry = await import(pathToFileURL(builtRegistryPath).href);
+	}
+	if (registry?.customMiddlewares && Array.isArray(registry.customMiddlewares)) registry.customMiddlewares.forEach((entry) => {
+		app.use(entry.handler);
+	});
+	if (mode === "development" && vite) app.use(vite.middlewares);
+	if (enableProxy) app.use(config.commerce.api.proxy, createCommerceProxyMiddleware(config));
+	app.use(createHostHeaderMiddleware());
+	app.all("*", await createSSRHandler(mode, bundleId, vite, build, enableAssetUrlPatching));
+	return app;
+}
+/**
+* Create the SSR request handler based on mode
+*/
+async function createSSRHandler(mode, bundleId, vite, build, enableAssetUrlPatching) {
+	if (mode === "development" && vite) {
+		const { isRunnableDevEnvironment } = await import("vite");
+		return async (req, res, next) => {
+			try {
+				const ssrEnvironment = vite.environments.ssr;
+				if (!isRunnableDevEnvironment(ssrEnvironment)) {
+					next(/* @__PURE__ */ new Error("SSR environment is not runnable. Please ensure:\n  1. \"@salesforce/storefront-next-dev\" plugin is added to vite.config.ts\n  2. React Router config uses the Storefront Next preset"));
+					return;
+				}
+				await createRequestHandler({
+					build: await ssrEnvironment.runner.import("virtual:react-router/server-build"),
+					mode: process.env.NODE_ENV
+				})(req, res, next);
+			} catch (error) {
+				vite.ssrFixStacktrace(error);
+				next(error);
+			}
+		};
+	} else if (build) {
+		let patchedBuild = build;
+		if (enableAssetUrlPatching) patchedBuild = patchReactRouterBuild(build, bundleId);
+		return createRequestHandler({
+			build: patchedBuild,
+			mode: process.env.NODE_ENV
+		});
+	} else throw new Error("Invalid server configuration: no vite or build provided");
+}
+
+//#endregion
+export { getCommerceCloudApiUrl as n, loadProjectConfig as r, createServer as t };

package/dist/utils.js

@@ -0,0 +1,126 @@
+import { c as warn, t as debug } from "./logger.js";
+import { execSync } from "child_process";
+import os from "os";
+import path from "path";
+import fs from "fs-extra";
+import dotenv from "dotenv";
+
+//#region src/utils.ts
+const getDefaultBuildDir = (targetDir) => path.join(targetDir, "build");
+const NODE_ENV = process.env.NODE_ENV || "development";
+/**
+* Get project package.json
+*/
+const getProjectPkg = (projectDir) => {
+	const packagePath = path.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.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.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";
+	}
+};
+/**
+* Given a project directory and a record of config overrides, generate a new .env file with the overrides based on the .env.default file.
+* @param projectDir
+* @param configOverrides
+*/
+const generateEnvFile = (projectDir, configOverrides) => {
+	const envDefaultPath = path.join(projectDir, ".env.default");
+	const envPath = path.join(projectDir, ".env");
+	if (!fs.existsSync(envDefaultPath)) {
+		console.warn(`${envDefaultPath} not found`);
+		return;
+	}
+	const envOutputLines = fs.readFileSync(envDefaultPath, "utf8").split("\n").map((line) => {
+		if (!line || line.trim().startsWith("#")) return line;
+		const eqIndex = line.indexOf("=");
+		if (eqIndex === -1) return line;
+		const key = line.slice(0, eqIndex);
+		const originalValue = line.slice(eqIndex + 1);
+		return `${key}=${(Object.prototype.hasOwnProperty.call(configOverrides, key) ? configOverrides[key] : void 0) ?? originalValue}`;
+	});
+	fs.writeFileSync(envPath, envOutputLines.join("\n"));
+};
+
+//#endregion
+export { getProjectDependencyTree as a, loadEnvFile as c, getMrtConfig as i, getDefaultBuildDir as n, getProjectPkg as o, getDefaultMessage as r, getPwaKitDependencies as s, generateEnvFile as t };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/storefront-next-dev",
-  "version": "0.1.1",
+  "version": "0.2.0-alpha.0",
   "description": "Dev and build tools for SFCC Storefront Next",
   "type": "module",
   "main": "./dist/index.js",
@@ -42,10 +42,41 @@
         "types": "./dist/cartridge-services/index.d.ts",
         "default": "./dist/cartridge-services/index.js"
       }
+    },
+    "./entry/server": {
+      "import": {
+        "types": "./dist/entry/server.d.ts",
+        "default": "./dist/entry/server.js"
+      }
+    },
+    "./entry/client": {
+      "import": {
+        "types": "./dist/entry/client.d.ts",
+        "default": "./dist/entry/client.js"
+      }
     }
   },
   "bin": {
-    "sfnext": "./dist/cli.js"
+    "sfnext": "./bin/run.js"
+  },
+  "oclif": {
+    "bin": "sfnext",
+    "dirname": "sfnext",
+    "commands": "./dist/commands",
+    "topicSeparator": " ",
+    "hooks": {
+      "init": "./dist/hooks/init"
+    },
+    "plugins": [
+      "@oclif/plugin-help",
+      "@oclif/plugin-plugins",
+      "@oclif/plugin-not-found"
+    ],
+    "topics": {
+      "extensions": {
+        "description": "Manage storefront extensions"
+      }
+    }
   },
   "files": [
     "dist"
@@ -70,6 +101,7 @@
     "vite": ">=7.0.0"
   },
   "devDependencies": {
+    "@oclif/test": "^4.1.15",
     "@react-router/dev": "7.12.0",
     "@serverless/event-mocks": "1.1.1",
     "@types/archiver": "^6.0.2",
@@ -81,7 +113,6 @@
     "@types/express": "4.17.23",
     "@types/fs-extra": "^11.0.4",
     "@types/glob": "^8.1.0",
-    "@types/handlebars": "^4.1.0",
     "@types/jest": "30.0.0",
     "@types/minimatch": "^5.1.2",
     "@types/morgan": "^1.9.9",
@@ -107,16 +138,20 @@
   },
   "dependencies": {
     "tsdown": "^0.15.4",
+    "@babel/generator": "7.28.5",
     "@babel/parser": "^7.28.4",
     "@babel/traverse": "^7.28.4",
     "@babel/types": "7.28.4",
-    "@babel/generator": "7.28.5",
     "@codegenie/serverless-express": "4.17.0",
     "@h4ad/serverless-adapter": "4.4.0",
+    "@oclif/core": "^4.2.10",
+    "@oclif/plugin-help": "^6.2.36",
+    "@oclif/plugin-not-found": "^3.2.73",
+    "@oclif/plugin-plugins": "^5",
     "@react-router/express": "7.12.0",
+    "@salesforce/b2c-tooling-sdk": "^0.5.4",
     "archiver": "^7.0.1",
     "chalk": "^5.3.0",
-    "commander": "^12.1.0",
     "compressible": "2.0.18",
     "compression": "^1.7.4",
     "dotenv": "^16.4.7",
@@ -150,9 +185,9 @@
     "lint": "eslint src --ext .ts,.tsx",
     "lint:fix": "eslint src --ext .ts,.tsx --fix",
     "clean": "shx rm -rf dist",
-    "push": "node dist/cli.js push",
-    "create-bundle": "node dist/cli.js create-bundle",
-    "generate-cartridge": "node dist/cli.js generate-cartridge",
-    "deploy-cartridge": "node dist/cli.js deploy-cartridge"
+    "push": "./bin/run.js push",
+    "create-bundle": "./bin/run.js create-bundle",
+    "generate-cartridge": "./bin/run.js generate-cartridge",
+    "deploy-cartridge": "./bin/run.js deploy-cartridge"
   }
 }