pob 17.2.1 → 17.3.0

package/CHANGELOG.md

@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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/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';
+        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) {

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pob",
-  "version": "17.2.1",
+  "version": "17.3.0",
   "description": "Pile of bones, library generator with git/babel/typescript/typedoc/readme/jest",
   "keywords": [
     "skeleton"
@@ -62,7 +62,7 @@
     "mem-fs-editor": "11.0.0",
     "minimist": "1.2.8",
     "parse-author": "2.0.0",
-    "pob-dependencies": "10.2.0",
+    "pob-dependencies": "10.3.0",
     "prettier": "2.8.8",
     "semver": "7.5.4",
     "validate-npm-package-name": "^5.0.0",
@@ -71,6 +71,6 @@
     "yeoman-generator": "7.1.1"
   },
   "devDependencies": {
-    "@pob/root": "8.11.1"
+    "@pob/root": "8.12.0"
   }
 }