@valbuild/init 0.60.24 → 0.61.0

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

@@ -504,7 +504,7 @@ function transformNextAppRouterValProvider(fileInfo, api, options) {
 
 var packageJson = {
 	name: "@valbuild/init",
-	version: "0.60.24",
+	version: "0.61.0",
 	description: "Initialize a new val.build project",
 	exports: {
 		"./main": {
@@ -576,7 +576,7 @@ var VAL_APP_PAGE = function VAL_APP_PAGE(configImportPath) {
   return "import { ValApp } from \"@valbuild/next\";\nimport { config } from \"".concat(configImportPath, "\";\n\nexport default function Val() {\n  return <ValApp config={config} />;\n}\n");
 };
 var BASIC_EXAMPLE = function BASIC_EXAMPLE(moduleId, configImportPath, isJavaScript) {
-  return "".concat(isJavaScript ? "// @ts-check\n" : "", "/**\n * Val example file - generated by @valbuild/init\n **/\n\nimport {\n  s /* s = schema */,\n  c /* c = content */,").concat(isJavaScript ? "" : "\n  type t /* t = type */,", "\n} from \"").concat(configImportPath, "\";\n\n/**\n * This is the schema for the content. It defines the structure of the content and the types of each field.\n *\n * @docs https://val.build/docs/api-reference\n */\nexport const testSchema = s.object({\n  /**\n   * Basic text field\n   */\n  text: s.string(),\n\n  /**\n   * Optional fields are marked with `.optional()`\n   */\n  optionals: s.string().optional(),\n\n  arrays: s.array(s.string()),\n  /**\n   * Records are objects where entries can be added. Useful for array-like structures where you would use a key to uniquely identify each entry.\n   */\n  records: s.record(s.string()),\n\n  /**\n   * Rich text can be used for multiline text, but also for more complex text editing capabilities like links, images, lists, etc.\n   *\n   * @docs https://val.build/docs/api-reference/schema-types/richtext\n   *\n   * @see ValRichText will render rich text\n   */\n  richText: s.richtext({\n    // All features enabled:\n    bold: true,\n    italic: true,\n    lineThrough: true,\n    headings: [\"h1\", \"h2\", \"h3\", \"h4\", \"h5\", \"h6\"],\n    a: true,\n    img: true,\n    ul: true,\n    ol: true,\n  }),\n\n  /**\n   * Images in Val are stored as files in the public folder.\n   *\n   * @docs https://val.build/docs/api-reference/schema-types/image\n   *\n   * When defining content use the following syntax:\n   * @example c.file('/public/myimage.png') // path to the image file, use the VS Code plugin or the `@valbuild/cli validate --fix` command to add metadata\n   *\n   * @see ValImage component to see how to render this in your app\n   */\n  image: s.image().optional(),\n\n  /**\n   * String enums: presents as a dropdown in the UI\n   */\n  stringEnum: s.union(s.literal(\"lit-0\"), s.literal(\"lit-1\")),\n\n  /**\n   * Raw strings disables the stega (steganography) feature that automatically tags content when using the overlay.\n   * It is useful for slugs and other data that might be processed in code (parsed or matching for equality...)\n   */\n  slug: s.string().raw(),\n\n  /**\n   * Object unions: presents as a dropdown in the UI and the different fields\n   *\n   * @docs https://val.build/docs/api-reference/schema-types/union\n   */\n  objectUnions: s.union(\n    \"type\",\n    s.object({\n      type: s.literal(\"page-type-1\"),\n      value: s.number(),\n    }),\n    s.object({\n      type: s.literal(\"page-type-2\"),\n      text: s.string(),\n    })\n  ),\n});\n").concat(isJavaScript ? "" : "\n/**\n * t.inferSchema returns the type of the content.\n * This pattern is useful to type props of components that use this content (partially or whole)\n */\nexport type TestContent = t.inferSchema<typeof testSchema>;\n", "\n\n/**\n * This is the content definition. Add your content below.\n *\n * NOTE: the first argument, module id, must match the path of the file.\n */\nexport default c.define(\"").concat(moduleId, "\", testSchema, {\n  text: \"Basic text content\",\n  optionals: null,\n  arrays: [\"A string\"],\n  records: {\n    \"unique-key-1\": \"A string\",\n  },\n  richText: c.richtext`# Title 1\n\n${c.rt.link(\"Val docs\", { href: \"https://val.build/docs\" })}\n\n- List item 1\n- List item 2\n`,\n  image: null,\n  slug: \"test\",\n  objectUnions: {\n    type: \"page-type-2\",\n    text: \"String value\",\n  },\n  stringEnum: \"lit-1\",\n});\n");
+  return "".concat(isJavaScript ? "// @ts-check\n" : "", "/**\n * Val example file - generated by @valbuild/init\n **/\n\nimport {\n  s /* s = schema */,\n  c /* c = content */,").concat(isJavaScript ? "" : "\n  type t /* t = type */,", "\n} from \"").concat(configImportPath, "\";\n\n/**\n * This is the schema for the content. It defines the structure of the content and the types of each field.\n *\n * @docs https://val.build/docs/api-reference\n */\nexport const testSchema = s.object({\n  /**\n   * Basic text field\n   */\n  text: s.string(),\n\n  /**\n   * Nullable are optional fields in the UI that can be null or not\n   */\n  optionals: s.string().nullable(),\n\n  arrays: s.array(s.string()),\n  /**\n   * Records are objects where entries can be added. Useful for array-like structures where you would use a key to uniquely identify each entry.\n   */\n  records: s.record(s.string()),\n\n  /**\n   * Rich text can be used for multiline text, but also for more complex text editing capabilities like links, images, lists, etc.\n   *\n   * @docs https://val.build/docs/api-reference/schema-types/richtext\n   *\n   * @see ValRichText will render rich text\n   */\n  richText: s.richtext({\n    // All features enabled:\n    bold: true,\n    italic: true,\n    lineThrough: true,\n    headings: [\"h1\", \"h2\", \"h3\", \"h4\", \"h5\", \"h6\"],\n    a: true,\n    img: true,\n    ul: true,\n    ol: true,\n  }),\n\n  /**\n   * Images in Val are stored as files in the public folder.\n   *\n   * @docs https://val.build/docs/api-reference/schema-types/image\n   *\n   * When defining content use the following syntax:\n   * @example c.file('/public/myimage.png') // path to the image file, use the VS Code plugin or the `@valbuild/cli validate --fix` command to add metadata\n   *\n   * @see ValImage component to see how to render this in your app\n   */\n  image: s.image().nullable(),\n\n  /**\n   * String enums: presents as a dropdown in the UI\n   */\n  stringEnum: s.union(s.literal(\"lit-0\"), s.literal(\"lit-1\")),\n\n  /**\n   * Raw strings disables the stega (steganography) feature that automatically tags content when using the overlay.\n   * It is useful for slugs and other data that might be processed in code (parsed or matching for equality...)\n   */\n  slug: s.string().raw(),\n\n  /**\n   * Object unions: presents as a dropdown in the UI and the different fields\n   *\n   * @docs https://val.build/docs/api-reference/schema-types/union\n   */\n  objectUnions: s.union(\n    \"type\",\n    s.object({\n      type: s.literal(\"page-type-1\"),\n      value: s.number(),\n    }),\n    s.object({\n      type: s.literal(\"page-type-2\"),\n      text: s.string(),\n    })\n  ),\n});\n").concat(isJavaScript ? "" : "\n/**\n * t.inferSchema returns the type of the content.\n * This pattern is useful to type props of components that use this content (partially or whole)\n */\nexport type TestContent = t.inferSchema<typeof testSchema>;\n", "\n\n/**\n * This is the content definition. Add your content below.\n *\n * NOTE: the first argument, module id, must match the path of the file.\n */\nexport default c.define(\"").concat(moduleId, "\", testSchema, {\n  text: \"Basic text content\",\n  optionals: null,\n  arrays: [\"A string\"],\n  records: {\n    \"unique-key-1\": \"A string\",\n  },\n  richText: c.richtext`# Title 1\n\n${c.rt.link(\"Val docs\", { href: \"https://val.build/docs\" })}\n\n- List item 1\n- List item 2\n`,\n  image: null,\n  slug: \"test\",\n  objectUnions: {\n    type: \"page-type-2\",\n    text: \"String value\",\n  },\n  stringEnum: \"lit-1\",\n});\n");
 };
 
 function error(message) {
@@ -664,7 +664,7 @@ function walk(dir) {
 }
 var analyze = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(root, files) {
-    var analysis, packageJsonPath, packageJsonText, _packageJson, _semver$minVersion, minNextVersion, _semver$minVersion2, minValVersion, pagesRouterAppPath, appRouterLayoutPath, git, gitStatus, gitRemoteOrigin, parts, owner, repo, gitIgnorePath;
+    var analysis, packageJsonPath, packageJsonText, _packageJson, _semver$minVersion, minNextVersion, _semver$minVersion2, minValVersion, _semver$minVersion3, _minValVersion, pagesRouterAppPath, appRouterLayoutPath, git, gitStatus, gitRemoteOrigin, parts, owner, repo, gitIgnorePath;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -682,38 +682,46 @@ var analyze = /*#__PURE__*/function () {
           });
           analysis.packageJsonDir = packageJsonPath && path.dirname(packageJsonPath);
           if (!packageJsonPath) {
-            _context.next = 20;
+            _context.next = 22;
             break;
           }
           packageJsonText = fs.readFileSync(packageJsonPath, "utf8");
           if (!packageJsonText) {
-            _context.next = 20;
+            _context.next = 22;
             break;
           }
           _context.prev = 8;
           _packageJson = JSON.parse(packageJsonText);
-          analysis.isValInstalled = !!_packageJson.dependencies["@valbuild/next"];
+          analysis.isValCoreInstalled = !!_packageJson.dependencies["@valbuild/core"];
+          analysis.isValNextInstalled = !!_packageJson.dependencies["@valbuild/next"];
           analysis.isNextInstalled = !!_packageJson.dependencies["next"];
           analysis.valEslintVersion = _packageJson.devDependencies["@valbuild/eslint-plugin"] || _packageJson.dependencies["@valbuild/eslint-plugin"];
           analysis.nextVersion = _packageJson.dependencies["next"];
-          analysis.valVersion = _packageJson.dependencies["@valbuild/next"];
-          _context.next = 20;
+          analysis.valCoreVersion = _packageJson.dependencies["@valbuild/core"];
+          analysis.valNextVersion = _packageJson.dependencies["@valbuild/next"];
+          _context.next = 22;
           break;
-        case 17:
-          _context.prev = 17;
+        case 19:
+          _context.prev = 19;
           _context.t0 = _context["catch"](8);
           throw new Error("Failed to parse package.json in file: ".concat(packageJsonPath));
-        case 20:
+        case 22:
           if (analysis.nextVersion) {
             minNextVersion = (_semver$minVersion = semver.minVersion(analysis.nextVersion)) === null || _semver$minVersion === void 0 ? void 0 : _semver$minVersion.version;
             if (minNextVersion) {
               analysis.nextVersionIsSatisfied = semver.satisfies(minNextVersion, ">=" + MIN_NEXT_VERSION);
             }
           }
-          if (analysis.valVersion) {
-            minValVersion = (_semver$minVersion2 = semver.minVersion(analysis.valVersion)) === null || _semver$minVersion2 === void 0 ? void 0 : _semver$minVersion2.version;
+          if (analysis.valNextVersion) {
+            minValVersion = (_semver$minVersion2 = semver.minVersion(analysis.valNextVersion)) === null || _semver$minVersion2 === void 0 ? void 0 : _semver$minVersion2.version;
             if (minValVersion) {
-              analysis.valVersionIsSatisfied = semver.satisfies(minValVersion, ">=" + MIN_VAL_VERSION);
+              analysis.valNextVersionIsSatisfied = semver.satisfies(minValVersion, ">=" + MIN_VAL_VERSION);
+            }
+          }
+          if (analysis.valCoreVersion) {
+            _minValVersion = (_semver$minVersion3 = semver.minVersion(analysis.valCoreVersion)) === null || _semver$minVersion3 === void 0 ? void 0 : _semver$minVersion3.version;
+            if (_minValVersion) {
+              analysis.valCoreVersionIsSatisfied = semver.satisfies(_minValVersion, ">=" + MIN_VAL_VERSION);
             }
           }
           analysis.eslintRcJsPath = files.find(function (file) {
@@ -763,15 +771,15 @@ var analyze = /*#__PURE__*/function () {
             analysis.appRouterPath = path.dirname(appRouterLayoutPath);
             analysis.srcDir = path.dirname(analysis.appRouterPath);
           }
-          _context.prev = 31;
+          _context.prev = 34;
           git = simpleGit(root);
-          _context.next = 35;
+          _context.next = 38;
           return git.status([]);
-        case 35:
+        case 38:
           gitStatus = _context.sent;
-          _context.next = 38;
+          _context.next = 41;
           return git.remote(["-v"]);
-        case 38:
+        case 41:
           gitRemoteOrigin = _context.sent;
           analysis.hasGit = true;
           analysis.isGitHub = gitRemoteOrigin ? !!gitRemoteOrigin.includes("github.com") : false;
@@ -787,21 +795,21 @@ var analyze = /*#__PURE__*/function () {
               repo: repo
             };
           }
-          _context.next = 47;
+          _context.next = 50;
           break;
-        case 45:
-          _context.prev = 45;
-          _context.t1 = _context["catch"](31);
-        case 47:
+        case 48:
+          _context.prev = 48;
+          _context.t1 = _context["catch"](34);
+        case 50:
           gitIgnorePath = path.join(root, ".gitignore");
           analysis.gitIgnorePath = gitIgnorePath;
           analysis.gitIgnoreFile = fs.readFileSync(gitIgnorePath, "utf-8");
           return _context.abrupt("return", analysis);
-        case 51:
+        case 54:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[8, 17], [31, 45]]);
+    }, _callee, null, [[8, 19], [34, 48]]);
   }));
   return function analyze(_x, _x2) {
     return _ref2.apply(this, arguments);
@@ -815,10 +823,11 @@ function _plan() {
     var defaultAnswers,
       plan,
       answer,
+      _answer,
       tsconfigJsonPath,
       jsconfigJsonPath,
-      _answer,
       _answer2,
+      _answer3,
       valConfigPath,
       valUtilsDir,
       valUtilsImportPath,
@@ -827,26 +836,26 @@ function _plan() {
       valPageImportPath,
       valRouterPath,
       valRouterImportPath,
-      _answer3,
       _answer4,
+      _answer5,
       NO_PATCH_WARNING,
       res,
       diff,
       s,
-      _answer5,
       _answer6,
       _answer7,
+      _answer8,
       currentEslintRc,
       parsedEslint,
-      _answer8,
       _answer9,
+      _answer10,
       vscodeDir,
       settingsPath,
       currentSettings,
       currentSettingsFile,
       currentRecommendations,
       valBuildIntelliSense,
-      _answer10,
+      _answer11,
       exampleDir,
       examplePath,
       exampleImport,
@@ -907,20 +916,20 @@ function _plan() {
             abort: true
           });
         case 20:
-          if (analysis.isValInstalled) {
+          if (analysis.isValCoreInstalled) {
             _context3.next = 25;
             break;
           }
-          error("Install @valbuild/next first");
+          error("Install @valbuild/core first");
           return _context3.abrupt("return", {
             abort: true
           });
         case 25:
-          if (analysis.valVersionIsSatisfied) {
+          if (analysis.valCoreVersionIsSatisfied) {
             _context3.next = 40;
             break;
           }
-          warn("  This init script expects @valbuild/next >= ".concat(MIN_VAL_VERSION, ". Found: ").concat(analysis.valVersion));
+          warn("  This init script expects @valbuild/core >= ".concat(MIN_VAL_VERSION, ". Found: ").concat(analysis.valCoreVersion));
           if (defaultAnswers) {
             _context3.next = 33;
             break;
@@ -942,7 +951,7 @@ function _plan() {
             _context3.next = 38;
             break;
           }
-          error("Aborted: val version is not satisfied.\n\nInstall the @valbuild/next@".concat(MIN_VAL_VERSION, " package with your favorite package manager.\n\nExample:\n\n  npm install -D @valbuild/next@").concat(MIN_VAL_VERSION, "\n"));
+          error("Aborted: @valbuild/core version is not satisfied.\n\nInstall the @valbuild/core@".concat(MIN_VAL_VERSION, " package with your favorite package manager.\n\nExample:\n\n  npm install -D @valbuild/core@").concat(MIN_VAL_VERSION, "\n"));
           return _context3.abrupt("return", {
             abort: true
           });
@@ -950,23 +959,70 @@ function _plan() {
           _context3.next = 41;
           break;
         case 40:
-          info("  Val version: found ".concat(analysis.valVersion, " >= ").concat(MIN_VAL_VERSION), {
+          info("  Val version: found ".concat(analysis.valCoreVersion, " >= ").concat(MIN_VAL_VERSION), {
             isGood: true
           });
         case 41:
-          if (analysis.nextVersionIsSatisfied) {
+          if (analysis.isValNextInstalled) {
             _context3.next = 46;
             break;
           }
-          error("Val requires Next.js >= ".concat(MIN_NEXT_VERSION, ". Found: ").concat(analysis.nextVersion));
+          error("Install @valbuild/next first");
           return _context3.abrupt("return", {
             abort: true
           });
         case 46:
+          if (analysis.valNextVersionIsSatisfied) {
+            _context3.next = 61;
+            break;
+          }
+          warn("  This init script expects @valbuild/next >= ".concat(MIN_VAL_VERSION, ". Found: ").concat(analysis.valNextVersion));
+          if (defaultAnswers) {
+            _context3.next = 54;
+            break;
+          }
+          _context3.next = 51;
+          return confirm({
+            message: "Continue?",
+            "default": false
+          });
+        case 51:
+          _context3.t1 = _context3.sent;
+          _context3.next = 55;
+          break;
+        case 54:
+          _context3.t1 = false;
+        case 55:
+          _answer = _context3.t1;
+          if (_answer) {
+            _context3.next = 59;
+            break;
+          }
+          error("Aborted: @valbuild/next version is not satisfied.\n\nInstall the @valbuild/next@".concat(MIN_VAL_VERSION, " package with your favorite package manager.\n\nExample:\n\n  npm install -D @valbuild/next@").concat(MIN_VAL_VERSION, "\n"));
+          return _context3.abrupt("return", {
+            abort: true
+          });
+        case 59:
+          _context3.next = 62;
+          break;
+        case 61:
+          info("  Val version: found ".concat(analysis.valNextVersion, " >= ").concat(MIN_VAL_VERSION), {
+            isGood: true
+          });
+        case 62:
+          if (analysis.nextVersionIsSatisfied) {
+            _context3.next = 67;
+            break;
+          }
+          error("Val requires Next.js >= ".concat(MIN_NEXT_VERSION, ". Found: ").concat(analysis.nextVersion));
+          return _context3.abrupt("return", {
+            abort: true
+          });
+        case 67:
           info("  Next.js version: found ".concat(analysis.nextVersion, " >= ").concat(MIN_NEXT_VERSION), {
             isGood: true
           });
-        case 47:
+        case 68:
           if (analysis.isTypeScript) {
             info("  Use: TypeScript", {
               isGood: true
@@ -982,81 +1038,81 @@ function _plan() {
             }
           }
           if (!analysis.isTypeScript) {
-            _context3.next = 59;
+            _context3.next = 80;
             break;
           }
           tsconfigJsonPath = path.join(analysis.root, "tsconfig.json");
           if (!fs.statSync(tsconfigJsonPath).isFile()) {
-            _context3.next = 55;
+            _context3.next = 76;
             break;
           }
           info("  tsconfig.json: found", {
             isGood: true
           });
-          _context3.next = 57;
+          _context3.next = 78;
           break;
-        case 55:
+        case 76:
           error("tsconfig.json: Failed to find tsconfig.json");
           return _context3.abrupt("return", {
             abort: true
           });
-        case 57:
-          _context3.next = 66;
+        case 78:
+          _context3.next = 87;
           break;
-        case 59:
+        case 80:
           jsconfigJsonPath = path.join(analysis.root, "jsconfig.json");
           if (!fs.statSync(jsconfigJsonPath).isFile()) {
-            _context3.next = 64;
+            _context3.next = 85;
             break;
           }
           info("  jsconfig.json: found", {
             isGood: true
           });
-          _context3.next = 66;
+          _context3.next = 87;
           break;
-        case 64:
+        case 85:
           error(" jsconfig.json: failed to find jsconfig.json");
           return _context3.abrupt("return", {
             abort: true
           });
-        case 66:
+        case 87:
           if (!(analysis.valEslintVersion === undefined)) {
-            _context3.next = 80;
+            _context3.next = 101;
             break;
           }
           if (defaultAnswers) {
-            _context3.next = 73;
+            _context3.next = 94;
             break;
           }
-          _context3.next = 70;
+          _context3.next = 91;
           return confirm({
             message: "The recommended Val eslint plugin (@valbuild/eslint-plugin) is not installed. Continue?",
             "default": false
           });
-        case 70:
-          _context3.t1 = _context3.sent;
-          _context3.next = 74;
+        case 91:
+          _context3.t2 = _context3.sent;
+          _context3.next = 95;
           break;
-        case 73:
-          _context3.t1 = false;
-        case 74:
-          _answer = _context3.t1;
-          if (_answer) {
-            _context3.next = 78;
+        case 94:
+          _context3.t2 = false;
+        case 95:
+          _answer2 = _context3.t2;
+          if (_answer2) {
+            _context3.next = 99;
             break;
           }
           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");
           return _context3.abrupt("return", {
             abort: true
           });
-        case 78:
-          _context3.next = 81;
+        case 99:
+          _context3.next = 102;
           break;
-        case 80:
+        case 101:
           info("  @valbuild/eslint-plugin: installed", {
             isGood: true
           });
-        case 81:
+        case 102:
           if (analysis.appRouter) {
             info("  Use: App Router", {
               isGood: true
@@ -1082,55 +1138,55 @@ function _plan() {
             warn("  Git state: dirty");
           }
           if (analysis.isGitClean) {
-            _context3.next = 101;
+            _context3.next = 122;
             break;
           }
-        case 86:
+        case 107:
           if (!(plan.ignoreGitDirty === undefined)) {
-            _context3.next = 101;
+            _context3.next = 122;
             break;
           }
           if (defaultAnswers) {
-            _context3.next = 93;
+            _context3.next = 114;
             break;
           }
-          _context3.next = 90;
+          _context3.next = 111;
           return confirm({
             message: "You have uncommitted changes. Continue?",
             "default": false
           });
-        case 90:
-          _context3.t2 = _context3.sent;
-          _context3.next = 94;
+        case 111:
+          _context3.t3 = _context3.sent;
+          _context3.next = 115;
           break;
-        case 93:
-          _context3.t2 = false;
-        case 94:
-          _answer2 = _context3.t2;
-          plan.ignoreGitDirty = _answer2;
-          if (_answer2) {
-            _context3.next = 99;
+        case 114:
+          _context3.t3 = false;
+        case 115:
+          _answer3 = _context3.t3;
+          plan.ignoreGitDirty = _answer3;
+          if (_answer3) {
+            _context3.next = 120;
             break;
           }
           error("Aborted: git state dirty");
           return _context3.abrupt("return", {
             abort: true
           });
-        case 99:
-          _context3.next = 86;
+        case 120:
+          _context3.next = 107;
           break;
-        case 101:
+        case 122:
           // New required files:
           valConfigPath = path.join(analysis.root, analysis.isTypeScript ? "val.config.ts" : "val.config.js");
           if (!fs.existsSync(valConfigPath)) {
-            _context3.next = 105;
+            _context3.next = 126;
             break;
           }
           error("Aborted: a Val config file: ".concat(valConfigPath, " already exists."));
           return _context3.abrupt("return", {
             abort: true
           });
-        case 105:
+        case 126:
           plan.createConfigFile = {
             path: valConfigPath,
             source: VAL_CONFIG(!!analysis.isTypeScript, {})
@@ -1159,29 +1215,29 @@ function _plan() {
           };
 
           // Util files:
-        case 117:
+        case 138:
           if (!(plan.createValClient === undefined)) {
-            _context3.next = 129;
+            _context3.next = 150;
             break;
           }
           if (defaultAnswers) {
-            _context3.next = 124;
+            _context3.next = 145;
             break;
           }
-          _context3.next = 121;
+          _context3.next = 142;
           return confirm({
             message: "Setup useVal for Client Components",
             "default": true
           });
-        case 121:
-          _context3.t3 = _context3.sent;
-          _context3.next = 125;
+        case 142:
+          _context3.t4 = _context3.sent;
+          _context3.next = 146;
           break;
-        case 124:
-          _context3.t3 = true;
-        case 125:
-          _answer3 = _context3.t3;
-          if (_answer3) {
+        case 145:
+          _context3.t4 = true;
+        case 146:
+          _answer4 = _context3.t4;
+          if (_answer4) {
             plan.createValClient = {
               path: path.join(valUtilsDir, analysis.isTypeScript ? "val.client.ts" : "val.client.js"),
               source: VAL_CLIENT(valUtilsImportPath)
@@ -1189,31 +1245,31 @@ function _plan() {
           } else {
             plan.createValClient = false;
           }
-          _context3.next = 117;
+          _context3.next = 138;
           break;
-        case 129:
+        case 150:
           if (!(plan.createValRsc === undefined)) {
-            _context3.next = 141;
+            _context3.next = 162;
             break;
           }
           if (defaultAnswers) {
-            _context3.next = 136;
+            _context3.next = 157;
             break;
           }
-          _context3.next = 133;
+          _context3.next = 154;
           return confirm({
             message: "Setup fetchVal for React Server Components",
             "default": true
           });
-        case 133:
-          _context3.t4 = _context3.sent;
-          _context3.next = 137;
+        case 154:
+          _context3.t5 = _context3.sent;
+          _context3.next = 158;
           break;
-        case 136:
-          _context3.t4 = true;
-        case 137:
-          _answer4 = _context3.t4;
-          if (_answer4) {
+        case 157:
+          _context3.t5 = true;
+        case 158:
+          _answer5 = _context3.t5;
+          if (_answer5) {
             plan.createValRsc = {
               path: path.join(valUtilsDir, analysis.isTypeScript ? "val.rsc.ts" : "val.rsc.js"),
               source: VAL_RSC(valUtilsImportPath)
@@ -1221,24 +1277,24 @@ function _plan() {
           } else {
             plan.createValRsc = false;
           }
-          _context3.next = 129;
+          _context3.next = 150;
           break;
-        case 141:
+        case 162:
           // Patches:
           NO_PATCH_WARNING = "Remember to add the ValProvider in your root app/layout.tsx or pages/_app.tsx file.\n";
           if (!analysis.appRouterLayoutPath) {
-            _context3.next = 171;
+            _context3.next = 192;
             break;
           }
           if (analysis.appRouterLayoutFile) {
-            _context3.next = 146;
+            _context3.next = 167;
             break;
           }
           error("Failed to read app router layout file");
           return _context3.abrupt("return", {
             abort: true
           });
-        case 146:
+        case 167:
           res = transformNextAppRouterValProvider({
             path: analysis.appRouterLayoutPath,
             source: analysis.appRouterLayoutFile
@@ -1262,44 +1318,44 @@ function _plan() {
             }
           });
           if (defaultAnswers) {
-            _context3.next = 156;
+            _context3.next = 177;
             break;
           }
-          _context3.next = 153;
+          _context3.next = 174;
           return confirm({
             message: "Automatically patch ".concat(analysis.appRouterLayoutPath, " file?"),
             "default": true
           });
-        case 153:
-          _context3.t5 = _context3.sent;
-          _context3.next = 157;
+        case 174:
+          _context3.t6 = _context3.sent;
+          _context3.next = 178;
           break;
-        case 156:
-          _context3.t5 = true;
-        case 157:
-          _answer5 = _context3.t5;
-          if (!_answer5) {
-            _context3.next = 170;
+        case 177:
+          _context3.t6 = true;
+        case 178:
+          _answer6 = _context3.t6;
+          if (!_answer6) {
+            _context3.next = 191;
             break;
           }
           if (defaultAnswers) {
-            _context3.next = 165;
+            _context3.next = 186;
             break;
           }
-          _context3.next = 162;
+          _context3.next = 183;
           return confirm({
             message: "Do you accept the following patch:\n".concat(s, "\n"),
             "default": true
           });
-        case 162:
-          _context3.t6 = _context3.sent;
-          _context3.next = 166;
+        case 183:
+          _context3.t7 = _context3.sent;
+          _context3.next = 187;
           break;
-        case 165:
-          _context3.t6 = true;
-        case 166:
-          _answer6 = _context3.t6;
-          if (!_answer6) {
+        case 186:
+          _context3.t7 = true;
+        case 187:
+          _answer7 = _context3.t7;
+          if (!_answer7) {
             warn(NO_PATCH_WARNING);
             plan.updateAppLayout = false;
           } else {
@@ -1308,70 +1364,70 @@ function _plan() {
               source: res
             };
           }
-          _context3.next = 171;
+          _context3.next = 192;
           break;
-        case 170:
+        case 191:
           warn(NO_PATCH_WARNING);
-        case 171:
+        case 192:
           if (analysis.pagesRouter) {
             warn(NO_PATCH_WARNING);
           }
           if (!analysis.valEslintVersion) {
-            _context3.next = 203;
+            _context3.next = 224;
             break;
           }
           if (!analysis.isValEslintRulesConfigured) {
-            _context3.next = 177;
+            _context3.next = 198;
             break;
           }
           warn("  @valbuild/eslint-plugin rules: already configured");
-          _context3.next = 203;
+          _context3.next = 224;
           break;
-        case 177:
+        case 198:
           if (!analysis.eslintRcJsPath) {
-            _context3.next = 181;
+            _context3.next = 202;
             break;
           }
           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');
-          _context3.next = 203;
+          _context3.next = 224;
           break;
-        case 181:
+        case 202:
           if (!analysis.eslintRcJsonPath) {
-            _context3.next = 202;
+            _context3.next = 223;
             break;
           }
           if (defaultAnswers) {
-            _context3.next = 188;
+            _context3.next = 209;
             break;
           }
-          _context3.next = 185;
+          _context3.next = 206;
           return confirm({
             message: "Patch eslintrc.json to use the recommended Val eslint rules?",
             "default": true
           });
-        case 185:
-          _context3.t7 = _context3.sent;
-          _context3.next = 189;
+        case 206:
+          _context3.t8 = _context3.sent;
+          _context3.next = 210;
           break;
-        case 188:
-          _context3.t7 = true;
-        case 189:
-          _answer7 = _context3.t7;
-          if (!_answer7) {
-            _context3.next = 200;
+        case 209:
+          _context3.t8 = true;
+        case 210:
+          _answer8 = _context3.t8;
+          if (!_answer8) {
+            _context3.next = 221;
             break;
           }
           currentEslintRc = fs.readFileSync(analysis.eslintRcJsonPath, "utf-8");
           parsedEslint = JSON.parse(currentEslintRc);
           if (!(_typeof(parsedEslint) !== "object")) {
-            _context3.next = 196;
+            _context3.next = 217;
             break;
           }
           error("Could not patch eslint: ".concat(analysis.eslintRcJsonPath, " was not an object"));
           return _context3.abrupt("return", {
             abort: true
           });
-        case 196:
+        case 217:
           if (typeof parsedEslint["extends"] === "string") {
             parsedEslint["extends"] = [parsedEslint["extends"]];
           }
@@ -1381,24 +1437,24 @@ function _plan() {
             path: analysis.eslintRcJsonPath,
             source: JSON.stringify(parsedEslint, null, 2) + "\n"
           };
-        case 200:
-          _context3.next = 203;
+        case 221:
+          _context3.next = 224;
           break;
-        case 202:
+        case 223:
           warn("Cannot patch eslint: failed to find eslint config file");
-        case 203:
+        case 224:
           if (!analysis.gitIgnorePath) {
-            _context3.next = 210;
+            _context3.next = 231;
             break;
           }
-          _context3.next = 206;
+          _context3.next = 227;
           return confirm({
             message: "Append .gitignore entry for Val cache? (recommended)",
             "default": true
           });
-        case 206:
-          _answer8 = _context3.sent;
-          if (_answer8) {
+        case 227:
+          _answer9 = _context3.sent;
+          if (_answer9) {
             plan.updateGitIgnore = {
               path: analysis.gitIgnorePath,
               source: (analysis.gitIgnoreFile ? "".concat(analysis.gitIgnoreFile, "\n\n") : "") + "# Val local cache\n.val\n"
@@ -1406,53 +1462,54 @@ function _plan() {
           } else {
             plan.updateGitIgnore = false;
           }
-          _context3.next = 211;
+          _context3.next = 232;
           break;
-        case 210:
+        case 231:
           plan.updateGitIgnore = false;
-        case 211:
-          _context3.next = 213;
+        case 232:
+          _context3.next = 234;
           return confirm({
             message: "Add the Val Build IntelliSense to .vscode/extensions.json?",
             "default": true
           });
-        case 213:
-          _answer9 = _context3.sent;
-          if (!_answer9) {
-            _context3.next = 239;
+        case 234:
+          _answer10 = _context3.sent;
+          if (!_answer10) {
+            _context3.next = 260;
             break;
           }
           vscodeDir = path.join(analysis.root, ".vscode");
           settingsPath = path.join(vscodeDir, "extensions.json");
           currentSettings = {};
-          _context3.prev = 218;
+          _context3.prev = 239;
           currentSettingsFile = fs.readFileSync(settingsPath, "utf-8");
           if (!currentSettingsFile) {
-            _context3.next = 229;
+            _context3.next = 250;
             break;
           }
-          _context3.prev = 221;
+          _context3.prev = 242;
           currentSettings = JSON.parse(currentSettingsFile);
-          _context3.next = 229;
+          _context3.next = 250;
           break;
-        case 225:
-          _context3.prev = 225;
-          _context3.t8 = _context3["catch"](221);
-          warn("Failed to parse VS Code extensions.json found here: ".concat(settingsPath, ".").concat(_context3.t8 instanceof Error ? "Parse error: ".concat(_context3.t8.message) : ""));
+        case 246:
+          _context3.prev = 246;
+          _context3.t9 = _context3["catch"](242);
+          warn("Failed to parse VS Code extensions.json found here: ".concat(settingsPath, ".").concat(_context3.t9 instanceof Error ? "Parse error: ".concat(_context3.t9.message) : ""));
           return _context3.abrupt("return", {
             abort: true
           });
-        case 229:
-          _context3.next = 233;
+        case 250:
+          _context3.next = 254;
           break;
-        case 231:
-          _context3.prev = 231;
-          _context3.t9 = _context3["catch"](218);
-        case 233:
+        case 252:
+          _context3.prev = 252;
+          _context3.t10 = _context3["catch"](239);
+        case 254:
+          currentRecommendations =
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          currentRecommendations = currentSettings.recommendations;
+          currentSettings.recommendations;
           valBuildIntelliSense = "valbuild.vscode-val-build";
-          if (!currentRecommendations.includes(valBuildIntelliSense)) {
+          if (!(currentRecommendations !== null && currentRecommendations !== void 0 && currentRecommendations.includes(valBuildIntelliSense))) {
             currentSettings = _objectSpread2(_objectSpread2({}, currentSettings), {}, {
               recommendations: (currentRecommendations || []).concat(valBuildIntelliSense)
             });
@@ -1461,43 +1518,43 @@ function _plan() {
             path: settingsPath,
             source: JSON.stringify(currentSettings, null, 2)
           };
-          _context3.next = 240;
+          _context3.next = 261;
           break;
-        case 239:
+        case 260:
           plan.updateVSCodeSettings = false;
-        case 240:
-          _context3.next = 242;
+        case 261:
+          _context3.next = 263;
           return confirm({
             message: "Include example Val files?",
             "default": true
           });
-        case 242:
-          _answer10 = _context3.sent;
-          if (!_answer10) {
-            _context3.next = 251;
+        case 263:
+          _answer11 = _context3.sent;
+          if (!_answer11) {
+            _context3.next = 272;
             break;
           }
           exampleDir = path.join(analysis.srcDir, "examples", "val");
           examplePath = path.join(exampleDir, "example.val." + (analysis.isJavaScript ? "js" : "ts"));
           exampleImport = path.relative(exampleDir, valConfigPath).replace(".js", "").replace(".ts", "");
           if (analysis.packageJsonDir) {
-            _context3.next = 249;
+            _context3.next = 270;
             break;
           }
           throw Error("Could not detect package.json directory! This is a Val bug.");
-        case 249:
+        case 270:
           exampleModuleId = "/".concat(path.relative(analysis.packageJsonDir, examplePath).replace(".val", "").replace(".js", "").replace(".ts", ""));
           plan.includeExample = {
             path: examplePath,
             source: BASIC_EXAMPLE(exampleModuleId, exampleImport, !!analysis.isJavaScript)
           };
-        case 251:
+        case 272:
           return _context3.abrupt("return", plan);
-        case 252:
+        case 273:
         case "end":
           return _context3.stop();
       }
-    }, _callee3, null, [[218, 231], [221, 225]]);
+    }, _callee3, null, [[239, 252], [242, 246]]);
   }));
   return _plan.apply(this, arguments);
 }