wrangler 0.0.0-e7a0cd5b → 0.0.0-e87ad068
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 +254 -128
- package/package.json +27 -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 +797 -98
- package/src/__tests__/constellation.test.ts +371 -0
- 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 +257 -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 -56
- package/src/__tests__/dev.test.tsx +198 -90
- package/src/__tests__/generate.test.ts +12 -10
- 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 +128 -27
- 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 +92 -72
- package/src/__tests__/init.test.ts +1033 -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 +589 -0
- package/src/__tests__/pages/deployment-list.test.ts +80 -0
- package/src/__tests__/pages/functions-build.test.ts +529 -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 +957 -0
- package/src/__tests__/parse.test.ts +106 -0
- package/src/__tests__/publish.test.ts +2227 -1005
- package/src/__tests__/pubsub.test.ts +226 -100
- package/src/__tests__/queues.test.ts +238 -77
- package/src/__tests__/r2.test.ts +55 -57
- package/src/__tests__/secret.test.ts +179 -130
- package/src/__tests__/tail.test.ts +313 -113
- 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 +43 -26
- package/src/__tests__/unstableDev.test.ts +61 -0
- 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 +180 -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 +80 -0
- package/src/api/pages/index.ts +5 -0
- package/src/api/pages/publish.tsx +371 -0
- package/src/bundle.ts +315 -148
- package/src/cfetch/index.ts +0 -2
- package/src/cfetch/internal.ts +33 -33
- package/src/cli.ts +4 -4
- package/src/config/config.ts +14 -7
- package/src/config/environment.ts +120 -24
- package/src/config/index.ts +117 -35
- package/src/config/validation-helpers.ts +1 -1
- package/src/config/validation.ts +430 -19
- package/src/constellation/createProject.tsx +51 -0
- package/src/constellation/deleteProject.ts +51 -0
- package/src/constellation/deleteProjectModel.ts +76 -0
- package/src/constellation/index.ts +75 -0
- package/src/constellation/listCatalog.tsx +35 -0
- package/src/constellation/listModel.tsx +49 -0
- package/src/constellation/listProject.tsx +28 -0
- package/src/constellation/listRuntime.tsx +28 -0
- package/src/constellation/options.ts +17 -0
- package/src/constellation/types.ts +17 -0
- package/src/constellation/uploadModel.tsx +84 -0
- package/src/constellation/utils.ts +90 -0
- package/src/create-worker-preview.ts +19 -8
- package/src/create-worker-upload-form.ts +81 -18
- package/src/d1/backups.tsx +47 -46
- package/src/d1/constants.ts +5 -0
- package/src/d1/create.tsx +85 -37
- package/src/d1/{delete.tsx → delete.ts} +12 -15
- package/src/d1/execute.tsx +228 -156
- package/src/d1/index.ts +31 -7
- package/src/d1/list.tsx +27 -13
- package/src/d1/migrations/apply.tsx +235 -0
- package/src/d1/migrations/create.tsx +79 -0
- package/src/d1/migrations/helpers.ts +171 -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 +12 -2
- package/src/d1/splitter.ts +161 -0
- package/src/d1/types.ts +32 -0
- package/src/d1/utils.ts +12 -2
- package/src/delete.ts +8 -16
- package/src/deployments.ts +340 -46
- package/src/deprecated/index.ts +8 -302
- package/src/dev/dev.tsx +66 -46
- package/src/dev/local.tsx +339 -104
- package/src/dev/remote.tsx +36 -3
- package/src/dev/start-server.ts +146 -101
- package/src/dev/use-esbuild.ts +82 -56
- package/src/dev/validate-dev-props.ts +9 -0
- package/src/{dev-registry.tsx → dev-registry.ts} +13 -1
- package/src/dev.tsx +202 -125
- package/src/dialogs.ts +136 -0
- package/src/dispatch-namespace.ts +21 -17
- package/src/docs/helpers.ts +50 -0
- package/src/docs/index.ts +54 -0
- package/src/entry.ts +26 -11
- package/src/environment-variables/factory.ts +89 -0
- package/src/environment-variables/misc-variables.ts +30 -0
- package/src/generate/index.ts +303 -0
- package/src/git-client.ts +15 -4
- package/src/{index.tsx → index.ts} +148 -63
- package/src/init.ts +301 -197
- package/src/inspect.ts +122 -6
- package/src/jest.d.ts +4 -0
- package/src/kv/helpers.ts +7 -4
- package/src/kv/index.ts +15 -17
- package/src/logger.ts +36 -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 +6 -9
- 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 +92 -26
- package/src/mtls-certificate/cli.ts +155 -0
- package/src/pages/build.ts +423 -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} +192 -126
- package/src/pages/errors.ts +1 -0
- package/src/pages/functions/buildPlugin.ts +73 -69
- package/src/pages/functions/buildWorker.ts +342 -117
- 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 +45 -214
- package/src/pages/types.ts +6 -9
- package/src/pages/upload.tsx +58 -14
- package/src/pages/utils.ts +14 -3
- 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 +81 -48
- 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/constants.ts +4 -0
- package/src/r2/helpers.ts +1 -0
- package/src/r2/index.ts +40 -28
- package/src/secret/index.ts +18 -17
- package/src/{sites.tsx → sites.ts} +165 -53
- package/src/tail/createTail.ts +103 -3
- package/src/tail/filters.ts +1 -1
- package/src/tail/index.ts +8 -11
- package/src/tail/printing.ts +27 -0
- package/src/traverse-module-graph.ts +54 -0
- package/src/tsconfig-sanity.ts +16 -0
- package/src/type-generation.ts +85 -57
- 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} +124 -82
- package/src/utils/render.ts +93 -0
- package/src/{whoami.tsx → whoami.ts} +37 -71
- package/src/worker.ts +61 -3
- 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 +95 -25
- 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-dev-util.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 +902 -77
- package/wrangler-dist/cli.js +131685 -140615
- package/wrangler-dist/wasm-sync.wasm +0 -0
- package/src/__tests__/api-devregistry.test.js +0 -57
- package/src/__tests__/d1.test.ts +0 -72
- package/src/__tests__/dialogs.test.tsx +0 -40
- package/src/__tests__/helpers/mock-cfetch.ts +0 -333
- package/src/__tests__/pages.test.ts +0 -2223
- package/src/d1/types.tsx +0 -14
- package/src/dialogs.tsx +0 -163
- package/src/environment-variables.ts +0 -50
- package/src/pages/build.tsx +0 -238
- 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
|
@@ -0,0 +1,423 @@
|
|
|
1
|
+
import { existsSync, lstatSync, mkdirSync, writeFileSync } from "node:fs";
|
|
2
|
+
import { basename, dirname, relative, resolve as resolvePath } from "node:path";
|
|
3
|
+
import { createUploadWorkerBundleContents } from "../api/pages/create-worker-bundle-contents";
|
|
4
|
+
import { FatalError } from "../errors";
|
|
5
|
+
import { logger } from "../logger";
|
|
6
|
+
import * as metrics from "../metrics";
|
|
7
|
+
import { buildFunctions } from "./buildFunctions";
|
|
8
|
+
import { isInPagesCI } from "./constants";
|
|
9
|
+
import {
|
|
10
|
+
EXIT_CODE_FUNCTIONS_NOTHING_TO_BUILD_ERROR,
|
|
11
|
+
EXIT_CODE_FUNCTIONS_NO_ROUTES_ERROR,
|
|
12
|
+
FunctionsNoRoutesError,
|
|
13
|
+
getFunctionsNoRoutesWarning,
|
|
14
|
+
} from "./errors";
|
|
15
|
+
import {
|
|
16
|
+
buildRawWorker,
|
|
17
|
+
traverseAndBuildWorkerJSDirectory,
|
|
18
|
+
} from "./functions/buildWorker";
|
|
19
|
+
import { pagesBetaWarning } from "./utils";
|
|
20
|
+
import type { BundleResult } from "../bundle";
|
|
21
|
+
import type {
|
|
22
|
+
CommonYargsArgv,
|
|
23
|
+
StrictYargsOptionsToInterface,
|
|
24
|
+
} from "../yargs-types";
|
|
25
|
+
|
|
26
|
+
export type PagesBuildArgs = StrictYargsOptionsToInterface<typeof Options>;
|
|
27
|
+
|
|
28
|
+
export function Options(yargs: CommonYargsArgv) {
|
|
29
|
+
return yargs
|
|
30
|
+
.positional("directory", {
|
|
31
|
+
type: "string",
|
|
32
|
+
default: "functions",
|
|
33
|
+
description: "The directory of Pages Functions",
|
|
34
|
+
})
|
|
35
|
+
.options({
|
|
36
|
+
outfile: {
|
|
37
|
+
type: "string",
|
|
38
|
+
description: "The location of the output Worker script",
|
|
39
|
+
},
|
|
40
|
+
outdir: {
|
|
41
|
+
type: "string",
|
|
42
|
+
description: "Output directory for the bundled Worker",
|
|
43
|
+
},
|
|
44
|
+
"output-config-path": {
|
|
45
|
+
type: "string",
|
|
46
|
+
description: "The location for the output config file",
|
|
47
|
+
},
|
|
48
|
+
"output-routes-path": {
|
|
49
|
+
type: "string",
|
|
50
|
+
description: "The location for the output _routes.json file",
|
|
51
|
+
},
|
|
52
|
+
minify: {
|
|
53
|
+
type: "boolean",
|
|
54
|
+
default: false,
|
|
55
|
+
description: "Minify the output Worker script",
|
|
56
|
+
},
|
|
57
|
+
sourcemap: {
|
|
58
|
+
type: "boolean",
|
|
59
|
+
default: false,
|
|
60
|
+
description: "Generate a sourcemap for the output Worker script",
|
|
61
|
+
},
|
|
62
|
+
"fallback-service": {
|
|
63
|
+
type: "string",
|
|
64
|
+
default: "ASSETS",
|
|
65
|
+
description:
|
|
66
|
+
"The service to fallback to at the end of the `next` chain. Setting to '' will fallback to the global `fetch`.",
|
|
67
|
+
},
|
|
68
|
+
watch: {
|
|
69
|
+
type: "boolean",
|
|
70
|
+
default: false,
|
|
71
|
+
description:
|
|
72
|
+
"Watch for changes to the functions and automatically rebuild the Worker script",
|
|
73
|
+
},
|
|
74
|
+
plugin: {
|
|
75
|
+
type: "boolean",
|
|
76
|
+
default: false,
|
|
77
|
+
description: "Build a plugin rather than a Worker script",
|
|
78
|
+
},
|
|
79
|
+
"build-output-directory": {
|
|
80
|
+
type: "string",
|
|
81
|
+
description: "The directory to output static assets to",
|
|
82
|
+
},
|
|
83
|
+
"node-compat": {
|
|
84
|
+
describe: "Enable Node.js compatibility",
|
|
85
|
+
default: false,
|
|
86
|
+
type: "boolean",
|
|
87
|
+
hidden: true,
|
|
88
|
+
},
|
|
89
|
+
"compatibility-date": {
|
|
90
|
+
describe: "Date to use for compatibility checks",
|
|
91
|
+
type: "string",
|
|
92
|
+
requiresArg: true,
|
|
93
|
+
},
|
|
94
|
+
"compatibility-flags": {
|
|
95
|
+
describe: "Flags to use for compatibility checks",
|
|
96
|
+
alias: "compatibility-flag",
|
|
97
|
+
type: "string",
|
|
98
|
+
requiresArg: true,
|
|
99
|
+
array: true,
|
|
100
|
+
},
|
|
101
|
+
bindings: {
|
|
102
|
+
type: "string",
|
|
103
|
+
describe:
|
|
104
|
+
"Bindings used in Functions (used to register beta product shims)",
|
|
105
|
+
deprecated: true,
|
|
106
|
+
hidden: true,
|
|
107
|
+
},
|
|
108
|
+
})
|
|
109
|
+
.epilogue(pagesBetaWarning);
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
export const Handler = async (args: PagesBuildArgs) => {
|
|
113
|
+
if (!isInPagesCI) {
|
|
114
|
+
// Beta message for `wrangler pages <commands>` usage
|
|
115
|
+
logger.log(pagesBetaWarning);
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
const validatedArgs = validateArgs(args);
|
|
119
|
+
|
|
120
|
+
let bundle: BundleResult | undefined = undefined;
|
|
121
|
+
|
|
122
|
+
if (validatedArgs.plugin) {
|
|
123
|
+
const {
|
|
124
|
+
directory,
|
|
125
|
+
outfile,
|
|
126
|
+
outdir,
|
|
127
|
+
outputConfigPath,
|
|
128
|
+
outputRoutesPath: routesOutputPath,
|
|
129
|
+
minify,
|
|
130
|
+
sourcemap,
|
|
131
|
+
fallbackService,
|
|
132
|
+
watch,
|
|
133
|
+
plugin,
|
|
134
|
+
nodejsCompat,
|
|
135
|
+
legacyNodeCompat,
|
|
136
|
+
} = validatedArgs;
|
|
137
|
+
|
|
138
|
+
try {
|
|
139
|
+
/**
|
|
140
|
+
* `buildFunctions` builds `/functions`, but doesn't give us the bundle
|
|
141
|
+
* we want to return, which includes the external dependencies (like wasm,
|
|
142
|
+
* binary, text). Let's output that build result to memory and only write
|
|
143
|
+
* to disk once we have the final bundle
|
|
144
|
+
*/
|
|
145
|
+
bundle = await buildFunctions({
|
|
146
|
+
outfile,
|
|
147
|
+
outdir,
|
|
148
|
+
outputConfigPath,
|
|
149
|
+
functionsDirectory: directory,
|
|
150
|
+
minify,
|
|
151
|
+
sourcemap,
|
|
152
|
+
fallbackService,
|
|
153
|
+
watch,
|
|
154
|
+
plugin,
|
|
155
|
+
legacyNodeCompat,
|
|
156
|
+
nodejsCompat,
|
|
157
|
+
routesOutputPath,
|
|
158
|
+
local: false,
|
|
159
|
+
});
|
|
160
|
+
} catch (e) {
|
|
161
|
+
if (e instanceof FunctionsNoRoutesError) {
|
|
162
|
+
throw new FatalError(
|
|
163
|
+
getFunctionsNoRoutesWarning(directory),
|
|
164
|
+
EXIT_CODE_FUNCTIONS_NO_ROUTES_ERROR
|
|
165
|
+
);
|
|
166
|
+
} else {
|
|
167
|
+
throw e;
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
|
|
171
|
+
if (outfile && outfile !== bundle.resolvedEntryPointPath) {
|
|
172
|
+
writeFileSync(
|
|
173
|
+
outfile,
|
|
174
|
+
`export { default } from './${relative(
|
|
175
|
+
dirname(outfile),
|
|
176
|
+
bundle.resolvedEntryPointPath
|
|
177
|
+
)}'`
|
|
178
|
+
);
|
|
179
|
+
}
|
|
180
|
+
} else {
|
|
181
|
+
const {
|
|
182
|
+
directory,
|
|
183
|
+
outfile,
|
|
184
|
+
outdir,
|
|
185
|
+
outputConfigPath,
|
|
186
|
+
outputRoutesPath: routesOutputPath,
|
|
187
|
+
minify,
|
|
188
|
+
sourcemap,
|
|
189
|
+
fallbackService,
|
|
190
|
+
watch,
|
|
191
|
+
plugin,
|
|
192
|
+
buildOutputDirectory,
|
|
193
|
+
nodejsCompat,
|
|
194
|
+
legacyNodeCompat,
|
|
195
|
+
bindings,
|
|
196
|
+
workerScriptPath,
|
|
197
|
+
} = validatedArgs;
|
|
198
|
+
|
|
199
|
+
let d1Databases: string[] | undefined = undefined;
|
|
200
|
+
if (bindings) {
|
|
201
|
+
try {
|
|
202
|
+
const decodedBindings = JSON.parse(bindings);
|
|
203
|
+
d1Databases = Object.keys(decodedBindings?.d1_databases || {});
|
|
204
|
+
} catch {
|
|
205
|
+
throw new FatalError("Could not parse a valid set of 'bindings'.", 1);
|
|
206
|
+
}
|
|
207
|
+
}
|
|
208
|
+
|
|
209
|
+
/**
|
|
210
|
+
* prioritize building `_worker.js` over Pages Functions, if both exist
|
|
211
|
+
* and if we were able to resolve _worker.js
|
|
212
|
+
*/
|
|
213
|
+
if (workerScriptPath) {
|
|
214
|
+
if (lstatSync(workerScriptPath).isDirectory()) {
|
|
215
|
+
bundle = await traverseAndBuildWorkerJSDirectory({
|
|
216
|
+
workerJSDirectory: workerScriptPath,
|
|
217
|
+
buildOutputDirectory,
|
|
218
|
+
d1Databases,
|
|
219
|
+
nodejsCompat,
|
|
220
|
+
});
|
|
221
|
+
} else {
|
|
222
|
+
/**
|
|
223
|
+
* `buildRawWorker` builds `_worker.js`, but doesn't give us the bundle
|
|
224
|
+
* we want to return, which includes the external dependencies (like wasm,
|
|
225
|
+
* binary, text). Let's output that build result to memory and only write
|
|
226
|
+
* to disk once we have the final bundle
|
|
227
|
+
*/
|
|
228
|
+
bundle = await buildRawWorker({
|
|
229
|
+
workerScriptPath,
|
|
230
|
+
outdir,
|
|
231
|
+
directory: buildOutputDirectory,
|
|
232
|
+
local: false,
|
|
233
|
+
sourcemap,
|
|
234
|
+
watch,
|
|
235
|
+
betaD1Shims: d1Databases,
|
|
236
|
+
nodejsCompat,
|
|
237
|
+
});
|
|
238
|
+
}
|
|
239
|
+
} else {
|
|
240
|
+
try {
|
|
241
|
+
/**
|
|
242
|
+
* `buildFunctions` builds `/functions`, but doesn't give us the bundle
|
|
243
|
+
* we want to return, which includes the external dependencies (like wasm,
|
|
244
|
+
* binary, text). Let's output that build result to memory and only write
|
|
245
|
+
* to disk once we have the final bundle
|
|
246
|
+
*/
|
|
247
|
+
bundle = await buildFunctions({
|
|
248
|
+
outdir,
|
|
249
|
+
outputConfigPath,
|
|
250
|
+
functionsDirectory: directory,
|
|
251
|
+
minify,
|
|
252
|
+
sourcemap,
|
|
253
|
+
fallbackService,
|
|
254
|
+
watch,
|
|
255
|
+
plugin,
|
|
256
|
+
buildOutputDirectory,
|
|
257
|
+
legacyNodeCompat,
|
|
258
|
+
nodejsCompat,
|
|
259
|
+
routesOutputPath,
|
|
260
|
+
local: false,
|
|
261
|
+
d1Databases,
|
|
262
|
+
});
|
|
263
|
+
} catch (e) {
|
|
264
|
+
if (e instanceof FunctionsNoRoutesError) {
|
|
265
|
+
throw new FatalError(
|
|
266
|
+
getFunctionsNoRoutesWarning(directory),
|
|
267
|
+
EXIT_CODE_FUNCTIONS_NO_ROUTES_ERROR
|
|
268
|
+
);
|
|
269
|
+
} else {
|
|
270
|
+
throw e;
|
|
271
|
+
}
|
|
272
|
+
}
|
|
273
|
+
}
|
|
274
|
+
|
|
275
|
+
if (outfile) {
|
|
276
|
+
const workerBundleContents = await createUploadWorkerBundleContents(
|
|
277
|
+
bundle as BundleResult
|
|
278
|
+
);
|
|
279
|
+
|
|
280
|
+
mkdirSync(dirname(outfile), { recursive: true });
|
|
281
|
+
writeFileSync(
|
|
282
|
+
outfile,
|
|
283
|
+
Buffer.from(await workerBundleContents.arrayBuffer())
|
|
284
|
+
);
|
|
285
|
+
}
|
|
286
|
+
}
|
|
287
|
+
|
|
288
|
+
await metrics.sendMetricsEvent("build pages functions");
|
|
289
|
+
};
|
|
290
|
+
|
|
291
|
+
type WorkerBundleArgs = Omit<PagesBuildArgs, "nodeCompat"> & {
|
|
292
|
+
plugin: false;
|
|
293
|
+
buildOutputDirectory: string;
|
|
294
|
+
legacyNodeCompat: boolean;
|
|
295
|
+
nodejsCompat: boolean;
|
|
296
|
+
|
|
297
|
+
workerScriptPath: string;
|
|
298
|
+
};
|
|
299
|
+
type PluginArgs = Omit<
|
|
300
|
+
PagesBuildArgs,
|
|
301
|
+
"buildOutputDirectory" | "bindings" | "nodeCompat"
|
|
302
|
+
> & {
|
|
303
|
+
plugin: true;
|
|
304
|
+
outdir: string;
|
|
305
|
+
legacyNodeCompat: boolean;
|
|
306
|
+
nodejsCompat: boolean;
|
|
307
|
+
};
|
|
308
|
+
|
|
309
|
+
type ValidatedArgs = WorkerBundleArgs | PluginArgs;
|
|
310
|
+
|
|
311
|
+
const validateArgs = (args: PagesBuildArgs): ValidatedArgs => {
|
|
312
|
+
if (args.outdir && args.outfile) {
|
|
313
|
+
throw new FatalError(
|
|
314
|
+
"Cannot specify both an `--outdir` and an `--outfile`.",
|
|
315
|
+
1
|
|
316
|
+
);
|
|
317
|
+
}
|
|
318
|
+
|
|
319
|
+
if (args.plugin) {
|
|
320
|
+
if (args.outfile) {
|
|
321
|
+
// Explicit old behavior. Encourage to migrate to `--outdir` instead.
|
|
322
|
+
logger.warn(
|
|
323
|
+
"Creating a Pages Plugin with `--outfile` is now deprecated. Please use `--outdir` instead."
|
|
324
|
+
);
|
|
325
|
+
|
|
326
|
+
args.outdir = dirname(resolvePath(args.outfile));
|
|
327
|
+
} else if (!args.outfile && !args.outdir) {
|
|
328
|
+
// Didn't specify `--outfile`, but didn't specify `--outdir` either. Implicit old behavior defaults. Encourage to migrate to `--outdir`.
|
|
329
|
+
args.outfile ??= "_worker.js";
|
|
330
|
+
args.outdir = ".";
|
|
331
|
+
|
|
332
|
+
logger.warn(
|
|
333
|
+
"Creating a Pages Plugin without `--outdir` is now deprecated. Please add an `--outdir` argument."
|
|
334
|
+
);
|
|
335
|
+
}
|
|
336
|
+
|
|
337
|
+
if (args.bindings) {
|
|
338
|
+
throw new FatalError(
|
|
339
|
+
"The `--bindings` flag cannot be used when creating a Pages Plugin with `--plugin`.",
|
|
340
|
+
1
|
|
341
|
+
);
|
|
342
|
+
}
|
|
343
|
+
|
|
344
|
+
if (args.buildOutputDirectory) {
|
|
345
|
+
throw new FatalError(
|
|
346
|
+
"The `--build-output-directory` flag cannot be used when creating a Pages Plugin with `--plugin`.",
|
|
347
|
+
1
|
|
348
|
+
);
|
|
349
|
+
}
|
|
350
|
+
} else {
|
|
351
|
+
if (!args.outdir) {
|
|
352
|
+
args.outfile ??= "_worker.bundle";
|
|
353
|
+
}
|
|
354
|
+
|
|
355
|
+
args.buildOutputDirectory ??= args.outfile ? dirname(args.outfile) : ".";
|
|
356
|
+
}
|
|
357
|
+
|
|
358
|
+
if (args.buildOutputDirectory) {
|
|
359
|
+
args.buildOutputDirectory = resolvePath(args.buildOutputDirectory);
|
|
360
|
+
}
|
|
361
|
+
if (args.outdir) {
|
|
362
|
+
args.outdir = resolvePath(args.outdir);
|
|
363
|
+
}
|
|
364
|
+
if (args.outfile) {
|
|
365
|
+
args.outfile = resolvePath(args.outfile);
|
|
366
|
+
}
|
|
367
|
+
|
|
368
|
+
const { nodeCompat: legacyNodeCompat, ...argsExceptNodeCompat } = args;
|
|
369
|
+
if (legacyNodeCompat) {
|
|
370
|
+
console.warn(
|
|
371
|
+
"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."
|
|
372
|
+
);
|
|
373
|
+
}
|
|
374
|
+
const nodejsCompat = !!args.compatibilityFlags?.includes("nodejs_compat");
|
|
375
|
+
if (legacyNodeCompat && nodejsCompat) {
|
|
376
|
+
throw new Error(
|
|
377
|
+
"The `nodejs_compat` compatibility flag cannot be used in conjunction with the legacy `--node-compat` flag. If you want to use the Workers runtime Node.js compatibility features, please remove the `--node-compat` argument from your CLI command."
|
|
378
|
+
);
|
|
379
|
+
}
|
|
380
|
+
|
|
381
|
+
let workerScriptPath: string | undefined;
|
|
382
|
+
|
|
383
|
+
if (args.buildOutputDirectory) {
|
|
384
|
+
const prospectiveWorkerScriptPath = resolvePath(
|
|
385
|
+
args.buildOutputDirectory,
|
|
386
|
+
"_worker.js"
|
|
387
|
+
);
|
|
388
|
+
|
|
389
|
+
const foundWorkerScript = existsSync(prospectiveWorkerScriptPath);
|
|
390
|
+
|
|
391
|
+
if (foundWorkerScript) {
|
|
392
|
+
workerScriptPath = prospectiveWorkerScriptPath;
|
|
393
|
+
} else if (!foundWorkerScript && !existsSync(args.directory)) {
|
|
394
|
+
throw new FatalError(
|
|
395
|
+
`Could not find anything to build.
|
|
396
|
+
We first looked inside the build output directory (${basename(
|
|
397
|
+
resolvePath(args.buildOutputDirectory)
|
|
398
|
+
)}), then looked for the Functions directory (${basename(
|
|
399
|
+
args.directory
|
|
400
|
+
)}) but couldn't find anything to build.
|
|
401
|
+
➤ If you are trying to build _worker.js, please make sure you provide the [--build-output-directory] containing your static files.
|
|
402
|
+
➤ If you are trying to build Pages Functions, please make sure [directory] points to the location of your Functions files.`,
|
|
403
|
+
EXIT_CODE_FUNCTIONS_NOTHING_TO_BUILD_ERROR
|
|
404
|
+
);
|
|
405
|
+
}
|
|
406
|
+
} else if (!existsSync(args.directory)) {
|
|
407
|
+
throw new FatalError(
|
|
408
|
+
`Could not find anything to build.
|
|
409
|
+
We looked for the Functions directory (${basename(
|
|
410
|
+
args.directory
|
|
411
|
+
)}) but couldn't find anything to build.
|
|
412
|
+
➤ Please make sure [directory] points to the location of your Functions files.`,
|
|
413
|
+
EXIT_CODE_FUNCTIONS_NOTHING_TO_BUILD_ERROR
|
|
414
|
+
);
|
|
415
|
+
}
|
|
416
|
+
|
|
417
|
+
return {
|
|
418
|
+
...argsExceptNodeCompat,
|
|
419
|
+
workerScriptPath,
|
|
420
|
+
nodejsCompat,
|
|
421
|
+
legacyNodeCompat,
|
|
422
|
+
} as ValidatedArgs;
|
|
423
|
+
};
|
|
@@ -0,0 +1,140 @@
|
|
|
1
|
+
import { writeFileSync } from "node:fs";
|
|
2
|
+
import { tmpdir } from "node:os";
|
|
3
|
+
import { join, resolve } from "node:path";
|
|
4
|
+
import { FatalError } from "../errors";
|
|
5
|
+
import { toUrlPath } from "../paths";
|
|
6
|
+
import { FunctionsNoRoutesError } from "./errors";
|
|
7
|
+
import { buildPlugin } from "./functions/buildPlugin";
|
|
8
|
+
import { buildWorker } from "./functions/buildWorker";
|
|
9
|
+
import { generateConfigFromFileTree } from "./functions/filepath-routing";
|
|
10
|
+
import { writeRoutesModule } from "./functions/routes";
|
|
11
|
+
import { convertRoutesToRoutesJSONSpec } from "./functions/routes-transformation";
|
|
12
|
+
import { RUNNING_BUILDERS } from "./utils";
|
|
13
|
+
import type { BundleResult } from "../bundle";
|
|
14
|
+
import type { PagesBuildArgs } from "./build";
|
|
15
|
+
import type { Config } from "./functions/routes";
|
|
16
|
+
|
|
17
|
+
/**
|
|
18
|
+
* Builds a Functions worker based on the functions directory, with filepath and handler based routing.
|
|
19
|
+
* @throws FunctionsNoRoutesError when there are no routes found in the functions directory
|
|
20
|
+
*/
|
|
21
|
+
|
|
22
|
+
export async function buildFunctions({
|
|
23
|
+
outfile,
|
|
24
|
+
outdir,
|
|
25
|
+
outputConfigPath,
|
|
26
|
+
functionsDirectory,
|
|
27
|
+
minify = false,
|
|
28
|
+
sourcemap = false,
|
|
29
|
+
fallbackService = "ASSETS",
|
|
30
|
+
watch = false,
|
|
31
|
+
onEnd,
|
|
32
|
+
plugin = false,
|
|
33
|
+
buildOutputDirectory,
|
|
34
|
+
routesOutputPath,
|
|
35
|
+
legacyNodeCompat,
|
|
36
|
+
nodejsCompat,
|
|
37
|
+
local,
|
|
38
|
+
d1Databases,
|
|
39
|
+
}: Partial<
|
|
40
|
+
Pick<
|
|
41
|
+
PagesBuildArgs,
|
|
42
|
+
| "outfile"
|
|
43
|
+
| "outdir"
|
|
44
|
+
| "outputConfigPath"
|
|
45
|
+
| "minify"
|
|
46
|
+
| "sourcemap"
|
|
47
|
+
| "fallbackService"
|
|
48
|
+
| "watch"
|
|
49
|
+
| "plugin"
|
|
50
|
+
| "buildOutputDirectory"
|
|
51
|
+
>
|
|
52
|
+
> & {
|
|
53
|
+
functionsDirectory: string;
|
|
54
|
+
onEnd?: () => void;
|
|
55
|
+
routesOutputPath?: PagesBuildArgs["outputRoutesPath"];
|
|
56
|
+
local: boolean;
|
|
57
|
+
d1Databases?: string[];
|
|
58
|
+
legacyNodeCompat?: boolean;
|
|
59
|
+
nodejsCompat?: boolean;
|
|
60
|
+
}) {
|
|
61
|
+
RUNNING_BUILDERS.forEach(
|
|
62
|
+
(runningBuilder) => runningBuilder.stop && runningBuilder.stop()
|
|
63
|
+
);
|
|
64
|
+
|
|
65
|
+
const routesModule = join(tmpdir(), `./functionsRoutes-${Math.random()}.mjs`);
|
|
66
|
+
const baseURL = toUrlPath("/");
|
|
67
|
+
|
|
68
|
+
const config: Config = await generateConfigFromFileTree({
|
|
69
|
+
baseDir: functionsDirectory,
|
|
70
|
+
baseURL,
|
|
71
|
+
});
|
|
72
|
+
|
|
73
|
+
if (!config.routes || config.routes.length === 0) {
|
|
74
|
+
throw new FunctionsNoRoutesError(
|
|
75
|
+
`Failed to find any routes while compiling Functions in: ${functionsDirectory}`
|
|
76
|
+
);
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
if (routesOutputPath) {
|
|
80
|
+
const routesJSON = convertRoutesToRoutesJSONSpec(config.routes);
|
|
81
|
+
writeFileSync(routesOutputPath, JSON.stringify(routesJSON, null, 2));
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
if (outputConfigPath) {
|
|
85
|
+
writeFileSync(
|
|
86
|
+
outputConfigPath,
|
|
87
|
+
JSON.stringify({ ...config, baseURL }, null, 2)
|
|
88
|
+
);
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
await writeRoutesModule({
|
|
92
|
+
config,
|
|
93
|
+
srcDir: functionsDirectory,
|
|
94
|
+
outfile: routesModule,
|
|
95
|
+
});
|
|
96
|
+
|
|
97
|
+
const absoluteFunctionsDirectory = resolve(functionsDirectory);
|
|
98
|
+
let bundle: BundleResult;
|
|
99
|
+
|
|
100
|
+
if (plugin) {
|
|
101
|
+
if (outdir === undefined) {
|
|
102
|
+
throw new FatalError(
|
|
103
|
+
"Must specify an output directory when building a Plugin.",
|
|
104
|
+
1
|
|
105
|
+
);
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
bundle = await buildPlugin({
|
|
109
|
+
routesModule,
|
|
110
|
+
outdir,
|
|
111
|
+
minify,
|
|
112
|
+
sourcemap,
|
|
113
|
+
watch,
|
|
114
|
+
legacyNodeCompat,
|
|
115
|
+
functionsDirectory: absoluteFunctionsDirectory,
|
|
116
|
+
local,
|
|
117
|
+
betaD1Shims: d1Databases,
|
|
118
|
+
});
|
|
119
|
+
} else {
|
|
120
|
+
bundle = await buildWorker({
|
|
121
|
+
routesModule,
|
|
122
|
+
outfile,
|
|
123
|
+
outdir,
|
|
124
|
+
minify,
|
|
125
|
+
sourcemap,
|
|
126
|
+
fallbackService,
|
|
127
|
+
watch,
|
|
128
|
+
functionsDirectory: absoluteFunctionsDirectory,
|
|
129
|
+
local,
|
|
130
|
+
betaD1Shims: d1Databases,
|
|
131
|
+
onEnd,
|
|
132
|
+
buildOutputDirectory,
|
|
133
|
+
legacyNodeCompat,
|
|
134
|
+
nodejsCompat,
|
|
135
|
+
});
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
RUNNING_BUILDERS.push(bundle);
|
|
139
|
+
return bundle;
|
|
140
|
+
}
|