@cloudflare/vite-plugin 0.0.0-bdc7958f2 → 0.0.0-bff209d85

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/dist/index.js CHANGED
@@ -3,16 +3,6 @@ import assert7 from "node:assert";
3
3
  import * as fs4 from "node:fs";
4
4
  import * as path6 from "node:path";
5
5
  import { createMiddleware } from "@hattip/adapter-node";
6
- import { Miniflare } from "miniflare";
7
- import "vite";
8
-
9
- // src/cloudflare-environment.ts
10
- import assert from "node:assert";
11
- import { builtinModules } from "node:module";
12
- import * as vite2 from "vite";
13
-
14
- // src/node-js-compat.ts
15
- import { createRequire } from "node:module";
16
6
 
17
7
  // ../../node_modules/.pnpm/@jridgewell+sourcemap-codec@1.5.0/node_modules/@jridgewell/sourcemap-codec/dist/sourcemap-codec.mjs
18
8
  var comma = ",".charCodeAt(0);
@@ -1078,7 +1068,17 @@ var MagicString = class _MagicString {
1078
1068
  }
1079
1069
  };
1080
1070
 
1071
+ // src/index.ts
1072
+ import { Miniflare } from "miniflare";
1073
+ import * as vite6 from "vite";
1074
+
1075
+ // src/cloudflare-environment.ts
1076
+ import assert from "node:assert";
1077
+ import { builtinModules } from "node:module";
1078
+ import * as vite2 from "vite";
1079
+
1081
1080
  // src/node-js-compat.ts
1081
+ import { createRequire } from "node:module";
1082
1082
  import { getNodeCompat } from "miniflare";
1083
1083
  import * as unenv from "unenv";
1084
1084
  var require2 = createRequire(import.meta.url);
@@ -1169,9 +1169,16 @@ function resolveNodeAliases(source, workerConfig) {
1169
1169
  return alias;
1170
1170
  }
1171
1171
 
1172
+ // src/constants.ts
1173
+ var ROUTER_WORKER_NAME = "__router-worker__";
1174
+ var ASSET_WORKER_NAME = "__asset-worker__";
1175
+ var ASSET_WORKERS_COMPATIBILITY_DATE = "2024-10-04";
1176
+ var MODULE_TYPES = ["CompiledWasm"];
1177
+
1172
1178
  // src/shared.ts
1173
1179
  var UNKNOWN_HOST = "http://localhost";
1174
1180
  var INIT_PATH = "/__vite_plugin_cloudflare_init__";
1181
+ var MODULE_PATTERN = `__CLOUDFLARE_MODULE__(${MODULE_TYPES.join("|")})__(.*?)__`;
1175
1182
 
1176
1183
  // src/utils.ts
1177
1184
  import * as path from "node:path";
@@ -1284,6 +1291,7 @@ var cloudflareBuiltInModules = [
1284
1291
  "cloudflare:workers",
1285
1292
  "cloudflare:workflows"
1286
1293
  ];
1294
+ var defaultConditions = ["workerd", "module", "browser"];
1287
1295
  function createCloudflareEnvironmentOptions(workerConfig, userConfig, environmentName) {
1288
1296
  return {
1289
1297
  resolve: {
@@ -1291,7 +1299,7 @@ function createCloudflareEnvironmentOptions(workerConfig, userConfig, environmen
1291
1299
  // dependencies as not external
1292
1300
  noExternal: true,
1293
1301
  // We want to use `workerd` package exports if available (e.g. for postgres).
1294
- conditions: ["workerd", "module", "browser", "development|production"]
1302
+ conditions: [...defaultConditions, "development|production"]
1295
1303
  },
1296
1304
  dev: {
1297
1305
  createEnvironment(name2, config) {
@@ -1302,6 +1310,9 @@ function createCloudflareEnvironmentOptions(workerConfig, userConfig, environmen
1302
1310
  createEnvironment(name2, config) {
1303
1311
  return new vite2.BuildEnvironment(name2, config);
1304
1312
  },
1313
+ target: "es2022",
1314
+ // We need to enable `emitAssets` in order to support additional modules defined by `rules`
1315
+ emitAssets: true,
1305
1316
  outDir: getOutputDirectory(userConfig, environmentName),
1306
1317
  ssr: true,
1307
1318
  rollupOptions: {
@@ -1323,6 +1334,7 @@ function createCloudflareEnvironmentOptions(workerConfig, userConfig, environmen
1323
1334
  ],
1324
1335
  esbuildOptions: {
1325
1336
  platform: "neutral",
1337
+ conditions: [...defaultConditions, "development"],
1326
1338
  resolveExtensions: [
1327
1339
  ".mjs",
1328
1340
  ".js",
@@ -1433,13 +1445,6 @@ function writeDeployConfig(resolvedPluginConfig, resolvedViteConfig) {
1433
1445
 
1434
1446
  // src/dev.ts
1435
1447
  import assert3 from "node:assert";
1436
-
1437
- // src/constants.ts
1438
- var ROUTER_WORKER_NAME = "__router-worker__";
1439
- var ASSET_WORKER_NAME = "__asset-worker__";
1440
- var ASSET_WORKERS_COMPATIBILITY_DATE = "2024-10-04";
1441
-
1442
- // src/dev.ts
1443
1448
  function getDevEntryWorker(resolvedPluginConfig, miniflare) {
1444
1449
  const entryWorkerConfig = resolvedPluginConfig.type === "assets-only" ? resolvedPluginConfig.config : resolvedPluginConfig.workers[resolvedPluginConfig.entryWorkerEnvironmentName];
1445
1450
  assert3(entryWorkerConfig, "Unexpected error: No entry worker configuration");
@@ -1637,10 +1642,13 @@ function getDevMiniflareOptions(resolvedPluginConfig, viteDevServer) {
1637
1642
  ];
1638
1643
  const userWorkers = resolvedPluginConfig.type === "workers" ? Object.entries(resolvedPluginConfig.workers).map(
1639
1644
  ([environmentName, workerConfig]) => {
1640
- const miniflareWorkerOptions = unstable_getMiniflareWorkerOptions({
1641
- ...workerConfig,
1642
- assets: void 0
1643
- });
1645
+ const miniflareWorkerOptions = unstable_getMiniflareWorkerOptions(
1646
+ {
1647
+ ...workerConfig,
1648
+ assets: void 0
1649
+ },
1650
+ resolvedPluginConfig.cloudflareEnv
1651
+ );
1644
1652
  const { ratelimits, ...workerOptions } = miniflareWorkerOptions.workerOptions;
1645
1653
  return {
1646
1654
  ...workerOptions,
@@ -1666,16 +1674,24 @@ function getDevMiniflareOptions(resolvedPluginConfig, viteDevServer) {
1666
1674
  `Invalid invoke event: ${invokePayloadData.name}`
1667
1675
  );
1668
1676
  const [moduleId] = invokePayloadData.data;
1677
+ const moduleRE = new RegExp(MODULE_PATTERN);
1678
+ if (moduleRE.test(moduleId)) {
1679
+ const result2 = {
1680
+ externalize: moduleId,
1681
+ type: "module"
1682
+ };
1683
+ return MiniflareResponse.json({ result: result2 });
1684
+ }
1669
1685
  if (moduleId.startsWith("cloudflare:")) {
1670
1686
  const result2 = {
1671
1687
  externalize: moduleId,
1672
1688
  type: "builtin"
1673
1689
  };
1674
- return new MiniflareResponse(JSON.stringify({ result: result2 }));
1690
+ return MiniflareResponse.json({ result: result2 });
1675
1691
  }
1676
1692
  const devEnvironment = viteDevServer.environments[environmentName];
1677
1693
  const result = await devEnvironment.hot.handleInvoke(payload);
1678
- return new MiniflareResponse(JSON.stringify(result));
1694
+ return MiniflareResponse.json(result);
1679
1695
  }
1680
1696
  }
1681
1697
  };
@@ -1754,10 +1770,37 @@ function getDevMiniflareOptions(resolvedPluginConfig, viteDevServer) {
1754
1770
  fileURLToPath(new URL(RUNNER_PATH, import.meta.url))
1755
1771
  )
1756
1772
  }
1757
- ]
1773
+ ],
1774
+ unsafeUseModuleFallbackService: true
1758
1775
  };
1759
1776
  })
1760
- ]
1777
+ ],
1778
+ unsafeModuleFallbackService(request) {
1779
+ const url = new URL(request.url);
1780
+ const rawSpecifier = url.searchParams.get("rawSpecifier");
1781
+ assert4(
1782
+ rawSpecifier,
1783
+ `Unexpected error: no specifier in request to module fallback service.`
1784
+ );
1785
+ const moduleRE = new RegExp(MODULE_PATTERN);
1786
+ const match = moduleRE.exec(rawSpecifier);
1787
+ assert4(match, `Unexpected error: no match for module ${rawSpecifier}.`);
1788
+ const [full, moduleType, modulePath] = match;
1789
+ assert4(
1790
+ modulePath,
1791
+ `Unexpected error: module path not found in reference ${full}.`
1792
+ );
1793
+ let source;
1794
+ try {
1795
+ source = fs2.readFileSync(modulePath);
1796
+ } catch (error) {
1797
+ throw new Error(`Import ${modulePath} not found. Does the file exist?`);
1798
+ }
1799
+ return MiniflareResponse.json({
1800
+ // Cap'n Proto expects byte arrays for `:Data` typed fields from JSON
1801
+ wasm: Array.from(source)
1802
+ });
1803
+ }
1761
1804
  };
1762
1805
  }
1763
1806
  function getPreviewMiniflareOptions(vitePreviewServer, persistState) {
@@ -2064,20 +2107,21 @@ function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
2064
2107
  const configPaths = /* @__PURE__ */ new Set();
2065
2108
  const persistState = pluginConfig.persistState ?? true;
2066
2109
  const root = userConfig.root ? path5.resolve(userConfig.root) : process.cwd();
2067
- const { CLOUDFLARE_ENV } = vite5.loadEnv(viteEnv.mode, root, "");
2110
+ const { CLOUDFLARE_ENV: cloudflareEnv } = vite5.loadEnv(
2111
+ viteEnv.mode,
2112
+ root,
2113
+ /* prefixes */
2114
+ ""
2115
+ );
2068
2116
  const configPath = pluginConfig.configPath ? path5.resolve(root, pluginConfig.configPath) : findWranglerConfig(root);
2069
2117
  assert6(
2070
2118
  configPath,
2071
2119
  `Config not found. Have you created a wrangler.json(c) or wrangler.toml file?`
2072
2120
  );
2073
- const entryWorkerResolvedConfig = getWorkerConfig(
2074
- configPath,
2075
- CLOUDFLARE_ENV,
2076
- {
2077
- visitedConfigPaths: configPaths,
2078
- isEntryWorker: true
2079
- }
2080
- );
2121
+ const entryWorkerResolvedConfig = getWorkerConfig(configPath, cloudflareEnv, {
2122
+ visitedConfigPaths: configPaths,
2123
+ isEntryWorker: true
2124
+ });
2081
2125
  if (entryWorkerResolvedConfig.type === "assets-only") {
2082
2126
  return {
2083
2127
  type: "assets-only",
@@ -2086,7 +2130,8 @@ function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
2086
2130
  persistState,
2087
2131
  rawConfigs: {
2088
2132
  entryWorker: entryWorkerResolvedConfig
2089
- }
2133
+ },
2134
+ cloudflareEnv
2090
2135
  };
2091
2136
  }
2092
2137
  const entryWorkerConfig = entryWorkerResolvedConfig.config;
@@ -2098,7 +2143,7 @@ function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
2098
2143
  for (const auxiliaryWorker of pluginConfig.auxiliaryWorkers ?? []) {
2099
2144
  const workerResolvedConfig = getWorkerConfig(
2100
2145
  path5.resolve(root, auxiliaryWorker.configPath),
2101
- CLOUDFLARE_ENV,
2146
+ cloudflareEnv,
2102
2147
  {
2103
2148
  visitedConfigPaths: configPaths
2104
2149
  }
@@ -2126,7 +2171,8 @@ function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
2126
2171
  rawConfigs: {
2127
2172
  entryWorker: entryWorkerResolvedConfig,
2128
2173
  auxiliaryWorkers: auxiliaryWorkersResolvedConfigs
2129
- }
2174
+ },
2175
+ cloudflareEnv
2130
2176
  };
2131
2177
  }
2132
2178
 
@@ -2195,211 +2241,326 @@ function cloudflare2(pluginConfig = {}) {
2195
2241
  let resolvedViteConfig;
2196
2242
  let miniflare;
2197
2243
  let workersConfigsWarningShown = false;
2198
- return {
2199
- name: "vite-plugin-cloudflare",
2200
- config(userConfig, env2) {
2201
- if (env2.isPreview) {
2202
- return { appType: "custom" };
2203
- }
2204
- resolvedPluginConfig = resolvePluginConfig(pluginConfig, userConfig, env2);
2205
- if (!workersConfigsWarningShown) {
2206
- workersConfigsWarningShown = true;
2207
- const workersConfigsWarning = getWarningForWorkersConfigs(
2208
- resolvedPluginConfig.rawConfigs
2244
+ return [
2245
+ {
2246
+ name: "vite-plugin-cloudflare",
2247
+ config(userConfig, env2) {
2248
+ if (env2.isPreview) {
2249
+ return { appType: "custom" };
2250
+ }
2251
+ resolvedPluginConfig = resolvePluginConfig(
2252
+ pluginConfig,
2253
+ userConfig,
2254
+ env2
2209
2255
  );
2210
- if (workersConfigsWarning) {
2211
- console.warn(workersConfigsWarning);
2256
+ if (!workersConfigsWarningShown) {
2257
+ workersConfigsWarningShown = true;
2258
+ const workersConfigsWarning = getWarningForWorkersConfigs(
2259
+ resolvedPluginConfig.rawConfigs
2260
+ );
2261
+ if (workersConfigsWarning) {
2262
+ console.warn(workersConfigsWarning);
2263
+ }
2212
2264
  }
2213
- }
2214
- return {
2215
- appType: "custom",
2216
- resolve: {
2217
- alias: getNodeCompatAliases()
2218
- },
2219
- environments: resolvedPluginConfig.type === "workers" ? {
2220
- ...Object.fromEntries(
2221
- Object.entries(resolvedPluginConfig.workers).map(
2222
- ([environmentName, workerConfig]) => {
2223
- return [
2224
- environmentName,
2225
- createCloudflareEnvironmentOptions(
2226
- workerConfig,
2227
- userConfig,
2228
- environmentName
2265
+ return {
2266
+ appType: "custom",
2267
+ resolve: {
2268
+ alias: getNodeCompatAliases()
2269
+ },
2270
+ environments: resolvedPluginConfig.type === "workers" ? {
2271
+ ...Object.fromEntries(
2272
+ Object.entries(resolvedPluginConfig.workers).map(
2273
+ ([environmentName, workerConfig]) => {
2274
+ return [
2275
+ environmentName,
2276
+ createCloudflareEnvironmentOptions(
2277
+ workerConfig,
2278
+ userConfig,
2279
+ environmentName
2280
+ )
2281
+ ];
2282
+ }
2283
+ )
2284
+ ),
2285
+ client: {
2286
+ build: {
2287
+ outDir: getOutputDirectory(userConfig, "client")
2288
+ }
2289
+ }
2290
+ } : void 0,
2291
+ builder: {
2292
+ async buildApp(builder) {
2293
+ const clientEnvironment = builder.environments.client;
2294
+ const defaultHtmlPath = path6.resolve(
2295
+ builder.config.root,
2296
+ "index.html"
2297
+ );
2298
+ if (clientEnvironment && (clientEnvironment.config.build.rollupOptions.input || fs4.existsSync(defaultHtmlPath))) {
2299
+ await builder.build(clientEnvironment);
2300
+ }
2301
+ if (resolvedPluginConfig.type === "workers") {
2302
+ const workerEnvironments = Object.keys(
2303
+ resolvedPluginConfig.workers
2304
+ ).map((environmentName) => {
2305
+ const environment = builder.environments[environmentName];
2306
+ assert7(
2307
+ environment,
2308
+ `${environmentName} environment not found`
2309
+ );
2310
+ return environment;
2311
+ });
2312
+ await Promise.all(
2313
+ workerEnvironments.map(
2314
+ (environment) => builder.build(environment)
2229
2315
  )
2230
- ];
2316
+ );
2231
2317
  }
2232
- )
2233
- ),
2234
- client: {
2235
- build: {
2236
- outDir: getOutputDirectory(userConfig, "client")
2318
+ writeDeployConfig(resolvedPluginConfig, resolvedViteConfig);
2237
2319
  }
2238
2320
  }
2239
- } : void 0,
2240
- builder: {
2241
- async buildApp(builder) {
2242
- const clientEnvironment = builder.environments.client;
2243
- const defaultHtmlPath = path6.resolve(
2244
- builder.config.root,
2245
- "index.html"
2321
+ };
2322
+ },
2323
+ configResolved(config) {
2324
+ resolvedViteConfig = config;
2325
+ },
2326
+ async resolveId(source) {
2327
+ if (resolvedPluginConfig.type === "assets-only") {
2328
+ return;
2329
+ }
2330
+ const workerConfig = resolvedPluginConfig.workers[this.environment.name];
2331
+ if (!workerConfig) {
2332
+ return;
2333
+ }
2334
+ return resolveNodeCompatId(this.environment, workerConfig, source);
2335
+ },
2336
+ async transform(code, id) {
2337
+ if (resolvedPluginConfig.type === "assets-only") {
2338
+ return;
2339
+ }
2340
+ const workerConfig = resolvedPluginConfig.workers[this.environment.name];
2341
+ if (!workerConfig) {
2342
+ return;
2343
+ }
2344
+ const resolvedId = await this.resolve(workerConfig.main);
2345
+ if (id === resolvedId?.id) {
2346
+ return injectGlobalCode(id, code, workerConfig);
2347
+ }
2348
+ },
2349
+ generateBundle(_, bundle) {
2350
+ let config;
2351
+ if (resolvedPluginConfig.type === "workers") {
2352
+ const workerConfig = resolvedPluginConfig.workers[this.environment.name];
2353
+ const entryChunk = Object.entries(bundle).find(
2354
+ ([_2, chunk]) => chunk.type === "chunk" && chunk.isEntry
2355
+ );
2356
+ if (!workerConfig || !entryChunk) {
2357
+ return;
2358
+ }
2359
+ workerConfig.main = entryChunk[0];
2360
+ const isEntryWorker = this.environment.name === resolvedPluginConfig.entryWorkerEnvironmentName;
2361
+ if (isEntryWorker && workerConfig.assets) {
2362
+ const workerOutputDirectory = this.environment.config.build.outDir;
2363
+ const clientOutputDirectory = resolvedViteConfig.environments.client?.build.outDir;
2364
+ assert7(
2365
+ clientOutputDirectory,
2366
+ "Unexpected error: client output directory is undefined"
2246
2367
  );
2247
- if (clientEnvironment && (clientEnvironment.config.build.rollupOptions.input || fs4.existsSync(defaultHtmlPath))) {
2248
- await builder.build(clientEnvironment);
2249
- }
2250
- if (resolvedPluginConfig.type === "workers") {
2251
- const workerEnvironments = Object.keys(
2252
- resolvedPluginConfig.workers
2253
- ).map((environmentName) => {
2254
- const environment = builder.environments[environmentName];
2255
- assert7(environment, `${environmentName} environment not found`);
2256
- return environment;
2368
+ workerConfig.assets.directory = path6.relative(
2369
+ path6.resolve(resolvedViteConfig.root, workerOutputDirectory),
2370
+ path6.resolve(resolvedViteConfig.root, clientOutputDirectory)
2371
+ );
2372
+ }
2373
+ config = workerConfig;
2374
+ if (workerConfig.configPath) {
2375
+ const dotDevDotVarsContent = getDotDevDotVarsContent(
2376
+ workerConfig.configPath,
2377
+ resolvedPluginConfig.cloudflareEnv
2378
+ );
2379
+ if (dotDevDotVarsContent) {
2380
+ this.emitFile({
2381
+ type: "asset",
2382
+ fileName: ".dev.vars",
2383
+ source: dotDevDotVarsContent
2257
2384
  });
2258
- await Promise.all(
2259
- workerEnvironments.map(
2260
- (environment) => builder.build(environment)
2261
- )
2262
- );
2263
2385
  }
2264
- writeDeployConfig(resolvedPluginConfig, resolvedViteConfig);
2265
2386
  }
2387
+ } else if (this.environment.name === "client") {
2388
+ const assetsOnlyConfig = resolvedPluginConfig.config;
2389
+ assetsOnlyConfig.assets.directory = ".";
2390
+ const filesToAssetsIgnore = ["wrangler.json", ".dev.vars"];
2391
+ this.emitFile({
2392
+ type: "asset",
2393
+ fileName: ".assetsignore",
2394
+ source: `${filesToAssetsIgnore.join("\n")}
2395
+ `
2396
+ });
2397
+ config = assetsOnlyConfig;
2266
2398
  }
2267
- };
2268
- },
2269
- configResolved(config) {
2270
- resolvedViteConfig = config;
2271
- },
2272
- async resolveId(source) {
2273
- if (resolvedPluginConfig.type === "assets-only") {
2274
- return;
2275
- }
2276
- const workerConfig = resolvedPluginConfig.workers[this.environment.name];
2277
- if (!workerConfig) {
2278
- return;
2279
- }
2280
- return resolveNodeCompatId(this.environment, workerConfig, source);
2281
- },
2282
- async transform(code, id) {
2283
- if (resolvedPluginConfig.type === "assets-only") {
2284
- return;
2285
- }
2286
- const workerConfig = resolvedPluginConfig.workers[this.environment.name];
2287
- if (!workerConfig) {
2288
- return;
2289
- }
2290
- const resolvedId = await this.resolve(workerConfig.main);
2291
- if (id === resolvedId?.id) {
2292
- return injectGlobalCode(id, code, workerConfig);
2399
+ if (!config) {
2400
+ return;
2401
+ }
2402
+ config.no_bundle = true;
2403
+ config.rules = [{ type: "ESModule", globs: ["**/*.js"] }];
2404
+ if (config.unsafe && Object.keys(config.unsafe).length === 0) {
2405
+ config.unsafe = void 0;
2406
+ }
2407
+ this.emitFile({
2408
+ type: "asset",
2409
+ fileName: "wrangler.json",
2410
+ source: JSON.stringify(config)
2411
+ });
2412
+ },
2413
+ handleHotUpdate(options) {
2414
+ if (resolvedPluginConfig.configPaths.has(options.file)) {
2415
+ options.server.restart();
2416
+ }
2417
+ },
2418
+ async buildEnd() {
2419
+ if (miniflare) {
2420
+ await miniflare.dispose();
2421
+ miniflare = void 0;
2422
+ }
2423
+ },
2424
+ async configureServer(viteDevServer) {
2425
+ assert7(
2426
+ viteDevServer.httpServer,
2427
+ "Unexpected error: No Vite HTTP server"
2428
+ );
2429
+ miniflare = new Miniflare(
2430
+ getDevMiniflareOptions(resolvedPluginConfig, viteDevServer)
2431
+ );
2432
+ await initRunners(resolvedPluginConfig, viteDevServer, miniflare);
2433
+ const entryWorker = await getDevEntryWorker(
2434
+ resolvedPluginConfig,
2435
+ miniflare
2436
+ );
2437
+ const middleware = createMiddleware(({ request }) => {
2438
+ return entryWorker.fetch(toMiniflareRequest(request), {
2439
+ redirect: "manual"
2440
+ });
2441
+ });
2442
+ handleWebSocket(
2443
+ viteDevServer.httpServer,
2444
+ entryWorker.fetch,
2445
+ viteDevServer.config.logger
2446
+ );
2447
+ return () => {
2448
+ viteDevServer.middlewares.use((req, res, next) => {
2449
+ middleware(req, res, next);
2450
+ });
2451
+ };
2452
+ },
2453
+ configurePreviewServer(vitePreviewServer) {
2454
+ const miniflare2 = new Miniflare(
2455
+ getPreviewMiniflareOptions(
2456
+ vitePreviewServer,
2457
+ pluginConfig.persistState ?? true
2458
+ )
2459
+ );
2460
+ const middleware = createMiddleware(({ request }) => {
2461
+ return miniflare2.dispatchFetch(toMiniflareRequest(request), {
2462
+ redirect: "manual"
2463
+ });
2464
+ });
2465
+ handleWebSocket(
2466
+ vitePreviewServer.httpServer,
2467
+ miniflare2.dispatchFetch,
2468
+ vitePreviewServer.config.logger
2469
+ );
2470
+ return () => {
2471
+ vitePreviewServer.middlewares.use((req, res, next) => {
2472
+ middleware(req, res, next);
2473
+ });
2474
+ };
2293
2475
  }
2294
2476
  },
2295
- generateBundle(_, bundle) {
2296
- let config;
2297
- if (resolvedPluginConfig.type === "workers") {
2298
- const workerConfig = resolvedPluginConfig.workers[this.environment.name];
2299
- const entryChunk = Object.entries(bundle).find(
2300
- ([_2, chunk]) => chunk.type === "chunk" && chunk.isEntry
2477
+ // Plugin to support `CompiledWasm` modules
2478
+ {
2479
+ name: "vite-plugin-cloudflare:modules",
2480
+ // We set `enforce: "pre"` so that this plugin runs before the Vite core plugins.
2481
+ // Otherwise the `vite:wasm-fallback` plugin prevents the `.wasm` extension being used for module imports.
2482
+ enforce: "pre",
2483
+ applyToEnvironment(environment) {
2484
+ if (resolvedPluginConfig.type === "assets-only") {
2485
+ return false;
2486
+ }
2487
+ return Object.keys(resolvedPluginConfig.workers).includes(
2488
+ environment.name
2301
2489
  );
2302
- if (!workerConfig || !entryChunk) {
2490
+ },
2491
+ async resolveId(source, importer) {
2492
+ if (!source.endsWith(".wasm")) {
2303
2493
  return;
2304
2494
  }
2305
- workerConfig.main = entryChunk[0];
2306
- const isEntryWorker = this.environment.name === resolvedPluginConfig.entryWorkerEnvironmentName;
2307
- if (isEntryWorker && workerConfig.assets) {
2308
- const workerOutputDirectory = this.environment.config.build.outDir;
2309
- const clientOutputDirectory = resolvedViteConfig.environments.client?.build.outDir;
2495
+ const resolved = await this.resolve(source, importer);
2496
+ assert7(
2497
+ resolved,
2498
+ `Unexpected error: could not resolve Wasm module ${source}`
2499
+ );
2500
+ return {
2501
+ external: true,
2502
+ id: createModuleReference("CompiledWasm", resolved.id)
2503
+ };
2504
+ },
2505
+ renderChunk(code, chunk) {
2506
+ const moduleRE = new RegExp(MODULE_PATTERN, "g");
2507
+ let match;
2508
+ let magicString;
2509
+ while (match = moduleRE.exec(code)) {
2510
+ magicString ??= new MagicString(code);
2511
+ const [full, moduleType, modulePath] = match;
2310
2512
  assert7(
2311
- clientOutputDirectory,
2312
- "Unexpected error: client output directory is undefined"
2513
+ modulePath,
2514
+ `Unexpected error: module path not found in reference ${full}.`
2515
+ );
2516
+ let source;
2517
+ try {
2518
+ source = fs4.readFileSync(modulePath);
2519
+ } catch (error) {
2520
+ throw new Error(
2521
+ `Import ${modulePath} not found. Does the file exist?`
2522
+ );
2523
+ }
2524
+ const referenceId = this.emitFile({
2525
+ type: "asset",
2526
+ name: path6.basename(modulePath),
2527
+ originalFileName: modulePath,
2528
+ source
2529
+ });
2530
+ const emittedFileName = this.getFileName(referenceId);
2531
+ const relativePath = vite6.normalizePath(
2532
+ path6.relative(path6.dirname(chunk.fileName), emittedFileName)
2313
2533
  );
2314
- workerConfig.assets.directory = path6.relative(
2315
- path6.resolve(resolvedViteConfig.root, workerOutputDirectory),
2316
- path6.resolve(resolvedViteConfig.root, clientOutputDirectory)
2534
+ const importPath = relativePath.startsWith(".") ? relativePath : `./${relativePath}`;
2535
+ magicString.update(
2536
+ match.index,
2537
+ match.index + full.length,
2538
+ importPath
2317
2539
  );
2318
2540
  }
2319
- config = workerConfig;
2320
- } else if (this.environment.name === "client") {
2321
- const assetsOnlyConfig = resolvedPluginConfig.config;
2322
- assetsOnlyConfig.assets.directory = ".";
2323
- this.emitFile({
2324
- type: "asset",
2325
- fileName: ".assetsignore",
2326
- source: "wrangler.json"
2327
- });
2328
- config = assetsOnlyConfig;
2329
- }
2330
- if (!config) {
2331
- return;
2332
- }
2333
- config.no_bundle = true;
2334
- config.rules = [{ type: "ESModule", globs: ["**/*.js"] }];
2335
- config.unsafe = void 0;
2336
- this.emitFile({
2337
- type: "asset",
2338
- fileName: "wrangler.json",
2339
- source: JSON.stringify(config)
2340
- });
2341
- },
2342
- handleHotUpdate(options) {
2343
- if (resolvedPluginConfig.configPaths.has(options.file)) {
2344
- options.server.restart();
2345
- }
2346
- },
2347
- async buildEnd() {
2348
- if (miniflare) {
2349
- await miniflare.dispose();
2350
- miniflare = void 0;
2541
+ if (magicString) {
2542
+ return {
2543
+ code: magicString.toString(),
2544
+ map: this.environment.config.build.sourcemap ? magicString.generateMap({ hires: "boundary" }) : null
2545
+ };
2546
+ }
2351
2547
  }
2352
- },
2353
- async configureServer(viteDevServer) {
2354
- assert7(viteDevServer.httpServer, "Unexpected error: No Vite HTTP server");
2355
- miniflare = new Miniflare(
2356
- getDevMiniflareOptions(resolvedPluginConfig, viteDevServer)
2357
- );
2358
- await initRunners(resolvedPluginConfig, viteDevServer, miniflare);
2359
- const entryWorker = await getDevEntryWorker(
2360
- resolvedPluginConfig,
2361
- miniflare
2362
- );
2363
- const middleware = createMiddleware(({ request }) => {
2364
- return entryWorker.fetch(toMiniflareRequest(request), {
2365
- redirect: "manual"
2366
- });
2367
- });
2368
- handleWebSocket(
2369
- viteDevServer.httpServer,
2370
- entryWorker.fetch,
2371
- viteDevServer.config.logger
2372
- );
2373
- return () => {
2374
- viteDevServer.middlewares.use((req, res, next) => {
2375
- middleware(req, res, next);
2376
- });
2377
- };
2378
- },
2379
- configurePreviewServer(vitePreviewServer) {
2380
- const miniflare2 = new Miniflare(
2381
- getPreviewMiniflareOptions(
2382
- vitePreviewServer,
2383
- pluginConfig.persistState ?? true
2384
- )
2385
- );
2386
- const middleware = createMiddleware(({ request }) => {
2387
- return miniflare2.dispatchFetch(toMiniflareRequest(request), {
2388
- redirect: "manual"
2389
- });
2390
- });
2391
- handleWebSocket(
2392
- vitePreviewServer.httpServer,
2393
- miniflare2.dispatchFetch,
2394
- vitePreviewServer.config.logger
2395
- );
2396
- return () => {
2397
- vitePreviewServer.middlewares.use((req, res, next) => {
2398
- middleware(req, res, next);
2399
- });
2400
- };
2401
2548
  }
2402
- };
2549
+ ];
2550
+ }
2551
+ function getDotDevDotVarsContent(configPath, cloudflareEnv) {
2552
+ const configDir = path6.dirname(configPath);
2553
+ const defaultDotDevDotVarsPath = `${configDir}/.dev.vars`;
2554
+ const inputDotDevDotVarsPath = `${defaultDotDevDotVarsPath}${cloudflareEnv ? `.${cloudflareEnv}` : ""}`;
2555
+ const targetPath = fs4.existsSync(inputDotDevDotVarsPath) ? inputDotDevDotVarsPath : fs4.existsSync(defaultDotDevDotVarsPath) ? defaultDotDevDotVarsPath : null;
2556
+ if (targetPath) {
2557
+ const dotDevDotVarsContent = fs4.readFileSync(targetPath);
2558
+ return dotDevDotVarsContent;
2559
+ }
2560
+ return null;
2561
+ }
2562
+ function createModuleReference(type, id) {
2563
+ return `__CLOUDFLARE_MODULE__${type}__${id}__`;
2403
2564
  }
2404
2565
  export {
2405
2566
  cloudflare2 as cloudflare