Automatic compilation

Version Packages

action.yml

@@ -4,7 +4,8 @@ branding:
   color: "orange"
 description: "Deploy your Cloudflare projects from GitHub using Wrangler"
 runs:
-  using: "node16"
+  # Possible values: https://github.com/actions/runner/blob/main/src/Runner.Common/Util/NodeUtil.cs#L9
+  using: "node20"
   main: "dist/index.mjs"
 inputs:
   apiToken:
@@ -40,3 +41,7 @@ inputs:
   vars:
     description: "A string of environment variable names, separated by newlines. These will be bound to your Worker using the values of matching environment variables declared in `env` of this workflow."
     required: false
+  packageManager:
+    description: "The package manager you'd like to use to install and run wrangler. If not specified, a value will be inferred based on the presence of a lockfile. Valid values: [npm, pnpm, yarn]"
+    required: false
+    default: npm

dist/index.mjs

@@ -2816,11 +2816,8 @@ var __webpack_exports__ = {};
 // EXPORTS
 __nccwpck_require__.d(__webpack_exports__, {
   "kj": () => (/* binding */ authenticationSetup),
-  "ny": () => (/* binding */ checkWorkingDirectory),
   "P8": () => (/* binding */ execCommands),
-  "wJ": () => (/* binding */ getNpxCmd),
   "VH": () => (/* binding */ installWrangler),
-  "Wp": () => (/* binding */ semverCompare),
   "cb": () => (/* binding */ uploadSecrets),
   "cj": () => (/* binding */ wranglerCommands)
 });
@@ -2829,12 +2826,81 @@ __nccwpck_require__.d(__webpack_exports__, {
 var core = __nccwpck_require__(186);
 ;// CONCATENATED MODULE: external "node:child_process"
 const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:child_process");
+;// CONCATENATED MODULE: external "node:util"
+const external_node_util_namespaceObject = __WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:util");
 ;// CONCATENATED MODULE: external "node:fs"
 const external_node_fs_namespaceObject = __WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:fs");
 ;// CONCATENATED MODULE: external "node:path"
 const external_node_path_namespaceObject = __WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:path");
-;// CONCATENATED MODULE: external "node:util"
-const external_node_util_namespaceObject = __WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:util");
+;// CONCATENATED MODULE: ./src/utils.ts
+
+
+/**
+ * A helper function to compare two semver versions. If the second arg is greater than the first arg, it returns true.
+ */
+function semverCompare(version1, version2) {
+    if (version2 === "latest")
+        return true;
+    const version1Parts = version1.split(".");
+    const version2Parts = version2.split(".");
+    for (const version1Part of version1Parts) {
+        const version2Part = version2Parts.shift();
+        if (version1Part !== version2Part && version2Part) {
+            return version1Part < version2Part ? true : false;
+        }
+    }
+    return false;
+}
+function checkWorkingDirectory(workingDirectory = ".") {
+    const normalizedPath = external_node_path_namespaceObject.normalize(workingDirectory);
+    if ((0,external_node_fs_namespaceObject.existsSync)(normalizedPath)) {
+        return normalizedPath;
+    }
+    else {
+        throw new Error(`Directory ${workingDirectory} does not exist.`);
+    }
+}
+
+;// CONCATENATED MODULE: ./src/packageManagers.ts
+
+
+const PACKAGE_MANAGERS = {
+    npm: {
+        install: "npm i",
+        exec: "npx",
+    },
+    yarn: {
+        install: "yarn add",
+        exec: "yarn",
+    },
+    pnpm: {
+        install: "pnpm add",
+        exec: "pnpm exec",
+    },
+};
+function detectPackageManager(workingDirectory = ".") {
+    if ((0,external_node_fs_namespaceObject.existsSync)(external_node_path_namespaceObject.join(workingDirectory, "package-lock.json"))) {
+        return "npm";
+    }
+    if ((0,external_node_fs_namespaceObject.existsSync)(external_node_path_namespaceObject.join(workingDirectory, "yarn.lock"))) {
+        return "yarn";
+    }
+    if ((0,external_node_fs_namespaceObject.existsSync)(external_node_path_namespaceObject.join(workingDirectory, "pnpm-lock.yaml"))) {
+        return "pnpm";
+    }
+    return null;
+}
+function assertValidPackageManagerValue(name) {
+    if (name && !Object.keys(PACKAGE_MANAGERS).includes(name)) {
+        throw new TypeError(`invalid value provided for "packageManager": ${name}
+	Value must be one of: [${Object.keys(PACKAGE_MANAGERS).join(", ")}]`);
+    }
+}
+function getPackageManager(name, { workingDirectory = "." } = {}) {
+    assertValidPackageManagerValue(name);
+    return PACKAGE_MANAGERS[name || detectPackageManager(workingDirectory) || "npm"];
+}
+
 ;// CONCATENATED MODULE: ./src/index.ts
 
 
@@ -2856,10 +2922,11 @@ const config = {
     VARS: (0,core.getMultilineInput)("vars"),
     COMMANDS: (0,core.getMultilineInput)("command"),
     QUIET_MODE: (0,core.getBooleanInput)("quiet"),
+    PACKAGE_MANAGER: (0,core.getInput)("packageManager"),
 };
-function getNpxCmd() {
-    return process.env.RUNNER_OS === "Windows" ? "npx.cmd" : "npx";
-}
+const packageManager = getPackageManager(config.PACKAGE_MANAGER, {
+    workingDirectory: config.workingDirectory,
+});
 function info(message, bypass) {
     if (!config.QUIET_MODE || bypass) {
         (0,core.info)(message);
@@ -2880,30 +2947,20 @@ function endGroup() {
         (0,core.endGroup)();
     }
 }
-/**
- * A helper function to compare two semver versions. If the second arg is greater than the first arg, it returns true.
- */
-function semverCompare(version1, version2) {
-    if (version2 === "latest")
-        return true;
-    const version1Parts = version1.split(".");
-    const version2Parts = version2.split(".");
-    for (const version1Part of version1Parts) {
-        const version2Part = version2Parts.shift();
-        if (version1Part !== version2Part && version2Part) {
-            return version1Part < version2Part ? true : false;
-        }
-    }
-    return false;
-}
 async function main() {
-    installWrangler();
-    authenticationSetup();
-    await execCommands((0,core.getMultilineInput)("preCommands"), "pre");
-    await uploadSecrets();
-    await wranglerCommands();
-    await execCommands((0,core.getMultilineInput)("postCommands"), "post");
-    info("🏁 Wrangler Action completed", true);
+    try {
+        installWrangler();
+        authenticationSetup();
+        await execCommands((0,core.getMultilineInput)("preCommands"), "pre");
+        await uploadSecrets();
+        await wranglerCommands();
+        await execCommands((0,core.getMultilineInput)("postCommands"), "post");
+        info("🏁 Wrangler Action completed", true);
+    }
+    catch (err) {
+        err instanceof Error && error(err.message);
+        (0,core.setFailed)("🚨 Action failed");
+    }
 }
 async function runProcess(command, options) {
     try {
@@ -2915,29 +2972,15 @@ async function runProcess(command, options) {
     catch (err) {
         err.stdout && info(err.stdout.toString());
         err.stderr && error(err.stderr.toString(), true);
-        throw err;
-    }
-}
-function checkWorkingDirectory(workingDirectory = ".") {
-    try {
-        const normalizedPath = external_node_path_namespaceObject.normalize(workingDirectory);
-        if ((0,external_node_fs_namespaceObject.existsSync)(normalizedPath)) {
-            return normalizedPath;
-        }
-        else {
-            (0,core.setFailed)(`🚨 Directory ${workingDirectory} does not exist.`);
-        }
-    }
-    catch (error) {
-        (0,core.setFailed)(`🚨 While checking/creating directory ${workingDirectory} received ${error}`);
+        throw new Error(`\`${command}\` returned non-zero exit code.`);
     }
 }
 function installWrangler() {
     if (config["WRANGLER_VERSION"].startsWith("1")) {
-        (0,core.setFailed)(`🚨 Wrangler v1 is no longer supported by this action. Please use major version 2 or greater`);
+        throw new Error(`Wrangler v1 is no longer supported by this action. Please use major version 2 or greater`);
     }
     startGroup("📥 Installing Wrangler");
-    const command = `npm install wrangler@${config["WRANGLER_VERSION"]}`;
+    const command = `${packageManager.install} wrangler@${config["WRANGLER_VERSION"]}`;
     info(`Running command: ${command}`);
     (0,external_node_child_process_namespaceObject.execSync)(command, { cwd: config["workingDirectory"], env: process.env });
     info(`✅ Wrangler installed`, true);
@@ -2952,52 +2995,47 @@ async function execCommands(commands, cmdType) {
         return;
     }
     startGroup(`🚀 Running ${cmdType}Commands`);
-    const arrPromises = commands.map(async (command) => {
-        const cmd = command.startsWith("wrangler")
-            ? `${getNpxCmd()} ${command}`
-            : command;
-        info(`🚀 Executing command: ${cmd}`);
-        return await runProcess(cmd, {
-            cwd: config["workingDirectory"],
-            env: process.env,
+    try {
+        const arrPromises = commands.map(async (command) => {
+            const cmd = command.startsWith("wrangler")
+                ? `${packageManager.exec} ${command}`
+                : command;
+            info(`🚀 Executing command: ${cmd}`);
+            return await runProcess(cmd, {
+                cwd: config["workingDirectory"],
+                env: process.env,
+            });
         });
-    });
-    await Promise.all(arrPromises).catch((result) => {
-        result.stdout && info(result.stdout.toString());
-        result.stderr && error(result.stderr.toString(), true);
-        (0,core.setFailed)(`🚨 ${cmdType}Commands failed`);
-    });
-    endGroup();
+        await Promise.all(arrPromises);
+    }
+    finally {
+        endGroup();
+    }
 }
 /**
  * A helper function to get the secret from the environment variables.
  */
 function getSecret(secret) {
     if (!secret) {
-        (0,core.setFailed)("No secret provided");
+        throw new Error("Secret name cannot be blank.");
     }
     const value = process.env[secret];
     if (!value) {
-        (0,core.setFailed)(`Secret ${secret} not found`);
+        throw new Error(`Value for secret ${secret} not found.`);
     }
     return value;
 }
 async function legacyUploadSecrets(secrets, environment, workingDirectory) {
-    try {
-        const arrPromises = secrets
-            .map((secret) => {
-            const command = `echo ${getSecret(secret)} | ${getNpxCmd()} wrangler secret put ${secret}`;
-            return environment ? command.concat(` --env ${environment}`) : command;
-        })
-            .map(async (command) => await execAsync(command, {
-            cwd: workingDirectory,
-            env: process.env,
-        }));
-        await Promise.all(arrPromises);
-    }
-    catch {
-        (0,core.setFailed)(`🚨 Error uploading secrets`);
-    }
+    const arrPromises = secrets
+        .map((secret) => {
+        const command = `echo ${getSecret(secret)} | ${packageManager.exec} wrangler secret put ${secret}`;
+        return environment ? command.concat(` --env ${environment}`) : command;
+    })
+        .map(async (command) => await execAsync(command, {
+        cwd: workingDirectory,
+        env: process.env,
+    }));
+    await Promise.all(arrPromises);
 }
 async function uploadSecrets() {
     const secrets = config["secrets"];
@@ -3006,8 +3044,8 @@ async function uploadSecrets() {
     if (!secrets.length) {
         return;
     }
+    startGroup("🔑 Uploading secrets...");
     try {
-        startGroup("🔑 Uploading Secrets");
         if (semverCompare(config["WRANGLER_VERSION"], "3.4.0"))
             return legacyUploadSecrets(secrets, environment, workingDirectory);
         const secretObj = secrets.reduce((acc, secret) => {
@@ -3017,7 +3055,7 @@ async function uploadSecrets() {
         const environmentSuffix = !environment.length
             ? ""
             : ` --env ${environment}`;
-        const secretCmd = `echo "${JSON.stringify(secretObj).replaceAll('"', '\\"')}" | ${getNpxCmd()} wrangler secret:bulk ${environmentSuffix}`;
+        const secretCmd = `echo "${JSON.stringify(secretObj).replaceAll('"', '\\"')}" | ${packageManager.exec} wrangler secret:bulk ${environmentSuffix}`;
         (0,external_node_child_process_namespaceObject.execSync)(secretCmd, {
             cwd: workingDirectory,
             env: process.env,
@@ -3025,8 +3063,9 @@ async function uploadSecrets() {
         });
         info(`✅ Uploaded secrets`);
     }
-    catch {
-        (0,core.setFailed)(`🚨 Error uploading secrets`);
+    catch (err) {
+        error(`❌ Upload failed`);
+        throw new Error(`Failed to upload secrets.`);
     }
     finally {
         endGroup();
@@ -3039,54 +3078,51 @@ function getVarArgs() {
             return `${envVar}:${process.env[envVar]}`;
         }
         else {
-            (0,core.setFailed)(`🚨 ${envVar} not found in variables.`);
+            throw new Error(`Value for var ${envVar} not found in environment.`);
         }
     });
     return envVarArray.length > 0 ? `--var ${envVarArray.join(" ").trim()}` : "";
 }
 async function wranglerCommands() {
     startGroup("🚀 Running Wrangler Commands");
-    const commands = config["COMMANDS"];
-    const environment = config["ENVIRONMENT"];
-    if (!commands.length) {
-        const wranglerVersion = config["WRANGLER_VERSION"];
-        const deployCommand = semverCompare("2.20.0", wranglerVersion)
-            ? "deploy"
-            : "publish";
-        commands.push(deployCommand);
-    }
-    const arrPromises = commands.map(async (command) => {
-        if (environment.length > 0 && !command.includes(`--env`)) {
-            command = command.concat(` --env ${environment}`);
+    try {
+        const commands = config["COMMANDS"];
+        const environment = config["ENVIRONMENT"];
+        if (!commands.length) {
+            const wranglerVersion = config["WRANGLER_VERSION"];
+            const deployCommand = semverCompare("2.20.0", wranglerVersion)
+                ? "deploy"
+                : "publish";
+            commands.push(deployCommand);
         }
-        const cmd = `${getNpxCmd()} wrangler ${command} ${(command.startsWith("deploy") || command.startsWith("publish")) &&
-            !command.includes(`--var`)
-            ? getVarArgs()
-            : ""}`.trim();
-        info(`🚀 Executing command: ${cmd}`);
-        return await runProcess(cmd, {
-            cwd: config["workingDirectory"],
-            env: process.env,
+        const arrPromises = commands.map(async (command) => {
+            if (environment.length > 0 && !command.includes(`--env`)) {
+                command = command.concat(` --env ${environment}`);
+            }
+            const cmd = `${packageManager.exec} wrangler ${command} ${(command.startsWith("deploy") || command.startsWith("publish")) &&
+                !command.includes(`--var`)
+                ? getVarArgs()
+                : ""}`.trim();
+            info(`🚀 Executing command: ${cmd}`);
+            return await runProcess(cmd, {
+                cwd: config["workingDirectory"],
+                env: process.env,
+            });
         });
-    });
-    await Promise.all(arrPromises).catch((result) => {
-        result.stdout && info(result.stdout.toString());
-        result.stderr && error(result.stderr.toString());
-        (0,core.setFailed)(`🚨 Command failed`);
-    });
-    endGroup();
+        await Promise.all(arrPromises);
+    }
+    finally {
+        endGroup();
+    }
 }
-main().catch(() => (0,core.setFailed)("🚨 Action failed"));
+main();
 
 
 })();
 
 var __webpack_exports__authenticationSetup = __webpack_exports__.kj;
-var __webpack_exports__checkWorkingDirectory = __webpack_exports__.ny;
 var __webpack_exports__execCommands = __webpack_exports__.P8;
-var __webpack_exports__getNpxCmd = __webpack_exports__.wJ;
 var __webpack_exports__installWrangler = __webpack_exports__.VH;
-var __webpack_exports__semverCompare = __webpack_exports__.Wp;
 var __webpack_exports__uploadSecrets = __webpack_exports__.cb;
 var __webpack_exports__wranglerCommands = __webpack_exports__.cj;
-export { __webpack_exports__authenticationSetup as authenticationSetup, __webpack_exports__checkWorkingDirectory as checkWorkingDirectory, __webpack_exports__execCommands as execCommands, __webpack_exports__getNpxCmd as getNpxCmd, __webpack_exports__installWrangler as installWrangler, __webpack_exports__semverCompare as semverCompare, __webpack_exports__uploadSecrets as uploadSecrets, __webpack_exports__wranglerCommands as wranglerCommands };
+export { __webpack_exports__authenticationSetup as authenticationSetup, __webpack_exports__execCommands as execCommands, __webpack_exports__installWrangler as installWrangler, __webpack_exports__uploadSecrets as uploadSecrets, __webpack_exports__wranglerCommands as wranglerCommands };