pob 34.2.0 → 35.0.0

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

@@ -4,7 +4,7 @@ import sortObject from "@pob/sort-object";
 import yml from "js-yaml";
 import { lt } from "semver";
 import Generator from "yeoman-generator";
-import ensureJsonFileFormatted from "../../../utils/ensureJsonFileFormatted.js";
+import { ensureJsonFileFormatted } from "../../../utils/ensureJsonFileFormatted.js";
 import inMonorepo from "../../../utils/inMonorepo.js";
 import * as packageUtils from "../../../utils/package.js";
 import { writeAndFormat } from "../../../utils/writeAndFormat.js";
@@ -43,14 +43,14 @@ export default class CoreYarnGenerator extends Generator {
     });
   }
 
-  initializing() {
+  async initializing() {
     if (this.options.enable) {
       // dont use this.fs here, as it will cache the result
       if (!fs.existsSync(".yarnrc.yml")) {
         // yarn 2 not yet installed
         // https://yarnpkg.com/getting-started/install
         this.spawnSync("yarn", ["set", "version", "stable"]);
-        ensureJsonFileFormatted(this.destinationPath("package.json"));
+        await ensureJsonFileFormatted(this.destinationPath("package.json"));
       } else {
         // disabled now that corepack is supposed to set the version used
         // this.spawnSync('yarn', ['set', 'version', 'stable']);)
@@ -58,7 +58,7 @@ export default class CoreYarnGenerator extends Generator {
     }
   }
 
-  writing() {
+  async writing() {
     const pkg = this.fs.readJSON(this.destinationPath("package.json"));
 
     if (this.options.enable && !inMonorepo && !pkg.private) {
@@ -193,7 +193,7 @@ export default class CoreYarnGenerator extends Generator {
       }
 
       if (!isDeepStrictEqual(config, previousConfig)) {
-        writeAndFormat(
+        await writeAndFormat(
           this.fs,
           ".yarnrc.yml",
           yml.dump(sortObject(config), {
@@ -235,7 +235,7 @@ export default class CoreYarnGenerator extends Generator {
       this.fs.delete("package-lock.json");
       this.spawnSync("yarn", ["dedupe"]);
 
-      this.spawnSync("yarn", ["prettier", "--write", ".vscode", ".yarnrc.yml"]);
+      this.spawnSync("yarn", ["oxfmt", ".vscode", ".yarnrc.yml"]);
 
       const pkg = this.fs.readJSON(this.destinationPath("package.json"));
 

package/lib/generators/lib/PobLibGenerator.js

@@ -220,16 +220,12 @@ export default class PobLibGenerator extends Generator {
           name: "runner",
           message: "Testing runner ?",
           when: !this.updateOnly || this.pobjson.testing?.runner === undefined,
-          default: this.pobjson.testing?.runner || "jest",
+          default: this.pobjson.testing?.runner,
           choices: [
             {
               name: "Vitest",
               value: "vitest",
             },
-            {
-              name: "Jest",
-              value: "jest",
-            },
             {
               name: "node:test",
               value: "node",
@@ -299,7 +295,6 @@ export default class PobLibGenerator extends Generator {
       dom: browser,
       jsx,
       updateOnly: this.options.updateOnly,
-      baseUrl: "none", // causes issues on dist definition files
       builddefs: true,
       onlyLatestLTS: this.onlyLatestLTS,
       srcDirectory: withTypescript ? "src" : "lib",
@@ -317,7 +312,7 @@ export default class PobLibGenerator extends Generator {
       runner: this.pobjson.testing
         ? (inMonorepo
             ? inMonorepo.pobMonorepoConfig.testRunner
-            : this.pobjson.testing.runner) || "jest"
+            : this.pobjson.testing.runner) || ""
         : undefined,
       build: withBabel || withTypescript,
       typescript: withTypescript,

package/lib/generators/lib/doc/LibDocGenerator.js

@@ -34,7 +34,7 @@ export default class LibDocGenerator extends Generator {
     });
   }
 
-  writing() {
+  async writing() {
     if (this.fs.exists(this.destinationPath("jsdoc.conf.json"))) {
       this.fs.delete(this.destinationPath("jsdoc.conf.json"));
     }
@@ -53,7 +53,9 @@ export default class LibDocGenerator extends Generator {
       if (inMonorepo && inMonorepo.root) {
         const existingConfig = this.fs.readJSON(
           this.destinationPath("tsconfig.doc.json"),
-          { typedocOptions: {} },
+          {
+            typedocOptions: {},
+          },
         );
         // "external-modulemap": ".*packages/([^/]+)/.*",
         const packagePaths = JSON.parse(this.options.packagePaths);
@@ -83,7 +85,7 @@ export default class LibDocGenerator extends Generator {
             );
           }
         }
-        copyAndFormatTpl(
+        await copyAndFormatTpl(
           this.fs,
           this.templatePath("tsconfig.doc.json.lerna.ejs"),
           this.destinationPath("tsconfig.doc.json"),
@@ -101,7 +103,7 @@ export default class LibDocGenerator extends Generator {
         const entryPoints = ((pkg.pob && pkg.pob.entries) || []).map(
           (entryName) => `src/${entryName}.ts`,
         );
-        copyAndFormatTpl(
+        await copyAndFormatTpl(
           this.fs,
           this.templatePath("tsconfig.doc.json.ejs"),
           this.destinationPath("tsconfig.doc.json"),

package/lib/generators/lib/readme/LibReadmeGenerator.js

@@ -41,7 +41,7 @@ export default class LibReadmeGenerator extends Generator {
     });
   }
 
-  writing() {
+  async writing() {
     const pkg = this.fs.readJSON(this.destinationPath("package.json"));
 
     const readmePath = this.destinationPath("README.md");
@@ -94,7 +94,7 @@ export default class LibReadmeGenerator extends Generator {
       );
     const [, gitHost, gitAccount, gitName] = match || [];
     try {
-      copyAndFormatTpl(
+      await copyAndFormatTpl(
         this.fs,
         this.templatePath("README.md.ejs"),
         readmePath,

package/lib/generators/monorepo/PobMonorepoGenerator.js

@@ -362,7 +362,7 @@ export default class PobMonorepoGenerator extends Generator {
     }
   }
 
-  writing() {
+  async writing() {
     if (!this.options.isAppProject) {
       const pkg = this.fs.readJSON(this.destinationPath("package.json"), {});
       const rollupKinds = new Set();
@@ -385,7 +385,7 @@ export default class PobMonorepoGenerator extends Generator {
       });
 
       if (rollupConfigs.length > 0) {
-        copyAndFormatTpl(
+        await copyAndFormatTpl(
           this.fs,
           this.templatePath("monorepo.rollup.config.mjs.ejs"),
           this.destinationPath("rollup.config.mjs"),

package/lib/generators/monorepo/lerna/MonorepoLernaGenerator.js

@@ -86,7 +86,7 @@ export default class MonorepoLernaGenerator extends Generator {
         lernaCurrentConfig.command.publish.ignoreChanges) ||
       [];
 
-    writeAndFormatJson(
+    return writeAndFormatJson(
       this.fs,
       this.destinationPath("lerna.json"),
       lernaConfig,

package/lib/generators/monorepo/typescript/MonorepoTypescriptGenerator.js

@@ -32,7 +32,6 @@ export default class MonorepoTypescriptGenerator extends Generator {
     this.option("testRunner", {
       type: String,
       required: false,
-      default: "jest",
     });
 
     this.option("checkOnly", {
@@ -117,7 +116,7 @@ export default class MonorepoTypescriptGenerator extends Generator {
   }
 
   // after pob ran in workspaces
-  end() {
+  async end() {
     const tsconfigPath = this.destinationPath("tsconfig.json");
     const tsconfigCheckPath = this.destinationPath("tsconfig.check.json");
     const tsconfigBuildPath = this.destinationPath("tsconfig.build.json");
@@ -131,7 +130,7 @@ export default class MonorepoTypescriptGenerator extends Generator {
     } else {
       const packagePaths = JSON.parse(this.options.packagePaths);
 
-      copyAndFormatTpl(
+      await copyAndFormatTpl(
         this.fs,
         this.templatePath("tsconfig.json.ejs"),
         tsconfigPath,
@@ -145,7 +144,7 @@ export default class MonorepoTypescriptGenerator extends Generator {
       this.fs.delete(tsconfigBuildPath);
       // if (this.options.isAppProject) {
       // } else {
-      //   copyAndFormatTpl(
+      //   await copyAndFormatTpl(
       //     this.fs,
       //     this.templatePath('tsconfig.check.json.ejs'),
       //     tsconfigCheckPath,
@@ -156,7 +155,7 @@ export default class MonorepoTypescriptGenerator extends Generator {
       //     },
       //   );
 
-      //   copyAndFormatTpl(
+      //   await copyAndFormatTpl(
       //     this.fs,
       //     this.templatePath('tsconfig.build.json.ejs'),
       //     tsconfigBuildPath,

package/lib/generators/monorepo/workspaces/MonorepoWorkspacesGenerator.js

@@ -85,9 +85,9 @@ export default class MonorepoWorkspacesGenerator extends Generator {
     const packageManager = this.options.packageManager;
 
     packageUtils.addScripts(pkg, {
-      lint: `${packageManager} run lint:prettier && ${packageManager} run lint:eslint`,
-      "lint:prettier": "pob-root-prettier --check .",
-      "lint:prettier:fix": "pob-root-prettier --write .",
+      lint: `${packageManager} run format && ${packageManager} run lint:eslint`,
+      format: "oxfmt",
+      "format:check": "oxfmt --check .",
       "lint:eslint":
         monorepoConfig &&
         monorepoConfig.eslint &&
@@ -166,13 +166,18 @@ export default class MonorepoWorkspacesGenerator extends Generator {
       content = content ? content[1].trim() : readmeFullContent;
     }
 
-    copyAndFormatTpl(this.fs, this.templatePath("README.md.ejs"), readmePath, {
-      title: pkg.description,
-      description: "",
-      packages: this.packages,
-      ci: this.fs.exists(this.destinationPath(".github/workflows/push.yml")),
-      content,
-    });
+    return copyAndFormatTpl(
+      this.fs,
+      this.templatePath("README.md.ejs"),
+      readmePath,
+      {
+        title: pkg.description,
+        description: "",
+        packages: this.packages,
+        ci: this.fs.exists(this.destinationPath(".github/workflows/push.yml")),
+        content,
+      },
+    );
   }
 
   end() {

package/lib/generators/pob/PobBaseGenerator.js

@@ -1,6 +1,6 @@
 import { fileURLToPath } from "node:url";
 import Generator from "yeoman-generator";
-import ensureJsonFileFormatted from "../../utils/ensureJsonFileFormatted.js";
+import { ensureJsonFileFormatted } from "../../utils/ensureJsonFileFormatted.js";
 import inMonorepo from "../../utils/inMonorepo.js";
 import * as packageUtils from "../../utils/package.js";
 
@@ -43,9 +43,9 @@ export default class PobBaseGenerator extends Generator {
     return "pob";
   }
 
-  initializing() {
-    // prettier package.json to ensure diff is correct
-    ensureJsonFileFormatted(this.destinationPath("package.json"));
+  async initializing() {
+    // format package.json to ensure diff is correct
+    await ensureJsonFileFormatted(this.destinationPath("package.json"));
 
     if (this.options.monorepo) {
       this.isMonorepo = true;

package/lib/utils/ensureJsonFileFormatted.js

@@ -1,19 +1,15 @@
-import fs from "node:fs";
-import sortPkg from "@pob/sort-pkg";
-import prettier from "@prettier/sync";
+import fs from "node:fs/promises";
+import { format } from "oxfmt";
 
-export default function ensureJsonFileFormatted(path) {
+export async function ensureJsonFileFormatted(path) {
   try {
-    let contentJson = fs.readFileSync(path, "utf8");
-    if (path === "package.json" || path.endsWith("/package.json")) {
-      contentJson = JSON.stringify(sortPkg(JSON.parse(contentJson)), null, 2);
-    }
-    const formattedPkg = prettier.format(contentJson, {
-      filepath: path,
+    const contentJson = await fs.readFile(path, "utf8");
+    const { code: formattedPkg } = await format(path, contentJson, {
+      printWidth: 80,
     });
     if (contentJson !== formattedPkg) {
       console.warn(`formatted json file ${path}`);
-      fs.writeFileSync(path, formattedPkg);
+      await fs.writeFile(path, formattedPkg);
     }
   } catch {}
 }

package/lib/utils/writeAndFormat.js

@@ -1,36 +1,21 @@
-import prettier from "@prettier/sync";
+import { format } from "oxfmt";
 
-export function writeAndFormat(fs, destinationPath, content, { parser } = {}) {
-  fs.write(
-    destinationPath,
-    prettier.format(content, {
-      parser,
-      filepath: destinationPath,
-      trailingComma: "all",
-      arrowParens: "always",
-      printWidth: destinationPath === ".yarnrc.yml" ? 9999 : undefined,
-    }),
-  );
-}
-
-function getParserFromDestinationPath(destinationPath) {
-  if (destinationPath.endsWith("/lerna.json")) {
-    return "json-stringify";
-  }
-  if (destinationPath.endsWith("json")) {
-    return undefined;
-  }
-
-  return "json";
+export async function writeAndFormat(fs, destinationPath, content) {
+  const { code: formatted } = await format(destinationPath, content, {
+    printWidth: 80,
+  });
+  return fs.write(destinationPath, formatted);
 }
 
-export function writeAndFormatJson(fs, destinationPath, value) {
-  writeAndFormat(fs, destinationPath, JSON.stringify(value, null, 2), {
-    // project.code-workspace is json
-    parser: getParserFromDestinationPath(destinationPath),
-  });
+export async function writeAndFormatJson(fs, destinationPath, value) {
+  await writeAndFormat(fs, destinationPath, JSON.stringify(value, null, 2));
 }
-export function copyAndFormatTpl(fs, templatePath, destinationPath, options) {
-  fs.copyTpl(templatePath, destinationPath, options);
-  writeAndFormat(fs, destinationPath, fs.read(destinationPath));
+export async function copyAndFormatTpl(
+  fs,
+  templatePath,
+  destinationPath,
+  options,
+) {
+  await fs.copyTpl(templatePath, destinationPath, options);
+  await writeAndFormat(fs, destinationPath, fs.read(destinationPath));
 }

package/package.json

@@ -1,36 +1,33 @@
 {
   "name": "pob",
-  "version": "34.2.0",
+  "version": "35.0.0",
   "description": "Pile of bones, library generator with git/babel/typescript/typedoc/readme/jest",
   "keywords": [
     "skeleton"
   ],
-  "author": "Christophe Hurpeau <christophe@hurpeau.com> (http://christophe.hurpeau.com/)",
+  "homepage": "https://github.com/christophehurpeau/pob",
+  "bugs": {
+    "url": "https://github.com/christophehurpeau/pob/issues"
+  },
   "license": "ISC",
+  "author": "Christophe Hurpeau <christophe@hurpeau.com> (http://christophe.hurpeau.com/)",
   "repository": {
     "type": "git",
     "url": "https://github.com/christophehurpeau/pob.git",
     "directory": "packages/pob"
   },
-  "homepage": "https://github.com/christophehurpeau/pob",
-  "bugs": {
-    "url": "https://github.com/christophehurpeau/pob/issues"
-  },
+  "bin": "./lib/pob.js",
+  "files": [
+    "lib",
+    "bin"
+  ],
   "type": "module",
-  "engines": {
-    "node": ">=22.18.0"
-  },
   "sideEffects": false,
-  "bin": "./lib/pob.js",
   "main": "./lib/index.js",
   "exports": {
     ".": "./lib/index.js",
     "./package.json": "./package.json"
   },
-  "files": [
-    "lib",
-    "bin"
-  ],
   "scripts": {
     "build": "yarn run build:definitions",
     "build:definitions": "tsc -p tsconfig.json",
@@ -38,20 +35,15 @@
     "lint": "yarn run lint:eslint",
     "lint:eslint": "yarn '../..' run eslint --quiet 'packages/pob'"
   },
-  "pob": {
-    "typescript": "check-only"
-  },
-  "prettier": "@pob/root/prettier-config",
   "dependencies": {
-    "@pob/eslint-config": "65.4.1",
-    "@pob/eslint-config-typescript-react": "65.4.1",
-    "@pob/sort-object": "10.1.2",
-    "@pob/sort-pkg": "12.1.2",
-    "@prettier/sync": "0.6.1",
+    "@pob/eslint-config": "65.4.3",
+    "@pob/eslint-config-typescript-react": "65.4.3",
+    "@pob/sort-object": "11.0.0",
+    "@pob/sort-pkg": "13.0.0",
     "@types/inquirer": "9.0.9",
     "@yeoman/adapter": "3.1.0",
     "@yeoman/types": "1.8.0",
-    "eslint": "10.2.1",
+    "eslint": "10.4.0",
     "findup-sync": "^5.0.0",
     "git-remote-url": "^1.0.1",
     "github-username": "^9.0.0",
@@ -62,17 +54,23 @@
     "mem-fs": "4.1.4",
     "mem-fs-editor": "11.1.4",
     "minimist": "1.2.8",
+    "oxfmt": "0.50.0",
     "parse-author": "2.0.0",
-    "pob-dependencies": "23.2.0",
-    "prettier": "3.8.3",
-    "semver": "7.7.4",
-    "typescript": "5.9.3",
+    "pob-dependencies": "24.0.0",
+    "semver": "7.8.0",
+    "typescript": "6.0.3",
     "validate-npm-package-name": "^7.0.0",
     "yeoman-environment": "5.0.0",
     "yeoman-generator": "7.5.1"
   },
   "devDependencies": {
-    "@pob/root": "23.2.0",
-    "@types/node": "24.12.2"
+    "@pob/root": "24.0.0",
+    "@types/node": "24.12.4"
+  },
+  "engines": {
+    "node": ">=22.18.0"
+  },
+  "pob": {
+    "typescript": "check-only"
   }
 }

package/lib/generators/common/testing/templates/.eslintrc.json

@@ -1,8 +0,0 @@
-{
-  "env": {
-    "jest": true
-  },
-  "rules": {
-    "strict": "off"
-  }
-}