@valbuild/init 0.63.4 → 0.64.0

package/main/dist/valbuild-init-main.cjs.dev.js

@@ -516,7 +516,7 @@ function transformNextAppRouterValProvider(fileInfo, api, options) {
 
 var packageJson = {
 	name: "@valbuild/init",
-	version: "0.63.4",
+	version: "0.64.0",
 	description: "Initialize a new val.build project",
 	exports: {
 		"./main": {
@@ -569,8 +569,8 @@ var packageJson = {
 var VAL_CLIENT = function VAL_CLIENT(configImportPath) {
   return "import \"client-only\";\nimport { initValClient } from \"@valbuild/next/client\";\nimport { config } from \"".concat(configImportPath, "\";\n\nconst { useValStega: useVal } = initValClient(config);\n\nexport { useVal };\n");
 };
-var VAL_RSC = function VAL_RSC(configImportPath) {
-  return "import \"server-only\";\nimport { initValRsc } from \"@valbuild/next/rsc\";\nimport { config } from \"".concat(configImportPath, "\";\nimport { cookies, draftMode, headers } from \"next/headers\";\n\nconst { fetchValStega: fetchVal } = initValRsc(config, {\n  draftMode,\n  headers,\n  cookies,\n});\n\nexport { fetchVal };\n");
+var VAL_RSC = function VAL_RSC(configImportPath, valModulesImportPath) {
+  return "import \"server-only\";\nimport { initValRsc } from \"@valbuild/next/rsc\";\nimport { config } from \"".concat(configImportPath, "\";\nimport valModules from \"").concat(valModulesImportPath, "\";\nimport { cookies, draftMode, headers } from \"next/headers\";\n\nconst { fetchValStega: fetchVal } = initValRsc(config, valModules, {\n  draftMode,\n  headers,\n  cookies,\n});\n\nexport { fetchVal };\n");
 };
 var VAL_SERVER = function VAL_SERVER(configImportPath, valModulesImportPath) {
   return "import \"server-only\";\nimport { initValServer } from \"@valbuild/next/server\";\nimport { config } from \"".concat(configImportPath, "\";\nimport { draftMode } from \"next/headers\";\nimport valModules from \"").concat(valModulesImportPath, "\";\n\nconst { valNextAppRouter } = initValServer(\n  valModules,\n  { ...config },\n  {\n    draftMode,\n  }\n);\n\nexport { valNextAppRouter };\n");
@@ -1337,7 +1337,7 @@ function _plan() {
           if (_answer6) {
             plan.createValRsc = {
               path: path__default["default"].join(valUtilsDir, analysis.isTypeScript ? "val.rsc.ts" : "val.rsc.js"),
-              source: VAL_RSC(valUtilsImportPath)
+              source: VAL_RSC(valUtilsImportPath, valModulesServerImport)
             };
           } else {
             plan.createValRsc = false;

package/main/dist/valbuild-init-main.cjs.prod.js

@@ -516,7 +516,7 @@ function transformNextAppRouterValProvider(fileInfo, api, options) {
 
 var packageJson = {
 	name: "@valbuild/init",
-	version: "0.63.4",
+	version: "0.64.0",
 	description: "Initialize a new val.build project",
 	exports: {
 		"./main": {
@@ -569,8 +569,8 @@ var packageJson = {
 var VAL_CLIENT = function VAL_CLIENT(configImportPath) {
   return "import \"client-only\";\nimport { initValClient } from \"@valbuild/next/client\";\nimport { config } from \"".concat(configImportPath, "\";\n\nconst { useValStega: useVal } = initValClient(config);\n\nexport { useVal };\n");
 };
-var VAL_RSC = function VAL_RSC(configImportPath) {
-  return "import \"server-only\";\nimport { initValRsc } from \"@valbuild/next/rsc\";\nimport { config } from \"".concat(configImportPath, "\";\nimport { cookies, draftMode, headers } from \"next/headers\";\n\nconst { fetchValStega: fetchVal } = initValRsc(config, {\n  draftMode,\n  headers,\n  cookies,\n});\n\nexport { fetchVal };\n");
+var VAL_RSC = function VAL_RSC(configImportPath, valModulesImportPath) {
+  return "import \"server-only\";\nimport { initValRsc } from \"@valbuild/next/rsc\";\nimport { config } from \"".concat(configImportPath, "\";\nimport valModules from \"").concat(valModulesImportPath, "\";\nimport { cookies, draftMode, headers } from \"next/headers\";\n\nconst { fetchValStega: fetchVal } = initValRsc(config, valModules, {\n  draftMode,\n  headers,\n  cookies,\n});\n\nexport { fetchVal };\n");
 };
 var VAL_SERVER = function VAL_SERVER(configImportPath, valModulesImportPath) {
   return "import \"server-only\";\nimport { initValServer } from \"@valbuild/next/server\";\nimport { config } from \"".concat(configImportPath, "\";\nimport { draftMode } from \"next/headers\";\nimport valModules from \"").concat(valModulesImportPath, "\";\n\nconst { valNextAppRouter } = initValServer(\n  valModules,\n  { ...config },\n  {\n    draftMode,\n  }\n);\n\nexport { valNextAppRouter };\n");
@@ -1337,7 +1337,7 @@ function _plan() {
           if (_answer6) {
             plan.createValRsc = {
               path: path__default["default"].join(valUtilsDir, analysis.isTypeScript ? "val.rsc.ts" : "val.rsc.js"),
-              source: VAL_RSC(valUtilsImportPath)
+              source: VAL_RSC(valUtilsImportPath, valModulesServerImport)
             };
           } else {
             plan.createValRsc = false;

package/main/dist/valbuild-init-main.esm.js

@@ -504,7 +504,7 @@ function transformNextAppRouterValProvider(fileInfo, api, options) {
 
 var packageJson = {
 	name: "@valbuild/init",
-	version: "0.63.4",
+	version: "0.64.0",
 	description: "Initialize a new val.build project",
 	exports: {
 		"./main": {
@@ -557,8 +557,8 @@ var packageJson = {
 var VAL_CLIENT = function VAL_CLIENT(configImportPath) {
   return "import \"client-only\";\nimport { initValClient } from \"@valbuild/next/client\";\nimport { config } from \"".concat(configImportPath, "\";\n\nconst { useValStega: useVal } = initValClient(config);\n\nexport { useVal };\n");
 };
-var VAL_RSC = function VAL_RSC(configImportPath) {
-  return "import \"server-only\";\nimport { initValRsc } from \"@valbuild/next/rsc\";\nimport { config } from \"".concat(configImportPath, "\";\nimport { cookies, draftMode, headers } from \"next/headers\";\n\nconst { fetchValStega: fetchVal } = initValRsc(config, {\n  draftMode,\n  headers,\n  cookies,\n});\n\nexport { fetchVal };\n");
+var VAL_RSC = function VAL_RSC(configImportPath, valModulesImportPath) {
+  return "import \"server-only\";\nimport { initValRsc } from \"@valbuild/next/rsc\";\nimport { config } from \"".concat(configImportPath, "\";\nimport valModules from \"").concat(valModulesImportPath, "\";\nimport { cookies, draftMode, headers } from \"next/headers\";\n\nconst { fetchValStega: fetchVal } = initValRsc(config, valModules, {\n  draftMode,\n  headers,\n  cookies,\n});\n\nexport { fetchVal };\n");
 };
 var VAL_SERVER = function VAL_SERVER(configImportPath, valModulesImportPath) {
   return "import \"server-only\";\nimport { initValServer } from \"@valbuild/next/server\";\nimport { config } from \"".concat(configImportPath, "\";\nimport { draftMode } from \"next/headers\";\nimport valModules from \"").concat(valModulesImportPath, "\";\n\nconst { valNextAppRouter } = initValServer(\n  valModules,\n  { ...config },\n  {\n    draftMode,\n  }\n);\n\nexport { valNextAppRouter };\n");
@@ -1325,7 +1325,7 @@ function _plan() {
           if (_answer6) {
             plan.createValRsc = {
               path: path.join(valUtilsDir, analysis.isTypeScript ? "val.rsc.ts" : "val.rsc.js"),
-              source: VAL_RSC(valUtilsImportPath)
+              source: VAL_RSC(valUtilsImportPath, valModulesServerImport)
             };
           } else {
             plan.createValRsc = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@valbuild/init",
-  "version": "0.63.4",
+  "version": "0.64.0",
   "description": "Initialize a new val.build project",
   "exports": {
     "./main": {

package/src/codemods/transformNextAppRouterValProvider.ts

@@ -3,7 +3,7 @@ import j from "jscodeshift";
 export function transformNextAppRouterValProvider(
   fileInfo: j.FileInfo,
   api: j.API,
-  options: j.Options
+  options: j.Options,
 ) {
   if (!options.configImportPath) {
     throw new Error("configImportPath is required");
@@ -15,14 +15,14 @@ export function transformNextAppRouterValProvider(
     .insertBefore(
       j.importDeclaration(
         [j.importSpecifier(j.identifier("ValProvider"))],
-        j.literal("@valbuild/next")
-      )
+        j.literal("@valbuild/next"),
+      ),
     )
     .insertBefore(
       j.importDeclaration(
         [j.importSpecifier(j.identifier("config"))],
-        j.literal(options.configImportPath)
-      )
+        j.literal(options.configImportPath),
+      ),
     );
   root
     .findJSXElements("body")
@@ -66,8 +66,8 @@ export function transformNextAppRouterValProvider(
                 },
                 type: "JSXClosingElement",
               },
-              [j.jsxExpressionContainer(j.identifier("children"))]
-            )
+              [j.jsxExpressionContainer(j.identifier("children"))],
+            ),
           );
         }
       }

package/src/codemods.test.ts

@@ -42,7 +42,7 @@ describe("codemods", () => {
       },
       {
         configImportPath: "../val.config",
-      }
+      },
     );
     expect(res).toEqual(`import { ValProvider } from "@valbuild/next";
 import { config } from "../val.config";

package/src/init.ts

@@ -26,14 +26,14 @@ const MIN_NEXT_VERSION = "13.4.0";
 let maxResetLength = 0;
 export async function init(
   root: string = process.cwd(),
-  { yes: defaultAnswers }: { yes?: boolean } = {}
+  { yes: defaultAnswers }: { yes?: boolean } = {},
 ) {
   logger.info(
     "Initializing " +
       chalk.bgBlack.hex("#37cd99")("Val") +
       ' in "' +
       root +
-      '"...\n'
+      '"...\n',
   );
   process.stdout.write("Analyzing project...");
   const analysis = await analyze(path.resolve(root), walk(path.resolve(root)));
@@ -126,7 +126,7 @@ const analyze = async (root: string, files: string[]): Promise<Analysis> => {
   }
   const analysis: Analysis = { root };
   const packageJsonPath = files.find(
-    (file) => file === [root, "package.json"].join(sep)
+    (file) => file === [root, "package.json"].join(sep),
   );
   analysis.packageJsonDir = packageJsonPath && path.dirname(packageJsonPath);
 
@@ -148,7 +148,7 @@ const analyze = async (root: string, files: string[]): Promise<Analysis> => {
         analysis.valNextVersion = packageJson.dependencies["@valbuild/next"];
       } catch (err) {
         throw new Error(
-          `Failed to parse package.json in file: ${packageJsonPath}`
+          `Failed to parse package.json in file: ${packageJsonPath}`,
         );
       }
     }
@@ -158,7 +158,7 @@ const analyze = async (root: string, files: string[]): Promise<Analysis> => {
     if (minNextVersion) {
       analysis.nextVersionIsSatisfied = semver.satisfies(
         minNextVersion,
-        ">=" + MIN_NEXT_VERSION
+        ">=" + MIN_NEXT_VERSION,
       );
     }
   }
@@ -167,7 +167,7 @@ const analyze = async (root: string, files: string[]): Promise<Analysis> => {
     if (minValVersion) {
       analysis.valNextVersionIsSatisfied = semver.satisfies(
         minValVersion,
-        ">=" + MIN_VAL_VERSION
+        ">=" + MIN_VAL_VERSION,
       );
     }
   }
@@ -176,7 +176,7 @@ const analyze = async (root: string, files: string[]): Promise<Analysis> => {
     if (minValVersion) {
       analysis.valCoreVersionIsSatisfied = semver.satisfies(
         minValVersion,
-        ">=" + MIN_VAL_VERSION
+        ">=" + MIN_VAL_VERSION,
       );
     }
   }
@@ -187,7 +187,7 @@ const analyze = async (root: string, files: string[]): Promise<Analysis> => {
     if (analysis.eslintRcJsText) {
       // TODO: Evaluate and extract config?
       analysis.isValEslintRulesConfigured = analysis.eslintRcJsText.includes(
-        "plugin:@valbuild/recommended"
+        "plugin:@valbuild/recommended",
       );
     }
   }
@@ -197,12 +197,12 @@ const analyze = async (root: string, files: string[]): Promise<Analysis> => {
   if (analysis.eslintRcJsonPath) {
     analysis.eslintRcJsonText = fs.readFileSync(
       analysis.eslintRcJsonPath,
-      "utf8"
+      "utf8",
     );
     if (analysis.eslintRcJsonText) {
       // TODO: Parse properly
       analysis.isValEslintRulesConfigured = analysis.eslintRcJsonText.includes(
-        "plugin:@valbuild/recommended"
+        "plugin:@valbuild/recommended",
       );
     }
   }
@@ -295,7 +295,7 @@ type Plan = Partial<{
 
 async function plan(
   analysis: Readonly<Analysis>,
-  defaultAnswers: boolean = false
+  defaultAnswers: boolean = false,
 ): Promise<Plan> {
   const plan: Plan = { root: analysis.root };
 
@@ -329,7 +329,7 @@ async function plan(
   } else {
     if (!analysis.valCoreVersionIsSatisfied) {
       logger.warn(
-        `  This init script expects @valbuild/core >= ${MIN_VAL_VERSION}. Found: ${analysis.valCoreVersion}`
+        `  This init script expects @valbuild/core >= ${MIN_VAL_VERSION}. Found: ${analysis.valCoreVersion}`,
       );
       const answer = !defaultAnswers
         ? await confirm({
@@ -339,14 +339,14 @@ async function plan(
         : false;
       if (!answer) {
         logger.error(
-          `Aborted: @valbuild/core version is not satisfied.\n\nInstall the @valbuild/core@${MIN_VAL_VERSION} package with your favorite package manager.\n\nExample:\n\n  npm install -D @valbuild/core@${MIN_VAL_VERSION}\n`
+          `Aborted: @valbuild/core version is not satisfied.\n\nInstall the @valbuild/core@${MIN_VAL_VERSION} package with your favorite package manager.\n\nExample:\n\n  npm install -D @valbuild/core@${MIN_VAL_VERSION}\n`,
         );
         return { abort: true };
       }
     } else {
       logger.info(
         `  Val version: found ${analysis.valCoreVersion} >= ${MIN_VAL_VERSION}`,
-        { isGood: true }
+        { isGood: true },
       );
     }
   }
@@ -356,7 +356,7 @@ async function plan(
   } else {
     if (!analysis.valNextVersionIsSatisfied) {
       logger.warn(
-        `  This init script expects @valbuild/next >= ${MIN_VAL_VERSION}. Found: ${analysis.valNextVersion}`
+        `  This init script expects @valbuild/next >= ${MIN_VAL_VERSION}. Found: ${analysis.valNextVersion}`,
       );
       const answer = !defaultAnswers
         ? await confirm({
@@ -366,26 +366,26 @@ async function plan(
         : false;
       if (!answer) {
         logger.error(
-          `Aborted: @valbuild/next version is not satisfied.\n\nInstall the @valbuild/next@${MIN_VAL_VERSION} package with your favorite package manager.\n\nExample:\n\n  npm install -D @valbuild/next@${MIN_VAL_VERSION}\n`
+          `Aborted: @valbuild/next version is not satisfied.\n\nInstall the @valbuild/next@${MIN_VAL_VERSION} package with your favorite package manager.\n\nExample:\n\n  npm install -D @valbuild/next@${MIN_VAL_VERSION}\n`,
         );
         return { abort: true };
       }
     } else {
       logger.info(
         `  Val version: found ${analysis.valNextVersion} >= ${MIN_VAL_VERSION}`,
-        { isGood: true }
+        { isGood: true },
       );
     }
   }
   if (!analysis.nextVersionIsSatisfied) {
     logger.error(
-      `Val requires Next.js >= ${MIN_NEXT_VERSION}. Found: ${analysis.nextVersion}`
+      `Val requires Next.js >= ${MIN_NEXT_VERSION}. Found: ${analysis.nextVersion}`,
     );
     return { abort: true };
   } else {
     logger.info(
       `  Next.js version: found ${analysis.nextVersion} >= ${MIN_NEXT_VERSION}`,
-      { isGood: true }
+      { isGood: true },
     );
   }
   if (analysis.isTypeScript) {
@@ -426,7 +426,7 @@ async function plan(
       : false;
     if (!answer) {
       logger.error(
-        "Aborted: the Val eslint plugin is not installed.\n\nInstall the @valbuild/eslint-plugin package with your favorite package manager.\n\nExample:\n\n  npm install -D @valbuild/eslint-plugin\n"
+        "Aborted: the Val eslint plugin is not installed.\n\nInstall the @valbuild/eslint-plugin package with your favorite package manager.\n\nExample:\n\n  npm install -D @valbuild/eslint-plugin\n",
       );
       return { abort: true };
     }
@@ -445,7 +445,7 @@ async function plan(
         "  Git state: clean (only package.json / lock files modified)",
         {
           isGood: true,
-        }
+        },
       );
     } else {
       logger.info("  Git state: clean", { isGood: true });
@@ -474,11 +474,11 @@ async function plan(
   // New required files:
   const valConfigPath = path.join(
     analysis.root,
-    analysis.isTypeScript ? "val.config.ts" : "val.config.js"
+    analysis.isTypeScript ? "val.config.ts" : "val.config.js",
   );
   if (fs.existsSync(valConfigPath)) {
     logger.error(
-      `Aborted: a Val config file: ${valConfigPath} already exists.`
+      `Aborted: a Val config file: ${valConfigPath} already exists.`,
     );
     return { abort: true };
   }
@@ -499,7 +499,7 @@ async function plan(
       const exampleDir = path.join(analysis.srcDir, "examples", "val");
       const examplePath = path.join(
         exampleDir,
-        "example.val." + (analysis.isJavaScript ? "js" : "ts")
+        "example.val." + (analysis.isJavaScript ? "js" : "ts"),
       );
       const exampleImport = path
         .relative(exampleDir, valConfigPath)
@@ -507,12 +507,12 @@ async function plan(
         .replace(".ts", "");
       if (!analysis.packageJsonDir) {
         throw Error(
-          "Could not detect package.json directory! This is a Val bug."
+          "Could not detect package.json directory! This is a Val bug.",
         );
       }
       const exampleModuleFilePath = `/${path.relative(
         analysis.packageJsonDir,
-        examplePath
+        examplePath,
       )}`;
 
       plan.includeExample = {
@@ -520,7 +520,7 @@ async function plan(
         source: BASIC_EXAMPLE(
           exampleModuleFilePath,
           exampleImport,
-          !!analysis.isJavaScript
+          !!analysis.isJavaScript,
         ),
       };
     }
@@ -555,7 +555,7 @@ async function plan(
     .replace(".ts", "");
   const valServerPath = path.join(
     valUtilsDir,
-    analysis.isTypeScript ? "val.server.ts" : "val.server.js"
+    analysis.isTypeScript ? "val.server.ts" : "val.server.js",
   );
   plan.createValServer = {
     path: valServerPath,
@@ -571,7 +571,7 @@ async function plan(
     "(val)",
     "val",
     "[[...val]]",
-    analysis.isTypeScript ? "page.tsx" : "page.jsx"
+    analysis.isTypeScript ? "page.tsx" : "page.jsx",
   );
   const valPageImportPath = path
     .relative(path.dirname(valAppPagePath), valConfigPath)
@@ -588,7 +588,7 @@ async function plan(
     "api",
     "val",
     "[[...val]]",
-    analysis.isTypeScript ? "route.ts" : "route.js"
+    analysis.isTypeScript ? "route.ts" : "route.js",
   );
   const valRouterImportPath = path
     .relative(path.dirname(valRouterPath), valServerPath)
@@ -612,7 +612,7 @@ async function plan(
       plan.createValClient = {
         path: path.join(
           valUtilsDir,
-          analysis.isTypeScript ? "val.client.ts" : "val.client.js"
+          analysis.isTypeScript ? "val.client.ts" : "val.client.js",
         ),
         source: VAL_CLIENT(valUtilsImportPath),
       };
@@ -631,9 +631,9 @@ async function plan(
       plan.createValRsc = {
         path: path.join(
           valUtilsDir,
-          analysis.isTypeScript ? "val.rsc.ts" : "val.rsc.js"
+          analysis.isTypeScript ? "val.rsc.ts" : "val.rsc.js",
         ),
-        source: VAL_RSC(valUtilsImportPath),
+        source: VAL_RSC(valUtilsImportPath, valModulesServerImport),
       };
     } else {
       plan.createValRsc = false;
@@ -666,7 +666,7 @@ async function plan(
           .relative(path.dirname(analysis.appRouterLayoutPath), valConfigPath)
           .replace(".js", "")
           .replace(".ts", ""),
-      }
+      },
     );
 
     const diff = diffLines(analysis.appRouterLayoutFile, res, {});
@@ -717,7 +717,7 @@ async function plan(
     } else {
       if (analysis.eslintRcJsPath) {
         logger.warn(
-          'Cannot patch eslint: found .eslintrc.js but can only patch JSON files (at the moment).\nAdd the following to your eslint config:\n\n  "extends": ["plugin:@valbuild/recommended"]\n'
+          'Cannot patch eslint: found .eslintrc.js but can only patch JSON files (at the moment).\nAdd the following to your eslint config:\n\n  "extends": ["plugin:@valbuild/recommended"]\n',
         );
       } else if (analysis.eslintRcJsonPath) {
         const answer = !defaultAnswers
@@ -730,12 +730,12 @@ async function plan(
         if (answer) {
           const currentEslintRc = fs.readFileSync(
             analysis.eslintRcJsonPath,
-            "utf-8"
+            "utf-8",
           );
           const parsedEslint = JSON.parse(currentEslintRc);
           if (typeof parsedEslint !== "object") {
             logger.error(
-              `Could not patch eslint: ${analysis.eslintRcJsonPath} was not an object`
+              `Could not patch eslint: ${analysis.eslintRcJsonPath} was not an object`,
             );
             return { abort: true };
           }
@@ -798,7 +798,7 @@ async function plan(
             logger.warn(
               `Failed to parse VS Code extensions.json found here: ${settingsPath}.${
                 err instanceof Error ? `Parse error: ${err.message}` : ""
-              }`
+              }`,
             );
             return {
               abort: true,
@@ -816,7 +816,7 @@ async function plan(
         currentSettings = {
           ...currentSettings,
           recommendations: (currentRecommendations || []).concat(
-            valBuildIntelliSense
+            valBuildIntelliSense,
           ),
         };
       }
@@ -865,12 +865,12 @@ Val was successfully initialized!
       `https://app.val.build/orgs/new${
         plan.gitRemote
           ? `?org=${encodeURIComponent(
-              plan.gitRemote.owner
+              plan.gitRemote.owner,
             )}&owner=${encodeURIComponent(
-              plan.gitRemote.owner
+              plan.gitRemote.owner,
             )}&repo=${encodeURIComponent(plan.gitRemote.repo)}`
           : ""
-      }`
+      }`,
     )}
 
 `);
@@ -879,7 +879,7 @@ Val was successfully initialized!
 function writeFile(
   fileOp: FileOp | undefined,
   rootDir: string,
-  isUpdate: boolean
+  isUpdate: boolean,
 ) {
   if (fileOp) {
     fs.mkdirSync(path.dirname(fileOp.path), { recursive: true });
@@ -887,9 +887,9 @@ function writeFile(
     logger.info(
       `  ${isUpdate ? "Patched" : "Created"} file: ${fileOp.path.replace(
         rootDir,
-        ""
+        "",
       )}`,
-      { isGood: true }
+      { isGood: true },
     );
   }
 }
@@ -907,7 +907,7 @@ function getGitStatusIsClean(gitStatus: StatusResult): Analysis["isGitClean"] {
           path === "yarn.lock" ||
           path === "pnpm-lock.yaml"
         )
-      )
+      ),
   );
   if (filteredFiles.length === 0) {
     if (gitStatus.files.length !== 0) {

package/src/logger.ts

@@ -10,7 +10,7 @@ export function warn(message: string) {
 
 export function info(
   message: string,
-  opts: { isCodeSnippet?: true; isGood?: true } = {}
+  opts: { isCodeSnippet?: true; isGood?: true } = {},
 ) {
   if (opts.isCodeSnippet) {
     console.log(chalk.cyanBright("$ >        ") + chalk.cyan(message));

package/src/main.ts

@@ -27,7 +27,7 @@ async function main() {
         },
       },
       hardRejection: false,
-    }
+    },
   );
 
   await init(flags.root, { yes: flags.yes });
@@ -42,8 +42,8 @@ void main().catch((err) => {
     err instanceof Error
       ? err.message + "\n" + err.stack
       : typeof err === "object"
-      ? JSON.stringify(err, null, 2)
-      : err
+        ? JSON.stringify(err, null, 2)
+        : err,
   );
   process.exitCode = 1;
 });

package/src/templates.ts

@@ -7,12 +7,16 @@ const { useValStega: useVal } = initValClient(config);
 export { useVal };
 `;
 
-export const VAL_RSC = (configImportPath: string) => `import "server-only";
+export const VAL_RSC = (
+  configImportPath: string,
+  valModulesImportPath: string,
+) => `import "server-only";
 import { initValRsc } from "@valbuild/next/rsc";
 import { config } from "${configImportPath}";
+import valModules from "${valModulesImportPath}";
 import { cookies, draftMode, headers } from "next/headers";
 
-const { fetchValStega: fetchVal } = initValRsc(config, {
+const { fetchValStega: fetchVal } = initValRsc(config, valModules, {
   draftMode,
   headers,
   cookies,
@@ -23,7 +27,7 @@ export { fetchVal };
 
 export const VAL_SERVER = (
   configImportPath: string,
-  valModulesImportPath: string
+  valModulesImportPath: string,
 ) => `import "server-only";
 import { initValServer } from "@valbuild/next/server";
 import { config } from "${configImportPath}";
@@ -50,7 +54,7 @@ type ValConfig = {
 };
 export const VAL_CONFIG = (
   isTypeScript: boolean,
-  options: ValConfig
+  options: ValConfig,
 ) => `import { initVal } from "@valbuild/next";
 
 const { s, c, val, config } = initVal(${JSON.stringify(options, null, 2)});
@@ -60,7 +64,7 @@ export { s, c, val, config };
 `;
 
 export const VAL_API_ROUTER = (
-  valServerPath: string
+  valServerPath: string,
 ) => `import { valNextAppRouter } from "${valServerPath}";
 
 export const GET = valNextAppRouter;
@@ -72,7 +76,7 @@ export const HEAD = valNextAppRouter;
 `;
 
 export const VAL_APP_PAGE = (
-  configImportPath: string
+  configImportPath: string,
 ) => `import { ValApp } from "@valbuild/next";
 import { config } from "${configImportPath}";
 
@@ -83,7 +87,7 @@ export default function Val() {
 
 export const VAL_MODULES = (
   configImportPath: string,
-  exampleModuleImport?: string
+  exampleModuleImport?: string,
 ) => `import { modules } from "@valbuild/next";
 import { config } from "./${configImportPath}";
 
@@ -101,7 +105,7 @@ export default modules(config, [
 export const BASIC_EXAMPLE = (
   moduleFilePath: string,
   configImportPath: string,
-  isJavaScript: boolean
+  isJavaScript: boolean,
 ) => `${isJavaScript ? "// @ts-check\n" : ""}/**
  * Val example file - generated by @valbuild/init
  **/