@shipstatic/drop 2.10.4-beta.2 → 2.10.4-beta.21

package/dist/index.js

@@ -932,6 +932,8 @@ function isZipFile(file) {
 }
 
 // src/process.ts
+var CANT_DEPLOY = "Can't deploy this";
+var COULDNT_PREPARE = "Couldn't prepare the files";
 function toValidatable(file) {
   return { name: file.path, size: file.size };
 }
@@ -983,7 +985,7 @@ async function processFiles(input, { limits, onStatus }) {
       if (!hasIndex) {
         const details = needsBuild ? "No index.html found \u2014 every web project needs an index.html entry point" : "No index.html at root \u2014 the entry point must be in the top-level directory";
         return failure({
-          title: "Validation Failed",
+          title: CANT_DEPLOY,
           details,
           sourceName,
           needsBuild,
@@ -1011,16 +1013,16 @@ async function processFiles(input, { limits, onStatus }) {
       statusMessage: validation.files[i]?.statusMessage ?? file.statusMessage
     }));
     if (!validation.canDeploy) {
+      const issues = validation.errors.map((e) => e.message);
       return failure({
-        title: "Validation Failed",
-        details: `${pluralize(validation.errors.length, "file", "files", true)} failed validation`,
-        errors: validation.errors.map((e) => `${e.file}: ${e.message}`),
+        title: CANT_DEPLOY,
+        ...issues.length === 1 ? { details: issues[0] } : { details: `${issues.length} files refused`, errors: issues },
         files: validated,
         sourceName
       });
     }
     const readyCount = validated.filter((f) => f.status === FileValidationStatus.READY).length;
-    const warnings = validation.warnings.map((w) => `${w.file}: ${w.message}`);
+    const warnings = validation.warnings.map((w) => w.message);
     if (readyCount > 0) {
       let details = `${pluralize(readyCount, "file", "files", true)} ready`;
       if (validation.warnings.length > 0) {
@@ -1034,30 +1036,22 @@ async function processFiles(input, { limits, onStatus }) {
         status: { title: "Ready", details, ...warnings.length ? { warnings } : {} }
       };
     }
-    if (validation.errors.length === 0 && validation.warnings.length > 0) {
-      return {
-        phase: "ready",
-        files: validated,
-        sourceName,
-        needsBuild: false,
-        status: {
-          title: "All files excluded",
-          details: `${pluralize(validation.warnings.length, "file", "files", true)} excluded (empty files cannot be deployed)`,
-          warnings
-        }
-      };
-    }
-    return failure({
-      title: "No Valid Files",
-      details: "None of the provided files could be processed.",
+    return {
+      phase: "ready",
       files: validated,
-      sourceName
-    });
+      sourceName,
+      needsBuild: false,
+      status: {
+        title: "All files excluded",
+        details: `${pluralize(validation.warnings.length, "file", "files", true)} excluded (empty files cannot be deployed)`,
+        warnings
+      }
+    };
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
     const isValidation = isShipError(error);
     return failure({
-      title: isValidation ? "Validation Failed" : "Processing Failed",
+      title: isValidation ? CANT_DEPLOY : COULDNT_PREPARE,
       details: isValidation ? message : `Failed to process files: ${message}`,
       sourceName
     });
@@ -1108,7 +1102,7 @@ var initialState = {
 };
 function useDrop({ ship }) {
   const [state, setState] = useState(initialState);
-  const isProcessingRef = useRef(false);
+  const runRef = useRef(null);
   const folderInputRef = useRef(null);
   const filesInputRef = useRef(null);
   const isProcessing = state.phase === "processing";
@@ -1119,24 +1113,40 @@ function useDrop({ ship }) {
     [state.files]
   );
   const getFilesForUpload = useCallback(() => validFiles.map((f) => f.file), [validFiles]);
-  const processFiles2 = useCallback(
-    async (newFiles) => {
-      if (isProcessingRef.current) {
+  const prepare = useCallback(
+    async (collect) => {
+      if (runRef.current) {
         console.warn("File processing already in progress. Ignoring duplicate call.");
         return;
       }
-      if (!newFiles || newFiles.length === 0) return;
-      isProcessingRef.current = true;
+      const run = new AbortController();
+      runRef.current = run;
       setState({
         ...initialState,
         phase: "processing",
         status: { title: "Processing...", details: "Validating and preparing files." }
       });
       try {
-        const outcome = await processFiles(newFiles, {
-          limits: await ship.getLimits(),
+        const [files, limits] = await Promise.all([
+          collect(),
+          ship.getLimits({ signal: run.signal })
+        ]);
+        if (run.signal.aborted) return;
+        if (files.length === 0) {
+          setState({
+            ...initialState,
+            phase: "error",
+            status: { title: CANT_DEPLOY, details: "The folder has no files." }
+          });
+          return;
+        }
+        const outcome = await processFiles(files, {
+          limits,
+          // The pipeline says its status before its first wait, so a
+          // cancelled run has none left to say.
           onStatus: (status) => setState((prev) => ({ ...prev, status }))
         });
+        if (run.signal.aborted) return;
         setState({
           phase: outcome.phase,
           isDragging: false,
@@ -1145,15 +1155,33 @@ function useDrop({ ship }) {
           status: outcome.status,
           needsBuild: outcome.needsBuild
         });
+      } catch (error) {
+        if (run.signal.aborted) return;
+        setState({
+          ...initialState,
+          phase: "error",
+          status: {
+            title: COULDNT_PREPARE,
+            details: error instanceof Error ? error.message : String(error)
+          }
+        });
       } finally {
-        isProcessingRef.current = false;
+        if (runRef.current === run) runRef.current = null;
       }
     },
     [ship]
   );
+  const processFiles2 = useCallback(
+    async (newFiles) => {
+      if (!newFiles || newFiles.length === 0) return;
+      await prepare(async () => newFiles);
+    },
+    [prepare]
+  );
   const reset = useCallback(() => {
+    runRef.current?.abort();
+    runRef.current = null;
     setState(initialState);
-    isProcessingRef.current = false;
   }, []);
   const handleDragOver = useCallback((e) => {
     e.preventDefault();
@@ -1188,13 +1216,13 @@ function useDrop({ ship }) {
           if (file) files.push(file);
         }
       }
-      await Promise.all(directories.map((d) => traverseFileTree(d.entry, files, d.path)));
-      if (files.length === 0 && e.dataTransfer.files.length > 0) {
-        files.push(...Array.from(e.dataTransfer.files));
-      }
-      if (files.length > 0) await processFiles2(files);
+      if (directories.length === 0 && files.length === 0) return;
+      await prepare(async () => {
+        await Promise.all(directories.map((d) => traverseFileTree(d.entry, files, d.path)));
+        return files;
+      });
     },
-    [processFiles2]
+    [prepare]
   );
   const handleInputChange = useCallback(
     (e) => {