Fixed bug where only top level files were deployed

danechitoaie · Jan 20, 2022 · 43a1614 · 43a1614
1 parent 26b96f2
commit 43a1614
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/.prettierrc.json b/.prettierrc.json
@@ -0,0 +1,4 @@
+{
+    "tabWidth": 4,
+    "printWidth": 160
+}
diff --git a/scripts/build.ts b/scripts/build.ts
@@ -39,7 +39,7 @@ async function run() {
         const prefix = `${pkg.name}/bld`;
         const cwd = path.resolve(__dirname, "../dist/build");
 
-        const fileList = await globby("*", { cwd });
+        const fileList = await globby("**/*", { cwd });
         await tar.create({ file, prefix, cwd }, fileList);
         setOutput(fileList.join("\n  "));
     });

diff --git a/scripts/deploy.ts b/scripts/deploy.ts
@@ -19,7 +19,7 @@ async function run() {
             return;
         }
 
-        await new Promise<void>((resolve, reject) => {
+        await new Promise<string>((resolve, reject) => {
             yargs
                 .usage("Usage: $0 [options]")
                 .option("username", { type: "string", description: "Username", demandOption: true })
@@ -28,13 +28,11 @@ async function run() {
                 .help()
                 .parse(process.argv, async (yargsErr: Error | undefined, argv: yargs.ArgumentsCamelCase<DeployArguments>, output: string) => {
                     if (yargsErr) {
-                        setError(yargsErr);
                         reject(yargsErr);
                         return;
                     }
 
                     if (output) {
-                        setOutput(output);
                         reject(output);
                         return;
                     }
@@ -71,21 +69,30 @@ async function run() {
                             body,
                         });
 
+                        if (res.status === 401) {
+                            const message = await res.text();
+                            reject(message);
+                            return;
+                        }
+
                         const { message } = await res.json();
 
                         if (res.ok) {
-                            setOutput(message);
                             resolve(message);
                         } else {
-                            setError(message);
                             reject(message);
                         }
                     } catch (fetchErr) {
-                        setError(fetchErr as Error);
                         reject(fetchErr);
                     }
                 });
-        });
+        })
+            .then((output) => {
+                setOutput(output);
+            })
+            .catch((output) => {
+                setError(output);
+            });
     });
 }