pob 14.0.1 → 14.2.0

package/CHANGELOG.md

@@ -3,6 +3,39 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [14.2.0](https://github.com/christophehurpeau/pob/compare/pob@14.1.0...pob@14.2.0) (2023-09-30)
+
+
+### Features
+
+* improve monorepo detection ([c7e43ef](https://github.com/christophehurpeau/pob/commit/c7e43efd767e1cc7d786c22f47796fc5106be84b))
+* **pob:** split yarn workspaces and legacy lerna ; use yarn to build graph ([4f3f77a](https://github.com/christophehurpeau/pob/commit/4f3f77a60a4e755815a836f76d53624573edcff4))
+
+
+### Bug Fixes
+
+* **deps:** update @pob/eslint-config to v51.0.2 ([#1718](https://github.com/christophehurpeau/pob/issues/1718)) ([18a8330](https://github.com/christophehurpeau/pob/commit/18a8330c54729273d091cfbe49e387916fbde3ba))
+* **deps:** update dependency yeoman-environment to v4.0.0-beta.5 ([#1785](https://github.com/christophehurpeau/pob/issues/1785)) ([deb0019](https://github.com/christophehurpeau/pob/commit/deb00197a177fdddb1037538969351ed8f2e1925))
+* **deps:** update dependency yeoman-generator to v6.0.0-rc.5 ([#1786](https://github.com/christophehurpeau/pob/issues/1786)) ([6ebbde9](https://github.com/christophehurpeau/pob/commit/6ebbde9db265b44e8807fd4a83526b49984e5d33))
+
+
+
+## [14.1.0](https://github.com/christophehurpeau/pob/compare/pob@14.0.1...pob@14.1.0) (2023-09-24)
+
+
+### Features
+
+* add option to disable yarn cache ([761436f](https://github.com/christophehurpeau/pob/commit/761436fb7946c52a4d02b61b5c81ea122d64dc05))
+* **deps:** update dependency eslint to v8.50.0 ([#1778](https://github.com/christophehurpeau/pob/issues/1778)) ([9002346](https://github.com/christophehurpeau/pob/commit/9002346e6f50bf455a47e63141d2f4fdf8689f8e))
+* update actions/checkout ([f040a5d](https://github.com/christophehurpeau/pob/commit/f040a5d3a87d8e3f5b5ae890ec49db37e435d22b))
+
+
+### Bug Fixes
+
+* add missing options to disable yarn cache ([2138584](https://github.com/christophehurpeau/pob/commit/21385841d31755f44a5661a282d094dc994f7404))
+
+
+
 ## [14.0.1](https://github.com/christophehurpeau/pob/compare/pob@14.0.0...pob@14.0.1) (2023-09-18)
 
 

package/lib/generators/app/PobAppGenerator.js

@@ -44,6 +44,13 @@ export default class PobAppGenerator extends Generator {
       default: 'node-modules',
       desc: 'Defines what linker should be used for installing Node packages (useful to enable the node-modules plugin), one of: pnp, node-modules.',
     });
+
+    this.option('disableYarnGitCache', {
+      type: Boolean,
+      required: false,
+      default: false,
+      desc: 'Disable git cache. See https://yarnpkg.com/features/caching#offline-mirror.',
+    });
   }
 
   initializing() {
@@ -205,6 +212,7 @@ export default class PobAppGenerator extends Generator {
     if (this.appConfig.type !== 'remix') {
       this.composeWith('pob:common:testing', {
         enable: this.appConfig.testing,
+        disableYarnGitCache: this.options.disableYarnGitCache,
         enableReleasePlease,
         testing: this.appConfig.testing,
         typescript: babel,

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

@@ -100,6 +100,13 @@ export default class CommonTestingGenerator extends Generator {
       default: 'src',
       desc: 'customize srcDir, if different than rootDir',
     });
+
+    this.option('disableYarnGitCache', {
+      type: Boolean,
+      required: false,
+      default: false,
+      desc: 'Disable git cache. See https://yarnpkg.com/features/caching#offline-mirror.',
+    });
   }
 
   default() {
@@ -108,6 +115,7 @@ export default class CommonTestingGenerator extends Generator {
         enable: this.options.ci,
         enableReleasePlease: this.options.enableReleasePlease,
         enableYarnVersion: this.options.enableYarnVersion,
+        disableYarnGitCache: this.options.disableYarnGitCache,
         testing: this.options.enable,
         build: this.options.build,
         typescript: this.options.typescript,

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

@@ -87,6 +87,13 @@ export default class CoreCIGenerator extends Generator {
       required: true,
       desc: 'split CI jobs for faster result',
     });
+
+    this.option('disableYarnGitCache', {
+      type: Boolean,
+      required: false,
+      default: false,
+      desc: 'Disable git cache. See https://yarnpkg.com/features/caching#offline-mirror.',
+    });
   }
 
   async prompting() {
@@ -136,6 +143,7 @@ export default class CoreCIGenerator extends Generator {
         this.destinationPath('.github/workflows/push.yml'),
         {
           packageManager: this.options.packageManager,
+          disableYarnGitCache: this.options.disableYarnGitCache,
           testing,
           checks,
           documentation: this.options.documentation,
@@ -184,6 +192,7 @@ export default class CoreCIGenerator extends Generator {
         this.destinationPath('.github/workflows/gh-pages.yml'),
         {
           packageManager: this.options.packageManager,
+          disableYarnGitCache: this.options.disableYarnGitCache,
           testing: this.options.testing,
           typedoc: this.options.documentation && this.options.typescript,
         },

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

@@ -8,14 +8,18 @@ jobs:
   create-documentation-and-deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: actions/setup-node@v3
         with:
           node-version: 18
 
       - name: Install Dependencies
+<% if (disableYarnGitCache) { -%>
+        run: yarn install --immutable
+<% } else { -%>
         run: yarn install --immutable --immutable-cache
+<% } -%>
 
 <% if (typedoc) { -%>
       - name: Run tsc for tsc cache

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

@@ -8,14 +8,18 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: actions/setup-node@v3
         with:
           node-version: 18
 
       - name: Install Dependencies
+<% if (disableYarnGitCache) { -%>
+        run: yarn install --immutable
+<% } else { -%>
         run: yarn install --immutable --immutable-cache
+<% } -%>
 
       - name: Checks
         run: yarn run checks
@@ -26,14 +30,18 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: actions/setup-node@v3
         with:
           node-version: 18
 
       - name: Install Dependencies
+<% if (disableYarnGitCache) { -%>
+        run: yarn install --immutable
+<% } else { -%>
         run: yarn install --immutable --immutable-cache
+<% } -%>
 
       - name: Build
         run: yarn run build
@@ -46,14 +54,18 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: actions/setup-node@v3
         with:
           node-version: 18
 
       - name: Install Dependencies
+<% if (disableYarnGitCache) { -%>
+        run: yarn install --immutable
+<% } else { -%>
         run: yarn install --immutable --immutable-cache
+<% } -%>
 
       - name: Prettier
         run: yarn run lint:prettier
@@ -75,14 +87,18 @@ jobs:
         node-version: [18, 20]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
 
       - name: Install Dependencies
+<% if (disableYarnGitCache) { -%>
+        run: yarn install --immutable
+<% } else { -%>
         run: yarn install --immutable --immutable-cache
+<% } -%>
 
 <% if (codecov) { -%>
       - name: Test
@@ -111,7 +127,7 @@ jobs:
     needs: [<%= checks ? '"checks", ' : '' -%><%= build ? '"build", ' : '' -%>"lint"<%= testing ? ', "test"' : '' -%>]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: actions/setup-node@v3
         with:

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

@@ -11,7 +11,7 @@ jobs:
         node-version: [18.x<% if (!onlyLatestLTS) { -%>, 20.x <% } -%>]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3
@@ -21,7 +21,11 @@ jobs:
 
 <% if (packageManager === 'yarn') { -%>
       - name: Install Dependencies
+<% if (disableYarnGitCache) { -%>
+        run: yarn install --immutable
+<% } else { -%>
         run: yarn install --immutable --immutable-cache
+<% } -%>
 <% } else if (packageManager === 'npm') { -%>
       - name: Install Dependencies
         run: npm ci

package/lib/generators/core/git/CoreGitGenerator.js

@@ -42,7 +42,6 @@ export default class CoreGitGenerator extends Generator {
       originUrl &&
       typeof originUrl === 'string' &&
       originUrl.match(
-        // eslint-disable-next-line unicorn/no-unsafe-regex
         /^(?:git@|https?:\/\/)(?:([^./:]+)(?:\.com)?[/:])?([^/:]+)\/([^./:]+)(?:.git)?/,
       );
     if (!match) return;

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

@@ -29,6 +29,13 @@ export default class CoreYarnGenerator extends Generator {
       default: 'node-modules',
       desc: 'Defines what linker should be used for installing Node packages (useful to enable the node-modules plugin), one of: pnp, node-modules.',
     });
+
+    this.option('disableYarnGitCache', {
+      type: Boolean,
+      required: false,
+      default: false,
+      desc: 'Disable git cache. See https://yarnpkg.com/features/caching#offline-mirror.',
+    });
   }
 
   initializing() {
@@ -52,7 +59,9 @@ export default class CoreYarnGenerator extends Generator {
       this.fs.copyTpl(
         this.templatePath('yarn_gitignore.ejs'),
         this.destinationPath('.yarn/.gitignore'),
-        {},
+        {
+          disableYarnGitCache: this.options.disableYarnGitCache,
+        },
       );
 
       const { stdout } = this.spawnSync(

package/lib/generators/core/yarn/templates/yarn_gitignore.ejs

@@ -1,2 +1,5 @@
 /unplugged
 /install-state.gz
+<% if (disableYarnGitCache) { -%>
+/cache
+<% } -%>

package/lib/generators/lib/PobLibGenerator.js

@@ -32,6 +32,13 @@ export default class PobLibGenerator extends Generator {
       default: 'node-modules',
       desc: 'Defines what linker should be used for installing Node packages (useful to enable the node-modules plugin), one of: pnp, node-modules.',
     });
+
+    this.option('disableYarnGitCache', {
+      type: Boolean,
+      required: false,
+      default: false,
+      desc: 'Disable git cache. See https://yarnpkg.com/features/caching#offline-mirror.',
+    });
   }
 
   initializing() {
@@ -264,6 +271,7 @@ export default class PobLibGenerator extends Generator {
 
     this.composeWith('pob:common:testing', {
       enable: this.pobjson.testing,
+      disableYarnGitCache: this.options.disableYarnGitCache,
       enableReleasePlease,
       testing: this.pobjson.testing,
       runner: this.pobjson.testing

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

@@ -68,7 +68,6 @@ export default class LibReadmeGenerator extends Generator {
     const match =
       repository &&
       repository.match(
-        // eslint-disable-next-line unicorn/no-unsafe-regex
         /^(?:git@|https?:\/\/)(?:([^./:]+)(?:\.com)?[/:])?([^/:]+)\/([^./:]+)(?:.git)?/,
       );
     const [, gitHost, gitAccount, gitName] = match || [];

package/lib/generators/monorepo/PobMonorepoGenerator.js

@@ -1,13 +1,31 @@
 import { execSync } from 'node:child_process';
 import fs from 'node:fs';
-import path from 'node:path';
 import { platform } from 'node:process';
-import { PackageGraph } from '@lerna/package-graph';
-import { Project as LernaProject } from '@lerna/project';
+import { getPluginConfiguration } from '@yarnpkg/cli';
+import { Configuration, Project } from '@yarnpkg/core';
+import { ppath } from '@yarnpkg/fslib';
+import {
+  buildTopologicalOrderBatches,
+  buildDependenciesMaps,
+  getWorkspaceName,
+} from 'yarn-workspace-utils';
 import Generator from 'yeoman-generator';
 import * as packageUtils from '../../utils/package.js';
 import { copyAndFormatTpl } from '../../utils/writeAndFormat.js';
 
+export const createYarnProject = async () => {
+  const portablePath = ppath.cwd();
+
+  const configuration = await Configuration.find(
+    portablePath,
+    // eslint-disable-next-line unicorn/no-array-method-this-argument -- not an array
+    getPluginConfiguration(),
+  );
+  // eslint-disable-next-line unicorn/no-array-method-this-argument -- not an array
+  const { project } = await Project.find(configuration, portablePath);
+  return project;
+};
+
 const getAppTypes = (configs) => {
   const appConfigs = configs.filter(
     (config) => config && config.project && config.project.type === 'app',
@@ -26,9 +44,9 @@ const hasDist = (packages, configs) =>
     (config, index) =>
       !!(config && config.project && config.project.type === 'lib') &&
       !!(
-        packages[index].get('pob') &&
-        packages[index].get('pob').babelEnvs &&
-        packages[index].get('pob').babelEnvs.length > 0
+        packages[index].pob &&
+        packages[index].pob.babelEnvs &&
+        packages[index].pob.babelEnvs.length > 0
       ),
   );
 
@@ -79,46 +97,38 @@ export default class PobMonorepoGenerator extends Generator {
       required: true,
       desc: 'only latest lts',
     });
+
+    this.option('disableYarnGitCache', {
+      type: Boolean,
+      required: false,
+      default: false,
+      desc: 'Disable git cache. See https://yarnpkg.com/features/caching#offline-mirror.',
+    });
   }
 
   async initializing() {
-    this.lernaProject = new LernaProject(this.destinationPath());
-    const packages = await this.lernaProject.getPackages();
-    const graph = new PackageGraph(packages);
-    const [cyclePaths] = graph.partitionCycles();
-
-    if (cyclePaths.size > 0) {
-      const cycleMessage = [
-        'Dependency cycles detected, you should fix these!',
-        ...cyclePaths.map((cycle) => cycle.join(' -> ')),
-      ].join('\n');
-
-      console.warn(cycleMessage);
-    }
+    const yarnProject = await createYarnProject(this.destinationPath());
+    const batches = buildTopologicalOrderBatches(
+      yarnProject,
+      buildDependenciesMaps(yarnProject),
+    );
 
     this.packages = [];
     this.packageLocations = [];
 
-    while (graph.size > 0) {
-      // pick the current set of nodes _without_ localDependencies (aka it is a "source" node)
-      const batch = [...graph.values()].filter(
-        (node) => node.localDependencies.size === 0,
-      );
-      batch.sort((a, b) => a.name.localeCompare(b.name, 'en'));
-
-      // batches are composed of Package instances, not PackageGraphNodes
-      this.packages.push(...batch.map((node) => node.pkg));
-      this.packageLocations.push(
-        ...batch.map((node) =>
-          path
-            .relative(this.destinationPath(), node.location)
-            // transform windows path to linux
-            .replace(/\\+/g, '/'),
-        ),
+    for (const batch of batches) {
+      // sort by name to ensure consistent ordering
+      batch.sort((a, b) =>
+        getWorkspaceName(a).localeCompare(getWorkspaceName(b), 'en'),
       );
 
-      // pruning the graph changes the node.localDependencies.size test
-      graph.prune(...batch);
+      batch.forEach((workspace) => {
+        if (workspace === yarnProject.topLevelWorkspace) {
+          return;
+        }
+        this.packages.push(workspace.manifest.raw);
+        this.packageLocations.push(workspace.relativeCwd.toString());
+      });
     }
 
     this.packageNames = this.packages.map((pkg) => pkg.name);
@@ -218,6 +228,7 @@ export default class PobMonorepoGenerator extends Generator {
     this.composeWith('pob:common:testing', {
       monorepo: true,
       enable: this.pobLernaConfig.testing,
+      disableYarnGitCache: this.options.disableYarnGitCache,
       enableReleasePlease: false,
       enableYarnVersion: isYarnVersionEnabled,
       testing: this.pobLernaConfig.testing,

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

@@ -1,11 +1,7 @@
-import { spawnSync } from 'node:child_process';
 import { readdirSync, existsSync } from 'node:fs';
 import Generator from 'yeoman-generator';
 import * as packageUtils from '../../../utils/package.js';
-import {
-  copyAndFormatTpl,
-  writeAndFormatJson,
-} from '../../../utils/writeAndFormat.js';
+import { writeAndFormatJson } from '../../../utils/writeAndFormat.js';
 
 export default class MonorepoLernaGenerator extends Generator {
   constructor(args, opts) {
@@ -22,8 +18,16 @@ export default class MonorepoLernaGenerator extends Generator {
       default: 'yarn',
       desc: 'yarn or npm',
     });
+
+    this.option('disableYarnGitCache', {
+      type: Boolean,
+      required: false,
+      default: false,
+      desc: 'Disable git cache. See https://yarnpkg.com/features/caching#offline-mirror.',
+    });
   }
 
+  // TODO pass packages as options ?
   initializing() {
     const pkg = this.fs.readJSON(this.destinationPath('package.json'), {});
     const packagesPaths = pkg.workspaces
@@ -121,65 +125,16 @@ export default class MonorepoLernaGenerator extends Generator {
     // package.json
     const pkg = this.fs.readJSON(this.destinationPath('package.json'), {});
     delete pkg.lerna;
-    packageUtils.removeDependencies(pkg, ['lerna', '@pob/lerna-light']);
+    packageUtils.removeDependencies(pkg, ['lerna']);
     packageUtils.removeDevDependencies(pkg, ['lerna']);
 
     if (this.fs.exists(this.destinationPath('lerna-debug.log'))) {
       this.fs.delete(this.destinationPath('lerna-debug.log'));
     }
-    if (this.npm) {
-      if (!pkg.engines) pkg.engines = {};
-      pkg.engines.yarn = '< 0.0.0';
-      pkg.engines.npm = '>= 6.4.0';
-    } else if (pkg.engines) {
-      delete pkg.engines.yarn;
-    }
-
-    if (pkg.name === 'pob-monorepo') {
-      pkg.devDependencies['@pob/lerna-light'] = 'workspace:*';
-    } else {
-      packageUtils.addOrRemoveDevDependencies(
-        pkg,
-        pkg.name !== 'pob-monorepo-test-repository' &&
-          pkg.name !== 'use-react-intl-formatters-monorepo',
-        // pkg.name !== '@pob/eslint-config-monorepo'
-        ['@pob/lerna-light'],
-      );
-    }
 
     // TODO remove lerna completely
     const isYarnVersionEnabled = !pkg.devDependencies?.['@pob/lerna-light'];
 
-    if (pkg.name !== 'pob-monorepo') {
-      packageUtils.addDevDependencies(pkg, ['repository-check-dirty']);
-    }
-
-    packageUtils.removeDevDependencies(pkg, ['standard-version']);
-
-    const monorepoConfig = this.config.get('monorepo');
-    const packageManager = this.npm ? 'npm' : 'yarn';
-
-    packageUtils.addScripts(pkg, {
-      lint: `${packageManager} run lint:prettier && ${packageManager} run lint:eslint`,
-      'lint:prettier': 'pob-root-prettier --check .',
-      'lint:prettier:fix': 'pob-root-prettier --write .',
-      'lint:eslint':
-        monorepoConfig &&
-        monorepoConfig.eslint &&
-        this.packagesConfig.length < 50
-          ? `${
-              this.packagesConfig.length > 15
-                ? 'NODE_OPTIONS=--max_old_space_size=4096 '
-                : ''
-            }eslint --report-unused-disable-directives --resolve-plugins-relative-to . --quiet .`
-          : // eslint-disable-next-line unicorn/no-nested-ternary
-          this.options.packageManager === 'yarn'
-          ? `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`
-          : 'npm run lint:eslint --workspaces',
-    });
-
     packageUtils.addOrRemoveScripts(
       pkg,
       this.options.packageManager === 'yarn' && !isYarnVersionEnabled,
@@ -189,112 +144,6 @@ export default class MonorepoLernaGenerator extends Generator {
       },
     );
 
-    // TODO rename release (release = version + publish)
-    this.fs.copyTpl(
-      this.templatePath('workflow-publish.yml.ejs'),
-      this.destinationPath('.github/workflows/publish.yml'),
-      {
-        publish: !this.options.isAppProject,
-        enableYarnVersion: isYarnVersionEnabled,
-        isIndependent: lernaConfig.version === 'independent',
-      },
-    );
-
-    packageUtils.removeScripts(
-      pkg,
-      [pkg.name !== 'pob-dependencies' && 'preversion', 'release'].filter(
-        Boolean,
-      ),
-    );
-
-    packageUtils.addOrRemoveScripts(pkg, withBabel, {
-      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, {
-    //   'build:definitions': `${
-    //     useYarnWorkspacesCommand
-    //       ? 'yarn workspaces foreach --parallel --exclude "*-example" -Av run'
-    //       : 'lerna run --stream'
-    //   } build:definitions`,
-    // });
-
-    // if (withTypescript) {
-    //   pkg.scripts.build += `${packageManager} run build:definitions${
-    //     useYarnWorkspacesCommand ? '' : ' --since'
-    //   }`;
-    // }
-
-    delete pkg.scripts.postbuild;
-    delete pkg.scripts.prepublishOnly;
-
-    if (this.npm) {
-      delete pkg.workspaces;
-      packageUtils.addScripts(pkg, {
-        postinstall: 'lerna link',
-      });
-    } else if (!pkg.workspaces) {
-      pkg.workspaces = ['packages/*'];
-    }
-
     this.fs.writeJSON(this.destinationPath('package.json'), pkg);
-
-    // README.md
-    const readmePath = this.destinationPath('README.md');
-
-    let content = '';
-
-    if (this.fs.exists(readmePath)) {
-      const readmeFullContent = this.fs.read(readmePath);
-      content = readmeFullContent.match(/^<h3[^#*]+([^]+)$/);
-      if (!content) content = readmeFullContent.match(/^#[^#*]+([^]+)$/);
-      content = content ? content[1].trim() : readmeFullContent;
-    }
-
-    copyAndFormatTpl(this.fs, this.templatePath('README.md.ejs'), readmePath, {
-      projectName: pkg.name,
-      description: pkg.description,
-      packages: this.packages,
-      ci: this.fs.exists(this.destinationPath('.github/workflows/push.yml')),
-      content,
-    });
-  }
-
-  end() {
-    this.packagePaths.forEach((packagePath) => {
-      if (
-        !existsSync(`${packagePath}/.yo-rc.json`) &&
-        !existsSync(`${packagePath}/.pob.json`)
-      ) {
-        return;
-      }
-      console.log(`=> update ${packagePath}`);
-      spawnSync(
-        process.argv[0],
-        [
-          process.argv[1],
-          'update',
-          'from-pob',
-          this.options.force ? '--force' : undefined,
-        ].filter(Boolean),
-        {
-          cwd: packagePath,
-          stdio: 'inherit',
-        },
-      );
-    });
-
-    switch (this.options.packageManager) {
-      case 'npm':
-        this.spawnCommandSync('npm', ['install']);
-        this.spawnCommandSync('npm', ['run', 'preversion']);
-        break;
-      case 'yarn':
-        // see CoreYarnGenerator
-        break;
-    }
   }
 }

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

@@ -0,0 +1,236 @@
+import { spawnSync } from 'node:child_process';
+import { readdirSync, existsSync } from 'node:fs';
+import Generator from 'yeoman-generator';
+import * as packageUtils from '../../../utils/package.js';
+import { copyAndFormatTpl } from '../../../utils/writeAndFormat.js';
+
+export default class MonorepoLernaGenerator extends Generator {
+  constructor(args, opts) {
+    super(args, opts);
+
+    this.option('isAppProject', {
+      type: Boolean,
+      default: true,
+      desc: 'is app project',
+    });
+
+    this.option('packageManager', {
+      type: String,
+      default: 'yarn',
+      desc: 'yarn or npm',
+    });
+
+    this.option('disableYarnGitCache', {
+      type: Boolean,
+      required: false,
+      default: false,
+      desc: 'Disable git cache. See https://yarnpkg.com/features/caching#offline-mirror.',
+    });
+  }
+
+  initializing() {
+    const pkg = this.fs.readJSON(this.destinationPath('package.json'), {});
+    const packagesPaths = pkg.workspaces
+      ? pkg.workspaces.map((workspace) => workspace.replace(/\/\*$/, ''))
+      : ['packages'];
+
+    this.packagePaths = packagesPaths.flatMap((packagesPath) =>
+      existsSync(`${packagesPath}/`)
+        ? readdirSync(`${packagesPath}/`).map(
+            (packageName) => `${packagesPath}/${packageName}`,
+          )
+        : [],
+    );
+    this.packages = this.packagePaths
+      .map((packagePath) =>
+        this.fs.readJSON(this.destinationPath(`${packagePath}/package.json`)),
+      )
+      .filter(Boolean);
+    this.packagesConfig = this.packagePaths
+      .map((packagePath) =>
+        this.fs.readJSON(this.destinationPath(`${packagePath}/.yo-rc.json`)),
+      )
+      .filter(Boolean);
+  }
+
+  default() {}
+
+  writing() {
+    const getPackagePobConfig = (config) => ({
+      babelEnvs: [],
+      ...(config && config.pob),
+    });
+    const withBabel = this.packages.some(
+      (config) => getPackagePobConfig(config).babelEnvs.length > 0,
+    );
+
+    // package.json
+    const pkg = this.fs.readJSON(this.destinationPath('package.json'), {});
+    packageUtils.removeDependencies(pkg, ['@pob/lerna-light']);
+
+    if (this.npm) {
+      if (!pkg.engines) pkg.engines = {};
+      pkg.engines.yarn = '< 0.0.0';
+      pkg.engines.npm = '>= 6.4.0';
+    } else if (pkg.engines) {
+      delete pkg.engines.yarn;
+    }
+
+    if (pkg.name === 'pob-monorepo') {
+      pkg.devDependencies['@pob/lerna-light'] = 'workspace:*';
+    } else {
+      packageUtils.addOrRemoveDevDependencies(
+        pkg,
+        pkg.name !== 'pob-monorepo-test-repository' &&
+          pkg.name !== 'use-react-intl-formatters-monorepo',
+        // pkg.name !== '@pob/eslint-config-monorepo'
+        ['@pob/lerna-light'],
+      );
+    }
+
+    const isYarnVersionEnabled = !pkg.devDependencies?.['@pob/lerna-light'];
+
+    if (pkg.name !== 'pob-monorepo') {
+      packageUtils.addDevDependencies(pkg, ['repository-check-dirty']);
+    }
+
+    packageUtils.removeDevDependencies(pkg, ['standard-version']);
+
+    const monorepoConfig = this.config.get('monorepo');
+    const packageManager = this.npm ? 'npm' : 'yarn';
+
+    packageUtils.addScripts(pkg, {
+      lint: `${packageManager} run lint:prettier && ${packageManager} run lint:eslint`,
+      'lint:prettier': 'pob-root-prettier --check .',
+      'lint:prettier:fix': 'pob-root-prettier --write .',
+      'lint:eslint':
+        monorepoConfig &&
+        monorepoConfig.eslint &&
+        this.packagesConfig.length < 50
+          ? `${
+              this.packagesConfig.length > 15
+                ? 'NODE_OPTIONS=--max_old_space_size=4096 '
+                : ''
+            }eslint --report-unused-disable-directives --resolve-plugins-relative-to . --quiet .`
+          : // eslint-disable-next-line unicorn/no-nested-ternary
+          this.options.packageManager === 'yarn'
+          ? `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`
+          : 'npm run lint:eslint --workspaces',
+    });
+
+    packageUtils.addOrRemoveScripts(
+      pkg,
+      this.options.packageManager === 'yarn' && !isYarnVersionEnabled,
+      {
+        version:
+          'YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn && git add yarn.lock',
+      },
+    );
+
+    // TODO rename release (release = version + publish)
+    this.fs.copyTpl(
+      this.templatePath('workflow-publish.yml.ejs'),
+      this.destinationPath('.github/workflows/publish.yml'),
+      {
+        publish: !this.options.isAppProject,
+        enableYarnVersion: isYarnVersionEnabled,
+        disableYarnGitCache: this.options.disableYarnGitCache,
+        isIndependent: !pkg.version || pkg.version === '0.0.0',
+      },
+    );
+
+    packageUtils.removeScripts(
+      pkg,
+      [pkg.name !== 'pob-dependencies' && 'preversion', 'release'].filter(
+        Boolean,
+      ),
+    );
+
+    packageUtils.addOrRemoveScripts(pkg, withBabel, {
+      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, {
+    //   'build:definitions': `${
+    //     useYarnWorkspacesCommand
+    //       ? 'yarn workspaces foreach --parallel --exclude "*-example" -Av run'
+    //       : 'lerna run --stream'
+    //   } build:definitions`,
+    // });
+
+    // if (withTypescript) {
+    //   pkg.scripts.build += `${packageManager} run build:definitions${
+    //     useYarnWorkspacesCommand ? '' : ' --since'
+    //   }`;
+    // }
+
+    delete pkg.scripts.postbuild;
+    delete pkg.scripts.prepublishOnly;
+
+    if (!pkg.workspaces) {
+      pkg.workspaces = ['packages/*'];
+    }
+
+    this.fs.writeJSON(this.destinationPath('package.json'), pkg);
+
+    // README.md
+    const readmePath = this.destinationPath('README.md');
+
+    let content = '';
+
+    if (this.fs.exists(readmePath)) {
+      const readmeFullContent = this.fs.read(readmePath);
+      content = readmeFullContent.match(/^<h3[^#*]+([^]+)$/);
+      if (!content) content = readmeFullContent.match(/^#[^#*]+([^]+)$/);
+      content = content ? content[1].trim() : readmeFullContent;
+    }
+
+    copyAndFormatTpl(this.fs, this.templatePath('README.md.ejs'), readmePath, {
+      projectName: pkg.name,
+      description: pkg.description,
+      packages: this.packages,
+      ci: this.fs.exists(this.destinationPath('.github/workflows/push.yml')),
+      content,
+    });
+  }
+
+  end() {
+    this.packagePaths.forEach((packagePath) => {
+      if (
+        !existsSync(`${packagePath}/.yo-rc.json`) &&
+        !existsSync(`${packagePath}/.pob.json`)
+      ) {
+        return;
+      }
+      console.log(`=> update ${packagePath}`);
+      spawnSync(
+        process.argv[0],
+        [
+          process.argv[1],
+          'update',
+          'from-pob',
+          this.options.force ? '--force' : undefined,
+        ].filter(Boolean),
+        {
+          cwd: packagePath,
+          stdio: 'inherit',
+        },
+      );
+    });
+
+    switch (this.options.packageManager) {
+      case 'npm':
+        this.spawnCommandSync('npm', ['install']);
+        this.spawnCommandSync('npm', ['run', 'preversion']);
+        break;
+      case 'yarn':
+        // see CoreYarnGenerator
+        break;
+    }
+  }
+}

package/lib/generators/monorepo/{lerna → workspaces}/templates/README.md.ejs

@@ -10,7 +10,7 @@
 
 <h1>Packages</h1>
 
-This repository is a monorepo that we manage using [Lerna](https://github.com/lerna/lerna).
+This repository is a monorepo that we manage using [Yarn Workspaces](https://yarnpkg.com/features/workspaces).
 
 | Package | Version | Description |
 |---------|---------|-------------|

package/lib/generators/monorepo/{lerna → workspaces}/templates/workflow-publish.yml.ejs

@@ -23,7 +23,7 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           token: ${{ secrets.GH_TOKEN }}
           fetch-depth: 0
@@ -33,7 +33,11 @@ jobs:
           node-version: 18
 
       - name: Install Dependencies
+<% if (disableYarnGitCache) { -%>
+        run: yarn install --immutable
+<% } else { -%>
         run: yarn install --immutable --immutable-cache
+<% } -%>
 
       - name: New version (dry run)
         if: github.ref == 'refs/heads/main' && inputs.dry-run

package/lib/generators/pob/PobBaseGenerator.js

@@ -125,6 +125,7 @@ export default class PobBaseGenerator extends Generator {
       type: this.projectConfig.type,
       enable: this.isRoot && this.projectConfig.packageManager === 'yarn',
       yarnNodeLinker: this.projectConfig.yarnNodeLinker,
+      disableYarnGitCache: this.projectConfig.disableYarnGitCache,
     });
 
     this.composeWith('pob:core:package', {
@@ -135,10 +136,17 @@ export default class PobBaseGenerator extends Generator {
     });
 
     if (this.useLerna) {
+      this.composeWith('pob:monorepo:workspaces', {
+        force: this.options.force,
+        isAppProject: this.projectConfig.type === 'app',
+        packageManager: this.projectConfig.packageManager,
+        disableYarnGitCache: this.projectConfig.disableYarnGitCache,
+      });
       this.composeWith('pob:monorepo:lerna', {
         force: this.options.force,
         isAppProject: this.projectConfig.type === 'app',
         packageManager: this.projectConfig.packageManager,
+        disableYarnGitCache: this.projectConfig.disableYarnGitCache,
       });
     }
 
@@ -197,6 +205,7 @@ export default class PobBaseGenerator extends Generator {
         ),
         {
           updateOnly: this.options.updateOnly,
+          disableYarnGitCache: this.projectConfig.disableYarnGitCache,
           isAppProject: this.projectConfig.type === 'app',
           packageManager: this.projectConfig.packageManager,
           yarnNodeLinker: this.projectConfig.yarnNodeLinker,
@@ -209,6 +218,7 @@ export default class PobBaseGenerator extends Generator {
           this.composeWith('pob:lib', {
             monorepo: this.useLerna,
             isRoot: this.isRoot,
+            disableYarnGitCache: this.projectConfig.disableYarnGitCache,
             updateOnly: this.options.updateOnly,
             fromPob: this.options.fromPob,
             packageManager: this.projectConfig.packageManager,
@@ -219,6 +229,7 @@ export default class PobBaseGenerator extends Generator {
           this.composeWith('pob:app', {
             monorepo: this.useLerna,
             isRoot: this.isRoot,
+            disableYarnGitCache: this.projectConfig.disableYarnGitCache,
             updateOnly: this.options.updateOnly,
             fromPob: this.options.fromPob,
             packageManager: this.projectConfig.packageManager,

package/lib/pob.js

@@ -207,6 +207,11 @@ env.registerStub(
   'pob:lib:readme',
   `${__dirname}/generators/lib/readme/LibReadmeGenerator.js`,
 );
+env.registerStub(
+  MonorepoLernaGenerator,
+  'pob:monorepo:workspaces',
+  `${__dirname}/generators/monorepo/workspaces/MonorepoWorkspacesGenerator.js`,
+);
 env.registerStub(
   MonorepoLernaGenerator,
   'pob:monorepo:lerna',
@@ -315,7 +320,10 @@ if (!existsSync('.yo-rc.json')) {
   writeFileSync('.yo-rc.json', '{}');
 }
 
-if (existsSync('lerna.json') || (projectPkg && projectPkg.lerna)) {
+if (
+  existsSync('lerna.json') ||
+  (projectPkg && (projectPkg.lerna || projectPkg.workspaces))
+) {
   monorepo = true;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pob",
-  "version": "14.0.1",
+  "version": "14.2.0",
   "description": "Pile of bones, library generator with git/babel/typescript/typedoc/readme/jest",
   "keywords": [
     "skeleton"
@@ -36,17 +36,18 @@
   "prettier": "@pob/root/prettier-config",
   "pob": {},
   "dependencies": {
-    "@lerna/package-graph": "5.5.4",
-    "@lerna/project": "5.5.4",
-    "@pob/eslint-config": "51.0.0",
-    "@pob/eslint-config-typescript": "51.0.0",
-    "@pob/eslint-config-typescript-react": "51.0.0",
+    "@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",
+    "@yarnpkg/fslib": "2.10.3",
     "@yeoman/types": "1.0.1",
-    "eslint": "8.49.0",
+    "eslint": "8.50.0",
     "findup-sync": "^5.0.0",
     "git-remote-url": "^1.0.1",
     "github-username": "^7.0.0",
@@ -59,13 +60,14 @@
     "mem-fs-editor": "10.0.2",
     "minimist": "1.2.8",
     "parse-author": "2.0.0",
-    "pob-dependencies": "8.5.1",
+    "pob-dependencies": "8.6.1",
     "prettier": "2.8.8",
     "semver": "7.5.4",
-    "yeoman-environment": "4.0.0-beta.4",
-    "yeoman-generator": "6.0.0-rc.4"
+    "yarn-workspace-utils": "1.0.0",
+    "yeoman-environment": "4.0.0-beta.5",
+    "yeoman-generator": "6.0.0-rc.5"
   },
   "devDependencies": {
-    "@pob/root": "8.2.2"
+    "@pob/root": "8.3.1"
   }
 }