@react-router/dev 0.0.0-experimental-49eef6a01 → 0.0.0-experimental-9c1812606

package/dist/cli/commands.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-49eef6a01
+ * @react-router/dev v0.0.0-experimental-9c1812606
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/cli/detectPackageManager.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-49eef6a01
+ * @react-router/dev v0.0.0-experimental-9c1812606
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/cli/index.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-49eef6a01
+ * @react-router/dev v0.0.0-experimental-9c1812606
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/cli/run.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-49eef6a01
+ * @react-router/dev v0.0.0-experimental-9c1812606
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/cli/useJavascript.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-49eef6a01
+ * @react-router/dev v0.0.0-experimental-9c1812606
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/cli.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-49eef6a01
+ * @react-router/dev v0.0.0-experimental-9c1812606
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/colors.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-49eef6a01
+ * @react-router/dev v0.0.0-experimental-9c1812606
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/config/findConfig.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-49eef6a01
+ * @react-router/dev v0.0.0-experimental-9c1812606
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/config/flatRoutes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-49eef6a01
+ * @react-router/dev v0.0.0-experimental-9c1812606
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -298,7 +298,7 @@ function getRouteSegments(routeId) {
             rawRouteSegment += char;
             break;
           }
-          if (!routeSegment && char == paramPrefixChar) {
+          if (!routeSegment && char === paramPrefixChar) {
             if (index === routeId.length) {
               routeSegment += "*";
               rawRouteSegment += char;

package/dist/config/format.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-49eef6a01
+ * @react-router/dev v0.0.0-experimental-9c1812606
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/config/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-49eef6a01
+ * @react-router/dev v0.0.0-experimental-9c1812606
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/config.d.ts

@@ -36,9 +36,6 @@ export type ServerBundlesBuildManifest = BaseBuildManifest & {
 };
 type ServerModuleFormat = "esm" | "cjs";
 interface FutureConfig {
-    v3_fetcherPersist: boolean;
-    v3_relativeSplatPath: boolean;
-    v3_throwAbortReason: boolean;
 }
 export type BuildManifest = DefaultBuildManifest | ServerBundlesBuildManifest;
 type BuildEndHook = (args: {

package/dist/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-49eef6a01
+ * @react-router/dev v0.0.0-experimental-9c1812606
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -122,7 +122,6 @@ async function resolveReactRouterConfig({
     basename,
     buildDirectory: userBuildDirectory,
     buildEnd,
-    future: userFuture,
     ignoredRouteFiles,
     routes: userRoutesFunction,
     prerender: prerenderConfig,
@@ -185,11 +184,7 @@ async function resolveReactRouterConfig({
       };
     }
   }
-  let future = {
-    v3_fetcherPersist: (userFuture === null || userFuture === void 0 ? void 0 : userFuture.v3_fetcherPersist) === true,
-    v3_relativeSplatPath: (userFuture === null || userFuture === void 0 ? void 0 : userFuture.v3_relativeSplatPath) === true,
-    v3_throwAbortReason: (userFuture === null || userFuture === void 0 ? void 0 : userFuture.v3_throwAbortReason) === true
-  };
+  let future = {};
   let reactRouterConfig = deepFreeze({
     appDirectory,
     basename,

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 export * as cli from "./cli/index";
 export type { Manifest as AssetsManifest } from "./manifest";
 export type { BuildManifest, Preset, ServerBundlesFunction, VitePluginConfig, } from "./config";
-export { vitePlugin, cloudflareDevProxyVitePlugin } from "./vite";
+export { reactRouterVitePlugin as vitePlugin } from "./vite/plugin";
+export { cloudflareDevProxyVitePlugin } from "./vite/cloudflare-dev-proxy";

package/dist/index.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-49eef6a01
+ * @react-router/dev v0.0.0-experimental-9c1812606
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -13,11 +13,11 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var index = require('./cli/index.js');
-var index$1 = require('./vite/index.js');
+var plugin = require('./vite/plugin.js');
 var cloudflareDevProxy = require('./vite/cloudflare-dev-proxy.js');
 
 
 
 exports.cli = index;
-exports.vitePlugin = index$1.vitePlugin;
+exports.vitePlugin = plugin.reactRouterVitePlugin;
 exports.cloudflareDevProxyVitePlugin = cloudflareDevProxy.cloudflareDevProxyVitePlugin;

package/dist/invariant.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-49eef6a01
+ * @react-router/dev v0.0.0-experimental-9c1812606
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/babel.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-49eef6a01
+ * @react-router/dev v0.0.0-experimental-9c1812606
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/build.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-49eef6a01
+ * @react-router/dev v0.0.0-experimental-9c1812606
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare-dev-proxy.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-49eef6a01
+ * @react-router/dev v0.0.0-experimental-9c1812606
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -13,10 +13,16 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var reactRouter = require('react-router');
-var wrangler = require('wrangler');
 var nodeAdapter = require('./node-adapter.js');
 
 let serverBuildId = "virtual:react-router/server-build";
+function importWrangler() {
+  try {
+    return import('wrangler');
+  } catch (_) {
+    throw Error("Could not import `wrangler`. Do you have it installed?");
+  }
+}
 const PLUGIN_NAME = "react-router-cloudflare-vite-dev-proxy";
 const cloudflareDevProxyVitePlugin = ({
   getLoadContext,
@@ -39,11 +45,14 @@ const cloudflareDevProxyVitePlugin = ({
       }
     },
     configureServer: async viteDevServer => {
+      let {
+        getPlatformProxy
+      } = await importWrangler();
       // Do not include `dispose` in Cloudflare context
       let {
         dispose,
         ...cloudflare
-      } = await wrangler.getPlatformProxy(options);
+      } = await getPlatformProxy(options);
       let context = {
         cloudflare
       };

package/dist/vite/combine-urls-test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/vite/combine-urls.d.ts

@@ -0,0 +1 @@
+export declare function combineURLs(baseURL: string, relativeURL: string): string;

package/dist/vite/combine-urls.js

@@ -0,0 +1,20 @@
+/**
+ * @react-router/dev v0.0.0-experimental-9c1812606
+ *
+ * Copyright (c) Remix Software Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE.md file in the root directory of this source tree.
+ *
+ * @license MIT
+ */
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+// Borrowed from axios: https://github.com/axios/axios/blob/0e4f9fa29077ebee4499facea6be1492b42e8a26/lib/helpers/combineURLs.js#L11-L15
+function combineURLs(baseURL, relativeURL) {
+  return relativeURL ? baseURL.replace(/\/+$/, "") + "/" + relativeURL.replace(/^\/+/, "") : baseURL;
+}
+
+exports.combineURLs = combineURLs;

package/dist/vite/define-route.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-49eef6a01
+ * @react-router/dev v0.0.0-experimental-9c1812606
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/dev.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-49eef6a01
+ * @react-router/dev v0.0.0-experimental-9c1812606
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/import-vite-esm-sync.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-49eef6a01
+ * @react-router/dev v0.0.0-experimental-9c1812606
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/node-adapter.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-49eef6a01
+ * @react-router/dev v0.0.0-experimental-9c1812606
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/plugin.d.ts

@@ -67,6 +67,6 @@ export type ReactRouterPluginContext = ReactRouterPluginSsrBuildContext & {
 export declare let getServerBuildDirectory: (ctx: ReactRouterPluginContext) => string;
 type MaybePromise<T> = T | Promise<T>;
 export declare let setReactRouterDevLoadContext: (loadContext: (request: Request) => MaybePromise<Record<string, unknown>>) => void;
-export type ReactRouterVitePlugin = (config?: VitePluginConfig) => Vite.Plugin[];
+type ReactRouterVitePlugin = (config?: VitePluginConfig) => Vite.Plugin[];
 export declare const reactRouterVitePlugin: ReactRouterVitePlugin;
 export {};

package/dist/vite/plugin.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-49eef6a01
+ * @react-router/dev v0.0.0-experimental-9c1812606
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -27,6 +27,7 @@ var nodeAdapter = require('./node-adapter.js');
 var styles = require('./styles.js');
 var vmod = require('./vmod.js');
 var resolveFileUrl = require('./resolve-file-url.js');
+var combineUrls = require('./combine-urls.js');
 var removeExports = require('./remove-exports.js');
 var importViteEsmSync = require('./import-vite-esm-sync.js');
 var config = require('../config.js');
@@ -448,7 +449,7 @@ const reactRouterVitePlugin = _config => {
         path: route.path,
         index: route.index,
         caseSensitive: route.caseSensitive,
-        module: path__namespace.posix.join(ctx.publicPath, `${resolveFileUrl.resolveFileUrl(ctx, resolveRelativeRouteFilePath(route, ctx.reactRouterConfig))}${ROUTE_ENTRY_QUERY_STRING}`),
+        module: combineUrls.combineURLs(ctx.publicPath, `${resolveFileUrl.resolveFileUrl(ctx, resolveRelativeRouteFilePath(route, ctx.reactRouterConfig))}${ROUTE_ENTRY_QUERY_STRING}`),
         hasAction: sourceExports.includes("action"),
         hasLoader: sourceExports.includes("loader"),
         hasClientAction: sourceExports.includes("clientAction"),
@@ -459,12 +460,12 @@ const reactRouterVitePlugin = _config => {
     }
     return {
       version: String(Math.random()),
-      url: path__namespace.posix.join(ctx.publicPath, vmod.url(browserManifestId)),
+      url: combineUrls.combineURLs(ctx.publicPath, vmod.url(browserManifestId)),
       hmr: {
-        runtime: path__namespace.posix.join(ctx.publicPath, vmod.url(injectHmrRuntimeId))
+        runtime: combineUrls.combineURLs(ctx.publicPath, vmod.url(injectHmrRuntimeId))
       },
       entry: {
-        module: path__namespace.posix.join(ctx.publicPath, resolveFileUrl.resolveFileUrl(ctx, ctx.entryClientFilePath)),
+        module: combineUrls.combineURLs(ctx.publicPath, resolveFileUrl.resolveFileUrl(ctx, ctx.entryClientFilePath)),
         imports: []
       },
       routes
@@ -1088,8 +1089,8 @@ async function getRouteMetadata(ctx, viteChildCompiler, route, readRouteFile) {
     path: route.path,
     index: route.index,
     caseSensitive: route.caseSensitive,
-    url: path__namespace.posix.join(ctx.publicPath, "/" + path__namespace.relative(ctx.rootDirectory, resolveRelativeRouteFilePath(route, ctx.reactRouterConfig))),
-    module: path__namespace.posix.join(ctx.publicPath, `${resolveFileUrl.resolveFileUrl(ctx, resolveRelativeRouteFilePath(route, ctx.reactRouterConfig))}?import`),
+    url: combineUrls.combineURLs(ctx.publicPath, "/" + path__namespace.relative(ctx.rootDirectory, resolveRelativeRouteFilePath(route, ctx.reactRouterConfig))),
+    module: combineUrls.combineURLs(ctx.publicPath, `${resolveFileUrl.resolveFileUrl(ctx, resolveRelativeRouteFilePath(route, ctx.reactRouterConfig))}?import`),
     // Ensure the Vite dev server responds with a JS module
     hasAction: sourceExports.includes("action"),
     hasClientAction: sourceExports.includes("clientAction"),
@@ -1146,20 +1147,19 @@ async function handlePrerender(viteConfig, reactRouterConfig, serverBuildDirecto
     }
     await prerenderRoute(handler, path, clientBuildDirectory, reactRouterConfig, viteConfig, requestInit);
   }
-  await prerenderManifest(build, clientBuildDirectory, reactRouterConfig, viteConfig);
-}
-async function prerenderData(handler, prerenderPath, clientBuildDirectory, reactRouterConfig, viteConfig, requestInit) {
-  let normalizedPath = `${reactRouterConfig.basename}${prerenderPath === "/" ? "/_root.data" : `${prerenderPath.replace(/\/$/, "")}.data`}`.replace(/\/\/+/g, "/");
-  let request = new Request(`http://localhost${normalizedPath}`, requestInit);
-  let response = await handler(request);
-  let data = await response.text();
-  validatePrerenderedResponse(response, data, "Prerender", normalizedPath);
-  // Write out the .data file
-  let outdir = path__namespace.relative(process.cwd(), clientBuildDirectory);
-  let outfile = path__namespace.join(outdir, ...normalizedPath.split("/"));
-  await fse__namespace.ensureDir(path__namespace.dirname(outfile));
-  await fse__namespace.outputFile(outfile, data);
-  viteConfig.logger.info(`Prerender: Generated ${colors__default["default"].bold(outfile)}`);
+  async function prerenderData(handler, prerenderPath, clientBuildDirectory, reactRouterConfig, viteConfig, requestInit) {
+    let normalizedPath = `${reactRouterConfig.basename}${prerenderPath === "/" ? "/_root.data" : `${prerenderPath.replace(/\/$/, "")}.data`}`.replace(/\/\/+/g, "/");
+    let request = new Request(`http://localhost${normalizedPath}`, requestInit);
+    let response = await handler(request);
+    let data = await response.text();
+    validatePrerenderedResponse(response, data, "Prerender", normalizedPath);
+    // Write out the .data file
+    let outdir = path__namespace.relative(process.cwd(), clientBuildDirectory);
+    let outfile = path__namespace.join(outdir, normalizedPath.split("/").join(path__namespace.sep));
+    await fse__namespace.ensureDir(path__namespace.dirname(outfile));
+    await fse__namespace.outputFile(outfile, data);
+    viteConfig.logger.info(`Prerender: Generated ${colors__default["default"].bold(outfile)}`);
+  }
 }
 async function prerenderRoute(handler, prerenderPath, clientBuildDirectory, reactRouterConfig, viteConfig, requestInit) {
   let normalizedPath = `${reactRouterConfig.basename}${prerenderPath}/`.replace(/\/\/+/g, "/");
@@ -1177,18 +1177,6 @@ async function prerenderRoute(handler, prerenderPath, clientBuildDirectory, reac
   await fse__namespace.outputFile(outfile, html);
   viteConfig.logger.info(`Prerender: Generated ${colors__default["default"].bold(outfile)}`);
 }
-async function prerenderManifest(build, clientBuildDirectory, reactRouterConfig, viteConfig) {
-  let normalizedPath = `${reactRouterConfig.basename}/__manifest`.replace(/\/\/+/g, "/");
-  let outdir = path__namespace.relative(process.cwd(), clientBuildDirectory);
-  let outfile = path__namespace.join(outdir, ...normalizedPath.split("/"));
-  await fse__namespace.ensureDir(path__namespace.dirname(outfile));
-  let manifestData = JSON.stringify({
-    notFoundPaths: [],
-    patches: build.assets.routes
-  });
-  await fse__namespace.outputFile(outfile, manifestData);
-  viteConfig.logger.info(`Prerender: Generated ${colors__default["default"].bold(outfile)}`);
-}
 function validatePrerenderedResponse(response, html, prefix, path) {
   if (response.status !== 200) {
     throw new Error(`${prefix}: Received a ${response.status} status code from ` + `\`entry.server.tsx\` while prerendering the \`${path}\` ` + `path.\n${html}`);

package/dist/vite/profiler.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-49eef6a01
+ * @react-router/dev v0.0.0-experimental-9c1812606
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/remove-exports.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-49eef6a01
+ * @react-router/dev v0.0.0-experimental-9c1812606
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/resolve-file-url.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-49eef6a01
+ * @react-router/dev v0.0.0-experimental-9c1812606
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/styles.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-49eef6a01
+ * @react-router/dev v0.0.0-experimental-9c1812606
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/vmod.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-49eef6a01
+ * @react-router/dev v0.0.0-experimental-9c1812606
  *
  * Copyright (c) Remix Software Inc.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "0.0.0-experimental-49eef6a01",
+  "version": "0.0.0-experimental-9c1812606",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -50,7 +50,7 @@
     "react-refresh": "^0.14.0",
     "semver": "^7.3.7",
     "set-cookie-parser": "^2.6.0",
-    "@react-router/node": "0.0.0-experimental-49eef6a01"
+    "@react-router/node": "0.0.0-experimental-9c1812606"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -75,15 +75,15 @@
     "tiny-invariant": "^1.2.0",
     "vite": "^5.1.0",
     "wrangler": "^3.28.2",
-    "@react-router/serve": "0.0.0-experimental-49eef6a01",
-    "react-router": "^0.0.0-experimental-49eef6a01"
+    "react-router": "^0.0.0-experimental-9c1812606",
+    "@react-router/serve": "0.0.0-experimental-9c1812606"
   },
   "peerDependencies": {
     "typescript": "^5.1.0",
     "vite": "^5.1.0",
     "wrangler": "^3.28.2",
-    "@react-router/serve": "^0.0.0-experimental-49eef6a01",
-    "react-router": "^0.0.0-experimental-49eef6a01"
+    "react-router": "^0.0.0-experimental-9c1812606",
+    "@react-router/serve": "^0.0.0-experimental-9c1812606"
   },
   "peerDependenciesMeta": {
     "@react-router/serve": {

package/dist/vite/index.d.ts

@@ -1,3 +0,0 @@
-import type { ReactRouterVitePlugin } from "./plugin";
-export declare const vitePlugin: ReactRouterVitePlugin;
-export { cloudflareDevProxyVitePlugin } from "./cloudflare-dev-proxy";

package/dist/vite/index.js

@@ -1,31 +0,0 @@
-/**
- * @react-router/dev v0.0.0-experimental-49eef6a01
- *
- * Copyright (c) Remix Software Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE.md file in the root directory of this source tree.
- *
- * @license MIT
- */
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-require('react-router');
-require('wrangler');
-require('node:events');
-require('node:stream');
-require('set-cookie-parser');
-require('@react-router/node');
-
-const vitePlugin = (...args) => {
-  let {
-    reactRouterVitePlugin
-  } =
-  // eslint-disable-next-line @typescript-eslint/consistent-type-imports
-  require("./plugin");
-  return reactRouterVitePlugin(...args);
-};
-
-exports.vitePlugin = vitePlugin;