pob 17.2.1 → 17.4.0

package/CHANGELOG.md

@@ -3,6 +3,35 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [17.4.0](https://github.com/christophehurpeau/pob/compare/pob@17.3.0...pob@17.4.0) (2023-12-28)
+
+
+### Features
+
+* **deps:** update @pob/eslint-config to v53 (major) ([#1886](https://github.com/christophehurpeau/pob/issues/1886)) ([de65f51](https://github.com/christophehurpeau/pob/commit/de65f51549afac0be03a124dba04dbb3a76f1b4e))
+* **deps:** update dependency @pob/eslint-config-typescript to v53.1.0 ([#1887](https://github.com/christophehurpeau/pob/issues/1887)) ([cca20c4](https://github.com/christophehurpeau/pob/commit/cca20c4e44aafdf05ba7928e02b290d2445d00cb))
+* keep configuring ts-node and typescript for ts without babel ([8483dc0](https://github.com/christophehurpeau/pob/commit/8483dc080170befe5a3be3e4dfc8fe7d8e74d0ae))
+
+Version bump for dependency: yarn-workspace-utils
+
+
+## [17.3.0](https://github.com/christophehurpeau/pob/compare/pob@17.2.1...pob@17.3.0) (2023-12-28)
+
+
+### Features
+
+* configure declarationDir ([338a4dc](https://github.com/christophehurpeau/pob/commit/338a4dc7a642e9f8c24f953d5368745467578a38))
+* use ts-node if needed with rollup-typescript ([9aefca2](https://github.com/christophehurpeau/pob/commit/9aefca2f69ba7bf2ff6f142e5156937d1c9e47fe))
+
+
+### Bug Fixes
+
+* add srcdirectory for glob tests ([3902bbd](https://github.com/christophehurpeau/pob/commit/3902bbdc088293df17a328687661a3dcb0a0c2a3))
+* add TS_NODE_PROJECT ([f67673b](https://github.com/christophehurpeau/pob/commit/f67673bd35a4ee84965de229266d5b944f8c49ef))
+
+Version bump for dependency: root
+
+
 ## [17.2.1](https://github.com/christophehurpeau/pob/compare/pob@17.2.0...pob@17.2.1) (2023-12-27)
 
 

package/lib/generators/app/PobAppGenerator.js

@@ -265,6 +265,7 @@ export default class PobAppGenerator extends Generator {
         isApp: true,
         documentation: false,
         testing: this.appConfig.testing,
+        testRunner: this.appConfig.testRunner,
         babel,
         typescript,
         node,

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

@@ -45,6 +45,12 @@ export default class CommonLintGenerator extends Generator {
       required: true,
       desc: 'Testing enabled',
     });
+    this.option('testRunner', {
+      type: String,
+      required: false,
+      default: 'jest',
+      desc: 'test runner: jest | node',
+    });
 
     this.option('typescript', {
       type: Boolean,
@@ -402,7 +408,10 @@ export default class CommonLintGenerator extends Generator {
       this.options.testing || globalTesting
         ? {
             files: [`**/*.test.${ext}`, `__tests__/**/*.${ext}`],
-            env: { jest: true },
+            ...(this.options.testRunner == null ||
+            this.options.testRunner === 'jest'
+              ? { env: { jest: true } }
+              : {}),
             rules: {
               'import/no-extraneous-dependencies': [
                 'error',
@@ -419,6 +428,7 @@ export default class CommonLintGenerator extends Generator {
 
       if (useTypescript) {
         testsOverride.extends = ['@pob/eslint-config-typescript/test'];
+        delete testsOverride.rules['import/no-extraneous-dependencies'];
       }
     }
 

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

@@ -14,12 +14,21 @@ function updateOverrides(config, testsOverride) {
       }
     }
   } else {
-    // eslint-disable-next-line no-lonely-if
+    if (testsOverride.rules && Object.keys(testsOverride.rules).length === 0) {
+      delete testsOverride.rules;
+    }
+
     if (existingTestsOverrideIndex !== -1) {
-      Object.assign(
-        config.overrides[existingTestsOverrideIndex],
-        testsOverride,
-      );
+      const existingTestsOverride =
+        config.overrides[existingTestsOverrideIndex];
+      Object.assign(existingTestsOverride, testsOverride);
+
+      if (
+        existingTestsOverride.rules &&
+        Object.keys(existingTestsOverride.rules).length === 0
+      ) {
+        delete existingTestsOverride.rules;
+      }
     } else {
       if (!config.overrides) config.overrides = [];
       config.overrides.push(testsOverride);

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

@@ -186,14 +186,59 @@ 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':
+          return '--import=tsimp/import';
+        case 'ts-node':
+          return '--loader=ts-node/esm --experimental-specifier-resolution=node';
+        case '@swc-node/register':
+          return '--import=@swc-node/register/esm';
+      }
+    })();
     packageUtils.addOrRemoveDevDependencies(
       pkg,
       this.options.enable &&
         this.options.runner === 'node' &&
         this.options.typescript,
-      ['tsimp'],
+      [tsTestUtil],
     );
 
+    const createTestCommand = ({
+      coverage,
+      watch,
+      shouldUseExperimentalVmModules,
+    }) => {
+      switch (this.options.runner) {
+        case 'jest': {
+          return `${
+            shouldUseExperimentalVmModules
+              ? 'NODE_OPTIONS=--experimental-vm-modules '
+              : ''
+          }jest${watch ? ' --watch' : ''}${
+            coverage
+              ? ' --coverage --coverageReporters=json --coverageReporters=text'
+              : ''
+          }`;
+        }
+        case 'node': {
+          return `${tsTestUtil === 'tsimp' ? 'TSIMP_DIAG=ignore ' : ''}${
+            tsTestUtil === 'ts-node'
+              ? 'TS_NODE_PROJECT=tsconfig.test.json '
+              : ''
+          }node ${this.options.typescript ? `${tsTestLoaderOption} ` : ''}${
+            coverage ? ' --experimental-test-coverage' : ''
+          }--test ${this.options.srcDirectory}/${
+            this.options.typescript ? '**/*.test.ts' : '**/*.test.js'
+          }`;
+        }
+        default: {
+          throw new Error('Invalid runner');
+        }
+      }
+    };
+
     if (!this.options.enable) {
       // if (inMonorepo) {
       //   if (pkg.scripts.test === 'echo "No tests"') {
@@ -227,26 +272,16 @@ export default class CommonTestingGenerator extends Generator {
       } else if (this.options.monorepo) {
         const shouldUseExperimentalVmModules = pkg.type === 'module';
 
-        const testCommand =
-          this.options.runner === 'jest'
-            ? `${
-                shouldUseExperimentalVmModules
-                  ? 'NODE_OPTIONS=--experimental-vm-modules '
-                  : ''
-              }jest`
-            : `node ${
-                this.options.typescript ? '--import=tsimp/import ' : ''
-              }--test ${
-                this.options.typescript ? '**/*.test.ts' : '**/*.test.js'
-              }`;
-
         packageUtils.addScripts(pkg, {
-          test: testCommand,
-          'test:watch': `${testCommand} --watch`,
-          'test:coverage':
-            this.options.runner === 'jest'
-              ? `${testCommand} --coverage --coverageReporters=json --coverageReporters=text`
-              : testCommand, // not yet configured
+          test: createTestCommand({ shouldUseExperimentalVmModules }),
+          'test:watch': createTestCommand({
+            shouldUseExperimentalVmModules,
+            watch: true,
+          }),
+          'test:coverage': createTestCommand({
+            shouldUseExperimentalVmModules,
+            coverage: true,
+          }),
         });
 
         if (isJestRunner) {
@@ -310,26 +345,16 @@ export default class CommonTestingGenerator extends Generator {
         const shouldUseExperimentalVmModules =
           pkg.type === 'module' && !inMonorepo;
 
-        const testCommand =
-          this.options.runner === 'jest'
-            ? `${
-                shouldUseExperimentalVmModules
-                  ? 'NODE_OPTIONS=--experimental-vm-modules '
-                  : ''
-              }jest`
-            : `node ${
-                this.options.typescript ? '--import=tsimp/import ' : ''
-              }--test ${
-                this.options.typescript ? '**/*.test.ts' : '**/*.test.js'
-              }`;
-
         packageUtils.addScripts(pkg, {
-          test: testCommand,
-          'test:watch': `${testCommand} --watch`,
-          'test:coverage':
-            this.options.runner === 'jest'
-              ? `${testCommand}  --coverage --coverageReporters=json --coverageReporters=text`
-              : testCommand, // not yet configured,
+          test: createTestCommand({ shouldUseExperimentalVmModules }),
+          'test:watch': createTestCommand({
+            shouldUseExperimentalVmModules,
+            watch: true,
+          }),
+          'test:coverage': createTestCommand({
+            shouldUseExperimentalVmModules,
+            coverage: true,
+          }),
         });
 
         if (this.options.runner === 'jest') {

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

@@ -232,9 +232,9 @@ export default class CommonTranspilerGenerator extends Generator {
       // see pkg.exports instead.
       delete pkg.main;
       if (!this.options.isApp) {
-        pkg.types = `./${this.options.buildDirectory}/${
-          withTypescript && !useRollup ? '' : 'definitions/'
-        }index.d.ts`;
+        pkg.types = `./${
+          this.options.buildDirectory
+        }/${'definitions/'}index.d.ts`;
       }
     } else {
       if (!pkg.main) {
@@ -264,7 +264,15 @@ export default class CommonTranspilerGenerator extends Generator {
     delete pkg['browser-dev'];
     delete pkg['module-dev'];
 
-    const esAllBrowserEnv = this.babelEnvs.find(
+    const envs = pkg.pob.babelEnvs ||
+      pkg.pob.envs || [
+        {
+          target: 'node',
+          version: '18',
+        },
+      ];
+
+    const esAllBrowserEnv = envs.find(
       (env) =>
         env.target === 'browser' &&
         env.version === undefined &&
@@ -298,7 +306,7 @@ export default class CommonTranspilerGenerator extends Generator {
         const isBrowserOnly =
           withBabel &&
           entry === 'browser' &&
-          (this.babelEnvs.every((env) => env.target === 'browser') ||
+          (envs?.every((env) => env.target === 'browser') ||
             (this.entries.length === 2 && this.entries.includes('index')));
         const entryDistName = isBrowserOnly ? 'index' : entry;
         const exportName = entry === 'index' ? '.' : `./${entry}`;
@@ -313,73 +321,67 @@ export default class CommonTranspilerGenerator extends Generator {
         };
 
         const defaultNodeEnv =
-          withBabel && this.babelEnvs.find((env) => env.target === 'node');
+          withBabel || withTypescript
+            ? envs.find((env) => env.target === 'node')
+            : undefined;
 
         const defaultNodeEnvVersion = defaultNodeEnv && defaultNodeEnv.version;
 
-        if (withTypescript) {
-          if (useRollup) {
-            targets.import = `./${this.options.buildDirectory}/${entryDistName}-node.mjs`;
-          } else {
-            targets.import = `./${this.options.buildDirectory}/${entryDistName}.js`;
-          }
-        } else {
-          this.babelEnvs.forEach(({ target, version, formats }) => {
-            if (target === 'node' && entry === 'browser') return;
-
-            const exportTarget = {};
-
-            if (target === 'node') {
-              const cjsExt = pkg.type === 'module' ? 'cjs' : 'cjs.js';
-              if (!formats || formats.includes('es')) {
-                exportTarget.import = `./${this.options.buildDirectory}/${entryDistName}-${target}${version}.mjs`;
-
-                if (formats && formats.includes('cjs')) {
-                  exportTarget.require = `./${this.options.buildDirectory}/${entryDistName}-${target}${version}.${cjsExt}`;
-                }
-              } else if (formats && formats.includes('cjs')) {
-                exportTarget.default = `./${this.options.buildDirectory}/${entryDistName}-${target}${version}.${cjsExt}`;
-              }
-              // eslint: https://github.com/benmosher/eslint-plugin-import/issues/2132
-              // jest: https://github.com/facebook/jest/issues/9771
-              if (!pkg.main && exportName === '.') {
-                pkg.main =
-                  pkg.type === 'module'
-                    ? exportTarget.import
-                    : exportTarget.default ||
-                      exportTarget.require ||
-                      exportTarget.import;
-              }
-            } else if (target === 'browser') {
-              if (!formats || formats.includes('es')) {
-                exportTarget.import = `./${
-                  this.options.buildDirectory
-                }/${entryDistName}-${target}${version || ''}.es.js`;
-              }
+        envs.forEach(({ target, version, formats }) => {
+          if (target === 'node' && entry === 'browser') return;
+
+          const exportTarget = {};
+
+          if (target === 'node') {
+            const cjsExt = pkg.type === 'module' ? 'cjs' : 'cjs.js';
+            if (!formats || formats.includes('es')) {
+              exportTarget.import = `./${this.options.buildDirectory}/${entryDistName}-${target}${version}.mjs`;
 
               if (formats && formats.includes('cjs')) {
-                exportTarget.require = `./${
-                  this.options.buildDirectory
-                }/index-${target}${version || ''}.cjs.js`;
+                exportTarget.require = `./${this.options.buildDirectory}/${entryDistName}-${target}${version}.${cjsExt}`;
               }
+            } else if (formats && formats.includes('cjs')) {
+              exportTarget.default = `./${this.options.buildDirectory}/${entryDistName}-${target}${version}.${cjsExt}`;
+            }
+            // eslint: https://github.com/benmosher/eslint-plugin-import/issues/2132
+            // jest: https://github.com/facebook/jest/issues/9771
+            if (!pkg.main && exportName === '.') {
+              pkg.main =
+                pkg.type === 'module'
+                  ? exportTarget.import
+                  : exportTarget.default ||
+                    exportTarget.require ||
+                    exportTarget.import;
+            }
+          } else if (target === 'browser') {
+            if (!formats || formats.includes('es')) {
+              exportTarget.import = `./${
+                this.options.buildDirectory
+              }/${entryDistName}-${target}${version || ''}.es.js`;
             }
 
-            if (
-              !version ||
-              (target === 'node' && version === defaultNodeEnvVersion)
-            ) {
-              targets[target] = {
-                ...targets[target],
-                ...exportTarget,
-              };
-            } else {
-              targets[target] = {
-                [`${target}:${version}`]: exportTarget,
-                ...targets[target],
-              };
+            if (formats && formats.includes('cjs')) {
+              exportTarget.require = `./${
+                this.options.buildDirectory
+              }/index-${target}${version || ''}.cjs.js`;
             }
-          });
-        }
+          }
+
+          if (
+            !version ||
+            (target === 'node' && version === defaultNodeEnvVersion)
+          ) {
+            targets[target] = {
+              ...targets[target],
+              ...exportTarget,
+            };
+          } else {
+            targets[target] = {
+              [`${target}:${version}`]: exportTarget,
+              ...targets[target],
+            };
+          }
+        });
 
         pkg.exports[exportName] = targets;
       });

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

@@ -125,7 +125,12 @@ export default class CommonTypescriptGenerator extends Generator {
       }
       if (withTypescript) {
         const nodeVersion = this.options.onlyLatestLTS ? '20' : '18';
-        const envs = pkg.pob?.envs;
+        const envs = pkg.pob?.envs || [
+          {
+            target: 'node',
+            version: '18',
+          },
+        ];
         if (pkg.pob.rollup === false) {
           return [`@pob/root/tsconfigs/targets/node-${nodeVersion}.json`];
         }

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

@@ -21,6 +21,9 @@
 <% } -%>
 <% if (emitDefinitions || build) { -%>
     "outDir": "<%= build ? 'dist' : 'dist/definitions' %>",
+    <% if (build) { -%>
+      "declarationDir": "dist/definitions",
+    <% } -%>
     <% if (composite) {
       // dont emit in dist/definitions to avoid publish to npm
        -%>

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

@@ -65,6 +65,7 @@ jobs:
         if: startsWith(matrix.node-version, '20.')
         env:
           CI: true
+          NODE_V8_COVERAGE: coverage/
 
       - name: Send results to codecov
         uses: codecov/codecov-action@v3

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

@@ -75,6 +75,7 @@ export default class CoreGitignoreGenerator extends Generator {
         documentation: this.options.documentation,
         testing: this.options.testing,
         withBabel,
+        tsTestUtil: 'ts-node',
         typescript: withBabel || this.options.typescript,
         paths: this.options.paths,
         buildInGit: this.options.buildInGit,

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

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

package/lib/generators/lib/PobLibGenerator.js

@@ -296,6 +296,7 @@ export default class PobLibGenerator extends Generator {
         !!this.pobjson.documentation ||
         !!(this.pobjson.testing && this.pobjson.testing.codecov),
       testing: !!this.pobjson.testing,
+      testRunner: this.pobjson.testing?.runner,
       packageManager: this.options.packageManager,
       yarnNodeLinker: this.options.yarnNodeLinker,
       ignorePaths: withBabel || withTypescript ? '/dist' : '',

package/lib/generators/monorepo/PobMonorepoGenerator.js

@@ -246,6 +246,7 @@ export default class PobMonorepoGenerator extends Generator {
       documentation: this.pobLernaConfig.documentation,
       typescript: this.pobLernaConfig.typescript,
       testing: this.pobLernaConfig.testing,
+      testRunner: this.pobLernaConfig.testRunner,
       packageManager: this.options.packageManager,
       yarnNodeLinker: this.options.yarnNodeLinker,
       appTypes: JSON.stringify(getAppTypes(this.packageConfigs)),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pob",
-  "version": "17.2.1",
+  "version": "17.4.0",
   "description": "Pile of bones, library generator with git/babel/typescript/typedoc/readme/jest",
   "keywords": [
     "skeleton"
@@ -39,9 +39,9 @@
   "prettier": "@pob/root/prettier-config",
   "pob": {},
   "dependencies": {
-    "@pob/eslint-config": "51.2.2",
-    "@pob/eslint-config-typescript": "51.2.2",
-    "@pob/eslint-config-typescript-react": "51.2.2",
+    "@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.0",
     "@pob/sort-object": "6.2.0",
     "@pob/sort-pkg": "6.2.0",
@@ -62,15 +62,15 @@
     "mem-fs-editor": "11.0.0",
     "minimist": "1.2.8",
     "parse-author": "2.0.0",
-    "pob-dependencies": "10.2.0",
+    "pob-dependencies": "10.4.0",
     "prettier": "2.8.8",
     "semver": "7.5.4",
     "validate-npm-package-name": "^5.0.0",
-    "yarn-workspace-utils": "3.0.0",
+    "yarn-workspace-utils": "3.1.0",
     "yeoman-environment": "4.1.3",
     "yeoman-generator": "7.1.1"
   },
   "devDependencies": {
-    "@pob/root": "8.11.1"
+    "@pob/root": "8.12.0"
   }
 }