pob 11.9.0 → 12.0.0

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [12.0.0](https://github.com/christophehurpeau/pob/compare/pob@11.9.0...pob@12.0.0) (2023-04-18)
+
+
+### ⚠ BREAKING CHANGES
+
+* require node 18 for pob and monorepo
+
+### Features
+
+* **deps:** update dependency eslint to v8.38.0 ([#1596](https://github.com/christophehurpeau/pob/issues/1596)) ([6e0c03b](https://github.com/christophehurpeau/pob/commit/6e0c03b39fe040e9af465fa1e29ec757af3a9311))
+* **deps:** update dependency semver to v7.4.0 ([#1599](https://github.com/christophehurpeau/pob/issues/1599)) ([d71ada7](https://github.com/christophehurpeau/pob/commit/d71ada7ca259ccf83b3226221fb6288e5cf42fcc))
+* **deps:** update dependency semver to v7.5.0 ([#1608](https://github.com/christophehurpeau/pob/issues/1608)) ([1dda98b](https://github.com/christophehurpeau/pob/commit/1dda98b556f670f1316fea18b31a9ce806dd114e))
+* **pob:** add node runner as testing option ([c96f6d8](https://github.com/christophehurpeau/pob/commit/c96f6d888a3cc62a5cba50f069e1c51124acb0d9))
+* require node 18 for pob and monorepo ([5953695](https://github.com/christophehurpeau/pob/commit/5953695fc2a7a440bfaebc8abce8533b05a68f65))
+
+
+### Bug Fixes
+
+* fix rootIgnorePatterns for monorepo ([6731118](https://github.com/christophehurpeau/pob/commit/673111827a0c378febae87f7fefa9917cd8354c3))
+
+
+
 ## [11.9.0](https://github.com/christophehurpeau/pob/compare/pob@11.8.1...pob@11.9.0) (2023-04-03)
 
 

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

@@ -423,8 +423,8 @@ export default class CommonLintGenerator extends Generator {
       if ((!inLerna || !inLerna.root) && useBabel) {
         const buildPath = `/${this.options.buildDirectory}`;
         if (
-          !this.options.ignorePaths ||
-          !this.options.ignorePaths.includes(buildPath)
+          !this.options.rootIgnorePatterns ||
+          !this.options.rootIgnorePatterns.includes(buildPath)
         ) {
           ignorePatterns.add(buildPath);
         }
@@ -433,8 +433,8 @@ export default class CommonLintGenerator extends Generator {
         ignorePatterns.add('/rollup.config.mjs');
       }
 
-      if (this.options.ignorePaths) {
-        this.options.ignorePaths
+      if (this.options.rootIgnorePatterns) {
+        this.options.rootIgnorePatterns
           .split('\n')
           .filter(Boolean)
           .forEach((ignorePath) => {

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

@@ -20,6 +20,12 @@ export default class CommonTestingGenerator extends Generator {
       desc: 'enable testing',
     });
 
+    this.option('runner', {
+      type: String,
+      defaults: 'jest',
+      desc: 'test runner (jest or node)',
+    });
+
     this.option('enableReleasePlease', {
       type: Boolean,
       defaults: true,
@@ -128,10 +134,13 @@ export default class CommonTestingGenerator extends Generator {
         ? yoConfigPobMonorepo.react ?? packageUtils.hasReact(pkg)
         : packageUtils.hasReact(pkg));
 
-    if (!this.options.enable) {
+    if (this.options.enable || this.options.runner !== 'jest') {
       packageUtils.removeDevDependencies(pkg, ['jest', '@types/jest']);
 
       delete pkg.jest;
+    }
+
+    if (!this.options.enable) {
       // if (inLerna) {
       //   if (pkg.scripts.test === 'echo "No tests"') {
       //     delete pkg.scripts.test;
@@ -142,15 +151,18 @@ export default class CommonTestingGenerator extends Generator {
         delete pkg.scripts.test;
         delete pkg.scripts['generate:test-coverage'];
         delete pkg.scripts['test:watch'];
+        delete pkg.scripts['test:coverage'];
       }
 
       this.fs.writeJSON(this.destinationPath('package.json'), pkg);
     } else {
-      packageUtils.addOrRemoveDevDependencies(
-        pkg,
-        enableForMonorepo || !globalTesting,
-        ['jest', '@types/jest'],
-      );
+      if (this.options.runner === 'jest') {
+        packageUtils.addOrRemoveDevDependencies(
+          pkg,
+          enableForMonorepo || !globalTesting,
+          ['jest', '@types/jest'],
+        );
+      }
 
       packageUtils.removeScripts(['test:coverage']);
       if (this.options.monorepo && !globalTesting) {
@@ -161,57 +173,68 @@ export default class CommonTestingGenerator extends Generator {
       } else if (this.options.monorepo) {
         const shouldUseExperimentalVmModules = pkg.type === 'module';
 
-        const jestCommand = `${
-          shouldUseExperimentalVmModules
-            ? 'NODE_OPTIONS=--experimental-vm-modules '
-            : ''
-        }jest`;
+        const testCommand =
+          this.options.runner === 'jest'
+            ? `${
+                shouldUseExperimentalVmModules
+                  ? 'NODE_OPTIONS=--experimental-vm-modules '
+                  : ''
+              }jest`
+            : 'node --test';
 
         packageUtils.addScripts(pkg, {
-          test: jestCommand,
+          test: testCommand,
+          'test:watch': `${testCommand} --watch`,
+          'test:coverage':
+            this.options.runner === 'jest'
+              ? `${testCommand} --coverage --coverageReporters=json --coverageReporters=text`
+              : testCommand, // not yet configured
         });
 
-        const workspacesWithoutStar = pkg.workspaces.map((workspace) => {
-          if (!workspace.endsWith('/*')) {
-            throw new Error(`Invalid workspace format: ${workspace}`);
+        if (this.options.runner === 'jest') {
+          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-'),
+          );
+
+          if (!pkg.jest) pkg.jest = {};
+          Object.assign(pkg.jest, {
+            cacheDirectory: './node_modules/.cache/jest',
+            testEnvironment: 'node',
+            testMatch: [
+              `<rootDir>/${workspacesPattern}/*/@(src|lib)/**/__tests__/**/*.${
+                transpileWithBabel ? '(ts|js|cjs|mjs)' : '(js|cjs|mjs)'
+              }${hasReact ? '?(x)' : ''}`,
+              `<rootDir>/${workspacesPattern}/*/@(src|lib)/**/*.test.${
+                transpileWithBabel ? '(ts|js|cjs|mjs)' : '(js|cjs|mjs)'
+              }${hasReact ? '?(x)' : ''}`,
+            ],
+          });
+
+          if (shouldUseExperimentalVmModules) {
+            pkg.jest.extensionsToTreatAsEsm = [
+              transpileWithBabel && '.ts',
+              transpileWithBabel && hasReact && '.tsx',
+            ].filter(Boolean);
+          } else {
+            delete pkg.jest.extensionsToTreatAsEsm;
           }
-          return workspace.slice(0, -2);
-        });
-        const workspacesPattern =
-          workspacesWithoutStar.length === 1
-            ? workspacesWithoutStar[0]
-            : `@(${workspacesWithoutStar.join('|')})`;
-        hasReact = yoConfigPobMonorepo.packageNames.some((pkgName) =>
-          pkgName.startsWith('react-'),
-        );
-
-        if (!pkg.jest) pkg.jest = {};
-        Object.assign(pkg.jest, {
-          cacheDirectory: './node_modules/.cache/jest',
-          testEnvironment: 'node',
-          testMatch: [
-            `<rootDir>/${workspacesPattern}/*/@(src|lib)/**/__tests__/**/*.${
-              transpileWithBabel ? '(ts|js|cjs|mjs)' : '(js|cjs|mjs)'
-            }${hasReact ? '?(x)' : ''}`,
-            `<rootDir>/${workspacesPattern}/*/@(src|lib)/**/*.test.${
-              transpileWithBabel ? '(ts|js|cjs|mjs)' : '(js|cjs|mjs)'
-            }${hasReact ? '?(x)' : ''}`,
-          ],
-        });
-
-        if (shouldUseExperimentalVmModules) {
-          pkg.jest.extensionsToTreatAsEsm = [
-            transpileWithBabel && '.ts',
-            transpileWithBabel && hasReact && '.tsx',
-          ].filter(Boolean);
-        } else {
-          delete pkg.jest.extensionsToTreatAsEsm;
         }
       } else if (globalTesting) {
         delete pkg.jest;
         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
@@ -225,67 +248,78 @@ export default class CommonTestingGenerator extends Generator {
         const shouldUseExperimentalVmModules =
           pkg.type === 'module' && !inLerna;
 
-        const jestCommand = `${
-          shouldUseExperimentalVmModules
-            ? 'NODE_OPTIONS=--experimental-vm-modules '
-            : ''
-        }jest`;
+        const testCommand =
+          this.options.runner === 'jest'
+            ? `${
+                shouldUseExperimentalVmModules
+                  ? 'NODE_OPTIONS=--experimental-vm-modules '
+                  : ''
+              }jest`
+            : 'node --test';
 
         packageUtils.addScripts(pkg, {
-          test: jestCommand,
-          'test:watch': `${jestCommand} --watch`,
+          test: testCommand,
+          'test:watch': `${testCommand} --watch`,
+          'test:coverage':
+            this.options.runner === 'jest'
+              ? `${testCommand}  --coverage --coverageReporters=json --coverageReporters=text`
+              : testCommand, // not yet configured,
         });
 
-        const srcDirectory = transpileWithBabel ? 'src' : 'lib';
-
-        if (!pkg.jest) pkg.jest = {};
-        Object.assign(pkg.jest, {
-          cacheDirectory: './node_modules/.cache/jest',
-          testMatch: [
-            `<rootDir>/${srcDirectory}/**/__tests__/**/*.${
-              transpileWithBabel ? 'ts' : '?(m)js'
-            }${hasReact ? '?(x)' : ''}`,
-            `<rootDir>/${srcDirectory}/**/*.test.${
-              transpileWithBabel ? 'ts' : '?(m)js'
-            }${hasReact ? '?(x)' : ''}`,
-          ],
-          collectCoverageFrom: [
-            `${srcDirectory}/**/*.${transpileWithBabel ? 'ts' : '?(m)js'}${
-              hasReact ? '?(x)' : ''
-            }`,
-          ],
-          moduleFileExtensions: [
-            transpileWithBabel && 'ts',
-            transpileWithBabel && hasReact && 'tsx',
-            'js',
-            // 'jsx',
-            'json',
-          ].filter(Boolean),
-          // transform: {
-          //   [`^.+\\.ts${hasReact ? 'x?' : ''}$`]: 'babel-jest',
-          // },
-        });
-        delete pkg.jest.transform;
+        if (this.options.runner === 'jest') {
+          const srcDirectory = transpileWithBabel ? 'src' : 'lib';
+
+          if (!pkg.jest) pkg.jest = {};
+          Object.assign(pkg.jest, {
+            cacheDirectory: './node_modules/.cache/jest',
+            testMatch: [
+              `<rootDir>/${srcDirectory}/**/__tests__/**/*.${
+                transpileWithBabel ? 'ts' : '?(m)js'
+              }${hasReact ? '?(x)' : ''}`,
+              `<rootDir>/${srcDirectory}/**/*.test.${
+                transpileWithBabel ? 'ts' : '?(m)js'
+              }${hasReact ? '?(x)' : ''}`,
+            ],
+            collectCoverageFrom: [
+              `${srcDirectory}/**/*.${transpileWithBabel ? 'ts' : '?(m)js'}${
+                hasReact ? '?(x)' : ''
+              }`,
+            ],
+            moduleFileExtensions: [
+              transpileWithBabel && 'ts',
+              transpileWithBabel && hasReact && 'tsx',
+              'js',
+              // 'jsx',
+              'json',
+            ].filter(Boolean),
+            // transform: {
+            //   [`^.+\\.ts${hasReact ? 'x?' : ''}$`]: 'babel-jest',
+            // },
+          });
+          delete pkg.jest.transform;
+
+          if (shouldUseExperimentalVmModules) {
+            pkg.jest.extensionsToTreatAsEsm = [
+              transpileWithBabel && '.ts',
+              transpileWithBabel && hasReact && '.tsx',
+            ].filter(Boolean);
+          } else {
+            delete pkg.jest.extensionsToTreatAsEsm;
+          }
 
-        if (shouldUseExperimentalVmModules) {
-          pkg.jest.extensionsToTreatAsEsm = [
-            transpileWithBabel && '.ts',
-            transpileWithBabel && hasReact && '.tsx',
-          ].filter(Boolean);
-        } else {
-          delete pkg.jest.extensionsToTreatAsEsm;
-        }
+          if (
+            babelEnvs.length === 0 ||
+            babelEnvs.some((env) => env.target === 'node')
+          ) {
+            pkg.jest.testEnvironment = 'node';
+          } else {
+            delete pkg.jest.testEnvironment;
+          }
 
-        if (
-          babelEnvs.length === 0 ||
-          babelEnvs.some((env) => env.target === 'node')
-        ) {
-          pkg.jest.testEnvironment = 'node';
+          if (!transpileWithBabel) delete pkg.jest.transform;
         } else {
-          delete pkg.jest.testEnvironment;
+          delete pkg.jest;
         }
-
-        if (!transpileWithBabel) delete pkg.jest.transform;
       }
     }
 

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

@@ -90,7 +90,7 @@ jobs:
         if: matrix.node-version != 18
 
       - name: Generate Test Coverage
-        run: <%= packageManager %> run test --coverage --coverageReporters=json --coverageReporters=text
+        run: <%= packageManager %> run test:coverage
         if: matrix.node-version == 18
 
       - name: Send results to codecov

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

@@ -54,7 +54,7 @@ jobs:
 <% if (codecov) { -%>
 
       - name: Generate Test Coverage
-        run: <%= packageManager %> run test --coverage --coverageReporters=json --coverageReporters=text
+        run: <%= packageManager %> run test:coverage
         if: startsWith(matrix.node-version, '18.')
         env:
           CI: true

package/lib/generators/core/git/generators/github/CoreGitGithubGenerator.js

@@ -1,6 +1,5 @@
 /* eslint-disable camelcase */
 
-import fetch from 'node-fetch';
 import Generator from 'yeoman-generator';
 import { ciContexts } from '../../../ci/CoreCIGenerator.js';
 // const packageUtils = require('../../../../../utils/package');

package/lib/generators/lib/PobLibGenerator.js

@@ -170,9 +170,26 @@ export default class PobLibGenerator extends Generator {
               ? this.pobjson.documentation
               : true,
         },
+        {
+          type: 'checkbox',
+          name: 'runner',
+          message: 'Testing runner ?',
+          default: 'jest',
+          choices: [
+            {
+              name: 'Jest',
+              value: 'jest',
+            },
+            {
+              name: 'node:test',
+              value: 'node',
+            },
+          ],
+        },
       ]);
 
       this.pobjson.documentation = !!answers.documentation;
+      this.pobjson.runner = !!answers.runner;
     }
 
     // testing
@@ -248,6 +265,9 @@ export default class PobLibGenerator extends Generator {
       enable: this.pobjson.testing,
       enableReleasePlease,
       testing: this.pobjson.testing,
+      runner: this.pobjson.testing
+        ? this.pobjson.testing.runner || 'jest'
+        : undefined,
       build: withBabel,
       typescript: withBabel,
       documentation: !!this.pobjson.documentation,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pob",
-  "version": "11.9.0",
+  "version": "12.0.0",
   "description": "Pile of bones, library generator with git/babel/typescript/typedoc/readme/jest",
   "keywords": [
     "skeleton"
@@ -18,7 +18,7 @@
   },
   "type": "module",
   "engines": {
-    "node": ">=16.0.0"
+    "node": ">=18.0.0"
   },
   "main": "./lib/index.js",
   "exports": {
@@ -44,7 +44,7 @@
     "@pob/sort-eslint-config": "4.1.1",
     "@pob/sort-object": "5.1.1",
     "@pob/sort-pkg": "5.2.0",
-    "eslint": "8.37.0",
+    "eslint": "8.38.0",
     "findup-sync": "^5.0.0",
     "git-remote-url": "^1.0.1",
     "github-username": "^6.0.0",
@@ -56,16 +56,15 @@
     "mem-fs": "2.3.0",
     "mem-fs-editor": "9.7.0",
     "minimist": "1.2.8",
-    "node-fetch": "3.3.1",
     "parse-author": "2.0.0",
-    "pob-dependencies": "7.7.0",
+    "pob-dependencies": "7.8.0",
     "prettier": "2.8.7",
-    "semver": "7.3.8",
+    "semver": "7.5.0",
     "yeoman-environment": "3.15.1",
     "yeoman-generator": "5.8.0"
   },
   "devDependencies": {
-    "@pob/root": "7.7.0"
+    "@pob/root": "7.8.0"
   },
-  "gitHead": "512ed98cfd994cae7ceb9717f70caa1f87012449"
+  "gitHead": "efa1629282be7a06f88a2b2c84b87e56c6ea3d30"
 }