wrangler 0.0.0-e30d1013 → 0.0.0-e311bbbf
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/README.md +3 -3
- package/bin/wrangler.js +30 -10
- package/miniflare-dist/index.mjs +126 -74
- package/package.json +26 -19
- package/src/__tests__/api-dev.test.ts +65 -36
- package/src/__tests__/api-devregistry.test.ts +121 -0
- package/src/__tests__/api.test.ts +27 -5
- package/src/__tests__/configuration.test.ts +567 -39
- package/src/__tests__/d1/d1.test.ts +82 -0
- package/src/__tests__/d1/execute.test.ts +66 -0
- package/src/__tests__/d1/migrate.test.ts +157 -0
- package/src/__tests__/d1/splitter.test.ts +255 -0
- package/src/__tests__/delete.test.ts +91 -49
- package/src/__tests__/deployments.test.ts +330 -52
- package/src/__tests__/dev.test.tsx +198 -90
- package/src/__tests__/generate.test.ts +8 -5
- package/src/__tests__/guess-worker-format.test.ts +35 -0
- package/src/__tests__/helpers/end-event-loop.ts +6 -0
- package/src/__tests__/helpers/mock-auth-domain.ts +20 -0
- package/src/__tests__/helpers/mock-console.ts +6 -0
- package/src/__tests__/helpers/mock-dialogs.ts +71 -85
- package/src/__tests__/helpers/mock-get-pages-upload-token.ts +25 -0
- package/src/__tests__/helpers/mock-get-zone-from-host.ts +8 -5
- package/src/__tests__/helpers/mock-known-routes.ts +7 -2
- package/src/__tests__/helpers/mock-kv.ts +29 -16
- package/src/__tests__/helpers/mock-oauth-flow.ts +103 -92
- package/src/__tests__/helpers/mock-process.ts +8 -13
- package/src/__tests__/helpers/mock-set-timeout.ts +16 -0
- package/src/__tests__/helpers/msw/blob-worker.cjs +19 -0
- package/src/__tests__/helpers/msw/handlers/deployments.ts +127 -26
- package/src/__tests__/helpers/msw/handlers/namespaces.ts +18 -41
- package/src/__tests__/helpers/msw/handlers/oauth.ts +13 -18
- package/src/__tests__/helpers/msw/handlers/r2.ts +14 -34
- package/src/__tests__/helpers/msw/handlers/script.ts +9 -28
- package/src/__tests__/helpers/msw/handlers/user.ts +13 -24
- package/src/__tests__/helpers/msw/handlers/zones.ts +6 -8
- package/src/__tests__/helpers/msw/index.ts +32 -1
- package/src/__tests__/helpers/msw/read-file-sync.js +61 -0
- package/src/__tests__/helpers/string-dynamic-values-matcher.ts +28 -0
- package/src/__tests__/helpers/worker-scripts/parent-worker.js +4 -1
- package/src/__tests__/index.test.ts +90 -72
- package/src/__tests__/init.test.ts +927 -631
- package/src/__tests__/jest.setup.ts +19 -42
- package/src/__tests__/kv.test.ts +355 -231
- package/src/__tests__/logger.test.ts +68 -2
- package/src/__tests__/logout.test.ts +47 -0
- package/src/__tests__/metrics.test.ts +94 -51
- package/src/__tests__/middleware.scheduled.test.ts +42 -32
- package/src/__tests__/middleware.test.ts +212 -122
- package/src/__tests__/mtls-certificates.test.ts +588 -0
- package/src/__tests__/pages/deployment-list.test.ts +80 -0
- package/src/__tests__/pages/functions-build.test.ts +452 -0
- package/src/__tests__/pages/pages.test.ts +81 -0
- package/src/__tests__/pages/project-create.test.ts +63 -0
- package/src/__tests__/pages/project-list.test.ts +110 -0
- package/src/__tests__/pages/project-upload.test.ts +500 -0
- package/src/__tests__/pages/publish.test.ts +2864 -0
- package/src/__tests__/pages-deployment-tail.test.ts +955 -0
- package/src/__tests__/parse.test.ts +106 -0
- package/src/__tests__/publish.test.ts +1620 -830
- package/src/__tests__/pubsub.test.ts +226 -100
- package/src/__tests__/queues.test.ts +237 -76
- package/src/__tests__/r2.test.ts +37 -56
- package/src/__tests__/secret.test.ts +179 -130
- package/src/__tests__/tail.test.ts +267 -109
- package/src/__tests__/test-old-node-version.js +3 -3
- package/src/__tests__/traverse-module-graph.test.ts +220 -0
- package/src/__tests__/tsconfig-sanity.ts +12 -0
- package/src/__tests__/tsconfig.json +8 -0
- package/src/__tests__/tsconfig.tsbuildinfo +1 -0
- package/src/__tests__/type-generation.test.ts +11 -2
- package/src/__tests__/user.test.ts +35 -72
- package/src/__tests__/whoami.test.tsx +8 -114
- package/src/__tests__/worker-namespace.test.ts +83 -69
- package/src/api/dev.ts +168 -60
- package/src/api/index.ts +10 -1
- package/src/api/mtls-certificate.ts +148 -0
- package/src/api/pages/create-worker-bundle-contents.ts +76 -0
- package/src/api/pages/index.ts +5 -0
- package/src/api/pages/publish.tsx +355 -0
- package/src/bundle.ts +221 -128
- package/src/cfetch/index.ts +0 -2
- package/src/cfetch/internal.ts +16 -21
- package/src/cli.ts +4 -4
- package/src/config/config.ts +14 -7
- package/src/config/environment.ts +73 -16
- package/src/config/index.ts +99 -30
- package/src/config/validation-helpers.ts +1 -1
- package/src/config/validation.ts +248 -9
- package/src/create-worker-preview.ts +19 -8
- package/src/create-worker-upload-form.ts +48 -5
- package/src/d1/backups.tsx +43 -42
- package/src/d1/create.tsx +26 -21
- package/src/d1/{delete.tsx → delete.ts} +11 -14
- package/src/d1/execute.tsx +183 -170
- package/src/d1/index.ts +7 -6
- package/src/d1/list.tsx +22 -10
- package/src/d1/migrations/apply.tsx +212 -0
- package/src/d1/migrations/create.tsx +79 -0
- package/src/d1/migrations/helpers.ts +172 -0
- package/src/d1/migrations/index.ts +3 -0
- package/src/d1/migrations/list.tsx +95 -0
- package/src/d1/migrations/options.ts +23 -0
- package/src/d1/options.ts +3 -3
- package/src/d1/splitter.ts +161 -0
- package/src/d1/{types.tsx → types.ts} +1 -0
- package/src/d1/utils.ts +2 -1
- package/src/delete.ts +8 -16
- package/src/deployments.ts +333 -42
- package/src/deprecated/index.ts +8 -302
- package/src/dev/dev.tsx +57 -44
- package/src/dev/local.tsx +248 -74
- package/src/dev/remote.tsx +32 -3
- package/src/dev/start-server.ts +81 -66
- package/src/dev/use-esbuild.ts +17 -18
- package/src/dev/validate-dev-props.ts +9 -0
- package/src/{dev-registry.tsx → dev-registry.ts} +2 -1
- package/src/dev.tsx +178 -117
- package/src/dialogs.ts +136 -0
- package/src/dispatch-namespace.ts +21 -17
- package/src/docs/index.ts +97 -0
- package/src/entry.ts +19 -11
- package/src/environment-variables/factory.ts +88 -0
- package/src/environment-variables/misc-variables.ts +30 -0
- package/src/generate/index.ts +298 -0
- package/src/git-client.ts +15 -4
- package/src/{index.tsx → index.ts} +134 -59
- package/src/init.ts +249 -187
- package/src/inspect.ts +16 -1
- package/src/jest.d.ts +4 -0
- package/src/kv/index.ts +15 -17
- package/src/logger.ts +32 -5
- package/src/metrics/metrics-config.ts +3 -3
- package/src/metrics/send-event.ts +6 -1
- package/src/miniflare-cli/assets.ts +64 -28
- package/src/miniflare-cli/index.ts +4 -7
- package/src/miniflare-cli/tsconfig.json +9 -0
- package/src/miniflare-cli/tsconfig.tsbuildinfo +1 -0
- package/src/miniflare-cli/types.ts +11 -0
- package/src/module-collection.ts +91 -25
- package/src/mtls-certificate/cli.ts +155 -0
- package/src/pages/build.ts +410 -0
- package/src/pages/buildFunctions.ts +140 -0
- package/src/pages/deployment-tails.ts +281 -0
- package/src/pages/deployments.tsx +11 -33
- package/src/pages/{dev.tsx → dev.ts} +147 -139
- package/src/pages/errors.ts +1 -0
- package/src/pages/functions/buildPlugin.ts +61 -54
- package/src/pages/functions/buildWorker.ts +159 -33
- package/src/pages/functions/tsconfig.json +8 -0
- package/src/pages/functions/tsconfig.tsbuildinfo +1 -0
- package/src/pages/{functions.tsx → functions.ts} +8 -4
- package/src/pages/{index.tsx → index.ts} +11 -3
- package/src/pages/projects.tsx +12 -22
- package/src/pages/prompt-select-project.tsx +31 -0
- package/src/pages/publish.tsx +46 -225
- package/src/pages/types.ts +6 -9
- package/src/pages/upload.tsx +58 -14
- package/src/pages/utils.ts +12 -1
- package/src/parse.ts +23 -1
- package/src/paths.ts +1 -1
- package/src/proxy.ts +5 -0
- package/src/publish/index.ts +20 -16
- package/src/publish/publish.ts +71 -46
- package/src/pubsub/{pubsub-commands.tsx → pubsub-commands.ts} +19 -20
- package/src/queues/cli/commands/consumer/add.ts +24 -24
- package/src/queues/cli/commands/consumer/index.ts +3 -6
- package/src/queues/cli/commands/consumer/remove.ts +11 -18
- package/src/queues/cli/commands/create.ts +8 -8
- package/src/queues/cli/commands/delete.ts +8 -8
- package/src/queues/cli/commands/index.ts +6 -4
- package/src/queues/cli/commands/list.ts +8 -8
- package/src/queues/client.ts +1 -0
- package/src/queues/utils.ts +18 -0
- package/src/r2/helpers.ts +1 -0
- package/src/r2/index.ts +28 -28
- package/src/secret/index.ts +14 -16
- package/src/{sites.tsx → sites.ts} +1 -1
- package/src/tail/createTail.ts +94 -3
- package/src/tail/filters.ts +1 -1
- package/src/tail/index.ts +8 -11
- package/src/tail/printing.ts +15 -0
- package/src/traverse-module-graph.ts +53 -0
- package/src/tsconfig-sanity.ts +16 -0
- package/src/type-generation.ts +28 -20
- package/src/user/access.ts +0 -1
- package/src/user/auth-variables.ts +113 -0
- package/src/user/choose-account.tsx +1 -31
- package/src/user/index.ts +0 -1
- package/src/user/{user.tsx → user.ts} +123 -82
- package/src/utils/render.ts +93 -0
- package/src/{whoami.tsx → whoami.ts} +37 -71
- package/src/worker.ts +30 -1
- package/src/yargs-types.ts +22 -5
- package/templates/__tests__/tsconfig-sanity.ts +12 -0
- package/templates/__tests__/tsconfig.json +8 -0
- package/templates/__tests__/tsconfig.tsbuildinfo +1 -0
- package/templates/checked-fetch.js +9 -3
- package/templates/d1-beta-facade.js +51 -3
- package/templates/facade.d.ts +14 -0
- package/templates/first-party-worker-module-facade.ts +4 -3
- package/templates/format-dev-errors.ts +8 -6
- package/templates/gitignore +1 -0
- package/templates/init-tests/test-jest-new-worker.js +3 -5
- package/templates/init-tests/test-vitest-new-worker.js +3 -5
- package/templates/init-tests/test-vitest-new-worker.ts +25 -0
- package/templates/middleware/loader-modules.ts +2 -2
- package/templates/middleware/loader-sw.ts +51 -31
- package/templates/middleware/middleware-miniflare3-json-error.ts +32 -0
- package/templates/new-worker.ts +3 -0
- package/templates/pages-dev-pipeline.ts +4 -1
- package/templates/pages-shim.ts +4 -1
- package/templates/pages-template-plugin.ts +19 -10
- package/templates/serve-static-assets.ts +17 -14
- package/templates/service-bindings-module-facade.js +1 -0
- package/templates/tsconfig-sanity.ts +11 -0
- package/templates/tsconfig.init.json +105 -0
- package/templates/tsconfig.json +5 -103
- package/templates/tsconfig.tsbuildinfo +1 -0
- package/wrangler-dist/cli.d.ts +820 -70
- package/wrangler-dist/cli.js +68161 -78780
- package/wrangler-dist/wasm-sync.wasm +0 -0
- package/src/__tests__/api-devregistry.test.js +0 -56
- package/src/__tests__/d1.test.ts +0 -74
- package/src/__tests__/dialogs.test.tsx +0 -40
- package/src/__tests__/helpers/mock-cfetch.ts +0 -333
- package/src/__tests__/pages.test.ts +0 -2387
- package/src/d1/migrations.tsx +0 -446
- package/src/dialogs.tsx +0 -169
- package/src/environment-variables.ts +0 -50
- package/src/pages/build.tsx +0 -270
- package/src/user/env-vars.ts +0 -46
- package/templates/experimental-local-cache-stubs.js +0 -27
- /package/src/{bundle-reporter.tsx → bundle-reporter.ts} +0 -0
- /package/src/dev/{get-local-persistence-path.tsx → get-local-persistence-path.ts} +0 -0
- /package/src/pages/{hash.tsx → hash.ts} +0 -0
package/src/pages/build.tsx
DELETED
|
@@ -1,270 +0,0 @@
|
|
|
1
|
-
import { writeFileSync } from "node:fs";
|
|
2
|
-
import { tmpdir } from "node:os";
|
|
3
|
-
import { dirname, join, resolve } from "node:path";
|
|
4
|
-
import { FatalError } from "../errors";
|
|
5
|
-
import { logger } from "../logger";
|
|
6
|
-
import * as metrics from "../metrics";
|
|
7
|
-
import { toUrlPath } from "../paths";
|
|
8
|
-
import { isInPagesCI } from "./constants";
|
|
9
|
-
import {
|
|
10
|
-
EXIT_CODE_FUNCTIONS_NO_ROUTES_ERROR,
|
|
11
|
-
FunctionsNoRoutesError,
|
|
12
|
-
getFunctionsNoRoutesWarning,
|
|
13
|
-
} from "./errors";
|
|
14
|
-
import { buildPlugin } from "./functions/buildPlugin";
|
|
15
|
-
import { buildWorker } from "./functions/buildWorker";
|
|
16
|
-
import { generateConfigFromFileTree } from "./functions/filepath-routing";
|
|
17
|
-
import { writeRoutesModule } from "./functions/routes";
|
|
18
|
-
import { convertRoutesToRoutesJSONSpec } from "./functions/routes-transformation";
|
|
19
|
-
import { pagesBetaWarning, RUNNING_BUILDERS } from "./utils";
|
|
20
|
-
import type { Config } from "./functions/routes";
|
|
21
|
-
import type { YargsOptionsToInterface } from "./types";
|
|
22
|
-
import type { Argv } from "yargs";
|
|
23
|
-
|
|
24
|
-
type PagesBuildArgs = YargsOptionsToInterface<typeof Options>;
|
|
25
|
-
|
|
26
|
-
export function Options(yargs: Argv) {
|
|
27
|
-
return yargs
|
|
28
|
-
.positional("directory", {
|
|
29
|
-
type: "string",
|
|
30
|
-
default: "functions",
|
|
31
|
-
description: "The directory of Pages Functions",
|
|
32
|
-
})
|
|
33
|
-
.options({
|
|
34
|
-
outfile: {
|
|
35
|
-
type: "string",
|
|
36
|
-
default: "_worker.js",
|
|
37
|
-
description: "The location of the output Worker script",
|
|
38
|
-
},
|
|
39
|
-
"output-config-path": {
|
|
40
|
-
type: "string",
|
|
41
|
-
description: "The location for the output config file",
|
|
42
|
-
},
|
|
43
|
-
"output-routes-path": {
|
|
44
|
-
type: "string",
|
|
45
|
-
description: "The location for the output _routes.json file",
|
|
46
|
-
},
|
|
47
|
-
minify: {
|
|
48
|
-
type: "boolean",
|
|
49
|
-
default: false,
|
|
50
|
-
description: "Minify the output Worker script",
|
|
51
|
-
},
|
|
52
|
-
sourcemap: {
|
|
53
|
-
type: "boolean",
|
|
54
|
-
default: false,
|
|
55
|
-
description: "Generate a sourcemap for the output Worker script",
|
|
56
|
-
},
|
|
57
|
-
"fallback-service": {
|
|
58
|
-
type: "string",
|
|
59
|
-
default: "ASSETS",
|
|
60
|
-
description:
|
|
61
|
-
"The service to fallback to at the end of the `next` chain. Setting to '' will fallback to the global `fetch`.",
|
|
62
|
-
},
|
|
63
|
-
watch: {
|
|
64
|
-
type: "boolean",
|
|
65
|
-
default: false,
|
|
66
|
-
description:
|
|
67
|
-
"Watch for changes to the functions and automatically rebuild the Worker script",
|
|
68
|
-
},
|
|
69
|
-
plugin: {
|
|
70
|
-
type: "boolean",
|
|
71
|
-
default: false,
|
|
72
|
-
description: "Build a plugin rather than a Worker script",
|
|
73
|
-
},
|
|
74
|
-
"build-output-directory": {
|
|
75
|
-
type: "string",
|
|
76
|
-
description: "The directory to output static assets to",
|
|
77
|
-
},
|
|
78
|
-
"node-compat": {
|
|
79
|
-
describe: "Enable node.js compatibility",
|
|
80
|
-
default: false,
|
|
81
|
-
type: "boolean",
|
|
82
|
-
hidden: true,
|
|
83
|
-
},
|
|
84
|
-
bindings: {
|
|
85
|
-
type: "string",
|
|
86
|
-
describe:
|
|
87
|
-
"Bindings used in Functions (used to register beta product shims)",
|
|
88
|
-
deprecated: true,
|
|
89
|
-
hidden: true,
|
|
90
|
-
},
|
|
91
|
-
})
|
|
92
|
-
.epilogue(pagesBetaWarning);
|
|
93
|
-
}
|
|
94
|
-
|
|
95
|
-
export const Handler = async ({
|
|
96
|
-
directory,
|
|
97
|
-
outfile,
|
|
98
|
-
outputConfigPath,
|
|
99
|
-
outputRoutesPath: routesOutputPath,
|
|
100
|
-
minify,
|
|
101
|
-
sourcemap,
|
|
102
|
-
fallbackService,
|
|
103
|
-
watch,
|
|
104
|
-
plugin,
|
|
105
|
-
buildOutputDirectory,
|
|
106
|
-
nodeCompat,
|
|
107
|
-
bindings,
|
|
108
|
-
}: PagesBuildArgs) => {
|
|
109
|
-
if (!isInPagesCI) {
|
|
110
|
-
// Beta message for `wrangler pages <commands>` usage
|
|
111
|
-
logger.log(pagesBetaWarning);
|
|
112
|
-
}
|
|
113
|
-
|
|
114
|
-
if (nodeCompat) {
|
|
115
|
-
console.warn(
|
|
116
|
-
"Enabling node.js compatibility mode for builtins and globals. This is experimental and has serious tradeoffs. Please see https://github.com/ionic-team/rollup-plugin-node-polyfills/ for more details."
|
|
117
|
-
);
|
|
118
|
-
}
|
|
119
|
-
|
|
120
|
-
let d1Databases: string[] | undefined = undefined;
|
|
121
|
-
if (bindings) {
|
|
122
|
-
try {
|
|
123
|
-
const decodedBindings = JSON.parse(bindings);
|
|
124
|
-
d1Databases = Object.keys(decodedBindings?.d1_databases || {});
|
|
125
|
-
} catch {
|
|
126
|
-
throw new FatalError("Could not parse a valid set of 'bindings'.", 1);
|
|
127
|
-
}
|
|
128
|
-
}
|
|
129
|
-
|
|
130
|
-
buildOutputDirectory ??= dirname(outfile);
|
|
131
|
-
try {
|
|
132
|
-
await buildFunctions({
|
|
133
|
-
outfile,
|
|
134
|
-
outputConfigPath,
|
|
135
|
-
functionsDirectory: directory,
|
|
136
|
-
minify,
|
|
137
|
-
sourcemap,
|
|
138
|
-
fallbackService,
|
|
139
|
-
watch,
|
|
140
|
-
plugin,
|
|
141
|
-
buildOutputDirectory,
|
|
142
|
-
nodeCompat,
|
|
143
|
-
routesOutputPath,
|
|
144
|
-
local: false,
|
|
145
|
-
d1Databases,
|
|
146
|
-
});
|
|
147
|
-
} catch (e) {
|
|
148
|
-
if (e instanceof FunctionsNoRoutesError) {
|
|
149
|
-
throw new FatalError(
|
|
150
|
-
getFunctionsNoRoutesWarning(directory),
|
|
151
|
-
EXIT_CODE_FUNCTIONS_NO_ROUTES_ERROR
|
|
152
|
-
);
|
|
153
|
-
} else {
|
|
154
|
-
throw e;
|
|
155
|
-
}
|
|
156
|
-
}
|
|
157
|
-
await metrics.sendMetricsEvent("build pages functions");
|
|
158
|
-
};
|
|
159
|
-
|
|
160
|
-
/**
|
|
161
|
-
* Builds a Functions worker based on the functions directory, with filepath and handler based routing.
|
|
162
|
-
* @throws FunctionsNoRoutesError when there are no routes found in the functions directory
|
|
163
|
-
*/
|
|
164
|
-
export async function buildFunctions({
|
|
165
|
-
outfile,
|
|
166
|
-
outputConfigPath,
|
|
167
|
-
functionsDirectory,
|
|
168
|
-
minify = false,
|
|
169
|
-
sourcemap = false,
|
|
170
|
-
fallbackService = "ASSETS",
|
|
171
|
-
watch = false,
|
|
172
|
-
onEnd,
|
|
173
|
-
plugin = false,
|
|
174
|
-
buildOutputDirectory,
|
|
175
|
-
routesOutputPath,
|
|
176
|
-
nodeCompat,
|
|
177
|
-
local,
|
|
178
|
-
d1Databases,
|
|
179
|
-
}: Partial<
|
|
180
|
-
Pick<
|
|
181
|
-
PagesBuildArgs,
|
|
182
|
-
| "outputConfigPath"
|
|
183
|
-
| "minify"
|
|
184
|
-
| "sourcemap"
|
|
185
|
-
| "fallbackService"
|
|
186
|
-
| "watch"
|
|
187
|
-
| "plugin"
|
|
188
|
-
| "buildOutputDirectory"
|
|
189
|
-
| "nodeCompat"
|
|
190
|
-
>
|
|
191
|
-
> & {
|
|
192
|
-
functionsDirectory: string;
|
|
193
|
-
onEnd?: () => void;
|
|
194
|
-
outfile: Required<PagesBuildArgs>["outfile"];
|
|
195
|
-
routesOutputPath?: PagesBuildArgs["outputRoutesPath"];
|
|
196
|
-
local: boolean;
|
|
197
|
-
d1Databases?: string[];
|
|
198
|
-
}) {
|
|
199
|
-
RUNNING_BUILDERS.forEach(
|
|
200
|
-
(runningBuilder) => runningBuilder.stop && runningBuilder.stop()
|
|
201
|
-
);
|
|
202
|
-
|
|
203
|
-
const routesModule = join(tmpdir(), `./functionsRoutes-${Math.random()}.mjs`);
|
|
204
|
-
const baseURL = toUrlPath("/");
|
|
205
|
-
|
|
206
|
-
const config: Config = await generateConfigFromFileTree({
|
|
207
|
-
baseDir: functionsDirectory,
|
|
208
|
-
baseURL,
|
|
209
|
-
});
|
|
210
|
-
|
|
211
|
-
if (!config.routes || config.routes.length === 0) {
|
|
212
|
-
throw new FunctionsNoRoutesError(
|
|
213
|
-
`Failed to find any routes while compiling Functions in: ${functionsDirectory}`
|
|
214
|
-
);
|
|
215
|
-
}
|
|
216
|
-
|
|
217
|
-
if (routesOutputPath) {
|
|
218
|
-
const routesJSON = convertRoutesToRoutesJSONSpec(config.routes);
|
|
219
|
-
writeFileSync(routesOutputPath, JSON.stringify(routesJSON, null, 2));
|
|
220
|
-
}
|
|
221
|
-
|
|
222
|
-
if (outputConfigPath) {
|
|
223
|
-
writeFileSync(
|
|
224
|
-
outputConfigPath,
|
|
225
|
-
JSON.stringify({ ...config, baseURL }, null, 2)
|
|
226
|
-
);
|
|
227
|
-
}
|
|
228
|
-
|
|
229
|
-
await writeRoutesModule({
|
|
230
|
-
config,
|
|
231
|
-
srcDir: functionsDirectory,
|
|
232
|
-
outfile: routesModule,
|
|
233
|
-
});
|
|
234
|
-
|
|
235
|
-
const absoluteFunctionsDirectory = resolve(functionsDirectory);
|
|
236
|
-
|
|
237
|
-
if (plugin) {
|
|
238
|
-
RUNNING_BUILDERS.push(
|
|
239
|
-
await buildPlugin({
|
|
240
|
-
routesModule,
|
|
241
|
-
outfile,
|
|
242
|
-
minify,
|
|
243
|
-
sourcemap,
|
|
244
|
-
watch,
|
|
245
|
-
nodeCompat,
|
|
246
|
-
functionsDirectory: absoluteFunctionsDirectory,
|
|
247
|
-
local,
|
|
248
|
-
betaD1Shims: d1Databases,
|
|
249
|
-
onEnd,
|
|
250
|
-
})
|
|
251
|
-
);
|
|
252
|
-
} else {
|
|
253
|
-
RUNNING_BUILDERS.push(
|
|
254
|
-
await buildWorker({
|
|
255
|
-
routesModule,
|
|
256
|
-
outfile,
|
|
257
|
-
minify,
|
|
258
|
-
sourcemap,
|
|
259
|
-
fallbackService,
|
|
260
|
-
watch,
|
|
261
|
-
functionsDirectory: absoluteFunctionsDirectory,
|
|
262
|
-
local,
|
|
263
|
-
betaD1Shims: d1Databases,
|
|
264
|
-
onEnd,
|
|
265
|
-
buildOutputDirectory,
|
|
266
|
-
nodeCompat,
|
|
267
|
-
})
|
|
268
|
-
);
|
|
269
|
-
}
|
|
270
|
-
}
|
package/src/user/env-vars.ts
DELETED
|
@@ -1,46 +0,0 @@
|
|
|
1
|
-
import { getEnvironmentVariableFactory } from "../environment-variables";
|
|
2
|
-
|
|
3
|
-
export type ApiCredentials =
|
|
4
|
-
| {
|
|
5
|
-
apiToken: string;
|
|
6
|
-
}
|
|
7
|
-
| {
|
|
8
|
-
authKey: string;
|
|
9
|
-
authEmail: string;
|
|
10
|
-
};
|
|
11
|
-
|
|
12
|
-
const getCloudflareAPITokenFromEnv = getEnvironmentVariableFactory({
|
|
13
|
-
variableName: "CLOUDFLARE_API_TOKEN",
|
|
14
|
-
deprecatedName: "CF_API_TOKEN",
|
|
15
|
-
});
|
|
16
|
-
const getCloudflareGlobalAuthKeyFromEnv = getEnvironmentVariableFactory({
|
|
17
|
-
variableName: "CLOUDFLARE_API_KEY",
|
|
18
|
-
deprecatedName: "CF_API_KEY",
|
|
19
|
-
});
|
|
20
|
-
const getCloudflareGlobalAuthEmailFromEnv = getEnvironmentVariableFactory({
|
|
21
|
-
variableName: "CLOUDFLARE_EMAIL",
|
|
22
|
-
deprecatedName: "CF_EMAIL",
|
|
23
|
-
});
|
|
24
|
-
|
|
25
|
-
/**
|
|
26
|
-
* Try to read an API token or Global Auth from the environment.
|
|
27
|
-
*/
|
|
28
|
-
export function getAuthFromEnv(): ApiCredentials | undefined {
|
|
29
|
-
const globalApiKey = getCloudflareGlobalAuthKeyFromEnv();
|
|
30
|
-
const globalApiEmail = getCloudflareGlobalAuthEmailFromEnv();
|
|
31
|
-
const apiToken = getCloudflareAPITokenFromEnv();
|
|
32
|
-
|
|
33
|
-
if (globalApiKey && globalApiEmail) {
|
|
34
|
-
return { authKey: globalApiKey, authEmail: globalApiEmail };
|
|
35
|
-
} else if (apiToken) {
|
|
36
|
-
return { apiToken };
|
|
37
|
-
}
|
|
38
|
-
}
|
|
39
|
-
|
|
40
|
-
/**
|
|
41
|
-
* Try to read the account ID from the environment.
|
|
42
|
-
*/
|
|
43
|
-
export const getCloudflareAccountIdFromEnv = getEnvironmentVariableFactory({
|
|
44
|
-
variableName: "CLOUDFLARE_ACCOUNT_ID",
|
|
45
|
-
deprecatedName: "CF_ACCOUNT_ID",
|
|
46
|
-
});
|
|
@@ -1,27 +0,0 @@
|
|
|
1
|
-
// `workerd` currently throws on any use of the Cache API. Workers Sites
|
|
2
|
-
// requires the Cache API to function though, so stub it out to no-ops, like in
|
|
3
|
-
// regular `wrangler dev`.
|
|
4
|
-
|
|
5
|
-
class Cache {
|
|
6
|
-
async put(req, res) {}
|
|
7
|
-
|
|
8
|
-
async match(req, options) {}
|
|
9
|
-
|
|
10
|
-
async delete(req, options) {
|
|
11
|
-
return false;
|
|
12
|
-
}
|
|
13
|
-
}
|
|
14
|
-
|
|
15
|
-
class CacheStorage {
|
|
16
|
-
#cache = new Cache();
|
|
17
|
-
|
|
18
|
-
get default() {
|
|
19
|
-
return this.#cache;
|
|
20
|
-
}
|
|
21
|
-
|
|
22
|
-
async open(cacheName) {
|
|
23
|
-
return this.#cache;
|
|
24
|
-
}
|
|
25
|
-
}
|
|
26
|
-
|
|
27
|
-
globalThis.caches = new CacheStorage();
|
|
File without changes
|
|
File without changes
|
|
File without changes
|