@valbuild/init 0.55.2 → 0.57.0

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

@@ -463,7 +463,7 @@ function transformNextAppRouterValProvider(fileInfo, api, options) {
 
 var packageJson = {
 	name: "@valbuild/init",
-	version: "0.55.2",
+	version: "0.57.0",
 	description: "Initialize a new val.build project",
 	exports: {
 		"./main": {
@@ -719,7 +719,7 @@ var analyze = /*#__PURE__*/function () {
           _context.prev = 31;
           git = simpleGit__default["default"](root);
           _context.next = 35;
-          return git.status();
+          return git.status([]);
         case 35:
           gitStatus = _context.sent;
           _context.next = 38;
@@ -728,7 +728,7 @@ var analyze = /*#__PURE__*/function () {
           gitRemoteOrigin = _context.sent;
           analysis.hasGit = true;
           analysis.isGitHub = gitRemoteOrigin ? !!gitRemoteOrigin.includes("github.com") : false;
-          analysis.isGitClean = gitStatus.isClean();
+          analysis.isGitClean = getGitStatusIsClean(gitStatus);
           _context.next = 46;
           break;
         case 44:
@@ -994,9 +994,15 @@ function _plan() {
             });
           }
           if (analysis.isGitClean) {
-            info("  Git state: clean", {
-              isGood: true
-            });
+            if (analysis.isGitClean === "packages") {
+              info("  Git state: clean (only package.json / lock files modified)", {
+                isGood: true
+              });
+            } else {
+              info("  Git state: clean", {
+                isGood: true
+              });
+            }
           }
           if (!analysis.isGitClean) {
             warn("  Git state: dirty");
@@ -1071,7 +1077,7 @@ function _plan() {
             path: valAppPagePath,
             source: VAL_APP_PAGE(valPageImportPath)
           };
-          valRouterPath = path__default["default"].join(analysis.appRouterPath || path__default["default"].join(analysis.srcDir, "app"), "(val)", "api", "val", "[[...val]]", analysis.isTypeScript ? "router.tsx" : "router.jsx");
+          valRouterPath = path__default["default"].join(analysis.appRouterPath || path__default["default"].join(analysis.srcDir, "app"), "(val)", "api", "val", "[[...val]]", analysis.isTypeScript ? "route.ts" : "route.js");
           valRouterImportPath = path__default["default"].relative(path__default["default"].dirname(valRouterPath), valServerPath).replace(".js", "").replace(".ts", "");
           plan.createValRouter = {
             path: valRouterPath,
@@ -1361,6 +1367,26 @@ function writeFile(fileOp, rootDir, isUpdate) {
     });
   }
 }
+function getGitStatusIsClean(gitStatus) {
+  var filteredFiles = gitStatus.files.filter(function (_ref3) {
+    var path = _ref3.path;
+    return !(
+    // ignore updates to package.json and lock files
+    // since user might have just installed val
+    // TODO: check if package.json only includes val related things
+
+    path === "package.json" ||
+    // lock files:
+    path === "package-lock.json" || path === "yarn.lock" || path === "pnpm-lock.yaml");
+  });
+  if (filteredFiles.length === 0) {
+    if (gitStatus.files.length !== 0) {
+      return "packages";
+    }
+    return true;
+  }
+  return false;
+}
 
 function main() {
   return _main.apply(this, arguments);

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

@@ -463,7 +463,7 @@ function transformNextAppRouterValProvider(fileInfo, api, options) {
 
 var packageJson = {
 	name: "@valbuild/init",
-	version: "0.55.2",
+	version: "0.57.0",
 	description: "Initialize a new val.build project",
 	exports: {
 		"./main": {
@@ -719,7 +719,7 @@ var analyze = /*#__PURE__*/function () {
           _context.prev = 31;
           git = simpleGit__default["default"](root);
           _context.next = 35;
-          return git.status();
+          return git.status([]);
         case 35:
           gitStatus = _context.sent;
           _context.next = 38;
@@ -728,7 +728,7 @@ var analyze = /*#__PURE__*/function () {
           gitRemoteOrigin = _context.sent;
           analysis.hasGit = true;
           analysis.isGitHub = gitRemoteOrigin ? !!gitRemoteOrigin.includes("github.com") : false;
-          analysis.isGitClean = gitStatus.isClean();
+          analysis.isGitClean = getGitStatusIsClean(gitStatus);
           _context.next = 46;
           break;
         case 44:
@@ -994,9 +994,15 @@ function _plan() {
             });
           }
           if (analysis.isGitClean) {
-            info("  Git state: clean", {
-              isGood: true
-            });
+            if (analysis.isGitClean === "packages") {
+              info("  Git state: clean (only package.json / lock files modified)", {
+                isGood: true
+              });
+            } else {
+              info("  Git state: clean", {
+                isGood: true
+              });
+            }
           }
           if (!analysis.isGitClean) {
             warn("  Git state: dirty");
@@ -1071,7 +1077,7 @@ function _plan() {
             path: valAppPagePath,
             source: VAL_APP_PAGE(valPageImportPath)
           };
-          valRouterPath = path__default["default"].join(analysis.appRouterPath || path__default["default"].join(analysis.srcDir, "app"), "(val)", "api", "val", "[[...val]]", analysis.isTypeScript ? "router.tsx" : "router.jsx");
+          valRouterPath = path__default["default"].join(analysis.appRouterPath || path__default["default"].join(analysis.srcDir, "app"), "(val)", "api", "val", "[[...val]]", analysis.isTypeScript ? "route.ts" : "route.js");
           valRouterImportPath = path__default["default"].relative(path__default["default"].dirname(valRouterPath), valServerPath).replace(".js", "").replace(".ts", "");
           plan.createValRouter = {
             path: valRouterPath,
@@ -1361,6 +1367,26 @@ function writeFile(fileOp, rootDir, isUpdate) {
     });
   }
 }
+function getGitStatusIsClean(gitStatus) {
+  var filteredFiles = gitStatus.files.filter(function (_ref3) {
+    var path = _ref3.path;
+    return !(
+    // ignore updates to package.json and lock files
+    // since user might have just installed val
+    // TODO: check if package.json only includes val related things
+
+    path === "package.json" ||
+    // lock files:
+    path === "package-lock.json" || path === "yarn.lock" || path === "pnpm-lock.yaml");
+  });
+  if (filteredFiles.length === 0) {
+    if (gitStatus.files.length !== 0) {
+      return "packages";
+    }
+    return true;
+  }
+  return false;
+}
 
 function main() {
   return _main.apply(this, arguments);

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

@@ -451,7 +451,7 @@ function transformNextAppRouterValProvider(fileInfo, api, options) {
 
 var packageJson = {
 	name: "@valbuild/init",
-	version: "0.55.2",
+	version: "0.57.0",
 	description: "Initialize a new val.build project",
 	exports: {
 		"./main": {
@@ -707,7 +707,7 @@ var analyze = /*#__PURE__*/function () {
           _context.prev = 31;
           git = simpleGit(root);
           _context.next = 35;
-          return git.status();
+          return git.status([]);
         case 35:
           gitStatus = _context.sent;
           _context.next = 38;
@@ -716,7 +716,7 @@ var analyze = /*#__PURE__*/function () {
           gitRemoteOrigin = _context.sent;
           analysis.hasGit = true;
           analysis.isGitHub = gitRemoteOrigin ? !!gitRemoteOrigin.includes("github.com") : false;
-          analysis.isGitClean = gitStatus.isClean();
+          analysis.isGitClean = getGitStatusIsClean(gitStatus);
           _context.next = 46;
           break;
         case 44:
@@ -982,9 +982,15 @@ function _plan() {
             });
           }
           if (analysis.isGitClean) {
-            info("  Git state: clean", {
-              isGood: true
-            });
+            if (analysis.isGitClean === "packages") {
+              info("  Git state: clean (only package.json / lock files modified)", {
+                isGood: true
+              });
+            } else {
+              info("  Git state: clean", {
+                isGood: true
+              });
+            }
           }
           if (!analysis.isGitClean) {
             warn("  Git state: dirty");
@@ -1059,7 +1065,7 @@ function _plan() {
             path: valAppPagePath,
             source: VAL_APP_PAGE(valPageImportPath)
           };
-          valRouterPath = path.join(analysis.appRouterPath || path.join(analysis.srcDir, "app"), "(val)", "api", "val", "[[...val]]", analysis.isTypeScript ? "router.tsx" : "router.jsx");
+          valRouterPath = path.join(analysis.appRouterPath || path.join(analysis.srcDir, "app"), "(val)", "api", "val", "[[...val]]", analysis.isTypeScript ? "route.ts" : "route.js");
           valRouterImportPath = path.relative(path.dirname(valRouterPath), valServerPath).replace(".js", "").replace(".ts", "");
           plan.createValRouter = {
             path: valRouterPath,
@@ -1349,6 +1355,26 @@ function writeFile(fileOp, rootDir, isUpdate) {
     });
   }
 }
+function getGitStatusIsClean(gitStatus) {
+  var filteredFiles = gitStatus.files.filter(function (_ref3) {
+    var path = _ref3.path;
+    return !(
+    // ignore updates to package.json and lock files
+    // since user might have just installed val
+    // TODO: check if package.json only includes val related things
+
+    path === "package.json" ||
+    // lock files:
+    path === "package-lock.json" || path === "yarn.lock" || path === "pnpm-lock.yaml");
+  });
+  if (filteredFiles.length === 0) {
+    if (gitStatus.files.length !== 0) {
+      return "packages";
+    }
+    return true;
+  }
+  return false;
+}
 
 function main() {
   return _main.apply(this, arguments);

package/package.json

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

package/src/init.ts

@@ -1,7 +1,7 @@
 import chalk from "chalk";
 import fs from "fs";
 import path from "path";
-import simpleGit from "simple-git";
+import simpleGit, { StatusResult } from "simple-git";
 import { confirm } from "@inquirer/prompts";
 import { transformNextAppRouterValProvider } from "./codemods/transformNextAppRouterValProvider";
 import { diffLines } from "diff";
@@ -94,7 +94,7 @@ type Analysis = Partial<{
   // git:
   hasGit: boolean;
   isGitHub: boolean;
-  isGitClean: boolean;
+  isGitClean: boolean | "packages";
 
   // TODO:
   // check if modules are used
@@ -200,13 +200,13 @@ const analyze = async (root: string, files: string[]): Promise<Analysis> => {
 
   try {
     const git = simpleGit(root);
-    const gitStatus = await git.status();
+    const gitStatus = await git.status([]);
     const gitRemoteOrigin = await git.remote(["-v"]);
     analysis.hasGit = true;
     analysis.isGitHub = gitRemoteOrigin
       ? !!gitRemoteOrigin.includes("github.com")
       : false;
-    analysis.isGitClean = gitStatus.isClean();
+    analysis.isGitClean = getGitStatusIsClean(gitStatus);
   } catch (err) {
     // console.error(err);
   }
@@ -353,7 +353,16 @@ async function plan(
     logger.info("  Use: Pages Router", { isGood: true });
   }
   if (analysis.isGitClean) {
-    logger.info("  Git state: clean", { isGood: true });
+    if (analysis.isGitClean === "packages") {
+      logger.info(
+        "  Git state: clean (only package.json / lock files modified)",
+        {
+          isGood: true,
+        }
+      );
+    } else {
+      logger.info("  Git state: clean", { isGood: true });
+    }
   }
   if (!analysis.isGitClean) {
     logger.warn("  Git state: dirty");
@@ -433,7 +442,7 @@ async function plan(
     "api",
     "val",
     "[[...val]]",
-    analysis.isTypeScript ? "router.tsx" : "router.jsx"
+    analysis.isTypeScript ? "route.ts" : "route.js"
   );
   const valRouterImportPath = path
     .relative(path.dirname(valRouterPath), valServerPath)
@@ -633,3 +642,27 @@ function writeFile(
     );
   }
 }
+function getGitStatusIsClean(gitStatus: StatusResult): Analysis["isGitClean"] {
+  const filteredFiles = gitStatus.files.filter(
+    ({ path }) =>
+      !(
+        // ignore updates to package.json and lock files
+        // since user might have just installed val
+        // TODO: check if package.json only includes val related things
+        (
+          path === "package.json" ||
+          // lock files:
+          path === "package-lock.json" ||
+          path === "yarn.lock" ||
+          path === "pnpm-lock.yaml"
+        )
+      )
+  );
+  if (filteredFiles.length === 0) {
+    if (gitStatus.files.length !== 0) {
+      return "packages";
+    }
+    return true;
+  }
+  return false;
+}