fix: update snapshot for error test

chore: bump dependencies

.changeset/weak-lobsters-march.md

@@ -0,0 +1,9 @@
+---
+"wrangler-action": patch
+---
+
+Fixes issues with semver comparison, where version parts were treated lexicographically instead of numerically.
+
+Bulk secret uploading was introduced in wrangler `3.4.0`, and this action tries to check if the version used is greater than `3.4.0`, and then if so, using the new bulk secret API which is faster. Due to a bug in the semver comparison, `3.19.0` was being considered less than `3.4.0`, and then using an older and slower method for uploading secrets.
+
+Now the semver comparison is fixed, the faster bulk method is used for uploading secrets when available.

.github/workflows/deploy.yml

@@ -34,6 +34,15 @@ jobs:
           accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
           command: deploy --dry-run
 
+      - name: Only build app w/ quiet enabled
+        uses: ./
+        with:
+          quiet: true
+          workingDirectory: "./test/base"
+          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          command: deploy --dry-run
+
       # START Setup and teardown of Worker Environment Tests
       - name: Environment support
         uses: ./
@@ -42,6 +51,7 @@ jobs:
           apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
           accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
           environment: dev
+          preCommands: npx wrangler deploy --env dev # https://github.com/cloudflare/wrangler-action/issues/162
           secrets: |
             SECRET1
             SECRET2
@@ -101,4 +111,51 @@ jobs:
           apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
           accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
           command: delete --name wrangler-action-test --force
-    # END Setup and teardown of Workers w/ Secrets Tests
+      # END Setup and teardown of Workers w/ Secrets Tests
+
+      - name: Support packageManager variable
+        uses: ./
+        with:
+          workingDirectory: "./test/empty"
+          packageManager: "npm"
+          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          command: deploy --dry-run
+
+      - name: Support unspecified packageManager with no lockfile
+        uses: ./
+        with:
+          workingDirectory: "./test/empty"
+          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          command: deploy --dry-run
+
+      - name: Support npm package manager
+        uses: ./
+        with:
+          workingDirectory: "./test/npm"
+          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          command: deploy --dry-run
+
+      - name: Install yarn
+        run: npm i -g yarn
+
+      - name: Support yarn package manager
+        uses: ./
+        with:
+          workingDirectory: "./test/yarn"
+          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          command: deploy --dry-run
+
+      - name: Install pnpm
+        run: npm i -g pnpm
+
+      - name: Support pnpm package manager
+        uses: ./
+        with:
+          workingDirectory: "./test/pnpm"
+          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          command: deploy --dry-run

.github/workflows/issues.yml

@@ -1,16 +1,17 @@
-name: Add issues to workers-sdk GH project
+name: Issue
 
 on:
   issues:
     types:
       - opened
+      - transferred
 
 jobs:
   add-to-project:
-    name: Add issue to project
+    name: Add issue to workers-sdk GH project
     runs-on: ubuntu-latest
     steps:
       - uses: actions/add-to-project@v0.5.0
         with:
           project-url: https://github.com/orgs/cloudflare/projects/1
-          github-token: ${{ secrets.GH_ACCESS_TOKEN }}
+          github-token: ${{ secrets.GH_ACCESS_TOKEN }}

.github/workflows/publish.yml

@@ -1,30 +0,0 @@
-name: Publish
-
-permissions:
-  contents: write
-
-on:
-  release:
-    types: [published, edited]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event.release.tag_name }}
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: "latest"
-          cache: "npm"
-
-      - name: Install modules and build
-        run: npm ci && npm run build
-
-      - uses: JasonEtco/build-and-tag-action@v2
-        env:
-          GITHUB_TOKEN: ${{ github.token }}

.github/workflows/pullrequests.yml

@@ -0,0 +1,10 @@
+name: Pull request
+
+on: pull_request
+
+jobs:
+  add-to-project:
+    name: Add PR to workers-sdk GH project
+    runs-on: ubuntu-latest
+    steps:
+      - run: curl -X POST https://devprod-status-bot.devprod.workers.dev/pr-project/wrangler-action/${{ github.event.number }}

.github/workflows/release.yml

@@ -20,6 +20,9 @@ jobs:
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          fetch-tags: true
 
       - name: Setup Node.js
         uses: actions/setup-node@v3
@@ -38,3 +41,15 @@ jobs:
           publish: npx changeset tag
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build action
+        if: steps.changesets.outputs.published == 'true'
+        run: npm run build
+
+      - name: Push dist-tags
+        if: steps.changesets.outputs.published == 'true'
+        uses: JasonEtco/build-and-tag-action@v2
+        with:
+          tag_name: v${{ fromJSON(steps.changesets.outputs.publishedPackages)[0].version }}
+        env:
+          GITHUB_TOKEN: ${{ github.token }}

.github/workflows/workerHealthCheck.cjs

@@ -8,9 +8,11 @@ function workerHealthCheck() {
 
 	const response = buffer.toString();
 
-	response.includes("OK")
-		? console.log(`Status: Worker is up! Secrets: ${response}`)
-		: console.log(`Worker is down!`);
+	if (response.includes("OK")) {
+		console.log(`Status: Worker is up! Response: ${response}`);
+	} else {
+		throw new Error(`Worker is down! Response: ${response}`);
+	}
 
 	return response;
 }

.prettierignore

@@ -0,0 +1 @@
+pnpm-lock.yaml

CHANGELOG.md

@@ -1,5 +1,58 @@
 # Changelog
 
+## 3.3.2
+
+### Patch Changes
+
+- [#171](https://github.com/cloudflare/wrangler-action/pull/171) [`76d614f`](https://github.com/cloudflare/wrangler-action/commit/76d614f400bd92237ed23c3df559f2c31b14a790) Thanks [@1000hz](https://github.com/1000hz)! - Fixed issues that caused the action to fail if any secret or var values contained shell metacharacters.
+
+- [#171](https://github.com/cloudflare/wrangler-action/pull/171) [`473d9cb`](https://github.com/cloudflare/wrangler-action/commit/473d9cbd296528b41c653af10062faba6540a7ab) Thanks [@1000hz](https://github.com/1000hz)! - Bumped `DEFAULT_WRANGLER_VERSION` to 3.13.2
+
+## 3.3.1
+
+### Patch Changes
+
+- [#193](https://github.com/cloudflare/wrangler-action/pull/193) [`a4509d5`](https://github.com/cloudflare/wrangler-action/commit/a4509d507c62dd7f49fba7df7d2db3997222393a) Thanks [@1000hz](https://github.com/1000hz)! - Fixed the package manager not being inferred based on lockfile when the `packageManager` input isn't set.
+
+## 3.3.0
+
+### Minor Changes
+
+- [#188](https://github.com/cloudflare/wrangler-action/pull/188) [`d9a0a00`](https://github.com/cloudflare/wrangler-action/commit/d9a0a00f8bc502ceea2a60e5af258416b35a85b9) Thanks [@simpleauthority](https://github.com/simpleauthority)! - Added support for Bun as a package manager
+
+## 3.2.1
+
+### Patch Changes
+
+- [#190](https://github.com/cloudflare/wrangler-action/pull/190) [`528687a`](https://github.com/cloudflare/wrangler-action/commit/528687aaf436f67565918533ffd15c250f39c47b) Thanks [@1000hz](https://github.com/1000hz)! - Fixed action failure when no `packageManager` specified and no lockfile is found. The action now falls back to using npm.
+
+## 3.2.0
+
+### Minor Changes
+
+- [#166](https://github.com/cloudflare/wrangler-action/pull/166) [`7d7b988`](https://github.com/cloudflare/wrangler-action/commit/7d7b98826e14e9ad422870a7263b7074b40bf16f) Thanks [@nix6839](https://github.com/nix6839)! - Support for package managers other than npm, such as pnpm and yarn.
+
+  fixes #156
+
+## 3.1.1
+
+### Patch Changes
+
+- [#161](https://github.com/cloudflare/wrangler-action/pull/161) [`e5251df`](https://github.com/cloudflare/wrangler-action/commit/e5251df52154e9ebc98edb02ee0598c7210dcf0f) Thanks [@1000hz](https://github.com/1000hz)! - Refactored error handling to stop execution when action fails. Previously, the action would continue executing to completion if one of the steps encountered an error. Fixes #160.
+
+## 3.1.0
+
+### Minor Changes
+
+- [#154](https://github.com/cloudflare/wrangler-action/pull/154) [`3f40637`](https://github.com/cloudflare/wrangler-action/commit/3f40637a1c48016d2101e412a7a06f1eb4b9c2fd) Thanks [@JacobMGEvans](https://github.com/JacobMGEvans)! - feat: Quiet mode
+  Some of the stderr, stdout, info & groupings can be a little noisy for some users and use cases.
+  This feature allows for a option to be passed 'quiet: true' this would significantly reduce the noise.
+
+  There will still be output that lets the user know Wrangler Installed and Wrangler Action completed successfully.
+  Any failure status will still be output to the user as well, to prevent silent failures.
+
+  resolves #142
+
 ## 3.0.2
 
 ### Patch Changes

CODEOWNERS

@@ -1 +1,3 @@
-* @cloudflare/wrangler
+* @cloudflare/wrangler
+
+CHANGELOG.md @cloudflare/wrangler-admins

README.md

@@ -1,12 +1,12 @@
 # Wrangler GitHub Action
 
-Easy-to-use GitHub Action to use [Wrangler](https://developers.cloudflare.com/workers/cli-wrangler/). Makes deploying Workers, Pages or modifying R2 easy to do.
+Easy-to-use GitHub Action to use [Wrangler](https://developers.cloudflare.com/workers/cli-wrangler/). Makes deploying Workers a breeze.
 
 ## Big Changes in v3
 
 - Wrangler v1 is no longer supported.
 - Global API key & Email Auth no longer supported
-- Action version syntax is newly supported. This means e.g. `uses: cloudflare/wrangler-action@v3` and `uses: cloudflare/wrangler-action@v3.x` are both now valid syntax. Previously supported syntax e.g. `uses: cloudflare/wrangler-action@3.x.x` continues to be supported.
+- Action version syntax is newly supported. This means e.g. `uses: cloudflare/wrangler-action@v3`, `uses: cloudflare/wrangler-action@v3.x`, and `uses: cloudflare/wrangler-action@v3.x.x` are all now valid syntax. Previously supported syntax e.g. `uses: cloudflare/wrangler-action@3.x.x` is no longer supported -- the prefix `v` is now necessary.
 
 [Refer to Changelog for more information](CHANGELOG.md).
 
@@ -29,25 +29,25 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Deploy
-        uses: cloudflare/wrangler-action@3.0.0
+        uses: cloudflare/wrangler-action@v3
         with:
-          apiToken: ${{ secrets.CF_API_TOKEN }}
+          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
 ```
 
 ## Authentication
 
 You'll need to configure Wrangler using GitHub's Secrets feature - go to "Settings -> Secrets" and add your Cloudflare API token (for help finding this, see the [Workers documentation](https://developers.cloudflare.com/workers/quickstart/#api-token)). Your API token is encrypted by GitHub, and the action won't print it into logs, so it should be safe!
 
-With your API token set as a secret for your repository, pass it to the action in the `with` block of your workflow. Below, I've set the secret name to `CF_API_TOKEN`:
+With your API token set as a secret for your repository, pass it to the action in the `with` block of your workflow. Below, I've set the secret name to `CLOUDFLARE_API_TOKEN`:
 
 ```yaml
 jobs:
   deploy:
     name: Deploy
     steps:
-      uses: cloudflare/wrangler-action@3.0.0
+      uses: cloudflare/wrangler-action@v3
       with:
-        apiToken: ${{ secrets.CF_API_TOKEN }}
+        apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
 ```
 
 ## Configuration
@@ -58,9 +58,9 @@ If you need to install a specific version of Wrangler to use for deployment, you
 jobs:
   deploy:
     steps:
-      uses: cloudflare/wrangler-action@3.0.0
+      uses: cloudflare/wrangler-action@v3
       with:
-        apiToken: ${{ secrets.CF_API_TOKEN }}
+        apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
         wranglerVersion: "2.20.0"
 ```
 
@@ -70,9 +70,9 @@ Optionally, you can also pass a `workingDirectory` key to the action. This will
 jobs:
   deploy:
     steps:
-      uses: cloudflare/wrangler-action@3.0.0
+      uses: cloudflare/wrangler-action@v3
       with:
-        apiToken: ${{ secrets.CF_API_TOKEN }}
+        apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
         workingDirectory: "subfoldername"
 ```
 
@@ -82,9 +82,9 @@ jobs:
 jobs:
   deploy:
     steps:
-      uses: cloudflare/wrangler-action@3.0.0
+      uses: cloudflare/wrangler-action@v3
       with:
-        apiToken: ${{ secrets.CF_API_TOKEN }}
+        apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
         secrets: |
           SECRET1
           SECRET2
@@ -99,9 +99,9 @@ If you need to run additional shell commands before or after your command, you c
 jobs:
   deploy:
     steps:
-      uses: cloudflare/wrangler-action@3.0.0
+      uses: cloudflare/wrangler-action@v3
       with:
-        apiToken: ${{ secrets.CF_API_TOKEN }}
+        apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
         preCommands: echo "*** pre command ***"
         postCommands: |
           echo "*** post commands ***"
@@ -115,9 +115,9 @@ You can use the `command` option to do specific actions such as running `wrangle
 jobs:
   deploy:
     steps:
-      uses: cloudflare/wrangler-action@3.0.0
+      uses: cloudflare/wrangler-action@v3
       with:
-        apiToken: ${{ secrets.CF_API_TOKEN }}
+        apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
         command: whoami
 ```
 
@@ -140,9 +140,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Deploy
-        uses: cloudflare/wrangler-action@3.0.0
+        uses: cloudflare/wrangler-action@v3
         with:
-          apiToken: ${{ secrets.CF_API_TOKEN }}
+          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
 ```
 
 Note that there are a number of possible events, like `push`, that can be used to trigger a workflow. For more details on the events available, refer to the [GitHub Actions documentation](https://help.github.com/en/articles/workflow-syntax-for-github-actions#on).
@@ -161,10 +161,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Deploy
-        uses: cloudflare/wrangler-action@3.0.0
+        uses: cloudflare/wrangler-action@v3
         with:
-          apiToken: ${{ secrets.CF_API_TOKEN }}
-          accountId: ${{ secrets.CF_ACCOUNT_ID }}
+          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
           command: pages deploy --project-name=example
 ```
 
@@ -184,9 +184,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Deploy app
-        uses: cloudflare/wrangler-action@3.0.0
+        uses: cloudflare/wrangler-action@v3
         with:
-          apiToken: ${{ secrets.CF_API_TOKEN }}
+          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
 ```
 
 If you need help defining the correct cron syntax, check out [crontab.guru](https://crontab.guru/), which provides a friendly user interface for validating your cron schedule.
@@ -210,9 +210,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Deploy app
-        uses: cloudflare/wrangler-action@3.0.0
+        uses: cloudflare/wrangler-action@v3
         with:
-          apiToken: ${{ secrets.CF_API_TOKEN }}
+          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
           command: deploy --env ${{ github.event.inputs.environment }}
 ```
 
@@ -238,8 +238,8 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Deploy app
-        uses: cloudflare/wrangler-action@3.0.0
+        uses: cloudflare/wrangler-action@v3
         with:
-          apiToken: ${{ secrets.CF_API_TOKEN }}
-          accountId: ${{ secrets.CF_ACCOUNT_ID }}
+          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
 ```

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:
@@ -13,7 +14,10 @@ inputs:
   accountId:
     description: "Your Cloudflare Account ID"
     required: false
-
+  quiet:
+    description: "Supresses output from Wrangler commands, defaults to `false`"
+    required: false
+    default: "false"
   environment:
     description: "The environment you'd like to deploy your Workers project to - must be defined in wrangler.toml"
   workingDirectory:
@@ -37,3 +41,6 @@ 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, the preferred package manager will be inferred based on the presence of a lockfile or fallback to using npm if no lockfile is found. Valid values are `npm` | `pnpm` | `yarn` | `bun`."
+    required: false

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wrangler-action",
-	"version": "3.0.2",
+	"version": "3.3.2",
 	"description": "GitHub Action to use [Wrangler](https://developers.cloudflare.com/workers/cli-wrangler/).",
 	"author": "wrangler@cloudflare.com",
 	"license": "MIT OR Apache-2.0",
@@ -25,20 +25,22 @@
 	"scripts": {
 		"build": "npx ncc build ./src/index.ts && mv ./dist/index.js ./dist/index.mjs",
 		"test": "vitest",
-		"format": "prettier --write . --ignore-path ./dist/**",
-		"check": "prettier --check . --ignore-path ./dist/**"
+		"format": "prettier --write .",
+		"check": "prettier --check ."
 	},
 	"dependencies": {
-		"@actions/core": "^1.10.0"
+		"@actions/core": "^1.10.1",
+		"@actions/exec": "^1.1.1"
 	},
 	"devDependencies": {
 		"@changesets/changelog-github": "^0.4.8",
 		"@changesets/cli": "^2.26.2",
-		"@cloudflare/workers-types": "^4.20230710.1",
-		"@types/node": "^20.4.2",
-		"@vercel/ncc": "^0.36.1",
-		"prettier": "^3.0.0",
-		"typescript": "^5.1.6",
-		"vitest": "^0.33.0"
+		"@cloudflare/workers-types": "^4.20231121.0",
+		"@types/node": "^20.10.4",
+		"@vercel/ncc": "^0.38.1",
+		"prettier": "^3.1.0",
+		"semver": "^7.5.4",
+		"typescript": "^5.3.3",
+		"vitest": "^1.0.3"
 	}
 }

src/exec.ts

@@ -0,0 +1,54 @@
+import {
+	exec as _childProcessExec,
+	type ExecException,
+} from "node:child_process";
+import { EOL } from "node:os";
+import { promisify } from "node:util";
+
+export { exec } from "@actions/exec";
+
+const childProcessExec = promisify(_childProcessExec);
+
+type ExecAsyncException = ExecException & {
+	stderr: string;
+	stdout: string;
+};
+
+function isExecAsyncException(err: unknown): err is ExecAsyncException {
+	return err instanceof Error && "code" in err && "stderr" in err;
+}
+
+export async function execShell(
+	command: string,
+	{
+		silent = false,
+		...options
+	}: Parameters<typeof childProcessExec>[1] & { silent?: boolean } = {},
+) {
+	if (!silent) {
+		process.stdout.write("[command]" + command + EOL);
+	}
+
+	try {
+		const promise = childProcessExec(command, {
+			...options,
+		});
+
+		const { child } = promise;
+
+		if (!silent) {
+			child.stdout?.on("data", (data: Buffer) => process.stdout.write(data));
+			child.stderr?.on("data", (data: Buffer) => process.stderr.write(data));
+		}
+
+		await promise;
+		return child.exitCode;
+	} catch (err: any) {
+		if (isExecAsyncException(err)) {
+			process.stderr.write(err.stderr);
+			throw new Error(`Process failed with exit code ${err.code}`);
+		}
+
+		throw err;
+	}
+}

src/index.test.ts

@@ -1,64 +0,0 @@
-import { expect, test, describe } from "vitest";
-import { checkWorkingDirectory, getNpxCmd, semverCompare } from "./index";
-import path from "node:path";
-
-const config = {
-	WRANGLER_VERSION: "mockVersion",
-	secrets: ["mockSercret", "mockSecretAgain"],
-	workingDirectory: "./mockWorkingDirectory",
-	CLOUDFLARE_API_TOKEN: "mockAPIToken",
-	CLOUDFLARE_ACCOUNT_ID: "mockAccountID",
-	ENVIRONMENT: undefined,
-	VARS: ["mockVar", "mockVarAgain"],
-	COMMANDS: ["mockCommand", "mockCommandAgain"],
-};
-
-test("getNpxCmd ", async () => {
-	process.env.RUNNER_OS = "Windows";
-	expect(getNpxCmd()).toBe("npx.cmd");
-
-	process.env.RUNNER_OS = "Mac";
-	expect(getNpxCmd()).toBe("npx");
-
-	process.env.RUNNER_OS = "Linux";
-	expect(getNpxCmd()).toBe("npx");
-
-	delete process.env.RUNNER_OS;
-});
-
-describe("semverCompare", () => {
-	test("should return false if the second argument is equal to the first argument", () => {
-		const isVersion1LessThanVersion2 = semverCompare("1.2.3", "1.2.3");
-
-		expect(isVersion1LessThanVersion2).toBe(false);
-	});
-
-	test("should return true if the first argument is less than the second argument", () => {
-		const isVersion1LessThanVersion2 = semverCompare("1.2.2", "1.2.3");
-
-		expect(isVersion1LessThanVersion2).toBe(true);
-	});
-});
-
-describe("checkWorkingDirectory", () => {
-	test("should return the normalized path if the directory exists", () => {
-		const normalizedPath = checkWorkingDirectory(".");
-		expect(normalizedPath).toBe(path.normalize("."));
-	});
-
-	test("should fail if the directory does not exist", () => {
-		try {
-			checkWorkingDirectory("/does/not/exist");
-		} catch (error) {
-			expect(error.message).toMatchInlineSnapshot();
-		}
-	});
-
-	test("should fail if an error occurs while checking/creating the directory", () => {
-		try {
-			checkWorkingDirectory("/does/not/exist");
-		} catch (error) {
-			expect(error.message).toMatchInlineSnapshot();
-		}
-	});
-});

src/index.ts

@@ -1,19 +1,18 @@
 import {
+	getBooleanInput,
 	getInput,
 	getMultilineInput,
-	info,
+	endGroup as originalEndGroup,
+	error as originalError,
+	info as originalInfo,
+	startGroup as originalStartGroup,
 	setFailed,
-	endGroup,
-	startGroup,
-	error,
 } from "@actions/core";
-import { execSync, exec } from "node:child_process";
-import { existsSync } from "node:fs";
-import * as path from "node:path";
-import * as util from "node:util";
-const execAsync = util.promisify(exec);
+import { exec, execShell } from "./exec";
+import { checkWorkingDirectory, semverCompare } from "./utils";
+import { getPackageManager } from "./packageManagers";
 
-const DEFAULT_WRANGLER_VERSION = "3.4.0";
+const DEFAULT_WRANGLER_VERSION = "3.13.2";
 
 /**
  * A configuration object that contains all the inputs & immutable state for the action.
@@ -27,86 +26,75 @@ const config = {
 	ENVIRONMENT: getInput("environment"),
 	VARS: getMultilineInput("vars"),
 	COMMANDS: getMultilineInput("command"),
+	QUIET_MODE: getBooleanInput("quiet"),
+	PACKAGE_MANAGER: getInput("packageManager"),
 } as const;
 
-function getNpxCmd() {
-	return process.env.RUNNER_OS === "Windows" ? "npx.cmd" : "npx";
+const packageManager = getPackageManager(config.PACKAGE_MANAGER, {
+	workingDirectory: config.workingDirectory,
+});
+
+function info(message: string, bypass?: boolean): void {
+	if (!config.QUIET_MODE || bypass) {
+		originalInfo(message);
+	}
 }
 
-/**
- * A helper function to compare two semver versions. If the second arg is greater than the first arg, it returns true.
- */
-function semverCompare(version1: string, version2: string) {
-	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;
-		}
+function error(message: string, bypass?: boolean): void {
+	if (!config.QUIET_MODE || bypass) {
+		originalError(message);
 	}
+}
 
-	return false;
+function startGroup(name: string): void {
+	if (!config.QUIET_MODE) {
+		originalStartGroup(name);
+	}
+}
+
+function endGroup(): void {
+	if (!config.QUIET_MODE) {
+		originalEndGroup();
+	}
 }
 
 async function main() {
-	installWrangler();
-	authenticationSetup();
-	await execCommands(getMultilineInput("preCommands"), "pre");
-	await uploadSecrets();
-	await wranglerCommands();
-	await execCommands(getMultilineInput("postCommands"), "post");
-}
-
-async function runProcess(
-	command: Parameters<typeof execAsync>[0],
-	options: Parameters<typeof execAsync>[1],
-) {
 	try {
-		const result = await execAsync(command, options);
-
-		result.stdout && info(result.stdout.toString());
-		result.stderr && error(result.stderr.toString());
-
-		return result;
-	} catch (err: any) {
-		err.stdout && info(err.stdout.toString());
-		err.stderr && error(err.stderr.toString());
-		throw err;
+		authenticationSetup();
+		await installWrangler();
+		await execCommands(getMultilineInput("preCommands"), "pre");
+		await uploadSecrets();
+		await wranglerCommands();
+		await execCommands(getMultilineInput("postCommands"), "post");
+		info("🏁 Wrangler Action completed", true);
+	} catch (err: unknown) {
+		err instanceof Error && error(err.message);
+		setFailed("🚨 Action failed");
 	}
 }
 
-function checkWorkingDirectory(workingDirectory = ".") {
-	try {
-		const normalizedPath = path.normalize(workingDirectory);
-		if (existsSync(normalizedPath)) {
-			return normalizedPath;
-		} else {
-			setFailed(`🚨 Directory ${workingDirectory} does not exist.`);
-		}
-	} catch (error) {
-		setFailed(
-			`🚨 While checking/creating directory ${workingDirectory} received ${error}`,
-		);
-	}
-}
-
-function installWrangler() {
+async function installWrangler() {
 	if (config["WRANGLER_VERSION"].startsWith("1")) {
-		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"]}`;
-	info(`Running command: ${command}`);
-	execSync(command, { cwd: config["workingDirectory"], env: process.env });
-	info(`✅ Wrangler installed`);
-	endGroup();
+	try {
+		await exec(
+			packageManager.install,
+			[`wrangler@${config["WRANGLER_VERSION"]}`],
+			{
+				cwd: config["workingDirectory"],
+				silent: config["QUIET_MODE"],
+			},
+		);
+
+		info(`✅ Wrangler installed`, true);
+	} finally {
+		endGroup();
+	}
 }
 
 function authenticationSetup() {
@@ -118,70 +106,68 @@ async function execCommands(commands: string[], cmdType: string) {
 	if (!commands.length) {
 		return;
 	}
+
 	startGroup(`🚀 Running ${cmdType}Commands`);
+	try {
+		for (const command of commands) {
+			const cmd = command.startsWith("wrangler")
+				? `${packageManager.exec} ${command}`
+				: command;
 
-	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,
-		});
-	});
-
-	await Promise.all(arrPromises).catch((result) => {
-		result.stdout && info(result.stdout.toString());
-		result.stderr && error(result.stderr.toString());
-		setFailed(`🚨 ${cmdType}Commands failed`);
-	});
-	endGroup();
+			await execShell(cmd, {
+				cwd: config["workingDirectory"],
+				silent: config["QUIET_MODE"],
+			});
+		}
+	} finally {
+		endGroup();
+	}
 }
 
-/**
- * A helper function to get the secret from the environment variables.
- */
 function getSecret(secret: string) {
 	if (!secret) {
-		setFailed("No secret provided");
+		throw new Error("Secret name cannot be blank.");
 	}
 
 	const value = process.env[secret];
 	if (!value) {
-		setFailed(`Secret ${secret} not found`);
+		throw new Error(`Value for secret ${secret} not found in environment.`);
 	}
 
 	return value;
 }
 
-async function legacyUploadSecrets(
+function getEnvVar(envVar: string) {
+	if (!envVar) {
+		throw new Error("Var name cannot be blank.");
+	}
+
+	const value = process.env[envVar];
+	if (!value) {
+		throw new Error(`Value for var ${envVar} not found in environment.`);
+	}
+
+	return value;
+}
+
+function legacyUploadSecrets(
 	secrets: string[],
 	environment?: string,
 	workingDirectory?: string,
 ) {
-	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 {
-		setFailed(`🚨 Error uploading secrets`);
-	}
+	return Promise.all(
+		secrets.map((secret) => {
+			const args = ["wrangler", "secret", "put", secret];
+			if (environment) {
+				args.push("--env", environment);
+			}
+			return exec(packageManager.exec, args, {
+				cwd: workingDirectory,
+				silent: config["QUIET_MODE"],
+				input: Buffer.from(getSecret(secret)),
+			});
+		}),
+	);
 }
 
 async function uploadSecrets() {
@@ -192,103 +178,86 @@ async function uploadSecrets() {
 	if (!secrets.length) {
 		return;
 	}
+
+	startGroup("🔑 Uploading secrets...");
+
 	try {
-		startGroup("🔑 Uploading Secrets");
-
-		if (semverCompare(config["WRANGLER_VERSION"], "3.4.0"))
+		if (semverCompare(config["WRANGLER_VERSION"], "3.4.0")) {
 			return legacyUploadSecrets(secrets, environment, workingDirectory);
+		}
 
-		const secretObj = secrets.reduce((acc: any, secret: string) => {
-			acc[secret] = getSecret(secret);
-			return acc;
-		}, {});
+		const args = ["wrangler", "secret:bulk"];
 
-		const environmentSuffix = !environment.length
-			? ""
-			: ` --env ${environment}`;
+		if (environment) {
+			args.push("--env", environment);
+		}
 
-		const secretCmd = `echo "${JSON.stringify(secretObj).replaceAll(
-			'"',
-			'\\"',
-		)}" | ${getNpxCmd()} wrangler secret:bulk ${environmentSuffix}`;
-
-		execSync(secretCmd, {
+		await exec(packageManager.exec, args, {
 			cwd: workingDirectory,
-			env: process.env,
-			stdio: "ignore",
+			silent: config["QUIET_MODE"],
+			input: Buffer.from(
+				JSON.stringify(
+					Object.fromEntries(
+						secrets.map((secret) => [secret, getSecret(secret)]),
+					),
+				),
+			),
 		});
-		info(`✅ Uploaded secrets`);
-	} catch {
-		setFailed(`🚨 Error uploading secrets`);
+	} catch (err) {
+		throw new Error(`Failed to upload secrets.`);
 	} finally {
 		endGroup();
 	}
 }
 
-function getVarArgs() {
-	const vars = config["VARS"];
-	const envVarArray = vars.map((envVar: string) => {
-		if (process.env[envVar] && process.env[envVar]?.length !== 0) {
-			return `${envVar}:${process.env[envVar]!}`;
-		} else {
-			setFailed(`🚨 ${envVar} not found in variables.`);
-		}
-	});
-
-	return envVarArray.length > 0 ? `--var ${envVarArray.join(" ").trim()}` : "";
-}
-
 async function wranglerCommands() {
 	startGroup("🚀 Running Wrangler Commands");
-	const commands = config["COMMANDS"];
-	const environment = config["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 arrPromises = commands.map(async (command) => {
-		if (environment.length > 0 && !command.includes(`--env`)) {
-			command = command.concat(` --env ${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();
+		for (let command of commands) {
+			const args = [];
 
-		info(`🚀 Executing command: ${cmd}`);
+			if (environment && !command.includes("--env")) {
+				args.push("--env", environment);
+			}
 
-		return await runProcess(cmd, {
-			cwd: config["workingDirectory"],
-			env: process.env,
-		});
-	});
+			if (
+				config["VARS"].length &&
+				(command.startsWith("deploy") || command.startsWith("publish")) &&
+				!command.includes("--var")
+			) {
+				args.push("--var");
+				for (const v of config["VARS"]) {
+					args.push(`${v}:${getEnvVar(v)}`);
+				}
+			}
 
-	await Promise.all(arrPromises).catch((result) => {
-		result.stdout && info(result.stdout.toString());
-		result.stderr && error(result.stderr.toString());
-		setFailed(`🚨 Command failed`);
-	});
-
-	endGroup();
+			await exec(`${packageManager.exec} wrangler ${command}`, args, {
+				cwd: config["workingDirectory"],
+				silent: config["QUIET_MODE"],
+			});
+		}
+	} finally {
+		endGroup();
+	}
 }
 
-main().catch(() => setFailed("🚨 Action failed"));
+main();
 
 export {
-	wranglerCommands,
-	execCommands,
-	uploadSecrets,
 	authenticationSetup,
+	execCommands,
 	installWrangler,
-	checkWorkingDirectory,
-	getNpxCmd,
-	semverCompare,
+	uploadSecrets,
+	wranglerCommands,
 };

src/packageManagers.test.ts

@@ -0,0 +1,94 @@
+import { describe, expect, test } from "vitest";
+import { getPackageManager } from "./packageManagers";
+
+describe("getPackageManager", () => {
+	test("should use provided value instead of inferring from lockfile", () => {
+		expect(getPackageManager("npm", { workingDirectory: "test/npm" }))
+			.toMatchInlineSnapshot(`
+				{
+				  "exec": "npx",
+				  "install": "npm i",
+				}
+			`);
+
+		expect(getPackageManager("yarn", { workingDirectory: "test/npm" }))
+			.toMatchInlineSnapshot(`
+			{
+			  "exec": "yarn",
+			  "install": "yarn add",
+			}
+		`);
+
+		expect(getPackageManager("pnpm", { workingDirectory: "test/npm" }))
+			.toMatchInlineSnapshot(`
+				{
+				  "exec": "pnpm exec",
+				  "install": "pnpm add",
+				}
+			`);
+
+		expect(getPackageManager("bun", { workingDirectory: "test/bun" }))
+			.toMatchInlineSnapshot(`
+				{
+				  "exec": "bunx",
+				  "install": "bun i",
+				}
+			`);
+	});
+
+	test("should use npm if no value provided and package-lock.json exists", () => {
+		expect(getPackageManager("", { workingDirectory: "test/npm" }))
+			.toMatchInlineSnapshot(`
+			{
+			  "exec": "npx",
+			  "install": "npm i",
+			}
+		`);
+	});
+
+	test("should use yarn if no value provided and yarn.lock exists", () => {
+		expect(getPackageManager("", { workingDirectory: "test/yarn" }))
+			.toMatchInlineSnapshot(`
+			{
+			  "exec": "yarn",
+			  "install": "yarn add",
+			}
+		`);
+	});
+
+	test("should use pnpm if no value provided and pnpm-lock.yaml exists", () => {
+		expect(getPackageManager("", { workingDirectory: "test/pnpm" }))
+			.toMatchInlineSnapshot(`
+			{
+			  "exec": "pnpm exec",
+			  "install": "pnpm add",
+			}
+		`);
+	});
+
+	test("should use bun if no value provided and bun.lockb exists", () => {
+		expect(getPackageManager("", { workingDirectory: "test/bun" }))
+			.toMatchInlineSnapshot(`
+			{
+			  "exec": "bunx",
+			  "install": "bun i",
+			}
+			`);
+	});
+
+	test("should use npm if no value provided and no lockfile is present", () => {
+		expect(getPackageManager("", { workingDirectory: "test/empty" }))
+			.toMatchInlineSnapshot(`
+			{
+			  "exec": "npx",
+			  "install": "npm i",
+			}
+		`);
+	});
+
+	test("should throw if an invalid value is provided", () => {
+		expect(() =>
+			getPackageManager("cargo", { workingDirectory: "test/npm" }),
+		).toThrowError();
+	});
+});

src/packageManagers.ts

@@ -0,0 +1,68 @@
+import { existsSync } from "node:fs";
+import * as path from "node:path";
+
+interface PackageManager {
+	install: string;
+	exec: string;
+}
+
+const PACKAGE_MANAGERS = {
+	npm: {
+		install: "npm i",
+		exec: "npx",
+	},
+	yarn: {
+		install: "yarn add",
+		exec: "yarn",
+	},
+	pnpm: {
+		install: "pnpm add",
+		exec: "pnpm exec",
+	},
+	bun: {
+		install: "bun i",
+		exec: "bunx",
+	},
+} as const satisfies Readonly<Record<string, PackageManager>>;
+
+type PackageManagerValue = keyof typeof PACKAGE_MANAGERS;
+
+function detectPackageManager(
+	workingDirectory = ".",
+): PackageManagerValue | null {
+	if (existsSync(path.join(workingDirectory, "package-lock.json"))) {
+		return "npm";
+	}
+	if (existsSync(path.join(workingDirectory, "yarn.lock"))) {
+		return "yarn";
+	}
+	if (existsSync(path.join(workingDirectory, "pnpm-lock.yaml"))) {
+		return "pnpm";
+	}
+	if (existsSync(path.join(workingDirectory, "bun.lockb"))) {
+		return "bun";
+	}
+	return null;
+}
+
+function assertValidPackageManagerValue(
+	name: string,
+): asserts name is PackageManagerValue | "" {
+	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(", ")}]`,
+		);
+	}
+}
+
+export function getPackageManager(
+	name: string,
+	{ workingDirectory = "." }: { workingDirectory?: string } = {},
+) {
+	assertValidPackageManagerValue(name);
+
+	return PACKAGE_MANAGERS[
+		name || detectPackageManager(workingDirectory) || "npm"
+	];
+}

src/utils.test.ts

@@ -0,0 +1,55 @@
+import path from "node:path";
+import { describe, expect, test } from "vitest";
+import { checkWorkingDirectory, semverCompare } from "./utils";
+
+describe("semverCompare", () => {
+	test("should return false if the second argument is equal to the first argument", () => {
+		const isVersion1LessThanVersion2 = semverCompare("1.2.3", "1.2.3");
+
+		expect(isVersion1LessThanVersion2).toBe(false);
+	});
+
+	test("should return true if the first argument is less than the second argument", () => {
+		const isVersion1LessThanVersion2 = semverCompare("1.2.2", "1.2.3");
+
+		expect(isVersion1LessThanVersion2).toBe(true);
+	});
+});
+
+describe("checkWorkingDirectory", () => {
+	test("should return the normalized path if the directory exists", () => {
+		const normalizedPath = checkWorkingDirectory(".");
+		expect(normalizedPath).toBe(path.normalize("."));
+	});
+
+	test("should fail if the directory does not exist", () => {
+		expect(() =>
+			checkWorkingDirectory("/does/not/exist"),
+		).toThrowErrorMatchingInlineSnapshot(
+			`[Error: Directory /does/not/exist does not exist.]`,
+		);
+	});
+});
+
+describe("semverCompare", () => {
+	test.each([
+		["1.2.3", "1.2.3", false],
+		["1.2.2", "1.2.3", true],
+		["2.0.0", "3.0.0", true],
+		["3.1.0", "3.1.1", true],
+		["3.1.0", "3.5.0", true],
+		["3.1.0", "3.10.0", true],
+		["3.1.0", "3.15.0", true],
+		["3.10.0", "3.1.0", false],
+		["3.20.0", "3.2.0", false],
+		["3.1.0", "latest", true],
+		["4.0.0", "latest", true],
+	])(
+		"should semver compare %s vs %s correctly, expecting %s",
+		(version1, version2, expected) => {
+			const isVersion1LessThanVersion2 = semverCompare(version1, version2);
+
+			expect(isVersion1LessThanVersion2).toBe(expected);
+		},
+	);
+});

src/utils.ts

@@ -0,0 +1,21 @@
+import { existsSync } from "node:fs";
+import * as path from "node:path";
+import semverGt from "semver/functions/gt";
+
+/**
+ * A helper function to compare two semver versions. If the second arg is greater than the first arg, it returns true.
+ */
+export function semverCompare(version1: string, version2: string) {
+	if (version2 === "latest") return true;
+
+	return semverGt(version2, version1);
+}
+
+export function checkWorkingDirectory(workingDirectory = ".") {
+	const normalizedPath = path.normalize(workingDirectory);
+	if (existsSync(normalizedPath)) {
+		return normalizedPath;
+	} else {
+		throw new Error(`Directory ${workingDirectory} does not exist.`);
+	}
+}

test/base/package-lock.json

@@ -0,0 +1,10 @@
+{
+	"name": "wrangler-action-test",
+	"lockfileVersion": 3,
+	"requires": true,
+	"packages": {
+		"": {
+			"name": "wrangler-action-test"
+		}
+	}
+}

test/base/package.json

@@ -1,3 +1,5 @@
 {
-	"name": "wrangler-action-test"
+	"name": "wrangler-action-test",
+	"license": "MIT",
+	"private": true
 }

test/bun/index.ts

@@ -0,0 +1,26 @@
+type Env = {
+	SECRET1?: string;
+	SECRET2?: string;
+};
+
+export default {
+	fetch(request: Request, env: Env) {
+		const url = new URL(request.url);
+
+		if (url.pathname === "/secret-health-check") {
+			const { SECRET1, SECRET2 } = env;
+
+			if (SECRET1 !== "SECRET_1_VALUE" || SECRET2 !== "SECRET_2_VALUE") {
+				throw new Error("SECRET1 or SECRET2 is not defined");
+			}
+
+			return new Response("OK");
+		}
+
+		// @ts-expect-error
+		return Response.json({
+			...request,
+			headers: Object.fromEntries(request.headers),
+		});
+	},
+};

test/bun/package.json

@@ -0,0 +1,5 @@
+{
+	"name": "wrangler-action-bun-test",
+	"license": "MIT",
+	"private": true
+}

test/bun/wrangler.toml

@@ -0,0 +1,4 @@
+name = "wrangler-action-test"
+main = "./index.ts"
+compatibility_date = "2023-07-07"
+workers_dev = true

test/empty/index.ts

@@ -0,0 +1 @@
+export default {};

test/empty/package.json

@@ -0,0 +1,5 @@
+{
+	"name": "wrangler-action-detect-package-manager-test",
+	"license": "MIT",
+	"private": true
+}

test/empty/wrangler.toml

@@ -0,0 +1,4 @@
+name = "wrangler-action-test"
+main = "./index.ts"
+compatibility_date = "2023-07-07"
+workers_dev = true

test/environment/package-lock.json

@@ -0,0 +1,10 @@
+{
+	"name": "wrangler-action-environment-test",
+	"lockfileVersion": 3,
+	"requires": true,
+	"packages": {
+		"": {
+			"name": "wrangler-action-environment-test"
+		}
+	}
+}

test/environment/package.json

@@ -1,3 +1,5 @@
 {
-	"name": "wrangler-action-environment-test"
+	"name": "wrangler-action-environment-test",
+	"license": "MIT",
+	"private": true
 }

test/npm/index.ts

@@ -0,0 +1,26 @@
+type Env = {
+	SECRET1?: string;
+	SECRET2?: string;
+};
+
+export default {
+	fetch(request: Request, env: Env) {
+		const url = new URL(request.url);
+
+		if (url.pathname === "/secret-health-check") {
+			const { SECRET1, SECRET2 } = env;
+
+			if (SECRET1 !== "SECRET_1_VALUE" || SECRET2 !== "SECRET_2_VALUE") {
+				throw new Error("SECRET1 or SECRET2 is not defined");
+			}
+
+			return new Response("OK");
+		}
+
+		// @ts-expect-error
+		return Response.json({
+			...request,
+			headers: Object.fromEntries(request.headers),
+		});
+	},
+};

test/npm/package-lock.json

@@ -0,0 +1,10 @@
+{
+	"name": "wrangler-action-npm-test",
+	"lockfileVersion": 3,
+	"requires": true,
+	"packages": {
+		"": {
+			"name": "wrangler-action-npm-test"
+		}
+	}
+}

test/npm/package.json

@@ -0,0 +1,3 @@
+{
+	"name": "wrangler-action-npm-test"
+}

test/npm/wrangler.toml

@@ -0,0 +1,4 @@
+name = "wrangler-action-test"
+main = "./index.ts"
+compatibility_date = "2023-07-07"
+workers_dev = true

test/pnpm/index.ts

@@ -0,0 +1,26 @@
+type Env = {
+	SECRET1?: string;
+	SECRET2?: string;
+};
+
+export default {
+	fetch(request: Request, env: Env) {
+		const url = new URL(request.url);
+
+		if (url.pathname === "/secret-health-check") {
+			const { SECRET1, SECRET2 } = env;
+
+			if (SECRET1 !== "SECRET_1_VALUE" || SECRET2 !== "SECRET_2_VALUE") {
+				throw new Error("SECRET1 or SECRET2 is not defined");
+			}
+
+			return new Response("OK");
+		}
+
+		// @ts-expect-error
+		return Response.json({
+			...request,
+			headers: Object.fromEntries(request.headers),
+		});
+	},
+};

test/pnpm/package.json

@@ -0,0 +1,5 @@
+{
+	"name": "wrangler-action-pnpm-test",
+	"license": "MIT",
+	"private": true
+}

test/pnpm/pnpm-lock.yaml

@@ -0,0 +1,5 @@
+lockfileVersion: '6.0'
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false

test/pnpm/wrangler.toml

@@ -0,0 +1,4 @@
+name = "wrangler-action-test"
+main = "./index.ts"
+compatibility_date = "2023-07-07"
+workers_dev = true

test/yarn/index.ts

@@ -0,0 +1,26 @@
+type Env = {
+	SECRET1?: string;
+	SECRET2?: string;
+};
+
+export default {
+	fetch(request: Request, env: Env) {
+		const url = new URL(request.url);
+
+		if (url.pathname === "/secret-health-check") {
+			const { SECRET1, SECRET2 } = env;
+
+			if (SECRET1 !== "SECRET_1_VALUE" || SECRET2 !== "SECRET_2_VALUE") {
+				throw new Error("SECRET1 or SECRET2 is not defined");
+			}
+
+			return new Response("OK");
+		}
+
+		// @ts-expect-error
+		return Response.json({
+			...request,
+			headers: Object.fromEntries(request.headers),
+		});
+	},
+};

test/yarn/package.json

@@ -0,0 +1,5 @@
+{
+	"name": "wrangler-action-yarn-test",
+	"license": "MIT",
+	"private": true
+}

test/yarn/wrangler.toml

@@ -0,0 +1,4 @@
+name = "wrangler-action-test"
+main = "./index.ts"
+compatibility_date = "2023-07-07"
+workers_dev = true

test/yarn/yarn.lock

@@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+

tsconfig.json

@@ -9,12 +9,12 @@
 		"isolatedModules": true,
 		"target": "ESNext",
 		"module": "ESNext",
-		"moduleResolution": "NodeNext",
+		"moduleResolution": "Bundler",
 		"rootDir": "./src",
 		"outDir": "./dist",
 		"lib": ["ESNext"],
 		"types": ["node", "@cloudflare/workers-types"]
 	},
 	"exclude": ["node_modules", "**/*.test.ts"],
-	"include": ["src/index.ts"]
+	"include": ["src"]
 }