@wix/create-new 0.0.30 → 0.0.31

package/build/index.js

@@ -79,13 +79,11 @@ import {
   CliErrorCode,
   CliSystemErrorCode,
   RepoType,
-  componentGenerator,
   createPackageManager,
   execa,
   external_exports,
   generator,
   getEnvFilePath,
-  getExtensionDir,
   getRepoType,
   getTestOverrides,
   gitClone,
@@ -113,7 +111,7 @@ import {
   writeJson,
   writePackageJson,
   zod_default
-} from "./chunk-OVBB732R.js";
+} from "./chunk-4P3PPFXH.js";
 import {
   __commonJS,
   __dirname,
@@ -15350,12 +15348,12 @@ var require_lodash = __commonJS({
     Stack.prototype.has = stackHas;
     Stack.prototype.set = stackSet;
     function arrayLikeKeys(value2, inherited) {
-      var isArr = isArray3(value2), isArg = !isArr && isArguments(value2), isBuff = !isArr && !isArg && isBuffer(value2), isType21 = !isArr && !isArg && !isBuff && isTypedArray(value2), skipIndexes = isArr || isArg || isBuff || isType21, result = skipIndexes ? baseTimes(value2.length, String) : [], length = result.length;
+      var isArr = isArray3(value2), isArg = !isArr && isArguments(value2), isBuff = !isArr && !isArg && isBuffer(value2), isType20 = !isArr && !isArg && !isBuff && isTypedArray(value2), skipIndexes = isArr || isArg || isBuff || isType20, result = skipIndexes ? baseTimes(value2.length, String) : [], length = result.length;
       for (var key in value2) {
         if ((inherited || hasOwnProperty3.call(value2, key)) && !(skipIndexes && // Safari 9 has enumerable `arguments.length` in strict mode.
         (key == "length" || // Node.js 0.10 has enumerable non-index properties on buffers.
         isBuff && (key == "offset" || key == "parent") || // PhantomJS 2 has enumerable non-index properties on typed arrays.
-        isType21 && (key == "buffer" || key == "byteLength" || key == "byteOffset") || // Skip index properties.
+        isType20 && (key == "buffer" || key == "byteLength" || key == "byteOffset") || // Skip index properties.
         isIndex(key, length)))) {
           result.push(key);
         }
@@ -32549,10 +32547,10 @@ var require_kebabCase = __commonJS({
     "use strict";
     init_esm_shims();
     var createCompounder = require_createCompounder();
-    var kebabCase4 = createCompounder(function(result, word, index) {
+    var kebabCase5 = createCompounder(function(result, word, index) {
       return result + (index ? "-" : "") + word.toLowerCase();
     });
-    module2.exports = kebabCase4;
+    module2.exports = kebabCase5;
   }
 });
 
@@ -32870,7 +32868,7 @@ var require_util = __commonJS({
       return path4;
     });
     exports.normalize = normalize4;
-    function join22(aRoot, aPath) {
+    function join20(aRoot, aPath) {
       if (aRoot === "") {
         aRoot = ".";
       }
@@ -32902,7 +32900,7 @@ var require_util = __commonJS({
       }
       return joined;
     }
-    exports.join = join22;
+    exports.join = join20;
     exports.isAbsolute = function(aPath) {
       return aPath.charAt(0) === "/" || urlRegexp.test(aPath);
     };
@@ -33116,7 +33114,7 @@ var require_util = __commonJS({
             parsed.path = parsed.path.substring(0, index + 1);
           }
         }
-        sourceURL = join22(urlGenerate(parsed), sourceURL);
+        sourceURL = join20(urlGenerate(parsed), sourceURL);
       }
       return normalize4(sourceURL);
     }
@@ -50354,10 +50352,10 @@ var RenewTokenData = (0, import_variant.variant)({
 var AuthClient = class {
   constructor(httpClient) {
     this.httpClient = httpClient;
-    const { minRetryTimeout: minRetryTimeout5 } = getTestOverrides();
+    const { minRetryTimeout: minRetryTimeout4 } = getTestOverrides();
     this.retryOptions = {
       retries: 3,
-      minTimeout: minRetryTimeout5,
+      minTimeout: minRetryTimeout4,
       maxTimeout: 3 * 1e3
     };
   }
@@ -51102,6 +51100,23 @@ var accountAuthStrategy = {
   async login({ deviceCode: deviceCode2, signal }) {
     const accountAuth = await waitForLogin(deviceCode2, { signal });
     return createAccountAuthState(accountAuth);
+  },
+  async loginWithRefreshToken({ refreshToken }) {
+    const renewTokenResult = await client.renewToken({ refreshToken });
+    if ((0, import_variant4.isType)(renewTokenResult, RenewTokenData.TokenRenewed)) {
+      const newTokenData = renewTokenResult.payload;
+      const userInfo2 = await client.userInfo({
+        accessToken: newTokenData.accessToken
+      });
+      const result = { ...newTokenData, userInfo: userInfo2 };
+      await deleteAuthData();
+      await saveAuthData(result);
+      return createAccountAuthState(result);
+    }
+    throw new CliError({
+      code: CliErrorCode.FailedToLoginWithRefreshToken(),
+      cause: null
+    });
   }
 };
 
@@ -58190,19 +58205,28 @@ var useBiLogger = () => {
   return context2;
 };
 
-// ../../node_modules/@wix/bi-logger-wix-cli/dist/esm/v2/index.js
+// ../../node_modules/@wix/bi-logger-dev-tools-data/dist/esm/v2/index.js
 init_esm_shims();
 function wixCliCliCommand(params) {
-  return { evid: 5200, src: 11, endpoint: "wix-cli", params };
+  return { evid: 5200, src: 11, endpoint: "", params };
 }
 function wixCliCliCommandStatus(params) {
-  return { evid: 5201, src: 11, endpoint: "wix-cli", params };
+  return { evid: 5201, src: 11, endpoint: "", params };
 }
 function wixCliLoginStart(params) {
-  return { evid: 5211, src: 11, endpoint: "wix-cli", params };
+  return { evid: 5211, src: 11, endpoint: "", params };
 }
 function wixCliLoginEnd(params) {
-  return { evid: 5212, src: 11, endpoint: "wix-cli", params };
+  return { evid: 5212, src: 11, endpoint: "", params };
+}
+function wixCliAppFlowStepsAnswers(params) {
+  return { evid: 5229, src: 11, endpoint: "", params };
+}
+function wixCliCliError(params) {
+  return { evid: 5230, src: 11, endpoint: "", params };
+}
+function wixCliAction(params) {
+  return { evid: 5231, src: 11, endpoint: "", params };
 }
 
 // ../cli-auth/src/components/Login.tsx
@@ -65282,7 +65306,9 @@ var createEnv = () => {
   return {
     isCI: overrides2.isCI ?? import_ci_info.default.isCI,
     isPR: overrides2.isPR ?? import_ci_info.default.isPR,
-    ciName: overrides2.ciName ?? import_ci_info.default.name ?? process.env.CI_NAME ?? null
+    ciName: overrides2.ciName ?? import_ci_info.default.name ?? process.env.CI_NAME ?? null,
+    cliEnvName: overrides2.cliEnvName ?? process.env.WIX_RUNTIME_ENVIRONMENT ?? null,
+    cliTrackingId: overrides2.cliTrackingId ?? process.env.TRACKING_ID ?? null
   };
 };
 
@@ -65611,6 +65637,15 @@ function getErrorComponent(code, cause) {
         }
       );
     },
+    FailedToLoginWithRefreshToken: () => {
+      return () => /* @__PURE__ */ import_react82.default.createElement(
+        ErrorMessage,
+        {
+          message: "Failed to login with refresh token",
+          hint: "Please check that your refresh token is valid and not revoked, then try again."
+        }
+      );
+    },
     FailedToRevokeRefreshToken: ({ email }) => {
       return () => /* @__PURE__ */ import_react82.default.createElement(
         SystemErrorMessage,
@@ -69780,6 +69815,9 @@ function toSafeJson(value2) {
   }
   return value2;
 }
+function normalizeRequestId(requestId) {
+  return requestId.split(",").map((id) => id.trim()).at(0) ?? requestId;
+}
 
 // ../cli-error-reporting/src/error-reporter.ts
 var ReportErrorResult = (0, import_variant18.variant)({
@@ -69796,7 +69834,10 @@ var reportError = (scope, originalError, { data } = {}) => {
     captureContext: (localScope) => {
       const httpError = extractHttpError(error);
       if (httpError) {
-        localScope.setTag("request.id", httpError.requestId);
+        localScope.setTag(
+          "request.id",
+          normalizeRequestId(httpError.requestId)
+        );
         const errorInfo = getHttpErrorInfo(httpError);
         errorInfo.request.data = toSafeJson(errorInfo.request.data);
         errorInfo.response.data = toSafeJson(errorInfo.response.data);
@@ -69809,9 +69850,11 @@ var reportError = (scope, originalError, { data } = {}) => {
           "Full Stack": import_verror3.default.fullStack(error)
         });
       }
-      const { isCI: isCI3, isPR, ciName } = createEnv();
+      const { isCI: isCI3, isPR, ciName, cliEnvName, cliTrackingId } = createEnv();
       localScope.setTag("ci", yesOrNo(isCI3));
       localScope.setTag("ci.name", ciName);
+      localScope.setTag("cli.env_name", cliEnvName);
+      localScope.setTag("cli.tracking_id", cliTrackingId);
       localScope.setContext("CI", {
         Name: ciName,
         "Is CI": yesOrNo(isCI3),
@@ -71609,20 +71652,6 @@ var import_react102 = __toESM(require_react(), 1);
 
 // ../create-new-packages/app-command/src/bi/events.ts
 init_esm_shims();
-
-// ../../node_modules/@wix/bi-logger-dev-tools-data/dist/esm/v2/index.js
-init_esm_shims();
-function wixCliAppFlowStepsAnswers(params) {
-  return { evid: 5229, src: 11, endpoint: "", params };
-}
-function wixCliCliError(params) {
-  return { evid: 5230, src: 11, endpoint: "", params };
-}
-function wixCliAction(params) {
-  return { evid: 5231, src: 11, endpoint: "", params };
-}
-
-// ../create-new-packages/app-command/src/bi/events.ts
 var createAppBiEvents = (biLogger) => ({
   cliAction: ({
     question,
@@ -71812,7 +71841,7 @@ function reportCommandStartEvent({
 }) {
   const options = command.opts();
   const args = command.args;
-  const privateOptions = /* @__PURE__ */ new Set(["apiKey"]);
+  const privateOptions = /* @__PURE__ */ new Set(["apiKey", "refreshToken"]);
   const sanitizedOptions = Object.fromEntries(
     Object.entries(options).map(([flagName, flagValue]) => {
       const value2 = privateOptions.has(flagName) ? "<censored>" : flagValue;
@@ -79868,10 +79897,10 @@ var EMPTY_SITE_TEMPLATE = "24bafe8a-7c80-4b63-8a71-08752062f246";
 var DevCenterClient = class {
   constructor(httpClient) {
     this.httpClient = httpClient;
-    const { minRetryTimeout: minRetryTimeout5 } = getTestOverrides();
+    const { minRetryTimeout: minRetryTimeout4 } = getTestOverrides();
     this.retryOptions = {
       retries: 3,
-      minTimeout: minRetryTimeout5,
+      minTimeout: minRetryTimeout4,
       maxTimeout: 3 * 1e3
     };
   }
@@ -82042,7 +82071,7 @@ function getTasks({
         cause: e2
       });
     }
-    const { generateApp } = await import("./generator-MFLMNWRL.js");
+    const { generateApp } = await import("./generator-L3CXBMWA.js");
     await generateApp({
       packageName,
       packageFolder,
@@ -82567,7 +82596,7 @@ var validateProjectName = (value2) => {
 // ../create-new-packages/headless-command/src/components/LinkCommand/LinkCommand.tsx
 init_esm_shims();
 var import_react139 = __toESM(require_react(), 1);
-var import_variant44 = __toESM(require_lib(), 1);
+var import_variant43 = __toESM(require_lib(), 1);
 
 // ../create-new-packages/headless-command/src/components/WelcomeMessage.tsx
 init_esm_shims();
@@ -82686,17 +82715,10 @@ var CreateProjectResponseSchema = external_exports.object({
 });
 
 // ../create-new-packages/headless-command/src/clients/funnel-projects/funnel-projects-client.ts
-var { minRetryTimeout: minRetryTimeout2 } = getTestOverrides();
 var FunnelProjectsClient = class {
   constructor(httpClient) {
     this.httpClient = httpClient;
-    this.retryOptions = {
-      retries: 3,
-      minTimeout: minRetryTimeout2,
-      maxTimeout: 3 * 1e3
-    };
   }
-  retryOptions;
   createProject = async (siteName, templateId) => {
     try {
       const { data } = await this.httpClient.request(
@@ -83022,8 +83044,16 @@ function useMetasiteManagerClient() {
 
 // ../create-new-packages/headless-command/src/hooks/create-project.ts
 var DEFAULT_ENVIRONMENT_NAME2 = "system_global";
-function generateSlugSalt() {
-  return randomBytes2(4).toString("hex");
+function generateSlug(projectName) {
+  const base = (0, import_kebabCase3.default)(projectName).replaceAll(/[^a-z0-9-]/gi, "").slice(0, 10).replace(/-$/, "");
+  const salt = randomBytes2(4).toString("hex");
+  return `${base}-${salt}`;
+}
+function truncateName(name, maxLength) {
+  if (name.length > maxLength) {
+    return `${name.slice(0, maxLength - 3)}...`;
+  }
+  return name;
 }
 var useCreateProject = (businessId) => {
   const { createOAuthApp: createOAuthApp2, updateOAuthApp: updateOAuthApp2, getAppSecret } = useDevCenterClient();
@@ -83035,7 +83065,7 @@ var useCreateProject = (businessId) => {
       cloudProviders
     }) => {
       const { id: projectId } = await createOAuthApp2({
-        name: `Private App for: ${projectName}`
+        name: truncateName(`Private App for: ${projectName}`, 50)
       });
       const [publicKeyAndSecret, instanceId] = await Promise.all([
         getAppSecret({ appId: projectId }),
@@ -83044,21 +83074,12 @@ var useCreateProject = (businessId) => {
           appId: projectId
         })
       ]);
-      const baseSlug = (0, import_kebabCase3.default)(projectName);
-      const appProject = await pRetry(
-        async (attempt) => {
-          const slug = attempt === 1 ? baseSlug : `${baseSlug}-${generateSlugSalt()}`;
-          return await createAppProject2({
-            id: projectId,
-            displayName: projectName,
-            slug,
-            cloudProvider: cloudProviders?.[0]
-          });
-        },
-        {
-          retries: 1
-        }
-      );
+      const appProject = await createAppProject2({
+        id: projectId,
+        displayName: truncateName(projectName, 50),
+        slug: generateSlug(projectName),
+        cloudProvider: cloudProviders?.[0]
+      });
       const loginRoute = `api/auth/callback`;
       const logoutRoute = `api/auth/logout-callback`;
       const projectBaseURL = new URL(appProject.baseUrl);
@@ -83147,7 +83168,7 @@ var CreateProject = ({
 // ../create-new-packages/headless-command/src/components/LinkCommand/GenerateProject.tsx
 init_esm_shims();
 var import_react137 = __toESM(require_react(), 1);
-var import_variant43 = __toESM(require_lib(), 1);
+var import_variant42 = __toESM(require_lib(), 1);
 
 // ../cli-project-extender/src/index.ts
 init_esm_shims();
@@ -92198,83 +92219,11 @@ async function extend2(projectFolder) {
   await modifyAstroConfig(projectFolder);
 }
 
-// ../cli-project-extender/src/add-files-from-template.ts
-init_esm_shims();
-import { join as join15 } from "node:path";
-import { randomUUID as randomUUID3 } from "node:crypto";
-var import_variant41 = __toESM(require_lib(), 1);
-
-// ../cli-project-extender/src/clone-templates-repo.ts
-init_esm_shims();
-import { join as join14 } from "node:path";
-import { rm as rm2 } from "node:fs/promises";
-async function cloneTemplatesRepo(url) {
-  const repoDir = temporaryDirectory({ prefix: "wix-cli-project-extender" });
-  try {
-    await gitClone(url, repoDir);
-    await rm2(join14(repoDir, ".git"), { recursive: true, force: true });
-  } catch (e2) {
-    throw new CliError({
-      code: CliErrorCode.FailedToCloneRepo(),
-      cause: e2
-    });
-  }
-  return repoDir;
-}
-
-// ../cli-project-extender/src/add-files-from-template.ts
-var TEMPLATE_REPO = "git@github.com:wix-incubator/headless-cli-templates.git";
-async function addFilesFromTemplate(projectFolder, templateId, packageManager2, repoType2) {
-  const repoRoot = await cloneTemplatesRepo(TEMPLATE_REPO);
-  const templateExtensionRoot = join15(repoRoot, "templates", templateId);
-  const sharedTemplate = join15(repoRoot, "templates-shared");
-  if (await pathExists(sharedTemplate)) {
-    await componentGenerator({
-      template: sharedTemplate,
-      projectFolder,
-      cwd: projectFolder,
-      data: {
-        packageManager: {
-          name: packageManager2.name
-        },
-        isMonorepo: (0, import_variant41.isType)(repoType2, RepoType.Monorepo)
-      }
-    });
-  }
-  if (!await pathExists(templateExtensionRoot)) {
-    return;
-  }
-  const extensionTemplates = await globby("*", {
-    onlyDirectories: true,
-    cwd: templateExtensionRoot
-  });
-  for (const template of extensionTemplates) {
-    const uniqueDir = await getUniqueExtensionPath(projectFolder, template, 0);
-    await componentGenerator({
-      template: join15(templateExtensionRoot, template),
-      projectFolder,
-      cwd: join15(getExtensionDir(projectFolder), uniqueDir),
-      data: {
-        randomUUID: () => randomUUID3(),
-        dir: uniqueDir
-      }
-    });
-  }
-}
-async function getUniqueExtensionPath(projectFolder, extensionPath, suffix) {
-  const uniqueExtensionPath = suffix ? `${extensionPath}${suffix}` : extensionPath;
-  const path4 = join15(getExtensionDir(projectFolder), uniqueExtensionPath);
-  if (!await pathExists(path4)) {
-    return uniqueExtensionPath;
-  }
-  return getUniqueExtensionPath(projectFolder, extensionPath, suffix + 1);
-}
-
 // ../create-new-packages/headless-command/src/task-runner.ts
 init_esm_shims();
 var import_react135 = __toESM(require_react(), 1);
-var import_variant42 = __toESM(require_lib(), 1);
-var TaskRunnerStatus2 = (0, import_variant42.variant)({
+var import_variant41 = __toESM(require_lib(), 1);
+var TaskRunnerStatus2 = (0, import_variant41.variant)({
   Idle: {},
   Running: (runningTasks, totalTaskCount) => {
     const taskStatuses = runningTasks.map((task, index) => {
@@ -92386,7 +92335,7 @@ var GenerateProject = ({ projectFolder, businessId, projectData, onDone, package
     await executeTaskRunner(tasks);
     onDone(true);
   }, []);
-  return (0, import_variant43.match)(taskRunnerStatus, {
+  return (0, import_variant42.match)(taskRunnerStatus, {
     Idle: () => null,
     Running: (status) => /* @__PURE__ */ import_react137.default.createElement(GenerationProgress2, { ...status }),
     Done: (status) => /* @__PURE__ */ import_react137.default.createElement(Box_default, { flexDirection: "column", marginBottom: 1 }, /* @__PURE__ */ import_react137.default.createElement(GenerationProgress2, { ...status }), /* @__PURE__ */ import_react137.default.createElement(Box_default, { marginLeft: -2, marginTop: 1 }, /* @__PURE__ */ import_react137.default.createElement(Alert, { type: "success" }, /* @__PURE__ */ import_react137.default.createElement(Badge, { skin: "success" }, "Success"), " ", /* @__PURE__ */ import_react137.default.createElement(Text2, null, "Project set up successfully"))))
@@ -92454,7 +92403,7 @@ var LinkCommand = ({
     const packageManager2 = await createPackageManager(repoType2);
     return { repoType: repoType2, packageManager: packageManager2 };
   }, []);
-  return (0, import_variant44.match)(status, {
+  return (0, import_variant43.match)(status, {
     Error: () => null,
     Loading: () => /* @__PURE__ */ import_react139.default.createElement(Spinner2, { text: "Loading..." }),
     Success: ({ result: { packageManager: packageManager2 } }) => {
@@ -92555,12 +92504,12 @@ var validateCloudProvider = (value2) => {
 // ../create-new-packages/headless-command/src/components/ProcessCommand.tsx
 init_esm_shims();
 var import_react150 = __toESM(require_react(), 1);
-var import_variant54 = __toESM(require_lib(), 1);
+var import_variant53 = __toESM(require_lib(), 1);
 
 // ../create-new-packages/headless-command/src/parse-command-options.ts
 init_esm_shims();
-var import_variant46 = __toESM(require_lib(), 1);
-import { join as join16 } from "node:path";
+var import_variant45 = __toESM(require_lib(), 1);
+import { join as join14 } from "node:path";
 
 // ../create-new-packages/headless-command/src/validations/index.ts
 init_esm_shims();
@@ -92578,11 +92527,11 @@ async function validateDirectory2(projectRoot) {
 // ../create-new-packages/headless-command/src/validations/package-name.ts
 init_esm_shims();
 var import_validate_npm_package_name2 = __toESM(require_lib2(), 1);
-var import_variant45 = __toESM(require_lib(), 1);
-var Result2 = (0, import_variant45.variant)(
-  (0, import_variant45.onTerms)(({ T }) => ({
-    Error: (0, import_variant45.payload)(T),
-    Ok: import_variant45.nil
+var import_variant44 = __toESM(require_lib(), 1);
+var Result2 = (0, import_variant44.variant)(
+  (0, import_variant44.onTerms)(({ T }) => ({
+    Error: (0, import_variant44.payload)(T),
+    Ok: import_variant44.nil
   }))
 );
 async function validatePackageName2(name) {
@@ -92652,10 +92601,10 @@ var headlessTemplates = [
   ...vibeCompatibleTemplates,
   ...pureHeadlessTemplates
 ];
-var TemplateSource2 = (0, import_variant46.variant)({
-  HeadlessApp: (0, import_variant46.fields)(),
-  GitRepo: (0, import_variant46.fields)(),
-  Local: (0, import_variant46.fields)()
+var TemplateSource2 = (0, import_variant45.variant)({
+  HeadlessApp: (0, import_variant45.fields)(),
+  GitRepo: (0, import_variant45.fields)(),
+  Local: (0, import_variant45.fields)()
 });
 function parseProviderString(cloudProvider) {
   switch (cloudProvider.trim().toLowerCase()) {
@@ -92715,7 +92664,7 @@ async function parseTemplateOptions2(options) {
 async function parseProjectNameOptions(targetParentFolder2, options) {
   const projectName = options.projectName;
   if (projectName) {
-    if (!await validateDirectory2(join16(targetParentFolder2, projectName))) {
+    if (!await validateDirectory2(join14(targetParentFolder2, projectName))) {
       throw new CliError({
         code: CliErrorCode.ProjectNameArgumentIsInvalid({
           errorMessage: `"${projectName}" directory is not empty`
@@ -92724,7 +92673,7 @@ async function parseProjectNameOptions(targetParentFolder2, options) {
       });
     }
     const npmValidationErrors = await validatePackageName2(projectName);
-    if ((0, import_variant46.isType)(npmValidationErrors, "Error")) {
+    if ((0, import_variant45.isType)(npmValidationErrors, "Error")) {
       throw new CliError({
         code: CliErrorCode.ProjectNameArgumentIsInvalid({
           errorMessage: `Invalid package name "${projectName}". Please fix the following issues: ${npmValidationErrors.payload.join(", ")}`
@@ -92780,20 +92729,21 @@ async function parseCommandOptions2(targetParentFolder2, options) {
 // ../create-new-packages/headless-command/src/components/CreateHeadlessSiteCommand.tsx
 init_esm_shims();
 var import_react149 = __toESM(require_react(), 1);
-var import_variant53 = __toESM(require_lib(), 1);
-import { join as join21 } from "node:path";
+var import_variant52 = __toESM(require_lib(), 1);
+var import_kebabCase4 = __toESM(require_kebabCase(), 1);
+import { join as join19 } from "node:path";
 
 // ../create-new-packages/headless-command/src/components/ChooseFolder.tsx
 init_esm_shims();
 var import_react140 = __toESM(require_react(), 1);
-var import_variant47 = __toESM(require_lib(), 1);
-import { join as join17 } from "node:path";
+var import_variant46 = __toESM(require_lib(), 1);
+import { join as join15 } from "node:path";
 var validateAppDirectory = async (targetParentFolder2, packageName) => {
-  if (!await validateDirectory2(join17(targetParentFolder2, packageName))) {
+  if (!await validateDirectory2(join15(targetParentFolder2, packageName))) {
     return `Provided directory "${packageName}" is not empty`;
   }
   const npmValidationErrors = await validatePackageName2(packageName);
-  return (0, import_variant47.match)(npmValidationErrors, {
+  return (0, import_variant46.match)(npmValidationErrors, {
     Ok: () => true,
     Error: ({ payload: payload7 }) => `Invalid folder name. Please fix the following issues: ${payload7.join(", ")}`
   });
@@ -92819,19 +92769,19 @@ var ChooseFolder = ({ initialFolderName, targetParentFolder: targetParentFolder2
 init_esm_shims();
 import { mkdir as mkdir2 } from "node:fs/promises";
 var import_react141 = __toESM(require_react(), 1);
-var import_variant48 = __toESM(require_lib(), 1);
-import { join as join19 } from "node:path";
+var import_variant47 = __toESM(require_lib(), 1);
+import { join as join17 } from "node:path";
 
 // ../create-new-packages/headless-command/src/services/generator/template-fetcher.ts
 init_esm_shims();
-import { join as join18 } from "node:path";
-import { rm as rm3 } from "node:fs/promises";
+import { join as join16 } from "node:path";
+import { rm as rm2 } from "node:fs/promises";
 var import_is_git_url3 = __toESM(require_is_git_url(), 1);
 async function downloadAndExtractRepo(url) {
   const repoDir = temporaryDirectory({ prefix: "wix-create-headless-site" });
   try {
     await gitClone(url, repoDir);
-    await rm3(join18(repoDir, ".git"), { recursive: true, force: true });
+    await rm2(join16(repoDir, ".git"), { recursive: true, force: true });
     return repoDir;
   } catch (e2) {
     throw new CliError({
@@ -92849,7 +92799,7 @@ async function fetchTemplate(url, path4 = ".") {
     });
   }
   const repoDir = await downloadAndExtractRepo(url);
-  const templateDirInRepo = join18(repoDir, path4);
+  const templateDirInRepo = join16(repoDir, path4);
   if (!await pathExists(templateDirInRepo)) {
     throw new CliError({
       code: CliErrorCode.TemplatePathNotFound({ templatePath: path4 }),
@@ -92866,7 +92816,7 @@ async function resolveTemplateFolder(templatePathOverride, selectedTemplate) {
   if (templatePathOverride) {
     return templatePathOverride;
   }
-  return (0, import_variant48.match)(selectedTemplate, {
+  return (0, import_variant47.match)(selectedTemplate, {
     HeadlessApp: ({ gitPath }) => fetchTemplate(headlessTemplatesGitUrl, gitPath),
     GitRepo: ({ url, path: path4 }) => fetchTemplate(url, path4),
     Local: ({ path: path4 }) => path4
@@ -92876,7 +92826,6 @@ var GenerationProgress3 = ({ tasks, totalTaskCount }) => {
   return /* @__PURE__ */ import_react141.default.createElement(import_react141.default.Fragment, null, /* @__PURE__ */ import_react141.default.createElement(Box_default, { marginBottom: 1 }, /* @__PURE__ */ import_react141.default.createElement(Text2, null, "Generating your headless site...")), /* @__PURE__ */ import_react141.default.createElement(TaskList2, { tasks, totalTaskCount }));
 };
 var GenerateProject2 = ({
-  repoType: repoType2,
   packageManager: packageManager2,
   targetParentFolder: targetParentFolder2,
   folderName,
@@ -92886,10 +92835,9 @@ var GenerateProject2 = ({
   selectedTemplate,
   onDone
 }) => {
-  const { reportError: reportError2 } = useErrorReporter();
   const { execute: executeTaskRunner, status: taskRunnerStatus } = useTaskRunner2();
   const packageFolder = (0, import_react141.useMemo)(
-    () => join19(targetParentFolder2, folderName),
+    () => join17(targetParentFolder2, folderName),
     [folderName, targetParentFolder2]
   );
   const generateProject = (0, import_react141.useCallback)(async () => {
@@ -92935,23 +92883,7 @@ var GenerateProject2 = ({
   ]);
   const extendProject = (0, import_react141.useCallback)(async () => {
     await extend2(packageFolder);
-    try {
-      await addFilesFromTemplate(
-        packageFolder,
-        selectedTemplate.siteTemplateId,
-        packageManager2,
-        repoType2
-      );
-    } catch (error) {
-      reportError2(error);
-    }
-  }, [
-    packageFolder,
-    selectedTemplate.siteTemplateId,
-    reportError2,
-    packageManager2,
-    repoType2
-  ]);
+  }, [packageFolder]);
   const initializeGit = (0, import_react141.useCallback)(async () => {
     try {
       await gitInit(packageFolder);
@@ -93036,7 +92968,7 @@ var GenerateProject2 = ({
     await executeTaskRunner(tasks);
     onDone(true);
   }, []);
-  return (0, import_variant48.match)(taskRunnerStatus, {
+  return (0, import_variant47.match)(taskRunnerStatus, {
     Idle: () => null,
     Running: (status) => /* @__PURE__ */ import_react141.default.createElement(GenerationProgress3, { ...status }),
     Done: (status) => /* @__PURE__ */ import_react141.default.createElement(Box_default, { flexDirection: "column", marginBottom: 1 }, /* @__PURE__ */ import_react141.default.createElement(GenerationProgress3, { ...status }), /* @__PURE__ */ import_react141.default.createElement(Box_default, { marginLeft: -2, marginTop: 1 }, /* @__PURE__ */ import_react141.default.createElement(Alert, { type: "success" }, /* @__PURE__ */ import_react141.default.createElement(Badge, { skin: "success" }, "Success"), " ", /* @__PURE__ */ import_react141.default.createElement(Text2, null, "Project set up successfully"))))
@@ -93085,7 +93017,7 @@ var ChooseTemplate2 = ({ onSubmit }) => {
 // ../create-new-packages/headless-command/src/components/ReleaseProject.tsx
 init_esm_shims();
 var import_react144 = __toESM(require_react(), 1);
-var import_variant50 = __toESM(require_lib(), 1);
+var import_variant49 = __toESM(require_lib(), 1);
 
 // ../create-new-packages/headless-command/src/components/FinishedSuccessfullyMessage.tsx
 init_esm_shims();
@@ -93111,9 +93043,9 @@ var FinishedSuccessfullyMessage3 = ({ packageManager: packageManager2, folderNam
 
 // ../create-new-packages/headless-command/src/hooks/release-project.ts
 init_esm_shims();
-var import_variant49 = __toESM(require_lib(), 1);
-import { join as join20 } from "node:path";
-var ReleaseStateVariant = (0, import_variant49.variant)({
+var import_variant48 = __toESM(require_lib(), 1);
+import { join as join18 } from "node:path";
+var ReleaseStateVariant = (0, import_variant48.variant)({
   Success: {},
   Skipped: {},
   Error: {}
@@ -93129,7 +93061,7 @@ var useReleaseProject = () => {
       if (!confirmed) {
         return ReleaseStateVariant.Skipped();
       }
-      const packageFolder = join20(targetParentFolder2, folderName);
+      const packageFolder = join18(targetParentFolder2, folderName);
       try {
         const buildCommand = packageManager2.getRunBinaryCmd(["wix", "build"]);
         const releaseCommand = packageManager2.getRunBinaryCmd([
@@ -93185,10 +93117,10 @@ var ReleaseProject = ({
         });
       }
     }
-  )), (0, import_variant50.match)(status, {
+  )), (0, import_variant49.match)(status, {
     NotRequested: () => null,
     Success: ({ result }) => {
-      return /* @__PURE__ */ import_react144.default.createElement(import_react144.default.Fragment, null, (0, import_variant50.match)(result, {
+      return /* @__PURE__ */ import_react144.default.createElement(import_react144.default.Fragment, null, (0, import_variant49.match)(result, {
         Success: () => /* @__PURE__ */ import_react144.default.createElement(Box_default, { marginLeft: -2 }, /* @__PURE__ */ import_react144.default.createElement(Alert, { type: "success" }, /* @__PURE__ */ import_react144.default.createElement(Badge, { skin: "success" }, "Success"), " ", /* @__PURE__ */ import_react144.default.createElement(Text2, null, "Site published successfully"))),
         Skipped: () => /* @__PURE__ */ import_react144.default.createElement(Text2, null, `No worries, you can publish your site later by running ${packageManager2.getRunCmd()} release`),
         Error: () => /* @__PURE__ */ import_react144.default.createElement(Box_default, { flexDirection: "column", gap: 1 }, /* @__PURE__ */ import_react144.default.createElement(Alert, { type: "error" }, "Failed to publish your site"), /* @__PURE__ */ import_react144.default.createElement(Text2, null, `No worries, you can publish your site later by running ${packageManager2.getRunCmd()} release`))
@@ -93198,7 +93130,7 @@ var ReleaseProject = ({
           packageManager: packageManager2,
           folderName,
           projectData,
-          isReleased: (0, import_variant50.isType)(result, "Success")
+          isReleased: (0, import_variant49.isType)(result, "Success")
         }
       ));
     },
@@ -93210,8 +93142,8 @@ var ReleaseProject = ({
 // ../create-new-packages/headless-command/src/components/ChooseVibeSetup.tsx
 init_esm_shims();
 var import_react145 = __toESM(require_react(), 1);
-var import_variant51 = __toESM(require_lib(), 1);
-var VibeSetupChoice = (0, import_variant51.variant)({
+var import_variant50 = __toESM(require_lib(), 1);
+var VibeSetupChoice = (0, import_variant50.variant)({
   SetupVibe: {},
   Skip: {}
 });
@@ -93243,7 +93175,7 @@ var ChooseVibeSetup = ({ onSubmit }) => {
 // ../create-new-packages/headless-command/src/components/VibeRepositorySetupPolling.tsx
 init_esm_shims();
 var import_react148 = __toESM(require_react(), 1);
-var import_variant52 = __toESM(require_lib(), 1);
+var import_variant51 = __toESM(require_lib(), 1);
 
 // ../velo-client/src/index.ts
 init_esm_shims();
@@ -93756,13 +93688,13 @@ var getResolveNpmDependenciesResultSchema = external_exports.object({
 var getWixLockFileSchema = external_exports.string();
 
 // ../velo-client/src/velo-client.ts
-var { minRetryTimeout: minRetryTimeout3, pollInterval, pollTimeout } = getTestOverrides();
+var { minRetryTimeout: minRetryTimeout2, pollInterval, pollTimeout } = getTestOverrides();
 var VeloClient = class {
   constructor(httpClient) {
     this.httpClient = httpClient;
     this.retryOptions = {
       retries: 3,
-      minTimeout: minRetryTimeout3,
+      minTimeout: minRetryTimeout2,
       maxTimeout: 3 * 1e3
     };
   }
@@ -94098,13 +94030,13 @@ var CreateProjectResponseSchema2 = external_exports.object({
 });
 
 // ../codestore-client/src/codestore-client.ts
-var { minRetryTimeout: minRetryTimeout4 } = getTestOverrides();
+var { minRetryTimeout: minRetryTimeout3 } = getTestOverrides();
 var CodestoreClient = class {
   constructor(httpClient) {
     this.httpClient = httpClient;
     this.retryOptions = {
       retries: 3,
-      minTimeout: minRetryTimeout4,
+      minTimeout: minRetryTimeout3,
       maxTimeout: 3 * 1e3
     };
   }
@@ -94159,8 +94091,8 @@ function useCodestoreClient() {
 }
 
 // ../create-new-packages/headless-command/src/components/VibeRepositorySetupPolling.tsx
-var VibeSetupResult = (0, import_variant52.variant)({
-  Success: (0, import_variant52.fields)(),
+var VibeSetupResult = (0, import_variant51.variant)({
+  Success: (0, import_variant51.fields)(),
   Canceled: {},
   Failed: {}
 });
@@ -94222,7 +94154,7 @@ var VibeRepositorySetupPolling = ({
     [projectFolder, projectId],
     {
       onSuccess: (result) => {
-        if ((0, import_variant52.isType)(result, VibeSetupResult.Success)) {
+        if ((0, import_variant51.isType)(result, VibeSetupResult.Success)) {
           onSubmit?.();
         }
       },
@@ -94233,10 +94165,10 @@ var VibeRepositorySetupPolling = ({
       }
     }
   );
-  return (0, import_variant52.match)(status, {
+  return (0, import_variant51.match)(status, {
     Error: () => /* @__PURE__ */ import_react148.default.createElement(Box_default, { flexDirection: "column", gap: 1 }, /* @__PURE__ */ import_react148.default.createElement(Text2, { skin: "error" }, "Failed to connect to Wix Vibe")),
     Loading: () => /* @__PURE__ */ import_react148.default.createElement(Box_default, { flexDirection: "column", gap: 1 }, /* @__PURE__ */ import_react148.default.createElement(Spinner2, { text: "Opening browser for Wix Vibe setup..." }), /* @__PURE__ */ import_react148.default.createElement(Text2, { skin: "secondary" }, "Complete the setup in your browser. We're waiting for you to finish...")),
-    Success: ({ result }) => (0, import_variant52.match)(result, {
+    Success: ({ result }) => (0, import_variant51.match)(result, {
       Success: ({ repoName, htmlUrl }) => /* @__PURE__ */ import_react148.default.createElement(Box_default, { marginLeft: -2, marginBottom: 1 }, /* @__PURE__ */ import_react148.default.createElement(Alert, { type: "success" }, /* @__PURE__ */ import_react148.default.createElement(Badge, { skin: "success" }, "Success"), " ", /* @__PURE__ */ import_react148.default.createElement(Text2, null, "GitHub repository '", repoName, "' created and Synced.", " ", /* @__PURE__ */ import_react148.default.createElement(Link, { url: htmlUrl }, "View Repository.")))),
       Canceled: () => null
     })
@@ -94266,22 +94198,22 @@ var CreateHeadlessSiteCommand = ({
   const [vibeSetupChoice, setVibeSetupChoice] = (0, import_react149.useState)();
   const [vibeSetupDone, setVibeSetupDone] = (0, import_react149.useState)(false);
   const projectFolder = (0, import_react149.useMemo)(
-    () => folderName ? join21(targetParentFolder2, folderName) : void 0,
+    () => folderName ? join19(targetParentFolder2, folderName) : void 0,
     [targetParentFolder2, folderName]
   );
   const { status } = useAsync2(async () => {
     const repoType2 = await getRepoType(targetParentFolder2);
     const packageManager2 = await createPackageManager(repoType2);
-    return { repoType: repoType2, packageManager: packageManager2 };
+    return { packageManager: packageManager2 };
   }, []);
   const isVibeCompatible = (0, import_react149.useMemo)(
-    () => (0, import_variant53.isType)(selectedTemplate, "HeadlessApp") && selectedTemplate.vibeCompatible,
+    () => (0, import_variant52.isType)(selectedTemplate, "HeadlessApp") && selectedTemplate.vibeCompatible,
     [selectedTemplate]
   );
-  return (0, import_variant53.match)(status, {
+  return (0, import_variant52.match)(status, {
     Error: () => null,
     Loading: () => /* @__PURE__ */ import_react149.default.createElement(Spinner2, { text: "Loading..." }),
-    Success: ({ result: { packageManager: packageManager2, repoType: repoType2 } }) => {
+    Success: ({ result: { packageManager: packageManager2 } }) => {
       return /* @__PURE__ */ import_react149.default.createElement(
         Box_default,
         {
@@ -94319,7 +94251,7 @@ var CreateHeadlessSiteCommand = ({
         !defaultProjectName && businessName && selectedTemplate && businessId && /* @__PURE__ */ import_react149.default.createElement(
           ChooseFolder,
           {
-            initialFolderName: businessName,
+            initialFolderName: (0, import_kebabCase4.default)(businessName),
             targetParentFolder: targetParentFolder2,
             onSubmit: ({ folderName: folderName2 }) => setFolderName(folderName2)
           }
@@ -94328,7 +94260,7 @@ var CreateHeadlessSiteCommand = ({
           CreateProject,
           {
             businessId,
-            projectName: folderName,
+            projectName: businessName,
             cloudProviders,
             onSubmit: (data) => setProjectData(data)
           }
@@ -94339,7 +94271,6 @@ var CreateHeadlessSiteCommand = ({
             folderName,
             businessId,
             projectData,
-            repoType: repoType2,
             packageManager: packageManager2,
             targetParentFolder: targetParentFolder2,
             commandOptions,
@@ -94353,7 +94284,7 @@ var CreateHeadlessSiteCommand = ({
             onSubmit: (choice) => setVibeSetupChoice(choice)
           }
         ),
-        businessName && selectedTemplate && businessId && projectData && projectFolder && generationDone && isVibeCompatible && (0, import_variant53.isType)(vibeSetupChoice, "SetupVibe") && /* @__PURE__ */ import_react149.default.createElement(AccountAuthProvider, null, /* @__PURE__ */ import_react149.default.createElement(
+        businessName && selectedTemplate && businessId && projectData && projectFolder && generationDone && isVibeCompatible && (0, import_variant52.isType)(vibeSetupChoice, "SetupVibe") && /* @__PURE__ */ import_react149.default.createElement(AccountAuthProvider, null, /* @__PURE__ */ import_react149.default.createElement(
           VibeRepositorySetupPolling,
           {
             projectId: projectData.projectId,
@@ -94361,7 +94292,7 @@ var CreateHeadlessSiteCommand = ({
             onSubmit: () => setVibeSetupDone(true)
           }
         )),
-        businessName && selectedTemplate && businessId && projectData && folderName && generationDone && (vibeSetupDone || (0, import_variant53.isType)(vibeSetupChoice, "Skip") || !isVibeCompatible) && /* @__PURE__ */ import_react149.default.createElement(
+        businessName && selectedTemplate && businessId && projectData && folderName && generationDone && (vibeSetupDone || (0, import_variant52.isType)(vibeSetupChoice, "Skip") || !isVibeCompatible) && /* @__PURE__ */ import_react149.default.createElement(
           ReleaseProject,
           {
             folderName,
@@ -94399,7 +94330,7 @@ var ProcessCommand = ({ targetParentFolder: targetParentFolder2, commandOptions
     }
     return result;
   }, []);
-  return (0, import_variant54.match)(status, {
+  return (0, import_variant53.match)(status, {
     Error: () => null,
     Loading: () => /* @__PURE__ */ import_react150.default.createElement(Spinner2, { text: "Loading..." }),
     Success: ({
@@ -94426,12 +94357,12 @@ init_esm_shims();
 
 // ../create-new-packages/headless-command/src/bi/createBiLogger.ts
 init_esm_shims();
-import { randomUUID as randomUUID4 } from "node:crypto";
+import { randomUUID as randomUUID3 } from "node:crypto";
 var createBiLogger3 = async (errorReporter2, cliVersion, userId) => {
   const biLogger = await createBiLogger(
     {
       command: "create-headless-site",
-      cliSessionId: randomUUID4(),
+      cliSessionId: randomUUID3(),
       cliVersion
     },
     userId
@@ -94609,7 +94540,7 @@ var getHeadlessCommand = ({
 var package_default = {
   name: "@wix/create-new",
   description: "General entry point for creating Wix projects",
-  version: "0.0.30",
+  version: "0.0.31",
   bin: "bin/index.cjs",
   devDependencies: {
     "@commander-js/extra-typings": "^13.0.0",