@wix/cli 1.1.88 → 1.1.90

package/build/{chunk-Z7H3PAZ6.js → chunk-7BXYVLCL.js}

@@ -4,7 +4,7 @@ import {
   resolveUrl,
   serializer,
   toURLSearchParams
-} from "./chunk-2EVNRLYY.js";
+} from "./chunk-E3PLBH3X.js";
 import {
   init_esm_shims
 } from "./chunk-PYIAC2GK.js";
@@ -132,4 +132,4 @@ export {
   publishDeployment,
   getDeploymentPipelineDescription
 };
-//# sourceMappingURL=chunk-Z7H3PAZ6.js.map
+//# sourceMappingURL=chunk-7BXYVLCL.js.map

package/build/{chunk-E5NGKLMX.js → chunk-7FRE72AU.js}

@@ -3,11 +3,11 @@ const require = _createRequire(import.meta.url);
 import {
   getProjectDependencies,
   saveWixLock
-} from "./chunk-MVF7XNIR.js";
+} from "./chunk-PYLT6JMC.js";
 import {
   createPackageManager,
   getRepoType
-} from "./chunk-QHSB6VG6.js";
+} from "./chunk-RXE2R5HP.js";
 import {
   init_esm_shims
 } from "./chunk-PYIAC2GK.js";
@@ -41,4 +41,4 @@ async function createDependenciesService(projectFolder, veloClient) {
 export {
   createDependenciesService
 };
-//# sourceMappingURL=chunk-E5NGKLMX.js.map
+//# sourceMappingURL=chunk-7FRE72AU.js.map

package/build/{chunk-LX7XE5RU.js → chunk-BLNTFZ46.js}

@@ -5,21 +5,21 @@ import {
 } from "./chunk-EDFOB3LN.js";
 import {
   GridAppLayout
-} from "./chunk-N6QOJTN4.js";
+} from "./chunk-IY3KYYVL.js";
 import {
   extractHttpError
-} from "./chunk-3WOTB46G.js";
+} from "./chunk-TFYNCJ2Y.js";
 import {
   WIX_LOCK_FILENAME,
   getSourceFolder
 } from "./chunk-7ZP5YH44.js";
 import {
   pathExists
-} from "./chunk-LPD4XGYD.js";
+} from "./chunk-TGMN5C3S.js";
 import {
   CliError,
   CliErrorCode
-} from "./chunk-ZKCONC7A.js";
+} from "./chunk-PUYZ4IST.js";
 import {
   __toESM,
   init_esm_shims
@@ -107,4 +107,4 @@ export {
   isSiteNotPublishedError,
   loadProjectGridAppContent
 };
-//# sourceMappingURL=chunk-LX7XE5RU.js.map
+//# sourceMappingURL=chunk-BLNTFZ46.js.map

package/build/{chunk-LDZEOWUV.js → chunk-BOYB62NS.js}

@@ -2,26 +2,26 @@ import { createRequire as _createRequire } from 'node:module';
 const require = _createRequire(import.meta.url);
 import {
   PlatformLink,
-  readAppManifest,
+  readLooseAppManifest,
   useARMClient,
   useUpdateDeploymentTopology,
   useUpdateManifest
-} from "./chunk-4NN2C4CS.js";
+} from "./chunk-S2RGKETR.js";
 import {
-  useWixstroClient
-} from "./chunk-2PNYIXMP.js";
+  useBackendAsAServiceClient
+} from "./chunk-Y2LBC7HR.js";
 import {
   buildMetadataSchema,
   getBuildManifestPath,
   useProjectModel
-} from "./chunk-AFVZOQLU.js";
+} from "./chunk-SVDRJSYB.js";
 import {
   globby
 } from "./chunk-65JTHDMM.js";
 import {
   SiteAuthProvider,
   pLimit
-} from "./chunk-2EVNRLYY.js";
+} from "./chunk-E3PLBH3X.js";
 import {
   Alert,
   Box_default,
@@ -29,19 +29,19 @@ import {
   Text,
   useAsync,
   useAsyncCallback
-} from "./chunk-QKHIYABF.js";
+} from "./chunk-NDIIAD53.js";
 import {
   require_react
 } from "./chunk-SO6EZMEL.js";
 import {
   pathExists,
   readJson
-} from "./chunk-LPD4XGYD.js";
+} from "./chunk-TGMN5C3S.js";
 import {
   CliError,
   CliErrorCode,
   require_lib
-} from "./chunk-ZKCONC7A.js";
+} from "./chunk-PUYZ4IST.js";
 import {
   __toESM,
   init_esm_shims
@@ -123,7 +123,7 @@ var ActionStatus = ({ status, loadingText, successText }) => (0, import_variant.
 init_esm_shims();
 async function readAppManifestFile(projectFolder) {
   const buildManifest = await readBuildManifest(projectFolder);
-  return readAppManifest(buildManifest.appManifestPath);
+  return readLooseAppManifest(buildManifest.appManifestPath);
 }
 
 // ../cli-astro-commands/src/components/PreviewCommand/hooks/useLoadBuildFiles.ts
@@ -136,11 +136,11 @@ function useLoadBuildFiles() {
   return useAsyncCallback(async () => {
     const buildManifest = await readBuildManifest(projectFolder);
     const client = (await loadFiles(buildManifest.clientDir)).filter(
-      ({ relativePath, path }) => {
+      ({ relativePath, path: path2 }) => {
         if (relativePath.startsWith("_wix")) {
           return false;
         }
-        if (path.startsWith(buildManifest.serverDir)) {
+        if (path2.startsWith(buildManifest.serverDir)) {
           return false;
         }
         return true;
@@ -169,8 +169,9 @@ async function loadFiles(cwd) {
   );
 }
 
-// ../cli-astro-commands/src/components/PreviewCommand/hooks/useUploadClientFiles.ts
+// ../cli-astro-commands/src/components/PreviewCommand/hooks/useDeployFiles.ts
 init_esm_shims();
+import path from "node:path";
 import crypto from "node:crypto";
 import fs from "node:fs";
 
@@ -1314,12 +1315,12 @@ var Mime = class {
     }
     return this;
   }
-  getType(path) {
-    if (typeof path !== "string")
+  getType(path2) {
+    if (typeof path2 !== "string")
       return null;
-    const last = path.replace(/^.*[/\\]/s, "").toLowerCase();
+    const last = path2.replace(/^.*[/\\]/s, "").toLowerCase();
     const ext = last.replace(/^.*\./s, "").toLowerCase();
-    const hasPath = last.length < path.length;
+    const hasPath = last.length < path2.length;
     const hasDot = ext.length < last.length - 1;
     if (!hasDot && hasPath)
       return null;
@@ -1359,211 +1360,140 @@ var Mime_default = Mime;
 // ../../node_modules/mime/dist/src/index.js
 var src_default = new Mime_default(standard_default, other_default)._freeze();
 
-// ../cli-astro-commands/src/components/PreviewCommand/hooks/useUploadClientFiles.ts
-function useUploadClientFiles() {
+// ../cli-astro-commands/src/components/PreviewCommand/hooks/useDeployFiles.ts
+function useDeployFiles() {
   const {
     model: {
-      config: { projectId }
+      projectFolder,
+      config: { appId }
     }
   } = useProjectModel();
-  const wixtro = useWixstroClient();
-  return useAsyncCallback(
-    async (_, files) => {
-      const filesWithHash = await Promise.all(
-        files.map(async (file) => {
-          const { hash, size } = await getFileMD5AndSize(file.path);
-          return { ...file, hash, size };
-        })
-      );
-      const result = await wixtro.createUploadManifest({
-        projectId,
-        manifest: Object.fromEntries(
-          filesWithHash.map(({ hash, size, relativePath }) => [
-            `/${relativePath}`,
-            { hash, size }
-          ])
-        )
-      });
-      if (result.buckets.length === 0) {
-        return {
-          deploymentToken: result.deploymentToken,
-          completionToken: result.jwt
-        };
-      }
-      const hashToFileMap = Object.fromEntries(
-        filesWithHash.map(({ hash, relativePath, path }) => [
-          hash,
-          { relativePath, path }
-        ])
-      );
-      let lastBucketResult;
-      const limit = pLimit(3);
-      const uploadPromises = result.buckets.map(
-        (bucket) => limit(async () => {
-          const bucketResult = await uploadSingleBucket(
-            result.jwt,
-            result.uploadEndpointURL,
-            bucket.map(({ serverHash, clientHash }) => {
-              const file = hashToFileMap[clientHash];
-              if (!file) {
-                throw new Error(`Unknown client file hash: ${clientHash}`);
-              }
-              return {
-                fileAbsolutePath: file.path,
-                fileHash: serverHash,
-                fileMime: src_default.getType(file.relativePath) ?? "application/octet-stream"
-              };
-            })
-          );
-          if (bucketResult) {
-            lastBucketResult = bucketResult;
-          }
-          return bucketResult;
-        })
+  const backendAsAServiceClient = useBackendAsAServiceClient();
+  return useAsyncCallback(async (_, files) => {
+    const clientFilesMetadata = await Promise.all(
+      files.client.map(getStaticFileMetadata)
+    );
+    const { appDeployment, staticFilesUploadUrls, uploadAuthToken } = await backendAsAServiceClient.createAppDeployment(
+      appId,
+      clientFilesMetadata
+    );
+    const uploadLimiter = pLimit(3);
+    let lastUploadAuthToken = uploadAuthToken;
+    if (staticFilesUploadUrls?.length && lastUploadAuthToken) {
+      const uploadPromises = staticFilesUploadUrls.map(
+        ({ uploadUrl, staticFileMetadata }) => {
+          return uploadLimiter(async () => {
+            const formData = await buildFormData(
+              projectFolder,
+              staticFileMetadata
+            );
+            const {
+              result: { jwt: responseUploadToken }
+            } = await backendAsAServiceClient.postForm(
+              uploadUrl,
+              lastUploadAuthToken,
+              formData
+            );
+            if (responseUploadToken) {
+              lastUploadAuthToken = responseUploadToken;
+            }
+            return responseUploadToken;
+          });
+        }
       );
       await Promise.all(uploadPromises);
-      if (!lastBucketResult) {
-        throw new Error("Failed to upload assets to completion");
-      }
-      return {
-        completionToken: lastBucketResult,
-        deploymentToken: result.deploymentToken
-      };
     }
-  );
-}
-async function getFileMD5AndSize(filePath) {
-  return new Promise((resolve, reject) => {
-    const hash = crypto.createHash("md5");
-    const stream = fs.createReadStream(filePath);
-    let size = 0;
-    stream.on("data", (chunk) => {
-      hash.update(chunk);
-      size += chunk.length;
-    });
-    stream.on("end", () => resolve({ hash: hash.digest("hex"), size }));
-    stream.on("error", reject);
-  });
-}
-async function uploadSingleBucket(jwt, uploadEndpoint, bucket) {
-  const form = new FormData();
-  for (const file of bucket) {
-    const fileContents = await fs.promises.readFile(file.fileAbsolutePath);
-    form.append(
-      file.fileHash,
-      new File([fileContents.toString("base64")], file.fileHash, {
-        type: file.fileMime
-        // Modify Content-Type header based on type of file
-      }),
-      file.fileHash
+    const backendFiles = await Promise.all(
+      files.server.map(getBackendFileData)
     );
-  }
-  const response = await fetch(uploadEndpoint, {
-    method: "POST",
-    headers: {
-      Authorization: `Bearer ${jwt}`
-    },
-    body: form
-  });
-  if (!response.ok) {
-    throw new Error(
-      `Failed to upload bucket: ${response.status} - ${response.statusText} ${await response.text()}`
+    const completeAppDeployment = await backendAsAServiceClient.completeAppDeployment(
+      {
+        ...appDeployment,
+        files: backendFiles
+      },
+      lastUploadAuthToken
     );
-  }
-  const data = await response.json();
-  if (data.result.jwt) {
-    return data.result.jwt;
-  }
+    return {
+      deploymentId: completeAppDeployment.id,
+      deploymentBaseUrl: completeAppDeployment.deploymentBaseUrl
+    };
+  });
 }
-
-// ../cli-astro-commands/src/components/PreviewCommand/hooks/useUploadServerFiles.ts
-init_esm_shims();
-import fs2 from "node:fs/promises";
-function useUploadServerFiles() {
-  const {
-    model: {
-      config: { projectId }
-    }
-  } = useProjectModel();
-  const wixstroClient = useWixstroClient();
-  return useAsyncCallback(
-    async (_, files, tokens, environment) => {
-      const toBlob = (buffer, mimeType) => new Blob([buffer], { type: mimeType });
-      const filesWithBuffer = await Promise.all(
-        files.map(async (file) => {
-          const buffer = await fs2.readFile(file.path);
-          return { ...file, buffer };
-        })
-      );
-      const formData = new FormData();
-      const metadataBlob = new Blob(
-        [
-          JSON.stringify({
-            environment,
-            deploymentToken: tokens.deploymentToken,
-            jwtCompletionToken: tokens.completionToken
-          })
-        ],
-        { type: "application/json" }
-      );
-      formData.append("metadata", metadataBlob);
-      for (const file of filesWithBuffer) {
-        formData.append(
-          `worker/${file.relativePath}`,
-          toBlob(
-            file.buffer,
-            src_default.getType(file.path) ?? "application/octet-stream"
-          )
-        );
-      }
-      const deployResult = await wixstroClient.deployV2({
-        projectId,
-        formData
-      });
-      return deployResult;
-    }
+async function getStaticFileMetadata(file) {
+  const stats = await fs.promises.stat(file.path);
+  const fileContent = await fs.promises.readFile(file.path);
+  const hash = crypto.createHash("md5").update(fileContent).digest("hex");
+  return {
+    size: stats.size,
+    hash,
+    contentType: src_default.getType(file.path),
+    path: `/${file.relativePath}`
+  };
+}
+async function getBackendFileData(file) {
+  const buffer = await fs.promises.readFile(file.path);
+  return { path: file.relativePath, content: buffer.toString("base64") };
+}
+async function buildFormData(projectFolder, staticFileMetadata) {
+  const form = new FormData();
+  const fileContents = await fs.promises.readFile(
+    path.join(projectFolder, "dist", staticFileMetadata.path)
   );
+  form.append(
+    staticFileMetadata.hash,
+    new File([fileContents.toString("base64")], staticFileMetadata.hash, {
+      type: staticFileMetadata.contentType
+    }),
+    staticFileMetadata.hash
+  );
+  return form;
 }
 
 // ../cli-astro-commands/src/components/PreviewCommand/Preview.tsx
 var Preview = ({ environment, baseUrl, onPreviewCreated }) => {
   const { model } = useProjectModel();
-  const arm = useARMClient();
+  const armClient = useARMClient();
   const loadBuildFiles = useLoadBuildFiles();
-  const uploadClientFiles = useUploadClientFiles();
-  const uploadServerFiles = useUploadServerFiles();
+  const deployFiles = useDeployFiles();
   const updateDeploymentTopology = useUpdateDeploymentTopology();
-  const updateManifest = useUpdateManifest();
+  const { updateManifest, updateManifestWithBackendWorker } = useUpdateManifest();
   const uploadApplicationAction = useAsyncCallback(
     async (_, baseUrl2) => {
       const buildFiles = await loadBuildFiles.execute();
-      const { deploymentToken, completionToken } = await uploadClientFiles.execute(buildFiles.client);
-      const result = await uploadServerFiles.execute(
-        buildFiles.server,
-        { deploymentToken, completionToken },
-        environment
-      );
-      return baseUrl2 ?? `https://${result.domain}/`;
+      const { deploymentBaseUrl, deploymentId } = await deployFiles.execute(buildFiles);
+      return {
+        deploymentUrl: baseUrl2 ?? deploymentBaseUrl,
+        deploymentId
+      };
     }
   );
   const createPreviewTagAction = useAsyncCallback(
-    async (_, serverUrl) => {
+    async (_, serverUrl, deploymentId) => {
       const manifest = await readAppManifestFile(model.projectFolder);
-      const updatedManifest = updateManifest(manifest, serverUrl);
-      return arm.createAppRelease(updatedManifest, model.config.projectId);
+      const updatedManifest = updateManifest(
+        updateManifestWithBackendWorker(manifest, deploymentId),
+        serverUrl
+      );
+      return armClient.createLooseAppRelease(
+        updatedManifest,
+        model.config.appId
+      );
     }
   );
   const { status: createPreviewStatus } = useAsync(async () => {
     await assertBuildOutputExists(model.projectFolder);
-    const serverUrl = await uploadApplicationAction.execute(baseUrl);
-    const armTag = await createPreviewTagAction.execute(serverUrl);
+    const { deploymentUrl: depoymentUrl, deploymentId } = await uploadApplicationAction.execute(baseUrl);
+    const armTag = await createPreviewTagAction.execute(
+      depoymentUrl,
+      deploymentId
+    );
     await updateDeploymentTopology.execute({
-      serverUrl,
+      serverUrl: depoymentUrl,
       armTag,
       environment
     });
-    onPreviewCreated?.({ armTag, serverUrl });
-    return { armTag, serverUrl };
+    onPreviewCreated?.({ armTag, serverUrl: depoymentUrl });
+    return { armTag, depoymentUrl };
   }, []);
   return /* @__PURE__ */ import_react2.default.createElement(import_react2.default.Fragment, null, /* @__PURE__ */ import_react2.default.createElement(
     ActionStatus,
@@ -1589,7 +1519,7 @@ var Preview = ({ environment, baseUrl, onPreviewCreated }) => {
   ), (0, import_variant2.match)(createPreviewStatus, {
     Error: () => null,
     Loading: () => null,
-    Success: ({ result: { armTag, serverUrl } }) => /* @__PURE__ */ import_react2.default.createElement(Box_default, { rowGap: 1, marginY: 1, flexDirection: "column" }, /* @__PURE__ */ import_react2.default.createElement(Text, null, "Open the preview on:"), /* @__PURE__ */ import_react2.default.createElement(Box_default, { paddingLeft: 2, flexDirection: "column" }, /* @__PURE__ */ import_react2.default.createElement(PlatformLink, { url: serverUrl, label: "Site" }), /* @__PURE__ */ import_react2.default.createElement(
+    Success: ({ result: { armTag, depoymentUrl } }) => /* @__PURE__ */ import_react2.default.createElement(Box_default, { rowGap: 1, marginY: 1, flexDirection: "column" }, /* @__PURE__ */ import_react2.default.createElement(Text, null, "Open the preview on:"), /* @__PURE__ */ import_react2.default.createElement(Box_default, { paddingLeft: 2, flexDirection: "column" }, /* @__PURE__ */ import_react2.default.createElement(PlatformLink, { url: depoymentUrl, label: "Site" }), /* @__PURE__ */ import_react2.default.createElement(
       PlatformLink,
       {
         url: `https://manage.wix.com/dashboard/${model.config.siteId}?apps-override=${armTag}`,
@@ -1620,4 +1550,4 @@ export {
   assertBuildOutputExists,
   PreviewCommand
 };
-//# sourceMappingURL=chunk-LDZEOWUV.js.map
+//# sourceMappingURL=chunk-BOYB62NS.js.map