pob 35.2.0 → 35.3.0

package/lib/generators/common/format-lint/CommonLintGenerator.js

@@ -200,7 +200,8 @@ export default class CommonFormatLintGenerator extends Generator {
         });
       }
 
-      this.fs.copyTpl(
+      copyAndFormatTpl(
+        this.fs,
         this.templatePath("oxfmtrc.jsonc.ejs"),
         this.destinationPath(".oxfmtrc.jsonc"),
         {

package/lib/generators/common/testing/CommonTestingGenerator.js

@@ -317,17 +317,17 @@ export default class CommonTestingGenerator extends Generator {
       packageUtils.addDevDependencies(pkg, ["vite"]);
     }
 
+    packageUtils.removeScripts(["generate:test-coverage"]);
+
     if (!this.options.enable) {
       // if (inMonorepo) {
       //   if (pkg.scripts.test === 'echo "No tests"') {
       //     delete pkg.scripts.test;
       //   }
-      //   delete pkg.scripts['generate:test-coverage'];
       // }
       packageUtils.removeScripts([
         "test",
         "test:coverage",
-        "generate:test-coverage",
         "test:watch",
         "test:coverage",
         "test:coverage:json",
@@ -395,7 +395,6 @@ export default class CommonTestingGenerator extends Generator {
 
           if (globalTesting) {
             if (pkg.scripts) {
-              delete pkg.scripts["generate:test-coverage"];
               delete pkg.scripts["test:watch"];
               delete pkg.scripts["test:coverage"];
             }

package/lib/generators/common/typescript/CommonTypescriptGenerator.js

@@ -208,8 +208,6 @@ export default class CommonTypescriptGenerator extends Generator {
       delete pkg.scripts.flow;
     }
 
-    console.log({ enableTypescript: this.options.enable });
-
     packageUtils.addOrRemoveDevDependencies(
       pkg,
       this.options.enable ||
@@ -364,13 +362,16 @@ export default class CommonTypescriptGenerator extends Generator {
       this.fs.delete(tsconfigBuildPath);
       // }
     } else {
-      if (pkg.scripts) delete pkg.scripts.tsc;
       this.fs.delete(tsconfigPath);
       this.fs.delete(tsconfigBuildPath);
       this.fs.delete(tsconfigCheckPath);
       this.fs.delete(tsconfigEslintPath);
     }
 
+    if (!pkg.workspaces || !this.options.enable) {
+      packageUtils.addOrRemoveScripts(pkg, this.options.enable, { tsc: "tsc" });
+    }
+
     this.fs.writeJSON(this.destinationPath("package.json"), pkg);
   }
 }

package/lib/generators/core/ci/templates/github-action-push-workflow.yml.ejs

@@ -99,6 +99,8 @@ jobs:
         with:
           fail_ci_if_error: true
           token: ${{ secrets.CODECOV_TOKEN }}
+          files: ./coverage/coverage-final.json
+          disable_search: true
         if: startsWith(matrix.node-version, '<%= nodeLatestMajorVersion %>.') && github.actor != 'dependabot[bot]'
 <% } else if (testing) { -%>
 

package/lib/generators/core/git/CoreGitGenerator.js

@@ -131,6 +131,11 @@ export default class CoreGitGenerator extends Generator {
     if (!pkg.homepage && this.gitHostAccount) {
       pkg.homepage = `https://${this.gitHost}.com/${this.gitHostAccount}/${repoName}`;
     }
+    if (this.gitHostAccount) {
+      pkg.bugs = {
+        url: `https://${this.gitHost}.com/${this.gitHostAccount}/${repoName}/issues`,
+      };
+    }
 
     const repository = `https://${this.gitHost}.com/${this.gitHostAccount}/${repoName}.git`;
 

package/lib/generators/core/package/CorePackageGenerator.js

@@ -206,6 +206,8 @@ export default class CorePackageGenerator extends Generator {
         directory: process.cwd().slice(inMonorepo.rootPath.length + 1),
       };
       pkg.homepage = rootMonorepoPkg.homepage;
+      if (pkg.private) delete pkg.bugs;
+      else if (rootMonorepoPkg.bugs) pkg.bugs = rootMonorepoPkg.bugs;
 
       if (this.fs.exists(this.destinationPath("yarn.lock"))) {
         fs.unlinkSync(this.destinationPath("yarn.lock"));
@@ -214,6 +216,7 @@ export default class CorePackageGenerator extends Generator {
         fs.unlinkSync(this.destinationPath("pnpm-lock.yaml"));
       }
     }
+
     if (this.fs.exists(this.destinationPath("yarn-error.log"))) {
       fs.unlinkSync(this.destinationPath("yarn-error.log"));
     }

package/lib/generators/core/pnpm/CorePnpmGenerator.js

@@ -40,7 +40,7 @@ export default class CorePnpmGenerator extends Generator {
         (!pkg.packageManager.startsWith("pnpm@") ||
           lt(pkg.packageManager.slice("pnpm@".length), "11.0.0"))
       ) {
-        pkg.packageManager = "pnpm@11.0.0";
+        delete pkg.packageManager;
       }
 
       const configString = this.fs.read(
@@ -50,9 +50,17 @@ export default class CorePnpmGenerator extends Generator {
       const config =
         yml.load(configString, {
           schema: yml.FAILSAFE_SCHEMA,
-          json: true,
         }) || {};
 
+      if (config.allowBuilds) {
+        config.allowBuilds = Object.fromEntries(
+          Object.entries(config.allowBuilds).map(([key, value]) => [
+            key,
+            value === "true" ? true : value,
+          ]),
+        );
+      }
+
       if (pkg.workspaces) {
         config.packages = pkg.workspaces;
       } else {

package/lib/generators/core/yarn/CoreYarnGenerator.js

@@ -159,6 +159,9 @@ export default class CoreYarnGenerator extends Generator {
           schema: yml.FAILSAFE_SCHEMA,
           json: true,
         }) || {};
+      if (config.enableScripts === "true") {
+        config.enableScripts = true;
+      }
       const previousConfig = { ...config };
       if (this.options.disableYarnGitCache) {
         // leave default compressionLevel instead of this next line
@@ -168,7 +171,7 @@ export default class CoreYarnGenerator extends Generator {
         delete config.supportedArchitectures;
       } else {
         config.compressionLevel = 0; // optimized for github config
-        config.enableGlobalCache = "false";
+        config.enableGlobalCache = false;
         // https://yarnpkg.dev/releases/3-1/
         // make sure all supported architectures are in yarn cache
         config.supportedArchitectures = {

package/lib/generators/pob/PobBaseGenerator.js

@@ -137,6 +137,9 @@ export default class PobBaseGenerator extends Generator {
     ]);
 
     this.projectConfig = { ...config, ...responses };
+    if (this.projectConfig.packageManager !== "yarn") {
+      delete this.projectConfig.yarnNodeLinker;
+    }
     this.config.set("project", this.projectConfig);
   }
 

package/lib/utils/package.js

@@ -1,3 +1,5 @@
+import fs from "node:fs";
+import { fileURLToPath } from "node:url";
 import sortObject from "@pob/sort-object";
 import sortPkg from "@pob/sort-pkg";
 import parseAuthor from "parse-author";
@@ -108,12 +110,23 @@ const getVersionFromDependencyName = (dependency) => {
     return pobEslintConfig.dependencies[dependency];
   }
 
+  let value = pobDependencies[dependency];
   // prevents cycle that lerna doesnt like
   if (dependency === "@pob/root") {
-    return pobPkg.devDependencies[dependency];
+    value = pobPkg.devDependencies[dependency];
   }
 
-  return pobDependencies[dependency];
+  if (value === "workspace:*") {
+    const pkgJson = JSON.parse(
+      fs.readFileSync(
+        fileURLToPath(
+          import.meta.resolve(`${dependency}/package.json`, import.meta.url),
+        ),
+      ),
+    );
+    return pkgJson.version;
+  }
+  return value;
 };
 
 const internalAddDependencies = (pkg, type, dependencies, cleaned, prefix) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pob",
-  "version": "35.2.0",
+  "version": "35.3.0",
   "description": "Pile of bones, library generator with git/babel/typescript/typedoc/readme/jest",
   "keywords": [
     "skeleton"
@@ -46,18 +46,18 @@
     "minimist": "1.2.8",
     "oxfmt": "0.51.0",
     "parse-author": "2.0.0",
-    "semver": "7.8.0",
+    "semver": "7.8.1",
     "typescript": "6.0.3",
     "validate-npm-package-name": "^8.0.0",
     "yeoman-environment": "6.1.0",
     "yeoman-generator": "8.2.2",
-    "pob-dependencies": "24.1.0",
-    "@pob/sort-pkg": "13.1.0",
-    "@pob/sort-object": "11.1.0"
+    "@pob/sort-object": "11.1.1",
+    "pob-dependencies": "24.1.1",
+    "@pob/sort-pkg": "13.1.1"
   },
   "devDependencies": {
     "@types/node": "24.12.4",
-    "@pob/root": "24.2.0"
+    "@pob/root": "24.3.0"
   },
   "engines": {
     "node": ">=22.18.0"
@@ -69,7 +69,8 @@
     "build": "pnpm run build:definitions",
     "build:definitions": "tsc -p tsconfig.json",
     "lint": "pnpm run lint:eslint",
-    "lint:eslint": "pnpm run --dir '../..' eslint --quiet 'packages/pob'"
+    "lint:eslint": "pnpm run --dir '../..' eslint --quiet 'packages/pob'",
+    "tsc": "tsc"
   },
   "bin": {
     "pob": "./lib/pob.js"