pob 38.2.1 → 38.3.0

package/lib/generators/app/PobAppGenerator.js

@@ -139,6 +139,12 @@ export default class PobAppGenerator extends Generator {
         default: !config || false,
         when: (values) => values.testing,
       },
+      {
+        type: "confirm",
+        name: "e2e",
+        message: "Do you want e2e testing (Playwright) ?",
+        default: (config && config.e2e) || false,
+      },
       {
         type: "confirm",
         name: "storybook",
@@ -295,8 +301,9 @@ export default class PobAppGenerator extends Generator {
       srcDirectory,
     });
 
-    this.composeWith("pob:app:e2e-testing", {
+    this.composeWith("pob:common:e2e", {
       enable: this.appConfig.e2e,
+      ci: this.options.ci,
     });
 
     this.composeWith("pob:common:format-lint", {
@@ -380,6 +387,9 @@ export default class PobAppGenerator extends Generator {
           enableServer: this.appConfig.type === "vite-with-server",
         });
         break;
+      case "expo":
+        this.composeWith("pob:app:expo", {});
+        break;
       // no default
     }
 

package/lib/generators/app/expo/AppExpoGenerator.js

@@ -0,0 +1,11 @@
+import Generator from "yeoman-generator";
+
+export default class AppExpoGenerator extends Generator {
+  writing() {
+    const pkg = this.fs.readJSON(this.destinationPath("package.json"));
+
+    pkg.main = "./src/AppEntry.tsx";
+
+    this.fs.writeJSON(this.destinationPath("package.json"), pkg);
+  }
+}

package/lib/generators/{app/e2e-testing/AppE2ETestingGenerator.js → common/e2e/CommonE2eGenerator.js}

@@ -1,9 +1,10 @@
 import Generator from "yeoman-generator";
 import * as packageUtils from "../../../utils/package.js";
-// import * as templateUtils from '../../../utils/templateUtils.js';
 import { writeAndFormatJson } from "../../../utils/writeAndFormat.js";
 
-export default class AppE2ETestingGenerator extends Generator {
+// Common e2e (Playwright) generator. The .gitignore entries are emitted by
+// pob:core:gitignore (the sole owner of .gitignore), gated on the same e2e flag.
+export default class CommonE2eGenerator extends Generator {
   constructor(args, opts) {
     super(args, opts);
 
@@ -12,12 +13,6 @@ export default class AppE2ETestingGenerator extends Generator {
       default: true,
       description: "enable e2e testing",
     });
-
-    this.option("ci", {
-      type: Boolean,
-      required: true,
-      description: "ci",
-    });
   }
 
   writing() {
@@ -25,21 +20,13 @@ export default class AppE2ETestingGenerator extends Generator {
 
     packageUtils.addOrRemoveDevDependencies(pkg, this.options.enable, [
       "@playwright/test",
+      "playwright",
     ]);
 
     packageUtils.addOrRemoveScripts(pkg, this.options.enable, {
       "test:e2e": "playwright test",
     });
 
-    // templateUtils.addOrRemoveTemplate(
-    //   this.fs,
-    //   this.options.enable && this.options.ci,
-    //   this.destinationPath('playwright.config.js'),
-    // );
-
-    if (this.options.enable) {
-    }
-
     return writeAndFormatJson(
       this.fs,
       this.destinationPath("package.json"),

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

@@ -316,12 +316,7 @@ export default class CommonFormatLintGenerator extends Generator {
         !pkg.name.startsWith("@pob/eslint-config") &&
         pkg.name !== "@pob/use-eslint-plugin"
       ) {
-        // @pob/eslint-config is provided through @pob/root (which re-exports it
-        // via "@pob/root/eslint-config"), so projects only need @pob/root.
-        if (pkg.name !== "@pob/root") {
-          packageUtils.addDevDependencies(pkg, ["@pob/root"]);
-        }
-        packageUtils.removeDevDependencies(pkg, ["@pob/eslint-config"]);
+        packageUtils.addDevDependencies(pkg, ["@pob/eslint-config"]);
         packageUtils.addOrRemoveDevDependencies(
           pkg,
           shouldHavePluginsDependencies,
@@ -378,7 +373,7 @@ export default class CommonFormatLintGenerator extends Generator {
 
       return {
         imports: [
-          'import pobConfig from "@pob/root/eslint-config"',
+          'import pobConfig from "@pob/eslint-config"',
           useTypescript &&
             hasReact &&
             'import pobTypescriptConfigReact from "@pob/eslint-config-typescript-react"',
@@ -414,8 +409,14 @@ export default class CommonFormatLintGenerator extends Generator {
 
     const isMonorepoRoot =
       this.options.monorepo || Boolean(inMonorepo && inMonorepo.root);
-    if (isMonorepoRoot && useTypescript) {
-      flatCascade.push("...pobConfig.configs.monorepo");
+    // non-published typescript (scripts/**/*.ts, root *.config.ts) is
+    // type-checked against tsconfig.tools.json rather than any emitting
+    // tsconfig.json; point typed lint at that project. The monorepo root owns
+    // the shared tsconfig.tools.json (its **/scripts/** glob covers package
+    // scripts too), and single repos own their own; in-monorepo packages
+    // inherit the root config.
+    if ((isMonorepoRoot || !inMonorepo) && useTypescript) {
+      flatCascade.push("...pobConfig.configs.toolsProject");
     }
 
     const eslintrcBadPath = this.destinationPath(".eslintrc");
@@ -540,11 +541,10 @@ export default class CommonFormatLintGenerator extends Generator {
         delete pkg.scripts.format;
         delete pkg.scripts["format:check"];
       }
-
-      delete pkg.scripts["lint:prettier"];
-      delete pkg.scripts["lint:prettier:fix"];
-      delete pkg.scripts["typescript-check"];
     }
+    delete pkg.scripts["typescript-check"];
+    delete pkg.scripts["lint:prettier"];
+    delete pkg.scripts["lint:prettier:fix"];
 
     this.fs.writeJSON(this.destinationPath("package.json"), pkg);
   }

package/lib/generators/common/transpiler/CommonTranspilerGenerator.js

@@ -385,7 +385,11 @@ export default class CommonTranspilerGenerator extends Generator {
       };
 
       this.entries.forEach((entryWithOptionalExt) => {
-        const entry = entryWithOptionalExt.replace(/\.[jt]sx?$/, "");
+        const entryName =
+          typeof entryWithOptionalExt === "string"
+            ? entryWithOptionalExt
+            : entryWithOptionalExt.name;
+        const entry = entryName.replace(/\.[jt]sx?$/, "");
         const isBrowserOnly =
           withBabel &&
           entry === "browser" &&
@@ -557,7 +561,15 @@ export default class CommonTranspilerGenerator extends Generator {
             }
           }
 
-          pkg.exports[`./${extraEntryConfig.name}`] = exportValue;
+          if (
+            extraEntryConfig.name.startsWith(`${this.options.srcDirectory}/`)
+          ) {
+            pkg.exports[
+              `./${extraEntryConfig.name.slice(this.options.srcDirectory.length + 1)}`
+            ] = exportValue;
+          } else {
+            pkg.exports[`./${extraEntryConfig.name}`] = exportValue;
+          }
         });
       }
     } else if (!pkg.exports) {

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

@@ -222,6 +222,7 @@ export default class CommonTypescriptGenerator extends Generator {
     const tsconfigCheckPath = this.destinationPath("tsconfig.check.json");
     const tsconfigEslintPath = this.destinationPath("tsconfig.eslint.json");
     const tsconfigBuildPath = this.destinationPath("tsconfig.build.json");
+    const tsconfigToolsPath = this.destinationPath("tsconfig.tools.json");
 
     if (this.options.enable) {
       const { jsx, dom } = this.options;
@@ -320,9 +321,6 @@ export default class CommonTypescriptGenerator extends Generator {
           rootDir: this.options.rootDir,
           srcDirectory: this.options.srcDirectory || this.options.rootDir,
           enableHashSlash: this.options.enableHashSlash,
-          scriptsDirectory: this.fs.exists(this.destinationPath("scripts"))
-            ? "scripts"
-            : undefined,
           jsx,
           jsxPreserve: this.options.jsxPreserve,
           nextConfig: this.options.nextConfig,
@@ -364,15 +362,39 @@ export default class CommonTypescriptGenerator extends Generator {
       // } else {
       this.fs.delete(tsconfigBuildPath);
       // }
+
+      // non-published typescript run in place (scripts/**/*.ts, root
+      // *.config.ts) is not part of the emitting tsconfig.json: give it a
+      // dedicated noEmit project so it is type-checked without emitting
+      // definitions nor violating rootDir. Monorepos handle this at the root
+      // via the shared tsconfig.tools.json, so only single repos get it here.
+      if (inMonorepo) {
+        this.fs.delete(tsconfigToolsPath);
+      } else {
+        await copyAndFormatTpl(
+          this.fs,
+          this.templatePath("tsconfig.tools.json.ejs"),
+          tsconfigToolsPath,
+          {
+            nodeVersion: latestLTS,
+          },
+        );
+      }
     } else {
       this.fs.delete(tsconfigPath);
       this.fs.delete(tsconfigBuildPath);
       this.fs.delete(tsconfigCheckPath);
       this.fs.delete(tsconfigEslintPath);
+      this.fs.delete(tsconfigToolsPath);
     }
 
     if (!pkg.workspaces || !this.options.enable) {
-      packageUtils.addOrRemoveScripts(pkg, this.options.enable, { tsc: "tsc" });
+      packageUtils.addOrRemoveScripts(pkg, this.options.enable, {
+        tsc:
+          inMonorepo || !this.options.enable
+            ? "tsc"
+            : "tsc && tsc -p tsconfig.tools.json",
+      });
     }
 
     this.fs.writeJSON(this.destinationPath("package.json"), pkg);

package/lib/generators/common/typescript/templates/tsconfig.json.ejs

@@ -4,8 +4,7 @@
     <%- presets.map(p => `"${p}"`).join(',\n    ') %><% } %>
   ],
   "include": [
-    "<%= srcDirectory %>/**/*.ts"<% if (scriptsDirectory) { -%>,
-    "<%= scriptsDirectory %>/**/*.ts",<% } %><% if (jsx) { -%>,
+    "<%= srcDirectory %>/**/*.ts"<% if (jsx) { -%>,
     "<%= srcDirectory %>/**/*.tsx"<% } %><% if (srcDirectory !== rootDir) { -%>,
     "<%= rootDir %>/*.ts"<% } %><% if (additionalIncludes.length > 0) { -%>,
     <%- additionalIncludes.map(adi => `"${adi}"`).join(',\n    ') %><% } %>

package/lib/generators/common/typescript/templates/tsconfig.tools.json.ejs

@@ -0,0 +1,21 @@
+{
+  "extends": [
+    "@pob/root/tsconfigs/strict.json",
+    "@pob/root/tsconfigs/targets/node-<%= nodeVersion %>.json"
+  ],
+  "files": [],
+  "include": [
+    "scripts/**/*.ts",
+    "scripts/**/*.mts",
+    "scripts/**/*.cts",
+    "*.config.ts",
+    "*.config.mts",
+    "*.config.cts"
+  ],
+  "compilerOptions": {
+    "noEmit": true,
+    "incremental": true,
+    "tsBuildInfoFile": "node_modules/.cache/tsc/tsbuildinfo-tools",
+    "resolveJsonModule": true
+  }
+}

package/lib/generators/core/gitignore/CoreGitignoreGenerator.js

@@ -59,6 +59,13 @@ export default class CoreGitignoreGenerator extends Generator {
       default: "",
       description: "Build directory.",
     });
+
+    this.option("playwright", {
+      type: Boolean,
+      required: false,
+      default: false,
+      description: "Playwright e2e testing enabled.",
+    });
   }
 
   writing() {
@@ -82,6 +89,7 @@ export default class CoreGitignoreGenerator extends Generator {
         typescript: withBabel || this.options.typescript,
         paths: this.options.paths,
         buildInGit: this.options.buildInGit,
+        playwright: this.options.playwright,
       });
     }
 

package/lib/generators/core/gitignore/templates/gitignore.ejs

@@ -35,6 +35,12 @@ yarn-error.log*
 # Typescript
 *.tsbuildinfo
 <% } -%>
+<% if (playwright) { -%>
+
+# Playwright
+/test-results
+/playwright-report
+<% } -%>
 
 #*
 *$

package/lib/generators/core/npm/CoreNpmGenerator.js

@@ -1,3 +1,4 @@
+import fs from "node:fs";
 import Generator from "yeoman-generator";
 
 export default class CoreNpmGenerator extends Generator {
@@ -51,7 +52,7 @@ export default class CoreNpmGenerator extends Generator {
           files.add("bin");
         }
 
-        if (this.fs.exists(this.destinationPath("skills"))) {
+        if (fs.existsSync(this.destinationPath("skills"))) {
           files.add("skills");
         }
 

package/lib/generators/lib/PobLibGenerator.js

@@ -243,6 +243,17 @@ export default class PobLibGenerator extends Generator {
       Object.assign(this.pobjson.testing, testingPrompts);
     }
 
+    // e2e
+    if (!this.updateOnly || this.pobjson.e2e === undefined) {
+      const { e2e } = await this.prompt({
+        type: "confirm",
+        name: "e2e",
+        message: "Would you like e2e testing (Playwright) ?",
+        default: this.pobjson.e2e || false,
+      });
+      this.pobjson.e2e = e2e;
+    }
+
     this.fs.writeJSON(this.destinationPath("package.json"), pkg);
 
     this.composeWith("pob:common:babel", {
@@ -310,7 +321,7 @@ export default class PobLibGenerator extends Generator {
       enable: this.pobjson.testing,
       disableYarnGitCache: this.options.disableYarnGitCache,
       testing: this.pobjson.testing,
-      e2eTesting: false,
+      e2eTesting: this.pobjson.e2e ? "." : false,
       runner: this.pobjson.testing
         ? (inMonorepo
             ? inMonorepo.pobMonorepoConfig.testRunner
@@ -328,6 +339,11 @@ export default class PobLibGenerator extends Generator {
       onlyLatestLTS: this.onlyLatestLTS,
     });
 
+    this.composeWith("pob:common:e2e", {
+      enable: this.pobjson.e2e,
+      ci: this.options.ci,
+    });
+
     // must be after testing
     this.composeWith("pob:common:format-lint", {
       typescript: withTypescript,
@@ -390,6 +406,7 @@ export default class PobLibGenerator extends Generator {
       documentation: this.pobjson.documentation,
       testing: !!this.pobjson.testing,
       buildDirectory,
+      playwright: this.pobjson.e2e,
     });
 
     this.composeWith("pob:core:npm", {

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

@@ -1,4 +1,4 @@
-import { readdirSync } from "node:fs";
+import { existsSync, readdirSync } from "node:fs";
 import Generator from "yeoman-generator";
 import { latestLTS } from "../../../utils/nodeVersions.js";
 import * as packageUtils from "../../../utils/package.js";
@@ -138,34 +138,41 @@ export default class MonorepoTypescriptGenerator extends Generator {
     const tsconfigCheckPath = this.destinationPath("tsconfig.check.json");
     const tsconfigBuildPath = this.destinationPath("tsconfig.build.json");
     const tsconfigTestPath = this.destinationPath("tsconfig.test.json");
-    const tsconfigRootConfigsPath = this.destinationPath(
-      "tsconfig.root-configs.json",
-    );
+    const tsconfigToolsPath = this.destinationPath("tsconfig.tools.json");
+    // previous name, migrate to tsconfig.tools.json
+    this.fs.delete(this.destinationPath("tsconfig.root-configs.json"));
     this.fs.delete(tsconfigTestPath);
 
     if (!this.options.enable) {
       this.fs.delete(tsconfigPath);
       this.fs.delete(tsconfigCheckPath);
       this.fs.delete(tsconfigBuildPath);
-      this.fs.delete(tsconfigRootConfigsPath);
+      this.fs.delete(tsconfigToolsPath);
     } else {
       const packagePaths = JSON.parse(this.options.packagePaths);
+      const pkg = this.fs.readJSON(this.destinationPath("package.json"));
 
-      // root config files written in typescript (e.g. vitest.config.ts) are not
-      // part of any package tsconfig, so they need a dedicated project for
-      // type-aware linting and tsc -b
+      // non-published typescript run in place is not part of any package's
+      // emitting tsconfig, so it needs a dedicated noEmit project for type-aware
+      // linting and tsc -b: root config files (e.g. vitest.config.ts), a root
+      // scripts/ dir, and each package's scripts/ dir (matched via the
+      // workspace globs so all packages are covered)
       const hasRootConfigs = hasRootConfigFiles(this.destinationPath());
-      if (hasRootConfigs) {
+      const hasRootScripts = existsSync(this.destinationPath("scripts"));
+      const workspaceGlobs = pkg.workspaces || [];
+      const hasTools = hasRootConfigs || hasRootScripts;
+      if (hasTools) {
         await copyAndFormatTpl(
           this.fs,
-          this.templatePath("tsconfig.root-configs.json.ejs"),
-          tsconfigRootConfigsPath,
+          this.templatePath("tsconfig.tools.json.ejs"),
+          tsconfigToolsPath,
           {
             nodeVersion: latestLTS,
+            workspaceGlobs,
           },
         );
       } else {
-        this.fs.delete(tsconfigRootConfigsPath);
+        this.fs.delete(tsconfigToolsPath);
       }
 
       await copyAndFormatTpl(
@@ -175,7 +182,7 @@ export default class MonorepoTypescriptGenerator extends Generator {
         {
           packagePaths,
           tsConfigSuffix: false,
-          hasRootConfigs,
+          hasTools,
         },
       );
 

package/lib/generators/monorepo/typescript/templates/tsconfig.json.ejs

@@ -1,8 +1,8 @@
 {
   "files": [],
   "references": [
-<% if (hasRootConfigs) { -%>
-    { "path": "tsconfig.root-configs.json" }<%= packagePaths.length > 0 ? ',' : '' %>
+<% if (hasTools) { -%>
+    { "path": "tsconfig.tools.json" }<%= packagePaths.length > 0 ? ',' : '' %>
 <% } -%>
 <% packagePaths.forEach((packagePath, index) => { -%>
     { "path": "<%= packagePath %>/tsconfig<%= tsConfigSuffix ? `.${tsConfigSuffix}` : '' %>.json" }<%= index === packagePaths.length -1 ? '' : ',' %>

package/lib/generators/monorepo/typescript/templates/tsconfig.tools.json.ejs

@@ -0,0 +1,25 @@
+{
+  "extends": [
+    "@pob/root/tsconfigs/strict.json",
+    "@pob/root/tsconfigs/targets/node-<%= nodeVersion %>.json"
+  ],
+  "include": [
+    "*.config.ts",
+    "*.config.mts",
+    "*.config.cts",
+    "scripts/**/*.ts",
+    "scripts/**/*.mts",
+    "scripts/**/*.cts",
+<% workspaceGlobs.forEach((workspaceGlob, index) => { -%>
+    "<%= workspaceGlob %>/scripts/**/*.ts",
+    "<%= workspaceGlob %>/scripts/**/*.mts",
+    "<%= workspaceGlob %>/scripts/**/*.cts"<%= index === workspaceGlobs.length - 1 ? '' : ',' %>
+<% }) -%>
+  ],
+  "compilerOptions": {
+    "noEmit": true,
+    "tsBuildInfoFile": "node_modules/.cache/tsc/tsbuildinfo-tools",
+    "incremental": true,
+    "resolveJsonModule": true
+  }
+}

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

@@ -108,6 +108,8 @@ export default class MonorepoWorkspacesGenerator extends Generator {
             : ""
         }eslint --quiet .`,
     });
+    delete pkg.scripts["lint:prettier"];
+    delete pkg.scripts["lint:prettier:fix"];
 
     if (
       pkg.scripts?.version ===

package/lib/pob.js

@@ -12,9 +12,10 @@ import path from "node:path";
 import minimist from "minimist";
 import * as yeoman from "yeoman-environment";
 import PobAppGenerator from "./generators/app/PobAppGenerator.js";
-import AppE2ETestingGenerator from "./generators/app/e2e-testing/AppE2ETestingGenerator.js";
+import AppExpoGenerator from "./generators/app/expo/AppExpoGenerator.js";
 import AppViteGenerator from "./generators/app/vite/AppViteGenerator.js";
 import CommonBabelGenerator from "./generators/common/babel/CommonBabelGenerator.js";
+import CommonE2eGenerator from "./generators/common/e2e/CommonE2eGenerator.js";
 import CommonLintGenerator from "./generators/common/format-lint/CommonLintGenerator.js";
 import CommonHuskyGenerator from "./generators/common/husky/CommonHuskyGenerator.js";
 import CommonRemoveOldDependenciesGenerator from "./generators/common/old-dependencies/CommonRemoveOldDependenciesGenerator.js";
@@ -92,16 +93,16 @@ env.registerStub(
   "pob:app",
   `${__dirname}/generators/app/PobAppGenerator.js`,
 );
-env.registerStub(
-  AppE2ETestingGenerator,
-  "pob:app:e2e-testing",
-  `${__dirname}/generators/app/e2e-testing/AppE2ETestingGenerator.js`,
-);
 env.registerStub(
   AppViteGenerator,
   "pob:app:vite",
   `${__dirname}/generators/app/vite/AppViteGenerator.js`,
 );
+env.registerStub(
+  AppExpoGenerator,
+  "pob:app:expo",
+  `${__dirname}/generators/app/expo/AppExpoGenerator.js`,
+);
 env.registerStub(
   CommonBabelGenerator,
   "pob:common:babel",
@@ -127,6 +128,11 @@ env.registerStub(
   "pob:common:remove-old-dependencies",
   `${__dirname}/generators/common/old-dependencies/CommonRemoveOldDependenciesGenerator.js`,
 );
+env.registerStub(
+  CommonE2eGenerator,
+  "pob:common:e2e",
+  `${__dirname}/generators/common/e2e/CommonE2eGenerator.js`,
+);
 env.registerStub(
   CommonReleaseGenerator,
   "pob:common:release",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pob",
-  "version": "38.2.1",
+  "version": "38.3.0",
   "description": "Pile of bones, library generator with git/babel/typescript/typedoc/readme/vitest",
   "keywords": [
     "skeleton"
@@ -48,17 +48,17 @@
     "validate-npm-package-name": "^8.0.0",
     "yeoman-environment": "6.1.0",
     "yeoman-generator": "8.2.2",
-    "@pob/eslint-config": "67.1.1",
-    "@pob/eslint-config-typescript-react": "67.1.1",
+    "@pob/eslint-config": "67.2.0",
+    "@pob/eslint-config-typescript-react": "67.2.0",
     "@pob/sort-pkg": "13.1.2",
-    "pob-dependencies": "27.1.1",
+    "pob-dependencies": "27.2.0",
     "@pob/sort-object": "11.1.1"
   },
   "devDependencies": {
     "@types/node": "24.13.3",
     "@typescript/native": "npm:typescript@7.0.2",
     "@yeoman/types": "1.11.1",
-    "@pob/root": "27.2.1"
+    "@pob/root": "27.3.0"
   },
   "engines": {
     "node": ">=22.18.0"

package/lib/generators/monorepo/typescript/templates/tsconfig.root-configs.json.ejs

@@ -1,13 +0,0 @@
-{
-  "extends": [
-    "@pob/root/tsconfigs/strict.json",
-    "@pob/root/tsconfigs/targets/node-<%= nodeVersion %>.json"
-  ],
-  "include": ["*.config.ts", "*.config.mts", "*.config.cts"],
-  "compilerOptions": {
-    "noEmit": true,
-    "tsBuildInfoFile": "node_modules/.cache/tsc/tsbuildinfo-root-configs",
-    "incremental": true,
-    "resolveJsonModule": true
-  }
-}