pob 18.2.0 → 18.4.0

package/CHANGELOG.md

@@ -3,6 +3,69 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [18.4.0](https://github.com/christophehurpeau/pob/compare/pob@18.3.0...pob@18.4.0) (2024-04-21)
+
+
+### Features
+
+* add app untranspiled-library ([c702f3e](https://github.com/christophehurpeau/pob/commit/c702f3e8170809b8c7b9ac5fe6cad4f6f7e70779))
+* add rollup-esbuild ([a1085db](https://github.com/christophehurpeau/pob/commit/a1085dbe6ea69767596dd46813044b96fbf713dd))
+* add swc support and improve jest without babel ([e7b050d](https://github.com/christophehurpeau/pob/commit/e7b050d3b7ac5ab2ec68d98095bb9832fdbc88bb))
+* add vitest support ([db3344c](https://github.com/christophehurpeau/pob/commit/db3344c45197f4b1bdfaa78df7dff25b37d291e2))
+* better support next and add example ([a60ce83](https://github.com/christophehurpeau/pob/commit/a60ce83d8277efb0eef65c5b3372ff89570919fb))
+* **deps:** update @pob/eslint-config to v55 (major) ([#2020](https://github.com/christophehurpeau/pob/issues/2020)) ([434d5b3](https://github.com/christophehurpeau/pob/commit/434d5b3dce53b1925091138444881a13e2a962d9))
+* **deps:** update @pob/eslint-config to v55.2.1 ([#2021](https://github.com/christophehurpeau/pob/issues/2021)) ([cdfe421](https://github.com/christophehurpeau/pob/commit/cdfe42126842ac1cb46d233ca7203fd241863a81))
+* **deps:** update dependency @yeoman/types to v1.2.0 ([#1962](https://github.com/christophehurpeau/pob/issues/1962)) ([3566bfd](https://github.com/christophehurpeau/pob/commit/3566bfdbc71ee07662d4b10ec76887c5407118e7))
+* **deps:** update dependency eslint to v8.57.0 ([#1942](https://github.com/christophehurpeau/pob/issues/1942)) ([69753af](https://github.com/christophehurpeau/pob/commit/69753aff1bea9e5801bd4deaa22d6d4eefba8e62))
+* **deps:** update dependency mem-fs to v4.1.0 ([#1945](https://github.com/christophehurpeau/pob/issues/1945)) ([c5c31cf](https://github.com/christophehurpeau/pob/commit/c5c31cfdf15018fbdfa9a4511d86fd6a9d72f277))
+* **deps:** update dependency yeoman-environment to v4.4.0 ([#1963](https://github.com/christophehurpeau/pob/issues/1963)) ([1a7dbb8](https://github.com/christophehurpeau/pob/commit/1a7dbb8fde589f3ad9e6e870cc767b9821832170))
+* **pob:** add tslib ([fb4ead7](https://github.com/christophehurpeau/pob/commit/fb4ead72f5ae31ae894b4f7e9f65fdc05c5e6be0))
+* simple esbuild bundler ([80659fa](https://github.com/christophehurpeau/pob/commit/80659fadb42190463585ff54e865af09e31fdc0d))
+* update peaceiris/actions-gh-pages to v4 ([a67c672](https://github.com/christophehurpeau/pob/commit/a67c672c539c2662650e7b1c00bbc95a4c53fca3))
+
+
+### Bug Fixes
+
+* **deps:** update @pob/eslint-config to v54.0.1 ([#1943](https://github.com/christophehurpeau/pob/issues/1943)) ([309437f](https://github.com/christophehurpeau/pob/commit/309437f195bfdfc9a6c00eec039fd74cba0a6ef8))
+* **deps:** update @pob/eslint-config to v54.0.2 ([#2000](https://github.com/christophehurpeau/pob/issues/2000)) ([04366c3](https://github.com/christophehurpeau/pob/commit/04366c3fe1917595a4b52369837ba31868e84164))
+* **deps:** update yarn monorepo to v4.1.1 ([#1955](https://github.com/christophehurpeau/pob/issues/1955)) ([872ccc1](https://github.com/christophehurpeau/pob/commit/872ccc1c51462a42edbce7b50c6d44dbf625647b))
+* few fixes for monorepo migrate ([a36ab40](https://github.com/christophehurpeau/pob/commit/a36ab408456ced31d8512a1b30391273dffcbe73))
+* fix previous commit ([cd870dc](https://github.com/christophehurpeau/pob/commit/cd870dccce1e4d80ed38e854915407084e8b0001))
+* missing dependency alp-rollup-plugin-config ([9cdc4e4](https://github.com/christophehurpeau/pob/commit/9cdc4e40fb7fa9ee2140618da5eef978de0f5f31))
+* **pob:** fix lint src directory with typescript and no babel ([b7d32a4](https://github.com/christophehurpeau/pob/commit/b7d32a4753ecf20742c8c4158f50f96e5d225e6d))
+* properly determine node only with typescript and no babel ([3a8d958](https://github.com/christophehurpeau/pob/commit/3a8d9584ecb9c6810e577891f4c040b338364c10))
+* tslib prefix ([b86d5e4](https://github.com/christophehurpeau/pob/commit/b86d5e47912fb16d0f58157d228772af43f00e80))
+
+Version bump for dependency: sort-eslint-config
+Version bump for dependency: sort-object
+Version bump for dependency: sort-pkg
+Version bump for dependency: yarn-workspace-utils
+Version bump for dependency: root
+
+
+## [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)
 
 

package/lib/generators/app/PobAppGenerator.js

@@ -88,6 +88,7 @@ export default class PobAppGenerator extends Generator {
           'remix',
           'node',
           'node-library', // monorepo library for app. Not a real library
+          'untranspiled-library', // monorepo library for app. Not a real library
           'alp-node',
           'expo',
           'other',
@@ -130,7 +131,9 @@ export default class PobAppGenerator extends Generator {
   default() {
     const srcDirectory =
       this.appConfig.type === 'yarn-plugin' ? 'sources' : 'src';
-    const isAppLibrary = this.appConfig.type === 'node-library';
+    const isAppLibrary =
+      this.appConfig.type === 'node-library' ||
+      this.appConfig.type === 'untranspiled-library';
 
     if (
       this.appConfig.type === 'node' ||
@@ -228,9 +231,9 @@ export default class PobAppGenerator extends Generator {
         return '';
       })(),
       additionalIncludes: (() => {
-        if (this.appConfig.type === 'next.js') {
-          return '.next/types/**/*.ts';
-        }
+        // if (this.appConfig.type === 'next.js') {
+        //   return '.next/types/**/*.ts';
+        // }
         return '';
       })(),
     });
@@ -308,6 +311,7 @@ export default class PobAppGenerator extends Generator {
       yarnNodeLinker: this.options.yarnNodeLinker,
       typescript,
       testing: this.appConfig.testing,
+      testRunner: this.appConfig.testRunner,
     });
 
     // only for gitignore
@@ -335,6 +339,7 @@ export default class PobAppGenerator extends Generator {
       case 'remix':
         this.composeWith('pob:app:remix', {});
         break;
+      // no default
     }
 
     if (platform !== 'win32') {

package/lib/generators/app/ignorePaths.js

@@ -14,6 +14,7 @@ export const appIgnorePaths = {
   pobpack: (config) => ['/build', '/public'],
   node: (config) => ['/build'],
   'node-library': (config) => ['/build'],
+  'untranspiled-library': (config) => [],
   'alp-node': (config) => ['/build'],
   other: (config) => [],
   expo: (config) => [
@@ -27,7 +28,7 @@ export const appIgnorePaths = {
     '/web-build/',
 
     '# Temporary files created by Metro to check the health of the file watcher',
-    '.metro-health-check*',
+    '/.metro-health-check*',
   ],
   'yarn-plugin': (config) => [],
 };

package/lib/generators/common/babel/CommonBabelGenerator.js

@@ -457,14 +457,6 @@ export default class CommonBabelGenerator extends Generator {
 
     packageUtils.removeDevDependencies(pkg, ['@rollup/plugin-run']);
     packageUtils.removeDependencies(pkg, ['alp-rollup-plugin-config']);
-    packageUtils.addOrRemoveDevDependencies(
-      pkg,
-      useBabel &&
-        this.options.isApp &&
-        !this.options.isAppLibrary &&
-        this.options.useAppConfig,
-      ['alp-rollup-plugin-config'],
-    );
 
     this.fs.delete('rollup.config.js');
     if (useBabel) {

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

@@ -133,12 +133,14 @@ export default class CommonLintGenerator extends Generator {
     const useNodeOnly =
       (!useBabel && !useTypescript) ||
       (useTypescript &&
-        pkg.pob?.envs?.every((env) => env.target === 'node') &&
-        pkg.pob?.entries.every(
-          (entry) =>
-            typeof entry === 'string' ||
-            (entry.target && entry.target !== 'node'),
-        )) ||
+        (!pkg.pob?.envs ||
+          pkg.pob?.envs?.every((env) => env.target === 'node')) &&
+        (!pkg.pob?.entries ||
+          pkg.pob?.entries.every(
+            (entry) =>
+              typeof entry === 'string' ||
+              (entry.target && entry.target !== 'node'),
+          ))) ||
       (babelEnvs.length > 0 && babelEnvs.every((env) => env.target === 'node'));
 
     if (this.fs.exists(this.destinationPath('.eslintignore'))) {
@@ -564,7 +566,8 @@ export default class CommonLintGenerator extends Generator {
 
     // see monorepo/lerna/index.js
     if (!(inMonorepo && inMonorepo.root) && !this.options.monorepo) {
-      const srcDirectory = useBabel ? this.options.srcDirectory : 'lib';
+      const srcDirectory =
+        useBabel || this.options.typescript ? this.options.srcDirectory : 'lib';
       const lintRootJsFiles = (useBabel && useNode) || !inMonorepo;
 
       const lintPaths = [srcDirectory, 'bin', 'scripts', 'migrations'].filter(

package/lib/generators/common/format-lint/templates/prettierignore.ejs

@@ -15,7 +15,7 @@ CHANGELOG.md
 <% for (let workspace of workspaces) { -%>
 <% if (ignorePatterns) { -%>
 <% for (let ignorePattern of ignorePatterns) { -%>
-<%= '/' + workspace + ignorePattern %>
+<%= ignorePattern.startsWith('*') ? ignorePattern : '/' + workspace + ignorePattern %>
 <% } -%>
 <% } -%>
 <% } -%>

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

@@ -132,7 +132,7 @@ export default function updateEslintConfig(
   config.root = true;
   config.extends = [
     ...extendsConfig,
-    ...(config?.extends
+    ...(config?.extends && Array.isArray(config.extends)
       ? config.extends.filter(
           (extendsValue) =>
             extendsValue === '@pob/eslint-config-typescript/allow-unsafe',

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';
@@ -113,6 +114,13 @@ export default class CommonTestingGenerator extends Generator {
       default: false,
       desc: 'Disable git cache. See https://yarnpkg.com/features/caching#offline-mirror.',
     });
+
+    this.option('swc', {
+      type: Boolean,
+      required: false,
+      default: false,
+      desc: 'Use swc to transpile code.',
+    });
   }
 
   default() {
@@ -154,7 +162,8 @@ export default class CommonTestingGenerator extends Generator {
       'pob-lcov-reporter',
     ]);
 
-    const yoConfigPobMonorepo = inMonorepo && inMonorepo.pobMonorepoConfig;
+    const yoConfigPobMonorepo =
+      (inMonorepo && inMonorepo.pobMonorepoConfig) || {};
     const globalTesting = yoConfigPobMonorepo && yoConfigPobMonorepo.testing;
     const enableForMonorepo = this.options.monorepo && globalTesting;
     const transpileWithEsbuild = packageUtils.transpileWithEsbuild(pkg);
@@ -176,14 +185,62 @@ export default class CommonTestingGenerator extends Generator {
 
     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],
+    const tsTestUtil = (() => {
+      if (testRunner === 'vitest') return undefined;
+      if (this.options.swc || isJestRunner) return 'swc';
+      return 'ts-node';
+    })();
+
+    const dependenciesForTestUtil = {
+      'ts-node': { devDependenciesShared: ['ts-node'] },
+      swc: {
+        devDependenciesShared: ['@swc/core'],
+        devDependenciesWithJest: ['@swc/jest'],
+        devDependenciesWithNode: ['@swc-node/register'],
+      },
+    };
+
+    Object.entries(dependenciesForTestUtil).forEach(
+      ([
+        key,
+        {
+          devDependenciesShared,
+          devDependenciesWithJest,
+          devDependenciesWithNode,
+        },
+      ]) => {
+        const sharedCondition =
+          this.options.enable &&
+          (!inMonorepo || inMonorepo.root) &&
+          this.options.typescript &&
+          key === tsTestUtil;
+        packageUtils.addOrRemoveDevDependencies(
+          pkg,
+          sharedCondition &&
+            (testRunner === 'node' || (withTypescript && !transpileWithBabel)),
+          devDependenciesShared,
+        );
+        if (devDependenciesWithJest) {
+          packageUtils.addOrRemoveDevDependencies(
+            pkg,
+            sharedCondition &&
+              withTypescript &&
+              !transpileWithBabel &&
+              testRunner === 'jest',
+            devDependenciesWithJest,
+          );
+        }
+        if (devDependenciesWithNode) {
+          packageUtils.addOrRemoveDevDependencies(
+            pkg,
+            sharedCondition &&
+              withTypescript &&
+              !transpileWithBabel &&
+              testRunner === 'node',
+            devDependenciesWithNode,
+          );
+        }
+      },
     );
 
     if (
@@ -202,15 +259,18 @@ export default class CommonTestingGenerator extends Generator {
 
     const tsTestLoaderOption = (() => {
       switch (tsTestUtil) {
-        case 'tsimp':
-          return '--import=tsimp/import';
         case 'ts-node':
           return '--loader=ts-node/esm --experimental-specifier-resolution=node';
-        case '@swc-node/register':
+        case 'swc':
           return '--import=@swc-node/register/esm';
+
+        // no default
       }
     })();
 
+    const hasTestFolder =
+      !this.options.monorepo && fs.existsSync(this.destinationPath('test'));
+
     const createTestCommand = ({
       coverage,
       coverageLcov,
@@ -242,7 +302,7 @@ export default class CommonTestingGenerator extends Generator {
           if (!workspacesPattern && this.options.monorepo) {
             throw new Error('Invalid workspacesPattern');
           }
-          return `${tsTestUtil === 'tsimp' ? 'TSIMP_DIAG=ignore ' : ''}${
+          return `${
             tsTestUtil === 'ts-node'
               ? 'TS_NODE_PROJECT=tsconfig.test.json '
               : ''
@@ -256,11 +316,18 @@ export default class CommonTestingGenerator extends Generator {
               : ''
           }node ${
             this.options.typescript ? `${tsTestLoaderOption} ` : ''
-          }--test ${
-            this.options.monorepo
-              ? workspacesPattern
-              : 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'}`}`;
+        }
+        case 'vitest': {
+          return `${
+            coverage || coverageJson || coverageLcov
+              ? `POB_VITEST_COVERAGE=${
+                  coverageLcov ? 'lcov' : `json${coverageJson ? '' : ',text'} `
+                }`
+              : ''
+          }vitest${watch ? ' --watch' : ''}`;
         }
         default: {
           throw new Error(`Invalid runner: "${testRunner}"`);
@@ -271,7 +338,9 @@ export default class CommonTestingGenerator extends Generator {
     const jestConfigPath = this.destinationPath('jest.config.json');
     packageUtils.addOrRemoveDevDependencies(
       pkg,
-      (enableForMonorepo || !globalTesting) && testRunner === 'jest',
+      this.options.enable &&
+        (enableForMonorepo || !globalTesting) &&
+        testRunner === 'jest',
       ['jest', '@types/jest'],
     );
 
@@ -372,6 +441,24 @@ export default class CommonTestingGenerator extends Generator {
           } else {
             delete jestConfig.extensionsToTreatAsEsm;
           }
+
+          if (tsTestUtil === 'swc' && !transpileWithBabel && withTypescript) {
+            jestConfig.transform = {
+              [hasReact ? '^.+\\.tsx?$' : '^.+\\.ts$']: ['@swc/jest'],
+            };
+          } else if (jestConfig.transform) {
+            jestConfig.transform = Object.fromEntries(
+              Object.entries(jestConfig.transform).filter(
+                ([key, value]) =>
+                  value !== '@swc/jest' &&
+                  !(Array.isArray(value) && value[0] === '@swc/jest'),
+              ),
+            );
+            if (Object.keys(jestConfig.transform).length === 0) {
+              delete jestConfig.transform;
+            }
+          }
+
           writeAndFormatJson(this.fs, jestConfigPath, jestConfig);
         }
       } else {
@@ -472,21 +559,44 @@ export default class CommonTestingGenerator extends Generator {
                   },
                 ],
               };
-            } else if (!transpileWithBabel) {
+            } else if (!transpileWithBabel && !withTypescript) {
               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;
+            } else {
+              if (
+                tsTestUtil === 'swc' &&
+                !transpileWithBabel &&
+                withTypescript
+              ) {
+                jestConfig.transform = {
+                  [hasReact ? '^.+\\.tsx?$' : '^.+\\.ts$']: ['@swc/jest'],
+                };
+              } else if (jestConfig.transform) {
+                jestConfig.transform = Object.fromEntries(
+                  Object.entries(jestConfig.transform).filter(
+                    ([key, value]) =>
+                      value !== '@swc/jest' &&
+                      !(Array.isArray(value) && value[0] === '@swc/jest'),
+                  ),
+                );
+                if (Object.keys(jestConfig.transform).length === 0) {
+                  delete jestConfig.transform;
+                }
+              }
+
+              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;
+                }
               }
             }
 

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

@@ -130,15 +130,23 @@ export default class CommonTranspilerGenerator extends Generator {
 
   default() {
     const pkg = this.fs.readJSON(this.destinationPath('package.json'));
-    const withTypescript = pkg.pob.typescript;
     const withBabel = this.babelEnvs && this.babelEnvs.length > 0;
-    const useRollup = (withBabel || withTypescript) && pkg.pob.rollup !== false;
+    const withTypescript = pkg.pob.typescript || withBabel || !!pkg.pob.bundler;
+    const bundler =
+      withTypescript &&
+      (pkg.pob.rollup === false
+        ? 'tsc'
+        : pkg.pob.bundler ??
+          (pkg.pob.typescript ? 'rollup-typescript' : 'rollup'));
+    this.bundler = bundler;
 
     const cleanCommand = (() => {
-      if (useRollup) {
-        if (withTypescript) return 'pob-typescript-clean-out';
+      if (bundler === 'rollup-typescript') return 'pob-typescript-clean-out';
+      if (bundler === 'rollup-esbuild') return 'pob-esbuild-clean-out';
+      if (bundler === 'rollup') {
         return 'pob-babel-clean-out';
       }
+      if (bundler === 'esbuild') return 'pob-esbuild-clean-out';
       return null;
     })();
 
@@ -146,36 +154,47 @@ export default class CommonTranspilerGenerator extends Generator {
 
     if (this.options.isApp) {
       packageUtils.removeScripts(['watch']);
-      packageUtils.addOrRemoveScripts(pkg, useRollup, {
+      packageUtils.addOrRemoveScripts(pkg, bundler && bundler !== 'tsc', {
         'clean:build': `${cleanCommand} ${this.options.buildDirectory}`,
         clean: 'yarn clean:build',
       });
 
-      packageUtils.addOrRemoveScripts(pkg, useRollup || withTypescript, {
-        start: useRollup
-          ? 'yarn clean:build && rollup --config rollup.config.mjs --watch'
-          : 'tsc --watch',
+      packageUtils.addOrRemoveScripts(pkg, bundler, {
+        start: (() => {
+          if (bundler && bundler.startsWith('rollup')) {
+            return 'yarn clean:build && rollup --config rollup.config.mjs --watch';
+          }
+          if (bundler === 'tsc') return 'tsc --watch';
+          if (bundler === 'esbuild') return 'pob-esbuild-watch';
+        })(),
       });
     } else {
       packageUtils.removeScripts(['start']);
-      packageUtils.addOrRemoveScripts(pkg, useRollup, {
+      packageUtils.addOrRemoveScripts(pkg, bundler && bundler !== 'tsc', {
         'clean:build': `${cleanCommand} ${this.options.buildDirectory}`,
       });
     }
-    packageUtils.addOrRemoveScripts(pkg, useRollup || withTypescript, {
-      build: useRollup
-        ? 'yarn clean:build && rollup --config rollup.config.mjs'
-        : 'tsc',
+
+    packageUtils.addOrRemoveScripts(pkg, bundler, {
+      build: (() => {
+        if (bundler && bundler.startsWith('rollup')) {
+          return 'yarn clean:build && rollup --config rollup.config.mjs';
+        }
+        if (bundler === 'tsc') return 'tsc';
+        if (bundler === 'esbuild') return 'pob-esbuild-build';
+      })(),
     });
 
-    const shouldBuildDefinitions = !this.options.isApp && useRollup;
+    const shouldBuildDefinitions =
+      !this.options.isApp && withTypescript && bundler !== 'tsc';
+
     packageUtils.addOrRemoveScripts(pkg, shouldBuildDefinitions, {
       'build:definitions': 'tsc -p tsconfig.json',
     });
 
     if (shouldBuildDefinitions) {
       pkg.scripts.build += ' && yarn run build:definitions';
-    } else if (!this.options.isApp && !useRollup && !withTypescript) {
+    } else if (!this.options.isApp && !bundler && !withTypescript) {
       // check definitions, but also force lerna to execute build:definitions in right order
       // example: nightingale-types depends on nightingale-levels
       if (this.fs.exists(this.destinationPath('lib/index.d.ts'))) {
@@ -203,9 +222,36 @@ export default class CommonTranspilerGenerator extends Generator {
 
     /* dependencies */
 
-    packageUtils.addOrRemoveDevDependencies(pkg, useRollup && withTypescript, [
-      '@pob/rollup-typescript',
-    ]);
+    packageUtils.addOrRemoveDevDependencies(
+      pkg,
+      bundler === 'rollup-typescript',
+      ['@pob/rollup-typescript'],
+    );
+    packageUtils.addOrRemoveDevDependencies(
+      pkg,
+      bundler === 'esbuild' && withTypescript,
+      ['@pob/esbuild'],
+    );
+    packageUtils.addOrRemoveDevDependencies(
+      pkg,
+      bundler === 'rollup-esbuild' && withTypescript,
+      ['@pob/rollup-esbuild'],
+    );
+    packageUtils.addOrRemoveDependencies(
+      pkg,
+      (bundler === 'tsc' || bundler === 'rollup-typescript') && withTypescript,
+      ['tslib'],
+      '^',
+    );
+
+    packageUtils.addOrRemoveDevDependencies(
+      pkg,
+      bundler === 'rollup' &&
+        this.options.isApp &&
+        !this.options.isAppLibrary &&
+        this.options.useAppConfig,
+      ['alp-rollup-plugin-config'],
+    );
 
     /* engines */
     // TODO move from CommonBabelGenerator
@@ -234,7 +280,7 @@ export default class CommonTranspilerGenerator extends Generator {
     }
 
     // if (!pkg.main || pkg.main.startsWith('./lib/')) {
-    if (useRollup || withTypescript) {
+    if (bundler || withTypescript) {
       // see pkg.exports instead.
       delete pkg.main;
       if (!this.options.isApp) {
@@ -305,12 +351,14 @@ export default class CommonTranspilerGenerator extends Generator {
     }
 
     /* webpack 5 and node with ESM support */
-    if (useRollup || withTypescript) {
+    if (bundler || withTypescript) {
+      const omitTarget = bundler === 'esbuild';
       pkg.exports = {
         './package.json': './package.json',
       };
 
-      this.entries.forEach((entry) => {
+      this.entries.forEach((entryWithOptionalExt) => {
+        const entry = entryWithOptionalExt.replace(/\.[jt]sx?$/, '');
         const isBrowserOnly =
           withBabel &&
           entry === 'browser' &&
@@ -324,7 +372,7 @@ export default class CommonTranspilerGenerator extends Generator {
             pkg.private || this.options.isAppLibrary
               ? `./src/${entryDistName}.ts`
               : `./${this.options.buildDirectory}/${
-                  useRollup ? 'definitions/' : ''
+                  bundler !== 'tsc' ? 'definitions/' : ''
                 }${entryDistName}.d.ts`,
         };
 
@@ -335,21 +383,26 @@ 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}${
+              omitTarget
+                ? ''
+                : `-${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
@@ -470,13 +523,18 @@ export default class CommonTranspilerGenerator extends Generator {
     const entries = pkg.pob.entries || ['index'];
 
     this.fs.delete('rollup.config.js');
-    if (pkg.pob.typescript && pkg.pob.rollup !== false) {
+    if (
+      pkg.pob.typescript &&
+      pkg.pob.rollup !== false &&
+      (!pkg.pob.bundler || pkg.pob.bundler.startsWith('rollup'))
+    ) {
       if (this.options.isApp) {
         copyAndFormatTpl(
           this.fs,
           this.templatePath('app.rollup.config.mjs.ejs'),
           this.destinationPath('rollup.config.mjs'),
           {
+            rollupConfigLib: this.bundler,
             config: this.options.useAppConfig,
             outDirectory: this.options.buildDirectory,
             enableRun: !this.options.isAppLibrary && entries.includes('index'),
@@ -488,11 +546,16 @@ export default class CommonTranspilerGenerator extends Generator {
           this.templatePath('lib.rollup.config.mjs.ejs'),
           this.destinationPath('rollup.config.mjs'),
           {
+            rollupConfigLib: this.bundler,
             outDirectory: this.options.buildDirectory,
           },
         );
       }
-    } else if (!pkg.pob.babelEnvs || pkg.pob.babelEnvs.length === 0) {
+    } else if (
+      !pkg.pob.babelEnvs ||
+      pkg.pob.babelEnvs.length === 0 ||
+      pkg.pob?.bundler === 'esbuild'
+    ) {
       this.fs.delete('rollup.config.mjs');
     }
 

package/lib/generators/common/transpiler/templates/app.rollup.config.mjs.ejs

@@ -3,9 +3,9 @@ import { fileURLToPath } from 'node:url';
 <% if (config) { -%>
 import config from 'alp-rollup-plugin-config';
 <% } -%>
-import createRollupConfig from '@pob/rollup-typescript/createRollupConfig.js';
+import createRollupConfig from '@pob/<%= rollupConfigLib %>/createRollupConfig.js';
 <% if (enableRun) { -%>
-import run from '@pob/rollup-typescript/plugin-run.cjs';
+import run from '@pob/<%= rollupConfigLib %>/plugin-run.cjs';
 
 const watch = process.env.ROLLUP_WATCH === 'true';
 <% } -%>

package/lib/generators/common/transpiler/templates/lib.rollup.config.mjs.ejs

@@ -1,6 +1,6 @@
 import { dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
-import createRollupConfig from '@pob/rollup-typescript/createRollupConfig.js';
+import createRollupConfig from '@pob/<%= rollupConfigLib %>/createRollupConfig.js';
 
 export default createRollupConfig({
   cwd: dirname(fileURLToPath(import.meta.url)),

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

@@ -135,12 +135,16 @@ export default class CommonTypescriptGenerator extends Generator {
             version: '18',
           },
         ];
-        if (pkg.pob.rollup === false) {
+        if (pkg.pob.rollup === false || pkg.pob.bundler === false) {
           return [`@pob/root/tsconfigs/targets/node-${nodeVersion}.json`];
         }
         if (envs && envs.every((env) => env.target === 'node')) {
           return [
-            `@pob/root/tsconfigs/targets/rollup-node-${nodeVersion}.json`,
+            `@pob/root/tsconfigs/targets/${
+              !pkg.pob.bundler || pkg.pob.bundler.startsWith('rollup')
+                ? 'rollup'
+                : pkg.pob.bundler
+            }-node-${nodeVersion}.json`,
           ];
         }
         return ['@pob/root/tsconfigs/targets/rollup-es2015.json'];
@@ -258,7 +262,7 @@ export default class CommonTypescriptGenerator extends Generator {
         tsconfigPath,
         {
           emitDefinitions: this.options.builddefs,
-          build: pkg.pob?.rollup === false,
+          build: pkg.pob?.rollup === false || pkg.pob?.bundler === false,
           cacheEnabled: !this.options.isApp || this.options.isAppLibrary,
           monorepoPackageSrcPaths,
           monorepoPackageReferences,

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

@@ -42,7 +42,7 @@ jobs:
         run: touch docs/.nojekyll
 
       - name: Deploy
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./docs

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

@@ -27,10 +27,6 @@ yarn-error.log*
 <% } -%>
 <% if (testing) { -%>
 
-<% if (typescript && !withBabel && tsTestUtil === 'tsimp') { -%>
-# tsimp cache
-/.tsimp
-<% } -%>
 # default coverage directory
 /coverage
 <% } -%>

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/core/package/CorePackageGenerator.js

@@ -36,6 +36,12 @@ export default class CorePackageGenerator extends Generator {
       default: false,
       desc: 'private package',
     });
+
+    this.option('packageType', {
+      type: String,
+      required: false,
+      desc: 'package type',
+    });
   }
 
   async initializing() {
@@ -106,6 +112,10 @@ export default class CorePackageGenerator extends Generator {
       pkg.name = name;
     }
 
+    if (this.options.packageType) {
+      pkg.type = this.options.packageType;
+    }
+
     let author = packageUtils.parsePkgAuthor(pkg);
 
     const props = await this.prompt(

package/lib/generators/core/vscode/CoreVSCodeGenerator.js

@@ -34,6 +34,12 @@ export default class CoreVSCodeGenerator extends Generator {
       desc: 'Testing enabled',
     });
 
+    this.option('testRunner', {
+      type: String,
+      required: false,
+      desc: 'Test runner (jest, vitest, ...)',
+    });
+
     this.option('yarnNodeLinker', {
       type: String,
       required: false,
@@ -81,6 +87,7 @@ export default class CoreVSCodeGenerator extends Generator {
           npm: this.options.packageManager === 'npm',
           typescript: this.options.typescript,
           testing: this.options.testing,
+          testRunner: this.options.testRunner,
           module: pkg.type === 'module',
         },
       );

package/lib/generators/core/vscode/templates/settings.json.ejs

@@ -35,7 +35,7 @@
   },
 
 
-<% if (testing && module) { -%>
+<% if (testing && module && (!testRunner || testRunner === 'jest')) { -%>
   // jest
   "jest.jestCommandLine": "NODE_OPTIONS=--experimental-vm-modules node_modules/.bin/jest",
 <% } -%>

package/lib/generators/lib/PobLibGenerator.js

@@ -292,6 +292,7 @@ export default class PobLibGenerator extends Generator {
       packageManager: this.options.packageManager,
       isApp: false,
       splitCIJobs: false,
+      srcDirectory: withBabel || withTypescript ? 'src' : 'lib',
     });
 
     // must be after testing
@@ -341,6 +342,7 @@ export default class PobLibGenerator extends Generator {
       yarnNodeLinker: this.options.yarnNodeLinker,
       typescript: withBabel || withTypescript,
       testing: this.pobjson.testing,
+      testRunner: this.pobjson.testRunner,
     });
 
     // must be after doc, testing

package/lib/generators/monorepo/PobMonorepoGenerator.js

@@ -275,6 +275,7 @@ export default class PobMonorepoGenerator extends Generator {
       yarnNodeLinker: this.options.yarnNodeLinker,
       typescript: this.pobLernaConfig.typescript,
       testing: this.pobLernaConfig.testing,
+      testRunner: this.pobLernaConfig.testRunner,
       packageNames: JSON.stringify(packageNames),
       packageLocations: JSON.stringify(this.packageLocations),
     });

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

@@ -199,6 +199,8 @@ export default class MonorepoWorkspacesGenerator extends Generator {
       case 'yarn':
         // see CoreYarnGenerator
         break;
+      default:
+        throw new Error('Invalid packageManager');
     }
   }
 }

package/lib/generators/pob/PobBaseGenerator.js

@@ -81,6 +81,13 @@ export default class PobBaseGenerator extends Generator {
       delete config.yarn2;
     }
 
+    if (!config.type) {
+      const pkg = this.fs.readJSON(this.destinationPath('package.json'), {});
+      if (pkg.dependencies?.next) {
+        config.type = 'app';
+      }
+    }
+
     const responses = await this.prompt([
       {
         when: () => !config.type,
@@ -123,10 +130,11 @@ export default class PobBaseGenerator extends Generator {
 
     this.composeWith('pob:core:package', {
       updateOnly: this.options.updateOnly,
-      private: this.isMonorepo,
+      private: this.isMonorepo || this.projectConfig.type === 'app',
       isMonorepo: this.isMonorepo,
       inMonorepo: !!inMonorepo,
       isRoot: this.isRoot,
+      packageType: this.projectConfig.type === 'app' ? 'module' : undefined,
     });
 
     if (this.isMonorepo) {
@@ -244,6 +252,7 @@ export default class PobBaseGenerator extends Generator {
         this.spawnCommandSync('npm', ['install']);
         break;
       case 'yarn':
+      default:
         // see CoreYarnGenerator
         break;
     }

package/lib/pob.js

@@ -306,6 +306,7 @@ if (action === 'migrate-to-monorepo') {
 
   const monorepoName = `${path.basename(process.cwd())}-monorepo`;
   const monorepoPkg = {
+    private: true,
     name: monorepoName,
     version: projectPkg.version,
     author: projectPkg.author,
@@ -313,6 +314,7 @@ if (action === 'migrate-to-monorepo') {
     repository: projectPkg.repository,
     engines: projectPkg.engines,
     packageManager: projectPkg.packageManager,
+    workspaces: ['packages/*'],
   };
 
   writeFileSync('package.json', JSON.stringify(monorepoPkg, null, 2));

package/lib/utils/package.js

@@ -222,8 +222,8 @@ export function removeDevDependencies(pkg, dependencies, forceEvenIfInPeerDep) {
   );
 }
 
-export function addOrRemoveDependencies(pkg, condition, dependencies) {
-  if (condition) return addDependencies(pkg, dependencies);
+export function addOrRemoveDependencies(pkg, condition, dependencies, prefix) {
+  if (condition) return addDependencies(pkg, dependencies, prefix);
   return removeDependencies(pkg, dependencies);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pob",
-  "version": "18.2.0",
+  "version": "18.4.0",
   "description": "Pile of bones, library generator with git/babel/typescript/typedoc/readme/jest",
   "keywords": [
     "skeleton"
@@ -39,18 +39,18 @@
   "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/sort-eslint-config": "5.2.1",
-    "@pob/sort-object": "6.2.1",
-    "@pob/sort-pkg": "7.0.0",
+    "@pob/eslint-config": "55.2.1",
+    "@pob/eslint-config-typescript": "55.2.1",
+    "@pob/eslint-config-typescript-react": "55.2.1",
+    "@pob/sort-eslint-config": "5.3.0",
+    "@pob/sort-object": "6.3.0",
+    "@pob/sort-pkg": "7.1.0",
     "@types/inquirer": "9.0.7",
-    "@yarnpkg/cli": "4.0.2",
-    "@yarnpkg/core": "4.0.2",
-    "@yarnpkg/fslib": "3.0.1",
-    "@yeoman/types": "1.1.2",
-    "eslint": "8.56.0",
+    "@yarnpkg/cli": "4.1.1",
+    "@yarnpkg/core": "4.0.3",
+    "@yarnpkg/fslib": "3.0.2",
+    "@yeoman/types": "1.2.0",
+    "eslint": "8.57.0",
     "findup-sync": "^5.0.0",
     "git-remote-url": "^1.0.1",
     "github-username": "^7.0.0",
@@ -58,19 +58,19 @@
     "json5": "^2.2.2",
     "lodash.camelcase": "^4.3.0",
     "lodash.kebabcase": "^4.1.1",
-    "mem-fs": "4.0.0",
+    "mem-fs": "4.1.0",
     "mem-fs-editor": "11.0.0",
     "minimist": "1.2.8",
     "parse-author": "2.0.0",
-    "pob-dependencies": "11.0.1",
+    "pob-dependencies": "11.2.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.2",
-    "yeoman-environment": "4.1.3",
+    "yarn-workspace-utils": "3.3.0",
+    "yeoman-environment": "4.4.0",
     "yeoman-generator": "7.1.1"
   },
   "devDependencies": {
-    "@pob/root": "9.1.0"
+    "@pob/root": "9.3.0"
   }
 }