wrangler 0.0.0-c712c22 → 0.0.0-c71d8a0f

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (178) hide show
  1. package/README.md +30 -12
  2. package/bin/wrangler.js +112 -58
  3. package/kv-asset-handler.js +1 -0
  4. package/package.json +127 -71
  5. package/templates/__tests__/pages-dev-util.test.ts +128 -0
  6. package/templates/__tests__/tsconfig-sanity.ts +12 -0
  7. package/templates/__tests__/tsconfig.json +8 -0
  8. package/templates/checked-fetch.js +30 -0
  9. package/templates/facade.d.ts +17 -0
  10. package/templates/gitignore +1 -0
  11. package/templates/init-tests/test-jest-new-worker.js +23 -0
  12. package/templates/init-tests/test-vitest-new-worker.js +24 -0
  13. package/templates/init-tests/test-vitest-new-worker.ts +25 -0
  14. package/templates/middleware/common.ts +67 -0
  15. package/templates/middleware/loader-modules.ts +137 -0
  16. package/templates/middleware/loader-sw.ts +228 -0
  17. package/templates/middleware/middleware-d1-beta.d.ts +3 -0
  18. package/templates/middleware/middleware-miniflare3-json-error.ts +33 -0
  19. package/templates/middleware/middleware-multiworker-dev.d.ts +4 -0
  20. package/templates/middleware/middleware-multiworker-dev.ts +59 -0
  21. package/templates/middleware/middleware-pretty-error.ts +40 -0
  22. package/templates/middleware/middleware-scheduled.ts +15 -0
  23. package/templates/middleware/middleware-serve-static-assets.d.ts +6 -0
  24. package/templates/middleware/middleware-serve-static-assets.ts +56 -0
  25. package/templates/new-worker-scheduled.js +17 -0
  26. package/templates/new-worker-scheduled.ts +32 -0
  27. package/templates/new-worker.js +3 -3
  28. package/templates/new-worker.ts +19 -16
  29. package/templates/no-op-worker.js +10 -0
  30. package/templates/pages-dev-pipeline.ts +31 -0
  31. package/templates/pages-dev-util.ts +55 -0
  32. package/templates/pages-shim.ts +9 -0
  33. package/templates/pages-template-plugin.ts +190 -0
  34. package/templates/pages-template-worker.ts +198 -0
  35. package/templates/tsconfig-sanity.ts +11 -0
  36. package/templates/tsconfig.init.json +105 -0
  37. package/templates/tsconfig.json +6 -103
  38. package/wrangler-dist/cli.d.ts +1779 -0
  39. package/wrangler-dist/cli.js +131982 -105232
  40. package/wrangler-dist/wasm-sync.wasm +0 -0
  41. package/import_meta_url.js +0 -3
  42. package/miniflare-config-stubs/.env.empty +0 -0
  43. package/miniflare-config-stubs/package.empty.json +0 -1
  44. package/miniflare-config-stubs/wrangler.empty.toml +0 -0
  45. package/miniflare-dist/index.mjs +0 -4886
  46. package/pages/functions/buildPlugin.ts +0 -105
  47. package/pages/functions/buildWorker.ts +0 -151
  48. package/pages/functions/filepath-routing.test.ts +0 -234
  49. package/pages/functions/filepath-routing.ts +0 -189
  50. package/pages/functions/identifiers.ts +0 -78
  51. package/pages/functions/routes.ts +0 -156
  52. package/pages/functions/template-plugin.ts +0 -147
  53. package/pages/functions/template-worker.ts +0 -143
  54. package/src/__tests__/config-cache.test.ts +0 -36
  55. package/src/__tests__/configuration.test.ts +0 -3313
  56. package/src/__tests__/dev.test.tsx +0 -891
  57. package/src/__tests__/guess-worker-format.test.ts +0 -85
  58. package/src/__tests__/helpers/clipboardy-mock.js +0 -4
  59. package/src/__tests__/helpers/cmd-shim.d.ts +0 -11
  60. package/src/__tests__/helpers/faye-websocket.d.ts +0 -6
  61. package/src/__tests__/helpers/mock-account-id.ts +0 -48
  62. package/src/__tests__/helpers/mock-bin.ts +0 -36
  63. package/src/__tests__/helpers/mock-cfetch.ts +0 -211
  64. package/src/__tests__/helpers/mock-console.ts +0 -87
  65. package/src/__tests__/helpers/mock-dialogs.ts +0 -90
  66. package/src/__tests__/helpers/mock-http-server.ts +0 -46
  67. package/src/__tests__/helpers/mock-istty.ts +0 -27
  68. package/src/__tests__/helpers/mock-kv.ts +0 -33
  69. package/src/__tests__/helpers/mock-oauth-flow.ts +0 -255
  70. package/src/__tests__/helpers/mock-stdin.ts +0 -103
  71. package/src/__tests__/helpers/mock-web-socket.ts +0 -29
  72. package/src/__tests__/helpers/run-in-tmp.ts +0 -39
  73. package/src/__tests__/helpers/run-wrangler.ts +0 -16
  74. package/src/__tests__/helpers/write-worker-source.ts +0 -31
  75. package/src/__tests__/helpers/write-wrangler-toml.ts +0 -17
  76. package/src/__tests__/https-options.test.ts +0 -130
  77. package/src/__tests__/index.test.ts +0 -256
  78. package/src/__tests__/init.test.ts +0 -1557
  79. package/src/__tests__/jest.setup.ts +0 -77
  80. package/src/__tests__/kv.test.ts +0 -1481
  81. package/src/__tests__/logger.test.ts +0 -115
  82. package/src/__tests__/package-manager.test.ts +0 -206
  83. package/src/__tests__/pages.test.ts +0 -529
  84. package/src/__tests__/parse.test.ts +0 -330
  85. package/src/__tests__/publish.test.ts +0 -5410
  86. package/src/__tests__/r2.test.ts +0 -233
  87. package/src/__tests__/route.test.ts +0 -45
  88. package/src/__tests__/secret.test.ts +0 -481
  89. package/src/__tests__/tail.test.ts +0 -690
  90. package/src/__tests__/user.test.ts +0 -131
  91. package/src/__tests__/whoami.test.tsx +0 -105
  92. package/src/abort.d.ts +0 -3
  93. package/src/bundle.ts +0 -200
  94. package/src/cfetch/index.ts +0 -106
  95. package/src/cfetch/internal.ts +0 -139
  96. package/src/cli.ts +0 -13
  97. package/src/config/README.md +0 -107
  98. package/src/config/config.ts +0 -234
  99. package/src/config/diagnostics.ts +0 -80
  100. package/src/config/environment.ts +0 -420
  101. package/src/config/index.ts +0 -225
  102. package/src/config/validation-helpers.ts +0 -575
  103. package/src/config/validation.ts +0 -1513
  104. package/src/config-cache.ts +0 -45
  105. package/src/create-worker-preview.ts +0 -185
  106. package/src/create-worker-upload-form.ts +0 -254
  107. package/src/dev/dev-vars.ts +0 -36
  108. package/src/dev/dev.tsx +0 -422
  109. package/src/dev/local.tsx +0 -318
  110. package/src/dev/remote.tsx +0 -227
  111. package/src/dev/use-esbuild.ts +0 -118
  112. package/src/dialogs.tsx +0 -87
  113. package/src/durable.ts +0 -102
  114. package/src/entry.ts +0 -322
  115. package/src/environment-variables.ts +0 -35
  116. package/src/errors.ts +0 -11
  117. package/src/https-options.ts +0 -123
  118. package/src/index.tsx +0 -2789
  119. package/src/inspect.ts +0 -662
  120. package/src/intl-polyfill.d.ts +0 -139
  121. package/src/kv.ts +0 -408
  122. package/src/logger.ts +0 -66
  123. package/src/miniflare-cli/README.md +0 -30
  124. package/src/miniflare-cli/enum-keys.ts +0 -17
  125. package/src/miniflare-cli/index.ts +0 -41
  126. package/src/miniflare-cli/request-context.ts +0 -40
  127. package/src/module-collection.ts +0 -258
  128. package/src/open-in-browser.ts +0 -19
  129. package/src/package-manager.ts +0 -127
  130. package/src/pages.tsx +0 -2004
  131. package/src/parse.ts +0 -202
  132. package/src/paths.ts +0 -26
  133. package/src/proxy.ts +0 -465
  134. package/src/publish.ts +0 -583
  135. package/src/r2.ts +0 -50
  136. package/src/selfsigned.d.ts +0 -29
  137. package/src/sites.tsx +0 -290
  138. package/src/tail/filters.ts +0 -279
  139. package/src/tail/index.ts +0 -299
  140. package/src/tail/printing.ts +0 -67
  141. package/src/update-check.ts +0 -19
  142. package/src/user.tsx +0 -1203
  143. package/src/whoami.tsx +0 -70
  144. package/src/worker.ts +0 -180
  145. package/templates/static-asset-facade.js +0 -47
  146. package/vendor/@cloudflare/kv-asset-handler/CHANGELOG.md +0 -332
  147. package/vendor/@cloudflare/kv-asset-handler/LICENSE_APACHE +0 -176
  148. package/vendor/@cloudflare/kv-asset-handler/LICENSE_MIT +0 -25
  149. package/vendor/@cloudflare/kv-asset-handler/README.md +0 -245
  150. package/vendor/@cloudflare/kv-asset-handler/dist/index.d.ts +0 -32
  151. package/vendor/@cloudflare/kv-asset-handler/dist/index.js +0 -354
  152. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.d.ts +0 -13
  153. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.js +0 -148
  154. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.d.ts +0 -1
  155. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.js +0 -436
  156. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.d.ts +0 -1
  157. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.js +0 -40
  158. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.d.ts +0 -1
  159. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.js +0 -42
  160. package/vendor/@cloudflare/kv-asset-handler/dist/types.d.ts +0 -26
  161. package/vendor/@cloudflare/kv-asset-handler/dist/types.js +0 -31
  162. package/vendor/@cloudflare/kv-asset-handler/package.json +0 -52
  163. package/vendor/@cloudflare/kv-asset-handler/src/index.ts +0 -296
  164. package/vendor/@cloudflare/kv-asset-handler/src/mocks.ts +0 -136
  165. package/vendor/@cloudflare/kv-asset-handler/src/test/getAssetFromKV.ts +0 -464
  166. package/vendor/@cloudflare/kv-asset-handler/src/test/mapRequestToAsset.ts +0 -33
  167. package/vendor/@cloudflare/kv-asset-handler/src/test/serveSinglePageApp.ts +0 -42
  168. package/vendor/@cloudflare/kv-asset-handler/src/types.ts +0 -39
  169. package/vendor/wrangler-mime/CHANGELOG.md +0 -289
  170. package/vendor/wrangler-mime/LICENSE +0 -21
  171. package/vendor/wrangler-mime/Mime.js +0 -97
  172. package/vendor/wrangler-mime/README.md +0 -187
  173. package/vendor/wrangler-mime/cli.js +0 -46
  174. package/vendor/wrangler-mime/index.js +0 -4
  175. package/vendor/wrangler-mime/lite.js +0 -4
  176. package/vendor/wrangler-mime/package.json +0 -52
  177. package/vendor/wrangler-mime/types/other.js +0 -1
  178. package/vendor/wrangler-mime/types/standard.js +0 -1
package/README.md CHANGED
@@ -1,6 +1,10 @@
1
- ## ⛅️ wrangler
2
-
3
- > This package is for wrangler v2.x, released first in May 2022. If you're looking for v1.x of the `@cloudflare/wrangler` package, visit https://www.npmjs.com/package/@cloudflare/wrangler / https://github.com/cloudflare/wrangler.
1
+ <h1 align="center"> ⛅️ wrangler </h1>
2
+ <section align="center" id="shieldio-badges">
3
+ <a href="https://www.npmjs.com/package/wrangler"><img alt="npm" src="https://img.shields.io/npm/dw/wrangler?style=flat-square"></a>
4
+ <img alt="GitHub contributors" src="https://img.shields.io/github/contributors/cloudflare/workers-sdk?style=flat-square">
5
+ <img alt="GitHub commit activity (branch)" src="https://img.shields.io/github/commit-activity/w/cloudflare/workers-sdk/main?style=flat-square">
6
+ <a href="https://discord.gg/CloudflareDev"><img alt="Discord" src="https://img.shields.io/discord/595317990191398933?color=%23F48120&style=flat-square"></a>
7
+ </section>
4
8
 
5
9
  `wrangler` is a command line tool for building [Cloudflare Workers](https://workers.cloudflare.com/).
6
10
 
@@ -11,8 +15,8 @@
11
15
  echo "export default { fetch() { return new Response('hello world') } }" > index.js
12
16
  # try it out
13
17
  npx wrangler dev index.js
14
- # and then publish it
15
- npx wrangler publish index.js --name my-worker
18
+ # and then deploy it
19
+ npx wrangler deploy index.js --name my-worker
16
20
  # visit https://my-worker.<your workers subdomain>.workers.dev
17
21
  ```
18
22
 
@@ -20,11 +24,11 @@ npx wrangler publish index.js --name my-worker
20
24
 
21
25
  ```bash
22
26
  # Generate a new project
23
- npx wrangler init my-worker
27
+ npx wrangler init my-worker --no-delegate-c3
24
28
  # try it out
25
29
  cd my-worker && npm run start
26
- # and then publish it
27
- npm run publish
30
+ # and then deploy it
31
+ npm run deploy
28
32
  ```
29
33
 
30
34
  ## Installation:
@@ -33,21 +37,35 @@ npm run publish
33
37
  $ npm install wrangler --save-dev
34
38
  ```
35
39
 
40
+ ## Configuration:
41
+
42
+ Wrangler is configured via a `wrangler.toml` file in the project root. When utilizing the `wrangler init` command, a `wrangler.toml` file will be created for you.
43
+
44
+ Example:
45
+
46
+ ```toml
47
+ name = "my-worker"
48
+ main = "./src/index.ts" # init w/ TypeScript
49
+ compatibility_date = "YYYY-MM-DD"
50
+ ```
51
+
52
+ For more detailed information about configuration, refer to the [documentation](https://developers.cloudflare.com/workers/wrangler/configuration/).
53
+
36
54
  ## Commands
37
55
 
38
56
  ### `wrangler init [name]`
39
57
 
40
- Creates a Worker project. For details on configuration keys and values, refer to the [documentation](https://developers.cloudflare.com/workers/cli-wrangler/configuration).
58
+ Creates a Worker project. For details on configuration keys and values, refer to the [documentation](https://developers.cloudflare.com/workers/wrangler/commands/#init).
41
59
 
42
60
  ### `wrangler dev`
43
61
 
44
62
  Start a local development server, with live reloading and devtools.
45
63
 
46
- ### `wrangler publish`
64
+ ### `wrangler deploy`
47
65
 
48
66
  Publish the given script to the worldwide Cloudflare network.
49
67
 
50
- For more commands and options, refer to the [documentation](https://developers.cloudflare.com/workers/cli-wrangler/commands).
68
+ For more commands and options, refer to the [documentation](https://developers.cloudflare.com/workers/wrangler/commands/).
51
69
 
52
70
  ## Pages
53
71
 
@@ -61,4 +79,4 @@ For more commands and options, refer to the [documentation](https://developers.c
61
79
 
62
80
  ## Documentation
63
81
 
64
- For the latest Wrangler documentation, [click here](https://6b05b6e1.cloudflare-docs-7ou.pages.dev/workers/wrangler/).
82
+ For the latest Wrangler documentation, [click here](https://developers.cloudflare.com/workers/wrangler/).
package/bin/wrangler.js CHANGED
@@ -1,68 +1,122 @@
1
1
  #!/usr/bin/env node
2
2
  const { spawn } = require("child_process");
3
- const { join } = require("path");
4
- const semiver = require("semiver");
3
+ const path = require("path");
4
+ const fs = require("fs");
5
+ const os = require("os");
5
6
 
6
- const MIN_NODE_VERSION = "16.7.0";
7
+ const MIN_NODE_VERSION = "16.13.0";
8
+ const debug =
9
+ process.env["WRANGLER_LOG"] === "debug"
10
+ ? (...args) => console.log(...args)
11
+ : () => {};
7
12
 
8
13
  let wranglerProcess;
9
14
 
10
- async function main() {
11
- if (semiver(process.versions.node, MIN_NODE_VERSION) < 0) {
12
- // Note Volta and nvm are also recommended in the official docs:
13
- // https://developers.cloudflare.com/workers/get-started/guide#2-install-the-workers-cli
14
- console.error(
15
- `Wrangler requires at least Node.js v${MIN_NODE_VERSION}. You are using v${process.versions.node}.
16
- You should use the latest Node.js version if possible, as Cloudflare Workers use a very up-to-date version of V8.
15
+ /**
16
+ * Executes ../wrangler-dist/cli.js
17
+ */
18
+ function runWrangler() {
19
+ if (semiver(process.versions.node, MIN_NODE_VERSION) < 0) {
20
+ // Note Volta and nvm are also recommended in the official docs:
21
+ // https://developers.cloudflare.com/workers/get-started/guide#2-install-the-workers-cli
22
+ console.error(
23
+ `Wrangler requires at least Node.js v${MIN_NODE_VERSION}. You are using v${process.versions.node}. Please update your version of Node.js.
24
+
17
25
  Consider using a Node.js version manager such as https://volta.sh/ or https://github.com/nvm-sh/nvm.`
18
- );
19
- process.exitCode = 1;
20
- return;
21
- }
22
-
23
- let pathToCACerts = process.env.NODE_EXTRA_CA_CERTS;
24
- if (pathToCACerts) {
25
- // TODO:
26
- // - should we log a warning here?
27
- // - maybe we can generate a certificate that concatenates with ours?
28
- // - is there a security concern/should we cleanup after we exit?
29
- //
30
- // I do think it'll be rare that someone wants to add a cert AND
31
- // use cloudflare WARP, but let's wait till the situation actually
32
- // arises before we do anything about it
33
- } else {
34
- pathToCACerts = join(__dirname, "../Cloudflare_CA.pem");
35
- }
36
-
37
- wranglerProcess = spawn(
38
- process.execPath,
39
- [
40
- ...(semiver(process.versions.node, "18.0.0") >= 0
41
- ? ["--no-experimental-fetch"] // TODO: remove this when https://github.com/cloudflare/wrangler2/issues/834 is properly fixed
42
- : []),
43
- "--no-warnings",
44
- "--experimental-vm-modules",
45
- ...process.execArgv,
46
- join(__dirname, "../wrangler-dist/cli.js"),
47
- ...process.argv.slice(2),
48
- ],
49
- {
50
- stdio: "inherit",
51
- env: {
52
- ...process.env,
53
- NODE_EXTRA_CA_CERTS: pathToCACerts,
54
- },
55
- }
56
- ).on("exit", (code) =>
57
- process.exit(code === undefined || code === null ? 0 : code)
58
- );
26
+ );
27
+ process.exitCode = 1;
28
+ return;
29
+ }
30
+
31
+ let pathToCACerts = process.env.NODE_EXTRA_CA_CERTS;
32
+ if (pathToCACerts) {
33
+ // TODO:
34
+ // - should we log a warning here?
35
+ // - maybe we can generate a certificate that concatenates with ours?
36
+ //
37
+ // I do think it'll be rare that someone wants to add a cert AND
38
+ // use Cloudflare WARP, but let's wait till the situation actually
39
+ // arises before we do anything about it
40
+ } else {
41
+ const osTempDir = os.tmpdir();
42
+ const certDir = path.join(osTempDir, "wrangler-cert");
43
+ const certPath = path.join(certDir, "Cloudflare_CA.pem");
44
+ // copy cert to the system temp dir if needed
45
+ if (!fs.existsSync(certPath)) {
46
+ fs.mkdirSync(certDir, { recursive: true });
47
+ fs.writeFileSync(
48
+ certPath,
49
+ fs.readFileSync(path.join(__dirname, "../Cloudflare_CA.pem"), "utf-8")
50
+ );
51
+ }
52
+ pathToCACerts = certPath;
53
+ }
54
+
55
+ return spawn(
56
+ process.execPath,
57
+ [
58
+ "--no-warnings",
59
+ "--experimental-vm-modules",
60
+ ...process.execArgv,
61
+ path.join(__dirname, "../wrangler-dist/cli.js"),
62
+ ...process.argv.slice(2),
63
+ ],
64
+ {
65
+ stdio: ["inherit", "inherit", "inherit", "ipc"],
66
+ env: {
67
+ ...process.env,
68
+ NODE_EXTRA_CA_CERTS: pathToCACerts,
69
+ },
70
+ }
71
+ )
72
+ .on("exit", (code) =>
73
+ process.exit(code === undefined || code === null ? 0 : code)
74
+ )
75
+ .on("message", (message) => {
76
+ if (process.send) {
77
+ process.send(message);
78
+ }
79
+ });
59
80
  }
60
81
 
61
- process.on("SIGINT", () => {
62
- wranglerProcess.kill();
63
- });
64
- process.on("SIGTERM", () => {
65
- wranglerProcess.kill();
66
- });
82
+ // semiver implementation via https://github.com/lukeed/semiver/blob/ae7eebe6053c96be63032b14fb0b68e2553fcac4/src/index.js
83
+
84
+ /**
85
+ MIT License
86
+
87
+ Copyright (c) Luke Edwards <luke.edwards05@gmail.com> (lukeed.com)
88
+
89
+ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
90
+
91
+ The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
92
+
93
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
67
94
 
68
- void main();
95
+ */
96
+
97
+ var fn = new Intl.Collator(0, { numeric: 1 }).compare;
98
+
99
+ function semiver(a, b, bool) {
100
+ a = a.split(".");
101
+ b = b.split(".");
102
+
103
+ return (
104
+ fn(a[0], b[0]) ||
105
+ fn(a[1], b[1]) ||
106
+ ((b[2] = b.slice(2).join(".")),
107
+ (bool = /[.-]/.test((a[2] = a.slice(2).join(".")))),
108
+ bool == /[.-]/.test(b[2]) ? fn(a[2], b[2]) : bool ? -1 : 1)
109
+ );
110
+ }
111
+
112
+ // end semiver implementation
113
+
114
+ if (module === require.main) {
115
+ wranglerProcess = runWrangler();
116
+ process.on("SIGINT", () => {
117
+ wranglerProcess && wranglerProcess.kill();
118
+ });
119
+ process.on("SIGTERM", () => {
120
+ wranglerProcess && wranglerProcess.kill();
121
+ });
122
+ }
@@ -0,0 +1 @@
1
+ export * from "@cloudflare/kv-asset-handler";
package/package.json CHANGED
@@ -1,17 +1,7 @@
1
1
  {
2
2
  "name": "wrangler",
3
- "version": "0.0.0-c712c22",
4
- "author": "wrangler@cloudflare.com",
3
+ "version": "0.0.0-c71d8a0f",
5
4
  "description": "Command-line interface for all things Cloudflare Workers",
6
- "bin": {
7
- "wrangler": "./bin/wrangler.js",
8
- "wrangler2": "./bin/wrangler.js"
9
- },
10
- "license": "MIT OR Apache-2.0",
11
- "bugs": {
12
- "url": "https://github.com/cloudflare/wrangler2/issues"
13
- },
14
- "homepage": "https://github.com/cloudflare/wrangler2#readme",
15
5
  "keywords": [
16
6
  "wrangler",
17
7
  "cloudflare",
@@ -28,49 +18,123 @@
28
18
  "webassembly",
29
19
  "rust",
30
20
  "emscripten",
31
- "rust",
32
21
  "typescript",
33
22
  "graphql",
34
23
  "router",
35
24
  "http",
36
25
  "cli"
37
26
  ],
27
+ "homepage": "https://github.com/cloudflare/workers-sdk#readme",
28
+ "bugs": {
29
+ "url": "https://github.com/cloudflare/workers-sdk/issues"
30
+ },
31
+ "repository": {
32
+ "type": "git",
33
+ "url": "https://github.com/cloudflare/workers-sdk.git",
34
+ "directory": "packages/wrangler"
35
+ },
36
+ "license": "MIT OR Apache-2.0",
37
+ "author": "wrangler@cloudflare.com",
38
+ "main": "wrangler-dist/cli.js",
39
+ "types": "wrangler-dist/cli.d.ts",
40
+ "bin": {
41
+ "wrangler": "./bin/wrangler.js",
42
+ "wrangler2": "./bin/wrangler.js"
43
+ },
44
+ "files": [
45
+ "bin",
46
+ "miniflare-dist",
47
+ "wrangler-dist",
48
+ "templates",
49
+ "kv-asset-handler.js",
50
+ "Cloudflare_CA.pem"
51
+ ],
52
+ "jest": {
53
+ "coverageReporters": [
54
+ "json",
55
+ "html",
56
+ "text",
57
+ "cobertura"
58
+ ],
59
+ "moduleNameMapper": {
60
+ "clipboardy": "<rootDir>/src/__tests__/helpers/clipboardy-mock.js",
61
+ "miniflare/cli": "<rootDir>/../../node_modules/miniflare/dist/src/cli.js"
62
+ },
63
+ "restoreMocks": true,
64
+ "setupFilesAfterEnv": [
65
+ "<rootDir>/src/__tests__/jest.setup.ts"
66
+ ],
67
+ "testRegex": "src/__tests__/.*\\.(test|spec)\\.[jt]sx?$",
68
+ "testTimeout": 50000,
69
+ "transform": {
70
+ "^.+\\.c?(t|j)sx?$": [
71
+ "esbuild-jest",
72
+ {
73
+ "sourcemap": true
74
+ }
75
+ ]
76
+ },
77
+ "transformIgnorePatterns": [
78
+ "node_modules/.pnpm/(?!find-up|locate-path|p-locate|p-limit|p-timeout|p-queue|yocto-queue|path-exists|execa|strip-final-newline|npm-run-path|path-key|onetime|mimic-fn|human-signals|is-stream|get-port|supports-color|pretty-bytes|npx-import)"
79
+ ],
80
+ "snapshotFormat": {
81
+ "escapeString": true,
82
+ "printBasicPrototype": true
83
+ }
84
+ },
38
85
  "dependencies": {
39
- "@esbuild-plugins/node-globals-polyfill": "^0.1.1",
40
- "@esbuild-plugins/node-modules-polyfill": "^0.1.4",
86
+ "@cloudflare/kv-asset-handler": "^0.2.0",
87
+ "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
88
+ "@esbuild-plugins/node-modules-polyfill": "^0.2.2",
41
89
  "blake3-wasm": "^2.1.5",
42
- "esbuild": "0.14.34",
43
- "miniflare": "2.4.0",
90
+ "chokidar": "^3.5.3",
91
+ "esbuild": "0.17.19",
92
+ "miniflare": "3.20231002.0",
44
93
  "nanoid": "^3.3.3",
45
94
  "path-to-regexp": "^6.2.0",
46
95
  "selfsigned": "^2.0.1",
47
- "semiver": "^1.1.0",
96
+ "source-map": "0.6.1",
97
+ "source-map-support": "0.5.21",
48
98
  "xxhash-wasm": "^1.0.1"
49
99
  },
50
- "optionalDependencies": {
51
- "fsevents": "~2.3.2"
52
- },
53
100
  "devDependencies": {
101
+ "@cloudflare/eslint-config-worker": "*",
102
+ "@cloudflare/types": "^6.18.4",
103
+ "@cloudflare/workers-types": "^4.20230914.0",
54
104
  "@iarna/toml": "^3.0.0",
105
+ "@microsoft/api-extractor": "^7.28.3",
106
+ "@types/body-parser": "^1.19.2",
107
+ "@types/busboy": "^1.5.0",
55
108
  "@types/command-exists": "^1.2.0",
109
+ "@types/express": "^4.17.13",
56
110
  "@types/glob-to-regexp": "0.4.1",
111
+ "@types/is-ci": "^3.0.0",
112
+ "@types/javascript-time-ago": "^2.0.3",
113
+ "@types/jest": "^29.5.5",
57
114
  "@types/mime": "^2.0.3",
115
+ "@types/minimatch": "^5.1.2",
58
116
  "@types/prompts": "^2.0.14",
59
117
  "@types/react": "^17.0.37",
60
118
  "@types/serve-static": "^1.13.10",
119
+ "@types/shell-quote": "^1.7.2",
61
120
  "@types/signal-exit": "^3.0.1",
121
+ "@types/source-map-support": "^0.5.7",
62
122
  "@types/supports-color": "^8.1.1",
63
123
  "@types/ws": "^8.5.3",
64
124
  "@types/yargs": "^17.0.10",
65
- "@webcontainer/env": "^1.0.1",
66
- "chokidar": "^3.5.3",
125
+ "@webcontainer/env": "^1.1.0",
126
+ "body-parser": "^1.20.0",
127
+ "chalk": "^2.4.2",
128
+ "cli-table3": "^0.6.3",
67
129
  "clipboardy": "^3.0.0",
68
130
  "cmd-shim": "^4.1.0",
69
131
  "command-exists": "^1.2.9",
132
+ "concurrently": "^7.2.2",
70
133
  "devtools-protocol": "^0.0.955664",
71
134
  "dotenv": "^16.0.0",
135
+ "esbuild-jest": "0.5.0",
72
136
  "execa": "^6.1.0",
73
- "faye-websocket": "^0.11.4",
137
+ "express": "^4.18.1",
74
138
  "finalhandler": "^1.2.0",
75
139
  "find-up": "^6.3.0",
76
140
  "get-port": "^6.1.2",
@@ -83,72 +147,64 @@
83
147
  "ink-table": "^3.0.0",
84
148
  "ink-testing-library": "^2.1.0",
85
149
  "ink-text-input": "^4.0.3",
150
+ "is-ci": "^3.0.1",
151
+ "javascript-time-ago": "^2.5.4",
152
+ "jest": "^29.7.0",
86
153
  "jest-fetch-mock": "^3.0.3",
87
- "jest-websocket-mock": "^2.3.0",
154
+ "jest-websocket-mock": "^2.5.0",
88
155
  "mime": "^3.0.0",
156
+ "minimatch": "^5.1.0",
157
+ "msw": "^0.49.1",
158
+ "npx-import": "^1.1.3",
89
159
  "open": "^8.4.0",
90
160
  "p-queue": "^7.2.0",
161
+ "patch-console": "^1.0.0",
91
162
  "pretty-bytes": "^6.0.0",
92
163
  "prompts": "^2.4.2",
93
164
  "react": "^17.0.2",
94
165
  "react-error-boundary": "^3.1.4",
166
+ "remove-accents-esm": "^0.0.1",
167
+ "semiver": "^1.1.0",
95
168
  "serve-static": "^1.15.0",
169
+ "shell-quote": "^1.8.1",
170
+ "shellac": "^0.8.0",
96
171
  "signal-exit": "^3.0.7",
172
+ "strip-ansi": "^7.0.1",
97
173
  "supports-color": "^9.2.2",
98
174
  "timeago.js": "^4.0.2",
99
175
  "tmp-promise": "^3.0.3",
100
176
  "ts-dedent": "^2.2.0",
101
- "undici": "^5.3.0",
177
+ "undici": "5.20.0",
102
178
  "update-check": "^1.5.4",
179
+ "vitest": "^0.34.4",
103
180
  "ws": "^8.5.0",
104
- "yargs": "^17.4.1"
181
+ "xdg-app-paths": "^8.3.0",
182
+ "yargs": "^17.4.1",
183
+ "yoga-layout": "file:../../vendor/yoga-layout-2.0.0-beta.1.tgz",
184
+ "@cloudflare/pages-shared": "^0.9.0",
185
+ "@cloudflare/workers-tsconfig": "0.0.0"
105
186
  },
106
- "files": [
107
- "src",
108
- "bin",
109
- "pages",
110
- "miniflare-config-stubs",
111
- "miniflare-dist",
112
- "wrangler-dist",
113
- "templates",
114
- "vendor",
115
- "import_meta_url.js",
116
- "Cloudflare_CA.pem"
117
- ],
118
- "scripts": {
119
- "clean": "rm -rf wrangler-dist miniflare-dist",
120
- "check:type": "tsc",
121
- "bundle": "node -r esbuild-register scripts/bundle.ts",
122
- "build": "npm run clean && npm run bundle",
123
- "prepublishOnly": "SOURCEMAPS=false npm run build",
124
- "start": "npm run bundle && NODE_OPTIONS=--enable-source-maps ./bin/wrangler.js",
125
- "test": "jest --silent=false --verbose=true",
126
- "test-watch": "npm run test -- --runInBand --testTimeout=50000 --watch"
187
+ "optionalDependencies": {
188
+ "fsevents": "~2.3.2"
127
189
  },
128
190
  "engines": {
129
- "node": ">=16.7.0"
191
+ "node": ">=16.13.0"
130
192
  },
131
- "jest": {
132
- "restoreMocks": true,
133
- "testTimeout": 30000,
134
- "testRegex": ".*.(test|spec)\\.[jt]sx?$",
135
- "transformIgnorePatterns": [
136
- "node_modules/(?!find-up|locate-path|p-locate|p-limit|p-timeout|p-queue|yocto-queue|path-exists|execa|strip-final-newline|npm-run-path|path-key|onetime|mimic-fn|human-signals|is-stream|get-port|supports-color|pretty-bytes)"
137
- ],
138
- "moduleNameMapper": {
139
- "clipboardy": "<rootDir>/src/__tests__/helpers/clipboardy-mock.js",
140
- "miniflare/cli": "<rootDir>/../../node_modules/miniflare/dist/src/cli.js"
141
- },
142
- "transform": {
143
- "^.+\\.c?(t|j)sx?$": [
144
- "esbuild-jest",
145
- {
146
- "sourcemap": true
147
- }
148
- ]
149
- },
150
- "setupFilesAfterEnv": [
151
- "<rootDir>/src/__tests__/jest.setup.ts"
152
- ]
193
+ "scripts": {
194
+ "assert-git-version": "node -r esbuild-register scripts/assert-git-version.ts",
195
+ "build": "pnpm run clean && pnpm run bundle && pnpm run emit-types",
196
+ "bundle": "node -r esbuild-register scripts/bundle.ts",
197
+ "check:lint": "eslint .",
198
+ "check:type": "tsc",
199
+ "clean": "rimraf wrangler-dist miniflare-dist emitted-types",
200
+ "dev": "pnpm run clean && concurrently -c black,blue --kill-others-on-fail false 'pnpm run bundle --watch' 'pnpm run check:type --watch --preserveWatchOutput'",
201
+ "emit-types": "tsc -p tsconfig.emit.json && node -r esbuild-register scripts/emit-types.ts",
202
+ "start": "pnpm run bundle && cross-env NODE_OPTIONS=--enable-source-maps ./bin/wrangler.js",
203
+ "test": "pnpm run assert-git-version && jest",
204
+ "test:ci": "pnpm run test --coverage",
205
+ "test:debug": "pnpm run test --silent=false --verbose=true",
206
+ "test:e2e": "vitest --test-timeout 240000 --single-thread --dir ./e2e run",
207
+ "test:watch": "pnpm run test --runInBand --testTimeout=50000 --watch",
208
+ "type:tests": "tsc -p ./src/__tests__/tsconfig.json && tsc -p ./e2e/tsconfig.json"
153
209
  }
154
- }
210
+ }
@@ -0,0 +1,128 @@
1
+ import { isRoutingRuleMatch } from "../pages-dev-util";
2
+
3
+ describe("isRoutingRuleMatch", () => {
4
+ it("should match rules referencing root level correctly", () => {
5
+ const routingRule = "/";
6
+
7
+ expect(isRoutingRuleMatch("/", routingRule)).toBeTruthy();
8
+ expect(isRoutingRuleMatch("/foo", routingRule)).toBeFalsy();
9
+ expect(isRoutingRuleMatch("/foo/", routingRule)).toBeFalsy();
10
+ expect(isRoutingRuleMatch("/foo/bar", routingRule)).toBeFalsy();
11
+ });
12
+
13
+ it("should match include-all rules correctly", () => {
14
+ const routingRule = "/*";
15
+
16
+ expect(isRoutingRuleMatch("/", routingRule)).toBeTruthy();
17
+ expect(isRoutingRuleMatch("/foo", routingRule)).toBeTruthy();
18
+ expect(isRoutingRuleMatch("/foo/", routingRule)).toBeTruthy();
19
+ expect(isRoutingRuleMatch("/foo/bar", routingRule)).toBeTruthy();
20
+ expect(isRoutingRuleMatch("/foo/bar/", routingRule)).toBeTruthy();
21
+ expect(isRoutingRuleMatch("/foo/bar/baz", routingRule)).toBeTruthy();
22
+ expect(isRoutingRuleMatch("/foo/bar/baz/", routingRule)).toBeTruthy();
23
+ });
24
+
25
+ it("should match `/*` suffix-ed rules correctly", () => {
26
+ let routingRule = "/foo/*";
27
+
28
+ expect(isRoutingRuleMatch("/foo", routingRule)).toBeTruthy();
29
+ expect(isRoutingRuleMatch("/foo/", routingRule)).toBeTruthy();
30
+ expect(isRoutingRuleMatch("/foobar", routingRule)).toBeFalsy();
31
+ expect(isRoutingRuleMatch("/foo/bar", routingRule)).toBeTruthy();
32
+ expect(isRoutingRuleMatch("/foo/bar/baz", routingRule)).toBeTruthy();
33
+ expect(isRoutingRuleMatch("/bar/foo", routingRule)).toBeFalsy();
34
+ expect(isRoutingRuleMatch("/bar/foo/baz", routingRule)).toBeFalsy();
35
+
36
+ routingRule = "/foo/bar/*";
37
+
38
+ expect(isRoutingRuleMatch("/foo", routingRule)).toBeFalsy();
39
+ expect(isRoutingRuleMatch("/foo/", routingRule)).toBeFalsy();
40
+ expect(isRoutingRuleMatch("/foo/bar", routingRule)).toBeTruthy();
41
+ expect(isRoutingRuleMatch("/foo/bar/baz", routingRule)).toBeTruthy();
42
+ expect(isRoutingRuleMatch("/foo/barfoo", routingRule)).toBeFalsy();
43
+ expect(isRoutingRuleMatch("baz/foo/bar", routingRule)).toBeFalsy();
44
+ expect(isRoutingRuleMatch("baz/foo/bar/", routingRule)).toBeFalsy();
45
+ });
46
+
47
+ it("should match `/` suffix-ed rules correctly", () => {
48
+ let routingRule = "/foo/";
49
+ expect(isRoutingRuleMatch("/foo/", routingRule)).toBeTruthy();
50
+ expect(isRoutingRuleMatch("/foo", routingRule)).toBeTruthy();
51
+
52
+ routingRule = "/foo/bar/";
53
+ expect(isRoutingRuleMatch("/foo/bar/", routingRule)).toBeTruthy();
54
+ expect(isRoutingRuleMatch("/foo/bar", routingRule)).toBeTruthy();
55
+ });
56
+
57
+ it("should match `*` suffix-ed rules correctly", () => {
58
+ let routingRule = "/foo*";
59
+ expect(isRoutingRuleMatch("/foo", routingRule)).toBeTruthy();
60
+ expect(isRoutingRuleMatch("/foo/", routingRule)).toBeTruthy();
61
+ expect(isRoutingRuleMatch("/foobar", routingRule)).toBeTruthy();
62
+ expect(isRoutingRuleMatch("/barfoo", routingRule)).toBeFalsy();
63
+ expect(isRoutingRuleMatch("/foo/bar", routingRule)).toBeTruthy();
64
+ expect(isRoutingRuleMatch("/bar/foo", routingRule)).toBeFalsy();
65
+ expect(isRoutingRuleMatch("/bar/foobar", routingRule)).toBeFalsy();
66
+ expect(isRoutingRuleMatch("/foo/bar/baz", routingRule)).toBeTruthy();
67
+ expect(isRoutingRuleMatch("/bar/foo/baz", routingRule)).toBeFalsy();
68
+
69
+ routingRule = "/foo/bar*";
70
+ expect(isRoutingRuleMatch("/foo/bar", routingRule)).toBeTruthy();
71
+ expect(isRoutingRuleMatch("/foo/bar/", routingRule)).toBeTruthy();
72
+ expect(isRoutingRuleMatch("/foo/barfoo", routingRule)).toBeTruthy();
73
+ expect(isRoutingRuleMatch("/bar/foo/barfoo", routingRule)).toBeFalsy();
74
+ expect(isRoutingRuleMatch("/foo/bar/baz", routingRule)).toBeTruthy();
75
+ expect(isRoutingRuleMatch("/bar/foo/bar/baz", routingRule)).toBeFalsy();
76
+ });
77
+
78
+ it("should match rules without wildcards correctly", () => {
79
+ let routingRule = "/foo";
80
+
81
+ expect(isRoutingRuleMatch("/foo", routingRule)).toBeTruthy();
82
+ expect(isRoutingRuleMatch("/foo/", routingRule)).toBeTruthy();
83
+ expect(isRoutingRuleMatch("/foo/bar", routingRule)).toBeFalsy();
84
+ expect(isRoutingRuleMatch("/bar/foo", routingRule)).toBeFalsy();
85
+
86
+ routingRule = "/foo/bar";
87
+ expect(isRoutingRuleMatch("/foo/bar", routingRule)).toBeTruthy();
88
+ expect(isRoutingRuleMatch("/foo/bar/", routingRule)).toBeTruthy();
89
+ expect(isRoutingRuleMatch("/foo/bar/baz", routingRule)).toBeFalsy();
90
+ expect(isRoutingRuleMatch("/baz/foo/bar", routingRule)).toBeFalsy();
91
+ });
92
+
93
+ it("should throw an error if pathname or routing rule params are missing", () => {
94
+ // MISSING PATHNAME
95
+ expect(() =>
96
+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
97
+ // @ts-ignore: sanity check
98
+ isRoutingRuleMatch(undefined, "/*")
99
+ ).toThrow("Pathname is undefined.");
100
+
101
+ expect(() =>
102
+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
103
+ // @ts-ignore: sanity check
104
+ isRoutingRuleMatch(null, "/*")
105
+ ).toThrow("Pathname is undefined.");
106
+
107
+ expect(() => isRoutingRuleMatch("", "/*")).toThrow(
108
+ "Pathname is undefined."
109
+ );
110
+
111
+ // MISSING ROUTING RULE
112
+ expect(() =>
113
+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
114
+ // @ts-ignore: sanity check
115
+ isRoutingRuleMatch("/foo", undefined)
116
+ ).toThrow("Routing rule is undefined.");
117
+
118
+ expect(() =>
119
+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
120
+ // @ts-ignore: sanity check
121
+ isRoutingRuleMatch("/foo", null)
122
+ ).toThrow("Routing rule is undefined.");
123
+
124
+ expect(() => isRoutingRuleMatch("/foo", "")).toThrow(
125
+ "Routing rule is undefined."
126
+ );
127
+ });
128
+ });