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.
Files changed (244) hide show
  1. package/README.md +10 -4
  2. package/bin/wrangler.js +10 -2
  3. package/miniflare-dist/index.mjs +257 -132
  4. package/package.json +26 -19
  5. package/src/__tests__/api-dev.test.ts +65 -36
  6. package/src/__tests__/api-devregistry.test.ts +121 -0
  7. package/src/__tests__/api.test.ts +27 -5
  8. package/src/__tests__/configuration.test.ts +575 -39
  9. package/src/__tests__/constellation.test.ts +371 -0
  10. package/src/__tests__/d1/d1.test.ts +82 -0
  11. package/src/__tests__/d1/execute.test.ts +66 -0
  12. package/src/__tests__/d1/migrate.test.ts +257 -0
  13. package/src/__tests__/d1/splitter.test.ts +255 -0
  14. package/src/__tests__/delete.test.ts +11 -2
  15. package/src/__tests__/deployments.test.ts +330 -52
  16. package/src/__tests__/dev.test.tsx +146 -82
  17. package/src/__tests__/generate.test.ts +10 -8
  18. package/src/__tests__/guess-worker-format.test.ts +35 -0
  19. package/src/__tests__/helpers/end-event-loop.ts +6 -0
  20. package/src/__tests__/helpers/mock-auth-domain.ts +20 -0
  21. package/src/__tests__/helpers/mock-console.ts +6 -0
  22. package/src/__tests__/helpers/mock-dialogs.ts +71 -85
  23. package/src/__tests__/helpers/mock-get-pages-upload-token.ts +25 -0
  24. package/src/__tests__/helpers/mock-get-zone-from-host.ts +8 -5
  25. package/src/__tests__/helpers/mock-known-routes.ts +7 -2
  26. package/src/__tests__/helpers/mock-kv.ts +29 -16
  27. package/src/__tests__/helpers/mock-oauth-flow.ts +99 -92
  28. package/src/__tests__/helpers/mock-process.ts +8 -13
  29. package/src/__tests__/helpers/mock-set-timeout.ts +16 -0
  30. package/src/__tests__/helpers/msw/blob-worker.cjs +19 -0
  31. package/src/__tests__/helpers/msw/handlers/deployments.ts +127 -26
  32. package/src/__tests__/helpers/msw/handlers/namespaces.ts +18 -41
  33. package/src/__tests__/helpers/msw/handlers/r2.ts +14 -34
  34. package/src/__tests__/helpers/msw/handlers/script.ts +9 -28
  35. package/src/__tests__/helpers/msw/handlers/user.ts +13 -24
  36. package/src/__tests__/helpers/msw/handlers/zones.ts +6 -8
  37. package/src/__tests__/helpers/msw/index.ts +32 -1
  38. package/src/__tests__/helpers/msw/read-file-sync.js +61 -0
  39. package/src/__tests__/helpers/string-dynamic-values-matcher.ts +28 -0
  40. package/src/__tests__/helpers/worker-scripts/parent-worker.js +4 -1
  41. package/src/__tests__/index.test.ts +92 -74
  42. package/src/__tests__/init.test.ts +909 -628
  43. package/src/__tests__/jest.setup.ts +19 -42
  44. package/src/__tests__/kv.test.ts +355 -231
  45. package/src/__tests__/logger.test.ts +68 -2
  46. package/src/__tests__/logout.test.ts +1 -1
  47. package/src/__tests__/metrics.test.ts +93 -50
  48. package/src/__tests__/middleware.scheduled.test.ts +42 -32
  49. package/src/__tests__/middleware.test.ts +212 -122
  50. package/src/__tests__/mtls-certificates.test.ts +589 -0
  51. package/src/__tests__/pages/deployment-list.test.ts +80 -0
  52. package/src/__tests__/pages/functions-build.test.ts +528 -0
  53. package/src/__tests__/pages/pages.test.ts +81 -0
  54. package/src/__tests__/pages/project-create.test.ts +63 -0
  55. package/src/__tests__/pages/project-list.test.ts +110 -0
  56. package/src/__tests__/pages/project-upload.test.ts +500 -0
  57. package/src/__tests__/pages/publish.test.ts +2864 -0
  58. package/src/__tests__/pages-deployment-tail.test.ts +239 -102
  59. package/src/__tests__/parse.test.ts +106 -0
  60. package/src/__tests__/publish.test.ts +2218 -1002
  61. package/src/__tests__/pubsub.test.ts +226 -100
  62. package/src/__tests__/queues.test.ts +42 -32
  63. package/src/__tests__/r2.test.ts +37 -56
  64. package/src/__tests__/secret.test.ts +179 -130
  65. package/src/__tests__/tail.test.ts +113 -23
  66. package/src/__tests__/test-old-node-version.js +3 -3
  67. package/src/__tests__/traverse-module-graph.test.ts +220 -0
  68. package/src/__tests__/tsconfig-sanity.ts +12 -0
  69. package/src/__tests__/tsconfig.json +8 -0
  70. package/src/__tests__/tsconfig.tsbuildinfo +1 -0
  71. package/src/__tests__/type-generation.test.ts +8 -0
  72. package/src/__tests__/user.test.ts +7 -18
  73. package/src/__tests__/whoami.test.tsx +8 -114
  74. package/src/__tests__/worker-namespace.test.ts +83 -69
  75. package/src/api/dev.ts +172 -61
  76. package/src/api/index.ts +10 -1
  77. package/src/api/mtls-certificate.ts +148 -0
  78. package/src/api/pages/create-worker-bundle-contents.ts +77 -0
  79. package/src/api/pages/index.ts +5 -0
  80. package/src/api/pages/publish.tsx +371 -0
  81. package/src/bundle.ts +139 -33
  82. package/src/cfetch/index.ts +0 -2
  83. package/src/cfetch/internal.ts +16 -21
  84. package/src/cli.ts +4 -4
  85. package/src/config/config.ts +14 -7
  86. package/src/config/environment.ts +80 -16
  87. package/src/config/index.ts +99 -30
  88. package/src/config/validation-helpers.ts +1 -1
  89. package/src/config/validation.ts +275 -9
  90. package/src/constellation/createProject.tsx +51 -0
  91. package/src/constellation/deleteProject.ts +51 -0
  92. package/src/constellation/deleteProjectModel.ts +68 -0
  93. package/src/constellation/index.ts +75 -0
  94. package/src/constellation/listCatalog.tsx +35 -0
  95. package/src/constellation/listModel.tsx +41 -0
  96. package/src/constellation/listProject.tsx +28 -0
  97. package/src/constellation/listRuntime.tsx +28 -0
  98. package/src/constellation/options.ts +17 -0
  99. package/src/constellation/types.ts +17 -0
  100. package/src/constellation/uploadModel.tsx +64 -0
  101. package/src/constellation/utils.ts +90 -0
  102. package/src/create-worker-preview.ts +19 -8
  103. package/src/create-worker-upload-form.ts +52 -5
  104. package/src/d1/backups.tsx +40 -44
  105. package/src/d1/create.tsx +50 -43
  106. package/src/d1/{delete.tsx → delete.ts} +8 -11
  107. package/src/d1/execute.tsx +171 -166
  108. package/src/d1/index.ts +5 -6
  109. package/src/d1/list.tsx +27 -13
  110. package/src/d1/migrations/apply.tsx +92 -64
  111. package/src/d1/migrations/create.tsx +31 -29
  112. package/src/d1/migrations/helpers.ts +66 -44
  113. package/src/d1/migrations/list.tsx +47 -31
  114. package/src/d1/migrations/options.ts +7 -2
  115. package/src/d1/options.ts +3 -3
  116. package/src/d1/splitter.ts +161 -0
  117. package/src/d1/{types.tsx → types.ts} +1 -0
  118. package/src/d1/utils.ts +2 -1
  119. package/src/delete.ts +8 -16
  120. package/src/deployments.ts +333 -42
  121. package/src/deprecated/index.ts +8 -302
  122. package/src/dev/dev.tsx +13 -22
  123. package/src/dev/local.tsx +131 -69
  124. package/src/dev/remote.tsx +35 -3
  125. package/src/dev/start-server.ts +83 -77
  126. package/src/dev/use-esbuild.ts +63 -52
  127. package/src/dev/validate-dev-props.ts +9 -0
  128. package/src/{dev-registry.tsx → dev-registry.ts} +9 -8
  129. package/src/dev.tsx +131 -110
  130. package/src/dialogs.ts +136 -0
  131. package/src/dispatch-namespace.ts +21 -17
  132. package/src/docs/helpers.ts +50 -0
  133. package/src/docs/index.ts +54 -0
  134. package/src/entry.ts +26 -11
  135. package/src/environment-variables/factory.ts +89 -0
  136. package/src/environment-variables/misc-variables.ts +30 -0
  137. package/src/generate/index.ts +298 -0
  138. package/src/{index.tsx → index.ts} +137 -56
  139. package/src/init.ts +254 -187
  140. package/src/inspect.ts +170 -9
  141. package/src/jest.d.ts +4 -0
  142. package/src/kv/helpers.ts +7 -4
  143. package/src/kv/index.ts +15 -17
  144. package/src/logger.ts +36 -5
  145. package/src/metrics/metrics-config.ts +1 -1
  146. package/src/metrics/send-event.ts +4 -1
  147. package/src/miniflare-cli/assets.ts +66 -31
  148. package/src/miniflare-cli/index.ts +5 -8
  149. package/src/miniflare-cli/tsconfig.json +9 -0
  150. package/src/miniflare-cli/tsconfig.tsbuildinfo +1 -0
  151. package/src/miniflare-cli/types.ts +11 -0
  152. package/src/module-collection.ts +92 -26
  153. package/src/mtls-certificate/cli.ts +155 -0
  154. package/src/pages/build.ts +423 -0
  155. package/src/pages/buildFunctions.ts +140 -0
  156. package/src/pages/{deployment-tails.tsx → deployment-tails.ts} +7 -10
  157. package/src/pages/deployments.tsx +9 -9
  158. package/src/pages/{dev.tsx → dev.ts} +167 -139
  159. package/src/pages/errors.ts +1 -0
  160. package/src/pages/functions/buildPlugin.ts +61 -54
  161. package/src/pages/functions/buildWorker.ts +217 -33
  162. package/src/pages/functions/tsconfig.json +8 -0
  163. package/src/pages/functions/tsconfig.tsbuildinfo +1 -0
  164. package/src/pages/{functions.tsx → functions.ts} +8 -4
  165. package/src/pages/{index.tsx → index.ts} +3 -3
  166. package/src/pages/projects.tsx +12 -22
  167. package/src/pages/publish.tsx +43 -227
  168. package/src/pages/types.ts +5 -0
  169. package/src/pages/upload.tsx +57 -14
  170. package/src/pages/utils.ts +1 -1
  171. package/src/parse.ts +23 -1
  172. package/src/paths.ts +1 -1
  173. package/src/publish/index.ts +20 -16
  174. package/src/publish/publish.ts +76 -46
  175. package/src/pubsub/{pubsub-commands.tsx → pubsub-commands.ts} +19 -20
  176. package/src/queues/cli/commands/consumer/add.ts +24 -24
  177. package/src/queues/cli/commands/consumer/index.ts +3 -6
  178. package/src/queues/cli/commands/consumer/remove.ts +11 -18
  179. package/src/queues/cli/commands/create.ts +8 -8
  180. package/src/queues/cli/commands/delete.ts +8 -8
  181. package/src/queues/cli/commands/index.ts +3 -4
  182. package/src/queues/cli/commands/list.ts +8 -8
  183. package/src/queues/client.ts +1 -0
  184. package/src/r2/helpers.ts +1 -0
  185. package/src/r2/index.ts +28 -28
  186. package/src/secret/index.ts +15 -16
  187. package/src/{sites.tsx → sites.ts} +165 -53
  188. package/src/tail/createTail.ts +37 -1
  189. package/src/tail/filters.ts +1 -1
  190. package/src/tail/index.ts +8 -11
  191. package/src/tail/printing.ts +25 -0
  192. package/src/traverse-module-graph.ts +54 -0
  193. package/src/tsconfig-sanity.ts +16 -0
  194. package/src/type-generation.ts +11 -3
  195. package/src/user/access.ts +0 -1
  196. package/src/user/auth-variables.ts +113 -0
  197. package/src/user/choose-account.tsx +1 -31
  198. package/src/user/index.ts +0 -1
  199. package/src/user/{user.tsx → user.ts} +114 -77
  200. package/src/utils/render.ts +93 -0
  201. package/src/{whoami.tsx → whoami.ts} +37 -71
  202. package/src/worker.ts +35 -1
  203. package/src/yargs-types.ts +18 -5
  204. package/templates/__tests__/tsconfig-sanity.ts +12 -0
  205. package/templates/__tests__/tsconfig.json +8 -0
  206. package/templates/__tests__/tsconfig.tsbuildinfo +1 -0
  207. package/templates/checked-fetch.js +9 -3
  208. package/templates/d1-beta-facade.js +42 -3
  209. package/templates/facade.d.ts +14 -0
  210. package/templates/first-party-worker-module-facade.ts +4 -3
  211. package/templates/format-dev-errors.ts +8 -6
  212. package/templates/gitignore +1 -0
  213. package/templates/init-tests/test-jest-new-worker.js +3 -5
  214. package/templates/init-tests/test-vitest-new-worker.js +3 -5
  215. package/templates/init-tests/test-vitest-new-worker.ts +25 -0
  216. package/templates/middleware/loader-modules.ts +2 -2
  217. package/templates/middleware/loader-sw.ts +6 -0
  218. package/templates/middleware/middleware-miniflare3-json-error.ts +17 -5
  219. package/templates/new-worker.ts +3 -0
  220. package/templates/pages-dev-pipeline.ts +4 -1
  221. package/templates/pages-shim.ts +4 -1
  222. package/templates/pages-template-plugin.ts +19 -10
  223. package/templates/serve-static-assets.ts +17 -14
  224. package/templates/service-bindings-module-facade.js +1 -0
  225. package/templates/tsconfig-sanity.ts +11 -0
  226. package/templates/tsconfig.init.json +105 -0
  227. package/templates/tsconfig.json +5 -103
  228. package/templates/tsconfig.tsbuildinfo +1 -0
  229. package/wrangler-dist/cli.d.ts +871 -73
  230. package/wrangler-dist/cli.js +80512 -90686
  231. package/wrangler-dist/wasm-sync.wasm +0 -0
  232. package/src/__tests__/api-devregistry.test.js +0 -56
  233. package/src/__tests__/d1.test.ts +0 -80
  234. package/src/__tests__/dialogs.test.tsx +0 -40
  235. package/src/__tests__/helpers/mock-cfetch.ts +0 -333
  236. package/src/__tests__/pages.test.ts +0 -2442
  237. package/src/dialogs.tsx +0 -168
  238. package/src/environment-variables.ts +0 -50
  239. package/src/pages/build.tsx +0 -270
  240. package/src/user/env-vars.ts +0 -46
  241. /package/src/{bundle-reporter.tsx → bundle-reporter.ts} +0 -0
  242. /package/src/d1/migrations/{index.tsx → index.ts} +0 -0
  243. /package/src/dev/{get-local-persistence-path.tsx → get-local-persistence-path.ts} +0 -0
  244. /package/src/pages/{hash.tsx → hash.ts} +0 -0
@@ -1,20 +1,29 @@
1
1
  import { access, cp, lstat, rm } from "node:fs/promises";
2
+ import { tmpdir } from "node:os";
2
3
  import { join, resolve } from "node:path";
4
+ import { build as esBuild } from "esbuild";
3
5
  import { nanoid } from "nanoid";
4
6
  import { bundleWorker } from "../../bundle";
7
+ import { FatalError } from "../../errors";
8
+ import { logger } from "../../logger";
5
9
  import { getBasePath } from "../../paths";
10
+ import traverseModuleGraph from "../../traverse-module-graph";
6
11
  import { D1_BETA_PREFIX } from "../../worker";
12
+ import type { BundleResult } from "../../bundle";
13
+ import type { Plugin } from "esbuild";
7
14
 
8
15
  export type Options = {
9
16
  routesModule: string;
10
- outfile: string;
17
+ outfile?: string;
18
+ outdir?: string;
11
19
  minify?: boolean;
12
20
  sourcemap?: boolean;
13
21
  fallbackService?: string;
14
22
  watch?: boolean;
15
23
  onEnd?: () => void;
16
24
  buildOutputDirectory?: string;
17
- nodeCompat?: boolean;
25
+ legacyNodeCompat?: boolean;
26
+ nodejsCompat?: boolean;
18
27
  functionsDirectory: string;
19
28
  local: boolean;
20
29
  betaD1Shims?: string[];
@@ -22,14 +31,16 @@ export type Options = {
22
31
 
23
32
  export function buildWorker({
24
33
  routesModule,
25
- outfile = "bundle.js",
34
+ outfile = join(tmpdir(), `./functionsWorker-${Math.random()}.js`),
35
+ outdir,
26
36
  minify = false,
27
37
  sourcemap = false,
28
38
  fallbackService = "ASSETS",
29
39
  watch = false,
30
40
  onEnd = () => {},
31
41
  buildOutputDirectory,
32
- nodeCompat,
42
+ legacyNodeCompat,
43
+ nodejsCompat,
33
44
  functionsDirectory,
34
45
  local,
35
46
  betaD1Shims,
@@ -39,45 +50,26 @@ export function buildWorker({
39
50
  file: resolve(getBasePath(), "templates/pages-template-worker.ts"),
40
51
  directory: functionsDirectory,
41
52
  format: "modules",
53
+ moduleRoot: functionsDirectory,
42
54
  },
43
- resolve(outfile),
55
+ outdir ? resolve(outdir) : resolve(outfile),
44
56
  {
45
57
  inject: [routesModule],
58
+ ...(outdir ? { entryName: "index" } : {}),
46
59
  minify,
47
60
  sourcemap,
48
61
  watch,
49
- nodeCompat,
50
- loader: {
51
- ".txt": "text",
52
- ".html": "text",
53
- },
62
+ legacyNodeCompat,
63
+ nodejsCompat,
54
64
  define: {
55
65
  __FALLBACK_SERVICE__: JSON.stringify(fallbackService),
56
66
  },
57
67
  betaD1Shims: (betaD1Shims || []).map(
58
68
  (binding) => `${D1_BETA_PREFIX}${binding}`
59
69
  ),
70
+ doBindings: [], // Pages functions don't support internal Durable Objects
60
71
  plugins: [
61
- {
62
- name: "wrangler notifier and monitor",
63
- setup(pluginBuild) {
64
- pluginBuild.onEnd((result) => {
65
- if (result.errors.length > 0) {
66
- console.error(
67
- `${result.errors.length} error(s) and ${result.warnings.length} warning(s) when compiling Worker.`
68
- );
69
- } else if (result.warnings.length > 0) {
70
- console.warn(
71
- `${result.warnings.length} warning(s) when compiling Worker.`
72
- );
73
- onEnd();
74
- } else {
75
- console.log("Compiled Worker successfully.");
76
- onEnd();
77
- }
78
- });
79
- },
80
- },
72
+ buildNotifierPlugin(onEnd),
81
73
  {
82
74
  name: "Assets",
83
75
  setup(pluginBuild) {
@@ -141,7 +133,7 @@ export function buildWorker({
141
133
  // TODO: Watch args.path for changes and re-copy when updated
142
134
  contents: `export const onRequest = ({ request, env, functionPath }) => {
143
135
  const url = new URL(request.url)
144
- const relativePathname = \`/\${url.pathname.split(functionPath)[1] || ''}\`.replace(/^\\/\\//, '/');
136
+ const relativePathname = \`/\${url.pathname.replace(functionPath, "") || ""}\`.replace(/^\\/\\//, '/');
145
137
  url.pathname = '/cdn-cgi/pages-plugins/${identifier}' + relativePathname
146
138
  request = new Request(url.toString(), request)
147
139
  return env.ASSETS.fetch(request)
@@ -153,14 +145,206 @@ export function buildWorker({
153
145
  },
154
146
  },
155
147
  ],
156
- isOutfile: true,
148
+ isOutfile: !outdir,
149
+ serveAssetsFromWorker: false,
150
+ disableModuleCollection: false,
151
+ rules: [],
152
+ checkFetch: local,
153
+ targetConsumer: local ? "dev" : "publish",
154
+ local,
155
+ experimentalLocal: false,
156
+ forPages: true,
157
+ }
158
+ );
159
+ }
160
+
161
+ export type RawOptions = {
162
+ workerScriptPath: string;
163
+ outfile?: string;
164
+ outdir?: string;
165
+ directory: string;
166
+ bundle?: boolean;
167
+ minify?: boolean;
168
+ sourcemap?: boolean;
169
+ watch?: boolean;
170
+ plugins?: Plugin[];
171
+ onEnd?: () => void;
172
+ buildOutputDirectory?: string;
173
+ legacyNodeCompat?: boolean;
174
+ nodejsCompat?: boolean;
175
+ local: boolean;
176
+ betaD1Shims?: string[];
177
+ };
178
+
179
+ /**
180
+ * This function bundles a raw `_worker.js` Pages file
181
+ * before it gets deployed.
182
+ *
183
+ * This allows Wrangler to add shims and other wrappers
184
+ * around the handlers, which is useful to support beta features.
185
+ */
186
+ export function buildRawWorker({
187
+ workerScriptPath,
188
+ outfile = join(tmpdir(), `./functionsWorker-${Math.random()}.js`),
189
+ outdir,
190
+ directory,
191
+ bundle = true,
192
+ minify = false,
193
+ sourcemap = false,
194
+ watch = false,
195
+ plugins = [],
196
+ onEnd = () => {},
197
+ legacyNodeCompat,
198
+ nodejsCompat,
199
+ local,
200
+ betaD1Shims,
201
+ }: RawOptions) {
202
+ return bundleWorker(
203
+ {
204
+ file: workerScriptPath,
205
+ directory: resolve(directory),
206
+ format: "modules",
207
+ moduleRoot: resolve(directory),
208
+ },
209
+ outdir ? resolve(outdir) : resolve(outfile),
210
+ {
211
+ bundle,
212
+ minify,
213
+ sourcemap,
214
+ watch,
215
+ legacyNodeCompat,
216
+ nodejsCompat,
217
+ define: {},
218
+ betaD1Shims: (betaD1Shims || []).map(
219
+ (binding) => `${D1_BETA_PREFIX}${binding}`
220
+ ),
221
+ doBindings: [], // Pages functions don't support internal Durable Objects
222
+ plugins: [...plugins, buildNotifierPlugin(onEnd)],
223
+ isOutfile: !outdir,
157
224
  serveAssetsFromWorker: false,
158
- disableModuleCollection: true,
225
+ disableModuleCollection: false,
159
226
  rules: [],
160
227
  checkFetch: local,
161
228
  targetConsumer: local ? "dev" : "publish",
162
229
  local,
163
230
  experimentalLocal: false,
231
+ forPages: true,
164
232
  }
165
233
  );
166
234
  }
235
+
236
+ export async function traverseAndBuildWorkerJSDirectory({
237
+ workerJSDirectory,
238
+ buildOutputDirectory,
239
+ d1Databases,
240
+ nodejsCompat,
241
+ }: {
242
+ workerJSDirectory: string;
243
+ buildOutputDirectory: string;
244
+ d1Databases?: string[];
245
+ nodejsCompat?: boolean;
246
+ }): Promise<BundleResult> {
247
+ const entrypoint = resolve(join(workerJSDirectory, "index.js"));
248
+
249
+ const traverseModuleGraphResult = await traverseModuleGraph(
250
+ {
251
+ file: entrypoint,
252
+ directory: resolve(workerJSDirectory),
253
+ format: "modules",
254
+ moduleRoot: resolve(workerJSDirectory),
255
+ },
256
+ [
257
+ {
258
+ type: "ESModule",
259
+ globs: ["**/*.js"],
260
+ },
261
+ ]
262
+ );
263
+
264
+ const outfile = join(tmpdir(), `./bundledWorker-${Math.random()}.mjs`);
265
+ const bundleResult = await buildRawWorker({
266
+ workerScriptPath: entrypoint,
267
+ bundle: false,
268
+ outfile,
269
+ directory: buildOutputDirectory,
270
+ local: false,
271
+ sourcemap: true,
272
+ watch: false,
273
+ onEnd: () => {},
274
+ betaD1Shims: d1Databases,
275
+ nodejsCompat,
276
+ });
277
+
278
+ return {
279
+ modules: traverseModuleGraphResult.modules,
280
+ dependencies: bundleResult.dependencies,
281
+ resolvedEntryPointPath: bundleResult.resolvedEntryPointPath,
282
+ bundleType: bundleResult.bundleType,
283
+ stop: bundleResult.stop,
284
+ sourceMapPath: bundleResult.sourceMapPath,
285
+ };
286
+ }
287
+
288
+ /**
289
+ * Creates an esbuild plugin that can notify Wrangler (via the `onEnd()`)
290
+ * when the build completes.
291
+ */
292
+ export function buildNotifierPlugin(onEnd: () => void): Plugin {
293
+ return {
294
+ name: "wrangler notifier and monitor",
295
+ setup(pluginBuild) {
296
+ pluginBuild.onEnd((result) => {
297
+ if (result.errors.length > 0) {
298
+ logger.error(
299
+ `${result.errors.length} error(s) and ${result.warnings.length} warning(s) when compiling Worker.`
300
+ );
301
+ } else if (result.warnings.length > 0) {
302
+ logger.warn(
303
+ `${result.warnings.length} warning(s) when compiling Worker.`
304
+ );
305
+ onEnd();
306
+ } else {
307
+ logger.log("✨ Compiled Worker successfully");
308
+ onEnd();
309
+ }
310
+ });
311
+ },
312
+ };
313
+ }
314
+
315
+ /**
316
+ * Runs the script through a simple esbuild bundle step to check for unwanted imports.
317
+ *
318
+ * This is useful when the user chooses not to bundle the `_worker.js` file by setting
319
+ * `--no-bundle` at the command line.
320
+ */
321
+ export async function checkRawWorker(scriptPath: string, onEnd: () => void) {
322
+ await esBuild({
323
+ entryPoints: [scriptPath],
324
+ write: false,
325
+ // we need it to be bundled so that any imports that are used are affected by the blocker plugin
326
+ bundle: true,
327
+ plugins: [blockWorkerJsImports, buildNotifierPlugin(onEnd)],
328
+ });
329
+ }
330
+
331
+ const blockWorkerJsImports: Plugin = {
332
+ name: "block-worker-js-imports",
333
+ setup(build) {
334
+ build.onResolve({ filter: /.*/g }, (args) => {
335
+ // If it's the entrypoint, let it be as is
336
+ if (args.kind === "entry-point") {
337
+ return {
338
+ path: args.path,
339
+ };
340
+ }
341
+ // Otherwise, block any imports that the file is requesting
342
+ throw new FatalError(
343
+ "_worker.js is not being bundled by Wrangler but it is importing from another file.\n" +
344
+ "This will throw an error if deployed.\n" +
345
+ "You should bundle the Worker in a pre-build step, remove the import if it is unused, or ask Wrangler to bundle it by setting `--bundle`.",
346
+ 1
347
+ );
348
+ });
349
+ },
350
+ };
@@ -0,0 +1,8 @@
1
+ {
2
+ "extends": "../../../tsconfig.json",
3
+ "compilerOptions": {
4
+ "types": ["node", "jest"]
5
+ },
6
+ "include": ["**/*.test.ts", "../../intl-polyfill.d.ts"],
7
+ "exclude": []
8
+ }
@@ -0,0 +1 @@
1
+ {"program":{"fileNames":["../../../../../node_modules/typescript/lib/lib.es5.d.ts","../../../../../node_modules/typescript/lib/lib.es2015.d.ts","../../../../../node_modules/typescript/lib/lib.es2016.d.ts","../../../../../node_modules/typescript/lib/lib.es2017.d.ts","../../../../../node_modules/typescript/lib/lib.es2018.d.ts","../../../../../node_modules/typescript/lib/lib.es2019.d.ts","../../../../../node_modules/typescript/lib/lib.es2020.d.ts","../../../../../node_modules/typescript/lib/lib.es2021.d.ts","../../../../../node_modules/typescript/lib/lib.es2022.d.ts","../../../../../node_modules/typescript/lib/lib.esnext.d.ts","../../../../../node_modules/typescript/lib/lib.es2015.core.d.ts","../../../../../node_modules/typescript/lib/lib.es2015.collection.d.ts","../../../../../node_modules/typescript/lib/lib.es2015.generator.d.ts","../../../../../node_modules/typescript/lib/lib.es2015.iterable.d.ts","../../../../../node_modules/typescript/lib/lib.es2015.promise.d.ts","../../../../../node_modules/typescript/lib/lib.es2015.proxy.d.ts","../../../../../node_modules/typescript/lib/lib.es2015.reflect.d.ts","../../../../../node_modules/typescript/lib/lib.es2015.symbol.d.ts","../../../../../node_modules/typescript/lib/lib.es2015.symbol.wellknown.d.ts","../../../../../node_modules/typescript/lib/lib.es2016.array.include.d.ts","../../../../../node_modules/typescript/lib/lib.es2017.object.d.ts","../../../../../node_modules/typescript/lib/lib.es2017.sharedmemory.d.ts","../../../../../node_modules/typescript/lib/lib.es2017.string.d.ts","../../../../../node_modules/typescript/lib/lib.es2017.intl.d.ts","../../../../../node_modules/typescript/lib/lib.es2017.typedarrays.d.ts","../../../../../node_modules/typescript/lib/lib.es2018.asyncgenerator.d.ts","../../../../../node_modules/typescript/lib/lib.es2018.asynciterable.d.ts","../../../../../node_modules/typescript/lib/lib.es2018.intl.d.ts","../../../../../node_modules/typescript/lib/lib.es2018.promise.d.ts","../../../../../node_modules/typescript/lib/lib.es2018.regexp.d.ts","../../../../../node_modules/typescript/lib/lib.es2019.array.d.ts","../../../../../node_modules/typescript/lib/lib.es2019.object.d.ts","../../../../../node_modules/typescript/lib/lib.es2019.string.d.ts","../../../../../node_modules/typescript/lib/lib.es2019.symbol.d.ts","../../../../../node_modules/typescript/lib/lib.es2020.bigint.d.ts","../../../../../node_modules/typescript/lib/lib.es2020.date.d.ts","../../../../../node_modules/typescript/lib/lib.es2020.promise.d.ts","../../../../../node_modules/typescript/lib/lib.es2020.sharedmemory.d.ts","../../../../../node_modules/typescript/lib/lib.es2020.string.d.ts","../../../../../node_modules/typescript/lib/lib.es2020.symbol.wellknown.d.ts","../../../../../node_modules/typescript/lib/lib.es2020.intl.d.ts","../../../../../node_modules/typescript/lib/lib.es2020.number.d.ts","../../../../../node_modules/typescript/lib/lib.es2021.promise.d.ts","../../../../../node_modules/typescript/lib/lib.es2021.string.d.ts","../../../../../node_modules/typescript/lib/lib.es2021.weakref.d.ts","../../../../../node_modules/typescript/lib/lib.es2021.intl.d.ts","../../../../../node_modules/typescript/lib/lib.es2022.array.d.ts","../../../../../node_modules/typescript/lib/lib.es2022.error.d.ts","../../../../../node_modules/typescript/lib/lib.es2022.intl.d.ts","../../../../../node_modules/typescript/lib/lib.es2022.object.d.ts","../../../../../node_modules/typescript/lib/lib.es2022.sharedmemory.d.ts","../../../../../node_modules/typescript/lib/lib.es2022.string.d.ts","../../../../../node_modules/typescript/lib/lib.esnext.intl.d.ts","../../../node_modules/@iarna/toml/index.d.ts","../../../../../node_modules/@webcontainer/env/dist/environment.d.ts","../../../../../node_modules/@webcontainer/env/dist/url.d.ts","../../../../../node_modules/@webcontainer/env/dist/index.d.ts","../../../../../node_modules/buffer/index.d.ts","../../../../../node_modules/undici/types/header.d.ts","../../../../../node_modules/undici/types/readable.d.ts","../../../../../node_modules/@types/node/assert.d.ts","../../../../../node_modules/@types/node/assert/strict.d.ts","../../../../../node_modules/@types/node/globals.d.ts","../../../../../node_modules/@types/node/async_hooks.d.ts","../../../../../node_modules/@types/node/buffer.d.ts","../../../../../node_modules/@types/node/child_process.d.ts","../../../../../node_modules/@types/node/cluster.d.ts","../../../../../node_modules/@types/node/console.d.ts","../../../../../node_modules/@types/node/constants.d.ts","../../../../../node_modules/@types/node/crypto.d.ts","../../../../../node_modules/@types/node/dgram.d.ts","../../../../../node_modules/@types/node/diagnostics_channel.d.ts","../../../../../node_modules/@types/node/dns.d.ts","../../../../../node_modules/@types/node/dns/promises.d.ts","../../../../../node_modules/@types/node/domain.d.ts","../../../../../node_modules/@types/node/events.d.ts","../../../../../node_modules/@types/node/fs.d.ts","../../../../../node_modules/@types/node/fs/promises.d.ts","../../../../../node_modules/@types/node/http.d.ts","../../../../../node_modules/@types/node/http2.d.ts","../../../../../node_modules/@types/node/https.d.ts","../../../../../node_modules/@types/node/inspector.d.ts","../../../../../node_modules/@types/node/module.d.ts","../../../../../node_modules/@types/node/net.d.ts","../../../../../node_modules/@types/node/os.d.ts","../../../../../node_modules/@types/node/path.d.ts","../../../../../node_modules/@types/node/perf_hooks.d.ts","../../../../../node_modules/@types/node/process.d.ts","../../../../../node_modules/@types/node/punycode.d.ts","../../../../../node_modules/@types/node/querystring.d.ts","../../../../../node_modules/@types/node/readline.d.ts","../../../../../node_modules/@types/node/repl.d.ts","../../../../../node_modules/@types/node/stream.d.ts","../../../../../node_modules/@types/node/stream/promises.d.ts","../../../../../node_modules/@types/node/stream/consumers.d.ts","../../../../../node_modules/@types/node/stream/web.d.ts","../../../../../node_modules/@types/node/string_decoder.d.ts","../../../../../node_modules/@types/node/timers.d.ts","../../../../../node_modules/@types/node/timers/promises.d.ts","../../../../../node_modules/@types/node/tls.d.ts","../../../../../node_modules/@types/node/trace_events.d.ts","../../../../../node_modules/@types/node/tty.d.ts","../../../../../node_modules/@types/node/url.d.ts","../../../../../node_modules/@types/node/util.d.ts","../../../../../node_modules/@types/node/v8.d.ts","../../../../../node_modules/@types/node/vm.d.ts","../../../../../node_modules/@types/node/wasi.d.ts","../../../../../node_modules/@types/node/worker_threads.d.ts","../../../../../node_modules/@types/node/zlib.d.ts","../../../../../node_modules/@types/node/globals.global.d.ts","../../../../../node_modules/@types/node/index.d.ts","../../../../../node_modules/undici/types/file.d.ts","../../../../../node_modules/undici/types/fetch.d.ts","../../../../../node_modules/undici/types/formdata.d.ts","../../../../../node_modules/undici/types/connector.d.ts","../../../../../node_modules/undici/types/client.d.ts","../../../../../node_modules/undici/types/errors.d.ts","../../../../../node_modules/undici/types/dispatcher.d.ts","../../../../../node_modules/undici/types/global-dispatcher.d.ts","../../../../../node_modules/undici/types/global-origin.d.ts","../../../../../node_modules/undici/types/pool-stats.d.ts","../../../../../node_modules/undici/types/pool.d.ts","../../../../../node_modules/undici/types/handlers.d.ts","../../../../../node_modules/undici/types/balanced-pool.d.ts","../../../../../node_modules/undici/types/agent.d.ts","../../../../../node_modules/undici/types/mock-interceptor.d.ts","../../../../../node_modules/undici/types/mock-agent.d.ts","../../../../../node_modules/undici/types/mock-client.d.ts","../../../../../node_modules/undici/types/mock-pool.d.ts","../../../../../node_modules/undici/types/mock-errors.d.ts","../../../../../node_modules/undici/types/proxy-agent.d.ts","../../../../../node_modules/undici/types/retry-handler.d.ts","../../../../../node_modules/undici/types/api.d.ts","../../../../../node_modules/undici/types/cookies.d.ts","../../../../../node_modules/undici/types/patch.d.ts","../../../../../node_modules/undici/types/filereader.d.ts","../../../../../node_modules/undici/types/diagnostics-channel.d.ts","../../../../../node_modules/undici/types/websocket.d.ts","../../../../../node_modules/undici/types/content-type.d.ts","../../../../../node_modules/undici/types/cache.d.ts","../../../../../node_modules/undici/types/interceptors.d.ts","../../../../../node_modules/undici/types/index.d.ts","../../../../../node_modules/undici/index.d.ts","../../../node_modules/locate-path/index.d.ts","../../../node_modules/find-up/index.d.ts","../../../../../node_modules/ci-info/index.d.ts","../../../../../node_modules/@types/is-ci/index.d.ts","../../is-ci.ts","../../is-interactive.ts","../../../../../node_modules/chalk/types/index.d.ts","../../../../../node_modules/cli-table3/index.d.ts","../../../../../node_modules/esbuild/lib/main.d.ts","../../environment-variables/factory.ts","../../logger.ts","../../config-cache.ts","../../../../../node_modules/@types/prompts/index.d.ts","../../dialogs.ts","../../../../../node_modules/xdg-app-paths/dist/types/mod.d.ts","../../global-wrangler-config-path.ts","../../../../../node_modules/open/index.d.ts","../../open-in-browser.ts","../../../../../node_modules/jsonc-parser/lib/umd/main.d.ts","../../parse.ts","../../user/access.ts","../../environment-variables/misc-variables.ts","../../user/auth-variables.ts","../../../package.json","../../cfetch/internal.ts","../../cfetch/index.ts","../../user/choose-account.tsx","../../user/generate-auth-url.ts","../../user/generate-random-state.ts","../../user/user.ts","../../user/index.ts","../../__tests__/helpers/run-in-tmp.ts","../../paths.ts","./identifiers.ts","./routes.ts","./filepath-routing.ts","./filepath-routing.test.ts","../constants.ts","./routes-consolidation.ts","./routes-consolidation.test.ts","./routes-transformation.ts","./routes-transformation.test.ts","../../errors.ts","./routes-validation.ts","../errors.ts","./routes-validation.test.ts","../../intl-polyfill.d.ts","../../../../../node_modules/@types/jest/node_modules/chalk/index.d.ts","../../../../../node_modules/@sinclair/typebox/typebox.d.ts","../../../../../node_modules/@jest/schemas/build/index.d.ts","../../../../../node_modules/@types/jest/node_modules/pretty-format/build/index.d.ts","../../../../../node_modules/@types/jest/node_modules/jest-diff/build/index.d.ts","../../../../../node_modules/@types/jest/node_modules/jest-matcher-utils/build/index.d.ts","../../../../../node_modules/@types/jest/index.d.ts"],"fileInfos":[{"version":"f20c05dbfe50a208301d2a1da37b9931bce0466eb5a1f4fe240971b4ecc82b67","affectsGlobalScope":true},"dc47c4fa66b9b9890cf076304de2a9c5201e94b740cffdf09f87296d877d71f6","7a387c58583dfca701b6c85e0adaf43fb17d590fb16d5b2dc0a2fbd89f35c467","8a12173c586e95f4433e0c6dc446bc88346be73ffe9ca6eec7aa63c8f3dca7f9","5f4e733ced4e129482ae2186aae29fde948ab7182844c3a5a51dd346182c7b06","e6b724280c694a9f588847f754198fb96c43d805f065c3a5b28bbc9594541c84","1fc5ab7a764205c68fa10d381b08417795fc73111d6dd16b5b1ed36badb743d9","746d62152361558ea6d6115cf0da4dd10ede041d14882ede3568bce5dc4b4f1f","d11a03592451da2d1065e09e61f4e2a9bf68f780f4f6623c18b57816a9679d17","aea179452def8a6152f98f63b191b84e7cbd69b0e248c91e61fb2e52328abe8c",{"version":"adb996790133eb33b33aadb9c09f15c2c575e71fb57a62de8bf74dbf59ec7dfb","affectsGlobalScope":true},{"version":"8cc8c5a3bac513368b0157f3d8b31cfdcfe78b56d3724f30f80ed9715e404af8","affectsGlobalScope":true},{"version":"cdccba9a388c2ee3fd6ad4018c640a471a6c060e96f1232062223063b0a5ac6a","affectsGlobalScope":true},{"version":"c5c05907c02476e4bde6b7e76a79ffcd948aedd14b6a8f56e4674221b0417398","affectsGlobalScope":true},{"version":"0d5f52b3174bee6edb81260ebcd792692c32c81fd55499d69531496f3f2b25e7","affectsGlobalScope":true},{"version":"55f400eec64d17e888e278f4def2f254b41b89515d3b88ad75d5e05f019daddd","affectsGlobalScope":true},{"version":"181f1784c6c10b751631b24ce60c7f78b20665db4550b335be179217bacc0d5f","affectsGlobalScope":true},{"version":"3013574108c36fd3aaca79764002b3717da09725a36a6fc02eac386593110f93","affectsGlobalScope":true},{"version":"75ec0bdd727d887f1b79ed6619412ea72ba3c81d92d0787ccb64bab18d261f14","affectsGlobalScope":true},{"version":"3be5a1453daa63e031d266bf342f3943603873d890ab8b9ada95e22389389006","affectsGlobalScope":true},{"version":"17bb1fc99591b00515502d264fa55dc8370c45c5298f4a5c2083557dccba5a2a","affectsGlobalScope":true},{"version":"7ce9f0bde3307ca1f944119f6365f2d776d281a393b576a18a2f2893a2d75c98","affectsGlobalScope":true},{"version":"6a6b173e739a6a99629a8594bfb294cc7329bfb7b227f12e1f7c11bc163b8577","affectsGlobalScope":true},{"version":"81cac4cbc92c0c839c70f8ffb94eb61e2d32dc1c3cf6d95844ca099463cf37ea","affectsGlobalScope":true},{"version":"b0124885ef82641903d232172577f2ceb5d3e60aed4da1153bab4221e1f6dd4e","affectsGlobalScope":true},{"version":"0eb85d6c590b0d577919a79e0084fa1744c1beba6fd0d4e951432fa1ede5510a","affectsGlobalScope":true},{"version":"da233fc1c8a377ba9e0bed690a73c290d843c2c3d23a7bd7ec5cd3d7d73ba1e0","affectsGlobalScope":true},{"version":"d154ea5bb7f7f9001ed9153e876b2d5b8f5c2bb9ec02b3ae0d239ec769f1f2ae","affectsGlobalScope":true},{"version":"bb2d3fb05a1d2ffbca947cc7cbc95d23e1d053d6595391bd325deb265a18d36c","affectsGlobalScope":true},{"version":"c80df75850fea5caa2afe43b9949338ce4e2de086f91713e9af1a06f973872b8","affectsGlobalScope":true},{"version":"9d57b2b5d15838ed094aa9ff1299eecef40b190722eb619bac4616657a05f951","affectsGlobalScope":true},{"version":"6c51b5dd26a2c31dbf37f00cfc32b2aa6a92e19c995aefb5b97a3a64f1ac99de","affectsGlobalScope":true},{"version":"6e7997ef61de3132e4d4b2250e75343f487903ddf5370e7ce33cf1b9db9a63ed","affectsGlobalScope":true},{"version":"2ad234885a4240522efccd77de6c7d99eecf9b4de0914adb9a35c0c22433f993","affectsGlobalScope":true},{"version":"09aa50414b80c023553090e2f53827f007a301bc34b0495bfb2c3c08ab9ad1eb","affectsGlobalScope":true},{"version":"d7f680a43f8cd12a6b6122c07c54ba40952b0c8aa140dcfcf32eb9e6cb028596","affectsGlobalScope":true},{"version":"3787b83e297de7c315d55d4a7c546ae28e5f6c0a361b7a1dcec1f1f50a54ef11","affectsGlobalScope":true},{"version":"e7e8e1d368290e9295ef18ca23f405cf40d5456fa9f20db6373a61ca45f75f40","affectsGlobalScope":true},{"version":"faf0221ae0465363c842ce6aa8a0cbda5d9296940a8e26c86e04cc4081eea21e","affectsGlobalScope":true},{"version":"06393d13ea207a1bfe08ec8d7be562549c5e2da8983f2ee074e00002629d1871","affectsGlobalScope":true},{"version":"775d9c9fd150d5de79e0450f35bc8b8f94ae64e3eb5da12725ff2a649dccc777","affectsGlobalScope":true},{"version":"b248e32ca52e8f5571390a4142558ae4f203ae2f94d5bac38a3084d529ef4e58","affectsGlobalScope":true},{"version":"6c55633c733c8378db65ac3da7a767c3cf2cf3057f0565a9124a16a3a2019e87","affectsGlobalScope":true},{"version":"fb4416144c1bf0323ccbc9afb0ab289c07312214e8820ad17d709498c865a3fe","affectsGlobalScope":true},{"version":"5b0ca94ec819d68d33da516306c15297acec88efeb0ae9e2b39f71dbd9685ef7","affectsGlobalScope":true},{"version":"34c839eaaa6d78c8674ae2c37af2236dee6831b13db7b4ef4df3ec889a04d4f2","affectsGlobalScope":true},{"version":"34478567f8a80171f88f2f30808beb7da15eac0538ae91282dd33dce928d98ed","affectsGlobalScope":true},{"version":"ab7d58e6161a550ff92e5aff755dc37fe896245348332cd5f1e1203479fe0ed1","affectsGlobalScope":true},{"version":"6bda95ea27a59a276e46043b7065b55bd4b316c25e70e29b572958fa77565d43","affectsGlobalScope":true},{"version":"aedb8de1abb2ff1095c153854a6df7deae4a5709c37297f9d6e9948b6806fa66","affectsGlobalScope":true},{"version":"a4da0551fd39b90ca7ce5f68fb55d4dc0c1396d589b612e1902f68ee090aaada","affectsGlobalScope":true},{"version":"11ffe3c281f375fff9ffdde8bbec7669b4dd671905509079f866f2354a788064","affectsGlobalScope":true},{"version":"52d1bb7ab7a3306fd0375c8bff560feed26ed676a5b0457fa8027b563aecb9a4","affectsGlobalScope":true},"72c6cda658c066bfd9f51a34a077648f11a0d8867050733f2cef365729043bf0","363f9ef6f21d68fb8daa0ec3127ea3fb2567c5583999d4846bdbbdeb6f386eb7","b49e007575f7087f2d8718cceea62a309dad06552d539c65d0bbd418b33a33b6","7a317ff3b65c289d4344ea7b6e0a9793168703a79bf1ee889b3ce379b58a54a3","4967529644e391115ca5592184d4b63980569adf60ee685f968fd59ab1557188","5929864ce17fba74232584d90cb721a89b7ad277220627cc97054ba15a98ea8f","7180c03fd3cb6e22f911ce9ba0f8a7008b1a6ddbe88ccf16a9c8140ef9ac1686","0d5a2ee1fdfa82740e0103389b9efd6bfe145a20018a2da3c02b89666181f4d9","a69c09dbea52352f479d3e7ac949fde3d17b195abe90b045d619f747b38d6d1a",{"version":"92d63add669d18ebc349efbacd88966d6f2ccdddfb1b880b2db98ae3aa7bf7c4","affectsGlobalScope":true},"ccc94049a9841fe47abe5baef6be9a38fc6228807974ae675fb15dc22531b4be",{"version":"9acfe4d1ff027015151ce81d60797b04b52bffe97ad8310bb0ec2e8fd61e1303","affectsGlobalScope":true},"95843d5cfafced8f3f8a5ce57d2335f0bcd361b9483587d12a25e4bd403b8216","afc6e96061af46bcff47246158caee7e056f5288783f2d83d6858cd25be1c565",{"version":"34f5bcac12b36d70304b73de5f5aab3bb91bd9919f984be80579ebcad03a624e","affectsGlobalScope":true},"82408ed3e959ddc60d3e9904481b5a8dc16469928257af22a3f7d1a3bc7fd8c4","2f520601649a893e6a49a8851ebfcf4be8ce090dc1281c2a08a871cb04e8251f","f50c975ab7b50e25a69e3d8a3773894125b44e9698924105f23b812bf7488baf","2b8c764f856a1dd0a9a2bf23e5efddbff157de8138b0754010be561ae5fcaa90","76650408392bf49a8fbf3e2b6b302712a92d76af77b06e2da1cc8077359c4409","0af3121e68297b2247dd331c0d24dba599e50736a7517a5622d5591aae4a3122","6972fca26f6e9bd56197568d4379f99071a90766e06b4fcb5920a0130a9202be",{"version":"4a2628e95962c8ab756121faa3ac2ed348112ff7a87b5c286dd2cc3326546b4c","affectsGlobalScope":true},"80793b2277f31baa199234daed806fff0fb11491d1ebd3357e520c3558063f00","a049a59a02009fc023684fcfaf0ac526fe36c35dcc5d2b7d620c1750ba11b083","196fee5541bfd59699dab615fee2ae7a6f5fe0a6337bcbbfd656ebf1ae329a63","160cc6e3d06938535bc887754afe5798c22d81ce83a9792ebfe2371a70f2ffc2","4b9a003b5c556c96784132945bb41c655ea11273b1917f5c8d0c154dd5fd20dd","a458dc78104cc80048ac24fdc02fe6dce254838094c2f25641b3f954d9721241",{"version":"e8b18c6385ff784228a6f369694fcf1a6b475355ba89090a88de13587a9391d5","affectsGlobalScope":true},"eecd493fc62c4dba3d988e2d7dff63299bf12ab49f5c9021dfef8dcc1ff2089e","abc1c425b2ad6720433f40f1877abfa4223f0f3dd486c9c28c492179ca183cb6","945a841f9a591197154c85386bc5a1467d42d325104bb36db51bc566bbb240be","10c39ce1df102994b47d4bc0c71aa9a6aea76f4651a5ec51914431f50bc883a1",{"version":"8207e7e6db9aa5fc7e61c8f17ba74cf9c115d26f51f91ee93f790815a7ea9dfb","affectsGlobalScope":true},"9f1069b9e2c051737b1f9b4f1baf50e4a63385a6a89c32235549ae87fc3d5492","ee18f2da7a037c6ceeb112a084e485aead9ea166980bf433474559eac1b46553","29c2706fa0cc49a2bd90c83234da33d08bb9554ecec675e91c1f85087f5a5324","0acbf26bf958f9e80c1ffa587b74749d2697b75b484062d36e103c137c562bc3","d7838022c7dab596357a9604b9c6adffe37dc34085ce0779c958ce9545bd7139","1b952304137851e45bc009785de89ada562d9376177c97e37702e39e60c2f1ff",{"version":"806ef4cac3b3d9fa4a48d849c8e084d7c72fcd7b16d76e06049a9ed742ff79c0","affectsGlobalScope":true},"a7971f9fb2a32ec7788ec6cda9d7a33c02023dfe9a62db2030ad1359649d8050","c33a6ea7147af60d8e98f1ac127047f4b0d4e2ce28b8f08ff3de07ca7cc00637",{"version":"b42b47e17b8ece2424ae8039feb944c2e3ba4b262986aebd582e51efbdca93dc","affectsGlobalScope":true},"664d8f2d59164f2e08c543981453893bc7e003e4dfd29651ce09db13e9457980","2408611d9b4146e35d1dbd1f443ccd8e187c74614a54b80300728277529dbf11","998a3de5237518c0b3ac00a11b3b4417affb008aa20aedee52f3fdae3cb86151","ad41008ffe077206e1811fc873f4d9005b5fd7f6ab52bb6118fef600815a5cb4",{"version":"daa2956e185fbca0591cb8cbe075c115301cbac7863092103f2aed6078dfb612","affectsGlobalScope":true},"badae0df9a8016ac36994b0a0e7b82ba6aaa3528e175a8c3cb161e4683eec03e","c3db860bcaaaeb3bbc23f353bbda1f8ab82756c8d5e973bebb3953cb09ea68f2","235a53595bd20b0b0eeb1a29cb2887c67c48375e92f03749b2488fbd46d0b1a0","bc09393cd4cd13f69cf1366d4236fbae5359bb550f0de4e15767e9a91d63dfb1","9c266243b01545e11d2733a55ad02b4c00ecdbda99c561cd1674f96e89cdc958","c71155c05fc76ff948a4759abc1cb9feec036509f500174bc18dad4c7827a60c",{"version":"ab9b9a36e5284fd8d3bf2f7d5fcbc60052f25f27e4d20954782099282c60d23e","affectsGlobalScope":true},"1503a452a67127e5c2da794d1c7c44344d5038373aae16c9b03ac964db159edd","25c8056edf4314820382a5fdb4bb7816999acdcb929c8f75e3f39473b87e85bc","499a48bb6b59bb20f0c70345f4ccedaa7ae186d0e7e2a7424440be2c6f03a212","3e4825171442666d31c845aeb47fcd34b62e14041bb353ae2b874285d78482aa","c6fd2c5a395f2432786c9cb8deb870b9b0e8ff7e22c029954fabdd692bff6195","8702b271086074c550d51bc0fc0626403e0c27f93a69264532ae3a9d5e65b9ab","e9775e97ac4877aebf963a0289c81abe76d1ec9a2a7778dbe637e5151f25c5f3","c34ee1ea9317f8a782b45c9053a87a637af138a8b49ddba52914d8186ecf36e6","cadc8aced301244057c4e7e73fbcae534b0f5b12a37b150d80e5a45aa4bebcbd","385aab901643aa54e1c36f5ef3107913b10d1b5bb8cbcd933d4263b80a0d7f20","9670d44354bab9d9982eca21945686b5c24a3f893db73c0dae0fd74217a4c219","db3435f3525cd785bf21ec6769bf8da7e8a776be1a99e2e7efb5f244a2ef5fee","c3b170c45fc031db31f782e612adf7314b167e60439d304b49e704010e7bafe5","40383ebef22b943d503c6ce2cb2e060282936b952a01bea5f9f493d5fb487cc7","4893a895ea92c85345017a04ed427cbd6a1710453338df26881a6019432febdd","3a84b7cb891141824bd00ef8a50b6a44596aded4075da937f180c90e362fe5f6","13f6f39e12b1518c6650bbb220c8985999020fe0f21d818e28f512b7771d00f9","9b5369969f6e7175740bf51223112ff209f94ba43ecd3bb09eefff9fd675624a","4fe9e626e7164748e8769bbf74b538e09607f07ed17c2f20af8d680ee49fc1da","24515859bc0b836719105bb6cc3d68255042a9f02a6022b3187948b204946bd2","33203609eba548914dc83ddf6cadbc0bcb6e8ef89f6d648ca0908ae887f9fcc5","1d150b70510edc11a33ecee95fdbc7609c5af88a40d29c3d0265f704d3cdb2e6","0db18c6e78ea846316c012478888f33c11ffadab9efd1cc8bcc12daded7a60b6","89167d696a849fce5ca508032aabfe901c0868f833a8625d5a9c6e861ef935d2","e53a3c2a9f624d90f24bf4588aacd223e7bec1b9d0d479b68d2f4a9e6011147f","339dc5265ee5ed92e536a93a04c4ebbc2128f45eeec6ed29f379e0085283542c","9f0a92164925aa37d4a5d9dd3e0134cff8177208dba55fd2310cd74beea40ee2","8bfdb79bf1a9d435ec48d9372dc93291161f152c0865b81fc0b2694aedb4578d","2e85db9e6fd73cfa3d7f28e0ab6b55417ea18931423bd47b409a96e4a169e8e6","c46e079fe54c76f95c67fb89081b3e399da2c7d109e7dca8e4b58d83e332e605","d32275be3546f252e3ad33976caf8c5e842c09cb87d468cb40d5f4cf092d1acc","5f69925a3ca4f275d26da3398a7c24ac669f099f840f89ccc64e5dc8026993dd","299fd0c281633d8dbfbe5f44c5f2850fe37392da6fd3b9cca3cb4e10cda16432","51cac533b4031fe5d4fecef5635afac9c0dca87c11f5b325e49e1600a9c51117","8b5baae22d64e1c47b88bdf16025396940393cfa830c66d9f330c1701e91ba91","913754f9281683f22d98d0ba7796896cee30c302baefa3dda69f61af8de244d8","a3e5b8b86e7bd38d9afdc294875c4445c535319e288d3a13c1e2e41f9af934f2","07a8b121d8256d717a496d25387a6f6a1218a49cd3d9dc7acc210382b1425a98","c824a031b54133fd5630aa0b295668d8b26df8ce0fcd1df639f2b3baf048a510","091f417275a51ab3c47b949723e9e8a193012157ecc64a96e2d7b1505e82f395","e6d2c107b358421399671d5afc04f9a0993833121c74bcbd3648ac3a65770936","6a93055f8327fa93dd414b15b3722657ea7c12d6052367d4ff303af29aa0ac76","1302a6a8c1a2f8f0efb923f254b8bed0d8692be7f1a6cd85c5c6e59a1f366fa9","f1814927210ac162c5ae64856a992cdc62e1eec5ef41782b5996626fafba0481","65a8bb855c73a06382ee35ef73c97eb825d5a7d8958eaddeeea4838f17c8078f","5f7614d60b32dc66e5d665eafd10d7619eedca3a20f0e876e9ec73141735e364","368597e75744b2e15fc12bd72ac54a4601f6d9021c6ad8b51d428be4e2d7278d","d46671fe4a68752899ca1ebd86d30a5ec8b8f7bf8c237c5e5d25f3642afa0626","ea8b0f6227604e008a0a77929b3adb5090c34aea3a0a5de5b353952a7301c4ba","ac0e45806dfb87684696b8a268697c8e789c50e29fd285fec047830e773f9832","045748197508c31fd7bf7027b2b4a42f4c5f4f84ec39ce1e1af55ca779313456","06c179a5025fef9432eaf716e55cd080020d2710cd98bb0c3d4340e8c866ab59","beaf45afe4bc9ba652ab6d73240c5e88bc3f34b0e0161742fcf354459a7a3c3f","1d6ad485ca9dc7c5d9e2b61f20e4bd3facbeb4ef56af8f68d71ba6e4a9b9f6eb","9eecb248ca8e33c2b5b5674237bc2b8607f5662bcc03a3e025a55fbfdf069cdc","513f467aabe4b358a7a1e8391b6853bae204ab1e0eeab09278a3681a0e817873","6eeae4dd32d769042ba7f29dbcd21aa74eb56c989097ffbb8cff3463272d2684","7c0ba9a5132b0fbdea735875c2990ceb36cdf2d617b0cb7e106c06b7cab53952","e4cd60d669bc6592b8bf26bfe3be5dd8a3c8038a2f86f74af9123033641c0a4c","8180a44d92e7f618789a4b26af4522321df8e8d4482445faf6d2cc6a85c95467","d1e35f1b3ee738c6cefabd665de7fcd72e3462b34c9f942fa685302d0be25922","f720a94058231196b81855293bbf4c6ee5226708e2c986d38f1fb9697f504f8a","76dd53abbc1d9dd1cea3944f79c0e2005551adbe15c189cc1f287e6b44371210","b7d3249cbee977a046efe0f325dc7f553f767b4a26c2360635b81ce800e7e913","539ea2f344e4fce2e77580cd7a5d7f4339926f589321231bc279960e3400772c","2e3343eebd7f317f0f12ebda5d455ece53c10b01df1cbc472c9a6425232bae2d","a4a4d800663fe45e65640e784a5973d7f56b544b7e2effbc478edc77610189f5","bb9bc38371e0c0d524420594c4128d4ec39c218f823c936e6b9892839b8ad126","1cf790bc4bef026b98cd90370d12d5d68cd845e7d055102a35ad2afa236c3d0c","e12caf7b64fa0c90bb21d5a29c17664c34a4b06cd432e4925bc4003b42e502d5","903456a035d80598a398c89af6fb6752c49703c4048af0c610fdebd2bcfd7b0c","cd95632585111aa5c5e76dc49b7781f8cdacc7660f8028c8482278c34c248fa0","ea97c663f8c9e5c5b33b008d036d901c342745cc9c0876e822d7f1ecbb87f8d0","64c55e5bbd1580a436bd34bee04f170ae2dca48cfc967fdf71aadf6171b27e64","da3ccf68e9f57491231c52b9127ec5d96c19fd4ee95a91fdb643bac31bc9a2f5","8526249c4486650b51b73ef9ae452fb6ef3254b2e73a1625c68889a9a3bfc070","44fef001b60bc425df2a36e532e867918012e5b50f5a6948c84974a25f93c99a","13756676a5ca4e5c4f0a75221a6f994a1c336cc99966a8c59fdb7ac5cbcd8f90","66d1ad7b4b9beb88809845c71ec64b8044b41700a436ec5136fcc5e0dfacdb05",{"version":"d50d5f2cc94307f9b6681ea4c48bbc28101faaaa87edfc64aab5a0a66414b586","affectsGlobalScope":true},"0d14fa22c41fdc7277e6f71473b20ebc07f40f00e38875142335d5b63cdfc9d2","d982cdd2610155b3cbcbfa62ccabcf2d2b739f821518ef113348d160ef0010d9","ffcc5500e77223169833fc6eb59b3a507944a1f89574e0a1276b0ea7fc22c4a4","22f13de9e2fe5f0f4724797abd3d34a1cdd6e47ef81fc4933fea3b8bf4ad524b","e3ba509d3dce019b3190ceb2f3fc88e2610ab717122dabd91a9efaa37804040d","cda0cb09b995489b7f4c57f168cd31b83dcbaa7aad49612734fb3c9c73f6e4f2",{"version":"1de1ad6a1929317171d8cfcd55bb2732257680c1bf89bcd53e1d46a4d8dbda22","affectsGlobalScope":true}],"options":{"allowSyntheticDefaultImports":true,"alwaysStrict":false,"esModuleInterop":true,"jsx":2,"module":1,"skipLibCheck":true,"strict":true,"target":99},"fileIdsList":[[104,192],[104],[104,146],[104,194,196],[104,194],[104,191,195],[104,193],[61,104],[64,104],[65,70,104],[66,76,77,84,93,103,104],[66,67,76,84,104],[68,104],[69,70,77,85,104],[70,93,100,104],[71,73,76,84,104],[72,104],[73,74,104],[75,76,104],[76,104],[76,77,78,93,103,104],[76,77,78,93,104],[79,84,93,103,104],[76,77,79,80,84,93,100,103,104],[79,81,93,100,103,104],[61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110],[76,82,104],[83,103,104],[73,76,84,93,104],[85,104],[86,104],[64,87,104],[88,102,104,108],[89,104],[90,104],[76,91,104],[91,92,104,106],[76,93,94,95,104],[93,95,104],[93,94,104],[96,104],[97,104],[76,98,99,104],[98,99,104],[70,84,100,104],[101,104],[84,102,104],[65,79,90,103,104],[70,104],[93,104,105],[104,106],[104,107],[65,70,76,78,87,93,103,104,106,108],[93,104,109],[93,104,111],[55,56,104],[66,104],[104,142],[103,104,118,122],[93,103,104,118],[104,113],[100,103,104,115,118],[84,100,104],[104,111],[104,111,113],[84,103,104,115,118],[59,60,65,76,93,103,104,114,117],[59,104,116],[65,96,103,104,111,114,118],[65,104,111],[65,104,111,135],[104,111,112,113],[104,118],[104,112,113,114,115,116,117,118,119,120,122,123,124,125,126,127,128,129,130,131,132,133,134,136,137,138,139,140,141],[104,118,125,126],[104,116,118,126,127],[104,117],[59,104,113,118],[104,118,122,126,127],[104,122],[103,104,116,118,121],[59,104,115,116,118,122,125],[65,93,104],[65,104,108,111,113,118,135],[93,104],[104,144],[77,85,86,104,174],[103,104,143,154,163,168],[61,103,104,143,154,163,165,167,174],[77,86,104,145,148,149,154],[104,148,149,150,154,156],[104,154],[104,153],[77,85,86,104,158],[104,147],[104,150,151,152,153],[104,154,160],[104,167],[104,181,187],[77,104,175,176,178,179],[78,86,104,152,176,178],[104,182],[104,181],[104,176,181,184],[86,104,176,178,181,182],[104,181,184,186,187,188],[104,181,184,186,188],[78,86,104,176,177],[54,77,86,104,152,154,162],[68,86,104],[66,104,143,154],[104,153,164,165],[104,166,169],[70,104,174],[104,170,173],[54,57,61,70,77,79,86,90,103,104,143,148,149,154,155,157,159,161,163,164,166,170,171,172]],"referencedMap":[[193,1],[192,2],[147,3],[197,4],[191,2],[195,5],[196,6],[194,7],[61,8],[62,8],[64,9],[65,10],[66,11],[67,12],[68,13],[69,14],[70,15],[71,16],[72,17],[73,18],[74,18],[75,19],[76,20],[77,21],[78,22],[63,2],[110,2],[79,23],[80,24],[81,25],[111,26],[82,27],[83,28],[84,29],[85,30],[86,31],[87,32],[88,33],[89,34],[90,35],[91,36],[92,37],[93,38],[95,39],[94,40],[96,41],[97,42],[98,43],[99,44],[100,45],[101,46],[102,47],[103,48],[104,49],[105,50],[106,51],[107,52],[108,53],[109,54],[156,55],[55,2],[57,56],[56,2],[58,2],[150,2],[146,2],[151,2],[152,2],[162,2],[160,57],[12,2],[11,2],[2,2],[13,2],[14,2],[15,2],[16,2],[17,2],[18,2],[19,2],[20,2],[3,2],[4,2],[24,2],[21,2],[22,2],[23,2],[25,2],[26,2],[27,2],[5,2],[28,2],[29,2],[30,2],[31,2],[6,2],[32,2],[33,2],[34,2],[35,2],[7,2],[36,2],[41,2],[42,2],[37,2],[38,2],[39,2],[40,2],[8,2],[46,2],[43,2],[44,2],[45,2],[47,2],[9,2],[48,2],[49,2],[50,2],[51,2],[52,2],[1,2],[10,2],[53,2],[143,58],[125,59],[133,60],[124,59],[140,61],[116,62],[115,63],[139,64],[134,65],[137,66],[118,67],[117,68],[113,69],[112,70],[136,71],[114,72],[119,73],[120,2],[123,73],[59,2],[142,74],[141,73],[127,75],[128,76],[130,77],[126,78],[129,79],[135,64],[121,80],[122,81],[131,82],[60,83],[132,73],[138,84],[158,2],[54,85],[145,86],[144,2],[167,2],[175,87],[169,88],[168,89],[155,90],[157,91],[153,92],[165,93],[186,2],[159,94],[190,2],[148,95],[149,2],[154,96],[161,97],[181,98],[188,99],[180,100],[179,101],[177,2],[183,102],[182,103],[185,104],[184,105],[189,106],[187,107],[178,108],[163,109],[176,110],[164,111],[166,112],[170,113],[171,2],[172,114],[174,115],[173,116]],"exportedModulesMap":[[193,1],[192,2],[147,3],[197,4],[191,2],[195,5],[196,6],[194,7],[61,8],[62,8],[64,9],[65,10],[66,11],[67,12],[68,13],[69,14],[70,15],[71,16],[72,17],[73,18],[74,18],[75,19],[76,20],[77,21],[78,22],[63,2],[110,2],[79,23],[80,24],[81,25],[111,26],[82,27],[83,28],[84,29],[85,30],[86,31],[87,32],[88,33],[89,34],[90,35],[91,36],[92,37],[93,38],[95,39],[94,40],[96,41],[97,42],[98,43],[99,44],[100,45],[101,46],[102,47],[103,48],[104,49],[105,50],[106,51],[107,52],[108,53],[109,54],[156,55],[55,2],[57,56],[56,2],[58,2],[150,2],[146,2],[151,2],[152,2],[162,2],[160,57],[12,2],[11,2],[2,2],[13,2],[14,2],[15,2],[16,2],[17,2],[18,2],[19,2],[20,2],[3,2],[4,2],[24,2],[21,2],[22,2],[23,2],[25,2],[26,2],[27,2],[5,2],[28,2],[29,2],[30,2],[31,2],[6,2],[32,2],[33,2],[34,2],[35,2],[7,2],[36,2],[41,2],[42,2],[37,2],[38,2],[39,2],[40,2],[8,2],[46,2],[43,2],[44,2],[45,2],[47,2],[9,2],[48,2],[49,2],[50,2],[51,2],[52,2],[1,2],[10,2],[53,2],[143,58],[125,59],[133,60],[124,59],[140,61],[116,62],[115,63],[139,64],[134,65],[137,66],[118,67],[117,68],[113,69],[112,70],[136,71],[114,72],[119,73],[120,2],[123,73],[59,2],[142,74],[141,73],[127,75],[128,76],[130,77],[126,78],[129,79],[135,64],[121,80],[122,81],[131,82],[60,83],[132,73],[138,84],[158,2],[54,85],[145,86],[144,2],[167,2],[175,87],[169,88],[168,89],[155,90],[157,91],[153,92],[165,93],[186,2],[159,94],[190,2],[148,95],[149,2],[154,96],[161,97],[181,98],[188,99],[180,100],[179,101],[177,2],[183,102],[182,103],[185,104],[184,105],[189,106],[187,107],[178,108],[163,109],[176,110],[164,111],[166,112],[170,113],[171,2],[172,114],[174,115],[173,116]],"semanticDiagnosticsPerFile":[193,192,147,197,191,195,196,194,61,62,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,63,110,79,80,81,111,82,83,84,85,86,87,88,89,90,91,92,93,95,94,96,97,98,99,100,101,102,103,104,105,106,107,108,109,156,55,57,56,58,150,146,151,152,162,160,12,11,2,13,14,15,16,17,18,19,20,3,4,24,21,22,23,25,26,27,5,28,29,30,31,6,32,33,34,35,7,36,41,42,37,38,39,40,8,46,43,44,45,47,9,48,49,50,51,52,1,10,53,143,125,133,124,140,116,115,139,134,137,118,117,113,112,136,114,119,120,123,59,142,141,127,128,130,126,129,135,121,122,131,60,132,138,158,54,145,144,167,175,169,168,155,157,153,165,186,159,190,148,149,154,161,181,188,180,179,177,183,182,185,184,189,187,178,163,176,164,166,170,171,172,174,173],"affectedFilesPendingEmit":[[193,1],[192,1],[147,1],[197,1],[191,1],[195,1],[196,1],[194,1],[61,1],[62,1],[64,1],[65,1],[66,1],[67,1],[68,1],[69,1],[70,1],[71,1],[72,1],[73,1],[74,1],[75,1],[76,1],[77,1],[78,1],[63,1],[110,1],[79,1],[80,1],[81,1],[111,1],[82,1],[83,1],[84,1],[85,1],[86,1],[87,1],[88,1],[89,1],[90,1],[91,1],[92,1],[93,1],[95,1],[94,1],[96,1],[97,1],[98,1],[99,1],[100,1],[101,1],[102,1],[103,1],[104,1],[105,1],[106,1],[107,1],[108,1],[109,1],[156,1],[55,1],[57,1],[56,1],[58,1],[150,1],[146,1],[151,1],[152,1],[162,1],[160,1],[2,1],[3,1],[4,1],[5,1],[6,1],[7,1],[8,1],[9,1],[10,1],[143,1],[125,1],[133,1],[124,1],[140,1],[116,1],[115,1],[139,1],[134,1],[137,1],[118,1],[117,1],[113,1],[112,1],[136,1],[114,1],[119,1],[120,1],[123,1],[59,1],[142,1],[141,1],[127,1],[128,1],[130,1],[126,1],[129,1],[135,1],[121,1],[122,1],[131,1],[60,1],[132,1],[138,1],[158,1],[54,1],[145,1],[144,1],[167,1],[175,1],[169,1],[168,1],[155,1],[157,1],[153,1],[165,1],[186,1],[159,1],[190,1],[148,1],[149,1],[154,1],[161,1],[181,1],[188,1],[180,1],[179,1],[177,1],[183,1],[182,1],[185,1],[184,1],[189,1],[187,1],[178,1],[163,1],[176,1],[164,1],[166,1],[170,1],[171,1],[172,1],[174,1],[173,1]]},"version":"4.8.4"}
@@ -6,12 +6,16 @@ import { isInPagesCI } from "./constants";
6
6
  import { optimizeRoutesJSONSpec } from "./functions/routes-transformation";
7
7
  import { validateRoutes } from "./functions/routes-validation";
8
8
  import { pagesBetaWarning } from "./utils";
9
- import type { YargsOptionsToInterface } from "../yargs-types";
10
- import type { Argv } from "yargs";
9
+ import type {
10
+ CommonYargsArgv,
11
+ StrictYargsOptionsToInterface,
12
+ } from "../yargs-types";
11
13
 
12
- type OptimizeRoutesArgs = YargsOptionsToInterface<typeof OptimizeRoutesOptions>;
14
+ type OptimizeRoutesArgs = StrictYargsOptionsToInterface<
15
+ typeof OptimizeRoutesOptions
16
+ >;
13
17
 
14
- export function OptimizeRoutesOptions(yargs: Argv) {
18
+ export function OptimizeRoutesOptions(yargs: CommonYargsArgv) {
15
19
  return yargs
16
20
  .options({
17
21
  "routes-path": {
@@ -9,7 +9,7 @@ import * as Projects from "./projects";
9
9
  import * as Publish from "./publish";
10
10
  import * as Upload from "./upload";
11
11
  import { CLEANUP, pagesBetaWarning } from "./utils";
12
- import type { BuilderCallback } from "yargs";
12
+ import type { CommonYargsArgv } from "../yargs-types";
13
13
 
14
14
  process.on("SIGINT", () => {
15
15
  CLEANUP();
@@ -20,7 +20,7 @@ process.on("SIGTERM", () => {
20
20
  process.exit();
21
21
  });
22
22
 
23
- export const pages: BuilderCallback<unknown, unknown> = (yargs) => {
23
+ export function pages(yargs: CommonYargsArgv) {
24
24
  return (
25
25
  yargs
26
26
  .command(
@@ -99,4 +99,4 @@ export const pages: BuilderCallback<unknown, unknown> = (yargs) => {
99
99
  )
100
100
  .epilogue(pagesBetaWarning)
101
101
  );
102
- };
102
+ }
@@ -1,5 +1,4 @@
1
1
  import { execSync } from "node:child_process";
2
- import { render } from "ink";
3
2
  import Table from "ink-table";
4
3
  import React from "react";
5
4
  import { format as timeagoFormat } from "timeago.js";
@@ -10,15 +9,16 @@ import { FatalError } from "../errors";
10
9
  import { logger } from "../logger";
11
10
  import * as metrics from "../metrics";
12
11
  import { requireAuth } from "../user";
12
+ import { renderToString } from "../utils/render";
13
13
  import { PAGES_CONFIG_CACHE_FILENAME } from "./constants";
14
14
  import { pagesBetaWarning } from "./utils";
15
+ import type {
16
+ CommonYargsArgv,
17
+ StrictYargsOptionsToInterface,
18
+ } from "../yargs-types";
15
19
  import type { PagesConfigCache, Project } from "./types";
16
- import type { ArgumentsCamelCase, Argv } from "yargs";
17
20
 
18
- // Empty object, as per eslint
19
- type ListArgs = Record<string, never>;
20
-
21
- export function ListOptions(yargs: Argv): Argv<ListArgs> {
21
+ export function ListOptions(yargs: CommonYargsArgv) {
22
22
  return yargs.epilogue(pagesBetaWarning);
23
23
  }
24
24
 
@@ -44,10 +44,7 @@ export async function ListHandler() {
44
44
  account_id: accountId,
45
45
  });
46
46
 
47
- const { unmount } = render(<Table data={data}></Table>, {
48
- patchConsole: false,
49
- });
50
- unmount();
47
+ logger.log(renderToString(<Table data={data}></Table>));
51
48
  await metrics.sendMetricsEvent("list pages projects");
52
49
  }
53
50
 
@@ -77,12 +74,7 @@ export const listProjects = async ({
77
74
  return results;
78
75
  };
79
76
 
80
- type CreateArgs = {
81
- "project-name": string;
82
- "production-branch"?: string;
83
- };
84
-
85
- export function CreateOptions(yargs: Argv): Argv<CreateArgs> {
77
+ export function CreateOptions(yargs: CommonYargsArgv) {
86
78
  return yargs
87
79
  .positional("project-name", {
88
80
  type: "string",
@@ -101,7 +93,7 @@ export function CreateOptions(yargs: Argv): Argv<CreateArgs> {
101
93
  export async function CreateHandler({
102
94
  productionBranch,
103
95
  projectName,
104
- }: ArgumentsCamelCase<CreateArgs>) {
96
+ }: StrictYargsOptionsToInterface<typeof CreateOptions>) {
105
97
  const config = getConfigCache<PagesConfigCache>(PAGES_CONFIG_CACHE_FILENAME);
106
98
  const accountId = await requireAuth(config);
107
99
 
@@ -132,11 +124,9 @@ export async function CreateHandler({
132
124
  } catch (err) {}
133
125
  }
134
126
 
135
- productionBranch = await prompt(
136
- "Enter the production branch name:",
137
- "text",
138
- productionBranch ?? "production"
139
- );
127
+ productionBranch = await prompt("Enter the production branch name:", {
128
+ defaultValue: productionBranch ?? "production",
129
+ });
140
130
  }
141
131
 
142
132
  if (!productionBranch) {