wrangler 0.0.0-e88a54e → 0.0.0-e8e684c7

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 (222) hide show
  1. package/Cloudflare_CA.pem +18 -0
  2. package/README.md +51 -14
  3. package/bin/wrangler.js +161 -29
  4. package/kv-asset-handler.js +1 -0
  5. package/miniflare-dist/index.mjs +5484 -21
  6. package/package.json +173 -143
  7. package/src/__tests__/config-cache-without-cache-dir.test.ts +38 -0
  8. package/src/__tests__/config-cache.test.ts +42 -0
  9. package/src/__tests__/configuration.test.ts +4016 -2786
  10. package/src/__tests__/dev.test.tsx +1305 -483
  11. package/src/__tests__/generate.test.ts +91 -0
  12. package/src/__tests__/guess-worker-format.test.ts +75 -48
  13. package/src/__tests__/helpers/cmd-shim.d.ts +6 -6
  14. package/src/__tests__/helpers/mock-account-id.ts +24 -24
  15. package/src/__tests__/helpers/mock-bin.ts +20 -20
  16. package/src/__tests__/helpers/mock-cfetch.ts +182 -93
  17. package/src/__tests__/helpers/mock-console.ts +59 -32
  18. package/src/__tests__/helpers/mock-dialogs.ts +121 -33
  19. package/src/__tests__/helpers/mock-get-zone-from-host.ts +8 -0
  20. package/src/__tests__/helpers/mock-http-server.ts +46 -0
  21. package/src/__tests__/helpers/mock-istty.ts +74 -0
  22. package/src/__tests__/helpers/mock-known-routes.ts +7 -0
  23. package/src/__tests__/helpers/mock-kv.ts +26 -26
  24. package/src/__tests__/helpers/mock-oauth-flow.ts +250 -0
  25. package/src/__tests__/helpers/mock-process.ts +39 -0
  26. package/src/__tests__/helpers/mock-stdin.ts +82 -77
  27. package/src/__tests__/helpers/mock-web-socket.ts +21 -21
  28. package/src/__tests__/helpers/run-in-tmp.ts +28 -22
  29. package/src/__tests__/helpers/run-wrangler.ts +8 -8
  30. package/src/__tests__/helpers/write-worker-source.ts +31 -0
  31. package/src/__tests__/helpers/write-wrangler-toml.ts +9 -9
  32. package/src/__tests__/https-options.test.ts +144 -108
  33. package/src/__tests__/index.test.ts +229 -975
  34. package/src/__tests__/init.test.ts +2170 -0
  35. package/src/__tests__/jest.setup.ts +122 -34
  36. package/src/__tests__/kv.test.ts +1376 -1087
  37. package/src/__tests__/logger.test.ts +141 -0
  38. package/src/__tests__/metrics.test.ts +450 -0
  39. package/src/__tests__/package-manager.test.ts +312 -165
  40. package/src/__tests__/pages.test.ts +1270 -39
  41. package/src/__tests__/parse.test.ts +253 -245
  42. package/src/__tests__/publish.test.ts +6878 -2627
  43. package/src/__tests__/pubsub.test.ts +367 -0
  44. package/src/__tests__/r2.test.ts +328 -190
  45. package/src/__tests__/route.test.ts +22 -22
  46. package/src/__tests__/secret.test.ts +474 -407
  47. package/src/__tests__/tail.test.ts +679 -441
  48. package/src/__tests__/test-old-node-version.js +31 -0
  49. package/src/__tests__/user.test.ts +155 -0
  50. package/src/__tests__/validate-dev-props.test.ts +56 -0
  51. package/src/__tests__/version.test.ts +35 -0
  52. package/src/__tests__/whoami.test.tsx +276 -87
  53. package/src/__tests__/worker-namespace.test.ts +329 -0
  54. package/src/abort.d.ts +3 -0
  55. package/src/api/dev.ts +93 -0
  56. package/src/api/index.ts +1 -0
  57. package/src/bundle-reporter.tsx +29 -0
  58. package/src/bundle.ts +441 -110
  59. package/src/cfetch/index.ts +83 -66
  60. package/src/cfetch/internal.ts +251 -92
  61. package/src/cli.ts +22 -14
  62. package/src/config/README.md +1 -1
  63. package/src/config/config.ts +224 -179
  64. package/src/config/diagnostics.ts +61 -61
  65. package/src/config/environment.ts +430 -311
  66. package/src/config/index.ts +227 -38
  67. package/src/config/validation-helpers.ts +414 -303
  68. package/src/config/validation.ts +1745 -973
  69. package/src/config-cache.ts +85 -0
  70. package/src/create-worker-preview.ts +209 -118
  71. package/src/create-worker-upload-form.ts +275 -201
  72. package/src/dev/dev-vars.ts +36 -0
  73. package/src/dev/dev.tsx +488 -307
  74. package/src/dev/local.tsx +427 -210
  75. package/src/dev/remote.tsx +407 -188
  76. package/src/dev/use-esbuild.ts +156 -78
  77. package/src/dev/validate-dev-props.ts +31 -0
  78. package/src/dev-registry.tsx +160 -0
  79. package/src/dev.tsx +696 -0
  80. package/src/dialogs.tsx +115 -57
  81. package/src/dispatch-namespace.ts +206 -0
  82. package/src/durable.ts +102 -0
  83. package/src/entry.ts +267 -147
  84. package/src/environment-variables.ts +25 -23
  85. package/src/errors.ts +11 -0
  86. package/src/faye-websocket.d.ts +6 -0
  87. package/src/generate.ts +131 -0
  88. package/src/git-client.ts +42 -0
  89. package/src/global-wrangler-config-path.ts +26 -0
  90. package/src/https-options.ts +85 -80
  91. package/src/index.tsx +2191 -2304
  92. package/src/init.ts +622 -0
  93. package/src/inspect.ts +687 -557
  94. package/src/intl-polyfill.d.ts +139 -0
  95. package/src/is-ci.ts +14 -0
  96. package/src/is-interactive.ts +12 -0
  97. package/src/kv.ts +353 -242
  98. package/src/logger.ts +73 -0
  99. package/src/metrics/index.ts +5 -0
  100. package/src/metrics/metrics-config.ts +239 -0
  101. package/src/metrics/metrics-dispatcher.ts +96 -0
  102. package/src/metrics/metrics-usage-headers.ts +24 -0
  103. package/src/metrics/send-event.ts +92 -0
  104. package/src/miniflare-cli/assets.ts +554 -0
  105. package/src/miniflare-cli/enum-keys.ts +8 -8
  106. package/src/miniflare-cli/index.ts +199 -29
  107. package/src/miniflare-cli/request-context.ts +40 -0
  108. package/src/module-collection.ts +213 -213
  109. package/src/open-in-browser.ts +8 -16
  110. package/src/package-manager.ts +183 -90
  111. package/src/pages/build.tsx +238 -0
  112. package/src/pages/constants.ts +12 -0
  113. package/src/pages/deployments.tsx +106 -0
  114. package/src/pages/dev.tsx +528 -0
  115. package/src/pages/errors.ts +22 -0
  116. package/src/pages/functions/buildPlugin.ts +109 -0
  117. package/src/pages/functions/buildWorker.ts +155 -0
  118. package/src/pages/functions/filepath-routing.test.ts +234 -0
  119. package/src/pages/functions/filepath-routing.ts +189 -0
  120. package/src/pages/functions/identifiers.ts +78 -0
  121. package/src/pages/functions/routes-consolidation.test.ts +250 -0
  122. package/src/pages/functions/routes-consolidation.ts +73 -0
  123. package/src/pages/functions/routes-transformation.test.ts +271 -0
  124. package/src/pages/functions/routes-transformation.ts +122 -0
  125. package/src/pages/functions/routes.ts +151 -0
  126. package/src/pages/functions.tsx +96 -0
  127. package/src/pages/index.tsx +94 -0
  128. package/src/pages/projects.tsx +169 -0
  129. package/src/pages/publish.tsx +391 -0
  130. package/src/pages/types.ts +49 -0
  131. package/src/pages/upload.tsx +413 -0
  132. package/src/pages/utils.ts +12 -0
  133. package/src/parse.ts +224 -121
  134. package/src/paths.ts +6 -6
  135. package/src/preview.ts +31 -0
  136. package/src/proxy.ts +416 -370
  137. package/src/publish.ts +796 -321
  138. package/src/pubsub/index.ts +286 -0
  139. package/src/pubsub/pubsub-commands.tsx +623 -0
  140. package/src/r2.ts +100 -19
  141. package/src/selfsigned.d.ts +23 -23
  142. package/src/sites.tsx +281 -189
  143. package/src/tail/filters.ts +111 -109
  144. package/src/tail/index.ts +230 -217
  145. package/src/tail/printing.ts +92 -47
  146. package/src/update-check.ts +19 -0
  147. package/src/user/choose-account.tsx +69 -0
  148. package/src/user/env-vars.ts +46 -0
  149. package/src/user/generate-auth-url.ts +33 -0
  150. package/src/user/generate-random-state.ts +16 -0
  151. package/src/user/index.ts +3 -0
  152. package/src/user/user.tsx +1191 -0
  153. package/src/whoami.tsx +142 -42
  154. package/src/worker.ts +135 -94
  155. package/src/zones.ts +167 -0
  156. package/templates/checked-fetch.js +17 -0
  157. package/templates/first-party-worker-module-facade.ts +18 -0
  158. package/templates/format-dev-errors.ts +32 -0
  159. package/templates/gitignore +171 -0
  160. package/templates/new-worker-scheduled.js +17 -0
  161. package/templates/new-worker-scheduled.ts +32 -0
  162. package/templates/new-worker.js +3 -3
  163. package/templates/new-worker.ts +18 -3
  164. package/templates/no-op-worker.js +10 -0
  165. package/templates/pages-shim.ts +9 -0
  166. package/templates/pages-template-plugin.ts +167 -0
  167. package/templates/pages-template-worker.ts +172 -0
  168. package/templates/serve-static-assets.ts +63 -0
  169. package/templates/service-bindings-module-facade.js +54 -0
  170. package/templates/service-bindings-sw-facade.js +42 -0
  171. package/templates/tsconfig.json +95 -95
  172. package/wrangler-dist/cli.d.ts +338 -0
  173. package/wrangler-dist/cli.js +124611 -112403
  174. package/miniflare-dist/index.mjs.map +0 -7
  175. package/pages/functions/buildWorker.ts +0 -62
  176. package/pages/functions/filepath-routing.test.ts +0 -223
  177. package/pages/functions/filepath-routing.ts +0 -181
  178. package/pages/functions/identifiers.ts +0 -78
  179. package/pages/functions/routes.ts +0 -151
  180. package/pages/functions/template-worker.ts +0 -130
  181. package/src/__tests__/dev2.test.tsx +0 -154
  182. package/src/__tests__/helpers/faye-websocket.d.ts +0 -6
  183. package/src/__tests__/logout.test.ts +0 -52
  184. package/src/__tests__/sentry.test.ts +0 -146
  185. package/src/pages.tsx +0 -1047
  186. package/src/reporting.ts +0 -131
  187. package/src/user.tsx +0 -1118
  188. package/templates/static-asset-facade.js +0 -47
  189. package/vendor/@cloudflare/kv-asset-handler/CHANGELOG.md +0 -332
  190. package/vendor/@cloudflare/kv-asset-handler/LICENSE_APACHE +0 -176
  191. package/vendor/@cloudflare/kv-asset-handler/LICENSE_MIT +0 -25
  192. package/vendor/@cloudflare/kv-asset-handler/README.md +0 -245
  193. package/vendor/@cloudflare/kv-asset-handler/dist/index.d.ts +0 -32
  194. package/vendor/@cloudflare/kv-asset-handler/dist/index.js +0 -354
  195. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.d.ts +0 -13
  196. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.js +0 -148
  197. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.d.ts +0 -1
  198. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.js +0 -436
  199. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.d.ts +0 -1
  200. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.js +0 -40
  201. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.d.ts +0 -1
  202. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.js +0 -42
  203. package/vendor/@cloudflare/kv-asset-handler/dist/types.d.ts +0 -26
  204. package/vendor/@cloudflare/kv-asset-handler/dist/types.js +0 -31
  205. package/vendor/@cloudflare/kv-asset-handler/package.json +0 -52
  206. package/vendor/@cloudflare/kv-asset-handler/src/index.ts +0 -296
  207. package/vendor/@cloudflare/kv-asset-handler/src/mocks.ts +0 -136
  208. package/vendor/@cloudflare/kv-asset-handler/src/test/getAssetFromKV.ts +0 -464
  209. package/vendor/@cloudflare/kv-asset-handler/src/test/mapRequestToAsset.ts +0 -33
  210. package/vendor/@cloudflare/kv-asset-handler/src/test/serveSinglePageApp.ts +0 -42
  211. package/vendor/@cloudflare/kv-asset-handler/src/types.ts +0 -39
  212. package/vendor/wrangler-mime/CHANGELOG.md +0 -289
  213. package/vendor/wrangler-mime/LICENSE +0 -21
  214. package/vendor/wrangler-mime/Mime.js +0 -97
  215. package/vendor/wrangler-mime/README.md +0 -187
  216. package/vendor/wrangler-mime/cli.js +0 -46
  217. package/vendor/wrangler-mime/index.js +0 -4
  218. package/vendor/wrangler-mime/lite.js +0 -4
  219. package/vendor/wrangler-mime/package.json +0 -52
  220. package/vendor/wrangler-mime/types/other.js +0 -1
  221. package/vendor/wrangler-mime/types/standard.js +0 -1
  222. package/wrangler-dist/cli.js.map +0 -7
@@ -2,16 +2,17 @@ import crypto from "node:crypto";
2
2
  import { readFile } from "node:fs/promises";
3
3
  import path from "node:path";
4
4
  import globToRegExp from "glob-to-regexp";
5
+ import { logger } from "./logger";
5
6
  import type { Config, ConfigModuleRuleType } from "./config";
6
7
  import type { CfModule, CfModuleType, CfScriptFormat } from "./worker";
7
8
  import type esbuild from "esbuild";
8
9
 
9
10
  const RuleTypeToModuleType: Record<ConfigModuleRuleType, CfModuleType> = {
10
- ESModule: "esm",
11
- CommonJS: "commonjs",
12
- CompiledWasm: "compiled-wasm",
13
- Data: "buffer",
14
- Text: "text",
11
+ ESModule: "esm",
12
+ CommonJS: "commonjs",
13
+ CompiledWasm: "compiled-wasm",
14
+ Data: "buffer",
15
+ Text: "text",
15
16
  };
16
17
 
17
18
  // This is a combination of an esbuild plugin and a mutable array
@@ -23,236 +24,235 @@ const RuleTypeToModuleType: Record<ConfigModuleRuleType, CfModuleType> = {
23
24
  // them correctly in the bundle, and add them to the form upload.
24
25
 
25
26
  export const DEFAULT_MODULE_RULES: Config["rules"] = [
26
- { type: "Text", globs: ["**/*.txt", "**/*.html"] },
27
- { type: "Data", globs: ["**/*.bin"] },
28
- { type: "CompiledWasm", globs: ["**/*.wasm"] },
27
+ { type: "Text", globs: ["**/*.txt", "**/*.html"] },
28
+ { type: "Data", globs: ["**/*.bin"] },
29
+ { type: "CompiledWasm", globs: ["**/*.wasm"] },
29
30
  ];
30
31
 
31
32
  export default function createModuleCollector(props: {
32
- format: CfScriptFormat;
33
- rules?: Config["rules"];
34
- // a collection of "legacy" style module references, which are just file names
35
- // we will eventually deprecate this functionality, hence the verbose greppable name
36
- wrangler1xlegacyModuleReferences: {
37
- rootDirectory: string;
38
- fileNames: Set<string>;
39
- };
33
+ format: CfScriptFormat;
34
+ rules?: Config["rules"];
35
+ // a collection of "legacy" style module references, which are just file names
36
+ // we will eventually deprecate this functionality, hence the verbose greppable name
37
+ wrangler1xlegacyModuleReferences: {
38
+ rootDirectory: string;
39
+ fileNames: Set<string>;
40
+ };
40
41
  }): {
41
- modules: CfModule[];
42
- plugin: esbuild.Plugin;
42
+ modules: CfModule[];
43
+ plugin: esbuild.Plugin;
43
44
  } {
44
- const rules: Config["rules"] = [
45
- ...(props.rules || []),
46
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
47
- ...DEFAULT_MODULE_RULES!,
48
- ];
45
+ const rules: Config["rules"] = [
46
+ ...(props.rules || []),
47
+ // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
48
+ ...DEFAULT_MODULE_RULES!,
49
+ ];
49
50
 
50
- // First, we want to add some validations to the module rules
51
- // We want to warn if rules are accidentally configured in such a way that
52
- // subsequent rules will never match because `fallthrough` hasn't been set
51
+ // First, we want to add some validations to the module rules
52
+ // We want to warn if rules are accidentally configured in such a way that
53
+ // subsequent rules will never match because `fallthrough` hasn't been set
53
54
 
54
- const completedRuleLocations: Record<string, number> = {};
55
- let index = 0;
56
- const rulesToRemove: Config["rules"] = [];
57
- for (const rule of rules) {
58
- if (rule.type in completedRuleLocations) {
59
- if (rules[completedRuleLocations[rule.type]].fallthrough !== false) {
60
- if (index < (props.rules || []).length) {
61
- console.warn(
62
- `The module rule at position ${index} (${JSON.stringify(
63
- rule
64
- )}) has the same type as a previous rule (at position ${
65
- completedRuleLocations[rule.type]
66
- }, ${JSON.stringify(
67
- rules[completedRuleLocations[rule.type]]
68
- )}). This rule will be ignored. To the previous rule, add \`fallthrough = true\` to allow this one to also be used, or \`fallthrough = false\` to silence this warning.`
69
- );
70
- } else {
71
- console.warn(
72
- `The default module rule ${JSON.stringify(
73
- rule
74
- )} has the same type as a previous rule (at position ${
75
- completedRuleLocations[rule.type]
76
- }, ${JSON.stringify(
77
- rules[completedRuleLocations[rule.type]]
78
- )}). This rule will be ignored. To the previous rule, add \`fallthrough = true\` to allow the default one to also be used, or \`fallthrough = false\` to silence this warning.`
79
- );
80
- }
81
- }
55
+ const completedRuleLocations: Record<string, number> = {};
56
+ let index = 0;
57
+ const rulesToRemove: Config["rules"] = [];
58
+ for (const rule of rules) {
59
+ if (rule.type in completedRuleLocations) {
60
+ if (rules[completedRuleLocations[rule.type]].fallthrough !== false) {
61
+ if (index < (props.rules || []).length) {
62
+ logger.warn(
63
+ `The module rule at position ${index} (${JSON.stringify(
64
+ rule
65
+ )}) has the same type as a previous rule (at position ${
66
+ completedRuleLocations[rule.type]
67
+ }, ${JSON.stringify(
68
+ rules[completedRuleLocations[rule.type]]
69
+ )}). This rule will be ignored. To the previous rule, add \`fallthrough = true\` to allow this one to also be used, or \`fallthrough = false\` to silence this warning.`
70
+ );
71
+ } else {
72
+ logger.warn(
73
+ `The default module rule ${JSON.stringify(
74
+ rule
75
+ )} has the same type as a previous rule (at position ${
76
+ completedRuleLocations[rule.type]
77
+ }, ${JSON.stringify(
78
+ rules[completedRuleLocations[rule.type]]
79
+ )}). This rule will be ignored. To the previous rule, add \`fallthrough = true\` to allow the default one to also be used, or \`fallthrough = false\` to silence this warning.`
80
+ );
81
+ }
82
+ }
82
83
 
83
- rulesToRemove.push(rule);
84
- }
85
- if (!(rule.type in completedRuleLocations) && rule.fallthrough !== true) {
86
- completedRuleLocations[rule.type] = index;
87
- }
88
- index++;
89
- }
84
+ rulesToRemove.push(rule);
85
+ }
86
+ if (!(rule.type in completedRuleLocations) && rule.fallthrough !== true) {
87
+ completedRuleLocations[rule.type] = index;
88
+ }
89
+ index++;
90
+ }
90
91
 
91
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
92
- rulesToRemove.forEach((rule) => rules!.splice(rules!.indexOf(rule), 1));
92
+ // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
93
+ rulesToRemove.forEach((rule) => rules!.splice(rules!.indexOf(rule), 1));
93
94
 
94
- const modules: CfModule[] = [];
95
- return {
96
- modules,
97
- plugin: {
98
- name: "wrangler-module-collector",
99
- setup(build) {
100
- build.onStart(() => {
101
- // reset the module collection array
102
- modules.splice(0);
103
- });
95
+ const modules: CfModule[] = [];
96
+ return {
97
+ modules,
98
+ plugin: {
99
+ name: "wrangler-module-collector",
100
+ setup(build) {
101
+ build.onStart(() => {
102
+ // reset the module collection array
103
+ modules.splice(0);
104
+ });
104
105
 
105
- // ~ start legacy module specifier support ~
106
+ // ~ start legacy module specifier support ~
106
107
 
107
- // This section detects usage of "legacy" 1.x style module specifiers
108
- // and modifies them so they "work" in wrangler v2, but with a warning
108
+ // This section detects usage of "legacy" 1.x style module specifiers
109
+ // and modifies them so they "work" in wrangler v2, but with a warning
109
110
 
110
- const rulesMatchers = rules.flatMap((rule) => {
111
- return rule.globs.map((glob) => {
112
- const regex = globToRegExp(glob);
113
- return {
114
- regex,
115
- rule,
116
- };
117
- });
118
- });
111
+ const rulesMatchers = rules.flatMap((rule) => {
112
+ return rule.globs.map((glob) => {
113
+ const regex = globToRegExp(glob);
114
+ return {
115
+ regex,
116
+ rule,
117
+ };
118
+ });
119
+ });
119
120
 
120
- if (props.wrangler1xlegacyModuleReferences.fileNames.size > 0) {
121
- build.onResolve(
122
- {
123
- filter: new RegExp(
124
- "^(" +
125
- [...props.wrangler1xlegacyModuleReferences.fileNames].join(
126
- "|"
127
- ) +
128
- ")$"
129
- ),
130
- },
131
- async (args: esbuild.OnResolveArgs) => {
132
- if (
133
- args.kind !== "import-statement" &&
134
- args.kind !== "require-call"
135
- ) {
136
- return;
137
- }
138
- // In the future, this will simply throw an error
139
- console.warn(
140
- `Deprecation warning: detected a legacy module import in "./${path.relative(
141
- process.cwd(),
142
- args.importer
143
- )}". This will stop working in the future. Replace references to "${
144
- args.path
145
- }" with "./${args.path}";`
146
- );
121
+ if (props.wrangler1xlegacyModuleReferences.fileNames.size > 0) {
122
+ build.onResolve(
123
+ {
124
+ filter: new RegExp(
125
+ "^(" +
126
+ [...props.wrangler1xlegacyModuleReferences.fileNames]
127
+ .map((name) => name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"))
128
+ .join("|") +
129
+ ")$"
130
+ ),
131
+ },
132
+ async (args: esbuild.OnResolveArgs) => {
133
+ if (
134
+ args.kind !== "import-statement" &&
135
+ args.kind !== "require-call"
136
+ ) {
137
+ return;
138
+ }
139
+ // In the future, this will simply throw an error
140
+ logger.warn(
141
+ `Deprecation: detected a legacy module import in "./${path.relative(
142
+ process.cwd(),
143
+ args.importer
144
+ )}". This will stop working in the future. Replace references to "${
145
+ args.path
146
+ }" with "./${args.path}";`
147
+ );
147
148
 
148
- // take the file and massage it to a
149
- // transportable/manageable format
150
- const filePath = path.join(
151
- props.wrangler1xlegacyModuleReferences.rootDirectory,
152
- args.path
153
- );
154
- const fileContent = await readFile(filePath);
155
- const fileHash = crypto
156
- .createHash("sha1")
157
- .update(fileContent)
158
- .digest("hex");
159
- const fileName = `./${fileHash}-${path.basename(args.path)}`;
149
+ // take the file and massage it to a
150
+ // transportable/manageable format
151
+ const filePath = path.join(
152
+ props.wrangler1xlegacyModuleReferences.rootDirectory,
153
+ args.path
154
+ );
155
+ const fileContent = await readFile(filePath);
156
+ const fileHash = crypto
157
+ .createHash("sha1")
158
+ .update(fileContent)
159
+ .digest("hex");
160
+ const fileName = `./${fileHash}-${path.basename(args.path)}`;
160
161
 
161
- const { rule } =
162
- rulesMatchers.find(({ regex }) => regex.test(fileName)) || {};
163
- if (rule) {
164
- // add the module to the array
165
- modules.push({
166
- name: fileName,
167
- content: fileContent,
168
- type: RuleTypeToModuleType[rule.type],
169
- });
170
- return {
171
- path: fileName, // change the reference to the changed module
172
- external: props.format === "modules", // mark it as external in the bundle
173
- namespace: `wrangler-module-${rule.type}`, // just a tag, this isn't strictly necessary
174
- watchFiles: [filePath], // we also add the file to esbuild's watch list
175
- };
176
- }
177
- }
178
- );
179
- }
162
+ const { rule } =
163
+ rulesMatchers.find(({ regex }) => regex.test(fileName)) || {};
164
+ if (rule) {
165
+ // add the module to the array
166
+ modules.push({
167
+ name: fileName,
168
+ content: fileContent,
169
+ type: RuleTypeToModuleType[rule.type],
170
+ });
171
+ return {
172
+ path: fileName, // change the reference to the changed module
173
+ external: props.format === "modules", // mark it as external in the bundle
174
+ namespace: `wrangler-module-${rule.type}`, // just a tag, this isn't strictly necessary
175
+ watchFiles: [filePath], // we also add the file to esbuild's watch list
176
+ };
177
+ }
178
+ }
179
+ );
180
+ }
180
181
 
181
- // ~ end legacy module specifier support ~
182
+ // ~ end legacy module specifier support ~
182
183
 
183
- rules?.forEach((rule) => {
184
- if (rule.type === "ESModule" || rule.type === "CommonJS") return; // TODO: we should treat these as js files, and use the jsx loader
184
+ rules?.forEach((rule) => {
185
+ if (rule.type === "ESModule" || rule.type === "CommonJS") return; // TODO: we should treat these as js files, and use the jsx loader
185
186
 
186
- rule.globs.forEach((glob) => {
187
- build.onResolve(
188
- { filter: globToRegExp(glob) },
189
- async (args: esbuild.OnResolveArgs) => {
190
- // take the file and massage it to a
191
- // transportable/manageable format
187
+ rule.globs.forEach((glob) => {
188
+ build.onResolve(
189
+ { filter: globToRegExp(glob) },
190
+ async (args: esbuild.OnResolveArgs) => {
191
+ // take the file and massage it to a
192
+ // transportable/manageable format
192
193
 
193
- const filePath = path.join(args.resolveDir, args.path);
194
- const fileContent = await readFile(filePath);
195
- const fileHash = crypto
196
- .createHash("sha1")
197
- .update(fileContent)
198
- .digest("hex");
199
- const fileName = `./${fileHash}-${path.basename(args.path)}`;
194
+ const filePath = path.join(args.resolveDir, args.path);
195
+ const fileContent = await readFile(filePath);
196
+ const fileHash = crypto
197
+ .createHash("sha1")
198
+ .update(fileContent)
199
+ .digest("hex");
200
+ const fileName = `./${fileHash}-${path.basename(args.path)}`;
200
201
 
201
- // add the module to the array
202
- modules.push({
203
- name: fileName,
204
- content: fileContent,
205
- type: RuleTypeToModuleType[rule.type],
206
- });
202
+ // add the module to the array
203
+ modules.push({
204
+ name: fileName,
205
+ content: fileContent,
206
+ type: RuleTypeToModuleType[rule.type],
207
+ });
207
208
 
208
- return {
209
- path: fileName, // change the reference to the changed module
210
- external: props.format === "modules", // mark it as external in the bundle
211
- namespace: `wrangler-module-${rule.type}`, // just a tag, this isn't strictly necessary
212
- watchFiles: [filePath], // we also add the file to esbuild's watch list
213
- };
214
- }
215
- );
209
+ return {
210
+ path: fileName, // change the reference to the changed module
211
+ external: props.format === "modules", // mark it as external in the bundle
212
+ namespace: `wrangler-module-${rule.type}`, // just a tag, this isn't strictly necessary
213
+ watchFiles: [filePath], // we also add the file to esbuild's watch list
214
+ };
215
+ }
216
+ );
216
217
 
217
- if (props.format === "service-worker") {
218
- build.onLoad(
219
- { filter: globToRegExp(glob) },
220
- async (args: esbuild.OnLoadArgs) => {
221
- return {
222
- // We replace the the module with an identifier
223
- // that we'll separately add to the form upload
224
- // as part of [wasm_modules]/[text_blobs]. This identifier has to be a valid
225
- // JS identifier, so we replace all non alphanumeric characters
226
- // with an underscore.
227
- // TODO: what of "Data"?
228
- contents: `export default ${args.path.replace(
229
- /[^a-zA-Z0-9_$]/g,
230
- "_"
231
- )};`,
232
- };
233
- }
234
- );
235
- }
236
- });
237
- });
218
+ if (props.format === "service-worker") {
219
+ build.onLoad(
220
+ { filter: globToRegExp(glob) },
221
+ async (args: esbuild.OnLoadArgs) => {
222
+ return {
223
+ // We replace the the module with an identifier
224
+ // that we'll separately add to the form upload
225
+ // as part of [wasm_modules]/[text_blobs]/[data_blobs]. This identifier has to be a valid
226
+ // JS identifier, so we replace all non alphanumeric characters
227
+ // with an underscore.
228
+ contents: `export default ${args.path.replace(
229
+ /[^a-zA-Z0-9_$]/g,
230
+ "_"
231
+ )};`,
232
+ };
233
+ }
234
+ );
235
+ }
236
+ });
237
+ });
238
238
 
239
- rulesToRemove.forEach((rule) => {
240
- rule.globs.forEach((glob) => {
241
- build.onResolve(
242
- { filter: globToRegExp(glob) },
243
- async (args: esbuild.OnResolveArgs) => {
244
- throw new Error(
245
- `The file ${
246
- args.path
247
- } matched a module rule in your configuration (${JSON.stringify(
248
- rule
249
- )}), but was ignored because a previous rule with the same type was not marked as \`fallthrough = true\`.`
250
- );
251
- }
252
- );
253
- });
254
- });
255
- },
256
- },
257
- };
239
+ rulesToRemove.forEach((rule) => {
240
+ rule.globs.forEach((glob) => {
241
+ build.onResolve(
242
+ { filter: globToRegExp(glob) },
243
+ async (args: esbuild.OnResolveArgs) => {
244
+ throw new Error(
245
+ `The file ${
246
+ args.path
247
+ } matched a module rule in your configuration (${JSON.stringify(
248
+ rule
249
+ )}), but was ignored because a previous rule with the same type was not marked as \`fallthrough = true\`.`
250
+ );
251
+ }
252
+ );
253
+ });
254
+ });
255
+ },
256
+ },
257
+ };
258
258
  }
@@ -1,25 +1,17 @@
1
1
  import open from "open";
2
+ import { logger } from "./logger";
2
3
 
3
4
  /**
4
5
  * An extremely simple wrapper around the open command.
5
6
  * Specifically, it adds an 'error' event handler so that when this function
6
- * is called in environments where we can't open the browser (e.g. github codespaces,
7
- * stackblitz, remote servers), it doesn't just crash the process.
7
+ * is called in environments where we can't open the browser (e.g. GitHub Codespaces,
8
+ * StackBlitz, remote servers), it doesn't just crash the process.
8
9
  *
9
10
  * @param url the URL to point the browser at
10
- * @param options open a chromium-based browser instead of the default
11
11
  */
12
- export default async function openInBrowser(
13
- url: string,
14
- { forceChromium }: { forceChromium: boolean } = { forceChromium: false }
15
- ): Promise<void> {
16
- const options: open.Options | undefined = forceChromium
17
- ? {
18
- app: [{ name: open.apps.chrome }, { name: open.apps.edge }],
19
- }
20
- : undefined;
21
- const childProcess = await open(url, options);
22
- childProcess.on("error", () => {
23
- console.warn(`Failed to open ${url} in a browser`);
24
- });
12
+ export default async function openInBrowser(url: string): Promise<void> {
13
+ const childProcess = await open(url);
14
+ childProcess.on("error", () => {
15
+ logger.warn("Failed to open");
16
+ });
25
17
  }