@cedarjs/vite 3.1.1 → 3.1.2-next.126

package/dist/cjs/plugins/vite-plugin-cedarjs-resolve-cedar-style-imports.js

@@ -0,0 +1,106 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var vite_plugin_cedarjs_resolve_cedar_style_imports_exports = {};
+__export(vite_plugin_cedarjs_resolve_cedar_style_imports_exports, {
+  cedarjsResolveCedarStyleImportsPlugin: () => cedarjsResolveCedarStyleImportsPlugin
+});
+module.exports = __toCommonJS(vite_plugin_cedarjs_resolve_cedar_style_imports_exports);
+var import_node_fs = __toESM(require("node:fs"), 1);
+var import_node_path = __toESM(require("node:path"), 1);
+var import_vite = require("vite");
+var import_project_config = require("@cedarjs/project-config");
+function resolveFromAbsolutePath(absolutePath) {
+  const ext = import_node_path.default.extname(absolutePath);
+  const pathToResolve = ext ? absolutePath.slice(0, -ext.length) : absolutePath;
+  const direct = (0, import_project_config.resolveFile)(pathToResolve);
+  if (direct) {
+    return direct;
+  }
+  const indexFile = (0, import_project_config.resolveFile)(import_node_path.default.join(pathToResolve, "index"));
+  if (indexFile) {
+    return indexFile;
+  }
+  const dirNamedFile = (0, import_project_config.resolveFile)(
+    import_node_path.default.join(pathToResolve, import_node_path.default.basename(pathToResolve))
+  );
+  if (dirNamedFile) {
+    return dirNamedFile;
+  }
+  return null;
+}
+function cedarjsResolveCedarStyleImportsPlugin() {
+  let cedarPaths;
+  try {
+    cedarPaths = (0, import_project_config.getPaths)();
+  } catch {
+  }
+  return {
+    name: "cedarjs-resolve-cedar-style-imports",
+    resolveId(id, importer) {
+      if (!importer || (0, import_vite.normalizePath)(importer).includes("/node_modules/")) {
+        return null;
+      }
+      if (cedarPaths && id.startsWith("src/")) {
+        const normalizedImporter = (0, import_vite.normalizePath)(importer);
+        const normalizedWebSrc = (0, import_vite.normalizePath)(cedarPaths.web.src);
+        const normalizedApiSrc = (0, import_vite.normalizePath)(cedarPaths.api.src);
+        let srcDir;
+        if (normalizedImporter.startsWith(normalizedWebSrc)) {
+          srcDir = cedarPaths.web.src;
+        } else if (normalizedImporter.startsWith(normalizedApiSrc)) {
+          srcDir = cedarPaths.api.src;
+        }
+        if (srcDir) {
+          const resolved = resolveFromAbsolutePath(
+            import_node_path.default.join(srcDir, id.slice("src/".length))
+          );
+          if (resolved) {
+            return (0, import_vite.normalizePath)(resolved);
+          }
+        }
+      }
+      const resolvedPath = import_node_path.default.resolve(import_node_path.default.dirname(importer), id);
+      if (import_node_fs.default.existsSync(resolvedPath)) {
+        const stats = import_node_fs.default.statSync(resolvedPath);
+        if (stats.isFile()) {
+          return null;
+        }
+      }
+      const newPath = resolveFromAbsolutePath(resolvedPath);
+      if (!newPath) {
+        return null;
+      }
+      return (0, import_vite.normalizePath)(newPath);
+    }
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  cedarjsResolveCedarStyleImportsPlugin
+});

package/dist/cjs/plugins/vite-plugin-rsc-routes-auto-loader.js

@@ -31,7 +31,7 @@ __export(vite_plugin_rsc_routes_auto_loader_exports, {
   rscRoutesAutoLoader: () => rscRoutesAutoLoader
 });
 module.exports = __toCommonJS(vite_plugin_rsc_routes_auto_loader_exports);
-var import_path = __toESM(require("path"), 1);
+var import_node_path = __toESM(require("node:path"), 1);
 var import_generator = __toESM(require("@babel/generator"), 1);
 var import_parser = require("@babel/parser");
 var import_traverse = __toESM(require("@babel/traverse"), 1);
@@ -41,10 +41,10 @@ var import_project_config = require("@cedarjs/project-config");
 const generate = import_generator.default.default;
 const traverse = import_traverse.default.default;
 const getPathRelativeToSrc = (maybeAbsolutePath) => {
-  if (!import_path.default.isAbsolute(maybeAbsolutePath)) {
+  if (!import_node_path.default.isAbsolute(maybeAbsolutePath)) {
     return maybeAbsolutePath;
   }
-  return `./${import_path.default.relative((0, import_project_config.getPaths)().web.src, maybeAbsolutePath)}`;
+  return `./${import_node_path.default.relative((0, import_project_config.getPaths)().web.src, maybeAbsolutePath)}`;
 };
 const withRelativeImports = (page) => {
   return {
@@ -77,7 +77,7 @@ function rscRoutesAutoLoader() {
       if (pages.length === 0) {
         return null;
       }
-      const ext = import_path.default.extname(id);
+      const ext = import_node_path.default.extname(id);
       const plugins = [];
       if (ext === ".jsx") {
         plugins.push("jsx");
@@ -98,9 +98,9 @@ function rscRoutesAutoLoader() {
           const userImportRelativePath = getPathRelativeToSrc(
             (0, import_project_config.importStatementPath)(importPath)
           );
-          const defaultSpecifier = path2.node.specifiers.filter(
+          const defaultSpecifier = path2.node.specifiers.find(
             (specifier) => t.isImportDefaultSpecifier(specifier)
-          )[0];
+          );
           if (userImportRelativePath && defaultSpecifier) {
             importedNames.add(defaultSpecifier.local.name);
           }

package/dist/cjs/plugins/vite-plugin-rsc-routes-imports.js

@@ -31,7 +31,7 @@ __export(vite_plugin_rsc_routes_imports_exports, {
   rscRoutesImports: () => rscRoutesImports
 });
 module.exports = __toCommonJS(vite_plugin_rsc_routes_imports_exports);
-var import_path = __toESM(require("path"), 1);
+var import_node_path = __toESM(require("node:path"), 1);
 var import_generator = __toESM(require("@babel/generator"), 1);
 var import_parser = require("@babel/parser");
 var import_traverse = __toESM(require("@babel/traverse"), 1);
@@ -41,10 +41,10 @@ var import_project_config = require("@cedarjs/project-config");
 const { default: generate } = import_generator.default;
 const { default: traverse } = import_traverse.default;
 const getPathRelativeToSrc = (maybeAbsolutePath) => {
-  if (!import_path.default.isAbsolute(maybeAbsolutePath)) {
+  if (!import_node_path.default.isAbsolute(maybeAbsolutePath)) {
     return maybeAbsolutePath;
   }
-  return `./${import_path.default.relative((0, import_project_config.getPaths)().web.src, maybeAbsolutePath)}`;
+  return `./${import_node_path.default.relative((0, import_project_config.getPaths)().web.src, maybeAbsolutePath)}`;
 };
 const withRelativeImports = (page) => {
   return {
@@ -77,7 +77,7 @@ function rscRoutesImports() {
       if (pages.length === 0) {
         return null;
       }
-      const ext = import_path.default.extname(id);
+      const ext = import_node_path.default.extname(id);
       const plugins = [];
       if (ext === ".jsx") {
         plugins.push("jsx");
@@ -96,9 +96,9 @@ function rscRoutesImports() {
           const userImportRelativePath = getPathRelativeToSrc(
             (0, import_project_config.importStatementPath)(path2.node.source?.value)
           );
-          const defaultSpecifier = path2.node.specifiers.filter(
+          const defaultSpecifier = path2.node.specifiers.find(
             (specifier) => t.isImportDefaultSpecifier(specifier)
-          )[0];
+          );
           if (userImportRelativePath && defaultSpecifier) {
             importedNames.add(defaultSpecifier.local.name);
           }

package/dist/cjs/plugins/vite-plugin-rsc-transform-client.js

@@ -159,6 +159,7 @@ async function parseExportNamesIntoNames(code, body, names) {
           }
         }
         continue;
+      // For CJS support
       case "ExpressionStatement": {
         let assignmentExpression = null;
         if (node.expression.type === "AssignmentExpression") {

package/dist/cjs/plugins/vite-plugin-rsc-transform-server.js

@@ -115,6 +115,7 @@ function transformServerModule(mod, url, code) {
   const localTypes = /* @__PURE__ */ new Map();
   for (const node of mod.body) {
     switch (node.type) {
+      // TODO (RSC): Add code comments with examples of each type of node
       case "ExportDeclaration":
         if (node.declaration.type === "FunctionDeclaration") {
           const name = node.declaration.identifier.value;

package/dist/cjs/rsc/rscBuildAnalyze.js

@@ -74,7 +74,13 @@ async function rscBuildAnalyze() {
         "react"
       ],
       resolve: {
-        externalConditions: ["react-server"]
+        // In Vite 6, we must include `defaultServerConditions` alongside
+        // `react-server` so that nested condition maps (e.g. the `node`
+        // sub-condition inside `react-server-dom-webpack/server`'s exports)
+        // can still be resolved. Without `node` (or another environment
+        // condition), the resolver throws "No known conditions for
+        // './server' specifier in 'react-server-dom-webpack' package".
+        externalConditions: ["react-server", ...import_vite.defaultServerConditions]
       }
     },
     build: {

package/dist/cjs/rsc/rscBuildForServer.js

@@ -81,8 +81,15 @@ async function rscBuildForServer(clientEntryFiles, serverEntryFiles, customModul
         // dependencies apart from node built-ins.
         // TODO (RSC): What's the difference between `conditions` and
         // `externalConditions`? When is one used over the other?
-        conditions: ["react-server"],
-        externalConditions: ["react-server"]
+        //
+        // In Vite 6, we must include `defaultServerConditions` alongside
+        // `react-server` so that nested condition maps (e.g. the `node`
+        // sub-condition inside `react-server-dom-webpack/server`'s exports)
+        // can still be resolved. Without `node` (or another environment
+        // condition), the commonjs resolver throws "No known conditions for
+        // './server' specifier in 'react-server-dom-webpack' package".
+        conditions: ["react-server", ...import_vite.defaultServerConditions],
+        externalConditions: ["react-server", ...import_vite.defaultServerConditions]
       }
     },
     plugins: [

package/dist/index.d.ts

@@ -6,7 +6,7 @@ export { cedarHtmlEnvPlugin } from './plugins/vite-plugin-cedar-html-env.js';
 export { cedarImportDirPlugin } from './plugins/vite-plugin-cedar-import-dir.js';
 export { cedarNodePolyfills } from './plugins/vite-plugin-cedar-node-polyfills.js';
 export { cedarRemoveFromBundle } from './plugins/vite-plugin-cedar-remove-from-bundle.js';
-export { cedarjsDirectoryNamedImportPlugin } from './plugins/vite-plugin-cedarjs-directory-named-import.js';
+export { cedarjsResolveCedarStyleImportsPlugin } from './plugins/vite-plugin-cedarjs-resolve-cedar-style-imports.js';
 export { cedarjsJobPathInjectorPlugin } from './plugins/vite-plugin-cedarjs-job-path-injector.js';
 export { cedarTransformJsAsJsx } from './plugins/vite-plugin-jsx-loader.js';
 export { cedarMergedConfig } from './plugins/vite-plugin-merged-config.js';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAoBxC,OAAO,EAAE,sBAAsB,EAAE,MAAM,4CAA4C,CAAA;AACnF,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAA;AACxE,OAAO,EAAE,yBAAyB,EAAE,MAAM,gDAAgD,CAAA;AAC1F,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAA;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAA;AAChF,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAA;AAClF,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAA;AACzF,OAAO,EAAE,iCAAiC,EAAE,MAAM,yDAAyD,CAAA;AAC3G,OAAO,EAAE,4BAA4B,EAAE,MAAM,oDAAoD,CAAA;AACjG,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAA;AAC1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAA;AAEvF,KAAK,aAAa,GAAG;IACnB,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAC1B,CAAA;AAED;;GAEG;AACH,wBAAgB,KAAK,CAAC,EAAE,IAAI,EAAE,GAAE,aAAkB,GAAG,YAAY,EAAE,CAsClE;AAED,8DAA8D;AAC9D,eAAe,KAAK,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAqBxC,OAAO,EAAE,sBAAsB,EAAE,MAAM,4CAA4C,CAAA;AACnF,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAA;AACxE,OAAO,EAAE,yBAAyB,EAAE,MAAM,gDAAgD,CAAA;AAC1F,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAA;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAA;AAChF,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAA;AAClF,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAA;AACzF,OAAO,EAAE,qCAAqC,EAAE,MAAM,8DAA8D,CAAA;AACpH,OAAO,EAAE,4BAA4B,EAAE,MAAM,oDAAoD,CAAA;AACjG,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAA;AAC1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAA;AAEvF,KAAK,aAAa,GAAG;IACnB,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAC1B,CAAA;AAED;;GAEG;AACH,wBAAgB,KAAK,CAAC,EAAE,IAAI,EAAE,GAAE,aAAkB,GAAG,YAAY,EAAE,CAyClE;AAED,8DAA8D;AAC9D,eAAe,KAAK,CAAA"}

package/dist/index.js

@@ -12,6 +12,7 @@ import { cedarHtmlEnvPlugin } from "./plugins/vite-plugin-cedar-html-env.js";
 import { cedarNodePolyfills } from "./plugins/vite-plugin-cedar-node-polyfills.js";
 import { cedarRemoveFromBundle } from "./plugins/vite-plugin-cedar-remove-from-bundle.js";
 import { cedarWaitForApiServer } from "./plugins/vite-plugin-cedar-wait-for-api-server.js";
+import { cedarjsResolveCedarStyleImportsPlugin } from "./plugins/vite-plugin-cedarjs-resolve-cedar-style-imports.js";
 import { cedarTransformJsAsJsx } from "./plugins/vite-plugin-jsx-loader.js";
 import { cedarMergedConfig } from "./plugins/vite-plugin-merged-config.js";
 import { cedarSwapApolloProvider } from "./plugins/vite-plugin-swap-apollo-provider.js";
@@ -22,7 +23,7 @@ import { cedarHtmlEnvPlugin as cedarHtmlEnvPlugin2 } from "./plugins/vite-plugin
 import { cedarImportDirPlugin } from "./plugins/vite-plugin-cedar-import-dir.js";
 import { cedarNodePolyfills as cedarNodePolyfills2 } from "./plugins/vite-plugin-cedar-node-polyfills.js";
 import { cedarRemoveFromBundle as cedarRemoveFromBundle2 } from "./plugins/vite-plugin-cedar-remove-from-bundle.js";
-import { cedarjsDirectoryNamedImportPlugin } from "./plugins/vite-plugin-cedarjs-directory-named-import.js";
+import { cedarjsResolveCedarStyleImportsPlugin as cedarjsResolveCedarStyleImportsPlugin2 } from "./plugins/vite-plugin-cedarjs-resolve-cedar-style-imports.js";
 import { cedarjsJobPathInjectorPlugin } from "./plugins/vite-plugin-cedarjs-job-path-injector.js";
 import { cedarTransformJsAsJsx as cedarTransformJsAsJsx2 } from "./plugins/vite-plugin-jsx-loader.js";
 import { cedarMergedConfig as cedarMergedConfig2 } from "./plugins/vite-plugin-merged-config.js";
@@ -30,7 +31,9 @@ import { cedarSwapApolloProvider as cedarSwapApolloProvider2 } from "./plugins/v
 function cedar({ mode } = {}) {
   const cedarConfig = getConfig();
   const rscEnabled = cedarConfig.experimental?.rsc?.enabled;
-  const webSideDefaultBabelConfig = getWebSideDefaultBabelConfig();
+  const webSideDefaultBabelConfig = getWebSideDefaultBabelConfig({
+    forVite: true
+  });
   const babelConfig = {
     ...webSideDefaultBabelConfig,
     // For RSC we don't want to include the routes auto-loader plugin as we
@@ -50,6 +53,7 @@ function cedar({ mode } = {}) {
     cedarHtmlEnvPlugin(),
     cedarEntryInjectionPlugin(),
     cedarMergedConfig(),
+    cedarjsResolveCedarStyleImportsPlugin(),
     cedarSwapApolloProvider(),
     cedarCellTransform(),
     cedarTransformJsAsJsx(),
@@ -57,7 +61,7 @@ function cedar({ mode } = {}) {
     react({ babel: babelConfig })
   ];
 }
-var src_default = cedar;
+var index_default = cedar;
 export {
   cedar,
   cedarAutoImportsPlugin,
@@ -70,7 +74,7 @@ export {
   cedarRemoveFromBundle2 as cedarRemoveFromBundle,
   cedarSwapApolloProvider2 as cedarSwapApolloProvider,
   cedarTransformJsAsJsx2 as cedarTransformJsAsJsx,
-  cedarjsDirectoryNamedImportPlugin,
   cedarjsJobPathInjectorPlugin,
-  src_default as default
+  cedarjsResolveCedarStyleImportsPlugin2 as cedarjsResolveCedarStyleImportsPlugin,
+  index_default as default
 };

package/dist/lib/StatusError.js

@@ -3,6 +3,7 @@ class StatusError extends Error {
     super(message);
     this.statusCode = statusCode;
   }
+  statusCode;
 }
 const hasStatusCode = (x) => typeof x?.statusCode === "number";
 export {

package/dist/lib/getMergedConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getMergedConfig.d.ts","sourceRoot":"","sources":["../../src/lib/getMergedConfig.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAE9D,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAO5D;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,IAC5D,YAAY,cAAc,EAAE,KAAK,SAAS,KAAG,cAAc,CAwGpE"}
+{"version":3,"file":"getMergedConfig.d.ts","sourceRoot":"","sources":["../../src/lib/getMergedConfig.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAE9D,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAO5D;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,IAC5D,YAAY,cAAc,EAAE,KAAK,SAAS,KAAG,cAAc,CA0GpE"}

package/dist/lib/getMergedConfig.js

@@ -9,7 +9,7 @@ function getMergedConfig(cedarConfig, cedarPaths) {
   return (userConfig, env) => {
     let apiHost = process.env.REDWOOD_API_HOST;
     apiHost ??= cedarConfig.api.host;
-    apiHost ??= process.env.NODE_ENV === "production" ? "0.0.0.0" : "[::]";
+    apiHost ??= process.env.NODE_ENV === "production" ? "0.0.0.0" : "127.0.0.1";
     const streamingSsrEnabled = cedarConfig.experimental.streamingSsr?.enabled;
     const rscEnabled = cedarConfig.experimental.rsc?.enabled;
     let apiPort;

package/dist/plugins/vite-plugin-cedarjs-resolve-cedar-style-imports.d.ts

@@ -0,0 +1,3 @@
+import type { Plugin } from 'vite';
+export declare function cedarjsResolveCedarStyleImportsPlugin(): Plugin;
+//# sourceMappingURL=vite-plugin-cedarjs-resolve-cedar-style-imports.d.ts.map

package/dist/plugins/vite-plugin-cedarjs-resolve-cedar-style-imports.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"vite-plugin-cedarjs-resolve-cedar-style-imports.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-cedarjs-resolve-cedar-style-imports.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAiClC,wBAAgB,qCAAqC,IAAI,MAAM,CAkE9D"}

package/dist/plugins/vite-plugin-cedarjs-resolve-cedar-style-imports.js

@@ -0,0 +1,72 @@
+import fs from "node:fs";
+import path from "node:path";
+import { normalizePath } from "vite";
+import { getPaths, resolveFile } from "@cedarjs/project-config";
+function resolveFromAbsolutePath(absolutePath) {
+  const ext = path.extname(absolutePath);
+  const pathToResolve = ext ? absolutePath.slice(0, -ext.length) : absolutePath;
+  const direct = resolveFile(pathToResolve);
+  if (direct) {
+    return direct;
+  }
+  const indexFile = resolveFile(path.join(pathToResolve, "index"));
+  if (indexFile) {
+    return indexFile;
+  }
+  const dirNamedFile = resolveFile(
+    path.join(pathToResolve, path.basename(pathToResolve))
+  );
+  if (dirNamedFile) {
+    return dirNamedFile;
+  }
+  return null;
+}
+function cedarjsResolveCedarStyleImportsPlugin() {
+  let cedarPaths;
+  try {
+    cedarPaths = getPaths();
+  } catch {
+  }
+  return {
+    name: "cedarjs-resolve-cedar-style-imports",
+    resolveId(id, importer) {
+      if (!importer || normalizePath(importer).includes("/node_modules/")) {
+        return null;
+      }
+      if (cedarPaths && id.startsWith("src/")) {
+        const normalizedImporter = normalizePath(importer);
+        const normalizedWebSrc = normalizePath(cedarPaths.web.src);
+        const normalizedApiSrc = normalizePath(cedarPaths.api.src);
+        let srcDir;
+        if (normalizedImporter.startsWith(normalizedWebSrc)) {
+          srcDir = cedarPaths.web.src;
+        } else if (normalizedImporter.startsWith(normalizedApiSrc)) {
+          srcDir = cedarPaths.api.src;
+        }
+        if (srcDir) {
+          const resolved = resolveFromAbsolutePath(
+            path.join(srcDir, id.slice("src/".length))
+          );
+          if (resolved) {
+            return normalizePath(resolved);
+          }
+        }
+      }
+      const resolvedPath = path.resolve(path.dirname(importer), id);
+      if (fs.existsSync(resolvedPath)) {
+        const stats = fs.statSync(resolvedPath);
+        if (stats.isFile()) {
+          return null;
+        }
+      }
+      const newPath = resolveFromAbsolutePath(resolvedPath);
+      if (!newPath) {
+        return null;
+      }
+      return normalizePath(newPath);
+    }
+  };
+}
+export {
+  cedarjsResolveCedarStyleImportsPlugin
+};

package/dist/plugins/vite-plugin-rsc-routes-auto-loader.js

@@ -1,4 +1,4 @@
-import path from "path";
+import path from "node:path";
 import babelGenerator from "@babel/generator";
 const generate = babelGenerator.default;
 import { parse as babelParse } from "@babel/parser";
@@ -70,9 +70,9 @@ function rscRoutesAutoLoader() {
           const userImportRelativePath = getPathRelativeToSrc(
             importStatementPath(importPath)
           );
-          const defaultSpecifier = path2.node.specifiers.filter(
+          const defaultSpecifier = path2.node.specifiers.find(
             (specifier) => t.isImportDefaultSpecifier(specifier)
-          )[0];
+          );
           if (userImportRelativePath && defaultSpecifier) {
             importedNames.add(defaultSpecifier.local.name);
           }

package/dist/plugins/vite-plugin-rsc-routes-imports.js

@@ -1,4 +1,4 @@
-import path from "path";
+import path from "node:path";
 import babelGenerator from "@babel/generator";
 const { default: generate } = babelGenerator;
 import { parse as babelParse } from "@babel/parser";
@@ -68,9 +68,9 @@ function rscRoutesImports() {
           const userImportRelativePath = getPathRelativeToSrc(
             importStatementPath(path2.node.source?.value)
           );
-          const defaultSpecifier = path2.node.specifiers.filter(
+          const defaultSpecifier = path2.node.specifiers.find(
             (specifier) => t.isImportDefaultSpecifier(specifier)
-          )[0];
+          );
           if (userImportRelativePath && defaultSpecifier) {
             importedNames.add(defaultSpecifier.local.name);
           }

package/dist/plugins/vite-plugin-rsc-transform-client.js

@@ -126,6 +126,7 @@ async function parseExportNamesIntoNames(code, body, names) {
           }
         }
         continue;
+      // For CJS support
       case "ExpressionStatement": {
         let assignmentExpression = null;
         if (node.expression.type === "AssignmentExpression") {

package/dist/plugins/vite-plugin-rsc-transform-server.js

@@ -82,6 +82,7 @@ function transformServerModule(mod, url, code) {
   const localTypes = /* @__PURE__ */ new Map();
   for (const node of mod.body) {
     switch (node.type) {
+      // TODO (RSC): Add code comments with examples of each type of node
       case "ExportDeclaration":
         if (node.declaration.type === "FunctionDeclaration") {
           const name = node.declaration.identifier.value;

package/dist/rsc/rscBuildAnalyze.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rscBuildAnalyze.d.ts","sourceRoot":"","sources":["../../src/rsc/rscBuildAnalyze.ts"],"names":[],"mappings":"AAQA;;;;;;GAMG;AACH,wBAAsB,eAAe;;;;;;;GAkGpC"}
+{"version":3,"file":"rscBuildAnalyze.d.ts","sourceRoot":"","sources":["../../src/rsc/rscBuildAnalyze.ts"],"names":[],"mappings":"AAQA;;;;;;GAMG;AACH,wBAAsB,eAAe;;;;;;;GAwGpC"}

package/dist/rsc/rscBuildAnalyze.js

@@ -1,4 +1,4 @@
-import { build as viteBuild } from "vite";
+import { build as viteBuild, defaultServerConditions } from "vite";
 import { getPaths } from "@cedarjs/project-config";
 import { getEntries } from "../lib/entries.js";
 import { onWarn } from "../lib/onWarn.js";
@@ -51,7 +51,13 @@ async function rscBuildAnalyze() {
         "react"
       ],
       resolve: {
-        externalConditions: ["react-server"]
+        // In Vite 6, we must include `defaultServerConditions` alongside
+        // `react-server` so that nested condition maps (e.g. the `node`
+        // sub-condition inside `react-server-dom-webpack/server`'s exports)
+        // can still be resolved. Without `node` (or another environment
+        // condition), the resolver throws "No known conditions for
+        // './server' specifier in 'react-server-dom-webpack' package".
+        externalConditions: ["react-server", ...defaultServerConditions]
       }
     },
     build: {

package/dist/rsc/rscBuildForServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rscBuildForServer.d.ts","sourceRoot":"","sources":["../../src/rsc/rscBuildForServer.ts"],"names":[],"mappings":"AAUA;;;;GAIG;AACH,wBAAsB,iBAAiB,CACrC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACxC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACxC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,+GA2ItC"}
+{"version":3,"file":"rscBuildForServer.d.ts","sourceRoot":"","sources":["../../src/rsc/rscBuildForServer.ts"],"names":[],"mappings":"AAUA;;;;GAIG;AACH,wBAAsB,iBAAiB,CACrC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACxC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACxC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,+GAkJtC"}

package/dist/rsc/rscBuildForServer.js

@@ -1,4 +1,4 @@
-import { build as viteBuild } from "vite";
+import { build as viteBuild, defaultServerConditions } from "vite";
 import { getPaths } from "@cedarjs/project-config";
 import { getEntries } from "../lib/entries.js";
 import { onWarn } from "../lib/onWarn.js";
@@ -58,8 +58,15 @@ async function rscBuildForServer(clientEntryFiles, serverEntryFiles, customModul
         // dependencies apart from node built-ins.
         // TODO (RSC): What's the difference between `conditions` and
         // `externalConditions`? When is one used over the other?
-        conditions: ["react-server"],
-        externalConditions: ["react-server"]
+        //
+        // In Vite 6, we must include `defaultServerConditions` alongside
+        // `react-server` so that nested condition maps (e.g. the `node`
+        // sub-condition inside `react-server-dom-webpack/server`'s exports)
+        // can still be resolved. Without `node` (or another environment
+        // condition), the commonjs resolver throws "No known conditions for
+        // './server' specifier in 'react-server-dom-webpack' package".
+        conditions: ["react-server", ...defaultServerConditions],
+        externalConditions: ["react-server", ...defaultServerConditions]
       }
     },
     plugins: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/vite",
-  "version": "3.1.1",
+  "version": "3.1.2-next.126+e7fa625a39",
   "description": "Vite configuration package for CedarJS",
   "repository": {
     "type": "git",
@@ -60,19 +60,19 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@ast-grep/napi": "0.42.0",
+    "@ast-grep/napi": "0.42.1",
     "@babel/generator": "7.29.1",
     "@babel/parser": "7.29.2",
     "@babel/traverse": "7.29.0",
-    "@cedarjs/auth": "3.1.1",
-    "@cedarjs/babel-config": "3.1.1",
-    "@cedarjs/cookie-jar": "3.1.1",
-    "@cedarjs/internal": "3.1.1",
-    "@cedarjs/project-config": "3.1.1",
-    "@cedarjs/server-store": "3.1.1",
-    "@cedarjs/testing": "3.1.1",
-    "@cedarjs/web": "3.1.1",
-    "@swc/core": "1.15.21",
+    "@cedarjs/auth": "3.1.2-next.126+e7fa625a39",
+    "@cedarjs/babel-config": "3.1.2-next.126+e7fa625a39",
+    "@cedarjs/cookie-jar": "3.1.2-next.126+e7fa625a39",
+    "@cedarjs/internal": "3.1.2-next.126+e7fa625a39",
+    "@cedarjs/project-config": "3.1.2-next.126+e7fa625a39",
+    "@cedarjs/server-store": "3.1.2-next.126+e7fa625a39",
+    "@cedarjs/testing": "3.1.2-next.126+e7fa625a39",
+    "@cedarjs/web": "3.1.2-next.126+e7fa625a39",
+    "@swc/core": "1.15.24",
     "@vitejs/plugin-react": "4.7.0",
     "@whatwg-node/fetch": "0.10.13",
     "@whatwg-node/server": "0.10.18",
@@ -85,13 +85,13 @@
     "express": "4.22.1",
     "find-my-way": "8.2.2",
     "http-proxy-middleware": "3.0.5",
-    "isbot": "5.1.36",
+    "isbot": "5.1.37",
     "react": "18.3.1",
     "react-server-dom-webpack": "19.2.4",
     "rimraf": "6.1.3",
-    "vite": "5.4.21",
+    "vite": "7.3.2",
     "vite-plugin-cjs-interop": "2.4.4",
-    "vite-plugin-node-polyfills": "0.25.0",
+    "vite-plugin-node-polyfills": "0.26.0",
     "ws": "8.20.0",
     "yargs-parser": "21.1.1"
   },
@@ -107,7 +107,7 @@
     "glob": "11.1.0",
     "memfs": "4.57.1",
     "publint": "0.3.18",
-    "rollup": "4.60.0",
+    "rollup": "4.60.1",
     "tsx": "4.21.0",
     "typescript": "5.9.3",
     "vitest": "3.2.4"
@@ -118,5 +118,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "daccdd356942396c8037bd53c8e945255e4c8fdb"
+  "gitHead": "e7fa625a39d829a9078bd5b8237e93ec1a8745be"
 }