Add wangler files in fixtures

Fix #156

.changeset/README.md

@@ -0,0 +1,8 @@
+# Changesets
+
+Hello and welcome! This folder has been automatically generated by `@changesets/cli`, a build tool that works
+with multi-package repos, or single-package repos to help you version and publish your code. You can
+find the full documentation for it [in our repository](https://github.com/changesets/changesets)
+
+We have a quick list of common questions to get you started engaging with this project in
+[our documentation](https://github.com/changesets/changesets/blob/main/docs/common-questions.md)

.changeset/config.json

@@ -0,0 +1,13 @@
+{
+	"$schema": "https://unpkg.com/@changesets/config@2.3.1/schema.json",
+	"changelog": [
+		"@changesets/changelog-github",
+		{ "repo": "cloudflare/wrangler-action" }
+	],
+	"commit": false,
+	"linked": [],
+	"access": "public",
+	"baseBranch": "main",
+	"updateInternalDependencies": "patch",
+	"ignore": []
+}

.changeset/two-rocks-hope.md

@@ -0,0 +1,7 @@
+---
+"wrangler-action": minor
+---
+
+Support for package managers other than npm, such as pnpm and yarn.
+
+fixes #156

.github/workflows/deploy.yml

@@ -1,91 +1,153 @@
-on: push
+name: Wrangler Action Self Testing
+on:
+  pull_request:
+    branches:
+      - main
 
 jobs:
-  lint:
+  wrangler_action_self_testing:
     runs-on: ubuntu-latest
-    name: Lint
     steps:
-    - uses: actions/checkout@v2
-    - name: Lint shell script
-      uses: azohra/shell-linter@v0.3.0
-      with:
-        path: "entrypoint.sh"
-  build-only:
-    runs-on: ubuntu-latest
-    name: Only build the app
-    steps:
-      - uses: actions/checkout@v2
-      - name: Build app
+      - name: Checkout Repo
+        uses: actions/checkout@v3
+
+      - 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
+
+      - name: Unit Tests
+        run: npm run test
+
+      - name: Check Formatting
+        run: npm run check
+
+      - name: Only build app
         uses: ./
         with:
+          workingDirectory: "./test/base"
           apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-          workingDirectory: "test"
-          publish: false
+          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: ./
+        with:
+          workingDirectory: "./test/environment"
+          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
-          preCommands: echo "*** pre commands ***"
-          postCommands: |
-            echo "*** post commands ***"
-            wrangler build
-            echo "******"
         env:
           SECRET1: ${{ secrets.SECRET1 }}
           SECRET2: ${{ secrets.SECRET2 }}
-  publish:
-    runs-on: ubuntu-latest
-    name: Publish app
-    steps:
-    - uses: actions/checkout@v2
-    - name: Publish app
-      uses: ./
-      with:
-        apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-        environment: "production"
-        workingDirectory: 'test'
-  publish_legacy_credentials:
-    runs-on: ubuntu-latest
-    name: Publish app with legacy credentials
-    steps:
-    - uses: actions/checkout@v2
-    - name: Publish app
-      uses: ./
-      with:
-        apiKey: ${{ secrets.CLOUDFLARE_API_KEY }}
-        email: ${{ secrets.CLOUDFLARE_EMAIL }}
-        environment: "production"
-        workingDirectory: 'test'
-  publish_hardcoded_wrangler_version:
-    runs-on: ubuntu-latest
-    name: Publish app with hardcoded Wrangler version
-    steps:
-    - uses: actions/checkout@v2
-    - name: Publish app
-      uses: ./
-      with:
-        apiKey: ${{ secrets.CLOUDFLARE_API_KEY }}
-        email: ${{ secrets.CLOUDFLARE_EMAIL }}
-        environment: "production"
-        wranglerVersion: '1.5.0'
-        workingDirectory: 'test'
-  publish_secrets:
-    runs-on: ubuntu-latest
-    name: Publish app with secrets
-    steps:
-      - uses: actions/checkout@v2
-      - name: Publish app
+
+      - name: Clean up Deployed Environment Worker
         uses: ./
         with:
+          workingDirectory: "./test/base"
           apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-          environment: "production"
-          workingDirectory: "test"
+          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          command: delete --name wrangler-action-dev-environment-test --force
+
+      # END Setup and teardown of Worker Environment Tests
+      # START Setup and teardown of Workers w/ Secrets Tests
+      - name: Deploy app secrets w/ hardcoded Wrangler v2
+        uses: ./
+        with:
+          wranglerVersion: "2.20.0"
+          workingDirectory: "./test/base"
+          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
           secrets: |
             SECRET1
             SECRET2
-          preCommands: echo "*** pre command ***"
-          postCommands: |
-            echo "*** post commands ***"
-            echo "******"
         env:
           SECRET1: ${{ secrets.SECRET1 }}
-          SECRET2: ${{ secrets.SECRET2 }}
+          SECRET2: ${{ secrets.SECRET2 }}
+
+      - name: Health Check Deployed Worker
+        run: node .github/workflows/workerHealthCheck.cjs
+        shell: bash
+
+      - name: Deploy app secrets w/ default version
+        uses: ./
+        with:
+          workingDirectory: "./test/base"
+          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          secrets: |
+            SECRET1
+            SECRET2
+        env:
+          SECRET1: ${{ secrets.SECRET1 }}
+          SECRET2: ${{ secrets.SECRET2 }}
+
+      - name: Health Check Deployed Worker
+        run: node .github/workflows/workerHealthCheck.cjs
+        shell: bash
+
+      - name: Clean Up Deployed Workers
+        uses: ./
+        with:
+          workingDirectory: "./test/base"
+          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
+
+      - 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 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

@@ -0,0 +1,16 @@
+name: Add issues to workers-sdk GH project
+
+on:
+  issues:
+    types:
+      - opened
+
+jobs:
+  add-to-project:
+    name: Add issue to 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/workflows/release.yml

@@ -0,0 +1,52 @@
+name: Release
+
+on:
+  push:
+    branches:
+      - main
+
+concurrency: ${{ github.workflow }}-${{ github.ref }}
+
+jobs:
+  release:
+    if: ${{ github.repository_owner == 'cloudflare' }}
+    name: Release
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: write
+      pull-requests: write
+      issues: read
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v3
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: "latest"
+          cache: "npm"
+
+      - name: Install modules
+        run: npm ci
+
+      - name: Create Version PR
+        id: changesets
+        uses: changesets/action@v1
+        with:
+          createGithubReleases: true
+          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

@@ -0,0 +1,20 @@
+const { execSync } = require("child_process");
+
+function workerHealthCheck() {
+	const url =
+		"https://wrangler-action-test.devprod-testing7928.workers.dev/secret-health-check";
+
+	const buffer = execSync(`curl ${url}`);
+
+	const response = buffer.toString();
+
+	if (response.includes("OK")) {
+		console.log(`Status: Worker is up! Response: ${response}`);
+	} else {
+		throw new Error(`Worker is down! Response: ${response}`);
+	}
+
+	return response;
+}
+
+workerHealthCheck();

.gitignore

@@ -0,0 +1,95 @@
+dist
+.idea
+.vscode
+
+### macOS ###
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### Node ###
+node_modules
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+.pnpm-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+
+# Moved from ./templates for ignoring all locks in templates
+templates/**/*-lock.*
+templates/**/*.lock
+
+# Snowpack dependency directory (https://snowpack.dev/)
+web_modules/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional stylelint cache
+.stylelintcache
+

.prettierignore

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

.prettierrc

@@ -0,0 +1,6 @@
+{
+	"printWidth": 80,
+	"singleQuote": false,
+	"semi": true,
+	"useTabs": true
+}

CHANGELOG.md

@@ -1,23 +1,93 @@
-# 2.0.0 (Breaking update)
+# Changelog
 
-## Additions
+## 3.1.1
 
-* New `command` input
-    * This allows you to specify the Wrangler command you would like to run.
+### 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
+
+- [#147](https://github.com/cloudflare/wrangler-action/pull/147) [`58f274b`](https://github.com/cloudflare/wrangler-action/commit/58f274b9f70867447519c6fa983c813e2b167b85) Thanks [@JacobMGEvans](https://github.com/JacobMGEvans)! - Added more error logging when a command fails to execute
+  Previously, we prevented any error logs from propagating too far to prevent leaking of any potentially sensitive information. However, this made it difficult for developers to debug their code.
+
+  In this release, we have updated our error handling to allow for more error messaging from pre/post and custom commands. We still discourage the use of these commands for secrets or other sensitive information, but we believe this change will make it easier for developers to debug their code.
+
+  Relates to #137
+
+- [#147](https://github.com/cloudflare/wrangler-action/pull/147) [`58f274b`](https://github.com/cloudflare/wrangler-action/commit/58f274b9f70867447519c6fa983c813e2b167b85) Thanks [@JacobMGEvans](https://github.com/JacobMGEvans)! - Adding Changesets
+
+- [Version 3.0.0](#version-300)
+- [Version 2.0.0](#version-200)
+
+## Version 3.0.0 (Breaking update)
+
+### Additions
+
+- **Rewritten Wrangler Action in TypeScript.**
+- Bulk secrets API utilization from Wrangler.
+- Added testing for improved reliability.
+- Implemented multiline support for the `command` input to allow running multiple Wrangler commands.
+- Now using Node for the Action engine/runner.
+- Open discussions with the community on all changes through GitHub Discussions and monitored Issues.
+
+### Removals
+
+- Removed Docker as a dependency.
+- Dropped support for Wrangler v1.
+
+### Changes
+
+- Fixed CI/CD issues.
+
+### Breaking changes
+
+- Wrangler v1 is no longer supported.
+  - Please update to the latest version of Wrangler.
+- Updated default version of Wrangler to v3.4.0
+
+### Additional Notes
+
+- Major Version Default: [DEVX-632](https://jira.cfdata.org/browse/DEVX-632)
+- Rewrite Project Tickets: [DEVX-804](https://jira.cfdata.org/browse/DEVX-804), [DEVX-802](https://jira.cfdata.org/browse/DEVX-802), [DEVX-800](https://jira.cfdata.org/browse/DEVX-800), [DEVX-632](https://jira.cfdata.org/browse/DEVX-632)
+
+---
+
+## Version 2.0.0 (Breaking update)
+
+### Additions
+
+- New `command` input
+  - This allows you to specify the Wrangler command you would like to run.
     For example, if you want to publish the production version of your Worker you may run `publish --env=production`.
-    * This opens up other possibilities too like publishing a Pages project: `pages publish <directory> --project-name=<name>`.
-* New `accountId` input
-  * This allows you to specify your account ID.
+  - This opens up other possibilities too like publishing a Pages project: `pages publish <directory> --project-name=<name>`.
+- New `accountId` input
+  - This allows you to specify your account ID.
 
-## Removals
+### Removals
 
-* Removed `publish` input (refer to [Breaking changes](#breaking-changes)).
+- Removed `publish` input (refer to [Breaking changes](#breaking-changes)).
 
-## Changes
+### Changes
 
 -- no changes --
 
-## __Breaking changes__
+### Breaking changes
 
-* `publish` has been removed.
-  * You should instead do `command: publish`.
+- `publish` has been removed.
+  - You should instead do `command:

CODEOWNERS

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

Dockerfile

@@ -1,7 +0,0 @@
-FROM node:16
-ENV XDG_CONFIG_HOME /github/workspace
-ENV WRANGLER_HOME /github/workspace
-
-COPY entrypoint.sh /entrypoint.sh
-
-ENTRYPOINT ["/entrypoint.sh"]

README.md

@@ -1,12 +1,18 @@
 # 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`, `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).
 
 ## Usage
 
-Add `wrangler-action` to the workflow for your Workers/Pages application. The below example will publish a Worker on a `git push` to the `main` branch:
+Add `wrangler-action` to the workflow for your Workers/Pages application. The below example will deploy a Worker on a `git push` to the `main` branch:
 
 ```yaml
 name: Deploy
@@ -21,9 +27,9 @@ jobs:
     runs-on: ubuntu-latest
     name: Deploy
     steps:
-      - uses: actions/checkout@v2
-      - name: Publish
-        uses: cloudflare/wrangler-action@2.0.0
+      - uses: actions/checkout@v3
+      - name: Deploy
+        uses: cloudflare/wrangler-action@v3
         with:
           apiToken: ${{ secrets.CF_API_TOKEN }}
 ```
@@ -39,36 +45,23 @@ jobs:
   deploy:
     name: Deploy
     steps:
-      uses: cloudflare/wrangler-action@2.0.0
+      uses: cloudflare/wrangler-action@v3
       with:
         apiToken: ${{ secrets.CF_API_TOKEN }}
 ```
 
-`wrangler-action` also supports using your [global API key and email](https://developers.cloudflare.com/workers/quickstart/#global-api-key) as an authentication method, although API tokens are preferred. Pass in `apiKey` and `email` to the GitHub Action to use this method:
-
-```yaml
-jobs:
-  deploy:
-    name: Deploy
-    steps:
-      uses: cloudflare/wrangler-action@2.0.0
-      with:
-        apiKey: ${{ secrets.CF_API_KEY }}
-        email: ${{ secrets.CF_EMAIL }}
-```
-
 ## Configuration
 
-If you need to install a specific version of Wrangler to use for deployment, you can also pass the input `wranglerVersion` to install a specific version of Wrangler from NPM. This should be a [SemVer](https://semver.org/)-style version number, such as `1.6.0`:
+If you need to install a specific version of Wrangler to use for deployment, you can also pass the input `wranglerVersion` to install a specific version of Wrangler from NPM. This should be a [SemVer](https://semver.org/)-style version number, such as `2.20.0`:
 
 ```yaml
 jobs:
   deploy:
     steps:
-      uses: cloudflare/wrangler-action@2.0.0
+      uses: cloudflare/wrangler-action@v3
       with:
         apiToken: ${{ secrets.CF_API_TOKEN }}
-        wranglerVersion: '1.6.0'
+        wranglerVersion: "2.20.0"
 ```
 
 Optionally, you can also pass a `workingDirectory` key to the action. This will allow you to specify a subdirectory of the repo to run the Wrangler command from.
@@ -77,36 +70,36 @@ Optionally, you can also pass a `workingDirectory` key to the action. This will
 jobs:
   deploy:
     steps:
-      uses: cloudflare/wrangler-action@2.0.0
+      uses: cloudflare/wrangler-action@v3
       with:
         apiToken: ${{ secrets.CF_API_TOKEN }}
-        workingDirectory: 'subfoldername'
+        workingDirectory: "subfoldername"
 ```
 
-[Worker secrets](https://developers.cloudflare.com/workers/tooling/wrangler/secrets/) can be optionally passed as a new line deliminated string of names in `secrets`.  Each secret name must match an environment variable name specified in the `env` attribute.  Creates or replaces the value for the Worker secret using the `wrangler secret put` command.
+[Worker secrets](https://developers.cloudflare.com/workers/tooling/wrangler/secrets/) can optionally be passed in via `secrets` as a string of names separated by newlines. Each secret name must match the name of an environment variable specified in the `env` field. This creates or replaces the value for the Worker secret using the `wrangler secret put` command.
 
 ```yaml
 jobs:
   deploy:
     steps:
-      uses: cloudflare/wrangler-action@2.0.0
+      uses: cloudflare/wrangler-action@v3
       with:
         apiToken: ${{ secrets.CF_API_TOKEN }}
         secrets: |
-            SECRET1
-            SECRET2
+          SECRET1
+          SECRET2
       env:
         SECRET1: ${{ secrets.SECRET1 }}
         SECRET2: ${{ secrets.SECRET2 }}
 ```
 
-If you need to run additional shell commands before or after your command, you can specify them as input to `preCommands` (before `publish`) or `postCommands` (after `publish`). These can include additional `wrangler` commands (that is, `whoami`, `kv:key put`) or any other commands available inside the `wrangler-action` context.
+If you need to run additional shell commands before or after your command, you can specify them as input to `preCommands` (before `deploy`) or `postCommands` (after `deploy`). These can include additional `wrangler` commands (that is, `whoami`, `kv:key put`) or any other commands available inside the `wrangler-action` context.
 
 ```yaml
 jobs:
   deploy:
     steps:
-      uses: cloudflare/wrangler-action@2.0.0
+      uses: cloudflare/wrangler-action@v3
       with:
         apiToken: ${{ secrets.CF_API_TOKEN }}
         preCommands: echo "*** pre command ***"
@@ -122,7 +115,7 @@ You can use the `command` option to do specific actions such as running `wrangle
 jobs:
   deploy:
     steps:
-      uses: cloudflare/wrangler-action@2.0.0
+      uses: cloudflare/wrangler-action@v3
       with:
         apiToken: ${{ secrets.CF_API_TOKEN }}
         command: whoami
@@ -146,8 +139,8 @@ jobs:
     name: Deploy
     steps:
       - uses: actions/checkout@v3
-      - name: Publish
-        uses: cloudflare/wrangler-action@2.0.0
+      - name: Deploy
+        uses: cloudflare/wrangler-action@v3
         with:
           apiToken: ${{ secrets.CF_API_TOKEN }}
 ```
@@ -156,7 +149,7 @@ Note that there are a number of possible events, like `push`, that can be used t
 
 ### Deploy your Pages site (production & preview)
 
-If you want to deploy your Pages project with GitHub Actions rather than the built-in continous integration (CI), then this is a great way to do it. Wrangler 2 will populate the commit message and branch for you. You only need to pass the project name. If a push to a non-production branch is done, it will publish as a preview deployment:
+If you want to deploy your Pages project with GitHub Actions rather than the built-in continous integration (CI), then this is a great way to do it. Wrangler 2 will populate the commit message and branch for you. You only need to pass the project name. If a push to a non-production branch is done, it will deploy as a preview deployment:
 
 ```yaml
 on: [push]
@@ -167,12 +160,12 @@ jobs:
     name: Deploy
     steps:
       - uses: actions/checkout@v3
-      - name: Publish
-        uses: cloudflare/wrangler-action@2.0.0
+      - name: Deploy
+        uses: cloudflare/wrangler-action@v3
         with:
           apiToken: ${{ secrets.CF_API_TOKEN }}
           accountId: ${{ secrets.CF_ACCOUNT_ID }}
-          command: pages publish --project-name=example
+          command: pages deploy --project-name=example
 ```
 
 ### Deploying on a schedule
@@ -182,7 +175,7 @@ If you would like to deploy your Workers application on a recurring basis – fo
 ```yaml
 on:
   schedule:
-    - cron: '0 * * * *'
+    - cron: "0 * * * *"
 
 jobs:
   deploy:
@@ -190,8 +183,8 @@ jobs:
     name: Deploy
     steps:
       - uses: actions/checkout@v3
-      - name: Publish app
-        uses: cloudflare/wrangler-action@2.0.0
+      - name: Deploy app
+        uses: cloudflare/wrangler-action@v3
         with:
           apiToken: ${{ secrets.CF_API_TOKEN }}
 ```
@@ -207,20 +200,20 @@ on:
   workflow_dispatch:
     inputs:
       environment:
-        description: 'Choose an environment to deploy to: <dev|staging|prod>'
+        description: "Choose an environment to deploy to: <dev|staging|prod>"
         required: true
-        default: 'dev'
+        default: "dev"
 jobs:
   deploy:
     runs-on: ubuntu-latest
     name: Deploy
     steps:
       - uses: actions/checkout@v3
-      - name: Publish app
-        uses: cloudflare/wrangler-action@2.0.0
+      - name: Deploy app
+        uses: cloudflare/wrangler-action@v3
         with:
           apiToken: ${{ secrets.CF_API_TOKEN }}
-          command: publish --env ${{ github.event.inputs.environment }}
+          command: deploy --env ${{ github.event.inputs.environment }}
 ```
 
 For more advanced usage or to programmatically trigger the workflow from scripts, refer to [the GitHub documentation](https://docs.github.com/en/rest/reference/actions#create-a-workflow-dispatch-event) for making API calls.
@@ -244,9 +237,9 @@ jobs:
     name: Deploy
     steps:
       - uses: actions/checkout@v3
-      - name: Publish app
-        uses: cloudflare/wrangler-action@2.0.0
+      - name: Deploy app
+        uses: cloudflare/wrangler-action@v3
         with:
           apiToken: ${{ secrets.CF_API_TOKEN }}
           accountId: ${{ secrets.CF_ACCOUNT_ID }}
-```
+```

action.yml

@@ -2,41 +2,45 @@ name: "Deploy to Cloudflare Workers with Wrangler"
 branding:
   icon: "upload-cloud"
   color: "orange"
-description: "Deploy your Cloudflare Workers and Pages projects from GitHub using Wrangler"
+description: "Deploy your Cloudflare projects from GitHub using Wrangler"
 runs:
-  using: "docker"
-  image: "Dockerfile"
+  # Possible values: https://github.com/actions/runner/blob/main/src/Runner.Common/Util/NodeUtil.cs#L9
+  using: "node20"
+  main: "dist/index.mjs"
 inputs:
-  apiKey:
-    description: "(Legacy) Your Cloudflare API Key"
-    required: false
-  email:
-    description: "(Legacy) Your Cloudflare Email"
-    required: false
   apiToken:
     description: "Your Cloudflare API Token"
     required: false
   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 publish your Workers project to - must be defined in wrangler.toml"
+    description: "The environment you'd like to deploy your Workers project to - must be defined in wrangler.toml"
   workingDirectory:
     description: "The relative path which Wrangler commands should be run from"
     required: false
   wranglerVersion:
-    description: "The version of Wrangler you'd like to use to publish your Workers project"
+    description: "The version of Wrangler you'd like to use to deploy your Workers project"
     required: false
   secrets:
-    description: "A new line deliminated string of environment variable names that should be configured as Worker secrets"
+    description: "A string of environment variable names, separated by newlines. These will be bound to your Worker as Secrets and must match the names of environment variables declared in `env` of this workflow."
     required: false
   preCommands:
-    description: "Commands to execute before publishing the Workers project"
+    description: "Commands to execute before deploying the Workers project"
     required: false
   postCommands:
-    description: "Commands to execute after publishing the Workers project"
+    description: "Commands to execute after deploying the Workers project"
     required: false
   command:
-    description: "The Wrangler command you wish to run. For example: \"publish\" - this will publish your Worker"
-    required: false
+    description: 'The Wrangler command (along with any arguments) you wish to run. Multiple Wrangler commands can be run by separating each command with a newline. Defaults to `"deploy"`.'
+    required: false
+  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 name of the package manager to install and run wrangler. If not provided, it will be detected via the lock file. Valid values: [npm, pnpm, yarn]"
+    required: false

entrypoint.sh

@@ -1,161 +0,0 @@
-#!/bin/bash
-
-set -e
-
-export HOME="/github/workspace"
-export WRANGLER_HOME="/github/workspace"
-
-mkdir -p "$HOME/.wrangler"
-chmod -R 770 "$HOME/.wrangler"
-
-export API_CREDENTIALS=""
-
-# Used to execute any specified pre and post commands
-execute_commands() {
-  echo "$ Running: $1"
-  COMMANDS=$1
-  while IFS= read -r COMMAND; do
-    CHUNKS=()
-
-    for CHUNK in $COMMAND; do
-      CHUNKS+=("$CHUNK")
-    done
-
-    eval "${CHUNKS[@]}"
-
-    CHUNKS=()
-  done <<< "$COMMANDS"
-}
-
-secret_not_found() {
-  echo "::error::Specified secret \"$1\" not found in environment variables."
-  exit 1
-}
-
-WRANGLER_VERSION=2
-
-# If no Wrangler version is specified install v2.
-if [ -z "$INPUT_WRANGLERVERSION" ]; then
-  npm i -g wrangler
-
-# If Wrangler version starts with 1 then install wrangler v1
-elif [[ "$INPUT_WRANGLERVERSION" == 1* ]]; then
-  npm i -g "@cloudflare/wrangler@$INPUT_WRANGLERVERSION"
-  WRANGLER_VERSION=1
-
-# Else install Wrangler 2
-else
-  npm i -g "wrangler@$INPUT_WRANGLERVERSION"
-  WRANGLER_VERSION=2
-fi
-
-# If an API token is detected as input
-if [ -n "$INPUT_APITOKEN" ]; then
-
-  # Wrangler v1 uses CF_API_TOKEN but v2 uses CLOUDFLARE_API_TOKEN
-  if [ $WRANGLER_VERSION == 1 ]; then
-    export CF_API_TOKEN="$INPUT_APITOKEN"
-  else
-    export CLOUDFLARE_API_TOKEN="$INPUT_APITOKEN"
-  fi
-
-  export API_CREDENTIALS="API Token"
-fi
-
-# If an API key and email are detected as input
-if [ -n "$INPUT_APIKEY" ] && [ -n "$INPUT_EMAIL" ]; then
-
-  # Wrangler v1 uses CF_ but v2 uses CLOUDFLARE_
-  if [ $WRANGLER_VERSION == 1 ]; then
-    export CF_EMAIL="$INPUT_EMAIL"
-    export CF_API_KEY="$INPUT_APIKEY"
-  else
-    echo "::error::Wrangler v2 does not support using the API Key. You should instead use an API token."
-    exit 1
-  fi
-  
-  export API_CREDENTIALS="Email and API Key"
-fi
-
-if [ -n "$INPUT_ACCOUNTID" ]; then
-
-  if [ $WRANGLER_VERSION == 1 ]; then
-    export CF_ACCOUNT_ID="$INPUT_ACCOUNTID"
-  else
-    export CLOUDFLARE_ACCOUNT_ID="$INPUT_ACCOUNTID"
-  fi
-  
-fi
-
-if [ -n "$INPUT_APIKEY" ] && [ -z "$INPUT_EMAIL" ]
-then
-  echo "Provided an API key without an email for authentication. Please pass in 'apiKey' and 'email' to the action."
-fi
-
-if [ -z "$INPUT_APIKEY" ] && [ -n "$INPUT_EMAIL" ]
-then
-  echo "Provided an email without an API key for authentication. Please pass in 'apiKey' and 'email' to the action."
-  exit 1
-fi
-
-if [ -z "$API_CREDENTIALS" ]
-then
-  >&2 echo "Unable to find authentication details. Please pass in an 'apiToken' as an input to the action, or a legacy 'apiKey' and 'email'."
-  exit 1
-else
-  echo "Using $API_CREDENTIALS authentication"
-fi
-
-# If a working directory is detected as input
-if [ -n "$INPUT_WORKINGDIRECTORY" ]
-then
-  cd "$INPUT_WORKINGDIRECTORY"
-fi
-
-# If precommands is detected as input
-if [ -n "$INPUT_PRECOMMANDS" ]
-then
-  execute_commands "$INPUT_PRECOMMANDS"
-fi
-
-# If we have secrets, set them
-for SECRET in $INPUT_SECRETS; do
-  VALUE=$(printenv "$SECRET") || secret_not_found "$SECRET"
-
-  if [ -z "$INPUT_ENVIRONMENT" ]; then
-    echo "$VALUE" | wrangler secret put "$SECRET"
-  else
-    echo "$VALUE" | wrangler secret put "$SECRET" --env "$INPUT_ENVIRONMENT"
-  fi
-done
-
-# If there's no input command then default to publish otherwise run it
-if [ -z "$INPUT_COMMAND" ]; then
-  echo "::notice:: No command was provided, defaulting to 'publish'"
-
- if [ -z "$INPUT_ENVIRONMENT" ]; then
-    wrangler publish
-  else
-    wrangler publish --env "$INPUT_ENVIRONMENT"
-  fi
-
-else
-  if [ -n "$INPUT_ENVIRONMENT" ]; then
-    echo "::notice::Since you have specified an environment you need to make sure to pass in '--env $INPUT_ENVIRONMENT' to your command."
-  fi
-
-  execute_commands "wrangler $INPUT_COMMAND"
-fi
-
-# If postcommands is detected as input
-if [ -n "$INPUT_POSTCOMMANDS" ]
-then
-  execute_commands "$INPUT_POSTCOMMANDS"
-fi
-
-# If a working directory is detected as input, revert to the
-# original directory before continuing with the workflow
-if [ -n "$INPUT_WORKINGDIRECTORY" ]
-then
-  cd $HOME
-fi

package.json

@@ -0,0 +1,44 @@
+{
+	"name": "wrangler-action",
+	"version": "3.1.1",
+	"description": "GitHub Action to use [Wrangler](https://developers.cloudflare.com/workers/cli-wrangler/).",
+	"author": "wrangler@cloudflare.com",
+	"license": "MIT OR Apache-2.0",
+	"bugs": {
+		"url": "https://github.com/cloudflare/wrangler-action/issues"
+	},
+	"homepage": "https://github.com/cloudflare/wrangler-action#readme",
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/cloudflare/wrangler-action.git"
+	},
+	"keywords": [
+		"script",
+		"cli",
+		"serverless",
+		"cloudflare",
+		"cloudflare-workers",
+		"typescript"
+	],
+	"type": "module",
+	"main": "dist/index.mjs",
+	"scripts": {
+		"build": "npx ncc build ./src/index.ts && mv ./dist/index.js ./dist/index.mjs",
+		"test": "vitest",
+		"format": "prettier --write .",
+		"check": "prettier --check ."
+	},
+	"dependencies": {
+		"@actions/core": "^1.10.0"
+	},
+	"devDependencies": {
+		"@changesets/changelog-github": "^0.4.8",
+		"@changesets/cli": "^2.26.2",
+		"@cloudflare/workers-types": "^4.20230814.0",
+		"@types/node": "^20.5.0",
+		"@vercel/ncc": "^0.36.1",
+		"prettier": "^3.0.1",
+		"typescript": "^5.1.6",
+		"vitest": "^0.34.1"
+	}
+}

src/index.ts

@@ -0,0 +1,321 @@
+import {
+	getBooleanInput,
+	getInput,
+	getMultilineInput,
+	endGroup as originalEndGroup,
+	error as originalError,
+	info as originalInfo,
+	startGroup as originalStartGroup,
+	setFailed,
+} from "@actions/core";
+import { exec, execSync } from "node:child_process";
+import * as util from "node:util";
+import {
+	PackageManager,
+	checkWorkingDirectory,
+	detectPackageManager,
+	isValidPackageManager,
+	semverCompare,
+} from "./utils";
+const execAsync = util.promisify(exec);
+
+const DEFAULT_WRANGLER_VERSION = "3.5.1";
+
+interface PackageManagerCommands {
+	install: string;
+	exec: string;
+}
+
+const PACKAGE_MANAGER_COMMANDS = {
+	npm: {
+		install: "npm i",
+		exec: "npx",
+	},
+	yarn: {
+		install: "yarn add",
+		exec: "yarn",
+	},
+	pnpm: {
+		install: "pnpm add",
+		exec: "pnpm exec",
+	},
+} as const satisfies Readonly<Record<PackageManager, PackageManagerCommands>>;
+
+/**
+ * A configuration object that contains all the inputs & immutable state for the action.
+ */
+const config = {
+	WRANGLER_VERSION: getInput("wranglerVersion") || DEFAULT_WRANGLER_VERSION,
+	secrets: getMultilineInput("secrets"),
+	workingDirectory: checkWorkingDirectory(getInput("workingDirectory")),
+	CLOUDFLARE_API_TOKEN: getInput("apiToken"),
+	CLOUDFLARE_ACCOUNT_ID: getInput("accountId"),
+	ENVIRONMENT: getInput("environment"),
+	VARS: getMultilineInput("vars"),
+	COMMANDS: getMultilineInput("command"),
+	QUIET_MODE: getBooleanInput("quiet"),
+	PACKAGE_MANAGER: getInput("packageManager"),
+} as const;
+
+function realPackageManager(): PackageManager {
+	if (isValidPackageManager(config.PACKAGE_MANAGER)) {
+		return config.PACKAGE_MANAGER;
+	}
+
+	const packageManager = detectPackageManager(config.workingDirectory);
+	if (packageManager !== null) {
+		return packageManager;
+	}
+
+	throw new Error("Package manager is not detected");
+}
+
+const pkgManagerCmd = PACKAGE_MANAGER_COMMANDS[realPackageManager()];
+
+function info(message: string, bypass?: boolean): void {
+	if (!config.QUIET_MODE || bypass) {
+		originalInfo(message);
+	}
+}
+
+function error(message: string, bypass?: boolean): void {
+	if (!config.QUIET_MODE || bypass) {
+		originalError(message);
+	}
+}
+
+function startGroup(name: string): void {
+	if (!config.QUIET_MODE) {
+		originalStartGroup(name);
+	}
+}
+
+function endGroup(): void {
+	if (!config.QUIET_MODE) {
+		originalEndGroup();
+	}
+}
+
+async function main() {
+	try {
+		installWrangler();
+		authenticationSetup();
+		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");
+	}
+}
+
+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(), true);
+
+		return result;
+	} catch (err: any) {
+		err.stdout && info(err.stdout.toString());
+		err.stderr && error(err.stderr.toString(), true);
+		throw new Error(`\`${command}\` returned non-zero exit code.`);
+	}
+}
+
+function installWrangler() {
+	if (config["WRANGLER_VERSION"].startsWith("1")) {
+		throw new Error(
+			`Wrangler v1 is no longer supported by this action. Please use major version 2 or greater`,
+		);
+	}
+	startGroup("📥 Installing Wrangler");
+	const command = `${pkgManagerCmd.install} wrangler@${config["WRANGLER_VERSION"]}`;
+	info(`Running command: ${command}`);
+	execSync(command, { cwd: config["workingDirectory"], env: process.env });
+	info(`✅ Wrangler installed`, true);
+	endGroup();
+}
+
+function authenticationSetup() {
+	process.env.CLOUDFLARE_API_TOKEN = config["CLOUDFLARE_API_TOKEN"];
+	process.env.CLOUDFLARE_ACCOUNT_ID = config["CLOUDFLARE_ACCOUNT_ID"];
+}
+
+async function execCommands(commands: string[], cmdType: string) {
+	if (!commands.length) {
+		return;
+	}
+
+	startGroup(`🚀 Running ${cmdType}Commands`);
+	try {
+		const arrPromises = commands.map(async (command) => {
+			const cmd = command.startsWith("wrangler")
+				? `${pkgManagerCmd.exec} ${command}`
+				: command;
+
+			info(`🚀 Executing command: ${cmd}`);
+
+			return await runProcess(cmd, {
+				cwd: config["workingDirectory"],
+				env: process.env,
+			});
+		});
+
+		await Promise.all(arrPromises);
+	} finally {
+		endGroup();
+	}
+}
+
+/**
+ * A helper function to get the secret from the environment variables.
+ */
+function getSecret(secret: string) {
+	if (!secret) {
+		throw new Error("Secret name cannot be blank.");
+	}
+
+	const value = process.env[secret];
+	if (!value) {
+		throw new Error(`Value for secret ${secret} not found.`);
+	}
+
+	return value;
+}
+
+async function legacyUploadSecrets(
+	secrets: string[],
+	environment?: string,
+	workingDirectory?: string,
+) {
+	const arrPromises = secrets
+		.map((secret) => {
+			const command = `echo ${getSecret(secret)} | ${
+				pkgManagerCmd.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: string[] = config["secrets"];
+	const environment = config["ENVIRONMENT"];
+	const workingDirectory = config["workingDirectory"];
+
+	if (!secrets.length) {
+		return;
+	}
+
+	startGroup("🔑 Uploading secrets...");
+
+	try {
+		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 environmentSuffix = !environment.length
+			? ""
+			: ` --env ${environment}`;
+
+		const secretCmd = `echo "${JSON.stringify(secretObj).replaceAll(
+			'"',
+			'\\"',
+		)}" | ${pkgManagerCmd.exec} wrangler secret:bulk ${environmentSuffix}`;
+
+		execSync(secretCmd, {
+			cwd: workingDirectory,
+			env: process.env,
+			stdio: "ignore",
+		});
+
+		info(`✅ Uploaded secrets`);
+	} catch (err) {
+		error(`❌ Upload failed`);
+		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 {
+			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");
+	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}`);
+			}
+
+			const cmd = `${pkgManagerCmd.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);
+	} finally {
+		endGroup();
+	}
+}
+
+main();
+
+export {
+	authenticationSetup,
+	execCommands,
+	installWrangler,
+	uploadSecrets,
+	wranglerCommands,
+};

src/utils.test.ts

@@ -0,0 +1,68 @@
+import path from "node:path";
+import { describe, expect, test } from "vitest";
+import {
+	checkWorkingDirectory,
+	detectPackageManager,
+	isValidPackageManager,
+	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(
+			'"Directory /does/not/exist does not exist."',
+		);
+	});
+});
+
+describe("detectPackageManager", () => {
+	test("should return name of package manager for current workspace", () => {
+		expect(detectPackageManager()).toBe("npm");
+	});
+
+	test("should return npm if package-lock.json exists", () => {
+		expect(detectPackageManager("test/npm")).toBe("npm");
+	});
+
+	test("should return yarn if yarn.lock exists", () => {
+		expect(detectPackageManager("test/yarn")).toBe("yarn");
+	});
+
+	test("should return pnpm if pnpm-lock.yaml exists", () => {
+		expect(detectPackageManager("test/pnpm")).toBe("pnpm");
+	});
+
+	test("should return null if no package manager is detected", () => {
+		expect(detectPackageManager("test/empty")).toBe(null);
+	});
+});
+
+test("isValidPackageManager", () => {
+	expect(isValidPackageManager("npm")).toBe(true);
+	expect(isValidPackageManager("pnpm")).toBe(true);
+	expect(isValidPackageManager("yarn")).toBe(true);
+
+	expect(isValidPackageManager("")).toBe(false);
+	expect(isValidPackageManager("ppnpm")).toBe(false);
+});

src/utils.ts

@@ -0,0 +1,52 @@
+import { existsSync } from "node:fs";
+import * as path from "node:path";
+
+/**
+ * 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;
+
+	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;
+}
+
+export function checkWorkingDirectory(workingDirectory = ".") {
+	const normalizedPath = path.normalize(workingDirectory);
+	if (existsSync(normalizedPath)) {
+		return normalizedPath;
+	} else {
+		throw new Error(`Directory ${workingDirectory} does not exist.`);
+	}
+}
+
+export type PackageManager = "npm" | "yarn" | "pnpm";
+
+export function detectPackageManager(
+	workingDirectory = ".",
+): PackageManager | 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";
+	}
+	return null;
+}
+
+export function isValidPackageManager(name: string): name is PackageManager {
+	return name === "npm" || name === "yarn" || name === "pnpm";
+}

test/.gitignore

@@ -1 +0,0 @@
-dist

test/base/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/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

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

test/base/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,3 @@
+{
+	"name": "wrangler-action-detect-package-manager-test"
+}

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/index.ts

@@ -0,0 +1,21 @@
+type Env = {
+	SECRET1?: string;
+	SECRET2?: string;
+};
+
+export default {
+	fetch(request: Request, env: Env) {
+		const url = new URL(request.url);
+
+		if (url.pathname === "/secret") {
+			const { SECRET1 = "", SECRET2 = "" } = env;
+			return new Response(`${SECRET1} ${SECRET2}`);
+		}
+
+		// @ts-expect-error
+		return Response.json({
+			...request,
+			headers: Object.fromEntries(request.headers),
+		});
+	},
+};

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

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

test/environment/wrangler.toml

@@ -0,0 +1,9 @@
+name = "wrangler-action-environment-test"
+main = "./index.ts"
+compatibility_date = "2023-07-07"
+workers_dev = true
+
+[env.dev]
+name = "wrangler-action-dev-environment-test"
+[env.dev.vars]
+DEV_VAR = "example_production_token"

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,3 @@
+{
+	"name": "wrangler-action-pnpm-test"
+}

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/public/index.html

@@ -1,6 +0,0 @@
-<h1>My Static Site Test</h1>
-<p>This is the content of my site</p>
-
-<footer>
-  And this is my footer
-</footer>

test/workers-site/index.js

@@ -1,88 +0,0 @@
-import { getAssetFromKV, mapRequestToAsset } from '@cloudflare/kv-asset-handler'
-
-/**
- * The DEBUG flag will do two things that help during development:
- * 1. we will skip caching on the edge, which makes it easier to
- *    debug.
- * 2. we will return an error message on exception in your response rather
- *    than the default 404.html page.
- */
-const DEBUG = false
-
-addEventListener('fetch', event => {
-  try {
-    event.respondWith(handleEvent(event))
-  } catch (e) {
-    if (DEBUG) {
-      return event.respondWith(
-        new Response(e.message || e.toString(), {
-          status: 500,
-        }),
-      )
-    }
-    event.respondWith(new Response('Internal Error', { status: 500 }))
-  }
-})
-
-async function handleEvent(event) {
-  const url = new URL(event.request.url)
-  let options = {}
-
-  /**
-   * You can add custom logic to how we fetch your assets
-   * by configuring the function `mapRequestToAsset`
-   */
-  // options.mapRequestToAsset = handlePrefix(/^\/docs/)
-
-  // Path to test secrets passed through Wrangler Action.  Create SECRET1 and SECRET2 secrets
-  // in the Action repo to something innocuous like "Hello" and "World!".
-  if (url.pathname === "/secret") {
-    let sec1 = (typeof SECRET1 !== 'undefined') ? SECRET1 : ""
-    let sec2 = (typeof SECRET2 !== 'undefined') ? SECRET2 : ""
-    return new Response(`${sec1} ${sec2}`)
-  }
-  
-  try {
-    if (DEBUG) {
-      // customize caching
-      options.cacheControl = {
-        bypassCache: true,
-      }
-    }
-    return await getAssetFromKV(event, options)
-  } catch (e) {
-    // if an error is thrown try to serve the asset at 404.html
-    if (!DEBUG) {
-      try {
-        let notFoundResponse = await getAssetFromKV(event, {
-          mapRequestToAsset: req => new Request(`${new URL(req.url).origin}/404.html`, req),
-        })
-
-        return new Response(notFoundResponse.body, { ...notFoundResponse, status: 404 })
-      } catch (e) {}
-    }
-
-    return new Response(e.message || e.toString(), { status: 500 })
-  }
-}
-
-/**
- * Here's one example of how to modify a request to
- * remove a specific prefix, in this case `/docs` from
- * the url. This can be useful if you are deploying to a
- * route on a zone, or if you only want your static content
- * to exist at a specific path.
- */
-function handlePrefix(prefix) {
-  return request => {
-    // compute the default (e.g. / -> index.html)
-    let defaultAssetKey = mapRequestToAsset(request)
-    let url = new URL(defaultAssetKey.url)
-
-    // strip the prefix from the path for lookup
-    url.pathname = url.pathname.replace(prefix, '/')
-
-    // inherit all other props from the default request
-    return new Request(url.toString(), defaultAssetKey)
-  }
-}

test/workers-site/package-lock.json

@@ -1,21 +0,0 @@
-{
-  "name": "worker",
-  "version": "1.0.0",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "@cloudflare/kv-asset-handler": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/@cloudflare/kv-asset-handler/-/kv-asset-handler-0.0.5.tgz",
-      "integrity": "sha512-7yLMAUZD1XQNKzmktYCcUUPB+wXmQENv1MMi8QEMs0rzL01e0XEyCUUDauRXHzxi7dBbSUGA5RS23h890ncKog==",
-      "requires": {
-        "mime": "^2.4.4"
-      }
-    },
-    "mime": {
-      "version": "2.4.4",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
-      "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA=="
-    }
-  }
-}

test/workers-site/package.json

@@ -1,12 +0,0 @@
-{
-  "private": true,
-  "name": "worker",
-  "version": "1.0.0",
-  "description": "A template for kick starting a Cloudflare Workers project",
-  "main": "index.js",
-  "author": "Ashley Lewis <ashleymichal@gmail.com>",
-  "license": "MIT",
-  "dependencies": {
-    "@cloudflare/kv-asset-handler": "^0.0.5"
-  }
-}

test/wrangler.toml

@@ -1,11 +0,0 @@
-name = "static-test"
-type = "webpack"
-workers_dev = true
-account_id = "dc56444c4c955a1653106ccf997c1067"
-
-[env.production]
-name = "static-test-prod"
-
-[site]
-bucket = "./public"
-entry-point = "workers-site"

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,3 @@
+{
+	"name": "wrangler-action-yarn-test"
+}

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

@@ -0,0 +1,20 @@
+{
+	"files": ["./src/index.ts"],
+	"compilerOptions": {
+		"strict": true,
+		"composite": true,
+		"incremental": true,
+		"esModuleInterop": true,
+		"skipLibCheck": true,
+		"isolatedModules": true,
+		"target": "ESNext",
+		"module": "ESNext",
+		"moduleResolution": "Bundler",
+		"rootDir": "./src",
+		"outDir": "./dist",
+		"lib": ["ESNext"],
+		"types": ["node", "@cloudflare/workers-types"]
+	},
+	"exclude": ["node_modules", "**/*.test.ts"],
+	"include": ["src"]
+}