wrangler 0.0.0-de17dfdf → 0.0.0-de25f9ac

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.
package/package.json CHANGED
@@ -1,196 +1,210 @@
1
1
  {
2
- "name": "wrangler",
3
- "version": "0.0.0-de17dfdf",
4
- "description": "Command-line interface for all things Cloudflare Workers",
5
- "keywords": [
6
- "wrangler",
7
- "cloudflare",
8
- "workers",
9
- "cloudflare workers",
10
- "edge",
11
- "compute",
12
- "serverless",
13
- "serverless application",
14
- "serverless module",
15
- "wasm",
16
- "web",
17
- "assembly",
18
- "webassembly",
19
- "rust",
20
- "emscripten",
21
- "typescript",
22
- "graphql",
23
- "router",
24
- "http",
25
- "cli"
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
- "scripts": {
53
- "assert-git-version": "node -r esbuild-register scripts/assert-git-version.ts",
54
- "build": "npm run clean && npm run bundle && npm run emit-types",
55
- "bundle": "node -r esbuild-register scripts/bundle.ts",
56
- "check:lint": "eslint .",
57
- "check:type": "tsc",
58
- "clean": "rimraf wrangler-dist miniflare-dist emitted-types",
59
- "dev": "npm run clean && concurrently -c black,blue --kill-others-on-fail false 'npm run bundle -- --watch' 'npm run check:type -- --watch --preserveWatchOutput'",
60
- "emit-types": "tsc -p tsconfig.emit.json && node -r esbuild-register scripts/emit-types.ts",
61
- "prepublishOnly": "SOURCEMAPS=false npm run build",
62
- "start": "npm run bundle && cross-env NODE_OPTIONS=--enable-source-maps ./bin/wrangler.js",
63
- "test": "npm run assert-git-version && jest",
64
- "test:ci": "npm run test -- --coverage",
65
- "test:debug": "npm run test -- --silent=false --verbose=true",
66
- "test:e2e": "vitest --test-timeout 240000 --single-thread --dir ./e2e run",
67
- "test:watch": "npm run test -- --runInBand --testTimeout=50000 --watch",
68
- "type:tests": "tsc -p ./src/__tests__/tsconfig.json && tsc -p ./e2e/tsconfig.json"
69
- },
70
- "jest": {
71
- "coverageReporters": [
72
- "json",
73
- "html",
74
- "text",
75
- "cobertura"
76
- ],
77
- "moduleNameMapper": {
78
- "clipboardy": "<rootDir>/src/__tests__/helpers/clipboardy-mock.js",
79
- "miniflare/cli": "<rootDir>/../../node_modules/miniflare/dist/src/cli.js"
80
- },
81
- "restoreMocks": true,
82
- "setupFilesAfterEnv": [
83
- "<rootDir>/src/__tests__/jest.setup.ts"
84
- ],
85
- "testRegex": "src/__tests__/.*\\.(test|spec)\\.[jt]sx?$",
86
- "testTimeout": 50000,
87
- "transform": {
88
- "^.+\\.c?(t|j)sx?$": [
89
- "esbuild-jest",
90
- {
91
- "sourcemap": true
92
- }
93
- ]
94
- },
95
- "transformIgnorePatterns": [
96
- "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|npx-import)"
97
- ]
98
- },
99
- "dependencies": {
100
- "@cloudflare/kv-asset-handler": "^0.2.0",
101
- "@esbuild-plugins/node-globals-polyfill": "^0.1.1",
102
- "@esbuild-plugins/node-modules-polyfill": "^0.1.4",
103
- "blake3-wasm": "^2.1.5",
104
- "chokidar": "^3.5.3",
105
- "esbuild": "0.16.3",
106
- "miniflare": "3.20230628.0",
107
- "nanoid": "^3.3.3",
108
- "path-to-regexp": "^6.2.0",
109
- "selfsigned": "^2.0.1",
110
- "source-map": "^0.7.4",
111
- "xxhash-wasm": "^1.0.1"
112
- },
113
- "devDependencies": {
114
- "@cloudflare/eslint-config-worker": "*",
115
- "@cloudflare/types": "^6.18.4",
116
- "@cloudflare/workers-tsconfig": "*",
117
- "@cloudflare/workers-types": "^4.20230511.0",
118
- "@iarna/toml": "^3.0.0",
119
- "@microsoft/api-extractor": "^7.28.3",
120
- "@types/better-sqlite3": "^7.6.0",
121
- "@types/busboy": "^1.5.0",
122
- "@types/command-exists": "^1.2.0",
123
- "@types/express": "^4.17.13",
124
- "@types/glob-to-regexp": "0.4.1",
125
- "@types/javascript-time-ago": "^2.0.3",
126
- "@types/mime": "^2.0.3",
127
- "@types/prompts": "^2.0.14",
128
- "@types/react": "^17.0.37",
129
- "@types/serve-static": "^1.13.10",
130
- "@types/signal-exit": "^3.0.1",
131
- "@types/supports-color": "^8.1.1",
132
- "@types/ws": "^8.5.3",
133
- "@types/yargs": "^17.0.10",
134
- "@webcontainer/env": "^1.1.0",
135
- "body-parser": "^1.20.0",
136
- "chalk": "^2.4.2",
137
- "cli-table3": "^0.6.3",
138
- "clipboardy": "^3.0.0",
139
- "cmd-shim": "^4.1.0",
140
- "command-exists": "^1.2.9",
141
- "concurrently": "^7.2.2",
142
- "devtools-protocol": "^0.0.955664",
143
- "dotenv": "^16.0.0",
144
- "execa": "^6.1.0",
145
- "express": "^4.18.1",
146
- "finalhandler": "^1.2.0",
147
- "find-up": "^6.3.0",
148
- "get-port": "^6.1.2",
149
- "glob-to-regexp": "0.4.1",
150
- "http-terminator": "^3.2.0",
151
- "ignore": "^5.2.0",
152
- "ink": "^3.2.0",
153
- "ink-select-input": "^4.2.1",
154
- "ink-spinner": "^4.0.3",
155
- "ink-table": "^3.0.0",
156
- "ink-testing-library": "^2.1.0",
157
- "ink-text-input": "^4.0.3",
158
- "is-ci": "^3.0.1",
159
- "javascript-time-ago": "^2.5.4",
160
- "jest-fetch-mock": "^3.0.3",
161
- "jest-websocket-mock": "^2.3.0",
162
- "mime": "^3.0.0",
163
- "minimatch": "^5.1.0",
164
- "msw": "^0.49.1",
165
- "npx-import": "^1.1.3",
166
- "open": "^8.4.0",
167
- "p-queue": "^7.2.0",
168
- "pretty-bytes": "^6.0.0",
169
- "prompts": "^2.4.2",
170
- "react": "^17.0.2",
171
- "react-error-boundary": "^3.1.4",
172
- "remove-accents-esm": "^0.0.1",
173
- "semiver": "^1.1.0",
174
- "serve-static": "^1.15.0",
175
- "shellac": "^0.8.0",
176
- "signal-exit": "^3.0.7",
177
- "strip-ansi": "^7.0.1",
178
- "supports-color": "^9.2.2",
179
- "timeago.js": "^4.0.2",
180
- "tmp-promise": "^3.0.3",
181
- "ts-dedent": "^2.2.0",
182
- "undici": "5.20.0",
183
- "update-check": "^1.5.4",
184
- "vitest": "^0.31.0",
185
- "ws": "^8.5.0",
186
- "xdg-app-paths": "^7.3.0",
187
- "yargs": "^17.4.1",
188
- "yoga-layout": "file:../../vendor/yoga-layout-2.0.0-beta.1.tgz"
189
- },
190
- "optionalDependencies": {
191
- "fsevents": "~2.3.2"
192
- },
193
- "engines": {
194
- "node": ">=16.13.0"
195
- }
196
- }
2
+ "name": "wrangler",
3
+ "version": "0.0.0-de25f9ac",
4
+ "description": "Command-line interface for all things Cloudflare Workers",
5
+ "keywords": [
6
+ "wrangler",
7
+ "cloudflare",
8
+ "workers",
9
+ "cloudflare workers",
10
+ "edge",
11
+ "compute",
12
+ "serverless",
13
+ "serverless application",
14
+ "serverless module",
15
+ "wasm",
16
+ "web",
17
+ "assembly",
18
+ "webassembly",
19
+ "rust",
20
+ "emscripten",
21
+ "typescript",
22
+ "graphql",
23
+ "router",
24
+ "http",
25
+ "cli"
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
+ },
85
+ "dependencies": {
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",
89
+ "blake3-wasm": "^2.1.5",
90
+ "chokidar": "^3.5.3",
91
+ "esbuild": "0.17.19",
92
+ "miniflare": "3.20231016.0",
93
+ "nanoid": "^3.3.3",
94
+ "path-to-regexp": "^6.2.0",
95
+ "selfsigned": "^2.0.1",
96
+ "source-map": "0.6.1",
97
+ "source-map-support": "0.5.21",
98
+ "xxhash-wasm": "^1.0.1"
99
+ },
100
+ "devDependencies": {
101
+ "@cloudflare/eslint-config-worker": "*",
102
+ "@cloudflare/types": "^6.18.4",
103
+ "@cloudflare/workers-types": "^4.20230914.0",
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",
108
+ "@types/command-exists": "^1.2.0",
109
+ "@types/express": "^4.17.13",
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",
114
+ "@types/mime": "^2.0.3",
115
+ "@types/minimatch": "^5.1.2",
116
+ "@types/prompts": "^2.0.14",
117
+ "@types/react": "^17.0.37",
118
+ "@types/serve-static": "^1.13.10",
119
+ "@types/shell-quote": "^1.7.2",
120
+ "@types/signal-exit": "^3.0.1",
121
+ "@types/source-map-support": "^0.5.7",
122
+ "@types/supports-color": "^8.1.1",
123
+ "@types/ws": "^8.5.3",
124
+ "@types/yargs": "^17.0.10",
125
+ "@webcontainer/env": "^1.1.0",
126
+ "body-parser": "^1.20.0",
127
+ "chalk": "^2.4.2",
128
+ "cli-table3": "^0.6.3",
129
+ "clipboardy": "^3.0.0",
130
+ "cmd-shim": "^4.1.0",
131
+ "command-exists": "^1.2.9",
132
+ "concurrently": "^7.2.2",
133
+ "devtools-protocol": "^0.0.955664",
134
+ "dotenv": "^16.0.0",
135
+ "esbuild-jest": "0.5.0",
136
+ "execa": "^6.1.0",
137
+ "express": "^4.18.1",
138
+ "finalhandler": "^1.2.0",
139
+ "find-up": "^6.3.0",
140
+ "get-port": "^6.1.2",
141
+ "glob-to-regexp": "0.4.1",
142
+ "http-terminator": "^3.2.0",
143
+ "ignore": "^5.2.0",
144
+ "ink": "^3.2.0",
145
+ "ink-select-input": "^4.2.1",
146
+ "ink-spinner": "^4.0.3",
147
+ "ink-table": "^3.0.0",
148
+ "ink-testing-library": "^2.1.0",
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",
153
+ "jest-fetch-mock": "^3.0.3",
154
+ "jest-websocket-mock": "^2.5.0",
155
+ "mime": "^3.0.0",
156
+ "minimatch": "^5.1.0",
157
+ "msw": "^0.49.1",
158
+ "npx-import": "^1.1.3",
159
+ "open": "^8.4.0",
160
+ "p-queue": "^7.2.0",
161
+ "patch-console": "^1.0.0",
162
+ "pretty-bytes": "^6.0.0",
163
+ "prompts": "^2.4.2",
164
+ "react": "^17.0.2",
165
+ "react-error-boundary": "^3.1.4",
166
+ "remove-accents-esm": "^0.0.1",
167
+ "semiver": "^1.1.0",
168
+ "serve-static": "^1.15.0",
169
+ "shell-quote": "^1.8.1",
170
+ "shellac": "^0.8.0",
171
+ "signal-exit": "^3.0.7",
172
+ "strip-ansi": "^7.0.1",
173
+ "supports-color": "^9.2.2",
174
+ "timeago.js": "^4.0.2",
175
+ "tmp-promise": "^3.0.3",
176
+ "ts-dedent": "^2.2.0",
177
+ "undici": "5.20.0",
178
+ "update-check": "^1.5.4",
179
+ "vitest": "^0.34.4",
180
+ "ws": "^8.5.0",
181
+ "xdg-app-paths": "^8.3.0",
182
+ "yargs": "^17.7.2",
183
+ "yoga-layout": "file:../../vendor/yoga-layout-2.0.0-beta.1.tgz",
184
+ "@cloudflare/pages-shared": "^0.10.1",
185
+ "@cloudflare/workers-tsconfig": "0.0.0"
186
+ },
187
+ "optionalDependencies": {
188
+ "fsevents": "~2.3.2"
189
+ },
190
+ "engines": {
191
+ "node": ">=16.13.0"
192
+ },
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"
209
+ }
210
+ }
@@ -62,9 +62,11 @@ function getMaskedEnv(rawEnv: unknown) {
62
62
  */
63
63
  type MissingExportHandlers = Omit<
64
64
  Required<ExportedHandler>,
65
- "tail" | "trace" | "scheduled" | "queue" | "test" | "fetch"
65
+ "tail" | "trace" | "scheduled" | "queue" | "test" | "email" | "fetch"
66
66
  >;
67
67
 
68
+ let registeredMiddleware = false;
69
+
68
70
  const facade: ExportedHandler<unknown> & MissingExportHandlers = {
69
71
  ...(worker.tail && {
70
72
  tail: maskHandlerEnv(worker.tail),
@@ -81,13 +83,21 @@ const facade: ExportedHandler<unknown> & MissingExportHandlers = {
81
83
  ...(worker.test && {
82
84
  test: maskHandlerEnv(worker.test),
83
85
  }),
86
+ ...(worker.email && {
87
+ email: maskHandlerEnv(worker.email),
88
+ }),
84
89
 
85
90
  fetch(request, rawEnv, ctx) {
86
91
  const env = getMaskedEnv(rawEnv);
87
92
  // Get the chain of middleware from the worker object
88
93
  if (worker.middleware && worker.middleware.length > 0) {
89
- for (const middleware of worker.middleware) {
90
- __facade_register__(middleware);
94
+ // Make sure we only register middleware once:
95
+ // https://github.com/cloudflare/workers-sdk/issues/2386#issuecomment-1614715911
96
+ if (!registeredMiddleware) {
97
+ registeredMiddleware = true;
98
+ for (const middleware of worker.middleware) {
99
+ __facade_register__(middleware);
100
+ }
91
101
  }
92
102
 
93
103
  const __facade_modules_dispatch__: Dispatcher = function (type, init) {
@@ -30,3 +30,4 @@ const jsonError: Middleware = async (request, env, _ctx, middlewareCtx) => {
30
30
  };
31
31
 
32
32
  export default jsonError;
33
+ export const wrap = undefined;
@@ -4,6 +4,42 @@
4
4
  import { workers } from "config:middleware/multiworker-dev";
5
5
  import type { WorkerRegistry } from "../../src/dev-registry";
6
6
 
7
+ class Fetcher {
8
+ #name: string;
9
+ #details: WorkerRegistry[string];
10
+ constructor(name: string, details: WorkerRegistry[string]) {
11
+ this.#name = name;
12
+ this.#details = details;
13
+ }
14
+
15
+ async fetch(...reqArgs: Parameters<Fetcher["fetch"]>) {
16
+ const reqFromArgs = new Request(...reqArgs);
17
+ if (this.#details.headers) {
18
+ for (const [key, value] of Object.entries(this.#details.headers)) {
19
+ // In remote mode, you need to add a couple of headers
20
+ // to make sure it's talking to the 'dev' preview session
21
+ // (much like wrangler dev already does via proxy.ts)
22
+ reqFromArgs.headers.set(key, value);
23
+ }
24
+ return (env[this.#name] as Fetcher).fetch(reqFromArgs);
25
+ }
26
+
27
+ const url = new URL(reqFromArgs.url);
28
+ if (this.#details.protocol !== undefined) {
29
+ url.protocol = this.#details.protocol;
30
+ }
31
+ if (this.#details.host !== undefined) {
32
+ url.host = this.#details.host;
33
+ }
34
+ if (this.#details.port !== undefined) {
35
+ url.port = this.#details.port.toString();
36
+ }
37
+
38
+ const request = new Request(url.toString(), reqFromArgs);
39
+ return fetch(request);
40
+ }
41
+ }
42
+
7
43
  export function wrap(env: Record<string, unknown>) {
8
44
  const facadeEnv = { ...env };
9
45
  // For every Worker definition that's available,
@@ -14,34 +50,7 @@ export function wrap(env: Record<string, unknown>) {
14
50
 
15
51
  for (const [name, details] of Object.entries(workers as WorkerRegistry)) {
16
52
  if (details) {
17
- facadeEnv[name] = {
18
- async fetch(...reqArgs: Parameters<Fetcher["fetch"]>) {
19
- const reqFromArgs = new Request(...reqArgs);
20
- if (details.headers) {
21
- for (const [key, value] of Object.entries(details.headers)) {
22
- // In remote mode, you need to add a couple of headers
23
- // to make sure it's talking to the 'dev' preview session
24
- // (much like wrangler dev already does via proxy.ts)
25
- reqFromArgs.headers.set(key, value);
26
- }
27
- return (env[name] as Fetcher).fetch(reqFromArgs);
28
- }
29
-
30
- const url = new URL(reqFromArgs.url);
31
- if (details.protocol !== undefined) {
32
- url.protocol = details.protocol;
33
- }
34
- if (details.host !== undefined) {
35
- url.host = details.host;
36
- }
37
- if (details.port !== undefined) {
38
- url.port = details.port.toString();
39
- }
40
-
41
- const request = new Request(url.toString(), reqFromArgs);
42
- return fetch(request);
43
- },
44
- };
53
+ facadeEnv[name] = new Fetcher(name, details);
45
54
  } else {
46
55
  // This means there's no dev binding available.
47
56
  // Let's use whatever's available, or put a shim with a message.
@@ -0,0 +1,4 @@
1
+ // `esbuild` doesn't support returning `watch*` options from `onStart()`
2
+ // plugin callbacks. Instead, we define an empty virtual module that is
3
+ // imported by this injected file. Importing the module registers watchers.
4
+ import "wrangler:modules-watch";