pob 9.8.0 → 9.11.0

package/CHANGELOG.md

@@ -3,6 +3,72 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [9.11.0](https://github.com/christophehurpeau/pob/compare/pob@9.10.0...pob@9.11.0) (2022-01-01)
+
+
+### Bug Fixes
+
+* **pob:** legacy pkg.main cjs ([04dc5e2](https://github.com/christophehurpeau/pob/commit/04dc5e22e77b7383660b3bc62516d884670cf25a))
+* force package type module when lerna and root is module ([c8e89a8](https://github.com/christophehurpeau/pob/commit/c8e89a8d04936ea7035d86a646437ba74e54146b))
+* **deps:** update dependency @yarnpkg/parsers to v2.5.0-rc.7 ([#1148](https://github.com/christophehurpeau/pob/issues/1148)) ([8da56d4](https://github.com/christophehurpeau/pob/commit/8da56d4c1576908570c16da89caebad87a50c473))
+* **pob:** monorepo react testing detection ([3f95cbf](https://github.com/christophehurpeau/pob/commit/3f95cbf667f624301aab82a88080c526507fe662))
+* **pob:** test babel config with react ([726b954](https://github.com/christophehurpeau/pob/commit/726b95400eeef042bb22cafd1f4cdec23e0008df))
+* package main when only esm is used ([b02684f](https://github.com/christophehurpeau/pob/commit/b02684f03a7bdf5875ac4919aa69df6b4993532f))
+
+
+### Features
+
+* **deps:** update dependency eslint to v8.6.0 ([#1152](https://github.com/christophehurpeau/pob/issues/1152)) ([004bf4f](https://github.com/christophehurpeau/pob/commit/004bf4f78e200606813498ee4f211ed06fec659f))
+
+
+
+
+
+# [9.10.0](https://github.com/christophehurpeau/pob/compare/pob@9.9.1...pob@9.10.0) (2021-12-26)
+
+
+### Features
+
+* **deps:** update dependency mem-fs-editor to v9.4.0 ([#992](https://github.com/christophehurpeau/pob/issues/992)) ([692888b](https://github.com/christophehurpeau/pob/commit/692888bfb3546028f6cf86c58bd8cf2efecfbf71))
+
+
+
+
+
+## [9.9.1](https://github.com/christophehurpeau/pob/compare/pob@9.9.0...pob@9.9.1) (2021-12-19)
+
+
+### Bug Fixes
+
+* **pob:** add missing workspaces plugin when needed ([f3759c3](https://github.com/christophehurpeau/pob/commit/f3759c3f9bc34f30a7f72580df85b352fb67fbad))
+* **pob:** exports for browser only ([0ede342](https://github.com/christophehurpeau/pob/commit/0ede342c71aefbcad6b037c3bd6ea1ac4eec2a61))
+* **pob:** watch command ([e026f52](https://github.com/christophehurpeau/pob/commit/e026f5209d5bc0eb81ce766bbc8b7e5f62abe4b7))
+
+
+
+
+
+# [9.9.0](https://github.com/christophehurpeau/pob/compare/pob@9.8.0...pob@9.9.0) (2021-12-18)
+
+
+### Bug Fixes
+
+* update mem-fs ([8fdf8f7](https://github.com/christophehurpeau/pob/commit/8fdf8f79768ac0ca6e0326e629834657e2992c71))
+* **pob:** ci testing check fix ([c8eb2cd](https://github.com/christophehurpeau/pob/commit/c8eb2cdf000766699e5590aebcc55e1c23d15700))
+* coverage is a documentation ([cfde873](https://github.com/christophehurpeau/pob/commit/cfde8733ef340dd097143acb66e9acd87e69fbbe))
+* defaults for readJSON5 method ([2a213b5](https://github.com/christophehurpeau/pob/commit/2a213b545be5e653b4f0a279983ea4cfeaacaa11))
+* update legacy yarn2 to node-modules ([d543e5e](https://github.com/christophehurpeau/pob/commit/d543e5ede8273f16fb0416424671c2d1d7c60c73))
+
+
+### Features
+
+* always use yarn workspaces commands ([83945e0](https://github.com/christophehurpeau/pob/commit/83945e0a2ee07c52ecd1a105e1e7b9749f91b712))
+* **deps:** update dependency eslint to v8.5.0 ([#1069](https://github.com/christophehurpeau/pob/issues/1069)) ([46d8538](https://github.com/christophehurpeau/pob/commit/46d85381f97fbd55e424ca8b6f1fc0138900ff7f))
+
+
+
+
+
 # [9.8.0](https://github.com/christophehurpeau/pob/compare/pob@9.7.4...pob@9.8.0) (2021-12-12)
 
 

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

@@ -421,6 +421,17 @@ export default class CommonBabelGenerator extends Generator {
         'not safari < 10',
         'not ios_saf < 10',
       ];
+    } else if (this.options.isApp && pkg.browserslist) {
+      pkg.browserslist = {
+        ...pkg.browserslist,
+        production: [
+          'defaults',
+          '> 0.2%',
+          'not ie < 12',
+          'not safari < 10',
+          'not ios_saf < 10',
+        ],
+      };
     } else {
       delete pkg.browserslist;
     }
@@ -457,7 +468,11 @@ export default class CommonBabelGenerator extends Generator {
       if (!pkg.main) {
         pkg.exports = './lib/index.js';
       }
-      pkg.main = './lib/index.js';
+      if (pkg.type === 'module' && this.fs.exists('./lib/index.cjs')) {
+        pkg.main = './lib/index.cjs';
+      } else {
+        pkg.main = './lib/index.js';
+      }
       if (!this.options.isApp) {
         if (this.fs.exists('./lib/index.ts')) {
           pkg.types = './lib/index.ts';
@@ -568,9 +583,10 @@ export default class CommonBabelGenerator extends Generator {
       this.entries.forEach((entry) => {
         const isBrowserOnly =
           entry === 'browser' &&
-          this.babelEnvs.every((env) => env.target === 'browser');
+          (this.babelEnvs.every((env) => env.target === 'browser') ||
+            (this.entries.length === 2 && this.entries.includes('index')));
         const entryDistName = isBrowserOnly ? 'index' : entry;
-        const exportName = entryDistName === 'index' ? '.' : `./${entry}`;
+        const exportName = entry === 'index' ? '.' : `./${entry}`;
 
         const targets = {};
 
@@ -597,7 +613,10 @@ export default class CommonBabelGenerator extends Generator {
             // eslint: https://github.com/benmosher/eslint-plugin-import/issues/2132
             // jest: https://github.com/facebook/jest/issues/9771
             if (!pkg.main && exportName === '.') {
-              pkg.main = exportTarget.default || exportTarget.require;
+              pkg.main =
+                exportTarget.default ||
+                exportTarget.require ||
+                exportTarget.import;
             }
           } else if (target === 'browser') {
             if (formats.includes('es')) {

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

@@ -86,6 +86,7 @@ export default class CommonTestingGenerator extends Generator {
     const transpileWithBabel = this.options.monorepo
       ? yoConfigPobMonorepo.typescript
       : pkg.pob && pkg.pob.babelEnvs && pkg.pob.babelEnvs.length > 0;
+    let hasReact = transpileWithBabel && packageUtils.hasReact(pkg);
 
     if (!this.options.enable) {
       packageUtils.removeDevDependencies(pkg, ['jest', '@types/jest']);
@@ -149,7 +150,9 @@ export default class CommonTestingGenerator extends Generator {
           workspacesWithoutStar.length === 1
             ? workspacesWithoutStar[0]
             : `(${workspacesWithoutStar.join('|')})`;
-        const hasReact = packageUtils.hasReact(pkg);
+        hasReact = yoConfigPobMonorepo.packageNames.some((pkgName) =>
+          pkgName.startsWith('react-'),
+        );
 
         if (!pkg.jest) pkg.jest = {};
         Object.assign(pkg.jest, {
@@ -204,7 +207,6 @@ export default class CommonTestingGenerator extends Generator {
           ].join(' ; '),
         });
 
-        const hasReact = transpileWithBabel && packageUtils.hasReact(pkg);
         const srcDirectory = transpileWithBabel ? 'src' : 'lib';
 
         if (!pkg.jest) pkg.jest = {};
@@ -262,7 +264,6 @@ export default class CommonTestingGenerator extends Generator {
       transpileWithBabel &&
       ((this.options.monorepo && globalTesting) || !globalTesting)
     ) {
-      const hasReact = transpileWithBabel && packageUtils.hasReact(pkg);
       // cjs for jest compat
       copyAndFormatTpl(
         this.fs,

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

@@ -7,6 +7,15 @@ module.exports = function babelConfig(api) {
 
   return {
     only: [<%- only %>],
-    presets: [[require.resolve('pob-babel/preset.cjs')<% if (!jestExperimentalESM) { %>, { modules: 'commonjs' }<% } %>]],
+    presets: [
+      [require.resolve('pob-babel/preset.cjs')<% if (!jestExperimentalESM) { %>, { modules: 'commonjs' }<% } %>]
+      <% if (hasReact) { %>, [
+        '@babel/preset-react',
+        {
+          development: false,
+          useBuiltIns: true,
+        },
+      ]<% } %>
+    ],
   };
 };

package/lib/generators/core/ci/CoreCIGenerator.js

@@ -69,7 +69,7 @@ export default class CoreCIGenerator extends Generator {
         this.destinationPath('.github/workflows/push.yml'),
         {
           packageManager: this.options.packageManager,
-          testing: this.options.testing && !!pkg.scripts.test,
+          testing: this.options.testing && !!pkg.scripts && !!pkg.scripts.test,
           checks: !!pkg.scripts && !!pkg.scripts.checks,
           documentation: this.options.documentation,
           build: this.options.build,

package/lib/generators/core/package/CorePackageGenerator.js

@@ -139,6 +139,9 @@ export default class CorePackageGenerator extends Generator {
     );
 
     if (!pkg.type) pkg.type = props.type;
+    if (inLerna && !inLerna.root && inLerna.rootMonorepoPkg.type === 'module') {
+      pkg.type = 'module';
+    }
 
     pkg.description = this.options.updateOnly
       ? pkg.description

package/lib/generators/core/yarn/CoreYarnGenerator.js

@@ -66,22 +66,32 @@ export default class CoreYarnGenerator extends Generator {
       const isPluginInstalled = (name) =>
         installedPlugins.some((plugin) => plugin.name === name);
 
+      const installPlugin = (nameOrUrl) => {
+        this.spawnCommandSync('yarn', ['plugin', 'import', nameOrUrl]);
+      };
+      const removePlugin = (name) => {
+        this.spawnCommandSync('yarn', ['plugin', 'remove', name]);
+      };
+
       const postinstallDevPluginName = '@yarnpkg/plugin-postinstall-dev';
+      const workspacesPluginName = '@yarnpkg/plugin-workspace-tools';
 
       if (!inLerna && !pkg.private) {
         if (!isPluginInstalled(postinstallDevPluginName)) {
-          this.spawnCommandSync('yarn', [
-            'plugin',
-            'import',
+          installPlugin(
             'https://raw.githubusercontent.com/sachinraja/yarn-plugin-postinstall-dev/main/bundles/%40yarnpkg/plugin-postinstall-dev.js',
-          ]);
+          );
         }
       } else if (isPluginInstalled(postinstallDevPluginName)) {
-        this.spawnCommandSync('yarn', [
-          'plugin',
-          'remove',
-          postinstallDevPluginName,
-        ]);
+        removePlugin(postinstallDevPluginName);
+      }
+
+      if (pkg.workspaces) {
+        if (!isPluginInstalled(workspacesPluginName)) {
+          installPlugin(workspacesPluginName);
+        }
+      } else if (isPluginInstalled(workspacesPluginName)) {
+        removePlugin(workspacesPluginName);
       }
 
       // must be done after plugins installed

package/lib/generators/lib/PobLibGenerator.js

@@ -254,7 +254,9 @@ export default class PobLibGenerator extends Generator {
 
     // must be after testing
     this.composeWith('pob:common:format-lint', {
-      documentation: !!this.pobjson.documentation,
+      documentation:
+        !!this.pobjson.documentation ||
+        !!(this.pobjson.testing && this.pobjson.testing.codecov),
       testing: this.pobjson.testing,
       packageManager: this.options.packageManager,
       yarnNodeLinker: this.options.yarnNodeLinker,

package/lib/generators/monorepo/PobMonorepoGenerator.js

@@ -228,11 +228,6 @@ export default class PobMonorepoGenerator extends Generator {
       packagePaths: JSON.stringify(packagePaths),
     });
 
-    // packageUtils.addOrRemoveScripts(pkg, this.pobLernaConfig.documentation, {
-    //   'generate:test-coverage':
-    //     'lerna run --parallel --ignore "*-example" generate:test-coverage',
-    // });
-
     if (this.pobLernaConfig.documentation) {
       pkg.scripts.build = `${
         pkg.scripts.build ? `${pkg.scripts.build} && ` : ''

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

@@ -154,8 +154,6 @@ export default class MonorepoLernaGenerator extends Generator {
 
     const monorepoConfig = this.config.get('monorepo');
     const packageManager = this.npm ? 'npm' : 'yarn';
-    const useYarnWorkspacesCommand =
-      pkg.name === 'pob-monorepo' || pkg.name === 'nightingale-monorepo'; // this.options.packageManager === 'yarn';
 
     packageUtils.addScripts(pkg, {
       lint: `${packageManager} run lint:prettier && ${packageManager} run lint:eslint`,
@@ -174,7 +172,7 @@ export default class MonorepoLernaGenerator extends Generator {
           ? `NODE_OPTIONS=--max_old_space_size=4096 eslint --report-unused-disable-directives --resolve-plugins-relative-to . --quiet . --ignore-pattern ${pkg.workspaces.join(
               ',',
             )} && yarn workspaces foreach --parallel -Av run lint:eslint`
-          : 'lerna run --stream lint:eslint',
+          : 'npm run lint:eslint --workspaces',
     });
 
     this.fs.copyTpl(
@@ -193,16 +191,10 @@ export default class MonorepoLernaGenerator extends Generator {
     );
 
     packageUtils.addOrRemoveScripts(pkg, withBabel, {
-      build: `${
-        useYarnWorkspacesCommand
-          ? 'yarn workspaces foreach --parallel --topological-dev -Av run'
-          : 'lerna run --stream'
-      } build`,
-      watch: `${
-        useYarnWorkspacesCommand
-          ? 'yarn workspaces foreach --parallel --exclude "*-example" -Av run'
-          : 'lerna run --parallel --ignore "*-example"'
-      } watch`,
+      build:
+        'yarn workspaces foreach --parallel --topological-dev -Av run build',
+      watch:
+        'yarn workspaces foreach --parallel --jobs unlimited --interlaced --exclude "*-example" -Av run watch',
     });
 
     // packageUtils.addOrRemoveScripts(pkg, withTypescript, {

package/lib/generators/pob/PobBaseGenerator.js

@@ -82,7 +82,7 @@ export default class PobBaseGenerator extends Generator {
 
     if ('yarn2' in config) {
       if (config.yarn2) {
-        config.yarnNodeLinker = 'pnp';
+        config.yarnNodeLinker = 'node-modules';
       }
       delete config.yarn2;
     }

package/lib/pob.js

@@ -1,12 +1,10 @@
 #!/usr/bin/env node
 
-import { execSync, spawnSync } from 'child_process';
+import { spawnSync } from 'child_process';
 import fs, { existsSync, writeFileSync, readFileSync } from 'fs';
 import path from 'path';
 import argv from 'minimist-argv';
-// import updateNotifier from 'update-notifier';
 import yeoman from 'yeoman-environment';
-// import pkg from '../package.json';
 import PobAppGenerator from './generators/app/PobAppGenerator.js';
 import CommonBabelGenerator from './generators/common/babel/CommonBabelGenerator.js';
 import CommonLintGenerator from './generators/common/format-lint/CommonLintGenerator.js';
@@ -39,7 +37,6 @@ import { __dirname } from './pob-dirname.cjs';
 const printUsage = () => {
   console.error('Usage: pob [monorepo] [lib|app|init]');
   console.error('       pob [monorepo] update [--force]');
-  console.error('       pob monorepo convert-npm');
   console.error('       pob add <packageName>');
 };
 
@@ -60,8 +57,6 @@ if (argv.version) {
   process.exit(0);
 }
 
-// updateNotifier({ pkg }).notify();
-
 const env = yeoman.createEnv();
 
 env.on('error', (err) => {
@@ -250,16 +245,6 @@ if (action === 'add') {
   process.exit(0);
 }
 
-if (monorepo && action === 'convert-npm') {
-  execSync('sed -i \'/"npmClient": "yarn",/d\' ./lerna.json', {
-    stdio: 'inherit',
-  });
-  execSync('npm install packages/*', { stdio: 'inherit' });
-  execSync('yarn lerna link convert', { stdio: 'inherit' });
-  execSync('rm -Rf yarn.lock packages/*/yarn.lock', { stdio: 'inherit' });
-  process.exit(0);
-}
-
 const updateOnly = action === 'update';
 const init = action === 'init';
 const type = updateOnly || init ? null : action;

package/lib/utils/json5.js

@@ -1,7 +1,7 @@
 import JSON5 from 'json5';
 
 export function readJSON5(fs, destinationPath, defaults) {
-  const content = fs.read(destinationPath, null);
+  const content = fs.read(destinationPath, { defaults: null });
   if (content === null) return defaults;
   return JSON5.parse(content);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pob",
-  "version": "9.8.0",
+  "version": "9.11.0",
   "description": "Pile of bones, library generator with git/babel/typescript/typedoc/readme/jest",
   "keywords": [
     "skeleton"
@@ -47,8 +47,8 @@
     "@pob/sort-eslint-config": "^3.0.1",
     "@pob/sort-object": "^4.0.1",
     "@pob/sort-pkg": "^4.0.1",
-    "@yarnpkg/parsers": "2.5.0-rc.6",
-    "eslint": "8.4.1",
+    "@yarnpkg/parsers": "2.5.0-rc.7",
+    "eslint": "8.6.0",
     "findup-sync": "^5.0.0",
     "git-remote-url": "^1.0.1",
     "github-username": "^6.0.0",
@@ -57,16 +57,15 @@
     "json5": "^2.2.0",
     "lodash.camelcase": "^4.3.0",
     "lodash.kebabcase": "^4.1.1",
-    "mem-fs": "1.2.0",
-    "mem-fs-editor": "8.1.2",
+    "mem-fs": "2.2.1",
+    "mem-fs-editor": "9.4.0",
     "minimist-argv": "^1.1.0",
     "parse-author": "^2.0.0",
-    "pob-dependencies": "6.3.3",
+    "pob-dependencies": "6.6.0",
     "prettier": "2.5.1",
     "semver": "^7.3.4",
-    "update-notifier": "^5.0.1",
     "yeoman-environment": "^3.5.1",
     "yeoman-generator": "^5.4.0"
   },
-  "gitHead": "1c94efb8acec1f95aeeea9b673c22c56497b9fcd"
+  "gitHead": "5d8871a5277b29282db5599a9e2a6032275da8d1"
 }