wrangler 0.0.0-e98613f8 → 0.0.0-e9a45766c
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 +10 -4
- package/bin/wrangler.js +10 -2
- package/miniflare-dist/index.mjs +257 -132
- 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 +575 -39
- 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 +11 -2
- package/src/__tests__/deployments.test.ts +330 -52
- package/src/__tests__/dev.test.tsx +146 -82
- package/src/__tests__/generate.test.ts +10 -8
- 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 +99 -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/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 -74
- package/src/__tests__/init.test.ts +909 -628
- 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 +1 -1
- package/src/__tests__/metrics.test.ts +93 -50
- 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 +528 -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 +239 -102
- package/src/__tests__/parse.test.ts +106 -0
- package/src/__tests__/publish.test.ts +2218 -1002
- package/src/__tests__/pubsub.test.ts +226 -100
- package/src/__tests__/queues.test.ts +42 -32
- package/src/__tests__/r2.test.ts +37 -56
- package/src/__tests__/secret.test.ts +179 -130
- package/src/__tests__/tail.test.ts +113 -23
- 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 +8 -0
- package/src/__tests__/user.test.ts +7 -18
- package/src/__tests__/whoami.test.tsx +8 -114
- package/src/__tests__/worker-namespace.test.ts +83 -69
- package/src/api/dev.ts +172 -61
- package/src/api/index.ts +10 -1
- package/src/api/mtls-certificate.ts +148 -0
- package/src/api/pages/create-worker-bundle-contents.ts +77 -0
- package/src/api/pages/index.ts +5 -0
- package/src/api/pages/publish.tsx +371 -0
- package/src/bundle.ts +139 -33
- 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 +80 -16
- package/src/config/index.ts +99 -30
- package/src/config/validation-helpers.ts +1 -1
- package/src/config/validation.ts +275 -9
- package/src/constellation/createProject.tsx +51 -0
- package/src/constellation/deleteProject.ts +51 -0
- package/src/constellation/deleteProjectModel.ts +68 -0
- package/src/constellation/index.ts +75 -0
- package/src/constellation/listCatalog.tsx +35 -0
- package/src/constellation/listModel.tsx +41 -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 +64 -0
- package/src/constellation/utils.ts +90 -0
- package/src/create-worker-preview.ts +19 -8
- package/src/create-worker-upload-form.ts +52 -5
- package/src/d1/backups.tsx +40 -44
- package/src/d1/create.tsx +50 -43
- package/src/d1/{delete.tsx → delete.ts} +8 -11
- package/src/d1/execute.tsx +171 -166
- package/src/d1/index.ts +5 -6
- package/src/d1/list.tsx +27 -13
- package/src/d1/migrations/apply.tsx +92 -64
- package/src/d1/migrations/create.tsx +31 -29
- package/src/d1/migrations/helpers.ts +66 -44
- package/src/d1/migrations/list.tsx +47 -31
- package/src/d1/migrations/options.ts +7 -2
- 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 +13 -22
- package/src/dev/local.tsx +131 -69
- package/src/dev/remote.tsx +35 -3
- package/src/dev/start-server.ts +83 -77
- package/src/dev/use-esbuild.ts +63 -52
- package/src/dev/validate-dev-props.ts +9 -0
- package/src/{dev-registry.tsx → dev-registry.ts} +9 -8
- package/src/dev.tsx +131 -110
- 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 +298 -0
- package/src/{index.tsx → index.ts} +137 -56
- package/src/init.ts +254 -187
- package/src/inspect.ts +170 -9
- 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 +1 -1
- package/src/metrics/send-event.ts +4 -1
- package/src/miniflare-cli/assets.ts +66 -31
- package/src/miniflare-cli/index.ts +5 -8
- 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.tsx → deployment-tails.ts} +7 -10
- package/src/pages/deployments.tsx +9 -9
- package/src/pages/{dev.tsx → dev.ts} +167 -139
- package/src/pages/errors.ts +1 -0
- package/src/pages/functions/buildPlugin.ts +61 -54
- package/src/pages/functions/buildWorker.ts +217 -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} +3 -3
- package/src/pages/projects.tsx +12 -22
- package/src/pages/publish.tsx +43 -227
- package/src/pages/types.ts +5 -0
- package/src/pages/upload.tsx +57 -14
- package/src/pages/utils.ts +1 -1
- package/src/parse.ts +23 -1
- package/src/paths.ts +1 -1
- package/src/publish/index.ts +20 -16
- package/src/publish/publish.ts +76 -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 +3 -4
- package/src/queues/cli/commands/list.ts +8 -8
- package/src/queues/client.ts +1 -0
- package/src/r2/helpers.ts +1 -0
- package/src/r2/index.ts +28 -28
- package/src/secret/index.ts +15 -16
- package/src/{sites.tsx → sites.ts} +165 -53
- package/src/tail/createTail.ts +37 -1
- package/src/tail/filters.ts +1 -1
- package/src/tail/index.ts +8 -11
- package/src/tail/printing.ts +25 -0
- package/src/traverse-module-graph.ts +54 -0
- package/src/tsconfig-sanity.ts +16 -0
- package/src/type-generation.ts +11 -3
- 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} +114 -77
- package/src/utils/render.ts +93 -0
- package/src/{whoami.tsx → whoami.ts} +37 -71
- package/src/worker.ts +35 -1
- package/src/yargs-types.ts +18 -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 +42 -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 +6 -0
- package/templates/middleware/middleware-miniflare3-json-error.ts +17 -5
- 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 +871 -73
- package/wrangler-dist/cli.js +80512 -90686
- package/wrangler-dist/wasm-sync.wasm +0 -0
- package/src/__tests__/api-devregistry.test.js +0 -56
- package/src/__tests__/d1.test.ts +0 -80
- package/src/__tests__/dialogs.test.tsx +0 -40
- package/src/__tests__/helpers/mock-cfetch.ts +0 -333
- package/src/__tests__/pages.test.ts +0 -2442
- package/src/dialogs.tsx +0 -168
- package/src/environment-variables.ts +0 -50
- package/src/pages/build.tsx +0 -270
- package/src/user/env-vars.ts +0 -46
- /package/src/{bundle-reporter.tsx → bundle-reporter.ts} +0 -0
- /package/src/d1/migrations/{index.tsx → index.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/init.ts
CHANGED
|
@@ -19,13 +19,18 @@ import { CommandLineArgsError, printWranglerBanner } from "./index";
|
|
|
19
19
|
|
|
20
20
|
import type { RawConfig } from "./config";
|
|
21
21
|
import type { Route, SimpleRoute } from "./config/environment";
|
|
22
|
-
import type {
|
|
23
|
-
|
|
22
|
+
import type {
|
|
23
|
+
WorkerMetadata,
|
|
24
|
+
WorkerMetadataBinding,
|
|
25
|
+
} from "./create-worker-upload-form";
|
|
24
26
|
import type { PackageManager } from "./package-manager";
|
|
25
|
-
import type {
|
|
26
|
-
import type {
|
|
27
|
+
import type { PackageJSON } from "./parse";
|
|
28
|
+
import type {
|
|
29
|
+
CommonYargsArgv,
|
|
30
|
+
StrictYargsOptionsToInterface,
|
|
31
|
+
} from "./yargs-types";
|
|
27
32
|
|
|
28
|
-
export
|
|
33
|
+
export function initOptions(yargs: CommonYargsArgv) {
|
|
29
34
|
return yargs
|
|
30
35
|
.positional("name", {
|
|
31
36
|
describe: "The name of your worker",
|
|
@@ -49,18 +54,14 @@ export async function initOptions(yargs: Argv<CommonYargsOptions>) {
|
|
|
49
54
|
alias: "y",
|
|
50
55
|
})
|
|
51
56
|
.option("from-dash", {
|
|
52
|
-
describe:
|
|
57
|
+
describe:
|
|
58
|
+
"The name of the Worker you wish to download from the Cloudflare dashboard for local development.",
|
|
53
59
|
type: "string",
|
|
54
60
|
requiresArg: true,
|
|
55
61
|
});
|
|
56
62
|
}
|
|
57
63
|
|
|
58
|
-
|
|
59
|
-
name: string;
|
|
60
|
-
type?: string;
|
|
61
|
-
site?: boolean;
|
|
62
|
-
yes?: boolean;
|
|
63
|
-
}
|
|
64
|
+
type InitArgs = StrictYargsOptionsToInterface<typeof initOptions>;
|
|
64
65
|
|
|
65
66
|
export type ServiceMetadataRes = {
|
|
66
67
|
id: string;
|
|
@@ -79,6 +80,7 @@ export type ServiceMetadataRes = {
|
|
|
79
80
|
usage_model: "bundled" | "unbound";
|
|
80
81
|
compatibility_date: string;
|
|
81
82
|
last_deployed_from?: "wrangler" | "dash" | "api";
|
|
83
|
+
placement_mode?: "smart";
|
|
82
84
|
};
|
|
83
85
|
};
|
|
84
86
|
created_on: string;
|
|
@@ -109,7 +111,7 @@ export type CronTriggersRes = {
|
|
|
109
111
|
];
|
|
110
112
|
};
|
|
111
113
|
|
|
112
|
-
export async function initHandler(args:
|
|
114
|
+
export async function initHandler(args: InitArgs) {
|
|
113
115
|
await printWranglerBanner();
|
|
114
116
|
if (args.type) {
|
|
115
117
|
let message = "The --type option is no longer supported.";
|
|
@@ -124,7 +126,7 @@ export async function initHandler(args: ArgumentsCamelCase<InitArgs>) {
|
|
|
124
126
|
const devDepsToInstall: string[] = [];
|
|
125
127
|
const instructions: string[] = [];
|
|
126
128
|
let shouldRunPackageManagerInstall = false;
|
|
127
|
-
const fromDashScriptName = args
|
|
129
|
+
const fromDashScriptName = args.fromDash;
|
|
128
130
|
const creationDirectory = path.resolve(
|
|
129
131
|
process.cwd(),
|
|
130
132
|
(args.name ? args.name : fromDashScriptName) ?? ""
|
|
@@ -165,6 +167,27 @@ export async function initHandler(args: ArgumentsCamelCase<InitArgs>) {
|
|
|
165
167
|
);
|
|
166
168
|
let justCreatedWranglerToml = false;
|
|
167
169
|
|
|
170
|
+
let accountId = "";
|
|
171
|
+
let serviceMetadata: undefined | ServiceMetadataRes;
|
|
172
|
+
|
|
173
|
+
// If --from-dash, check that script actually exists
|
|
174
|
+
if (fromDashScriptName) {
|
|
175
|
+
const config = readConfig(args.config, args);
|
|
176
|
+
accountId = await requireAuth(config);
|
|
177
|
+
try {
|
|
178
|
+
serviceMetadata = await fetchResult<ServiceMetadataRes>(
|
|
179
|
+
`/accounts/${accountId}/workers/services/${fromDashScriptName}`
|
|
180
|
+
);
|
|
181
|
+
} catch (err) {
|
|
182
|
+
if ((err as { code?: number }).code === 10090) {
|
|
183
|
+
throw new Error(
|
|
184
|
+
"wrangler couldn't find a Worker script with that name in your account.\nRun `wrangler whoami` to confirm you're logged into the correct account."
|
|
185
|
+
);
|
|
186
|
+
}
|
|
187
|
+
throw err;
|
|
188
|
+
}
|
|
189
|
+
}
|
|
190
|
+
|
|
168
191
|
if (fs.existsSync(wranglerTomlDestination)) {
|
|
169
192
|
let shouldContinue = false;
|
|
170
193
|
logger.warn(
|
|
@@ -309,7 +332,7 @@ export async function initHandler(args: ArgumentsCamelCase<InitArgs>) {
|
|
|
309
332
|
isTypescriptProject = true;
|
|
310
333
|
await writeFile(
|
|
311
334
|
path.join(creationDirectory, "./tsconfig.json"),
|
|
312
|
-
readFileSync(path.join(getBasePath(), "templates/tsconfig.json"))
|
|
335
|
+
readFileSync(path.join(getBasePath(), "templates/tsconfig.init.json"))
|
|
313
336
|
);
|
|
314
337
|
devDepsToInstall.push("@cloudflare/workers-types");
|
|
315
338
|
devDepsToInstall.push("typescript");
|
|
@@ -411,7 +434,7 @@ export async function initHandler(args: ArgumentsCamelCase<InitArgs>) {
|
|
|
411
434
|
: `wrangler publish ${scriptPath}`,
|
|
412
435
|
...(isAddingTestScripts && { test: testRunner }),
|
|
413
436
|
},
|
|
414
|
-
},
|
|
437
|
+
} as PackageJSON,
|
|
415
438
|
null,
|
|
416
439
|
2
|
|
417
440
|
) + "\n"
|
|
@@ -449,19 +472,15 @@ export async function initHandler(args: ArgumentsCamelCase<InitArgs>) {
|
|
|
449
472
|
);
|
|
450
473
|
if (fromDashScriptName) {
|
|
451
474
|
logger.warn(
|
|
452
|
-
|
|
453
|
-
Edits made via the Dashboard will not be synchronized locally and will be overridden by your local code and config when you publish.`
|
|
475
|
+
"After running `wrangler init --from-dash`, modifying your worker via the Cloudflare dashboard is discouraged.\nEdits made via the Dashboard will not be synchronized locally and will be overridden by your local code and config when you publish."
|
|
454
476
|
);
|
|
455
|
-
|
|
456
|
-
const accountId = await requireAuth(config);
|
|
477
|
+
|
|
457
478
|
await mkdir(path.join(creationDirectory, "./src"), {
|
|
458
479
|
recursive: true,
|
|
459
480
|
});
|
|
460
|
-
|
|
461
|
-
`/accounts/${accountId}/workers/services/${fromDashScriptName}`
|
|
462
|
-
);
|
|
481
|
+
|
|
463
482
|
const defaultEnvironment =
|
|
464
|
-
|
|
483
|
+
serviceMetadata?.default_environment.environment;
|
|
465
484
|
// I want the default environment, assuming it's the most up to date code.
|
|
466
485
|
const dashScript = await fetchDashboardScript(
|
|
467
486
|
`/accounts/${accountId}/workers/services/${fromDashScriptName}/environments/${defaultEnvironment}/content`
|
|
@@ -479,7 +498,7 @@ export async function initHandler(args: ArgumentsCamelCase<InitArgs>) {
|
|
|
479
498
|
scriptPath: "src/index.ts",
|
|
480
499
|
extraToml: (await getWorkerConfig(accountId, fromDashScriptName, {
|
|
481
500
|
defaultEnvironment,
|
|
482
|
-
environments:
|
|
501
|
+
environments: serviceMetadata?.environments,
|
|
483
502
|
})) as TOML.JsonMap,
|
|
484
503
|
});
|
|
485
504
|
} else {
|
|
@@ -493,6 +512,7 @@ export async function initHandler(args: ArgumentsCamelCase<InitArgs>) {
|
|
|
493
512
|
await mkdir(path.join(creationDirectory, "./src"), {
|
|
494
513
|
recursive: true,
|
|
495
514
|
});
|
|
515
|
+
|
|
496
516
|
await writeFile(
|
|
497
517
|
path.join(creationDirectory, "./src/index.ts"),
|
|
498
518
|
readFileSync(path.join(getBasePath(), `templates/${template}`))
|
|
@@ -505,10 +525,43 @@ export async function initHandler(args: ArgumentsCamelCase<InitArgs>) {
|
|
|
505
525
|
)}`
|
|
506
526
|
);
|
|
507
527
|
|
|
528
|
+
shouldCreateTests =
|
|
529
|
+
yesFlag ||
|
|
530
|
+
(await confirm(
|
|
531
|
+
"Would you like us to write your first test with Vitest?"
|
|
532
|
+
));
|
|
533
|
+
|
|
534
|
+
if (shouldCreateTests) {
|
|
535
|
+
if (yesFlag) {
|
|
536
|
+
logger.info("Your project will use Vitest to run your tests.");
|
|
537
|
+
}
|
|
538
|
+
|
|
539
|
+
newWorkerTestType = "vitest";
|
|
540
|
+
devDepsToInstall.push(newWorkerTestType);
|
|
541
|
+
|
|
542
|
+
await writeFile(
|
|
543
|
+
path.join(creationDirectory, "./src/index.test.ts"),
|
|
544
|
+
readFileSync(
|
|
545
|
+
path.join(
|
|
546
|
+
getBasePath(),
|
|
547
|
+
`templates/init-tests/test-${newWorkerTestType}-new-worker.ts`
|
|
548
|
+
)
|
|
549
|
+
)
|
|
550
|
+
);
|
|
551
|
+
logger.log(
|
|
552
|
+
`✨ Created ${path.relative(
|
|
553
|
+
process.cwd(),
|
|
554
|
+
path.join(creationDirectory, "./src/index.test.ts")
|
|
555
|
+
)}`
|
|
556
|
+
);
|
|
557
|
+
}
|
|
558
|
+
|
|
508
559
|
await writePackageJsonScriptsAndUpdateWranglerToml({
|
|
509
560
|
isWritingScripts: shouldWritePackageJsonScripts,
|
|
561
|
+
isAddingTests: shouldCreateTests,
|
|
510
562
|
isCreatingWranglerToml: justCreatedWranglerToml,
|
|
511
563
|
packagePath: pathToPackageJson,
|
|
564
|
+
testRunner: newWorkerTestType,
|
|
512
565
|
scriptPath: "src/index.ts",
|
|
513
566
|
extraToml: getNewWorkerToml(newWorkerType),
|
|
514
567
|
});
|
|
@@ -524,20 +577,15 @@ export async function initHandler(args: ArgumentsCamelCase<InitArgs>) {
|
|
|
524
577
|
|
|
525
578
|
if (fromDashScriptName) {
|
|
526
579
|
logger.warn(
|
|
527
|
-
|
|
528
|
-
Edits made via the Dashboard will not be synchronized locally and will be overridden by your local code and config when you publish.`
|
|
580
|
+
"After running `wrangler init --from-dash`, modifying your worker via the Cloudflare dashboard is discouraged.\nEdits made via the Dashboard will not be synchronized locally and will be overridden by your local code and config when you publish."
|
|
529
581
|
);
|
|
530
|
-
|
|
531
|
-
const accountId = await requireAuth(config);
|
|
582
|
+
|
|
532
583
|
await mkdir(path.join(creationDirectory, "./src"), {
|
|
533
584
|
recursive: true,
|
|
534
585
|
});
|
|
535
586
|
|
|
536
|
-
const serviceMetaData = await fetchResult<ServiceMetadataRes>(
|
|
537
|
-
`/accounts/${accountId}/workers/services/${fromDashScriptName}`
|
|
538
|
-
);
|
|
539
587
|
const defaultEnvironment =
|
|
540
|
-
|
|
588
|
+
serviceMetadata?.default_environment.environment;
|
|
541
589
|
|
|
542
590
|
// I want the default environment, assuming it's the most up to date code.
|
|
543
591
|
const dashScript = await fetchDashboardScript(
|
|
@@ -553,11 +601,11 @@ export async function initHandler(args: ArgumentsCamelCase<InitArgs>) {
|
|
|
553
601
|
isWritingScripts: shouldWritePackageJsonScripts,
|
|
554
602
|
isCreatingWranglerToml: justCreatedWranglerToml,
|
|
555
603
|
packagePath: pathToPackageJson,
|
|
556
|
-
scriptPath: "src/index.
|
|
604
|
+
scriptPath: "src/index.js",
|
|
557
605
|
//? Should we have Environment argument for `wrangler init --from-dash` - Jacob
|
|
558
606
|
extraToml: (await getWorkerConfig(accountId, fromDashScriptName, {
|
|
559
607
|
defaultEnvironment,
|
|
560
|
-
environments:
|
|
608
|
+
environments: serviceMetadata?.environments,
|
|
561
609
|
})) as TOML.JsonMap,
|
|
562
610
|
});
|
|
563
611
|
} else {
|
|
@@ -588,7 +636,7 @@ export async function initHandler(args: ArgumentsCamelCase<InitArgs>) {
|
|
|
588
636
|
(await confirm("Would you like us to write your first test?"));
|
|
589
637
|
|
|
590
638
|
if (shouldCreateTests) {
|
|
591
|
-
newWorkerTestType = await getNewWorkerTestType();
|
|
639
|
+
newWorkerTestType = await getNewWorkerTestType(yesFlag);
|
|
592
640
|
devDepsToInstall.push(newWorkerTestType);
|
|
593
641
|
await writeFile(
|
|
594
642
|
path.join(creationDirectory, "./src/index.test.js"),
|
|
@@ -678,41 +726,41 @@ async function installPackages(
|
|
|
678
726
|
}
|
|
679
727
|
|
|
680
728
|
async function getNewWorkerType(newWorkerFilename: string) {
|
|
681
|
-
return select(
|
|
682
|
-
|
|
683
|
-
[
|
|
729
|
+
return select(`Would you like to create a Worker at ${newWorkerFilename}?`, {
|
|
730
|
+
choices: [
|
|
684
731
|
{
|
|
685
732
|
value: "none",
|
|
686
|
-
|
|
733
|
+
title: "None",
|
|
687
734
|
},
|
|
688
735
|
{
|
|
689
736
|
value: "fetch",
|
|
690
|
-
|
|
737
|
+
title: "Fetch handler",
|
|
691
738
|
},
|
|
692
739
|
{
|
|
693
740
|
value: "scheduled",
|
|
694
|
-
|
|
741
|
+
title: "Scheduled handler",
|
|
695
742
|
},
|
|
696
743
|
],
|
|
697
|
-
1
|
|
698
|
-
)
|
|
744
|
+
defaultOption: 1,
|
|
745
|
+
});
|
|
699
746
|
}
|
|
700
747
|
|
|
701
|
-
async function getNewWorkerTestType() {
|
|
702
|
-
return
|
|
703
|
-
|
|
704
|
-
|
|
705
|
-
|
|
706
|
-
|
|
707
|
-
|
|
708
|
-
|
|
709
|
-
|
|
710
|
-
|
|
711
|
-
|
|
712
|
-
|
|
713
|
-
|
|
714
|
-
|
|
715
|
-
|
|
748
|
+
async function getNewWorkerTestType(yesFlag?: boolean) {
|
|
749
|
+
return yesFlag
|
|
750
|
+
? "jest"
|
|
751
|
+
: select(`Which test runner would you like to use?`, {
|
|
752
|
+
choices: [
|
|
753
|
+
{
|
|
754
|
+
value: "vitest",
|
|
755
|
+
title: "Vitest",
|
|
756
|
+
},
|
|
757
|
+
{
|
|
758
|
+
value: "jest",
|
|
759
|
+
title: "Jest",
|
|
760
|
+
},
|
|
761
|
+
],
|
|
762
|
+
defaultOption: 1,
|
|
763
|
+
});
|
|
716
764
|
}
|
|
717
765
|
|
|
718
766
|
function getNewWorkerTemplate(
|
|
@@ -770,8 +818,8 @@ async function getWorkerConfig(
|
|
|
770
818
|
defaultEnvironment,
|
|
771
819
|
environments,
|
|
772
820
|
}: {
|
|
773
|
-
defaultEnvironment: string;
|
|
774
|
-
environments: ServiceMetadataRes["environments"];
|
|
821
|
+
defaultEnvironment: string | undefined;
|
|
822
|
+
environments: ServiceMetadataRes["environments"] | undefined;
|
|
775
823
|
}
|
|
776
824
|
): Promise<RawConfig> {
|
|
777
825
|
const [bindings, routes, serviceEnvMetadata, cronTriggers] =
|
|
@@ -794,131 +842,7 @@ async function getWorkerConfig(
|
|
|
794
842
|
);
|
|
795
843
|
});
|
|
796
844
|
|
|
797
|
-
const mappedBindings = bindings
|
|
798
|
-
.filter((binding) => (binding.type as string) !== "secret_text")
|
|
799
|
-
// Combine the same types into {[type]: [binding]}
|
|
800
|
-
.reduce((configObj, binding) => {
|
|
801
|
-
// Some types have different names in wrangler.toml
|
|
802
|
-
// I want the type safety of the binding being destructured after the case narrowing the union but type is unused
|
|
803
|
-
|
|
804
|
-
switch (binding.type) {
|
|
805
|
-
case "plain_text":
|
|
806
|
-
{
|
|
807
|
-
configObj.vars = {
|
|
808
|
-
...(configObj.vars ?? {}),
|
|
809
|
-
[binding.name]: binding.text,
|
|
810
|
-
};
|
|
811
|
-
}
|
|
812
|
-
break;
|
|
813
|
-
case "json":
|
|
814
|
-
{
|
|
815
|
-
configObj.vars = {
|
|
816
|
-
...(configObj.vars ?? {}),
|
|
817
|
-
name: binding.name,
|
|
818
|
-
json: binding.json,
|
|
819
|
-
};
|
|
820
|
-
}
|
|
821
|
-
break;
|
|
822
|
-
case "kv_namespace":
|
|
823
|
-
{
|
|
824
|
-
configObj.kv_namespaces = [
|
|
825
|
-
...(configObj.kv_namespaces ?? []),
|
|
826
|
-
{ id: binding.namespace_id, binding: binding.name },
|
|
827
|
-
];
|
|
828
|
-
}
|
|
829
|
-
break;
|
|
830
|
-
case "durable_object_namespace":
|
|
831
|
-
{
|
|
832
|
-
configObj.durable_objects = {
|
|
833
|
-
bindings: [
|
|
834
|
-
...(configObj.durable_objects?.bindings ?? []),
|
|
835
|
-
{
|
|
836
|
-
name: binding.name,
|
|
837
|
-
class_name: binding.class_name,
|
|
838
|
-
script_name: binding.script_name,
|
|
839
|
-
environment: binding.environment,
|
|
840
|
-
},
|
|
841
|
-
],
|
|
842
|
-
};
|
|
843
|
-
}
|
|
844
|
-
break;
|
|
845
|
-
case "r2_bucket":
|
|
846
|
-
{
|
|
847
|
-
configObj.r2_buckets = [
|
|
848
|
-
...(configObj.r2_buckets ?? []),
|
|
849
|
-
{ binding: binding.name, bucket_name: binding.bucket_name },
|
|
850
|
-
];
|
|
851
|
-
}
|
|
852
|
-
break;
|
|
853
|
-
case "service":
|
|
854
|
-
{
|
|
855
|
-
configObj.services = [
|
|
856
|
-
...(configObj.services ?? []),
|
|
857
|
-
{
|
|
858
|
-
binding: binding.name,
|
|
859
|
-
service: binding.service,
|
|
860
|
-
environment: binding.environment,
|
|
861
|
-
},
|
|
862
|
-
];
|
|
863
|
-
}
|
|
864
|
-
break;
|
|
865
|
-
case "namespace":
|
|
866
|
-
{
|
|
867
|
-
configObj.dispatch_namespaces = [
|
|
868
|
-
...(configObj.dispatch_namespaces ?? []),
|
|
869
|
-
{ binding: binding.name, namespace: binding.namespace },
|
|
870
|
-
];
|
|
871
|
-
}
|
|
872
|
-
break;
|
|
873
|
-
case "logfwdr":
|
|
874
|
-
{
|
|
875
|
-
configObj.logfwdr = {
|
|
876
|
-
// TODO: Messaging about adding schema file path
|
|
877
|
-
schema: "",
|
|
878
|
-
bindings: [
|
|
879
|
-
...(configObj.logfwdr?.bindings ?? []),
|
|
880
|
-
{ name: binding.name, destination: binding.destination },
|
|
881
|
-
],
|
|
882
|
-
};
|
|
883
|
-
}
|
|
884
|
-
break;
|
|
885
|
-
case "wasm_module":
|
|
886
|
-
{
|
|
887
|
-
configObj.wasm_modules = {
|
|
888
|
-
...(configObj.wasm_modules ?? {}),
|
|
889
|
-
[binding.name]: binding.part,
|
|
890
|
-
};
|
|
891
|
-
}
|
|
892
|
-
break;
|
|
893
|
-
case "text_blob":
|
|
894
|
-
{
|
|
895
|
-
configObj.text_blobs = {
|
|
896
|
-
...(configObj.text_blobs ?? {}),
|
|
897
|
-
[binding.name]: binding.part,
|
|
898
|
-
};
|
|
899
|
-
}
|
|
900
|
-
break;
|
|
901
|
-
case "data_blob":
|
|
902
|
-
{
|
|
903
|
-
configObj.data_blobs = {
|
|
904
|
-
...(configObj.data_blobs ?? {}),
|
|
905
|
-
[binding.name]: binding.part,
|
|
906
|
-
};
|
|
907
|
-
}
|
|
908
|
-
break;
|
|
909
|
-
default: {
|
|
910
|
-
// If we don't know what the type is, its an unsafe binding
|
|
911
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
912
|
-
if (!(binding as any)?.type) break;
|
|
913
|
-
configObj.unsafe = {
|
|
914
|
-
bindings: [...(configObj.unsafe?.bindings ?? []), binding],
|
|
915
|
-
};
|
|
916
|
-
}
|
|
917
|
-
}
|
|
918
|
-
|
|
919
|
-
return configObj;
|
|
920
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
921
|
-
}, {} as RawConfig);
|
|
845
|
+
const mappedBindings = mapBindings(bindings);
|
|
922
846
|
|
|
923
847
|
const durableObjectClassNames = bindings
|
|
924
848
|
.filter((binding) => binding.type === "durable_object_namespace")
|
|
@@ -945,6 +869,10 @@ async function getWorkerConfig(
|
|
|
945
869
|
new Date().toISOString().substring(0, 10),
|
|
946
870
|
...routeOrRoutesToConfig,
|
|
947
871
|
usage_model: serviceEnvMetadata.script.usage_model,
|
|
872
|
+
placement:
|
|
873
|
+
serviceEnvMetadata.script.placement_mode === "smart"
|
|
874
|
+
? { mode: "smart" }
|
|
875
|
+
: undefined,
|
|
948
876
|
...(durableObjectClassNames.length
|
|
949
877
|
? {
|
|
950
878
|
migrations: [
|
|
@@ -959,7 +887,7 @@ async function getWorkerConfig(
|
|
|
959
887
|
crons: cronTriggers.schedules.map((scheduled) => scheduled.cron),
|
|
960
888
|
},
|
|
961
889
|
env: environments
|
|
962
|
-
|
|
890
|
+
?.filter((env) => env.environment !== "production")
|
|
963
891
|
// `env` can have multiple Environments, with different configs.
|
|
964
892
|
.reduce((envObj, { environment }) => {
|
|
965
893
|
return { ...envObj, [environment]: {} };
|
|
@@ -968,3 +896,142 @@ async function getWorkerConfig(
|
|
|
968
896
|
...mappedBindings,
|
|
969
897
|
};
|
|
970
898
|
}
|
|
899
|
+
|
|
900
|
+
export function mapBindings(bindings: WorkerMetadataBinding[]): RawConfig {
|
|
901
|
+
return (
|
|
902
|
+
bindings
|
|
903
|
+
.filter((binding) => (binding.type as string) !== "secret_text")
|
|
904
|
+
// Combine the same types into {[type]: [binding]}
|
|
905
|
+
.reduce((configObj, binding) => {
|
|
906
|
+
// Some types have different names in wrangler.toml
|
|
907
|
+
// I want the type safety of the binding being destructured after the case narrowing the union but type is unused
|
|
908
|
+
|
|
909
|
+
switch (binding.type) {
|
|
910
|
+
case "plain_text":
|
|
911
|
+
{
|
|
912
|
+
configObj.vars = {
|
|
913
|
+
...(configObj.vars ?? {}),
|
|
914
|
+
[binding.name]: binding.text,
|
|
915
|
+
};
|
|
916
|
+
}
|
|
917
|
+
break;
|
|
918
|
+
case "json":
|
|
919
|
+
{
|
|
920
|
+
configObj.vars = {
|
|
921
|
+
...(configObj.vars ?? {}),
|
|
922
|
+
name: binding.name,
|
|
923
|
+
json: binding.json,
|
|
924
|
+
};
|
|
925
|
+
}
|
|
926
|
+
break;
|
|
927
|
+
case "kv_namespace":
|
|
928
|
+
{
|
|
929
|
+
configObj.kv_namespaces = [
|
|
930
|
+
...(configObj.kv_namespaces ?? []),
|
|
931
|
+
{ id: binding.namespace_id, binding: binding.name },
|
|
932
|
+
];
|
|
933
|
+
}
|
|
934
|
+
break;
|
|
935
|
+
case "durable_object_namespace":
|
|
936
|
+
{
|
|
937
|
+
configObj.durable_objects = {
|
|
938
|
+
bindings: [
|
|
939
|
+
...(configObj.durable_objects?.bindings ?? []),
|
|
940
|
+
{
|
|
941
|
+
name: binding.name,
|
|
942
|
+
class_name: binding.class_name,
|
|
943
|
+
script_name: binding.script_name,
|
|
944
|
+
environment: binding.environment,
|
|
945
|
+
},
|
|
946
|
+
],
|
|
947
|
+
};
|
|
948
|
+
}
|
|
949
|
+
break;
|
|
950
|
+
case "r2_bucket":
|
|
951
|
+
{
|
|
952
|
+
configObj.r2_buckets = [
|
|
953
|
+
...(configObj.r2_buckets ?? []),
|
|
954
|
+
{ binding: binding.name, bucket_name: binding.bucket_name },
|
|
955
|
+
];
|
|
956
|
+
}
|
|
957
|
+
break;
|
|
958
|
+
case "service":
|
|
959
|
+
{
|
|
960
|
+
configObj.services = [
|
|
961
|
+
...(configObj.services ?? []),
|
|
962
|
+
{
|
|
963
|
+
binding: binding.name,
|
|
964
|
+
service: binding.service,
|
|
965
|
+
environment: binding.environment,
|
|
966
|
+
},
|
|
967
|
+
];
|
|
968
|
+
}
|
|
969
|
+
break;
|
|
970
|
+
case "analytics_engine":
|
|
971
|
+
{
|
|
972
|
+
configObj.analytics_engine_datasets = [
|
|
973
|
+
...(configObj.analytics_engine_datasets ?? []),
|
|
974
|
+
{ binding: binding.name, dataset: binding.dataset },
|
|
975
|
+
];
|
|
976
|
+
}
|
|
977
|
+
break;
|
|
978
|
+
case "dispatch_namespace":
|
|
979
|
+
{
|
|
980
|
+
configObj.dispatch_namespaces = [
|
|
981
|
+
...(configObj.dispatch_namespaces ?? []),
|
|
982
|
+
{ binding: binding.name, namespace: binding.namespace },
|
|
983
|
+
];
|
|
984
|
+
}
|
|
985
|
+
break;
|
|
986
|
+
case "logfwdr":
|
|
987
|
+
{
|
|
988
|
+
configObj.logfwdr = {
|
|
989
|
+
// TODO: Messaging about adding schema file path
|
|
990
|
+
schema: "",
|
|
991
|
+
bindings: [
|
|
992
|
+
...(configObj.logfwdr?.bindings ?? []),
|
|
993
|
+
{ name: binding.name, destination: binding.destination },
|
|
994
|
+
],
|
|
995
|
+
};
|
|
996
|
+
}
|
|
997
|
+
break;
|
|
998
|
+
case "wasm_module":
|
|
999
|
+
{
|
|
1000
|
+
configObj.wasm_modules = {
|
|
1001
|
+
...(configObj.wasm_modules ?? {}),
|
|
1002
|
+
[binding.name]: binding.part,
|
|
1003
|
+
};
|
|
1004
|
+
}
|
|
1005
|
+
break;
|
|
1006
|
+
case "text_blob":
|
|
1007
|
+
{
|
|
1008
|
+
configObj.text_blobs = {
|
|
1009
|
+
...(configObj.text_blobs ?? {}),
|
|
1010
|
+
[binding.name]: binding.part,
|
|
1011
|
+
};
|
|
1012
|
+
}
|
|
1013
|
+
break;
|
|
1014
|
+
case "data_blob":
|
|
1015
|
+
{
|
|
1016
|
+
configObj.data_blobs = {
|
|
1017
|
+
...(configObj.data_blobs ?? {}),
|
|
1018
|
+
[binding.name]: binding.part,
|
|
1019
|
+
};
|
|
1020
|
+
}
|
|
1021
|
+
break;
|
|
1022
|
+
default: {
|
|
1023
|
+
// If we don't know what the type is, its an unsafe binding
|
|
1024
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
1025
|
+
if (!(binding as any)?.type) break;
|
|
1026
|
+
configObj.unsafe = {
|
|
1027
|
+
bindings: [...(configObj.unsafe?.bindings ?? []), binding],
|
|
1028
|
+
metadata: configObj.unsafe?.metadata ?? undefined,
|
|
1029
|
+
};
|
|
1030
|
+
}
|
|
1031
|
+
}
|
|
1032
|
+
|
|
1033
|
+
return configObj;
|
|
1034
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
1035
|
+
}, {} as RawConfig)
|
|
1036
|
+
);
|
|
1037
|
+
}
|