pob 18.1.1 → 18.3.0

package/CHANGELOG.md

@@ -3,6 +3,47 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [18.3.0](https://github.com/christophehurpeau/pob/compare/pob@18.2.0...pob@18.3.0) (2024-02-17)
+
+
+### Features
+
+* add directory in extraEntries for usage in files ([17839e6](https://github.com/christophehurpeau/pob/commit/17839e65d6a4f5c50e8f7e4e9da635fc3e0b7382))
+* custom test folder ([f3214b9](https://github.com/christophehurpeau/pob/commit/f3214b9554dd2ce057786dad762a9eef07a25c41))
+* **deps:** update dependency semver to v7.6.0 ([#1930](https://github.com/christophehurpeau/pob/issues/1930)) ([dfc8761](https://github.com/christophehurpeau/pob/commit/dfc8761b8123fbb5a9bdf25ba296a20043e25aae))
+* **deps:** update dependency yeoman-environment to v4.2.1 ([#1901](https://github.com/christophehurpeau/pob/issues/1901)) ([e8bb372](https://github.com/christophehurpeau/pob/commit/e8bb372cd141cedc2736913b84e861768636f26e))
+* **deps:** update dependency yeoman-environment to v4.3.0 ([#1917](https://github.com/christophehurpeau/pob/issues/1917)) ([453fdd9](https://github.com/christophehurpeau/pob/commit/453fdd96725e740306c9341595f1b9e1af15f3fc))
+* **deps:** update yarn monorepo ([#1918](https://github.com/christophehurpeau/pob/issues/1918)) ([288ed84](https://github.com/christophehurpeau/pob/commit/288ed84945daa7813dcfb692ee459676a119b9bf))
+
+
+### Bug Fixes
+
+* fix export when omitVersionInFileName is set ([501367f](https://github.com/christophehurpeau/pob/commit/501367f0072f9ac41ace22312c0576afd7b1645a))
+* fix jest enabled condition ([c10f8b1](https://github.com/christophehurpeau/pob/commit/c10f8b19139d41ef1565a5e7314dbdee5d67cdba))
+* fix srcDirectory for app library ([7df6ba1](https://github.com/christophehurpeau/pob/commit/7df6ba14228326ee9b00b3fa2ec7af1204398860))
+
+Version bump for dependency: yarn-workspace-utils
+Version bump for dependency: root
+
+
+## [18.2.0](https://github.com/christophehurpeau/pob/compare/pob@18.1.1...pob@18.2.0) (2023-12-31)
+
+
+### Features
+
+* initial work for monorepo node test runner ([c013532](https://github.com/christophehurpeau/pob/commit/c013532d6f204eb59861a95d946604f858cabe1a))
+
+
+### Bug Fixes
+
+* monorepo test runner ([d0d443f](https://github.com/christophehurpeau/pob/commit/d0d443ff95c03671378bb1f7a2c947075b982a04))
+* **pob:** fix test override existing detection ([a030544](https://github.com/christophehurpeau/pob/commit/a03054400ded303aa8129f271a5abf1ee0701355))
+* **pob:** fix test override existing detection ([4c54e86](https://github.com/christophehurpeau/pob/commit/4c54e86ba53e0cdad4ffa784ee8d89b96a139a4f))
+
+Version bump for dependency: yarn-workspace-utils
+Version bump for dependency: root
+
+
 ## [18.1.1](https://github.com/christophehurpeau/pob/compare/pob@18.1.0...pob@18.1.1) (2023-12-29)
 
 

package/lib/generators/app/PobAppGenerator.js

@@ -127,7 +127,7 @@ export default class PobAppGenerator extends Generator {
     this.config.save();
   }
 
-  async default() {
+  default() {
     const srcDirectory =
       this.appConfig.type === 'yarn-plugin' ? 'sources' : 'src';
     const isAppLibrary = this.appConfig.type === 'node-library';
@@ -137,7 +137,7 @@ export default class PobAppGenerator extends Generator {
       this.appConfig.type === 'node-library' ||
       this.appConfig.type === 'alp-node'
     ) {
-      await this.composeWith('pob:common:babel', {
+      this.composeWith('pob:common:babel', {
         updateOnly: this.options.updateOnly,
         onlyLatestLTS: true,
         isApp: true,
@@ -148,7 +148,7 @@ export default class PobAppGenerator extends Generator {
         fromPob: this.options.fromPob,
         buildDirectory: 'build',
       });
-      await this.composeWith('pob:common:transpiler', {
+      this.composeWith('pob:common:transpiler', {
         updateOnly: this.options.updateOnly,
         onlyLatestLTS: true,
         isApp: true,
@@ -165,7 +165,7 @@ export default class PobAppGenerator extends Generator {
     const pkg = this.fs.readJSON(this.destinationPath('package.json'));
 
     if (!inMonorepo || inMonorepo.root) {
-      await this.composeWith('pob:common:husky', {});
+      this.composeWith('pob:common:husky', {});
     }
 
     const babelEnvs = (pkg.pob && pkg.pob.babelEnvs) || [];
@@ -190,7 +190,7 @@ export default class PobAppGenerator extends Generator {
       pkg,
     ).filter(Boolean);
 
-    await this.composeWith('pob:common:typescript', {
+    this.composeWith('pob:common:typescript', {
       enable: typescript,
       isApp: true,
       isAppLibrary,
@@ -235,17 +235,22 @@ export default class PobAppGenerator extends Generator {
       })(),
     });
 
-    await this.composeWith('pob:common:remove-old-dependencies');
+    this.composeWith('pob:common:remove-old-dependencies');
 
     const enableReleasePlease =
       !inMonorepo && this.appConfig.testing && this.appConfig.ci;
 
     if (this.appConfig.type !== 'remix') {
-      await this.composeWith('pob:common:testing', {
+      this.composeWith('pob:common:testing', {
         enable: this.appConfig.testing,
         disableYarnGitCache: this.options.disableYarnGitCache,
         enableReleasePlease,
         testing: this.appConfig.testing,
+        runner: this.appConfig.testing
+          ? (inMonorepo
+              ? inMonorepo.pobMonorepoConfig.testRunner
+              : this.appConfig.testRunner) || 'jest'
+          : undefined,
         e2eTesting: this.appConfig.e2e ? '.' : '',
         typescript,
         build: typescript && this.appConfig.type !== 'expo',
@@ -259,11 +264,11 @@ export default class PobAppGenerator extends Generator {
         srcDirectory,
       });
 
-      await this.composeWith('pob:app:e2e-testing', {
+      this.composeWith('pob:app:e2e-testing', {
         enable: this.appConfig.e2e,
       });
 
-      await this.composeWith('pob:common:format-lint', {
+      this.composeWith('pob:common:format-lint', {
         isApp: true,
         documentation: false,
         testing: this.appConfig.testing,
@@ -281,7 +286,7 @@ export default class PobAppGenerator extends Generator {
         buildDirectory: this.appConfig.type === 'expo' ? '.expo' : 'build',
       });
 
-      await this.composeWith('pob:common:release', {
+      this.composeWith('pob:common:release', {
         enable:
           !inMonorepo &&
           this.appConfig.testing &&
@@ -296,7 +301,7 @@ export default class PobAppGenerator extends Generator {
       });
     }
 
-    await this.composeWith('pob:core:vscode', {
+    this.composeWith('pob:core:vscode', {
       root: !inMonorepo,
       monorepo: false,
       packageManager: this.options.packageManager,
@@ -310,7 +315,7 @@ export default class PobAppGenerator extends Generator {
       ignorePaths.push('/.env*', '!/.env.example');
     }
 
-    await this.composeWith('pob:core:gitignore', {
+    this.composeWith('pob:core:gitignore', {
       root: !inMonorepo || inMonorepo.root,
       documentation: false,
       testing: this.appConfig.testing,
@@ -319,16 +324,16 @@ export default class PobAppGenerator extends Generator {
       buildInGit: false,
     });
 
-    await this.composeWith('pob:core:npm', { enable: false });
+    this.composeWith('pob:core:npm', { enable: false });
 
     switch (this.appConfig.type) {
       case 'next.js':
-        await this.composeWith('pob:app:nextjs', {
+        this.composeWith('pob:app:nextjs', {
           export: this.appConfig.export,
         });
         break;
       case 'remix':
-        await this.composeWith('pob:app:remix', {});
+        this.composeWith('pob:app:remix', {});
         break;
     }
 
@@ -341,7 +346,7 @@ export default class PobAppGenerator extends Generator {
     }
   }
 
-  async writing() {
+  writing() {
     // Re-read the content at this point because a composed generator might modify it.
     const pkg = this.fs.readJSON(this.destinationPath('package.json'));
 
@@ -355,6 +360,6 @@ export default class PobAppGenerator extends Generator {
 
     this.fs.writeJSON(this.destinationPath('package.json'), pkg);
 
-    await this.composeWith('pob:core:sort-package');
+    this.composeWith('pob:core:sort-package');
   }
 }

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

@@ -404,12 +404,14 @@ export default class CommonLintGenerator extends Generator {
       ? `{${pkg.type === 'commonjs' ? 'mjs' : 'cjs'},js}`
       : `${hasReact ? '{ts,tsx}' : 'ts'}`;
 
+    const testRunner = globalTesting
+      ? inMonorepo.pobConfig.monorepo.testRunner
+      : this.options.testRunner;
     const testsOverride =
       this.options.testing || globalTesting
         ? {
             files: [`**/*.test.${ext}`, `__tests__/**/*.${ext}`],
-            ...(this.options.testRunner == null ||
-            this.options.testRunner === 'jest'
+            ...(testRunner == null || testRunner === 'jest'
               ? { env: { jest: true } }
               : {}),
             rules: {

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

@@ -6,7 +6,9 @@ function updateOverrides(config, testsOverride) {
     : config.overrides.findIndex(
         testsOverride.env?.jest
           ? (override) => override.env && override.env.jest
-          : (override) => override.extends.includes(testsOverride.extends[0]),
+          : (override) =>
+              override?.env?.jest ||
+              override.extends?.includes(testsOverride.extends[0]),
       );
   if (!testsOverride) {
     if (existingTestsOverrideIndex !== -1) {

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

@@ -1,3 +1,4 @@
+import fs from 'node:fs';
 import path from 'node:path';
 import Generator from 'yeoman-generator';
 import inMonorepo from '../../../utils/inMonorepo.js';
@@ -115,9 +116,9 @@ export default class CommonTestingGenerator extends Generator {
     });
   }
 
-  async default() {
+  default() {
     if (!inMonorepo || inMonorepo.root) {
-      await this.composeWith('pob:core:ci', {
+      this.composeWith('pob:core:ci', {
         enable: this.options.ci,
         enableReleasePlease: this.options.enableReleasePlease,
         enableYarnVersion: this.options.enableYarnVersion,
@@ -135,7 +136,7 @@ export default class CommonTestingGenerator extends Generator {
         onlyLatestLTS: this.options.onlyLatestLTS,
       });
     } else {
-      await this.composeWith('pob:core:ci', {
+      this.composeWith('pob:core:ci', {
         enable: false,
       });
     }
@@ -170,8 +171,21 @@ export default class CommonTestingGenerator extends Generator {
       (this.options.monorepo
         ? yoConfigPobMonorepo.react ?? packageUtils.hasReact(pkg)
         : packageUtils.hasReact(pkg));
+    const testRunner = globalTesting
+      ? inMonorepo.pobConfig.monorepo.testRunner || 'jest'
+      : this.options.runner;
 
-    const isJestRunner = this.options.runner === 'jest';
+    const isJestRunner = testRunner === 'jest';
+
+    const tsTestUtil = 'ts-node'; // : 'babel' | 'tsimp' | 'ts-node' | 'swc'
+    packageUtils.addOrRemoveDevDependencies(
+      pkg,
+      this.options.enable &&
+        (!inMonorepo || inMonorepo.root) &&
+        testRunner === 'node' &&
+        this.options.typescript,
+      [tsTestUtil],
+    );
 
     if (
       !this.options.enable ||
@@ -187,7 +201,6 @@ export default class CommonTestingGenerator extends Generator {
       this.fs.delete(this.destinationPath('jest.config.json'));
     }
 
-    const tsTestUtil = 'ts-node'; // : 'tsimp' | 'ts-node' | 'swc
     const tsTestLoaderOption = (() => {
       switch (tsTestUtil) {
         case 'tsimp':
@@ -198,13 +211,9 @@ export default class CommonTestingGenerator extends Generator {
           return '--import=@swc-node/register/esm';
       }
     })();
-    packageUtils.addOrRemoveDevDependencies(
-      pkg,
-      this.options.enable &&
-        this.options.runner === 'node' &&
-        this.options.typescript,
-      [tsTestUtil],
-    );
+
+    const hasTestFolder =
+      !this.options.monorepo && fs.existsSync(this.destinationPath('test'));
 
     const createTestCommand = ({
       coverage,
@@ -212,8 +221,10 @@ export default class CommonTestingGenerator extends Generator {
       coverageJson,
       watch,
       shouldUseExperimentalVmModules,
+      workspacesPattern,
+      hasReact,
     }) => {
-      switch (this.options.runner) {
+      switch (testRunner) {
         case 'jest': {
           return `${
             shouldUseExperimentalVmModules
@@ -232,6 +243,9 @@ export default class CommonTestingGenerator extends Generator {
           }`;
         }
         case 'node': {
+          if (!workspacesPattern && this.options.monorepo) {
+            throw new Error('Invalid workspacesPattern');
+          }
           return `${tsTestUtil === 'tsimp' ? 'TSIMP_DIAG=ignore ' : ''}${
             tsTestUtil === 'ts-node'
               ? 'TS_NODE_PROJECT=tsconfig.test.json '
@@ -246,16 +260,25 @@ export default class CommonTestingGenerator extends Generator {
               : ''
           }node ${
             this.options.typescript ? `${tsTestLoaderOption} ` : ''
-          }--test ${this.options.srcDirectory}/${
-            this.options.typescript ? '**/*.test.ts' : '**/*.test.js'
-          }`;
+          }--test ${this.options.monorepo ? `${workspacesPattern}/` : ''}${`${
+            hasTestFolder ? 'test/*' : `${this.options.srcDirectory}/**/*.test`
+          }.${this.options.typescript ? 'ts' : 'js'}`}`;
         }
         default: {
-          throw new Error('Invalid runner');
+          throw new Error(`Invalid runner: "${testRunner}"`);
         }
       }
     };
 
+    const jestConfigPath = this.destinationPath('jest.config.json');
+    packageUtils.addOrRemoveDevDependencies(
+      pkg,
+      this.options.enable &&
+        (enableForMonorepo || !globalTesting) &&
+        testRunner === 'jest',
+      ['jest', '@types/jest'],
+    );
+
     if (!this.options.enable) {
       // if (inMonorepo) {
       //   if (pkg.scripts.test === 'echo "No tests"') {
@@ -263,27 +286,32 @@ export default class CommonTestingGenerator extends Generator {
       //   }
       //   delete pkg.scripts['generate:test-coverage'];
       // }
-      if (pkg.scripts) {
-        delete pkg.scripts.test;
-        delete pkg.scripts['generate:test-coverage'];
-        delete pkg.scripts['test:watch'];
-        delete pkg.scripts['test:coverage'];
-        delete pkg.scripts['test:coverage:json'];
-        delete pkg.scripts['test:coverage:lcov'];
-      }
+      packageUtils.removeScripts([
+        'test',
+        'test:coverage',
+        'generate:test-coverage',
+        'test:watch',
+        'test:coverage',
+        'test:coverage:json',
+        'test:coverage:lcov',
+      ]);
 
       writeAndFormatJson(this.fs, this.destinationPath('package.json'), pkg);
     } else {
-      const jestConfigPath = this.destinationPath('jest.config.json');
-      if (this.options.runner === 'jest') {
-        packageUtils.addOrRemoveDevDependencies(
-          pkg,
-          enableForMonorepo || !globalTesting,
-          ['jest', '@types/jest'],
-        );
+      let workspacesPattern;
+      if (this.options.monorepo) {
+        const workspacesWithoutStar = pkg.workspaces.map((workspace) => {
+          if (!workspace.endsWith('/*')) {
+            throw new Error(`Invalid workspace format: ${workspace}`);
+          }
+          return workspace.slice(0, -2);
+        });
+        workspacesPattern =
+          workspacesWithoutStar.length === 1
+            ? workspacesWithoutStar[0]
+            : `@(${workspacesWithoutStar.join('|')})`;
       }
 
-      packageUtils.removeScripts(['test:coverage']);
       if (this.options.monorepo && !globalTesting) {
         packageUtils.addScripts(pkg, {
           test: 'yarn workspaces foreach --parallel -Av run test',
@@ -292,36 +320,33 @@ export default class CommonTestingGenerator extends Generator {
         const shouldUseExperimentalVmModules = pkg.type === 'module';
 
         packageUtils.addScripts(pkg, {
-          test: createTestCommand({ shouldUseExperimentalVmModules }),
+          test: createTestCommand({
+            workspacesPattern,
+            shouldUseExperimentalVmModules,
+          }),
           'test:watch': createTestCommand({
+            workspacesPattern,
             shouldUseExperimentalVmModules,
             watch: true,
           }),
           'test:coverage': createTestCommand({
+            workspacesPattern,
             shouldUseExperimentalVmModules,
             coverage: true,
           }),
           'test:coverage:lcov': createTestCommand({
+            workspacesPattern,
             shouldUseExperimentalVmModules,
             coverageLcov: true,
           }),
           'test:coverage:json': createTestCommand({
+            workspacesPattern,
             shouldUseExperimentalVmModules,
             coverageJson: true,
           }),
         });
 
         if (isJestRunner) {
-          const workspacesWithoutStar = pkg.workspaces.map((workspace) => {
-            if (!workspace.endsWith('/*')) {
-              throw new Error(`Invalid workspace format: ${workspace}`);
-            }
-            return workspace.slice(0, -2);
-          });
-          const workspacesPattern =
-            workspacesWithoutStar.length === 1
-              ? workspacesWithoutStar[0]
-              : `@(${workspacesWithoutStar.join('|')})`;
           hasReact = yoConfigPobMonorepo.packageNames.some((pkgName) =>
             pkgName.startsWith('react-'),
           );
@@ -353,133 +378,151 @@ export default class CommonTestingGenerator extends Generator {
           }
           writeAndFormatJson(this.fs, jestConfigPath, jestConfig);
         }
-      } else if (globalTesting) {
-        if (pkg.scripts) {
-          delete pkg.scripts['generate:test-coverage'];
-          delete pkg.scripts['test:watch'];
-          delete pkg.scripts['test:coverage'];
-        }
-        packageUtils.addScripts(pkg, {
-          test: `yarn ../../ run test -- ${path
-            .relative('../..', '.')
-            .replace('\\', '/')}`,
-        });
       } else {
-        const babelEnvs = pkg.pob?.babelEnvs || [];
-        const transpileWithBabel = packageUtils.transpileWithBabel(pkg);
-        const withTypescript = babelEnvs.length > 0 || pkg.pob?.typescript;
-
-        const shouldUseExperimentalVmModules =
-          pkg.type === 'module' && !inMonorepo;
-
-        packageUtils.addScripts(pkg, {
-          test: createTestCommand({ shouldUseExperimentalVmModules }),
-          'test:watch': createTestCommand({
-            shouldUseExperimentalVmModules,
-            watch: true,
-          }),
-          'test:coverage': createTestCommand({
-            shouldUseExperimentalVmModules,
-            coverage: true,
-          }),
-          'test:coverage:lcov': createTestCommand({
-            shouldUseExperimentalVmModules,
-            coverageLcov: true,
-          }),
-          'test:coverage:json': createTestCommand({
-            shouldUseExperimentalVmModules,
-            coverageJson: true,
-          }),
-        });
-
-        if (this.options.runner === 'jest') {
-          const srcDirectory =
-            transpileWithBabel || withTypescript
-              ? this.options.srcDirectory
-              : 'lib';
+        const tsconfigTestPath = this.destinationPath('tsconfig.test.json');
+        if (testRunner === 'node' && withTypescript) {
+          const nodeVersion = this.options.onlyLatestLTS ? '20' : '18';
+          copyAndFormatTpl(
+            this.fs,
+            this.templatePath('tsconfig.test.json.ejs'),
+            tsconfigTestPath,
+            {
+              nodeVersion,
+            },
+          );
+        } else {
+          this.fs.delete(tsconfigTestPath);
+        }
 
-          const jestConfig = this.fs.readJSON(jestConfigPath, pkg.jest ?? {});
-          delete pkg.jest;
-          Object.assign(jestConfig, {
-            cacheDirectory: './node_modules/.cache/jest',
-            testMatch: [
-              `<rootDir>/${srcDirectory}/**/__tests__/**/*.${
-                withTypescript ? 'ts' : '?(m)js'
-              }${hasReact ? '?(x)' : ''}`,
-              `<rootDir>/${srcDirectory}/**/*.test.${
-                withTypescript ? 'ts' : '?(m)js'
-              }${hasReact ? '?(x)' : ''}`,
-            ],
-            collectCoverageFrom: [
-              `${srcDirectory}/**/*.${withTypescript ? 'ts' : '?(m)js'}${
-                hasReact ? '?(x)' : ''
-              }`,
-            ],
-            moduleFileExtensions: [
-              withTypescript && 'ts',
-              withTypescript && hasReact && 'tsx',
-              'js',
-              // 'jsx',
-              'json',
-            ].filter(Boolean),
-            // transform: {
-            //   [`^.+\\.ts${hasReact ? 'x?' : ''}$`]: 'babel-jest',
-            // },
+        if (globalTesting) {
+          if (pkg.scripts) {
+            delete pkg.scripts['generate:test-coverage'];
+            delete pkg.scripts['test:watch'];
+            delete pkg.scripts['test:coverage'];
+          }
+          packageUtils.addScripts(pkg, {
+            test: `yarn ../../ run test -- ${path
+              .relative('../..', '.')
+              .replace('\\', '/')}`,
+          });
+        } else {
+          const babelEnvs = pkg.pob?.babelEnvs || [];
+          const transpileWithBabel = packageUtils.transpileWithBabel(pkg);
+          const withTypescript = babelEnvs.length > 0 || pkg.pob?.typescript;
+
+          const shouldUseExperimentalVmModules =
+            pkg.type === 'module' && !inMonorepo;
+
+          packageUtils.addScripts(pkg, {
+            test: createTestCommand({ shouldUseExperimentalVmModules }),
+            'test:watch': createTestCommand({
+              shouldUseExperimentalVmModules,
+              watch: true,
+            }),
+            'test:coverage': createTestCommand({
+              shouldUseExperimentalVmModules,
+              coverage: true,
+            }),
+            'test:coverage:lcov': createTestCommand({
+              shouldUseExperimentalVmModules,
+              coverageLcov: true,
+            }),
+            'test:coverage:json': createTestCommand({
+              shouldUseExperimentalVmModules,
+              coverageJson: true,
+            }),
           });
-          if (transpileWithEsbuild) {
-            jestConfig.transform = {
-              [hasReact ? '^.+\\.tsx?$' : '^.+\\.ts$']: [
-                'jest-esbuild',
-                {
-                  format: shouldUseExperimentalVmModules ? 'esm' : 'cjs',
-                },
+
+          if (testRunner === 'jest') {
+            const srcDirectory =
+              transpileWithBabel || withTypescript
+                ? this.options.srcDirectory
+                : 'lib';
+
+            const jestConfig = this.fs.readJSON(jestConfigPath, pkg.jest ?? {});
+            delete pkg.jest;
+            Object.assign(jestConfig, {
+              cacheDirectory: './node_modules/.cache/jest',
+              testMatch: [
+                `<rootDir>/${srcDirectory}/**/__tests__/**/*.${
+                  withTypescript ? 'ts' : '?(m)js'
+                }${hasReact ? '?(x)' : ''}`,
+                `<rootDir>/${srcDirectory}/**/*.test.${
+                  withTypescript ? 'ts' : '?(m)js'
+                }${hasReact ? '?(x)' : ''}`,
+              ],
+              collectCoverageFrom: [
+                `${srcDirectory}/**/*.${withTypescript ? 'ts' : '?(m)js'}${
+                  hasReact ? '?(x)' : ''
+                }`,
               ],
-            };
-          } else if (!transpileWithBabel) {
-            delete jestConfig.transform;
-          } else if (jestConfig.transform) {
-            jestConfig.transform = Object.fromEntries(
-              Object.entries(jestConfig.transform).filter(
-                ([key, value]) =>
-                  !(
-                    value &&
-                    Array.isArray(value) &&
-                    value[0] === 'jest-esbuild'
-                  ),
-              ),
-            );
-            if (Object.keys(jestConfig.transform).length === 0) {
+              moduleFileExtensions: [
+                withTypescript && 'ts',
+                withTypescript && hasReact && 'tsx',
+                'js',
+                // 'jsx',
+                'json',
+              ].filter(Boolean),
+              // transform: {
+              //   [`^.+\\.ts${hasReact ? 'x?' : ''}$`]: 'babel-jest',
+              // },
+            });
+            if (transpileWithEsbuild) {
+              jestConfig.transform = {
+                [hasReact ? '^.+\\.tsx?$' : '^.+\\.ts$']: [
+                  'jest-esbuild',
+                  {
+                    format: shouldUseExperimentalVmModules ? 'esm' : 'cjs',
+                  },
+                ],
+              };
+            } else if (!transpileWithBabel) {
               delete jestConfig.transform;
+            } else if (jestConfig.transform) {
+              jestConfig.transform = Object.fromEntries(
+                Object.entries(jestConfig.transform).filter(
+                  ([key, value]) =>
+                    !(
+                      value &&
+                      Array.isArray(value) &&
+                      value[0] === 'jest-esbuild'
+                    ),
+                ),
+              );
+              if (Object.keys(jestConfig.transform).length === 0) {
+                delete jestConfig.transform;
+              }
             }
-          }
 
-          if (shouldUseExperimentalVmModules) {
-            jestConfig.extensionsToTreatAsEsm = [
-              withTypescript && '.ts',
-              withTypescript && hasReact && '.tsx',
-            ].filter(Boolean);
-          } else {
-            delete jestConfig.extensionsToTreatAsEsm;
-          }
+            if (shouldUseExperimentalVmModules) {
+              jestConfig.extensionsToTreatAsEsm = [
+                withTypescript && '.ts',
+                withTypescript && hasReact && '.tsx',
+              ].filter(Boolean);
+            } else {
+              delete jestConfig.extensionsToTreatAsEsm;
+            }
 
-          if (
-            babelEnvs.length === 0 ||
-            babelEnvs.some((env) => env.target === 'node')
-          ) {
-            // jestConfig.testEnvironment = 'node'; this is the default now
-            delete jestConfig.testEnvironment;
-          } else {
-            delete jestConfig.testEnvironment;
-          }
+            if (
+              babelEnvs.length === 0 ||
+              babelEnvs.some((env) => env.target === 'node')
+            ) {
+              // jestConfig.testEnvironment = 'node'; this is the default now
+              delete jestConfig.testEnvironment;
+            } else {
+              delete jestConfig.testEnvironment;
+            }
 
-          writeAndFormatJson(this.fs, jestConfigPath, jestConfig);
+            writeAndFormatJson(this.fs, jestConfigPath, jestConfig);
+          }
         }
       }
     }
 
     if (
       transpileWithBabel &&
-      ((this.options.monorepo && globalTesting) || !globalTesting)
+      ((this.options.monorepo && globalTesting) || !globalTesting) &&
+      testRunner === 'jest'
     ) {
       // cjs for jest compat
       copyAndFormatTpl(

package/lib/generators/common/testing/templates/tsconfig.test.json.ejs

@@ -0,0 +1,10 @@
+{
+  "extends": [
+    "./tsconfig.json",
+    "@pob/root/tsconfigs/targets/node-<%= nodeVersion %>.json"
+  ],
+  "ts-node": {
+    "esm": true,
+    "transpileOnly": true
+  }
+}

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

@@ -335,21 +335,24 @@ export default class CommonTranspilerGenerator extends Generator {
 
         const defaultNodeEnvVersion = defaultNodeEnv && defaultNodeEnv.version;
 
-        envs.forEach(({ target, version, formats }) => {
+        envs.forEach(({ target, version, formats, omitVersionInFileName }) => {
           if (target === 'node' && entry === 'browser') return;
 
           const exportTarget = {};
 
           if (target === 'node') {
             const cjsExt = pkg.type === 'module' ? 'cjs' : 'cjs.js';
+            const filenameWithoutExt = `${entryDistName}-${target}${
+              omitVersionInFileName ? '' : version
+            }`;
             if (!formats || formats.includes('es')) {
-              exportTarget.import = `./${this.options.buildDirectory}/${entryDistName}-${target}${version}.mjs`;
+              exportTarget.import = `./${this.options.buildDirectory}/${filenameWithoutExt}.mjs`;
 
               if (formats && formats.includes('cjs')) {
-                exportTarget.require = `./${this.options.buildDirectory}/${entryDistName}-${target}${version}.${cjsExt}`;
+                exportTarget.require = `./${this.options.buildDirectory}/${filenameWithoutExt}.${cjsExt}`;
               }
             } else if (formats && formats.includes('cjs')) {
-              exportTarget.default = `./${this.options.buildDirectory}/${entryDistName}-${target}${version}.${cjsExt}`;
+              exportTarget.default = `./${this.options.buildDirectory}/${filenameWithoutExt}.${cjsExt}`;
             }
             // eslint: https://github.com/benmosher/eslint-plugin-import/issues/2132
             // jest: https://github.com/facebook/jest/issues/9771

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

@@ -99,9 +99,9 @@ export default class CoreGitGenerator extends Generator {
     }
   }
 
-  async default() {
+  default() {
     if (this.gitHost === 'github') {
-      await this.composeWith('pob:core:git:github', {
+      this.composeWith('pob:core:git:github', {
         shouldCreate: !this.originUrl,
         gitHostAccount: this.gitHostAccount,
         repoName: this.repoName,

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

@@ -60,6 +60,13 @@ export default class CoreNpmGenerator extends Generator {
           }
         });
       }
+      if (pkg.pob?.extraEntries) {
+        pkg.pob?.extraEntries.forEach((extraEntry) => {
+          if (extraEntry.directory) {
+            files.add(extraEntry.directory);
+          }
+        });
+      }
 
       pkg.files = [...files].filter(Boolean);
     } else {

package/lib/generators/lib/PobLibGenerator.js

@@ -229,14 +229,14 @@ export default class PobLibGenerator extends Generator {
 
     this.fs.writeJSON(this.destinationPath('package.json'), pkg);
 
-    await this.composeWith('pob:common:babel', {
+    this.composeWith('pob:common:babel', {
       updateOnly: this.options.updateOnly,
       testing: !!this.pobjson.testing,
       documentation: !!this.pobjson.documentation,
       fromPob: this.options.fromPob,
       onlyLatestLTS: false,
     });
-    await this.composeWith('pob:common:transpiler', {
+    this.composeWith('pob:common:transpiler', {
       updateOnly: this.options.updateOnly,
       testing: !!this.pobjson.testing,
       documentation: !!this.pobjson.documentation,
@@ -245,7 +245,7 @@ export default class PobLibGenerator extends Generator {
     });
   }
 
-  async default() {
+  default() {
     const pkg = this.fs.readJSON(this.destinationPath('package.json'));
     const babelEnvs = pkg.pob.babelEnvs || [];
 
@@ -255,7 +255,7 @@ export default class PobLibGenerator extends Generator {
     const browser =
       withBabel && babelEnvs.some((env) => env.target === 'browser');
 
-    await this.composeWith('pob:common:typescript', {
+    this.composeWith('pob:common:typescript', {
       enable: withTypescript,
       isApp: false,
       dom: browser,
@@ -266,21 +266,23 @@ export default class PobLibGenerator extends Generator {
       onlyLatestLTS: false,
     });
 
-    await this.composeWith('pob:common:husky', {});
+    this.composeWith('pob:common:husky', {});
 
-    await this.composeWith('pob:common:remove-old-dependencies');
+    this.composeWith('pob:common:remove-old-dependencies');
 
     const enableReleasePlease =
       !inMonorepo && this.pobjson.testing && this.pobjson.testing.ci;
 
-    await this.composeWith('pob:common:testing', {
+    this.composeWith('pob:common:testing', {
       enable: this.pobjson.testing,
       disableYarnGitCache: this.options.disableYarnGitCache,
       enableReleasePlease,
       testing: this.pobjson.testing,
       e2eTesting: false,
       runner: this.pobjson.testing
-        ? this.pobjson.testing.runner || 'jest'
+        ? (inMonorepo
+            ? inMonorepo.pobMonorepoConfig.testRunner
+            : this.pobjson.testing.runner) || 'jest'
         : undefined,
       build: withBabel || withTypescript,
       typescript: withTypescript,
@@ -290,35 +292,38 @@ export default class PobLibGenerator extends Generator {
       packageManager: this.options.packageManager,
       isApp: false,
       splitCIJobs: false,
+      srcDirectory: withBabel || withTypescript ? 'src' : 'lib',
     });
 
     // must be after testing
-    await this.composeWith('pob:common:format-lint', {
+    this.composeWith('pob:common:format-lint', {
       typescript: withTypescript,
       documentation:
         !!this.pobjson.documentation ||
         !!(this.pobjson.testing && this.pobjson.testing.codecov),
       testing: !!this.pobjson.testing,
-      testRunner: this.pobjson.testing?.runner,
+      testRunner: inMonorepo
+        ? inMonorepo.pobMonorepoConfig.testRunner
+        : this.pobjson.testing?.runner,
       packageManager: this.options.packageManager,
       yarnNodeLinker: this.options.yarnNodeLinker,
       ignorePaths: withBabel || withTypescript ? '/dist' : '',
     });
 
-    await this.composeWith('pob:lib:doc', {
+    this.composeWith('pob:lib:doc', {
       enabled: this.pobjson.documentation,
       testing: this.pobjson.testing,
     });
 
     // must be after doc, testing
-    await this.composeWith('pob:lib:readme', {
+    this.composeWith('pob:lib:readme', {
       documentation: !!this.pobjson.documentation,
       testing: !!this.pobjson.testing,
       ci: this.pobjson.testing && this.pobjson.testing.ci,
       codecov: this.pobjson.testing && this.pobjson.testing.codecov,
     });
 
-    await this.composeWith('pob:common:release', {
+    this.composeWith('pob:common:release', {
       enable: !inMonorepo && this.pobjson.testing,
       enablePublish: true,
       withBabel,
@@ -330,7 +335,7 @@ export default class PobLibGenerator extends Generator {
       updateOnly: this.options.updateOnly,
     });
 
-    await this.composeWith('pob:core:vscode', {
+    this.composeWith('pob:core:vscode', {
       root: !inMonorepo,
       monorepo: false,
       packageManager: this.options.packageManager,
@@ -340,7 +345,7 @@ export default class PobLibGenerator extends Generator {
     });
 
     // must be after doc, testing
-    await this.composeWith('pob:core:gitignore', {
+    this.composeWith('pob:core:gitignore', {
       root: !inMonorepo,
       withBabel: babelEnvs.length > 0,
       typescript: withTypescript,
@@ -348,14 +353,14 @@ export default class PobLibGenerator extends Generator {
       testing: !!this.pobjson.testing,
     });
 
-    await this.composeWith('pob:core:npm', {
+    this.composeWith('pob:core:npm', {
       enable: !pkg.private,
       srcDirectory: withBabel || withTypescript ? 'src' : 'lib',
       distDirectory: withBabel || withTypescript ? 'dist' : '',
     });
   }
 
-  async writing() {
+  writing() {
     // Re-read the content at this point because a composed generator might modify it.
     const pkg = this.fs.readJSON(this.destinationPath('package.json'));
 
@@ -420,6 +425,6 @@ export default class PobLibGenerator extends Generator {
     this.config.set('lib', pobjson);
     this.config.save();
 
-    await this.composeWith('pob:core:sort-package');
+    this.composeWith('pob:core:sort-package');
   }
 }

package/lib/generators/monorepo/PobMonorepoGenerator.js

@@ -201,7 +201,7 @@ export default class PobMonorepoGenerator extends Generator {
     this.config.delete('pob-config');
   }
 
-  async default() {
+  default() {
     const pkg = this.fs.readJSON(this.destinationPath('package.json'), {});
 
     const packageNames = this.packageNames;
@@ -216,15 +216,16 @@ export default class PobMonorepoGenerator extends Generator {
       throw new Error('packages should not be empty');
     }
 
-    await this.composeWith('pob:common:husky', {});
+    this.composeWith('pob:common:husky', {});
 
     const isYarnVersionEnabled = this.pobLernaConfig.ci;
 
     const splitCIJobs = this.packageNames.length > 8;
 
-    await this.composeWith('pob:common:testing', {
+    this.composeWith('pob:common:testing', {
       monorepo: true,
       enable: this.pobLernaConfig.testing,
+      runner: this.pobLernaConfig.testRunner || 'jest',
       disableYarnGitCache: this.options.disableYarnGitCache,
       enableReleasePlease: false,
       enableYarnVersion: isYarnVersionEnabled,
@@ -241,7 +242,7 @@ export default class PobMonorepoGenerator extends Generator {
       splitCIJobs,
     });
 
-    await this.composeWith('pob:common:format-lint', {
+    this.composeWith('pob:common:format-lint', {
       monorepo: true,
       documentation: this.pobLernaConfig.documentation,
       typescript: this.pobLernaConfig.typescript,
@@ -259,7 +260,7 @@ export default class PobMonorepoGenerator extends Generator {
       rootIgnorePaths: [],
     });
 
-    await this.composeWith('pob:lib:doc', {
+    this.composeWith('pob:lib:doc', {
       enabled: this.pobLernaConfig.documentation,
       testing: this.pobLernaConfig.testing,
       packageNames: JSON.stringify(packageNames),
@@ -267,7 +268,7 @@ export default class PobMonorepoGenerator extends Generator {
       packageManager: this.options.packageManager,
     });
 
-    await this.composeWith('pob:core:vscode', {
+    this.composeWith('pob:core:vscode', {
       root: true,
       monorepo: true,
       packageManager: this.options.packageManager,
@@ -279,16 +280,16 @@ export default class PobMonorepoGenerator extends Generator {
     });
 
     // Always add a gitignore, because npm publish uses it.
-    await this.composeWith('pob:core:gitignore', {
+    this.composeWith('pob:core:gitignore', {
       root: true,
       typescript: this.pobLernaConfig.typescript,
       documentation: this.pobLernaConfig.documentation,
       testing: this.pobLernaConfig.testing,
     });
 
-    await this.composeWith('pob:common:remove-old-dependencies');
+    this.composeWith('pob:common:remove-old-dependencies');
 
-    await this.composeWith('pob:common:release', {
+    this.composeWith('pob:common:release', {
       enable: true,
       enablePublish: !this.options.isAppProject,
       withBabel: this.pobLernaConfig.typescript,
@@ -299,11 +300,12 @@ export default class PobMonorepoGenerator extends Generator {
       updateOnly: this.options.updateOnly,
     });
 
-    await this.composeWith('pob:monorepo:typescript', {
+    this.composeWith('pob:monorepo:typescript', {
       enable: this.pobLernaConfig.typescript,
       isAppProject: this.options.isAppProject,
       packageNames: JSON.stringify(packageNames),
       packagePaths: JSON.stringify(packagePaths),
+      testRunner: this.pobLernaConfig.testRunner,
     });
 
     this.fs.writeJSON(this.destinationPath('package.json'), pkg);
@@ -315,7 +317,7 @@ export default class PobMonorepoGenerator extends Generator {
     }
   }
 
-  async writing() {
+  writing() {
     if (!this.options.isAppProject) {
       const pkg = this.fs.readJSON(this.destinationPath('package.json'), {});
 
@@ -354,7 +356,7 @@ export default class PobMonorepoGenerator extends Generator {
       this.fs.writeJSON(this.destinationPath('package.json'), pkg);
     }
 
-    await this.composeWith('pob:core:sort-package');
+    this.composeWith('pob:core:sort-package');
   }
 
   end() {

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

@@ -1,3 +1,4 @@
+import { existsSync } from 'node:fs';
 import Generator from 'yeoman-generator';
 import * as packageUtils from '../../../utils/package.js';
 import { copyAndFormatTpl } from '../../../utils/writeAndFormat.js';
@@ -27,6 +28,12 @@ export default class MonorepoTypescriptGenerator extends Generator {
       type: String,
       required: true,
     });
+
+    this.option('testRunner', {
+      type: String,
+      required: false,
+      default: 'jest',
+    });
   }
 
   writing() {
@@ -85,11 +92,13 @@ export default class MonorepoTypescriptGenerator extends Generator {
     const tsconfigPath = this.destinationPath('tsconfig.json');
     const tsconfigCheckPath = this.destinationPath('tsconfig.check.json');
     const tsconfigBuildPath = this.destinationPath('tsconfig.build.json');
+    const tsconfigTestPath = this.destinationPath('tsconfig.test.json');
 
     if (!this.options.enable) {
       this.fs.delete(tsconfigPath);
       this.fs.delete(tsconfigCheckPath);
       this.fs.delete(tsconfigBuildPath);
+      this.fs.delete(tsconfigTestPath);
     } else {
       const packagePaths = JSON.parse(this.options.packagePaths);
 
@@ -99,9 +108,24 @@ export default class MonorepoTypescriptGenerator extends Generator {
         tsconfigPath,
         {
           packagePaths,
+          tsConfigSuffix: false,
         },
       );
 
+      if (this.options.testRunner === 'node') {
+        copyAndFormatTpl(
+          this.fs,
+          this.templatePath('tsconfig.json.ejs'),
+          tsconfigTestPath,
+          {
+            packagePaths: packagePaths.filter((packagePath) =>
+              existsSync(`${packagePath}/tsconfig.test.json`),
+            ),
+            tsConfigSuffix: 'test',
+          },
+        );
+      }
+
       this.fs.delete(tsconfigCheckPath);
       this.fs.delete(tsconfigBuildPath);
       // if (this.options.isAppProject) {

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

@@ -2,7 +2,7 @@
   "files": [],
   "references": [
 <% packagePaths.forEach((packagePath, index) => { -%>
-    { "path": "<%= packagePath %>/tsconfig.json" }<%= index === packagePaths.length -1 ? '' : ',' %>
+    { "path": "<%= packagePath %>/tsconfig<%= tsConfigSuffix ? `.${tsConfigSuffix}` : '' %>.json" }<%= index === packagePaths.length -1 ? '' : ',' %>
 <% }) -%>
   ]
 }

package/lib/generators/pob/PobBaseGenerator.js

@@ -113,15 +113,15 @@ export default class PobBaseGenerator extends Generator {
     this.config.set('project', this.projectConfig);
   }
 
-  async default() {
-    await this.composeWith('pob:core:yarn', {
+  default() {
+    this.composeWith('pob:core:yarn', {
       type: this.projectConfig.type,
       enable: this.isRoot && this.projectConfig.packageManager === 'yarn',
       yarnNodeLinker: this.projectConfig.yarnNodeLinker,
       disableYarnGitCache: this.projectConfig.disableYarnGitCache,
     });
 
-    await this.composeWith('pob:core:package', {
+    this.composeWith('pob:core:package', {
       updateOnly: this.options.updateOnly,
       private: this.isMonorepo,
       isMonorepo: this.isMonorepo,
@@ -130,13 +130,13 @@ export default class PobBaseGenerator extends Generator {
     });
 
     if (this.isMonorepo) {
-      await this.composeWith('pob:monorepo:workspaces', {
+      this.composeWith('pob:monorepo:workspaces', {
         force: this.options.force,
         isAppProject: this.projectConfig.type === 'app',
         packageManager: this.projectConfig.packageManager,
         disableYarnGitCache: this.projectConfig.disableYarnGitCache,
       });
-      await this.composeWith('pob:monorepo:lerna', {
+      this.composeWith('pob:monorepo:lerna', {
         force: this.options.force,
         isAppProject: this.projectConfig.type === 'app',
         packageManager: this.projectConfig.packageManager,
@@ -147,13 +147,13 @@ export default class PobBaseGenerator extends Generator {
     this.fs.delete('Makefile');
     this.fs.delete(this.destinationPath('.commitrc.js'));
 
-    await this.composeWith('pob:core:editorconfig');
+    this.composeWith('pob:core:editorconfig');
 
-    await this.composeWith('pob:core:clean', {
+    this.composeWith('pob:core:clean', {
       root: this.isRoot,
     });
 
-    await this.composeWith('pob:core:renovate', {
+    this.composeWith('pob:core:renovate', {
       updateOnly: this.options.updateOnly,
       app: this.projectConfig.type === 'app',
     });
@@ -167,7 +167,7 @@ export default class PobBaseGenerator extends Generator {
     if (!this.hasAncestor) {
       const splitCIJobs =
         inMonorepo && inMonorepo.pobMonorepoConfig?.packageNames.length > 8;
-      await this.composeWith('pob:core:git', {
+      this.composeWith('pob:core:git', {
         onlyLatestLTS,
         splitCIJobs,
       });
@@ -192,7 +192,7 @@ export default class PobBaseGenerator extends Generator {
     }
 
     if (this.isMonorepo) {
-      await this.composeWith(
+      this.composeWith(
         // pob:monorepo <= for searching PobMonorepoGenerator.js
         fileURLToPath(
           new URL('../monorepo/PobMonorepoGenerator.js', import.meta.url),
@@ -209,7 +209,7 @@ export default class PobBaseGenerator extends Generator {
     } else {
       switch (this.projectConfig.type) {
         case 'lib':
-          await this.composeWith('pob:lib', {
+          this.composeWith('pob:lib', {
             monorepo: this.isMonorepo,
             isRoot: this.isRoot,
             disableYarnGitCache: this.projectConfig.disableYarnGitCache,
@@ -220,7 +220,7 @@ export default class PobBaseGenerator extends Generator {
           });
           break;
         case 'app':
-          await this.composeWith('pob:app', {
+          this.composeWith('pob:app', {
             monorepo: this.isMonorepo,
             isRoot: this.isRoot,
             disableYarnGitCache: this.projectConfig.disableYarnGitCache,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pob",
-  "version": "18.1.1",
+  "version": "18.3.0",
   "description": "Pile of bones, library generator with git/babel/typescript/typedoc/readme/jest",
   "keywords": [
     "skeleton"
@@ -39,16 +39,16 @@
   "pob": {},
   "prettier": "@pob/root/prettier-config",
   "dependencies": {
-    "@pob/eslint-config": "53.0.0",
-    "@pob/eslint-config-typescript": "53.1.0",
-    "@pob/eslint-config-typescript-react": "53.0.0",
+    "@pob/eslint-config": "54.0.0",
+    "@pob/eslint-config-typescript": "54.0.0",
+    "@pob/eslint-config-typescript-react": "54.0.0",
     "@pob/sort-eslint-config": "5.2.1",
     "@pob/sort-object": "6.2.1",
     "@pob/sort-pkg": "7.0.0",
     "@types/inquirer": "9.0.7",
-    "@yarnpkg/cli": "4.0.2",
-    "@yarnpkg/core": "4.0.2",
-    "@yarnpkg/fslib": "3.0.1",
+    "@yarnpkg/cli": "4.1.0",
+    "@yarnpkg/core": "4.0.3",
+    "@yarnpkg/fslib": "3.0.2",
     "@yeoman/types": "1.1.2",
     "eslint": "8.56.0",
     "findup-sync": "^5.0.0",
@@ -62,15 +62,15 @@
     "mem-fs-editor": "11.0.0",
     "minimist": "1.2.8",
     "parse-author": "2.0.0",
-    "pob-dependencies": "11.0.0",
+    "pob-dependencies": "11.1.0",
     "prettier": "2.8.8",
-    "semver": "7.5.4",
+    "semver": "7.6.0",
     "validate-npm-package-name": "^5.0.0",
-    "yarn-workspace-utils": "3.1.1",
-    "yeoman-environment": "4.1.3",
+    "yarn-workspace-utils": "3.2.0",
+    "yeoman-environment": "4.3.0",
     "yeoman-generator": "7.1.1"
   },
   "devDependencies": {
-    "@pob/root": "9.0.0"
+    "@pob/root": "9.2.0"
   }
 }