@pob/root 27.16.0 → 28.0.0

package/createLintStagedConfig.js

@@ -74,7 +74,8 @@ const hasOxlint = fs.existsSync(path.resolve(".oxlintrc.json"));
 const isOxlintSupportedFile = (filename) =>
   /\.[cm]?[jt]sx?$/.test(filename) && !filename.endsWith(".d.ts");
 
-const CODE_COMMANDS = [OXFMT, hasOxlint && OXLINT_FIX, ESLINT_FIX].filter(
+// oxfmt runs after the linters, as their fixes are not formatted.
+const CODE_COMMANDS = [hasOxlint && OXLINT_FIX, ESLINT_FIX, OXFMT].filter(
   Boolean,
 );
 
@@ -172,10 +173,10 @@ const createLegacyConfig = ({
       return [
         ...installAndDedupe,
         pkg.scripts?.checks ? `${pm.name} run checks` : undefined,
+        ESLINT_FIX,
         packagejsonFilenames.length === 0
           ? undefined
           : withFilenames("oxfmt", packagejsonFilenames),
-        ESLINT_FIX,
         getGitAddPmFilesCommand(),
       ].filter(Boolean);
     },
@@ -223,65 +224,61 @@ const createConfig = ({
   );
   const matchesTscTrigger = createMatcher([tscTriggerPattern]);
 
-  // Build tasks generate their own command so that lint-staged does not append
-  // the matched filenames: they build the whole project. They return no command
-  // at all when nothing they depend on changed.
-  const createBuildTask = (command) => (allStagedFiles) =>
-    allStagedFiles.map(toRelativePosixPath).some(matchesTscTrigger)
-      ? command
-      : [];
+  // Both build the whole project, in parallel.
+  const buildCommands = (
+    hasRollup
+      ? ["rollup --config rollup.config.mjs", hasTsconfig && "tsc -b"]
+      : [hasTsconfig && "tsc"]
+  ).filter(Boolean);
 
+  // A single function at the top level: lint-staged runs its commands
+  // sequentially and does not append the matched filenames. A function inside a
+  // list of tasks would have its commands run in parallel.
   return defineConfig({
-    "*": [
-      (allStagedFiles) => {
-        const filenames = allStagedFiles.map(toRelativePosixPath);
-        const hasPmFiles = filenames.some(matchesPmFiles);
-        const eslintFilenames = filenames.filter(matchesEslint);
-
-        // Running on the whole project is simpler and avoids too long command
-        // lines when many files are staged.
-        const withFilenamesOrWholeProject = (command, commandFilenames) => {
-          if (commandFilenames.length === 0) return undefined;
-          if (commandFilenames.length > MAX_FILENAMES) return command;
-          return withFilenames(command, commandFilenames);
-        };
-
-        const getOxlintCommand = () => {
-          if (!hasOxlint) return undefined;
-          return withFilenamesOrWholeProject(
-            OXLINT_FIX,
-            eslintFilenames.filter(isOxlintSupportedFile),
-          );
-        };
-
-        const getEslintCommand = () => {
-          // eslint runs on the whole project when a package.json, the lockfile
-          // or the package manager config changed, like in the legacy config,
-          // as lint rules depend on the dependencies themselves.
-          if (hasPmFiles) return ESLINT_FIX;
-          return withFilenamesOrWholeProject(ESLINT_FIX, eslintFilenames);
-        };
-
-        return [
-          ...(hasPmFiles ? installAndDedupe : []),
-          hasPmFiles && pkg.scripts?.checks
-            ? `${pm.name} run checks`
-            : undefined,
-          withFilenamesOrWholeProject(OXFMT, filenames),
-          getOxlintCommand(),
-          getEslintCommand(),
-          hasPmFiles ? getGitAddPmFilesCommand() : undefined,
-        ].filter(Boolean);
-      },
-      // Runs after the tasks above, so that the build sees the formatted and
-      // fixed files. Both commands build the whole project, in parallel.
-      hasRollup
-        ? [
-            createBuildTask("rollup --config rollup.config.mjs"),
-            hasTsconfig && createBuildTask("tsc -b"),
-          ].filter(Boolean)
-        : hasTsconfig && createBuildTask("tsc"),
-    ].filter(Boolean),
+    "*": (allStagedFiles) => {
+      const filenames = allStagedFiles.map(toRelativePosixPath);
+      const hasPmFiles = filenames.some(matchesPmFiles);
+      const eslintFilenames = filenames.filter(matchesEslint);
+
+      // Running on the whole project is simpler and avoids too long command
+      // lines when many files are staged.
+      const withFilenamesOrWholeProject = (command, commandFilenames) => {
+        if (commandFilenames.length === 0) return undefined;
+        if (commandFilenames.length > MAX_FILENAMES) return command;
+        return withFilenames(command, commandFilenames);
+      };
+
+      const getOxlintCommand = () => {
+        if (!hasOxlint) return undefined;
+        return withFilenamesOrWholeProject(
+          OXLINT_FIX,
+          eslintFilenames.filter(isOxlintSupportedFile),
+        );
+      };
+
+      const getEslintCommand = () => {
+        // eslint runs on the whole project when a package.json, the lockfile
+        // or the package manager config changed, like in the legacy config,
+        // as lint rules depend on the dependencies themselves.
+        if (hasPmFiles) return ESLINT_FIX;
+        return withFilenamesOrWholeProject(ESLINT_FIX, eslintFilenames);
+      };
+
+      return [
+        ...(hasPmFiles ? installAndDedupe : []),
+        hasPmFiles && pkg.scripts?.checks ? `${pm.name} run checks` : undefined,
+        getOxlintCommand(),
+        getEslintCommand(),
+        // after the linters, as their fixes are not formatted
+        withFilenamesOrWholeProject(OXFMT, filenames),
+        hasPmFiles ? getGitAddPmFilesCommand() : undefined,
+        // after the tasks above, so that the build sees the formatted and
+        // fixed files
+        buildCommands.length > 0 && filenames.some(matchesTscTrigger)
+          ? buildCommands
+          : undefined,
+      ].filter(Boolean);
+    },
   });
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pob/root",
-  "version": "27.16.0",
+  "version": "28.0.0",
   "description": "root package",
   "keywords": [],
   "homepage": "https://github.com/christophehurpeau/pob",
@@ -66,7 +66,7 @@
     "@commitlint/format": "21.2.3",
     "@commitlint/lint": "21.2.3",
     "@commitlint/types": "21.2.3",
-    "@pob/version": "7.0.0",
+    "@pob/version": "8.0.0",
     "conventional-changelog-conventionalcommits": "^10.0.0",
     "conventional-changelog-writer": "^9.0.0",
     "conventional-commits-parser": "^7.0.0",
@@ -76,7 +76,7 @@
     "oxlint": "1.85.0",
     "oxlint-tsgolint": "7.0.2003",
     "picomatch": "^4.0.7",
-    "pob-dependencies": "27.13.0",
+    "pob-dependencies": "28.0.0",
     "semver": "^7.7.3"
   },
   "engines": {