@cedarjs/prerender 5.0.0-canary.13889 → 5.0.0-canary.13893

package/dist/cjs/graphql/node-runner.js

@@ -22,9 +22,6 @@ __export(node_runner_exports, {
 });
 module.exports = __toCommonJS(node_runner_exports);
 var import_vite = require("vite");
-var import_client = require("vite-node/client");
-var import_server = require("vite-node/server");
-var import_source_map = require("vite-node/source-map");
 var import_project_config = require("@cedarjs/project-config");
 var import_vite2 = require("@cedarjs/vite");
 var import_vite_plugin_cedar_auto_import = require("./vite-plugin-cedar-auto-import.js");
@@ -33,10 +30,16 @@ async function createViteServer(customConfig = {}) {
   const defaultConfig = {
     mode: "production",
     optimizeDeps: {
-      // This is recommended in the vite-node readme
       noDiscovery: true,
       include: void 0
     },
+    server: {
+      hmr: false,
+      watch: null
+    },
+    environments: {
+      nodeRunnerEnv: {}
+    },
     resolve: {
       alias: [
         {
@@ -46,6 +49,7 @@ async function createViteServer(customConfig = {}) {
       ]
     },
     plugins: [
+      (0, import_vite2.cedarCjsCompatPlugin)(),
       (0, import_vite_plugin_cedar_import_dir.cedarImportDirPlugin)(),
       (0, import_vite_plugin_cedar_auto_import.cedarAutoImportsPlugin)(),
       (0, import_vite2.cedarjsResolveCedarStyleImportsPlugin)(),
@@ -56,48 +60,33 @@ async function createViteServer(customConfig = {}) {
   };
   const mergedConfig = (0, import_vite.mergeConfig)(defaultConfig, customConfig);
   const server = await (0, import_vite.createServer)(mergedConfig);
-  if (Number(import_vite.version.split(".")[0]) < 6) {
-    await server.pluginContainer.buildStart({});
-  }
   return server;
 }
 class NodeRunner {
   viteServer = void 0;
-  runner = void 0;
+  env = void 0;
   customViteConfig;
   constructor(customViteConfig = {}) {
     this.customViteConfig = customViteConfig;
   }
   async init() {
     this.viteServer = await createViteServer(this.customViteConfig);
-    const nodeServer = new import_server.ViteNodeServer(this.viteServer, {
-      transformMode: {
-        ssr: [/.*/],
-        web: [/\/web\//]
-      },
-      deps: {
-        fallbackCJS: true
-      }
-    });
-    (0, import_source_map.installSourcemapsSupport)({
-      getSourceMap: (source) => nodeServer?.getSourceMap(source)
-    });
-    this.runner = new import_client.ViteNodeRunner({
-      root: this.viteServer.config.root,
-      base: this.viteServer.config.base,
-      fetchModule(id) {
-        return nodeServer.fetchModule(id);
-      },
-      resolveId(id, importer) {
-        return nodeServer.resolveId(id, importer);
-      }
-    });
+    const env = this.viteServer.environments.nodeRunnerEnv;
+    if (!env || !(0, import_vite.isRunnableDevEnvironment)(env)) {
+      await this.viteServer.close();
+      throw new Error("Vite environment is not runnable.");
+    }
+    this.env = env;
   }
   async importFile(filePath) {
-    if (!this.runner) {
+    if (!this.env) {
       await this.init();
     }
-    return this.runner?.executeFile(filePath);
+    const env = this.env;
+    if (!env) {
+      throw new Error("NodeRunner failed to initialize");
+    }
+    return env.runner.import(filePath);
   }
   async close() {
     await this.viteServer?.close();

package/dist/graphql/node-runner.d.ts

@@ -1,7 +1,7 @@
 import type { UserConfig } from 'vite';
 export declare class NodeRunner {
     private viteServer?;
-    private runner?;
+    private env?;
     private readonly customViteConfig;
     constructor(customViteConfig?: UserConfig);
     init(): Promise<void>;

package/dist/graphql/node-runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node-runner.d.ts","sourceRoot":"","sources":["../../src/graphql/node-runner.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAiB,UAAU,EAAE,MAAM,MAAM,CAAA;AAsDrD,qBAAa,UAAU;IACrB,OAAO,CAAC,UAAU,CAAC,CAA2B;IAC9C,OAAO,CAAC,MAAM,CAAC,CAA4B;IAC3C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAY;gBAEjC,gBAAgB,GAAE,UAAe;IAIvC,IAAI;IA6BJ,UAAU,CAAC,QAAQ,EAAE,MAAM;IAQ3B,KAAK;CAGZ"}
+{"version":3,"file":"node-runner.d.ts","sourceRoot":"","sources":["../../src/graphql/node-runner.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAyC,UAAU,EAAE,MAAM,MAAM,CAAA;AAsD7E,qBAAa,UAAU;IACrB,OAAO,CAAC,UAAU,CAAC,CAA2B;IAC9C,OAAO,CAAC,GAAG,CAAC,CAAoC;IAChD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAY;gBAEjC,gBAAgB,GAAE,UAAe;IAIvC,IAAI;IAYJ,UAAU,CAAC,QAAQ,EAAE,MAAM;IAa3B,KAAK;CAGZ"}

package/dist/graphql/node-runner.js

@@ -1,13 +1,11 @@
-import { createServer, version as viteVersion, mergeConfig } from "vite";
-import { ViteNodeRunner } from "vite-node/client";
-import { ViteNodeServer } from "vite-node/server";
-import { installSourcemapsSupport } from "vite-node/source-map";
+import { createServer, isRunnableDevEnvironment, mergeConfig } from "vite";
 import { getPaths } from "@cedarjs/project-config";
 import {
   cedarCellTransform,
   cedarjsResolveCedarStyleImportsPlugin,
   cedarjsJobPathInjectorPlugin,
-  cedarSwapApolloProvider
+  cedarSwapApolloProvider,
+  cedarCjsCompatPlugin
 } from "@cedarjs/vite";
 import { cedarAutoImportsPlugin } from "./vite-plugin-cedar-auto-import.js";
 import { cedarImportDirPlugin } from "./vite-plugin-cedar-import-dir.js";
@@ -15,10 +13,16 @@ async function createViteServer(customConfig = {}) {
   const defaultConfig = {
     mode: "production",
     optimizeDeps: {
-      // This is recommended in the vite-node readme
       noDiscovery: true,
       include: void 0
     },
+    server: {
+      hmr: false,
+      watch: null
+    },
+    environments: {
+      nodeRunnerEnv: {}
+    },
     resolve: {
       alias: [
         {
@@ -28,6 +32,7 @@ async function createViteServer(customConfig = {}) {
       ]
     },
     plugins: [
+      cedarCjsCompatPlugin(),
       cedarImportDirPlugin(),
       cedarAutoImportsPlugin(),
       cedarjsResolveCedarStyleImportsPlugin(),
@@ -38,48 +43,33 @@ async function createViteServer(customConfig = {}) {
   };
   const mergedConfig = mergeConfig(defaultConfig, customConfig);
   const server = await createServer(mergedConfig);
-  if (Number(viteVersion.split(".")[0]) < 6) {
-    await server.pluginContainer.buildStart({});
-  }
   return server;
 }
 class NodeRunner {
   viteServer = void 0;
-  runner = void 0;
+  env = void 0;
   customViteConfig;
   constructor(customViteConfig = {}) {
     this.customViteConfig = customViteConfig;
   }
   async init() {
     this.viteServer = await createViteServer(this.customViteConfig);
-    const nodeServer = new ViteNodeServer(this.viteServer, {
-      transformMode: {
-        ssr: [/.*/],
-        web: [/\/web\//]
-      },
-      deps: {
-        fallbackCJS: true
-      }
-    });
-    installSourcemapsSupport({
-      getSourceMap: (source) => nodeServer?.getSourceMap(source)
-    });
-    this.runner = new ViteNodeRunner({
-      root: this.viteServer.config.root,
-      base: this.viteServer.config.base,
-      fetchModule(id) {
-        return nodeServer.fetchModule(id);
-      },
-      resolveId(id, importer) {
-        return nodeServer.resolveId(id, importer);
-      }
-    });
+    const env = this.viteServer.environments.nodeRunnerEnv;
+    if (!env || !isRunnableDevEnvironment(env)) {
+      await this.viteServer.close();
+      throw new Error("Vite environment is not runnable.");
+    }
+    this.env = env;
   }
   async importFile(filePath) {
-    if (!this.runner) {
+    if (!this.env) {
       await this.init();
     }
-    return this.runner?.executeFile(filePath);
+    const env = this.env;
+    if (!env) {
+      throw new Error("NodeRunner failed to initialize");
+    }
+    return env.runner.import(filePath);
   }
   async close() {
     await this.viteServer?.close();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/prerender",
-  "version": "5.0.0-canary.13889+d7d8c21e39",
+  "version": "5.0.0-canary.13893+8801f7260c",
   "description": "CedarJS prerender",
   "repository": {
     "type": "git",
@@ -71,12 +71,12 @@
     "@babel/generator": "7.29.1",
     "@babel/parser": "7.29.2",
     "@babel/traverse": "7.29.0",
-    "@cedarjs/babel-config": "5.0.0-canary.13889",
-    "@cedarjs/project-config": "5.0.0-canary.13889",
-    "@cedarjs/router": "5.0.0-canary.13889",
-    "@cedarjs/structure": "5.0.0-canary.13889",
-    "@cedarjs/vite": "5.0.0-canary.13889",
-    "@cedarjs/web": "5.0.0-canary.13889",
+    "@cedarjs/babel-config": "5.0.0-canary.13893",
+    "@cedarjs/project-config": "5.0.0-canary.13893",
+    "@cedarjs/router": "5.0.0-canary.13893",
+    "@cedarjs/structure": "5.0.0-canary.13893",
+    "@cedarjs/vite": "5.0.0-canary.13893",
+    "@cedarjs/web": "5.0.0-canary.13893",
     "@rollup/plugin-alias": "5.1.1",
     "@rollup/plugin-commonjs": "28.0.9",
     "@rollup/plugin-node-resolve": "16.0.3",
@@ -91,11 +91,10 @@
     "rollup-plugin-swc3": "0.12.1",
     "unimport": "5.7.0",
     "unplugin-auto-import": "19.3.0",
-    "vite": "7.3.2",
-    "vite-node": "3.2.4"
+    "vite": "7.3.2"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "5.0.0-canary.13889",
+    "@cedarjs/framework-tools": "5.0.0-canary.13893",
     "@types/mime-types": "2.1.4",
     "@types/react": "^18.2.55",
     "babel-plugin-tester": "11.0.4",
@@ -119,5 +118,5 @@
     "react": "react",
     "react-dom": "react-dom"
   },
-  "gitHead": "d7d8c21e39d2bf02ec27a79854571fe8c2376fbc"
+  "gitHead": "8801f7260cc1702114b09ff8a2aa35334b109b2f"
 }