pob 9.3.1 → 9.4.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [9.4.0](https://github.com/christophehurpeau/pob/compare/pob@9.3.1...pob@9.4.0) (2021-12-11)
+
+
+### Features
+
+* monorepo testing generator ([b444042](https://github.com/christophehurpeau/pob/commit/b444042aa5203e4ac7a56a3d93f5a3b98c0fce11))
+
+
+
+
+
 ## [9.3.1](https://github.com/christophehurpeau/pob/compare/pob@9.3.0...pob@9.3.1) (2021-12-11)
 
 **Note:** Version bump only for package pob

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

@@ -1,6 +1,7 @@
 import fs from 'fs';
 import semver from 'semver';
 import Generator from 'yeoman-generator';
+import inLerna from '../../../utils/inLerna.js';
 import * as packageUtils from '../../../utils/package.js';
 
 export default class CommonBabelGenerator extends Generator {
@@ -734,6 +735,7 @@ export default class CommonBabelGenerator extends Generator {
         {
           hasReact,
           testing: this.options.testing,
+          jestExperimentalESM: !inLerna,
         },
       );
     } else {

package/lib/generators/common/babel/templates/babel.config.cjs.ejs

@@ -9,6 +9,6 @@ module.exports = function babelConfig(api) {
 
   return {
     only: [path.resolve(__dirname, 'src')],
-    presets: [require.resolve('pob-babel/preset')],
+    presets: [[require.resolve('pob-babel/preset')<% if (!jestExperimentalESM) { %>, { modules: 'commonjs' }<% } %>]],
   };
 };

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

@@ -337,7 +337,7 @@ export default class CommonLintGenerator extends Generator {
       ? `{${pkg.type === 'commonjs' ? 'mjs' : 'cjs'},js}`
       : `${hasReact ? '{ts,tsx}' : 'ts'}`;
 
-    const jestOverride = !packageUtils.hasJest(pkg)
+    const jestOverride = !pkg.jest
       ? null
       : {
           files: [`**/*.test.${ext}`, `__tests__/**/*.${ext}`],

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

@@ -6,6 +6,12 @@ export default class CommonTestingGenerator extends Generator {
   constructor(args, opts) {
     super(args, opts);
 
+    this.option('monorepo', {
+      type: Boolean,
+      defaults: false,
+      desc: 'is root monorepo',
+    });
+
     this.option('enable', {
       type: Boolean,
       defaults: true,
@@ -44,10 +50,10 @@ export default class CommonTestingGenerator extends Generator {
   }
 
   default() {
-    if (!inLerna) {
+    if (!inLerna || inLerna.root) {
       this.composeWith('pob:core:ci', {
         enable: this.options.ci,
-        testing: this.options.testing,
+        testing: this.options.enable,
         build: this.options.typescript,
         typescript: this.options.typescript,
         documentation: this.options.documentation,
@@ -73,6 +79,12 @@ export default class CommonTestingGenerator extends Generator {
       'babel-jest',
     ]);
 
+    // const yoConfigPobMonorepo = inLerna && inLerna.pobMonorepoConfig;
+    // const globalTesting = yoConfigPobMonorepo && yoConfigPobMonorepo.testing;
+    const globalTesting = false;
+
+    const enableForMonorepo = this.options.monorepo && globalTesting;
+
     if (!this.options.enable) {
       packageUtils.removeDevDependencies(pkg, ['jest', '@types/jest']);
 
@@ -91,81 +103,93 @@ export default class CommonTestingGenerator extends Generator {
 
       this.fs.writeJSON(this.destinationPath('package.json'), pkg);
     } else {
-      const babelEnvs = pkg.pob.babelEnvs || [];
-      const transpileWithBabel = packageUtils.transpileWithBabel(pkg);
-
-      const shouldUseExperimentalVmModules =
-        pkg.type === 'module' || transpileWithBabel;
-
-      const jestCommand = `${
-        shouldUseExperimentalVmModules
-          ? 'NODE_OPTIONS=--experimental-vm-modules '
-          : ''
-      }jest`;
-
-      packageUtils.addScripts(pkg, {
-        test: jestCommand,
-        'test:watch': `${jestCommand} --watch`,
-        'generate:test-coverage': [
-          'rm -Rf docs/coverage/',
-          `NODE_ENV=production ${
-            transpileWithBabel ? 'BABEL_ENV=test ' : ''
-          }${jestCommand} --coverage --coverageReporters=pob-lcov-reporter --coverageDirectory=docs/coverage/`,
-        ].join(' ; '),
-      });
-
-      packageUtils.addDevDependencies(pkg, [
-        'pob-lcov-reporter',
-        'jest',
-        '@types/jest',
-      ]);
-
-      const hasReact = transpileWithBabel && packageUtils.hasReact(pkg);
-      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),
-        extensionsToTreatAsEsm: [
-          transpileWithBabel && '.ts',
-          transpileWithBabel && hasReact && '.tsx',
-        ].filter(Boolean),
-        // transform: {
-        //   [`^.+\\.ts${hasReact ? 'x?' : ''}$`]: 'babel-jest',
-        // },
-      });
-      delete pkg.jest.transform;
-
-      if (
-        babelEnvs.length === 0 ||
-        babelEnvs.some((env) => env.target === 'node')
-      ) {
-        pkg.jest.testEnvironment = 'node';
+      packageUtils.addOrRemoveDevDependencies(
+        pkg,
+        enableForMonorepo || !globalTesting,
+        ['pob-lcov-reporter', 'jest', '@types/jest'],
+      );
+
+      if (this.options.monorepo) {
+        delete pkg.jest;
+        packageUtils.addScripts(pkg, {
+          test: 'yarn workspaces foreach --parallel -Av run test',
+        });
       } else {
-        delete pkg.jest.testEnvironment;
+        const babelEnvs = pkg.pob.babelEnvs || [];
+        const transpileWithBabel = packageUtils.transpileWithBabel(pkg);
+
+        const shouldUseExperimentalVmModules =
+          pkg.type === 'module' || (transpileWithBabel && !inLerna);
+
+        const jestCommand = `${
+          shouldUseExperimentalVmModules
+            ? 'NODE_OPTIONS=--experimental-vm-modules '
+            : ''
+        }jest`;
+
+        packageUtils.addScripts(pkg, {
+          test: jestCommand,
+          'test:watch': `${jestCommand} --watch`,
+          'generate:test-coverage': [
+            'rm -Rf docs/coverage/',
+            `NODE_ENV=production ${
+              transpileWithBabel ? 'BABEL_ENV=test ' : ''
+            }${jestCommand} --coverage --coverageReporters=pob-lcov-reporter --coverageDirectory=docs/coverage/`,
+          ].join(' ; '),
+        });
+
+        const hasReact = transpileWithBabel && packageUtils.hasReact(pkg);
+        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 (
+          babelEnvs.length === 0 ||
+          babelEnvs.some((env) => env.target === 'node')
+        ) {
+          pkg.jest.testEnvironment = 'node';
+        } else {
+          delete pkg.jest.testEnvironment;
+        }
+
+        if (!transpileWithBabel) delete pkg.jest.transform;
       }
-
-      if (!transpileWithBabel) delete pkg.jest.transform;
     }
 
     this.fs.writeJSON(this.destinationPath('package.json'), pkg);

package/lib/generators/monorepo/PobMonorepoGenerator.js

@@ -194,19 +194,19 @@ export default class PobMonorepoGenerator extends Generator {
       throw new Error('packages should not be empty');
     }
 
-    this.composeWith('pob:core:ci', {
-      enable: this.pobLernaConfig.ci,
-      build: this.pobLernaConfig.typescript,
-      typescript: this.pobLernaConfig.typescript,
+    this.composeWith('pob:common:husky', {});
+
+    this.composeWith('pob:common:testing', {
+      monorepo: true,
+      enable: this.pobLernaConfig.testing,
       testing: this.pobLernaConfig.testing,
-      codecov: this.pobLernaConfig.codecov,
-      documentation: this.pobLernaConfig.documentation,
-      updateOnly: this.options.updateOnly,
+      typescript: this.pobLernaConfig.typescript,
+      documentation: !!this.pobLernaConfig.documentation,
+      codecov: this.pobLernaConfig.testing && this.pobLernaConfig.codecov,
+      ci: this.pobLernaConfig.ci,
       packageManager: this.options.packageManager,
     });
 
-    this.composeWith('pob:common:husky', {});
-
     this.composeWith('pob:common:format-lint', {
       monorepo: true,
       documentation: this.pobLernaConfig.documentation,

package/lib/generators/monorepo/lerna/MonorepoLernaGenerator.js

@@ -152,19 +152,6 @@ export default class MonorepoLernaGenerator extends Generator {
 
     packageUtils.removeDevDependencies(pkg, ['standard-version']);
 
-    const getPobConfig = (config) => ({
-      ...(config &&
-        config.pob &&
-        (config.pob['pob-config'] || config.pob.lib || config.pob.app)),
-    });
-    // ynnub doesnt use babel but still have typescript
-    // const withTypescript = this.packagePaths.some((packagePath) =>
-    //   this.fs.exists(this.destinationPath(`${packagePath}/tsconfig.json`)),
-    // );
-    const withTests = this.packagesConfig.some(
-      (config) => getPobConfig(config).testing,
-    );
-
     const monorepoConfig = this.config.get('monorepo');
     const packageManager = this.npm ? 'npm' : 'yarn';
     const useYarnWorkspacesCommand =
@@ -205,14 +192,6 @@ export default class MonorepoLernaGenerator extends Generator {
       ),
     );
 
-    packageUtils.addOrRemoveScripts(pkg, withTests, {
-      test: `${
-        useYarnWorkspacesCommand
-          ? 'yarn workspaces foreach --parallel -Av run'
-          : 'lerna run --stream'
-      } test`,
-    });
-
     packageUtils.addOrRemoveScripts(pkg, withBabel, {
       build: `${
         useYarnWorkspacesCommand

package/lib/utils/package.js

@@ -37,9 +37,6 @@ export const hasReact = (pkg) =>
     (pkg.peerDependencies && pkg.peerDependencies.react)
   );
 
-export const hasJest = (pkg) =>
-  !!(pkg.devDependencies && pkg.devDependencies.jest);
-
 export const sort = function sort(pkg) {
   return sortPkg(pkg);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pob",
-  "version": "9.3.1",
+  "version": "9.4.0",
   "description": "Pile of bones, library generator with git/babel/typescript/typedoc/readme/jest",
   "keywords": [
     "skeleton"
@@ -63,12 +63,12 @@
     "mem-fs-editor": "8.1.2",
     "minimist-argv": "^1.1.0",
     "parse-author": "^2.0.0",
-    "pob-dependencies": "^6.0.5",
+    "pob-dependencies": "^6.0.6",
     "prettier": "2.5.1",
     "semver": "^7.3.4",
     "update-notifier": "^5.0.1",
     "yeoman-environment": "^3.5.1",
     "yeoman-generator": "^5.4.0"
   },
-  "gitHead": "af56a72ee2ebe57624d26c15689b9ab54ffe13d0"
+  "gitHead": "578f2d74ffe7819f88444604226014077a3ba869"
 }