@wix/cli 1.1.89 → 1.1.90

package/build/{DevCommand-DSJBVCXP.js → DevCommand-6KYPSTGJ.js}

@@ -2,37 +2,38 @@ import { createRequire as _createRequire } from 'node:module';
 const require = _createRequire(import.meta.url);
 import {
   useTunnel
-} from "./chunk-U7RM5FAW.js";
+} from "./chunk-ZXQETEOV.js";
 import {
   ComponentType,
   EmbedCategory,
   EmbeddedScriptPlacement,
   PlatformLink,
-  appManifestSchema,
+  looseAppManifestSchema,
+  looseComponentSchema,
   useARMClient,
   useUpdateDeploymentTopology,
   useUpdateManifest
-} from "./chunk-7T7SLCFH.js";
+} from "./chunk-S2RGKETR.js";
 import {
   createPackageManager,
   getRepoType
-} from "./chunk-L2ALAYPX.js";
+} from "./chunk-RXE2R5HP.js";
 import {
   execa
 } from "./chunk-3OG3PDAA.js";
 import "./chunk-OJHDGJWP.js";
 import {
   useHttpClient
-} from "./chunk-VCVYBKDN.js";
+} from "./chunk-YTNJOVDF.js";
 import {
   useProjectModel
-} from "./chunk-WFKMTTHE.js";
+} from "./chunk-SVDRJSYB.js";
 import {
   SiteAuthProvider
-} from "./chunk-NNJ3SLG4.js";
-import "./chunk-I5OLIQ4U.js";
+} from "./chunk-E3PLBH3X.js";
+import "./chunk-TFYNCJ2Y.js";
 import "./chunk-NPVP6ZBL.js";
-import "./chunk-MOWGYB6X.js";
+import "./chunk-VCTDGSZE.js";
 import "./chunk-GPEPI5XF.js";
 import {
   Box_default,
@@ -42,7 +43,7 @@ import {
   createRendererToString,
   useAsync,
   useExit
-} from "./chunk-J2QEZEUE.js";
+} from "./chunk-NDIIAD53.js";
 import {
   require_react
 } from "./chunk-SO6EZMEL.js";
@@ -52,7 +53,7 @@ import "./chunk-XMTHMR2B.js";
 import {
   readUserConfig,
   updateUserConfig
-} from "./chunk-F64BUTC2.js";
+} from "./chunk-PWDRKULR.js";
 import "./chunk-7ZP5YH44.js";
 import "./chunk-COXRYL76.js";
 import "./chunk-MWHZITF4.js";
@@ -60,13 +61,13 @@ import {
   pathExists,
   readJson,
   writeJson
-} from "./chunk-JTAS7UOW.js";
+} from "./chunk-TGMN5C3S.js";
 import {
   z
 } from "./chunk-SF2XPDVG.js";
 import {
   require_lib
-} from "./chunk-ULCE6HIP.js";
+} from "./chunk-PUYZ4IST.js";
 import {
   __commonJS,
   __dirname,
@@ -103212,7 +103213,7 @@ init_esm_shims();
 
 // ../cli-astro-commands/src/components/DevCommand/DevCommand.tsx
 init_esm_shims();
-var import_react4 = __toESM(require_react(), 1);
+var import_react5 = __toESM(require_react(), 1);
 
 // ../cli-astro-commands/src/components/DevCommand/DevScreenBorder.tsx
 init_esm_shims();
@@ -103254,7 +103255,7 @@ function runAstroDev({
   const result = execa(file, args, {
     cwd: projectFolder,
     stdio: "pipe",
-    env: { FORCE_COLOR: "0" },
+    env: { FORCE_COLOR: "1" },
     cleanup: true,
     detached: true
   });
@@ -103285,9 +103286,16 @@ function runAstroDev({
   return result;
 }
 
-// ../cli-astro-commands/src/components/DevCommand/utils/createAstroLogger.ts
+// ../cli-astro-commands/src/components/DevCommand/utils/createAstroLogger.tsx
 init_esm_shims();
-function createAstroLogger() {
+var import_react2 = __toESM(require_react(), 1);
+var dateTimeFormat = new Intl.DateTimeFormat([], {
+  hour: "2-digit",
+  minute: "2-digit",
+  second: "2-digit",
+  hour12: false
+});
+function createAstroLogger(isPrefixed = true) {
   const renderer = createRendererToString({ stripAnsi: false });
   const log = (msg) => {
     if (typeof msg === "string") {
@@ -103296,12 +103304,17 @@ function createAstroLogger() {
       setTimeout(() => console.log(renderer.render(msg)), 0);
     }
   };
-  return { log };
+  const prefixedLog = (msg) => {
+    const timestamp = dateTimeFormat.format(/* @__PURE__ */ new Date());
+    const log2 = /* @__PURE__ */ import_react2.default.createElement(Text, null, /* @__PURE__ */ import_react2.default.createElement(Text, null, timestamp, " "), /* @__PURE__ */ import_react2.default.createElement(Text, { skin: "info" }, "[wix] "), /* @__PURE__ */ import_react2.default.createElement(Text, null, msg));
+    console.log(renderer.render(log2));
+  };
+  return isPrefixed ? { log: prefixedLog } : { log };
 }
 
 // ../cli-astro-commands/src/components/DevCommand/DevCenterUpdater.tsx
 init_esm_shims();
-var import_react3 = __toESM(require_react(), 1);
+var import_react4 = __toESM(require_react(), 1);
 import { isDeepStrictEqual } from "node:util";
 var import_variant3 = __toESM(require_lib(), 1);
 
@@ -103715,22 +103728,29 @@ async function saveAppConfig(projectFolder, config) {
 // ../cli-astro-commands/src/components/DevCommand/utils/isTunnelRequired.ts
 init_esm_shims();
 function isTunnelRequired(appManifest) {
-  return appManifest.components.some(isWebhookManagedByCLI);
-}
-function isWebhookManagedByCLI(component) {
-  if (component.compType === ComponentType.WEBHOOK) {
-    return !URL.canParse(component.compData.webhook.callbackUrl);
+  for (const extension of appManifest.components) {
+    const knownAppManifest = parseKnownExtensionManifest(extension);
+    if (knownAppManifest != null && knownAppManifest.compType === ComponentType.WEBHOOK) {
+      return !URL.canParse(knownAppManifest.compData.webhook.callbackUrl);
+    }
   }
   return false;
 }
+function parseKnownExtensionManifest(extensionManifest) {
+  const appManifestResult = looseComponentSchema.safeParse(extensionManifest);
+  if (appManifestResult.error) {
+    return null;
+  }
+  return appManifestResult.data;
+}
 
 // ../cli-astro-commands/src/components/DevCommand/TunnelingConsent.tsx
 init_esm_shims();
-var import_react2 = __toESM(require_react(), 1);
+var import_react3 = __toESM(require_react(), 1);
 var import_variant2 = __toESM(require_lib(), 1);
 var TunnelingConsent = ({ required, children }) => {
   const exit = useExit();
-  const [approved, setApproved] = (0, import_react2.useState)();
+  const [approved, setApproved] = (0, import_react3.useState)();
   const { status } = useAsync(async () => {
     const config = await readUserConfig();
     if (config.tunneling) {
@@ -103741,8 +103761,8 @@ var TunnelingConsent = ({ required, children }) => {
   if (!required || approved) {
     return children;
   }
-  return /* @__PURE__ */ import_react2.default.createElement(import_react2.default.Fragment, null, (0, import_variant2.match)(status, {
-    Success: () => /* @__PURE__ */ import_react2.default.createElement(
+  return /* @__PURE__ */ import_react3.default.createElement(import_react3.default.Fragment, null, (0, import_variant2.match)(status, {
+    Success: () => /* @__PURE__ */ import_react3.default.createElement(
       ConfirmInput,
       {
         label: "To proceed, we'll set up a secure tunnel from your machine for development purposes",
@@ -103758,7 +103778,7 @@ var TunnelingConsent = ({ required, children }) => {
     ),
     Error: () => null,
     Loading: () => null
-  }), approved === false && /* @__PURE__ */ import_react2.default.createElement(Text, { skin: "error" }, "Operation aborted. Tunneling is necessary to run your application."));
+  }), approved === false && /* @__PURE__ */ import_react3.default.createElement(Text, { skin: "error" }, "Operation aborted. Tunneling is necessary to run your application."));
 };
 
 // ../cli-astro-commands/src/components/DevCommand/DevCenterUpdater.tsx
@@ -103767,26 +103787,26 @@ var DevCenterUpdateResult = (0, import_variant3.variant)({
   Unchanged: {}
 });
 var DevCenterUpdater = ({ serverLocalUrl, serverExposedUrl }) => {
-  const [devArmTag, setDevArmTag] = (0, import_react3.useState)("");
-  const [manifest, setManifest] = (0, import_react3.useState)(null);
+  const [devArmTag, setDevArmTag] = (0, import_react4.useState)("");
+  const [manifest, setManifest] = (0, import_react4.useState)(null);
   const {
     model: {
-      config: { siteId, projectId },
+      config: { siteId, appId },
       projectFolder
     }
   } = useProjectModel();
-  const logger = (0, import_react3.useMemo)(() => createAstroLogger(), []);
+  const logger = (0, import_react4.useMemo)(() => createAstroLogger(), []);
   const http = useHttpClient({ type: "standalone" });
   const { updateManifest } = useUpdateManifest();
   const arm = useARMClient();
   const updateDeploymentTopology = useUpdateDeploymentTopology();
   const openTunnel = useTunnel();
-  const tunnelUrl = (0, import_react3.useRef)();
-  const [tunnelRequired, setTunnelRequired] = (0, import_react3.useState)(false);
-  const updateDevCenter = (0, import_react3.useCallback)(async () => {
+  const tunnelUrl = (0, import_react4.useRef)();
+  const [tunnelRequired, setTunnelRequired] = (0, import_react4.useState)(false);
+  const updateDevCenter = (0, import_react4.useCallback)(async () => {
     const url = new URL("/_wix/app-manifest.json", serverLocalUrl).href;
     const { data: responseFromDevServer } = await http.get(url);
-    const latestManifest = appManifestSchema.parse(responseFromDevServer);
+    const latestManifest = looseAppManifestSchema.parse(responseFromDevServer);
     if (isDeepStrictEqual(manifest, latestManifest)) {
       return DevCenterUpdateResult.Unchanged();
     }
@@ -103804,19 +103824,19 @@ var DevCenterUpdater = ({ serverLocalUrl, serverExposedUrl }) => {
     const appConfig = await readAppConfig(projectFolder);
     let updatedDevArmTag = appConfig?.devArmTag;
     if (!updatedDevArmTag) {
-      updatedDevArmTag = await arm.createAppRelease(
+      updatedDevArmTag = await arm.createLooseAppRelease(
         updateManifest(latestManifest, baseUrl, tunnelUrl.current),
-        projectId
+        appId
       );
     } else {
-      const updateState = await arm.updateAppRelease(
+      const updateState = await arm.updateLooseAppRelease(
         updateManifest(latestManifest, baseUrl, tunnelUrl.current),
         updatedDevArmTag
       );
       if (!(0, import_variant3.isType)(updateState, "TagUpdated")) {
-        updatedDevArmTag = await arm.createAppRelease(
+        updatedDevArmTag = await arm.createLooseAppRelease(
           updateManifest(latestManifest, baseUrl, tunnelUrl.current),
-          projectId
+          appId
         );
       }
     }
@@ -103840,12 +103860,12 @@ var DevCenterUpdater = ({ serverLocalUrl, serverExposedUrl }) => {
     arm,
     manifest,
     projectFolder,
-    projectId,
+    appId,
     updateDeploymentTopology,
     openTunnel
   ]);
-  const [timer, setTimer] = (0, import_react3.useState)(Date.now());
-  (0, import_react3.useEffect)(() => {
+  const [timer, setTimer] = (0, import_react4.useState)(Date.now());
+  (0, import_react4.useEffect)(() => {
     let disposed = false;
     void updateDevCenter().then((result) => {
       if ((0, import_variant3.isType)(result, "Changed")) {
@@ -103865,13 +103885,13 @@ var DevCenterUpdater = ({ serverLocalUrl, serverExposedUrl }) => {
       disposed = true;
     };
   }, [timer]);
-  return /* @__PURE__ */ import_react3.default.createElement(Box_default, { rowGap: 1, marginY: 1, flexDirection: "column" }, /* @__PURE__ */ import_react3.default.createElement(TunnelingConsent, { required: tunnelRequired }, /* @__PURE__ */ import_react3.default.createElement(Text, null, "Open the preview on:"), /* @__PURE__ */ import_react3.default.createElement(Box_default, { paddingLeft: 2, flexDirection: "column" }, /* @__PURE__ */ import_react3.default.createElement(PlatformLink, { url: serverLocalUrl, label: "Site" }), devArmTag ? /* @__PURE__ */ import_react3.default.createElement(
+  return /* @__PURE__ */ import_react4.default.createElement(Box_default, { rowGap: 1, marginY: 1, flexDirection: "column" }, /* @__PURE__ */ import_react4.default.createElement(TunnelingConsent, { required: tunnelRequired }, /* @__PURE__ */ import_react4.default.createElement(Text, null, "Open the preview on:"), /* @__PURE__ */ import_react4.default.createElement(Box_default, { paddingLeft: 2, flexDirection: "column" }, /* @__PURE__ */ import_react4.default.createElement(PlatformLink, { url: serverLocalUrl, label: "Site" }), devArmTag ? /* @__PURE__ */ import_react4.default.createElement(
     PlatformLink,
     {
       url: `https://manage.wix.com/dashboard/${siteId}?apps-override=${devArmTag}`,
       label: "Dashboard"
     }
-  ) : /* @__PURE__ */ import_react3.default.createElement(Spinner, { text: "Waiting for dashboard..." }))));
+  ) : /* @__PURE__ */ import_react4.default.createElement(Spinner, { text: "Preparing your dashboard..." }))));
 };
 
 // ../cli-astro-commands/src/components/DevCommand/DevCommand.tsx
@@ -103880,15 +103900,15 @@ var DevCommand = ({
   allowedHosts,
   serverExposedUrl
 }) => {
-  const [serverLocalUrl, setServerLocalUrl] = (0, import_react4.useState)("");
+  const [serverLocalUrl, setServerLocalUrl] = (0, import_react5.useState)("");
   const {
     model: {
       config: { siteId },
       projectFolder
     }
   } = useProjectModel();
-  const logger = (0, import_react4.useMemo)(() => createAstroLogger(), []);
-  const astroProcess = (0, import_react4.useRef)();
+  const logger = (0, import_react5.useMemo)(() => createAstroLogger(false), []);
+  const astroProcess = (0, import_react5.useRef)();
   useAsync(async () => {
     const repoType = await getRepoType(projectFolder);
     const packageManager = await createPackageManager(repoType);
@@ -103905,20 +103925,20 @@ var DevCommand = ({
     astro.stdout?.on(EVENT_LINE, (line) => logger.log(line));
     astro.stderr?.on(EVENT_LINE, (line) => logger.log(line));
   }, []);
-  (0, import_react4.useEffect)(() => {
+  (0, import_react5.useEffect)(() => {
     return () => {
       if (astroProcess.current?.pid) {
         process.kill(-astroProcess.current.pid, "SIGTERM");
       }
     };
   }, []);
-  return /* @__PURE__ */ import_react4.default.createElement(SiteAuthProvider, { siteId }, serverLocalUrl ? /* @__PURE__ */ import_react4.default.createElement(DevScreenBorder, null, /* @__PURE__ */ import_react4.default.createElement(Text, null, "Development environment ready"), /* @__PURE__ */ import_react4.default.createElement(
+  return /* @__PURE__ */ import_react5.default.createElement(SiteAuthProvider, { siteId }, serverLocalUrl ? /* @__PURE__ */ import_react5.default.createElement(DevScreenBorder, null, /* @__PURE__ */ import_react5.default.createElement(Text, null, "Development environment ready"), /* @__PURE__ */ import_react5.default.createElement(
     DevCenterUpdater,
     {
       serverLocalUrl,
       serverExposedUrl
     }
-  )) : /* @__PURE__ */ import_react4.default.createElement(Spinner, { text: "Starting dev environment..." }));
+  )) : /* @__PURE__ */ import_react5.default.createElement(Spinner, { text: "Starting dev environment..." }));
 };
 export {
   DevCommand
@@ -103977,4 +103997,4 @@ export {
      *)
   *)
 */
-//# sourceMappingURL=DevCommand-DSJBVCXP.js.map
+//# sourceMappingURL=DevCommand-6KYPSTGJ.js.map