@cedarjs/cli 1.0.0-canary.12378 → 1.0.0-canary.12381

package/dist/commands/exec.js

@@ -18,11 +18,11 @@ const builder = (yargs) => {
     alias: "s",
     type: "boolean",
     default: false,
-    description: "Silence Redwood's output, leaving only the script output"
+    description: "Silence CedarJS's output, leaving only the script output"
   }).strict(false).epilogue(
     `Also see the ${terminalLink(
-      "Redwood CLI Reference",
-      "https://redwoodjs.com/docs/cli-commands#up"
+      "CedarJS CLI Reference",
+      "https://cedarjs.com/docs/cli-commands#exec"
     )}`
   );
 };

package/dist/commands/execHandler.js

@@ -6,7 +6,7 @@ import { Listr } from "listr2";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { findScripts } from "@cedarjs/internal/dist/files";
 import c from "../lib/colors.js";
-import { configureBabel, runScriptFunction } from "../lib/exec.js";
+import { runScriptFunction } from "../lib/exec.js";
 import { generatePrismaClient } from "../lib/generatePrismaClient.js";
 import { getPaths } from "../lib/index.js";
 const printAvailableScriptsToConsole = () => {
@@ -56,7 +56,6 @@ No script called \`${name}\` in the ./scripts folder.
     printAvailableScriptsToConsole();
     process.exit(1);
   }
-  configureBabel();
   const scriptTasks = [
     {
       title: "Generating Prisma client",

package/dist/commands/prerenderHandler.js

@@ -7,7 +7,8 @@ import { detectPrerenderRoutes } from "@cedarjs/prerender/detection";
 import { getConfig, getPaths } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import c from "../lib/colors.js";
-import { configureBabel, runScriptFunction } from "../lib/exec.js";
+import { runScriptFunction } from "../lib/exec.js";
+import { configureBabel } from "../lib/execBabel.js";
 class PathParamError extends Error {
 }
 const mapRouterPathToHtml = (routerPath) => {

package/dist/lib/exec.js

@@ -1,85 +1,111 @@
-import { createRequire } from "node:module";
 import path from "node:path";
+import { createServer, version as viteVersion } from "vite";
+import { ViteNodeRunner } from "vite-node/client";
+import { ViteNodeServer } from "vite-node/server";
+import { installSourcemapsSupport } from "vite-node/source-map";
+import { getConfig, getPaths } from "@cedarjs/project-config";
 import {
-  getWebSideDefaultBabelConfig,
-  registerApiSideBabelHook
-} from "@cedarjs/babel-config";
-import { getPaths } from "@cedarjs/project-config";
+  cedarCellTransform,
+  cedarjsDirectoryNamedImportPlugin,
+  cedarjsJobPathInjectorPlugin,
+  swapApolloProvider
+} from "@cedarjs/vite/plugins";
 async function runScriptFunction({
   path: scriptPath,
   functionName,
   args
 }) {
-  const createdRequire = createRequire(import.meta.url);
-  const script = createdRequire(scriptPath);
-  const returnValue = await script[functionName](args);
-  try {
-    const { db } = createdRequire(path.join(getPaths().api.lib, "db"));
-    db.$disconnect();
-  } catch (e) {
-  }
-  return returnValue;
-}
-function configureBabel() {
-  const {
-    overrides: _overrides,
-    plugins: webPlugins,
-    ...otherWebConfig
-  } = getWebSideDefaultBabelConfig();
-  registerApiSideBabelHook({
-    plugins: [
-      [
-        "babel-plugin-module-resolver",
+  const rwConfig = getConfig();
+  const streamingEnabled = rwConfig?.experimental.streamingSsr.enabled;
+  const NODE_ENV = process.env.NODE_ENV;
+  process.env.NODE_ENV = "production";
+  const server = await createServer({
+    mode: "production",
+    optimizeDeps: {
+      // This is recommended in the vite-node readme
+      noDiscovery: true,
+      include: void 0
+    },
+    resolve: {
+      alias: [
+        {
+          find: /^\$api\//,
+          replacement: getPaths().api.base + "/"
+        },
+        {
+          find: /^\$web\//,
+          replacement: getPaths().web.base + "/"
+        },
+        {
+          find: /^api\//,
+          replacement: getPaths().api.base + "/"
+        },
         {
-          alias: {
-            $api: getPaths().api.base,
-            $web: getPaths().web.base,
-            api: getPaths().api.base,
-            web: getPaths().web.base
-          },
-          loglevel: "silent"
-          // to silence the unnecessary warnings
+          find: /^web\//,
+          replacement: getPaths().web.base + "/"
         },
-        "exec-$side-module-resolver"
+        {
+          find: /^src\//,
+          replacement: "src/",
+          customResolver: (id, importer, _options) => {
+            if (importer.startsWith(getPaths().api.base)) {
+              return { id: id.replace("src", getPaths().api.src) };
+            } else if (importer.startsWith(getPaths().web.base)) {
+              return { id: id.replace("src", getPaths().web.src) };
+            }
+            return null;
+          }
+        }
       ]
-    ],
-    overrides: [
-      {
-        test: ["./api/"],
-        plugins: [
-          [
-            "babel-plugin-module-resolver",
-            {
-              alias: {
-                src: getPaths().api.src
-              },
-              loglevel: "silent"
-            },
-            "exec-api-src-module-resolver"
-          ]
-        ]
-      },
-      {
-        test: ["./web/"],
-        plugins: [
-          ...webPlugins,
-          [
-            "babel-plugin-module-resolver",
-            {
-              alias: {
-                src: getPaths().web.src
-              },
-              loglevel: "silent"
-            },
-            "exec-web-src-module-resolver"
-          ]
-        ],
-        ...otherWebConfig
-      }
+    },
+    plugins: [
+      cedarjsDirectoryNamedImportPlugin(),
+      cedarCellTransform(),
+      cedarjsJobPathInjectorPlugin(),
+      streamingEnabled && swapApolloProvider()
     ]
   });
+  if (Number(viteVersion.split(".")[0]) < 6) {
+    await server.pluginContainer.buildStart({});
+  }
+  const node = new ViteNodeServer(server, {
+    transformMode: {
+      ssr: [/.*/],
+      web: [/\/web\//]
+    },
+    deps: {
+      fallbackCJS: true
+    }
+  });
+  installSourcemapsSupport({
+    getSourceMap: (source) => node.getSourceMap(source)
+  });
+  const runner = new ViteNodeRunner({
+    root: server.config.root,
+    base: server.config.base,
+    fetchModule(id) {
+      return node.fetchModule(id);
+    },
+    resolveId(id, importer) {
+      return node.resolveId(id, importer);
+    }
+  });
+  let returnValue;
+  try {
+    const script = await runner.executeFile(scriptPath);
+    returnValue = script[functionName](args);
+  } catch (error) {
+    console.error(error);
+  }
+  try {
+    const { db } = await runner.executeFile(path.join(getPaths().api.lib, "db"));
+    db.$disconnect();
+  } catch (e) {
+  }
+  await server.close();
+  process.env.NODE_ENV = NODE_ENV;
+  return returnValue;
 }
 export {
-  configureBabel,
   runScriptFunction
 };

package/dist/lib/execBabel.js

@@ -0,0 +1,85 @@
+import { createRequire } from "node:module";
+import path from "node:path";
+import {
+  getWebSideDefaultBabelConfig,
+  registerApiSideBabelHook
+} from "@cedarjs/babel-config";
+import { getPaths } from "@cedarjs/project-config";
+async function runScriptFunction({
+  path: scriptPath,
+  functionName,
+  args
+}) {
+  const createdRequire = createRequire(import.meta.url);
+  const script = createdRequire(scriptPath);
+  const returnValue = await script[functionName](args);
+  try {
+    const { db } = createdRequire(path.join(getPaths().api.lib, "db"));
+    db.$disconnect();
+  } catch (e) {
+  }
+  return returnValue;
+}
+function configureBabel() {
+  const {
+    overrides: _overrides,
+    plugins: webPlugins,
+    ...otherWebConfig
+  } = getWebSideDefaultBabelConfig();
+  registerApiSideBabelHook({
+    plugins: [
+      [
+        "babel-plugin-module-resolver",
+        {
+          alias: {
+            $api: getPaths().api.base,
+            $web: getPaths().web.base,
+            api: getPaths().api.base,
+            web: getPaths().web.base
+          },
+          loglevel: "silent"
+          // to silence the unnecessary warnings
+        },
+        "exec-$side-module-resolver"
+      ]
+    ],
+    overrides: [
+      {
+        test: ["./api/"],
+        plugins: [
+          [
+            "babel-plugin-module-resolver",
+            {
+              alias: {
+                src: getPaths().api.src
+              },
+              loglevel: "silent"
+            },
+            "exec-api-src-module-resolver"
+          ]
+        ]
+      },
+      {
+        test: ["./web/"],
+        plugins: [
+          ...webPlugins,
+          [
+            "babel-plugin-module-resolver",
+            {
+              alias: {
+                src: getPaths().web.src
+              },
+              loglevel: "silent"
+            },
+            "exec-web-src-module-resolver"
+          ]
+        ],
+        ...otherWebConfig
+      }
+    ]
+  });
+}
+export {
+  configureBabel,
+  runScriptFunction
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "1.0.0-canary.12378+0c980b4f3",
+  "version": "1.0.0-canary.12381+f68e0d2f6",
   "description": "The Redwood Command Line",
   "repository": {
     "type": "git",
@@ -29,15 +29,15 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.27.6",
-    "@cedarjs/api-server": "1.0.0-canary.12378",
-    "@cedarjs/cli-helpers": "1.0.0-canary.12378",
-    "@cedarjs/fastify-web": "1.0.0-canary.12378",
-    "@cedarjs/internal": "1.0.0-canary.12378",
-    "@cedarjs/prerender": "1.0.0-canary.12378",
-    "@cedarjs/project-config": "1.0.0-canary.12378",
-    "@cedarjs/structure": "1.0.0-canary.12378",
-    "@cedarjs/telemetry": "1.0.0-canary.12378",
-    "@cedarjs/web-server": "1.0.0-canary.12378",
+    "@cedarjs/api-server": "1.0.0-canary.12381",
+    "@cedarjs/cli-helpers": "1.0.0-canary.12381",
+    "@cedarjs/fastify-web": "1.0.0-canary.12381",
+    "@cedarjs/internal": "1.0.0-canary.12381",
+    "@cedarjs/prerender": "1.0.0-canary.12381",
+    "@cedarjs/project-config": "1.0.0-canary.12381",
+    "@cedarjs/structure": "1.0.0-canary.12381",
+    "@cedarjs/telemetry": "1.0.0-canary.12381",
+    "@cedarjs/web-server": "1.0.0-canary.12381",
     "@listr2/prompt-adapter-enquirer": "2.0.12",
     "@opentelemetry/api": "1.8.0",
     "@opentelemetry/core": "1.22.0",
@@ -83,6 +83,7 @@
     "title-case": "3.0.3",
     "unionfs": "4.5.4",
     "uuid": "10.0.0",
+    "vite-node": "3.2.4",
     "yargs": "17.7.2"
   },
   "devDependencies": {
@@ -95,5 +96,5 @@
     "typescript": "5.6.2",
     "vitest": "3.2.4"
   },
-  "gitHead": "0c980b4f364095c0bcfa2df4ce8c8d7f4c187d92"
+  "gitHead": "f68e0d2f6cc27c9b25edf9f3d6d7bb7b316e4247"
 }