wrangler 0.0.0-e978986 → 0.0.0-e981d0be5

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 (187) hide show
  1. package/README.md +46 -36
  2. package/bin/wrangler.js +82 -69
  3. package/config-schema.json +2278 -0
  4. package/kv-asset-handler.js +1 -0
  5. package/package.json +131 -102
  6. package/templates/__tests__/pages-dev-util.test.ts +128 -0
  7. package/templates/__tests__/tsconfig-sanity.ts +12 -0
  8. package/templates/__tests__/tsconfig.json +8 -0
  9. package/templates/checked-fetch.js +30 -0
  10. package/templates/facade.d.ts +19 -0
  11. package/templates/gitignore +2 -3
  12. package/templates/init-tests/test-jest-new-worker.js +23 -0
  13. package/templates/init-tests/test-vitest-new-worker.js +24 -0
  14. package/templates/init-tests/test-vitest-new-worker.ts +25 -0
  15. package/templates/middleware/common.ts +67 -0
  16. package/templates/middleware/loader-modules.ts +134 -0
  17. package/templates/middleware/loader-sw.ts +229 -0
  18. package/templates/middleware/middleware-ensure-req-body-drained.ts +18 -0
  19. package/templates/middleware/middleware-miniflare3-json-error.ts +32 -0
  20. package/templates/middleware/middleware-mock-analytics-engine.d.ts +3 -0
  21. package/templates/middleware/middleware-mock-analytics-engine.ts +30 -0
  22. package/templates/middleware/middleware-patch-console-prefix.d.ts +3 -0
  23. package/templates/middleware/middleware-patch-console-prefix.ts +21 -0
  24. package/templates/middleware/middleware-pretty-error.ts +40 -0
  25. package/templates/middleware/middleware-scheduled.ts +29 -0
  26. package/templates/modules-watch-stub.js +4 -0
  27. package/templates/new-worker-scheduled.js +4 -4
  28. package/templates/new-worker-scheduled.ts +17 -17
  29. package/templates/new-worker.js +3 -3
  30. package/templates/new-worker.ts +19 -16
  31. package/templates/no-op-worker.js +10 -0
  32. package/templates/pages-dev-pipeline.ts +33 -0
  33. package/templates/pages-dev-util.ts +55 -0
  34. package/templates/pages-shim.ts +9 -0
  35. package/templates/pages-template-plugin.ts +190 -0
  36. package/templates/pages-template-worker.ts +198 -0
  37. package/templates/startDevWorker/InspectorProxyWorker.ts +679 -0
  38. package/templates/startDevWorker/ProxyWorker.ts +336 -0
  39. package/templates/tsconfig-sanity.ts +11 -0
  40. package/templates/tsconfig.init.json +22 -0
  41. package/templates/tsconfig.json +13 -103
  42. package/templates/tsconfig.tsbuildinfo +1 -0
  43. package/wrangler-dist/InspectorProxyWorker.js +471 -0
  44. package/wrangler-dist/InspectorProxyWorker.js.map +6 -0
  45. package/wrangler-dist/ProxyWorker.js +238 -0
  46. package/wrangler-dist/ProxyWorker.js.map +6 -0
  47. package/wrangler-dist/cli.d.ts +26693 -0
  48. package/wrangler-dist/cli.js +148246 -120054
  49. package/Cloudflare_CA.pem +0 -18
  50. package/import_meta_url.js +0 -3
  51. package/miniflare-config-stubs/.env.empty +0 -0
  52. package/miniflare-config-stubs/package.empty.json +0 -1
  53. package/miniflare-config-stubs/wrangler.empty.toml +0 -0
  54. package/miniflare-dist/index.mjs +0 -4886
  55. package/pages/functions/buildPlugin.ts +0 -105
  56. package/pages/functions/buildWorker.ts +0 -151
  57. package/pages/functions/filepath-routing.test.ts +0 -234
  58. package/pages/functions/filepath-routing.ts +0 -189
  59. package/pages/functions/identifiers.ts +0 -78
  60. package/pages/functions/routes.ts +0 -156
  61. package/pages/functions/template-plugin.ts +0 -147
  62. package/pages/functions/template-worker.ts +0 -143
  63. package/src/__tests__/config-cache.test.ts +0 -36
  64. package/src/__tests__/configuration.test.ts +0 -3374
  65. package/src/__tests__/dev.test.tsx +0 -980
  66. package/src/__tests__/guess-worker-format.test.ts +0 -85
  67. package/src/__tests__/helpers/clipboardy-mock.js +0 -4
  68. package/src/__tests__/helpers/cmd-shim.d.ts +0 -11
  69. package/src/__tests__/helpers/faye-websocket.d.ts +0 -6
  70. package/src/__tests__/helpers/mock-account-id.ts +0 -48
  71. package/src/__tests__/helpers/mock-bin.ts +0 -36
  72. package/src/__tests__/helpers/mock-cfetch.ts +0 -211
  73. package/src/__tests__/helpers/mock-console.ts +0 -87
  74. package/src/__tests__/helpers/mock-dialogs.ts +0 -130
  75. package/src/__tests__/helpers/mock-http-server.ts +0 -46
  76. package/src/__tests__/helpers/mock-istty.ts +0 -27
  77. package/src/__tests__/helpers/mock-kv.ts +0 -33
  78. package/src/__tests__/helpers/mock-oauth-flow.ts +0 -255
  79. package/src/__tests__/helpers/mock-stdin.ts +0 -103
  80. package/src/__tests__/helpers/mock-web-socket.ts +0 -29
  81. package/src/__tests__/helpers/run-in-tmp.ts +0 -39
  82. package/src/__tests__/helpers/run-wrangler.ts +0 -16
  83. package/src/__tests__/helpers/write-worker-source.ts +0 -31
  84. package/src/__tests__/helpers/write-wrangler-toml.ts +0 -17
  85. package/src/__tests__/https-options.test.ts +0 -130
  86. package/src/__tests__/index.test.ts +0 -256
  87. package/src/__tests__/init.test.ts +0 -1567
  88. package/src/__tests__/jest.setup.ts +0 -77
  89. package/src/__tests__/kv.test.ts +0 -1481
  90. package/src/__tests__/logger.test.ts +0 -115
  91. package/src/__tests__/package-manager.test.ts +0 -353
  92. package/src/__tests__/pages.test.ts +0 -657
  93. package/src/__tests__/parse.test.ts +0 -330
  94. package/src/__tests__/publish.test.ts +0 -5468
  95. package/src/__tests__/r2.test.ts +0 -233
  96. package/src/__tests__/route.test.ts +0 -45
  97. package/src/__tests__/secret.test.ts +0 -481
  98. package/src/__tests__/tail.test.ts +0 -690
  99. package/src/__tests__/user.test.ts +0 -131
  100. package/src/__tests__/whoami.test.tsx +0 -105
  101. package/src/abort.d.ts +0 -3
  102. package/src/bundle.ts +0 -200
  103. package/src/cfetch/index.ts +0 -121
  104. package/src/cfetch/internal.ts +0 -145
  105. package/src/cli.ts +0 -13
  106. package/src/config/README.md +0 -107
  107. package/src/config/config.ts +0 -234
  108. package/src/config/diagnostics.ts +0 -80
  109. package/src/config/environment.ts +0 -420
  110. package/src/config/index.ts +0 -225
  111. package/src/config/validation-helpers.ts +0 -575
  112. package/src/config/validation.ts +0 -1539
  113. package/src/config-cache.ts +0 -45
  114. package/src/create-worker-preview.ts +0 -185
  115. package/src/create-worker-upload-form.ts +0 -254
  116. package/src/dev/dev-vars.ts +0 -36
  117. package/src/dev/dev.tsx +0 -419
  118. package/src/dev/local.tsx +0 -318
  119. package/src/dev/remote.tsx +0 -227
  120. package/src/dev/use-esbuild.ts +0 -118
  121. package/src/dialogs.tsx +0 -135
  122. package/src/durable.ts +0 -102
  123. package/src/entry.ts +0 -322
  124. package/src/environment-variables.ts +0 -35
  125. package/src/errors.ts +0 -11
  126. package/src/https-options.ts +0 -123
  127. package/src/index.tsx +0 -2848
  128. package/src/inspect.ts +0 -662
  129. package/src/intl-polyfill.d.ts +0 -139
  130. package/src/kv.ts +0 -408
  131. package/src/logger.ts +0 -66
  132. package/src/miniflare-cli/README.md +0 -30
  133. package/src/miniflare-cli/enum-keys.ts +0 -17
  134. package/src/miniflare-cli/index.ts +0 -41
  135. package/src/miniflare-cli/request-context.ts +0 -40
  136. package/src/module-collection.ts +0 -258
  137. package/src/open-in-browser.ts +0 -19
  138. package/src/package-manager.ts +0 -174
  139. package/src/pages.tsx +0 -2027
  140. package/src/parse.ts +0 -202
  141. package/src/paths.ts +0 -26
  142. package/src/proxy.ts +0 -465
  143. package/src/publish.ts +0 -583
  144. package/src/r2.ts +0 -50
  145. package/src/selfsigned.d.ts +0 -29
  146. package/src/sites.tsx +0 -295
  147. package/src/tail/filters.ts +0 -279
  148. package/src/tail/index.ts +0 -299
  149. package/src/tail/printing.ts +0 -67
  150. package/src/update-check.ts +0 -19
  151. package/src/user.tsx +0 -1203
  152. package/src/whoami.tsx +0 -70
  153. package/src/worker.ts +0 -180
  154. package/templates/static-asset-facade.js +0 -47
  155. package/vendor/@cloudflare/kv-asset-handler/CHANGELOG.md +0 -332
  156. package/vendor/@cloudflare/kv-asset-handler/LICENSE_APACHE +0 -176
  157. package/vendor/@cloudflare/kv-asset-handler/LICENSE_MIT +0 -25
  158. package/vendor/@cloudflare/kv-asset-handler/README.md +0 -245
  159. package/vendor/@cloudflare/kv-asset-handler/dist/index.d.ts +0 -32
  160. package/vendor/@cloudflare/kv-asset-handler/dist/index.js +0 -354
  161. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.d.ts +0 -13
  162. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.js +0 -148
  163. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.d.ts +0 -1
  164. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.js +0 -436
  165. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.d.ts +0 -1
  166. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.js +0 -40
  167. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.d.ts +0 -1
  168. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.js +0 -42
  169. package/vendor/@cloudflare/kv-asset-handler/dist/types.d.ts +0 -26
  170. package/vendor/@cloudflare/kv-asset-handler/dist/types.js +0 -31
  171. package/vendor/@cloudflare/kv-asset-handler/package.json +0 -52
  172. package/vendor/@cloudflare/kv-asset-handler/src/index.ts +0 -296
  173. package/vendor/@cloudflare/kv-asset-handler/src/mocks.ts +0 -136
  174. package/vendor/@cloudflare/kv-asset-handler/src/test/getAssetFromKV.ts +0 -464
  175. package/vendor/@cloudflare/kv-asset-handler/src/test/mapRequestToAsset.ts +0 -33
  176. package/vendor/@cloudflare/kv-asset-handler/src/test/serveSinglePageApp.ts +0 -42
  177. package/vendor/@cloudflare/kv-asset-handler/src/types.ts +0 -39
  178. package/vendor/wrangler-mime/CHANGELOG.md +0 -289
  179. package/vendor/wrangler-mime/LICENSE +0 -21
  180. package/vendor/wrangler-mime/Mime.js +0 -97
  181. package/vendor/wrangler-mime/README.md +0 -187
  182. package/vendor/wrangler-mime/cli.js +0 -46
  183. package/vendor/wrangler-mime/index.js +0 -4
  184. package/vendor/wrangler-mime/lite.js +0 -4
  185. package/vendor/wrangler-mime/package.json +0 -52
  186. package/vendor/wrangler-mime/types/other.js +0 -1
  187. package/vendor/wrangler-mime/types/standard.js +0 -1
@@ -1,78 +0,0 @@
1
- export const RESERVED_KEYWORDS = [
2
- "do",
3
- "if",
4
- "in",
5
- "for",
6
- "let",
7
- "new",
8
- "try",
9
- "var",
10
- "case",
11
- "else",
12
- "enum",
13
- "eval",
14
- "null",
15
- "this",
16
- "true",
17
- "void",
18
- "with",
19
- "await",
20
- "break",
21
- "catch",
22
- "class",
23
- "const",
24
- "false",
25
- "super",
26
- "throw",
27
- "while",
28
- "yield",
29
- "delete",
30
- "export",
31
- "import",
32
- "public",
33
- "return",
34
- "static",
35
- "switch",
36
- "typeof",
37
- "default",
38
- "extends",
39
- "finally",
40
- "package",
41
- "private",
42
- "continue",
43
- "debugger",
44
- "function",
45
- "arguments",
46
- "interface",
47
- "protected",
48
- "implements",
49
- "instanceof",
50
- "NaN",
51
- "Infinity",
52
- "undefined",
53
- ];
54
-
55
- export const reservedKeywordRegex = new RegExp(
56
- `^${RESERVED_KEYWORDS.join("|")}$`
57
- );
58
-
59
- export const identifierStartRegex = /[$_\p{ID_Start}]/u;
60
-
61
- export const identifierPartRegex = /[$_\u200C\u200D\p{ID_Continue}]/u;
62
-
63
- export const identifierNameRegex =
64
- /^(?:[$_\p{ID_Start}])(?:[$_\u200C\u200D\p{ID_Continue}])*$/u;
65
-
66
- export const validIdentifierRegex = new RegExp(
67
- `(?!(${reservedKeywordRegex.source})$)${identifierNameRegex.source}`,
68
- "u"
69
- );
70
-
71
- export const isValidIdentifier = (identifier: string) =>
72
- validIdentifierRegex.test(identifier);
73
-
74
- export const normalizeIdentifier = (identifier: string) =>
75
- identifier.replace(
76
- /(?:^[^$_\p{ID_Start}])|[^$_\u200C\u200D\p{ID_Continue}]/gu,
77
- "_"
78
- );
@@ -1,156 +0,0 @@
1
- import fs from "node:fs/promises";
2
- import path from "node:path";
3
- import { isValidIdentifier, normalizeIdentifier } from "./identifiers";
4
- import type { UrlPath } from "../../src/paths";
5
-
6
- export const HTTP_METHODS = [
7
- "HEAD",
8
- "OPTIONS",
9
- "GET",
10
- "POST",
11
- "PUT",
12
- "PATCH",
13
- "DELETE",
14
- ] as const;
15
- export type HTTPMethod = typeof HTTP_METHODS[number];
16
- export function isHTTPMethod(
17
- maybeHTTPMethod: string
18
- ): maybeHTTPMethod is HTTPMethod {
19
- return (HTTP_METHODS as readonly string[]).includes(maybeHTTPMethod);
20
- }
21
-
22
- export type RoutesCollection = Array<{
23
- routePath: UrlPath;
24
- mountPath: UrlPath;
25
- method?: HTTPMethod;
26
- modules: string[];
27
- middlewares: string[];
28
- }>;
29
-
30
- export type Config = {
31
- routes?: RouteConfig[];
32
- schedules?: unknown;
33
- };
34
-
35
- export type RouteConfig = {
36
- routePath: UrlPath;
37
- mountPath: UrlPath;
38
- method?: HTTPMethod;
39
- middleware?: string | string[];
40
- module?: string | string[];
41
- };
42
-
43
- type ImportMap = Map<
44
- string,
45
- {
46
- filepath: string;
47
- name: string;
48
- identifier: string;
49
- }
50
- >;
51
-
52
- type Arguments = {
53
- config: Config;
54
- outfile: string;
55
- srcDir: string;
56
- };
57
-
58
- export async function writeRoutesModule({
59
- config,
60
- srcDir,
61
- outfile = "_routes.js",
62
- }: Arguments) {
63
- const { importMap, routes } = parseConfig(config, srcDir);
64
- const routesModule = generateRoutesModule(importMap, routes);
65
-
66
- await fs.writeFile(outfile, routesModule);
67
-
68
- return outfile;
69
- }
70
-
71
- export function parseConfig(config: Config, baseDir: string) {
72
- const routes: RoutesCollection = [];
73
- const importMap: ImportMap = new Map();
74
- const identifierCount = new Map<string, number>(); // to keep track of identifier collisions
75
-
76
- function parseModuleIdentifiers(paths: string | string[] | undefined) {
77
- if (typeof paths === "undefined") {
78
- paths = [];
79
- }
80
-
81
- if (typeof paths === "string") {
82
- paths = [paths];
83
- }
84
-
85
- return paths.map((modulePath) => {
86
- const [filepath, name = "default"] = modulePath.split(":");
87
- let { identifier } = importMap.get(modulePath) ?? {};
88
-
89
- const resolvedPath = path.resolve(baseDir, filepath);
90
-
91
- // ensure the filepath isn't attempting to resolve to anything outside of the project
92
- if (path.relative(baseDir, resolvedPath).startsWith("..")) {
93
- throw new Error(`Invalid module path "${filepath}"`);
94
- }
95
-
96
- // ensure the module name (if provided) is a valid identifier to guard against injection attacks
97
- if (name !== "default" && !isValidIdentifier(name)) {
98
- throw new Error(`Invalid module identifier "${name}"`);
99
- }
100
-
101
- if (!identifier) {
102
- identifier = normalizeIdentifier(`__${filepath}_${name}`);
103
-
104
- let count = identifierCount.get(identifier) ?? 0;
105
- identifierCount.set(identifier, ++count);
106
-
107
- if (count > 1) {
108
- identifier += `_${count}`;
109
- }
110
-
111
- importMap.set(modulePath, { filepath: resolvedPath, name, identifier });
112
- }
113
-
114
- return identifier;
115
- });
116
- }
117
-
118
- for (const { routePath, mountPath, method, ...props } of config.routes ??
119
- []) {
120
- routes.push({
121
- routePath,
122
- mountPath,
123
- method,
124
- middlewares: parseModuleIdentifiers(props.middleware),
125
- modules: parseModuleIdentifiers(props.module),
126
- });
127
- }
128
-
129
- return { routes, importMap };
130
- }
131
-
132
- export function generateRoutesModule(
133
- importMap: ImportMap,
134
- routes: RoutesCollection
135
- ) {
136
- return `${[...importMap.values()]
137
- .map(
138
- ({ filepath, name, identifier }) =>
139
- `import { ${name} as ${identifier} } from ${JSON.stringify(filepath)}`
140
- )
141
- .join("\n")}
142
-
143
- export const routes = [
144
- ${routes
145
- .map(
146
- (route) => ` {
147
- routePath: "${route.routePath}",
148
- mountPath: "${route.mountPath}",
149
- method: "${route.method}",
150
- middlewares: [${route.middlewares.join(", ")}],
151
- modules: [${route.modules.join(", ")}],
152
- },`
153
- )
154
- .join("\n")}
155
- ]`;
156
- }
@@ -1,147 +0,0 @@
1
- import { match } from "path-to-regexp";
2
- import type { HTTPMethod } from "./routes";
3
-
4
- /* TODO: Grab these from @cloudflare/workers-types instead */
5
- type Params<P extends string = string> = Record<P, string | string[]>;
6
-
7
- type EventContext<Env, P extends string, Data> = {
8
- request: Request;
9
- functionPath: string;
10
- waitUntil: (promise: Promise<unknown>) => void;
11
- next: (input?: Request | string, init?: RequestInit) => Promise<Response>;
12
- env: Env & { ASSETS: { fetch: typeof fetch } };
13
- params: Params<P>;
14
- data: Data;
15
- };
16
-
17
- type EventPluginContext<Env, P extends string, Data, PluginArgs> = {
18
- request: Request;
19
- functionPath: string;
20
- waitUntil: (promise: Promise<unknown>) => void;
21
- next: (input?: Request | string, init?: RequestInit) => Promise<Response>;
22
- env: Env & { ASSETS: { fetch: typeof fetch } };
23
- params: Params<P>;
24
- data: Data;
25
- pluginArgs: PluginArgs;
26
- };
27
-
28
- declare type PagesFunction<
29
- Env = unknown,
30
- P extends string = string,
31
- Data extends Record<string, unknown> = Record<string, unknown>
32
- > = (context: EventContext<Env, P, Data>) => Response | Promise<Response>;
33
-
34
- declare type PagesPluginFunction<
35
- Env = unknown,
36
- P extends string = string,
37
- Data extends Record<string, unknown> = Record<string, unknown>,
38
- PluginArgs = unknown
39
- > = (
40
- context: EventPluginContext<Env, P, Data, PluginArgs>
41
- ) => Response | Promise<Response>;
42
- /* end @cloudflare/workers-types */
43
-
44
- type RouteHandler = {
45
- routePath: string;
46
- mountPath: string;
47
- method?: HTTPMethod;
48
- modules: PagesFunction[];
49
- middlewares: PagesFunction[];
50
- };
51
-
52
- // inject `routes` via ESBuild
53
- declare const routes: RouteHandler[];
54
-
55
- function* executeRequest(request: Request, relativePathname: string) {
56
- // First, iterate through the routes (backwards) and execute "middlewares" on partial route matches
57
- for (const route of [...routes].reverse()) {
58
- if (route.method && route.method !== request.method) {
59
- continue;
60
- }
61
-
62
- const routeMatcher = match(route.routePath, { end: false });
63
- const mountMatcher = match(route.mountPath, { end: false });
64
- const matchResult = routeMatcher(relativePathname);
65
- const mountMatchResult = mountMatcher(relativePathname);
66
- if (matchResult && mountMatchResult) {
67
- for (const handler of route.middlewares.flat()) {
68
- yield {
69
- handler,
70
- params: matchResult.params as Params,
71
- path: mountMatchResult.path,
72
- };
73
- }
74
- }
75
- }
76
-
77
- // Then look for the first exact route match and execute its "modules"
78
- for (const route of routes) {
79
- if (route.method && route.method !== request.method) {
80
- continue;
81
- }
82
-
83
- const routeMatcher = match(route.routePath, { end: true });
84
- const mountMatcher = match(route.mountPath, { end: false });
85
- const matchResult = routeMatcher(relativePathname);
86
- const mountMatchResult = mountMatcher(relativePathname);
87
- if (matchResult && mountMatchResult && route.modules.length) {
88
- for (const handler of route.modules.flat()) {
89
- yield {
90
- handler,
91
- params: matchResult.params as Params,
92
- path: matchResult.path,
93
- };
94
- }
95
- break;
96
- }
97
- }
98
- }
99
-
100
- export default function (pluginArgs) {
101
- const onRequest: PagesPluginFunction = async (workerContext) => {
102
- let { request } = workerContext;
103
- const { env, next, data } = workerContext;
104
-
105
- const url = new URL(request.url);
106
- const relativePathname = `/${
107
- url.pathname.split(workerContext.functionPath)[1] || ""
108
- }`.replace(/^\/\//, "/");
109
-
110
- const handlerIterator = executeRequest(request, relativePathname);
111
- const pluginNext = async (input?: RequestInfo, init?: RequestInit) => {
112
- if (input !== undefined) {
113
- request = new Request(input, init);
114
- }
115
-
116
- const result = handlerIterator.next();
117
- // Note we can't use `!result.done` because this doesn't narrow to the correct type
118
- if (result.done === false) {
119
- const { handler, params, path } = result.value;
120
- const context = {
121
- request,
122
- functionPath: workerContext.functionPath + path,
123
- next: pluginNext,
124
- params,
125
- data,
126
- pluginArgs,
127
- env,
128
- waitUntil: workerContext.waitUntil.bind(workerContext),
129
- };
130
-
131
- const response = await handler(context);
132
-
133
- // https://fetch.spec.whatwg.org/#null-body-status
134
- return new Response(
135
- [101, 204, 205, 304].includes(response.status) ? null : response.body,
136
- { ...response, headers: new Headers(response.headers) }
137
- );
138
- } else {
139
- return next();
140
- }
141
- };
142
-
143
- return pluginNext();
144
- };
145
-
146
- return onRequest;
147
- }
@@ -1,143 +0,0 @@
1
- import { match } from "path-to-regexp";
2
- import type { HTTPMethod } from "./routes";
3
-
4
- /* TODO: Grab these from @cloudflare/workers-types instead */
5
- type Params<P extends string = string> = Record<P, string | string[]>;
6
-
7
- type EventContext<Env, P extends string, Data> = {
8
- request: Request;
9
- functionPath: string;
10
- waitUntil: (promise: Promise<unknown>) => void;
11
- next: (input?: Request | string, init?: RequestInit) => Promise<Response>;
12
- env: Env & { ASSETS: { fetch: typeof fetch } };
13
- params: Params<P>;
14
- data: Data;
15
- };
16
-
17
- declare type PagesFunction<
18
- Env = unknown,
19
- P extends string = string,
20
- Data extends Record<string, unknown> = Record<string, unknown>
21
- > = (context: EventContext<Env, P, Data>) => Response | Promise<Response>;
22
- /* end @cloudflare/workers-types */
23
-
24
- type RouteHandler = {
25
- routePath: string;
26
- mountPath: string;
27
- method?: HTTPMethod;
28
- modules: PagesFunction[];
29
- middlewares: PagesFunction[];
30
- };
31
-
32
- // inject `routes` via ESBuild
33
- declare const routes: RouteHandler[];
34
- // define `__FALLBACK_SERVICE__` via ESBuild
35
- declare const __FALLBACK_SERVICE__: string;
36
-
37
- // expect an ASSETS fetcher binding pointing to the asset-server stage
38
- type FetchEnv = {
39
- [name: string]: { fetch: typeof fetch };
40
- ASSETS: { fetch: typeof fetch };
41
- };
42
-
43
- type WorkerContext = {
44
- waitUntil: (promise: Promise<unknown>) => void;
45
- };
46
-
47
- function* executeRequest(request: Request) {
48
- const requestPath = new URL(request.url).pathname;
49
-
50
- // First, iterate through the routes (backwards) and execute "middlewares" on partial route matches
51
- for (const route of [...routes].reverse()) {
52
- if (route.method && route.method !== request.method) {
53
- continue;
54
- }
55
-
56
- const routeMatcher = match(route.routePath, { end: false });
57
- const mountMatcher = match(route.mountPath, { end: false });
58
- const matchResult = routeMatcher(requestPath);
59
- const mountMatchResult = mountMatcher(requestPath);
60
- if (matchResult && mountMatchResult) {
61
- for (const handler of route.middlewares.flat()) {
62
- yield {
63
- handler,
64
- params: matchResult.params as Params,
65
- path: mountMatchResult.path,
66
- };
67
- }
68
- }
69
- }
70
-
71
- // Then look for the first exact route match and execute its "modules"
72
- for (const route of routes) {
73
- if (route.method && route.method !== request.method) {
74
- continue;
75
- }
76
-
77
- const routeMatcher = match(route.routePath, { end: true });
78
- const mountMatcher = match(route.mountPath, { end: false });
79
- const matchResult = routeMatcher(requestPath);
80
- const mountMatchResult = mountMatcher(requestPath);
81
- if (matchResult && mountMatchResult && route.modules.length) {
82
- for (const handler of route.modules.flat()) {
83
- yield {
84
- handler,
85
- params: matchResult.params as Params,
86
- path: matchResult.path,
87
- };
88
- }
89
- break;
90
- }
91
- }
92
- }
93
-
94
- export default {
95
- async fetch(request: Request, env: FetchEnv, workerContext: WorkerContext) {
96
- const handlerIterator = executeRequest(request);
97
- const data = {}; // arbitrary data the user can set between functions
98
- const next = async (input?: RequestInfo, init?: RequestInit) => {
99
- if (input !== undefined) {
100
- let url = input;
101
- if (typeof input === "string") {
102
- url = new URL(input, request.url).toString();
103
- }
104
- request = new Request(url, init);
105
- }
106
-
107
- const result = handlerIterator.next();
108
- // Note we can't use `!result.done` because this doesn't narrow to the correct type
109
- if (result.done === false) {
110
- const { handler, params, path } = result.value;
111
- const context = {
112
- request: new Request(request.clone()),
113
- functionPath: path,
114
- next,
115
- params,
116
- data,
117
- env,
118
- waitUntil: workerContext.waitUntil.bind(workerContext),
119
- };
120
-
121
- const response = await handler(context);
122
-
123
- // https://fetch.spec.whatwg.org/#null-body-status
124
- return new Response(
125
- [101, 204, 205, 304].includes(response.status) ? null : response.body,
126
- { ...response, headers: new Headers(response.headers) }
127
- );
128
- } else if (__FALLBACK_SERVICE__) {
129
- // There are no more handlers so finish with the fallback service (`env.ASSETS.fetch` in Pages' case)
130
- return env[__FALLBACK_SERVICE__].fetch(request);
131
- } else {
132
- // There was not fallback service so actually make the request to the origin.
133
- return fetch(request);
134
- }
135
- };
136
-
137
- try {
138
- return next();
139
- } catch (err) {
140
- return new Response("Internal Error", { status: 500 });
141
- }
142
- },
143
- };
@@ -1,36 +0,0 @@
1
- import { getConfigCache, saveToConfigCache } from "../config-cache";
2
- import { runInTempDir } from "./helpers/run-in-tmp";
3
-
4
- interface PagesConfigCache {
5
- account_id: string;
6
- pages_project_name: string;
7
- }
8
-
9
- describe("config cache", () => {
10
- runInTempDir();
11
-
12
- const pagesConfigCacheFilename = "pages-config-cache.json";
13
-
14
- it("should return an empty config if no file exists", () => {
15
- expect(
16
- getConfigCache<PagesConfigCache>(pagesConfigCacheFilename)
17
- ).toMatchInlineSnapshot(`Object {}`);
18
- });
19
-
20
- it("should read and write values without overriding old ones", () => {
21
- saveToConfigCache<PagesConfigCache>(pagesConfigCacheFilename, {
22
- account_id: "some-account-id",
23
- pages_project_name: "foo",
24
- });
25
- expect(
26
- getConfigCache<PagesConfigCache>(pagesConfigCacheFilename).account_id
27
- ).toEqual("some-account-id");
28
-
29
- saveToConfigCache<PagesConfigCache>(pagesConfigCacheFilename, {
30
- pages_project_name: "bar",
31
- });
32
- expect(
33
- getConfigCache<PagesConfigCache>(pagesConfigCacheFilename).account_id
34
- ).toEqual("some-account-id");
35
- });
36
- });