@valbuild/init 0.62.3 → 0.62.4

package/src/init.ts

@@ -14,6 +14,7 @@ import {
   VAL_APP_PAGE,
   VAL_CLIENT,
   VAL_CONFIG,
+  VAL_MODULES,
   VAL_RSC,
   VAL_SERVER,
 } from "./templates";
@@ -288,6 +289,7 @@ type Plan = Partial<{
         repo: string;
       };
   includeExample: false | FileOp;
+  includeModules: false | FileOp;
   updateVSCodeSettings: false | FileOp;
 }>;
 
@@ -486,19 +488,76 @@ async function plan(
     source: VAL_CONFIG(!!analysis.isTypeScript, {}),
   };
 
+  {
+    const answer = await confirm({
+      message: "Include example Val files?",
+      default: true,
+    });
+    if (answer) {
+      const exampleDir = path.join(analysis.srcDir, "examples", "val");
+      const examplePath = path.join(
+        exampleDir,
+        "example.val." + (analysis.isJavaScript ? "js" : "ts")
+      );
+      const exampleImport = path
+        .relative(exampleDir, valConfigPath)
+        .replace(".js", "")
+        .replace(".ts", "");
+      if (!analysis.packageJsonDir) {
+        throw Error(
+          "Could not detect package.json directory! This is a Val bug."
+        );
+      }
+      const exampleModuleFilePath = `/${path.relative(
+        analysis.packageJsonDir,
+        examplePath
+      )}`;
+
+      plan.includeExample = {
+        path: examplePath,
+        source: BASIC_EXAMPLE(
+          exampleModuleFilePath,
+          exampleImport,
+          !!analysis.isJavaScript
+        ),
+      };
+    }
+  }
+
+  const valModulesDir = analysis.root;
+  const valModulesImport = path
+    .relative(valModulesDir, valConfigPath)
+    .replace(".js", "")
+    .replace(".ts", "");
+  const exampleModuleFilePath = plan.includeExample
+    ? plan.includeExample.path
+    : undefined;
+  const exampleModuleImport =
+    exampleModuleFilePath &&
+    path
+      .relative(valModulesDir, exampleModuleFilePath)
+      .replace(".js", "")
+      .replace(".ts", "");
+  plan.includeModules = {
+    path: path.join(valModulesDir, "val.modules.ts"),
+    source: VAL_MODULES(valModulesImport, exampleModuleImport),
+  };
   const valUtilsDir = path.join(analysis.srcDir, "val");
+  const valModulesServerImport = path
+    .relative(valUtilsDir, plan.includeModules.path)
+    .replace(".js", "")
+    .replace(".ts", "");
   const valUtilsImportPath = path
     .relative(valUtilsDir, valConfigPath)
     .replace(".js", "")
     .replace(".ts", "");
-
   const valServerPath = path.join(
     valUtilsDir,
     analysis.isTypeScript ? "val.server.ts" : "val.server.js"
   );
   plan.createValServer = {
     path: valServerPath,
-    source: VAL_SERVER(valUtilsImportPath),
+    source: VAL_SERVER(valUtilsImportPath, valModulesServerImport),
   };
 
   if (!analysis.appRouterPath) {
@@ -764,43 +823,6 @@ async function plan(
     }
   }
 
-  {
-    const answer = await confirm({
-      message: "Include example Val files?",
-      default: true,
-    });
-    if (answer) {
-      const exampleDir = path.join(analysis.srcDir, "examples", "val");
-      const examplePath = path.join(
-        exampleDir,
-        "example.val." + (analysis.isJavaScript ? "js" : "ts")
-      );
-      const exampleImport = path
-        .relative(exampleDir, valConfigPath)
-        .replace(".js", "")
-        .replace(".ts", "");
-      if (!analysis.packageJsonDir) {
-        throw Error(
-          "Could not detect package.json directory! This is a Val bug."
-        );
-      }
-      const exampleModuleId = `/${path
-        .relative(analysis.packageJsonDir, examplePath)
-        .replace(".val", "")
-        .replace(".js", "")
-        .replace(".ts", "")}`;
-
-      plan.includeExample = {
-        path: examplePath,
-        source: BASIC_EXAMPLE(
-          exampleModuleId,
-          exampleImport,
-          !!analysis.isJavaScript
-        ),
-      };
-    }
-  }
-
   return plan;
 }
 

package/src/templates.ts

@@ -21,12 +21,17 @@ const { fetchValStega: fetchVal } = initValRsc(config, {
 export { fetchVal };
 `;
 
-export const VAL_SERVER = (configImportPath: string) => `import "server-only";
+export const VAL_SERVER = (
+  configImportPath: string,
+  valModulesImportPath: string
+) => `import "server-only";
 import { initValServer } from "@valbuild/next/server";
 import { config } from "${configImportPath}";
 import { draftMode } from "next/headers";
+import valModules from "${valModulesImportPath}";
 
 const { valNextAppRouter } = initValServer(
+  valModules,
   { ...config },
   {
     draftMode,
@@ -76,8 +81,25 @@ export default function Val() {
 }
 `;
 
+export const VAL_MODULES = (
+  configImportPath: string,
+  exampleModuleImport?: string
+) => `import { modules } from "@valbuild/next";
+import { config } from "./${configImportPath}";
+
+export default modules(config, [
+  // Add your modules here${
+    exampleModuleImport
+      ? `
+  { def: () => import("./${exampleModuleImport}") },`
+      : ""
+  }
+]);
+
+`;
+
 export const BASIC_EXAMPLE = (
-  moduleId: string,
+  moduleFilePath: string,
   configImportPath: string,
   isJavaScript: boolean
 ) => `${isJavaScript ? "// @ts-check\n" : ""}/**
@@ -187,7 +209,7 @@ export type TestContent = t.inferSchema<typeof testSchema>;
  *
  * NOTE: the first argument, module id, must match the path of the file.
  */
-export default c.define("${moduleId}", testSchema, {
+export default c.define("${moduleFilePath}", testSchema, {
   text: "Basic text content",
   optionals: null,
   arrays: ["A string"],