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

package/dist/commands/create-storefront.js

@@ -12,6 +12,7 @@ import prompts from "prompts";
 //#region src/create-storefront.ts
 const DEFAULT_STOREFRONT = "sfcc-storefront";
 const STOREFRONT_NEXT_GITHUB_URL = "https://github.com/SalesforceCommerceCloud/storefront-next-template";
+const isLocalPath = (template) => template.startsWith("file://") || template.startsWith("/") || template.startsWith("./") || template.startsWith("../");
 const createStorefront = async (options = {}) => {
 	try {
 		execSync("git --version", { stdio: "ignore" });
@@ -31,6 +32,7 @@ const createStorefront = async (options = {}) => {
 		process.exit(1);
 	}
 	console.log("\n");
+	const outputPath = options.outputDir ? path.join(options.outputDir, storefront) : storefront;
 	let template = options.template;
 	if (!template) {
 		template = (await prompts({
@@ -67,30 +69,47 @@ const createStorefront = async (options = {}) => {
 		error("--template-branch cannot be empty.");
 		process.exit(1);
 	}
-	const cloneArgs = [
-		"clone",
-		"--depth",
-		"1"
-	];
-	if (options.templateBranch) cloneArgs.push("--branch", options.templateBranch);
-	cloneArgs.push(template, storefront);
-	execFileSync("git", cloneArgs);
-	const gitDir = path.join(storefront, ".git");
+	if (isLocalPath(template)) {
+		const resolvedPath = path.resolve(template.replace("file://", ""));
+		if (fs.existsSync(path.join(resolvedPath, ".git"))) {
+			const cloneArgs = [
+				"clone",
+				"--depth",
+				"1"
+			];
+			if (options.templateBranch) cloneArgs.push("--branch", options.templateBranch);
+			cloneArgs.push(resolvedPath, outputPath);
+			execFileSync("git", cloneArgs);
+		} else fs.copySync(resolvedPath, outputPath, { filter: (src) => {
+			const rel = path.relative(resolvedPath, src);
+			return rel !== "node_modules" && !rel.startsWith(`node_modules${path.sep}`) && rel !== ".git" && !rel.startsWith(`.git${path.sep}`);
+		} });
+	} else {
+		const cloneArgs = [
+			"clone",
+			"--depth",
+			"1"
+		];
+		if (options.templateBranch) cloneArgs.push("--branch", options.templateBranch);
+		cloneArgs.push(template, outputPath);
+		execFileSync("git", cloneArgs);
+	}
+	const gitDir = path.join(outputPath, ".git");
 	if (fs.existsSync(gitDir)) fs.rmSync(gitDir, {
 		recursive: true,
 		force: true
 	});
-	if (template.startsWith("file://") || options.localPackagesDir) {
+	if (isLocalPath(template) || options.localPackagesDir) {
 		const templatePath = template.replace("file://", "");
-		const sourcePackagesDir = options.localPackagesDir || path.dirname(templatePath);
 		await prepareForLocalDev({
-			projectDirectory: storefront,
-			sourcePackagesDir
+			projectDirectory: outputPath,
+			sourcePackagesDir: options.localPackagesDir || path.dirname(templatePath),
+			defaults: options.defaults
 		});
 	}
 	console.log("\n");
-	if (fs.existsSync(path.join(storefront, "src", "extensions", "config.json"))) {
-		const extensionConfigText = fs.readFileSync(path.join(storefront, "src", "extensions", "config.json"), "utf8");
+	if (fs.existsSync(path.join(outputPath, "src", "extensions", "config.json"))) {
+		const extensionConfigText = fs.readFileSync(path.join(outputPath, "src", "extensions", "config.json"), "utf8");
 		const extensionConfig = JSON.parse(extensionConfigText);
 		if (extensionConfig.extensions) {
 			try {
@@ -99,7 +118,9 @@ const createStorefront = async (options = {}) => {
 				error(`Extension configuration error: ${e.message}`);
 				process.exit(1);
 			}
-			const { selectedExtensions } = await prompts({
+			let selectedExtensions;
+			if (options.defaults) selectedExtensions = Object.keys(extensionConfig.extensions).filter((ext) => extensionConfig.extensions[ext].defaultOn ?? true);
+			else ({selectedExtensions} = await prompts({
 				type: "multiselect",
 				name: "selectedExtensions",
 				message: "🔌 Which extension would you like to enable? (Use arrow keys to select, space to toggle, and enter to confirm.)\n",
@@ -109,7 +130,7 @@ const createStorefront = async (options = {}) => {
 					selected: extensionConfig.extensions[extension].defaultOn ?? true
 				})),
 				instructions: false
-			});
+			}));
 			const resolvedExtensions = resolveDependenciesForMultiple(selectedExtensions, extensionConfig);
 			const selectedSet = new Set(selectedExtensions);
 			const autoAdded = resolvedExtensions.filter((ext) => !selectedSet.has(ext));
@@ -122,17 +143,17 @@ const createStorefront = async (options = {}) => {
 					warn(`${dependentExts.map((ext) => extensionConfig.extensions[ext]?.name || ext).join(", ")} requires ${addedName}. ${addedName} has been automatically added.`);
 				}
 			}
-			const enabledExtensions = Object.fromEntries(resolvedExtensions.map((ext) => [ext, true]));
-			trimExtensions(storefront, enabledExtensions, { extensions: extensionConfig.extensions }, options?.verbose || false);
+			trimExtensions(outputPath, Object.fromEntries(resolvedExtensions.map((ext) => [ext, true])), { extensions: extensionConfig.extensions }, options?.verbose || false);
 		}
 	}
-	const configMeta = JSON.parse(fs.readFileSync(path.join(storefront, "src", "config", "config-meta.json"), "utf8"));
-	const envDefaultPath = path.join(storefront, ".env.default");
+	const configMeta = JSON.parse(fs.readFileSync(path.join(outputPath, "src", "config", "config-meta.json"), "utf8"));
+	const envDefaultPath = path.join(outputPath, ".env.default");
 	let envDefaultValues = {};
 	if (fs.existsSync(envDefaultPath)) envDefaultValues = dotenv.parse(fs.readFileSync(envDefaultPath, "utf8"));
 	console.log("\n⚙️ We will now configure your storefront before it will be ready to run.\n");
 	const configOverrides = {};
-	for (const config of configMeta.configs) {
+	for (const config of configMeta.configs) if (options.defaults) configOverrides[config.key] = envDefaultValues[config.key] ?? "";
+	else {
 		const answer = await prompts({
 			type: "text",
 			name: config.key,
@@ -141,7 +162,7 @@ const createStorefront = async (options = {}) => {
 		});
 		configOverrides[config.key] = answer[config.key];
 	}
-	generateEnvFile(storefront, configOverrides);
+	generateEnvFile(outputPath, configOverrides);
 	const BANNER = `
     ╔══════════════════════════════════════════════════════════════════╗
     ║                       CONGRATULATIONS                            ║
@@ -149,8 +170,8 @@ const createStorefront = async (options = {}) => {
 
         🎉 Congratulations! Your storefront is ready to use! 🎉
         What's next:
-        - Navigate to the storefront directory: cd ${storefront}
-        - Install dependencies: pnpm install
+        - Navigate to the storefront directory: cd ${outputPath}
+        - Install dependencies: ${options.localPackagesDir ? "pnpm install --ignore-workspace" : "pnpm install"}
         - Build the storefront: pnpm run build
         - Run the development server: pnpm run dev
     `;
@@ -192,6 +213,15 @@ var CreateStorefront = class CreateStorefront extends Command {
 		"local-packages-dir": Flags.string({
 			char: "l",
 			description: "Local monorepo packages directory for file:// templates (pre-fills dependency paths)"
+		}),
+		defaults: Flags.boolean({
+			char: "d",
+			description: "Accept all defaults without prompting (for CI/automation)",
+			default: false
+		}),
+		"output-dir": Flags.string({
+			char: "o",
+			description: "Directory where the storefront project will be created"
 		})
 	};
 	async run() {
@@ -201,7 +231,9 @@ var CreateStorefront = class CreateStorefront extends Command {
 			name: flags.name,
 			template: flags.template,
 			templateBranch: flags["template-branch"],
-			localPackagesDir: flags["local-packages-dir"]
+			localPackagesDir: flags["local-packages-dir"],
+			defaults: flags.defaults,
+			outputDir: flags["output-dir"]
 		});
 	}
 };

package/dist/local-dev-setup.js

@@ -9,7 +9,7 @@ import prompts from "prompts";
 * Prompts user for local package paths and replaces workspace:* dependencies with file: references.
 */
 async function prepareForLocalDev(options) {
-	const { projectDirectory, sourcePackagesDir } = options;
+	const { projectDirectory, sourcePackagesDir, defaults } = options;
 	const packageJsonPath = path.join(projectDirectory, "package.json");
 	if (!fs.existsSync(packageJsonPath)) throw new Error(`package.json not found in ${projectDirectory}`);
 	const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
@@ -35,15 +35,18 @@ async function prepareForLocalDev(options) {
 	console.log("");
 	const defaultPaths = {};
 	if (sourcePackagesDir) {
-		defaultPaths["@salesforce/storefront-next-dev"] = path.join(sourcePackagesDir, "storefront-next-dev");
-		defaultPaths["@salesforce/storefront-next-runtime"] = path.join(sourcePackagesDir, "storefront-next-runtime");
+		defaultPaths["@salesforce/storefront-next-dev"] = path.resolve(sourcePackagesDir, "storefront-next-dev");
+		defaultPaths["@salesforce/storefront-next-runtime"] = path.resolve(sourcePackagesDir, "storefront-next-runtime");
 	}
 	const resolvedPaths = {};
 	for (const { pkg } of workspaceDeps) {
 		if (resolvedPaths[pkg]) continue;
 		const defaultPath = defaultPaths[pkg] || "";
 		const defaultExists = defaultPath && fs.existsSync(defaultPath);
-		const { localPath } = await prompts({
+		let localPath;
+		if (defaults && defaultExists) localPath = defaultPath;
+		else if (defaults) warn(`Skipping ${pkg} - default path not found: ${defaultPath}`);
+		else ({localPath} = await prompts({
 			type: "text",
 			name: "localPath",
 			message: `📦 Path to ${pkg}:`,
@@ -54,7 +57,7 @@ async function prepareForLocalDev(options) {
 				if (!fs.existsSync(path.join(value, "package.json"))) return `No package.json found in: ${value}`;
 				return true;
 			}
-		});
+		}));
 		if (!localPath) {
 			warn(`Skipping ${pkg} - no path provided`);
 			continue;

package/dist/logger.js

@@ -3,7 +3,7 @@ import chalk from "chalk";
 import { createRequire } from "module";
 
 //#region package.json
-var version = "0.2.0-alpha.1";
+var version = "0.2.0-alpha.2";
 
 //#endregion
 //#region src/utils/logger.ts