pob 14.3.0 → 14.4.1

package/CHANGELOG.md

@@ -3,6 +3,40 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [14.4.1](https://github.com/christophehurpeau/pob/compare/pob@14.4.0...pob@14.4.1) (2023-10-18)
+
+**Note:** Version bump only for package pob
+
+
+
+
+
+## [14.4.0](https://github.com/christophehurpeau/pob/compare/pob@14.3.0...pob@14.4.0) (2023-10-18)
+
+
+### Features
+
+* **deps:** update @pob/eslint-config to v51.1.0 ([#1796](https://github.com/christophehurpeau/pob/issues/1796)) ([076afb2](https://github.com/christophehurpeau/pob/commit/076afb27c2225caa416d2160739dc408b6e0ca3a))
+* **deps:** update dependency @yeoman/types to v1.1.1 ([#1811](https://github.com/christophehurpeau/pob/issues/1811)) ([e258f5e](https://github.com/christophehurpeau/pob/commit/e258f5e718d7a5b4723b90d2aa1c1017609489e0))
+* **deps:** update dependency eslint to v8.51.0 ([#1802](https://github.com/christophehurpeau/pob/issues/1802)) ([a116098](https://github.com/christophehurpeau/pob/commit/a1160986eba0dd3be8f0b3ba2f08da2389156ba3))
+
+
+### Bug Fixes
+
+* change tsBuildInfoFile ([3807a34](https://github.com/christophehurpeau/pob/commit/3807a34652fa4f3b6aa6f1e88d0ce323af5d8265))
+* **deps:** update dependency @types/inquirer to v9.0.4 ([#1806](https://github.com/christophehurpeau/pob/issues/1806)) ([c4df08f](https://github.com/christophehurpeau/pob/commit/c4df08fb1ba7d9ec35f19e01405d2535d4410454))
+* **deps:** update dependency @types/inquirer to v9.0.5 ([#1821](https://github.com/christophehurpeau/pob/issues/1821)) ([6e6d1c0](https://github.com/christophehurpeau/pob/commit/6e6d1c0fea5e2e9fc059146ad5fb207dbfa5fe11))
+* **deps:** update dependency @types/inquirer to v9.0.6 ([#1823](https://github.com/christophehurpeau/pob/issues/1823)) ([d7414f2](https://github.com/christophehurpeau/pob/commit/d7414f2407a5feb6e4727d228a414906b12902b2))
+* **deps:** update dependency mem-fs-editor to v10.0.3 ([#1819](https://github.com/christophehurpeau/pob/issues/1819)) ([a7dfdfc](https://github.com/christophehurpeau/pob/commit/a7dfdfc962c73c7303f4fe89fe0fbc8c2f2a9639))
+* **deps:** update dependency yeoman-generator to v6.0.0-rc.6 ([#1808](https://github.com/christophehurpeau/pob/issues/1808)) ([a044760](https://github.com/christophehurpeau/pob/commit/a044760f7ab299c009fdd41451620f0b8d79be08))
+* **deps:** update yarn monorepo ([#1795](https://github.com/christophehurpeau/pob/issues/1795)) ([c893a31](https://github.com/christophehurpeau/pob/commit/c893a315a1e382e14c5270c4fdc3b3488ddefa30))
+* **pob:** bring back npmignore ([3ac3841](https://github.com/christophehurpeau/pob/commit/3ac38415362e8a6ba3c23db41f404287a82356eb))
+* **pob:** fix monorepo workspaces generator not called ([0baab7c](https://github.com/christophehurpeau/pob/commit/0baab7ccb430cc7f052b343b7d6989cb733a252c))
+* **pob:** fix package generator not working in monorepo ([1c63705](https://github.com/christophehurpeau/pob/commit/1c63705cd809fde7813ef7ac5d2a85c92a53693f))
+* run npm publish in parallel ([7f22704](https://github.com/christophehurpeau/pob/commit/7f22704e7f37c7f6d2907f620e21dcbf8b184fb4))
+
+
+
 ## [14.3.0](https://github.com/christophehurpeau/pob/compare/pob@14.2.0...pob@14.3.0) (2023-10-02)
 
 

package/lib/generators/app/PobAppGenerator.js

@@ -1,7 +1,7 @@
 import { execSync } from 'node:child_process';
 import { platform } from 'node:process';
 import Generator from 'yeoman-generator';
-import inLerna from '../../utils/inLerna.js';
+import inMonorepo from '../../utils/inMonorepo.js';
 import * as packageUtils from '../../utils/package.js';
 import { appIgnorePaths } from './ignorePaths.js';
 
@@ -119,7 +119,7 @@ export default class PobAppGenerator extends Generator {
         name: 'ci',
         message: 'Do you want ci ?',
         default: !config || config.ci === undefined ? true : config.ci,
-        when: () => !inLerna,
+        when: () => !inMonorepo,
       },
     ]);
 
@@ -150,7 +150,7 @@ export default class PobAppGenerator extends Generator {
 
     const pkg = this.fs.readJSON(this.destinationPath('package.json'));
 
-    if (!inLerna || inLerna.root) {
+    if (!inMonorepo || inMonorepo.root) {
       this.composeWith('pob:common:husky', {});
     }
 
@@ -207,7 +207,7 @@ export default class PobAppGenerator extends Generator {
     this.composeWith('pob:common:remove-old-dependencies');
 
     const enableReleasePlease =
-      !inLerna && this.appConfig.testing && this.appConfig.ci;
+      !inMonorepo && this.appConfig.testing && this.appConfig.ci;
 
     if (this.appConfig.type !== 'remix') {
       this.composeWith('pob:common:testing', {
@@ -243,7 +243,7 @@ export default class PobAppGenerator extends Generator {
       });
 
       this.composeWith('pob:common:release', {
-        enable: !inLerna && this.appConfig.testing && this.appConfig.ci,
+        enable: !inMonorepo && this.appConfig.testing && this.appConfig.ci,
         withBabel: babel,
         documentation: false,
         updateOnly: this.options.updateOnly,
@@ -251,7 +251,7 @@ export default class PobAppGenerator extends Generator {
     }
 
     this.composeWith('pob:core:vscode', {
-      root: !inLerna,
+      root: !inMonorepo,
       monorepo: false,
       packageManager: this.options.packageManager,
       yarnNodeLinker: this.options.yarnNodeLinker,
@@ -265,7 +265,7 @@ export default class PobAppGenerator extends Generator {
     }
 
     this.composeWith('pob:core:gitignore', {
-      root: !inLerna || inLerna.root,
+      root: !inMonorepo || inMonorepo.root,
       documentation: false,
       testing: this.appConfig.testing,
       withBabel: babel,

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

@@ -2,7 +2,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import Generator from 'yeoman-generator';
 import ensureJsonFileFormatted from '../../../utils/ensureJsonFileFormatted.js';
-import inLerna from '../../../utils/inLerna.js';
+import inMonorepo from '../../../utils/inMonorepo.js';
 import * as packageUtils from '../../../utils/package.js';
 import { writeAndFormatJson } from '../../../utils/writeAndFormat.js';
 import { appIgnorePaths } from '../../app/ignorePaths.js';
@@ -140,7 +140,7 @@ export default class CommonLintGenerator extends Generator {
 
     pkg.prettier = '@pob/root/prettier-config';
 
-    if (!inLerna || inLerna.root || this.options.monorepo) {
+    if (!inMonorepo || inMonorepo.root || this.options.monorepo) {
       const rootIgnorePatterns = new Set(
         this.options.rootIgnorePaths.split('\n').filter(Boolean),
       );
@@ -164,7 +164,7 @@ export default class CommonLintGenerator extends Generator {
         this.templatePath('prettierignore.ejs'),
         this.destinationPath('.prettierignore'),
         {
-          inRoot: !inLerna || inLerna.root || this.options.monorepo,
+          inRoot: !inMonorepo || inMonorepo.root || this.options.monorepo,
           documentation: this.options.documentation,
           packageManager: this.options.packageManager,
           yarnNodeLinker: this.options.yarnNodeLinker,
@@ -211,23 +211,26 @@ export default class CommonLintGenerator extends Generator {
       ]);
     }
 
-    const yoConfigPobMonorepo = inLerna && inLerna.pobMonorepoConfig;
+    const yoConfigPobMonorepo = inMonorepo && inMonorepo.pobMonorepoConfig;
     const globalEslint =
       this.options.monorepo ||
       (yoConfigPobMonorepo && yoConfigPobMonorepo.eslint !== false);
     const globalTesting = yoConfigPobMonorepo && yoConfigPobMonorepo.testing;
     const composite = yoConfigPobMonorepo && yoConfigPobMonorepo.typescript;
-    const { rootPackageManager, rootYarnNodeLinker } = inLerna || {};
+    const { rootPackageManager, rootYarnNodeLinker } = inMonorepo || {};
     const lernaProjectType =
-      inLerna.pobConfig &&
-      inLerna.pobConfig.project &&
-      inLerna.pobConfig.project.type;
+      inMonorepo.pobConfig &&
+      inMonorepo.pobConfig.project &&
+      inMonorepo.pobConfig.project.type;
 
     if (this.options.monorepo && !globalEslint) {
       throw new Error('Please enable global eslint');
     }
 
-    if (globalEslint && !((inLerna && inLerna.root) || this.options.monorepo)) {
+    if (
+      globalEslint &&
+      !((inMonorepo && inMonorepo.root) || this.options.monorepo)
+    ) {
       if (!pkg.name.startsWith('@pob/eslint-config')) {
         packageUtils.removeDevDependencies(
           pkg,
@@ -254,7 +257,7 @@ export default class CommonLintGenerator extends Generator {
       packageUtils.addOrRemoveDevDependencies(
         pkg,
         !globalEslint ||
-          (inLerna && inLerna.root) ||
+          (inMonorepo && inMonorepo.root) ||
           this.options.monorepo ||
           lernaProjectType === 'app' ||
           (rootPackageManager === 'yarn' &&
@@ -283,7 +286,7 @@ export default class CommonLintGenerator extends Generator {
           ['eslint-plugin-node'],
         );
 
-        if ((inLerna && inLerna.root) || this.options.monorepo) {
+        if ((inMonorepo && inMonorepo.root) || this.options.monorepo) {
           if (this.options.typescript) {
             packageUtils.updateDevDependenciesIfPresent(pkg, [
               '@pob/eslint-config-typescript',
@@ -418,15 +421,19 @@ export default class CommonLintGenerator extends Generator {
     const getRootIgnorePatterns = () => {
       const ignorePatterns = new Set();
 
-      if (inLerna && !inLerna.root && (this.options.typescript || pkg.types)) {
+      if (
+        inMonorepo &&
+        !inMonorepo.root &&
+        (this.options.typescript || pkg.types)
+      ) {
         ignorePatterns.add('*.d.ts');
       }
 
-      if (inLerna && inLerna.root && this.options.documentation) {
+      if (inMonorepo && inMonorepo.root && this.options.documentation) {
         ignorePatterns.add('/docs');
       }
 
-      if ((!inLerna || !inLerna.root) && useBabel) {
+      if ((!inMonorepo || !inMonorepo.root) && useBabel) {
         const buildPath = `/${this.options.buildDirectory}`;
         if (
           !this.options.rootIgnorePaths ||
@@ -435,7 +442,7 @@ export default class CommonLintGenerator extends Generator {
           ignorePatterns.add(buildPath);
         }
       }
-      if (inLerna && inLerna.root && this.options.typescript) {
+      if (inMonorepo && inMonorepo.root && this.options.typescript) {
         ignorePatterns.add('/rollup.config.mjs');
       }
 
@@ -478,7 +485,7 @@ export default class CommonLintGenerator extends Generator {
     }
     // no else: dont delete root eslintrc, src is root
 
-    if ((inLerna && inLerna.root) || this.options.monorepo) {
+    if ((inMonorepo && inMonorepo.root) || this.options.monorepo) {
       if (this.fs.exists(srcEslintrcPath)) {
         this.fs.delete(srcEslintrcPath);
       }
@@ -513,7 +520,7 @@ export default class CommonLintGenerator extends Generator {
                   }
                 : false,
             },
-            relativePath: inLerna ? inLerna.relative : undefined,
+            relativePath: inMonorepo ? inMonorepo.relative : undefined,
           },
         );
 
@@ -524,9 +531,9 @@ export default class CommonLintGenerator extends Generator {
     }
 
     // see monorepo/lerna/index.js
-    if (!(inLerna && inLerna.root) && !this.options.monorepo) {
+    if (!(inMonorepo && inMonorepo.root) && !this.options.monorepo) {
       const srcDirectory = useBabel ? 'src' : 'lib';
-      const lintRootJsFiles = (useBabel && useNode) || !inLerna;
+      const lintRootJsFiles = (useBabel && useNode) || !inMonorepo;
 
       const lintPaths = [srcDirectory, 'bin', 'scripts', 'migrations'].filter(
         (dir) => fs.existsSync(this.destinationPath(dir)),
@@ -548,7 +555,7 @@ export default class CommonLintGenerator extends Generator {
         lint: `${useBabel && !composite ? 'tsc && ' : ''}yarn run lint:eslint`,
       });
 
-      if (!inLerna) {
+      if (!inMonorepo) {
         pkg.scripts.lint = `yarn run lint:prettier && ${pkg.scripts.lint}`;
         packageUtils.addScripts(pkg, {
           'lint:prettier': 'pob-root-prettier --check .',

package/lib/generators/common/husky/CommonHuskyGenerator.js

@@ -1,6 +1,6 @@
 import { readlinkSync, rmSync } from 'node:fs';
 import Generator from 'yeoman-generator';
-import inLerna from '../../../utils/inLerna.js';
+import inMonorepo from '../../../utils/inMonorepo.js';
 import * as packageUtils from '../../../utils/package.js';
 
 export default class CommonHuskyGenerator extends Generator {
@@ -58,14 +58,14 @@ export default class CommonHuskyGenerator extends Generator {
     const pkg = this.fs.readJSON(this.destinationPath('package.json'));
     packageUtils.removeDevDependencies(pkg, ['husky']);
 
-    if (!inLerna || inLerna.root) {
+    if (!inMonorepo || inMonorepo.root) {
       if (pkg.name !== 'pob-monorepo') {
         packageUtils.removeDevDependencies(pkg, [
           '@pob/repo-config',
           'repository-check-dirty',
         ]);
         packageUtils.addDevDependencies(pkg, ['@pob/root']);
-        // packageUtils.addOrRemoveDevDependencies(pkg, inLerna, {
+        // packageUtils.addOrRemoveDevDependencies(pkg, inMonorepo, {
         //   '@commitlint/config-lerna-scopes': '6.1.3',
         // });
 

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

@@ -1,6 +1,6 @@
 import path from 'node:path';
 import Generator from 'yeoman-generator';
-import inLerna from '../../../utils/inLerna.js';
+import inMonorepo from '../../../utils/inMonorepo.js';
 import * as packageUtils from '../../../utils/package.js';
 import {
   copyAndFormatTpl,
@@ -110,7 +110,7 @@ export default class CommonTestingGenerator extends Generator {
   }
 
   default() {
-    if (!inLerna || inLerna.root) {
+    if (!inMonorepo || inMonorepo.root) {
       this.composeWith('pob:core:ci', {
         enable: this.options.ci,
         enableReleasePlease: this.options.enableReleasePlease,
@@ -146,7 +146,7 @@ export default class CommonTestingGenerator extends Generator {
       'pob-lcov-reporter',
     ]);
 
-    const yoConfigPobMonorepo = inLerna && inLerna.pobMonorepoConfig;
+    const yoConfigPobMonorepo = inMonorepo && inMonorepo.pobMonorepoConfig;
     const globalTesting = yoConfigPobMonorepo && yoConfigPobMonorepo.testing;
     const enableForMonorepo = this.options.monorepo && globalTesting;
     const transpileWithEsbuild = packageUtils.transpileWithEsbuild(pkg);
@@ -179,7 +179,7 @@ export default class CommonTestingGenerator extends Generator {
     }
 
     if (!this.options.enable) {
-      // if (inLerna) {
+      // if (inMonorepo) {
       //   if (pkg.scripts.test === 'echo "No tests"') {
       //     delete pkg.scripts.test;
       //   }
@@ -287,7 +287,7 @@ export default class CommonTestingGenerator extends Generator {
         const transpileWithBabel = packageUtils.transpileWithBabel(pkg);
 
         const shouldUseExperimentalVmModules =
-          pkg.type === 'module' && !inLerna;
+          pkg.type === 'module' && !inMonorepo;
 
         const testCommand =
           this.options.runner === 'jest'

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

@@ -1,6 +1,6 @@
 import { existsSync } from 'node:fs';
 import Generator from 'yeoman-generator';
-import inLerna from '../../../utils/inLerna.js';
+import inMonorepo from '../../../utils/inMonorepo.js';
 import * as packageUtils from '../../../utils/package.js';
 import { copyAndFormatTpl } from '../../../utils/writeAndFormat.js';
 
@@ -120,8 +120,8 @@ export default class CommonTypescriptGenerator extends Generator {
       // let monorepoPackageBuildReferences;
       let monorepoPackageSrcPaths;
 
-      if (inLerna && !inLerna.root) {
-        const yoConfig = inLerna.rootYoConfig;
+      if (inMonorepo && !inMonorepo.root) {
+        const yoConfig = inMonorepo.rootYoConfig;
 
         composite =
           yoConfig.pob &&
@@ -131,7 +131,7 @@ export default class CommonTypescriptGenerator extends Generator {
         if (composite) {
           packageUtils.addOrRemoveDevDependencies(
             pkg,
-            inLerna.rootPackageManager === 'yarn',
+            inMonorepo.rootPackageManager === 'yarn',
             ['typescript'],
           );
 
@@ -226,7 +226,7 @@ export default class CommonTypescriptGenerator extends Generator {
       //     this.templatePath('tsconfig.build.json.ejs'),
       //     tsconfigBuildPath,
       //     {
-      //       inMonorepo: inLerna && !inLerna.root,
+      //       inMonorepo: inMonorepo && !inMonorepo.root,
       //       jsx,
       //       composite,
       //       monorepoPackageSrcPaths,

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

@@ -17,8 +17,10 @@
     "newLine": "lf",
 <% if (emit) { -%>
     "outDir": "dist/definitions",
-    <% if (composite) { -%>
-    "tsBuildInfoFile": "dist/definitions/tsbuildinfo",
+    <% if (composite) {
+      // dont emit in dist/definitions to avoid publish to npm
+       -%>
+    "tsBuildInfoFile": "node_modules/.cache/tsc/tsbuildinfo",
     <% } -%>
 <% } else if (composite) { -%>
 <% if (cacheEnabled) { -%>

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

@@ -1,6 +1,6 @@
 import fs from 'node:fs';
 import Generator from 'yeoman-generator';
-import inLerna from '../../../utils/inLerna.js';
+import inMonorepo from '../../../utils/inMonorepo.js';
 import * as packageUtils from '../../../utils/package.js';
 import { copyAndFormatTpl } from '../../../utils/writeAndFormat.js';
 
@@ -155,9 +155,9 @@ export default class CoreCIGenerator extends Generator {
           publishSinglePackage: this.isReleasePleaseEnabled && !pkg.private,
           publishMonorepo:
             this.isReleasePleaseEnabled &&
-            inLerna &&
-            inLerna.root &&
-            inLerna.pobConfig?.project?.type === 'lib',
+            inMonorepo &&
+            inMonorepo.root &&
+            inMonorepo.pobConfig?.project?.type === 'lib',
         },
       );
 

package/lib/generators/core/npm/CoreNpmGenerator.js

@@ -1,6 +1,4 @@
-import fs from 'node:fs';
 import Generator from 'yeoman-generator';
-import inLerna from '../../../utils/inLerna.js';
 
 export default class CoreNpmGenerator extends Generator {
   constructor(args, opts) {
@@ -12,17 +10,18 @@ export default class CoreNpmGenerator extends Generator {
       default: true,
       desc: 'Enable npm',
     });
-    this.option('ci', {
-      type: Boolean,
-      required: false,
-      default: true,
-      desc: 'Enabled ci',
+
+    this.option('srcDirectory', {
+      type: String,
+      required: true,
+      default: 'lib',
+      desc: 'src directory to include in published files',
     });
-    this.option('testing', {
-      type: Boolean,
+
+    this.option('distDirectory', {
+      type: String,
       required: false,
-      default: true,
-      desc: 'Enabled testing',
+      desc: 'dist directory to include in published files',
     });
   }
 
@@ -30,25 +29,43 @@ export default class CoreNpmGenerator extends Generator {
     const pkg = this.fs.readJSON(this.destinationPath('package.json'), {});
 
     if (!pkg.private && this.options.enable) {
-      const babelEnvs = pkg.pob.babelEnvs || [];
-      const withBabel = babelEnvs.length > 0;
-
       this.fs.copyTpl(
         this.templatePath('npmignore.ejs'),
         this.destinationPath('.npmignore'),
-        {
-          inLerna,
-          ci: this.options.ci,
-          testing: this.options.testing,
-          babel: withBabel,
-          typedoc: pkg.devDependencies && pkg.devDependencies.typedoc,
-          yarn: fs.existsSync('.yarnrc.yml'),
-          npm: this.fs.exists('package-lock.json'),
-          codeclimate: this.fs.exists('.codeclimate.yml'),
-        },
+        {},
       );
     } else if (this.fs.exists(this.destinationPath('.npmignore'))) {
       this.fs.delete(this.destinationPath('.npmignore'));
     }
+
+    if (!pkg.private && this.options.enable) {
+      const files = new Set([
+        this.options.srcDirectory,
+        this.options.distDirectory,
+      ]);
+
+      if (pkg.bin) {
+        files.add('bin');
+      }
+
+      if (pkg.exports) {
+        Object.values(pkg.exports).forEach((value) => {
+          if (
+            typeof value === 'string' &&
+            value.startsWith('./') &&
+            value !== './package.json' &&
+            ![...files].some((file) => value.startsWith(`./${file}/`))
+          ) {
+            files.add(value.slice('./'.length));
+          }
+        });
+      }
+
+      pkg.files = [...files].filter(Boolean);
+    } else {
+      delete pkg.files;
+    }
+
+    this.fs.writeJSON(this.destinationPath('package.json'), pkg);
   }
 }

package/lib/generators/core/npm/templates/npmignore.ejs

@@ -1,55 +1 @@
-<% if (!inLerna && ci) { -%>
-/.husky
-<% } -%>
-<% if (!inLerna) { -%>
-/.github
-<% } -%>
-<% if (!inLerna && codeclimate) { -%>
-/.codeclimate.yml
-<% } -%>
-/build
-/docs
-/examples
-/samples
-/test
-/*.config.js
-/*.config.cjs
-/*.config.mjs
-<% if (babel) { -%>
-/tsconfig.json
-/dist/definitions/tsbuildinfo
-<% if (typedoc) { -%>
-/tsconfig.doc.json
-<% } -%>
-babel.config.json
-<% } -%>
-<% if (testing) { -%>
-__snapshots__
-/coverage
-<% } -%>
-.yo-rc.json
-<% if (!inLerna) { -%>
-/renovate.json
-<% if (yarn) { -%>
-/yarn.lock
-/.yarn
-/.yarnrc.yml
-/.pnp.*
-<% } -%>
-<% } -%>
-
-/.settings
-/.project
-/.idea
-/.vscode
-*.sublime-project
-*.sublime-workspace
-
-#*
-*$
-*.BAK
-*.bak
-*.log
-*.old
-*~
-.#*
+# keep an empty file to avoid using gitignore.

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

@@ -2,20 +2,27 @@ import fs from 'node:fs';
 import path from 'node:path';
 import askName from 'inquirer-npm-name';
 import Generator from 'yeoman-generator';
-import inLerna from '../../../utils/inLerna.js';
+import inMonorepo from '../../../utils/inMonorepo.js';
 import * as packageUtils from '../../../utils/package.js';
 
 export default class CorePackageGenerator extends Generator {
   constructor(args, opts) {
     super(args, opts);
 
-    this.option('monorepo', {
+    this.option('isMonorepo', {
       type: Boolean,
       required: true,
       default: false,
       desc: 'is monorepo',
     });
 
+    this.option('inMonorepo', {
+      type: Boolean,
+      required: true,
+      default: false,
+      desc: 'in monorepo',
+    });
+
     this.option('isRoot', {
       type: Boolean,
       required: true,
@@ -46,7 +53,7 @@ export default class CorePackageGenerator extends Generator {
     }
 
     if (!this.options.updateOnly) {
-      if (this.options.monorepo && this.options.isRoot) {
+      if (this.options.isMonorepo && this.options.isRoot) {
         pkg.private = true;
       } else if (this.options.private) {
         pkg.private = true;
@@ -65,7 +72,7 @@ export default class CorePackageGenerator extends Generator {
       }
     }
 
-    if (this.options.monorepo && this.options.isRoot) {
+    if (this.options.isMonorepo && this.options.isRoot) {
       if (!pkg.name) {
         const { name } = await this.prompt({
           name: 'name',
@@ -96,7 +103,7 @@ export default class CorePackageGenerator extends Generator {
     const props = await this.prompt(
       [
         !this.options.updateOnly &&
-          !(this.options.monorepo && this.options.isRoot) && {
+          !(this.options.isMonorepo && this.options.isRoot) && {
             name: 'description',
             message: 'Description',
             default: pkg.description,
@@ -136,7 +143,11 @@ export default class CorePackageGenerator extends Generator {
     );
 
     if (!pkg.type) pkg.type = props.type;
-    if (inLerna && !inLerna.root && inLerna.rootMonorepoPkg.type === 'module') {
+    if (
+      inMonorepo &&
+      !inMonorepo.root &&
+      inMonorepo.rootMonorepoPkg.type === 'module'
+    ) {
       pkg.type = 'module';
     }
 
@@ -144,8 +155,8 @@ export default class CorePackageGenerator extends Generator {
       ? pkg.description
       : props.description || pkg.description;
 
-    if (this.options.monorepo && !this.options.isRoot) {
-      const rootMonorepoPkg = inLerna.rootMonorepoPkg;
+    if (this.options.inMonorepo && !this.options.isRoot) {
+      const rootMonorepoPkg = inMonorepo.rootMonorepoPkg;
       const rootRepositoryUrl =
         typeof rootMonorepoPkg.repository === 'string'
           ? rootMonorepoPkg.repository
@@ -153,7 +164,7 @@ export default class CorePackageGenerator extends Generator {
       pkg.repository = {
         type: 'git',
         url: rootRepositoryUrl,
-        directory: process.cwd().slice(inLerna.rootPath.length + 1),
+        directory: process.cwd().slice(inMonorepo.rootPath.length + 1),
       };
       pkg.homepage = rootMonorepoPkg.homepage;
 
@@ -165,9 +176,9 @@ export default class CorePackageGenerator extends Generator {
       fs.unlinkSync(this.destinationPath('yarn-error.log'));
     }
 
-    if (this.options.monorepo && !this.options.isRoot) {
+    if (this.options.inMonorepo && !this.options.isRoot) {
       packageUtils.removeScripts(pkg, ['checks']);
-    } else if (this.options.monorepo && this.options.isRoot) {
+    } else if (this.options.isMonorepo && this.options.isRoot) {
       const doesMjsCheckPackagesExists = this.fs.exists(
         this.destinationPath('scripts/check-packages.mjs'),
       );
@@ -193,7 +204,7 @@ export default class CorePackageGenerator extends Generator {
           }`,
         },
       );
-    } else if (inLerna && !inLerna.root) {
+    } else if (inMonorepo && !inMonorepo.root) {
       if (this.fs.exists('scripts/check-package.js')) {
         this.fs.delete('scripts/check-package.js');
       }
@@ -303,7 +314,7 @@ export default class CorePackageGenerator extends Generator {
         }
       }
     };
-    if (this.options.monorepo || inLerna || pkg.private) {
+    if (this.options.inMonorepo || inMonorepo || pkg.private) {
       uninstallPostinstallScript('postinstallDev');
       if (this.options.isRoot) {
         installPostinstallScript('postinstall');

package/lib/generators/core/renovate/CoreRenovateGenerator.js

@@ -1,5 +1,5 @@
 import Generator from 'yeoman-generator';
-import inLerna from '../../../utils/inLerna.js';
+import inMonorepo from '../../../utils/inMonorepo.js';
 import { writeAndFormatJson } from '../../../utils/writeAndFormat.js';
 
 export default class CoreRenovateGenerator extends Generator {
@@ -29,7 +29,7 @@ export default class CoreRenovateGenerator extends Generator {
   }
 
   initializing() {
-    if (inLerna && !inLerna.root) {
+    if (inMonorepo && !inMonorepo.root) {
       this.enableRenovate = false;
       this.config.delete('renovate');
       return;
@@ -39,7 +39,7 @@ export default class CoreRenovateGenerator extends Generator {
   }
 
   async prompting() {
-    if (inLerna && !inLerna.root) {
+    if (inMonorepo && !inMonorepo.root) {
       return;
     }
 

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

@@ -2,7 +2,7 @@ import fs from 'node:fs';
 import yml from 'js-yaml';
 import Generator from 'yeoman-generator';
 import ensureJsonFileFormatted from '../../../utils/ensureJsonFileFormatted.js';
-import inLerna from '../../../utils/inLerna.js';
+import inMonorepo from '../../../utils/inMonorepo.js';
 import * as packageUtils from '../../../utils/package.js';
 import { writeAndFormat } from '../../../utils/writeAndFormat.js';
 
@@ -97,7 +97,7 @@ export default class CoreYarnGenerator extends Generator {
       const workspacesPluginName = '@yarnpkg/plugin-workspace-tools';
       const versionPluginName = '@yarnpkg/plugin-conventional-version';
 
-      if (!inLerna && !pkg.private) {
+      if (!inMonorepo && !pkg.private) {
         installPluginIfNotInstalled(
           postinstallDevPluginName,
           'https://raw.githubusercontent.com/sachinraja/yarn-plugin-postinstall-dev/main/bundles/%40yarnpkg/plugin-postinstall-dev.js',

package/lib/generators/lib/PobLibGenerator.js

@@ -1,6 +1,6 @@
 import fs, { rmSync } from 'node:fs';
 import Generator from 'yeoman-generator';
-import inLerna from '../../utils/inLerna.js';
+import inMonorepo from '../../utils/inMonorepo.js';
 import * as packageUtils from '../../utils/package.js';
 
 export default class PobLibGenerator extends Generator {
@@ -164,7 +164,7 @@ export default class PobLibGenerator extends Generator {
     const pkg = this.fs.readJSON(this.destinationPath('package.json'));
 
     // documentation
-    if (inLerna && !inLerna.root) {
+    if (inMonorepo && !inMonorepo.root) {
       this.pobjson.documentation = false;
     } else if (!this.updateOnly) {
       const answers = await this.prompt([
@@ -209,7 +209,7 @@ export default class PobLibGenerator extends Generator {
       });
       this.pobjson.testing = !testing ? false : this.pobjson.testing || {};
 
-      if (this.pobjson.testing && !(inLerna || inLerna.root)) {
+      if (this.pobjson.testing && !(inMonorepo || inMonorepo.root)) {
         const testingPrompts = await this.prompt([
           {
             type: 'confirm',
@@ -229,16 +229,16 @@ export default class PobLibGenerator extends Generator {
     }
 
     this.fs.writeJSON(this.destinationPath('package.json'), pkg);
-  }
 
-  default() {
     this.composeWith('pob:common:babel', {
       updateOnly: this.options.updateOnly,
       testing: !!this.pobjson.testing,
       documentation: !!this.pobjson.documentation,
       fromPob: this.options.fromPob,
     });
+  }
 
+  default() {
     const pkg = this.fs.readJSON(this.destinationPath('package.json'));
     const babelEnvs = pkg.pob.babelEnvs || [];
 
@@ -267,7 +267,7 @@ export default class PobLibGenerator extends Generator {
     this.composeWith('pob:common:remove-old-dependencies');
 
     const enableReleasePlease =
-      !inLerna && this.pobjson.testing && this.pobjson.testing.ci;
+      !inMonorepo && this.pobjson.testing && this.pobjson.testing.ci;
 
     this.composeWith('pob:common:testing', {
       enable: this.pobjson.testing,
@@ -312,14 +312,14 @@ export default class PobLibGenerator extends Generator {
     });
 
     this.composeWith('pob:common:release', {
-      enable: !inLerna && this.pobjson.testing && this.pobjson.testing.ci,
+      enable: !inMonorepo && this.pobjson.testing && this.pobjson.testing.ci,
       withBabel: babelEnvs.length > 0,
       documentation: !!this.pobjson.documentation,
       updateOnly: this.options.updateOnly,
     });
 
     this.composeWith('pob:core:vscode', {
-      root: !inLerna,
+      root: !inMonorepo,
       monorepo: false,
       packageManager: this.options.packageManager,
       yarnNodeLinker: this.options.yarnNodeLinker,
@@ -329,7 +329,7 @@ export default class PobLibGenerator extends Generator {
 
     // must be after doc, testing
     this.composeWith('pob:core:gitignore', {
-      root: !inLerna,
+      root: !inMonorepo,
       withBabel: babelEnvs.length > 0,
       typescript: babelEnvs.length > 0,
       documentation: this.pobjson.documentation,
@@ -338,8 +338,8 @@ export default class PobLibGenerator extends Generator {
 
     this.composeWith('pob:core:npm', {
       enable: !pkg.private,
-      testing: !!this.pobjson.testing,
-      ci: this.pobjson.testing && this.pobjson.testing.ci,
+      srcDirectory: withBabel ? 'src' : 'lib',
+      distDirectory: withBabel ? 'dist' : '',
     });
   }
 
@@ -358,7 +358,7 @@ export default class PobLibGenerator extends Generator {
     const withBabel = Boolean(pkg.pob.babelEnvs);
 
     packageUtils.removeDevDependencies(pkg, ['lerna', '@pob/lerna-light']);
-    if (inLerna) {
+    if (inMonorepo) {
       if (pkg.scripts) {
         if (pkg.name !== 'pob-dependencies') {
           delete pkg.scripts.preversion;

package/lib/generators/lib/doc/LibDocGenerator.js

@@ -1,5 +1,5 @@
 import Generator from 'yeoman-generator';
-import inLerna from '../../../utils/inLerna.js';
+import inMonorepo from '../../../utils/inMonorepo.js';
 import * as packageUtils from '../../../utils/package.js';
 import { copyAndFormatTpl } from '../../../utils/writeAndFormat.js';
 
@@ -50,7 +50,7 @@ export default class LibDocGenerator extends Generator {
           ? pkg.pob.jsx
           : packageUtils.hasReact(pkg);
 
-      if (inLerna && inLerna.root) {
+      if (inMonorepo && inMonorepo.root) {
         const existingConfig = this.fs.readJSON(
           this.destinationPath('tsconfig.doc.json'),
           { typedocOptions: {} },
@@ -133,12 +133,12 @@ export default class LibDocGenerator extends Generator {
 
     // packageUtils.addOrRemoveDevDependencies(
     //   pkg,
-    //   this.options.enabled && inLerna && inLerna.root,
+    //   this.options.enabled && inMonorepo && inMonorepo.root,
     //   ['@chrp/typedoc-plugin-lerna-packages'],
     // );
     // packageUtils.addOrRemoveDependenciesMeta(
     //   pkg,
-    //   this.options.enabled && inLerna && inLerna.root,
+    //   this.options.enabled && inMonorepo && inMonorepo.root,
     //   {
     //     'typedoc-neo-theme': {
     //       unplugged: true,

package/lib/generators/lib/readme/LibReadmeGenerator.js

@@ -1,6 +1,6 @@
 import camelCase from 'lodash.camelcase';
 import Generator from 'yeoman-generator';
-import inLerna from '../../../utils/inLerna.js';
+import inMonorepo from '../../../utils/inMonorepo.js';
 import * as packageUtils from '../../../utils/package.js';
 import { copyAndFormatTpl } from '../../../utils/writeAndFormat.js';
 
@@ -81,7 +81,7 @@ export default class LibReadmeGenerator extends Generator {
           packageName: pkg.name,
           camelCaseProjectName: camelCase(pkg.name),
           description: pkg.description,
-          inLerna,
+          inMonorepo,
           gitHost,
           gitAccount,
           gitName,

package/lib/generators/monorepo/workspaces/MonorepoWorkspacesGenerator.js

@@ -4,7 +4,7 @@ import Generator from 'yeoman-generator';
 import * as packageUtils from '../../../utils/package.js';
 import { copyAndFormatTpl } from '../../../utils/writeAndFormat.js';
 
-export default class MonorepoLernaGenerator extends Generator {
+export default class MonorepoWorkspacesGenerator extends Generator {
   constructor(args, opts) {
     super(args, opts);
 

package/lib/generators/monorepo/workspaces/templates/workflow-publish.yml.ejs

@@ -74,7 +74,7 @@ jobs:
           fi
           echo >> ./.yarnrc.yml
           echo "npmAuthToken: $NODE_AUTH_TOKEN" >> ./.yarnrc.yml
-          yarn workspaces foreach --no-private npm publish --tolerate-republish
+          yarn workspaces foreach --parallel --no-private npm publish --tolerate-republish
         if: github.ref == 'refs/heads/main' && !inputs.dry-run
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

package/lib/generators/pob/PobBaseGenerator.js

@@ -1,20 +1,13 @@
 import { fileURLToPath } from 'node:url';
 import Generator from 'yeoman-generator';
 import ensureJsonFileFormatted from '../../utils/ensureJsonFileFormatted.js';
-import inLerna from '../../utils/inLerna.js';
+import inMonorepo from '../../utils/inMonorepo.js';
 import * as packageUtils from '../../utils/package.js';
 
 export default class PobBaseGenerator extends Generator {
   constructor(args, opts) {
     super(args, opts, { customInstallTask: true });
 
-    /** @deprecated use monorepo option instead */
-    this.option('lerna', {
-      type: Boolean,
-      required: false,
-      desc: 'Lerna monorepo',
-    });
-
     this.option('monorepo', {
       type: Boolean,
       required: false,
@@ -54,14 +47,14 @@ export default class PobBaseGenerator extends Generator {
     // prettier package.json to ensure diff is correct
     ensureJsonFileFormatted(this.destinationPath('package.json'));
 
-    if (this.options.monorepo || this.options.lerna) {
-      this.useLerna = true;
-      this.inLerna = false;
+    if (this.options.monorepo) {
+      this.isMonorepo = true;
+      this.hasAncestor = false;
       this.isRoot = true;
     } else {
-      this.useLerna = inLerna && inLerna.root;
-      this.inLerna = inLerna && !inLerna.root;
-      this.isRoot = !inLerna || this.useLerna;
+      this.isMonorepo = inMonorepo && inMonorepo.root;
+      this.hasAncestor = inMonorepo && !inMonorepo.root;
+      this.isRoot = !inMonorepo || this.isMonorepo;
     }
   }
 
@@ -130,12 +123,13 @@ export default class PobBaseGenerator extends Generator {
 
     this.composeWith('pob:core:package', {
       updateOnly: this.options.updateOnly,
-      private: this.useLerna,
-      monorepo: this.useLerna,
+      private: this.isMonorepo,
+      isMonorepo: this.isMonorepo,
+      inMonorepo: !!inMonorepo,
       isRoot: this.isRoot,
     });
 
-    if (this.useLerna) {
+    if (this.isMonorepo) {
       this.composeWith('pob:monorepo:workspaces', {
         force: this.options.force,
         isAppProject: this.projectConfig.type === 'app',
@@ -166,13 +160,13 @@ export default class PobBaseGenerator extends Generator {
 
     const onlyLatestLTS =
       this.projectConfig.type === 'app' ||
-      (inLerna &&
-        (inLerna.pobConfig?.project?.supportsNode14 === false ||
-          inLerna.pobConfig?.project?.onlyLatestLTS === true));
+      (inMonorepo &&
+        (inMonorepo.pobConfig?.project?.supportsNode14 === false ||
+          inMonorepo.pobConfig?.project?.onlyLatestLTS === true));
 
-    if (!this.inLerna) {
+    if (!this.hasAncestor) {
       const splitCIJobs =
-        inLerna && inLerna.pobMonorepoConfig?.packageNames.length > 8;
+        inMonorepo && inMonorepo.pobMonorepoConfig?.packageNames.length > 8;
       this.composeWith('pob:core:git', {
         onlyLatestLTS,
         splitCIJobs,
@@ -197,7 +191,7 @@ export default class PobBaseGenerator extends Generator {
       this.fs.writeJSON(this.destinationPath('package.json'), pkg);
     }
 
-    if (this.useLerna) {
+    if (this.isMonorepo) {
       this.composeWith(
         // pob:monorepo <= for searching PobMonorepoGenerator.js
         fileURLToPath(
@@ -216,7 +210,7 @@ export default class PobBaseGenerator extends Generator {
       switch (this.projectConfig.type) {
         case 'lib':
           this.composeWith('pob:lib', {
-            monorepo: this.useLerna,
+            monorepo: this.isMonorepo,
             isRoot: this.isRoot,
             disableYarnGitCache: this.projectConfig.disableYarnGitCache,
             updateOnly: this.options.updateOnly,
@@ -227,7 +221,7 @@ export default class PobBaseGenerator extends Generator {
           break;
         case 'app':
           this.composeWith('pob:app', {
-            monorepo: this.useLerna,
+            monorepo: this.isMonorepo,
             isRoot: this.isRoot,
             disableYarnGitCache: this.projectConfig.disableYarnGitCache,
             updateOnly: this.options.updateOnly,
@@ -256,7 +250,7 @@ export default class PobBaseGenerator extends Generator {
   }
 
   end() {
-    if (this.useLerna && !this.options.updateOnly) {
+    if (this.isMonorepo && !this.options.updateOnly) {
       console.log('To create a new lerna package: ');
       console.log(' pob add <packageName>');
     }

package/lib/pob.js

@@ -38,6 +38,7 @@ import LibDocGenerator from './generators/lib/doc/LibDocGenerator.js';
 import LibReadmeGenerator from './generators/lib/readme/LibReadmeGenerator.js';
 import MonorepoLernaGenerator from './generators/monorepo/lerna/MonorepoLernaGenerator.js';
 import MonorepoTypescriptGenerator from './generators/monorepo/typescript/MonorepoTypescriptGenerator.js';
+import MonorepoWorkspacesGenerator from './generators/monorepo/workspaces/MonorepoWorkspacesGenerator.js';
 import PobBaseGenerator from './generators/pob/PobBaseGenerator.js';
 import { __dirname } from './pob-dirname.cjs';
 
@@ -208,7 +209,7 @@ env.registerStub(
   `${__dirname}/generators/lib/readme/LibReadmeGenerator.js`,
 );
 env.registerStub(
-  MonorepoLernaGenerator,
+  MonorepoWorkspacesGenerator,
   'pob:monorepo:workspaces',
   `${__dirname}/generators/monorepo/workspaces/MonorepoWorkspacesGenerator.js`,
 );

package/lib/utils/{inLerna.js → inMonorepo.js}

@@ -2,7 +2,6 @@ import fs from 'node:fs';
 import path from 'node:path';
 import findup from 'findup-sync';
 
-const lernaJsonPath = findup('lerna.json');
 const lintStagedConfigPath = findup('lint-staged.config.js');
 const lintStagedConfigCjsPath = findup('lint-staged.config.cjs');
 
@@ -15,7 +14,7 @@ const rootMonorepoPkg =
   rootMonorepo &&
   JSON.parse(fs.readFileSync(path.resolve(rootMonorepo, 'package.json')));
 
-const getInLernaThings = () => {
+const getInMonorepoThings = () => {
   const rootYoConfig = JSON.parse(
     fs.readFileSync(path.resolve(rootMonorepo, '.yo-rc.json')),
   );
@@ -23,7 +22,6 @@ const getInLernaThings = () => {
 
   return {
     rootMonorepoPkg,
-    lernaJsonPath: lernaJsonPath || path.resolve('lerna.json'),
     rootPath: rootMonorepo,
     root: rootMonorepo === cwd,
     rootPackageManager:
@@ -49,7 +47,7 @@ const getInLernaThings = () => {
 
 export default !(
   rootMonorepoPkg &&
-  (rootMonorepoPkg.workspaces || rootMonorepoPkg.lerna || !!lernaJsonPath)
+  (rootMonorepoPkg.workspaces || rootMonorepoPkg.lerna)
 )
   ? false
-  : getInLernaThings();
+  : getInMonorepoThings();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pob",
-  "version": "14.3.0",
+  "version": "14.4.1",
   "description": "Pile of bones, library generator with git/babel/typescript/typedoc/readme/jest",
   "keywords": [
     "skeleton"
@@ -27,6 +27,10 @@
   },
   "sideEffects": false,
   "bin": "./lib/pob.js",
+  "files": [
+    "lib",
+    "bin"
+  ],
   "scripts": {
     "clean:build": "true",
     "format": "prettier --write",
@@ -36,18 +40,18 @@
   "prettier": "@pob/root/prettier-config",
   "pob": {},
   "dependencies": {
-    "@pob/eslint-config": "51.0.2",
-    "@pob/eslint-config-typescript": "51.0.2",
-    "@pob/eslint-config-typescript-react": "51.0.2",
-    "@pob/sort-eslint-config": "5.0.1",
-    "@pob/sort-object": "6.0.1",
-    "@pob/sort-pkg": "6.0.1",
-    "@types/inquirer": "9.0.3",
-    "@yarnpkg/cli": "3.6.3",
-    "@yarnpkg/core": "3.5.3",
+    "@pob/eslint-config": "51.1.0",
+    "@pob/eslint-config-typescript": "51.1.0",
+    "@pob/eslint-config-typescript-react": "51.1.0",
+    "@pob/sort-eslint-config": "5.0.2",
+    "@pob/sort-object": "6.0.2",
+    "@pob/sort-pkg": "6.0.2",
+    "@types/inquirer": "9.0.6",
+    "@yarnpkg/cli": "3.6.4",
+    "@yarnpkg/core": "3.5.4",
     "@yarnpkg/fslib": "2.10.3",
-    "@yeoman/types": "1.0.1",
-    "eslint": "8.50.0",
+    "@yeoman/types": "1.1.1",
+    "eslint": "8.51.0",
     "findup-sync": "^5.0.0",
     "git-remote-url": "^1.0.1",
     "github-username": "^7.0.0",
@@ -57,17 +61,17 @@
     "lodash.camelcase": "^4.3.0",
     "lodash.kebabcase": "^4.1.1",
     "mem-fs": "3.0.0",
-    "mem-fs-editor": "10.0.2",
+    "mem-fs-editor": "10.0.3",
     "minimist": "1.2.8",
     "parse-author": "2.0.0",
-    "pob-dependencies": "8.6.1",
+    "pob-dependencies": "8.7.0",
     "prettier": "2.8.8",
     "semver": "7.5.4",
-    "yarn-workspace-utils": "1.0.1",
+    "yarn-workspace-utils": "1.0.2",
     "yeoman-environment": "4.0.0-beta.5",
-    "yeoman-generator": "6.0.0-rc.5"
+    "yeoman-generator": "6.0.0-rc.6"
   },
   "devDependencies": {
-    "@pob/root": "8.3.2"
+    "@pob/root": "8.4.1"
   }
 }

package/.editorconfig

@@ -1,13 +0,0 @@
-# EditorConfig helps developers define and maintain consistent
-# coding styles between different editors and IDEs
-# http://editorconfig.org
-
-root = true
-
-[*]
-indent_style = space
-indent_size = 2
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true

package/.eslintrc.json

@@ -1,4 +0,0 @@
-{
-  "root": true,
-  "extends": ["@pob/eslint-config/root-module"]
-}

package/AUTHORS

@@ -1 +0,0 @@
-Christophe Hurpeau <christophe@hurpeau.com>

package/lib/utils/inNpmLerna.js

@@ -1,5 +0,0 @@
-import { readFileSync } from 'node:fs';
-import inLerna from './inLerna.js';
-
-export default inLerna &&
-  JSON.parse(readFileSync(inLerna.lernaJsonPath)).npmClient !== 'yarn';