@shipstatic/drop 2.10.4-beta.8 → 2.10.4

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
     });
@@ -1139,14 +1133,18 @@ function useDrop({ ship }) {
         ]);
         if (run.signal.aborted) return;
         if (files.length === 0) {
-          setState(initialState);
+          setState({
+            ...initialState,
+            phase: "error",
+            status: { title: CANT_DEPLOY, details: "The folder has no files." }
+          });
           return;
         }
         const outcome = await processFiles(files, {
           limits,
-          onStatus: (status) => {
-            if (!run.signal.aborted) setState((prev) => ({ ...prev, status }));
-          }
+          // 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({
@@ -1163,7 +1161,7 @@ function useDrop({ ship }) {
           ...initialState,
           phase: "error",
           status: {
-            title: "Processing Failed",
+            title: COULDNT_PREPARE,
             details: error instanceof Error ? error.message : String(error)
           }
         });
@@ -1218,11 +1216,10 @@ function useDrop({ ship }) {
           if (file) files.push(file);
         }
       }
-      const plain = Array.from(e.dataTransfer.files);
-      if (directories.length === 0 && files.length === 0 && plain.length === 0) return;
+      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.length > 0 ? files : plain;
+        return files;
       });
     },
     [prepare]