pob 10.13.1 → 10.16.0

package/CHANGELOG.md

@@ -3,6 +3,53 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [10.16.0](https://github.com/christophehurpeau/pob/compare/pob@10.15.0...pob@10.16.0) (2022-05-31)
+
+
+### Features
+
+* **deps:** update dependency eslint to v8.15.0 ([#1277](https://github.com/christophehurpeau/pob/issues/1277)) ([245b369](https://github.com/christophehurpeau/pob/commit/245b36992ca45f7f10ebcdb039badafc2740a6fe))
+* **deps:** update dependency eslint to v8.16.0 ([#1290](https://github.com/christophehurpeau/pob/issues/1290)) ([e62d102](https://github.com/christophehurpeau/pob/commit/e62d102178e494d2009d225a365f4e62c692da4c))
+* **deps:** update lerna monorepo to v5 (major) ([#1292](https://github.com/christophehurpeau/pob/issues/1292)) ([049f8c9](https://github.com/christophehurpeau/pob/commit/049f8c936d6b621077f7da932cf6b271bf93026b))
+
+
+
+
+
+# [10.15.0](https://github.com/christophehurpeau/pob/compare/pob@10.14.0...pob@10.15.0) (2022-04-30)
+
+
+### Bug Fixes
+
+* **pob:** fix ejs workflow for npm publish ([42ddb67](https://github.com/christophehurpeau/pob/commit/42ddb6791e97cfa06d9b6651c165fa717bfac9b2))
+
+
+### Features
+
+* **pob:** improve readme with more badges ([b766c11](https://github.com/christophehurpeau/pob/commit/b766c11709bb0349beb1492b8f1860b65d87e73f))
+
+
+
+
+
+# [10.14.0](https://github.com/christophehurpeau/pob/compare/pob@10.13.1...pob@10.14.0) (2022-04-30)
+
+
+### Bug Fixes
+
+* **pob:** fix readme repository parser ([0aed381](https://github.com/christophehurpeau/pob/commit/0aed3812e753c9affe6b1db4ca3c70812c6182a6))
+
+
+### Features
+
+* **pob:** add rootIgnorePatterns option in format-lint generator ([8baecc3](https://github.com/christophehurpeau/pob/commit/8baecc30735a576b8e60006bbe265aed076d9435))
+* **pob:** initial config for release-please in monorepo ([72f4fc5](https://github.com/christophehurpeau/pob/commit/72f4fc50446a6f455e851f0fda4a351d9921fa74))
+* remove useless dependencies cache ([f84c525](https://github.com/christophehurpeau/pob/commit/f84c52577e90a03ef3adb87b02ee1772b8acc74f))
+
+
+
+
+
 ## [10.13.1](https://github.com/christophehurpeau/pob/compare/pob@10.13.0...pob@10.13.1) (2022-04-30)
 
 **Note:** Version bump only for package pob

package/lib/generators/app/PobAppGenerator.js

@@ -168,9 +168,13 @@ export default class PobAppGenerator extends Generator {
 
     this.composeWith('pob:common:remove-old-dependencies');
 
+    const enableReleasePlease =
+      !inLerna && this.appConfig.testing && this.appConfig.ci;
+
     if (this.appConfig.type !== 'remix') {
       this.composeWith('pob:common:testing', {
         enable: this.appConfig.testing,
+        enableReleasePlease,
         testing: this.appConfig.testing,
         typescript: babel,
         documentation: false,

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

@@ -60,9 +60,17 @@ export default class CommonLintGenerator extends Generator {
       desc: 'list of app types',
     });
 
+    this.option('rootIgnorePaths', {
+      type: String,
+      required: false,
+      defaults: '',
+      desc: 'list of ignore paths to add',
+    });
+
     this.option('ignorePaths', {
       type: String,
       required: false,
+      defaults: '',
       desc: 'list of ignore paths to add',
     });
 
@@ -125,6 +133,9 @@ export default class CommonLintGenerator extends Generator {
     };
 
     if (!inLerna || inLerna.root || this.options.monorepo) {
+      const rootIgnorePatterns = new Set(
+        this.options.rootIgnorePaths.split('\n').filter(Boolean),
+      );
       const ignorePatterns = new Set(
         this.options.ignorePaths.split('\n').filter(Boolean),
       );
@@ -151,6 +162,7 @@ export default class CommonLintGenerator extends Generator {
           yarnNodeLinker: this.options.yarnNodeLinker,
           workspaces: pkg.workspaces,
           hasApp: this.options.hasApp,
+          rootIgnorePatterns: [...rootIgnorePatterns],
           ignorePatterns: [...ignorePatterns],
         },
       );

package/lib/generators/common/format-lint/templates/prettierignore.ejs

@@ -8,6 +8,9 @@ CHANGELOG.md
 /.pnp.*
 <% } -%>
 <% } -%>
+<% for (let ignorePattern of rootIgnorePatterns) { -%>
+<%= ignorePattern %>
+<% } -%>
 <% if (workspaces) { -%>
 <% for (let workspace of workspaces) { -%>
 <% if (ignorePatterns) { -%>

package/lib/generators/common/release/CommonReleaseGenerator.js

@@ -1,5 +1,4 @@
 import Generator from 'yeoman-generator';
-import inLerna from '../../../utils/inLerna.js';
 import * as packageUtils from '../../../utils/package.js';
 
 export default class CommonReleaseGenerator extends Generator {
@@ -33,34 +32,11 @@ export default class CommonReleaseGenerator extends Generator {
     });
   }
 
-  async prompting() {
-    this.isReleasePleaseEnabled =
-      this.options.enable &&
-      this.fs.exists(
-        this.destinationPath('.github/workflows/release-please.yml'),
-      );
-
-    if (
-      this.options.enable &&
-      !process.env.CI &&
-      !this.isReleasePleaseEnabled
-    ) {
-      const { enableReleasePlease } = await this.prompt({
-        type: 'confirm',
-        name: 'enableReleasePlease',
-        message: 'Would you like to enable release please ?',
-        default: true,
-      });
-      this.isReleasePleaseEnabled = enableReleasePlease;
-    }
-  }
-
   writing() {
     const pkg = this.fs.readJSON(this.destinationPath('package.json'));
 
-    const isReleasePleaseEnabled = this.isReleasePleaseEnabled;
     const isStandardVersionEnabled =
-      this.options.enable && !isReleasePleaseEnabled;
+      this.options.enable && !!pkg.devDependencies?.['standard-version'];
 
     if (!isStandardVersionEnabled) {
       packageUtils.removeDevDependencies(pkg, ['standard-version']);
@@ -87,24 +63,13 @@ export default class CommonReleaseGenerator extends Generator {
       }
     }
 
-    if (!isReleasePleaseEnabled) {
-      if (
-        this.fs.exists(
-          this.destinationPath('.github/workflows/release-please.yml'),
-        )
-      ) {
-        this.fs.delete(
-          this.destinationPath('.github/workflows/release-please.yml'),
-        );
-      }
-    } else {
-      this.fs.copyTpl(
-        this.templatePath('release-please.yml.ejs'),
+    if (
+      this.fs.exists(
+        this.destinationPath('.github/workflows/release-please.yml'),
+      )
+    ) {
+      this.fs.delete(
         this.destinationPath('.github/workflows/release-please.yml'),
-        {
-          isLerna: !!inLerna,
-          publish: !pkg.private,
-        },
       );
     }
 

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

@@ -19,6 +19,12 @@ export default class CommonTestingGenerator extends Generator {
       desc: 'enable testing',
     });
 
+    this.option('enableReleasePlease', {
+      type: Boolean,
+      defaults: true,
+      desc: 'enable release-please',
+    });
+
     this.option('ci', {
       type: Boolean,
       required: true,
@@ -60,6 +66,7 @@ export default class CommonTestingGenerator extends Generator {
     if (!inLerna || inLerna.root) {
       this.composeWith('pob:core:ci', {
         enable: this.options.ci,
+        enableReleasePlease: this.options.enableReleasePlease,
         testing: this.options.enable,
         build: this.options.typescript,
         typescript: this.options.typescript,

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

@@ -1,5 +1,6 @@
 import fs from 'fs';
 import Generator from 'yeoman-generator';
+import inLerna from '../../../utils/inLerna.js';
 import * as packageUtils from '../../../utils/package.js';
 import { copyAndFormatTpl } from '../../../utils/writeAndFormat.js';
 
@@ -13,6 +14,12 @@ export default class CoreCIGenerator extends Generator {
       desc: 'enable ci',
     });
 
+    this.option('enableReleasePlease', {
+      type: Boolean,
+      defaults: true,
+      desc: 'enable release-please',
+    });
+
     this.option('build', {
       type: Boolean,
       defaults: true,
@@ -62,6 +69,28 @@ export default class CoreCIGenerator extends Generator {
     });
   }
 
+  async prompting() {
+    const pkg = this.fs.readJSON(this.destinationPath('package.json'));
+
+    this.isReleasePleaseEnabled =
+      this.options.enableReleasePlease &&
+      !pkg.devDependencies?.['standard-version'];
+
+    if (
+      this.options.enableReleasePlease &&
+      !process.env.CI &&
+      !this.isReleasePleaseEnabled
+    ) {
+      const { enableReleasePlease } = await this.prompt({
+        type: 'confirm',
+        name: 'enableReleasePlease',
+        message: 'Would you like to enable release please ?',
+        default: true,
+      });
+      this.isReleasePleaseEnabled = enableReleasePlease;
+    }
+  }
+
   default() {
     if (fs.existsSync(this.destinationPath('.circleci'))) {
       fs.rmdirSync(this.destinationPath('.circleci'), { recursive: true });
@@ -83,6 +112,14 @@ export default class CoreCIGenerator extends Generator {
           typescript: this.options.typescript,
           codecov: this.options.codecov,
           supportsNode14: !this.options.isApp,
+
+          isReleasePleaseEnabled: this.isReleasePleaseEnabled,
+          publishSinglePackage: this.isReleasePleaseEnabled && !pkg.private,
+          publishMonorepo:
+            this.isReleasePleaseEnabled &&
+            inLerna &&
+            inLerna.root &&
+            inLerna.pobConfig?.project?.type === 'lib',
         },
       );
     } else {

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

@@ -14,18 +14,7 @@ jobs:
         with:
           node-version: 16
 
-      - name: Cache dependencies
-        uses: actions/cache@v3
-        with:
-          path: |
-            .yarn/unplugged
-            .yarn/install-state.gz
-          key: v2-dependencies--${{ matrix.node-version }}-${{ runner.OS }}-${{ hashFiles('yarn.lock') }}
-          restore-keys: |
-            v2-dependencies--${{ matrix.node-version }}-${{ runner.OS }}-
-            v2-dependencies--${{ matrix.node-version }}-
-
-      - name: Check Dependencies
+      - name: Install Dependencies
         run: yarn install --immutable --immutable-cache
 
 <% if (typedoc) { -%>

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

@@ -17,36 +17,14 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
+          registry-url: 'https://registry.npmjs.org'
 
-<% if (packageManager !== 'npm') { -%>
-      - name: Cache dependencies
-        uses: actions/cache@v3
-        with:
-<% if (packageManager === 'yarn') { -%>
-          path: |
-            .yarn/unplugged
-            .yarn/install-state.gz
-<% } else { -%>
-          path: node_modules
-<% } -%>
-          key: v2-dependencies--${{ matrix.node-version }}-${{ runner.OS }}-${{ hashFiles('yarn.lock') }}
-          restore-keys: |
-            v2-dependencies--${{ matrix.node-version }}-${{ runner.OS }}-
-            v2-dependencies--${{ matrix.node-version }}-
-
-<% } -%>
 <% if (packageManager === 'yarn') { -%>
-      - name: Check Dependencies
+      - name: Install Dependencies
         run: yarn install --immutable --immutable-cache
 <% } else if (packageManager === 'npm') { -%>
-      - name: Install Latest Npm
-        run: npm install -g npm@next-7
-
       - name: Install Dependencies
         run: npm ci
-<% } else { -%>
-      - name: Install Dependencies
-        run: yarn install --prefer-offline --pure-lockfile
 <% } -%>
 
 <% if (checks) { -%>
@@ -99,3 +77,22 @@ jobs:
         if: startsWith(matrix.node-version, '16.')
         run: <%= packageManager === 'npm' ? 'npx' : 'yarn run' %> repository-check-dirty
 <% } -%>
+
+<% if (isReleasePleaseEnabled) { -%>
+      - uses: GoogleCloudPlatform/release-please-action@v3
+        if: ${{ startsWith(matrix.node-version, '16.') && github.ref == 'refs/heads/main' }}
+        id: release
+        with:
+          token: ${{ secrets.GH_TOKEN }}
+          release-type: node
+          package-name: release-please-action
+
+<% if (publishSinglePackage) { -%>
+
+      # publish:
+      - run: npm publish
+        if: ${{ startsWith(matrix.node-version, '16.') && github.ref == 'refs/heads/main' && steps.release.outputs.release_created }}
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+<% } -%>
+<% } -%>

package/lib/generators/lib/PobLibGenerator.js

@@ -242,8 +242,12 @@ export default class PobLibGenerator extends Generator {
 
     this.composeWith('pob:common:remove-old-dependencies');
 
+    const enableReleasePlease =
+      !inLerna && this.pobjson.testing && this.pobjson.testing.ci;
+
     this.composeWith('pob:common:testing', {
       enable: this.pobjson.testing,
+      enableReleasePlease,
       testing: this.pobjson.testing,
       typescript: withBabel,
       documentation: !!this.pobjson.documentation,
@@ -274,7 +278,6 @@ export default class PobLibGenerator extends Generator {
       documentation: !!this.pobjson.documentation,
       testing: !!this.pobjson.testing,
       ci: this.pobjson.testing && this.pobjson.testing.ci,
-      // travisci: this.pobjson.testing && this.pobjson.testing.travisci,
       codecov: this.pobjson.testing && this.pobjson.testing.codecov,
     });
 

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

@@ -69,7 +69,7 @@ export default class LibReadmeGenerator extends Generator {
       repository &&
       repository.match(
         // eslint-disable-next-line unicorn/no-unsafe-regex
-        /^(?:git@|https?:\/\/)(?:([^./:]+)(?:\.com)?:)?([^/:]+)\/([^./:]+)(?:.git)?/,
+        /^(?:git@|https?:\/\/)(?:([^./:]+)(?:\.com)?[/:])?([^/:]+)\/([^./:]+)(?:.git)?/,
       );
     const [, gitHost, gitAccount, gitName] = match || [];
     try {
@@ -94,6 +94,10 @@ export default class LibReadmeGenerator extends Generator {
           license: pkg.license,
           codecov: this.options.codecov,
           documentation: this.options.documentation,
+          documentationUrl:
+            this.options.documentation && gitHost === 'github'
+              ? `https://${gitAccount}.github.io/${gitName}/`
+              : undefined,
           testing: this.options.testing,
           content,
         },

package/lib/generators/lib/readme/templates/README.md.ejs

@@ -11,10 +11,16 @@
 <p align="center">
 <% if (!privatePackage) { -%>
   <a href="https://npmjs.org/package/<%= packageName %>"><img src="https://img.shields.io/npm/v/<%= packageName %>.svg?style=flat-square"></a>
+  <a href="https://npmjs.org/package/<%= packageName %>"><img src="https://img.shields.io/npm/dw/<%= packageName %>.svg?style=flat-square"></a>
+  <a href="https://npmjs.org/package/<%= packageName %>"><img src="https://img.shields.io/node/v/<%= packageName %>.svg?style=flat-square"></a>
+  <a href="https://npmjs.org/package/<%= packageName %>"><img src="https://img.shields.io/npm/types/<%= packageName %>.svg?style=flat-square"></a>
 <% } if (gitHost === 'github') { -%>
 <% if (testing && codecov) { -%>
   <a href="https://codecov.io/gh/<%= gitAccount %>/<%= gitName %>"><img src="https://img.shields.io/codecov/c/github/<%= gitAccount %>/<%= gitName %>/master.svg?style=flat-square"></a>
 <% } -%>
+<% if (documentationUrl) { -%>
+  <a href="<%= documentationUrl %>"><img src="https://img.shields.io/website.svg?down_color=lightgrey&down_message=offline&up_color=blue&up_message=online&url=<%= encodeURIComponent(documentationUrl) %>?style=flat-square"></a>
+<% } -%>
 <% } -%>
 </p>
 

package/lib/generators/monorepo/PobMonorepoGenerator.js

@@ -197,9 +197,15 @@ export default class PobMonorepoGenerator extends Generator {
 
     this.composeWith('pob:common:husky', {});
 
+    const isReleasePleaseEnabled =
+      this.pobLernaConfig.testing &&
+      this.pobLernaConfig.ci &&
+      !pkg.devDependencies?.['@pob/lerna-light'];
+
     this.composeWith('pob:common:testing', {
       monorepo: true,
       enable: this.pobLernaConfig.testing,
+      enableReleasePlease: isReleasePleaseEnabled,
       testing: this.pobLernaConfig.testing,
       typescript: this.pobLernaConfig.typescript,
       documentation: !!this.pobLernaConfig.documentation,
@@ -223,6 +229,11 @@ export default class PobMonorepoGenerator extends Generator {
       ]
         .filter(Boolean)
         .join('\n'),
+      rootIgnorePaths: [
+        isReleasePleaseEnabled && '/.release-please-manifest.json',
+      ]
+        .filter(Boolean)
+        .join('\n'),
     });
 
     this.composeWith('pob:lib:doc', {
@@ -254,6 +265,14 @@ export default class PobMonorepoGenerator extends Generator {
 
     this.composeWith('pob:common:remove-old-dependencies');
 
+    this.composeWith('pob:common:release', {
+      enable: this.pobLernaConfig.testing && this.pobLernaConfig.ci,
+      isReleasePleaseEnabled,
+      withBabel: this.pobLernaConfig.typescript,
+      documentation: this.pobLernaConfig.documentation,
+      updateOnly: this.options.updateOnly,
+    });
+
     this.composeWith('pob:monorepo:typescript', {
       enable: this.pobLernaConfig.typescript,
       isAppProject: this.options.isAppProject,

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

@@ -20,18 +20,7 @@ jobs:
         with:
           node-version: 14
 
-      - name: Cache dependencies
-        uses: actions/cache@v3
-        with:
-          path: |
-            .yarn/unplugged
-            .yarn/install-state.gz
-          key: v2-dependencies--${{ matrix.node-version }}-${{ runner.OS }}-${{ hashFiles('yarn.lock') }}
-          restore-keys: |
-            v2-dependencies--${{ matrix.node-version }}-${{ runner.OS }}-
-            v2-dependencies--${{ matrix.node-version }}-
-
-      - name: Check Dependencies
+      - name: Install Dependencies
         run: yarn install --immutable --immutable-cache
 
       - name: New version (dry run)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pob",
-  "version": "10.13.1",
+  "version": "10.16.0",
   "description": "Pile of bones, library generator with git/babel/typescript/typedoc/readme/jest",
   "keywords": [
     "skeleton"
@@ -39,15 +39,15 @@
   },
   "pob": {},
   "dependencies": {
-    "@lerna/package-graph": "^4.0.0",
-    "@lerna/project": "^4.0.0",
+    "@lerna/package-graph": "^5.0.0",
+    "@lerna/project": "^5.0.0",
     "@pob/eslint-config": "49.1.0",
     "@pob/eslint-config-typescript": "49.3.0",
     "@pob/eslint-config-typescript-react": "49.3.1",
     "@pob/sort-eslint-config": "^3.0.1",
     "@pob/sort-object": "^4.0.1",
     "@pob/sort-pkg": "^4.0.1",
-    "eslint": "8.14.0",
+    "eslint": "8.16.0",
     "findup-sync": "^5.0.0",
     "git-remote-url": "^1.0.1",
     "github-username": "^6.0.0",
@@ -61,11 +61,11 @@
     "mem-fs-editor": "9.4.0",
     "minimist": "1.2.6",
     "parse-author": "2.0.0",
-    "pob-dependencies": "6.25.2",
+    "pob-dependencies": "6.26.0",
     "prettier": "2.6.2",
     "semver": "7.3.7",
     "yeoman-environment": "3.9.1",
     "yeoman-generator": "5.6.1"
   },
-  "gitHead": "cc8f94676eea6b7d99541e74ec99f8e0a942e1b4"
+  "gitHead": "6e909141a6d1ee895cfc0dfa6686512cfd7ba409"
 }

package/lib/generators/common/release/templates/release-please.yml.ejs

@@ -1,36 +0,0 @@
-name: release-please
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  release-please:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: GoogleCloudPlatform/release-please-action@v3
-        id: release
-        with:
-          token: ${{ secrets.GH_TOKEN }}
-          release-type: node
-          package-name: release-please-action
-
-      # publish:
-      - uses: actions/checkout@v3
-        # these if statements ensure that a publication only occurs when
-        # a new release is created:
-        if: ${{ steps.release.outputs.release_created }}
-
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 14
-          registry-url: 'https://registry.npmjs.org'
-        if: ${{ steps.release.outputs.release_created }}
-<% if (publish) { -%>
-
-      - run: npm publish
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-        if: ${{ steps.release.outputs.release_created }}
-<% } -%>