pob 8.7.0 → 8.8.2

package/CHANGELOG.md

@@ -3,6 +3,41 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [8.8.2](https://github.com/christophehurpeau/pob/compare/pob@8.8.1...pob@8.8.2) (2021-11-14)
+
+**Note:** Version bump only for package pob
+
+
+
+
+
+## [8.8.1](https://github.com/christophehurpeau/pob/compare/pob@8.8.0...pob@8.8.1) (2021-11-14)
+
+**Note:** Version bump only for package pob
+
+
+
+
+
+# [8.8.0](https://github.com/christophehurpeau/pob/compare/pob@8.7.1...pob@8.8.0) (2021-11-14)
+
+
+### Features
+
+* release libs using github ([3c09271](https://github.com/christophehurpeau/pob/commit/3c0927168a7bd755311470212a8699a560a52174))
+
+
+
+
+
+## [8.7.1](https://github.com/christophehurpeau/pob/compare/pob@8.7.0...pob@8.7.1) (2021-11-11)
+
+**Note:** Version bump only for package pob
+
+
+
+
+
 # [8.7.0](https://github.com/christophehurpeau/pob/compare/pob@8.6.0...pob@8.7.0) (2021-11-11)
 
 

package/lib/generators/lib/PobLibGenerator.js

@@ -2,7 +2,6 @@ import { execSync } from 'child_process';
 import fs from 'fs';
 import Generator from 'yeoman-generator';
 import inLerna from '../../utils/inLerna.js';
-import inNpmLerna from '../../utils/inNpmLerna.js';
 import * as packageUtils from '../../utils/package.js';
 
 export default class PobLibGenerator extends Generator {
@@ -273,6 +272,12 @@ export default class PobLibGenerator extends Generator {
       codecov: this.pobjson.testing && this.pobjson.testing.codecov,
     });
 
+    this.composeWith('pob:lib:release', {
+      enable: !inLerna,
+      withBabel: babelEnvs.length > 0,
+      documentation: !!this.pobjson.documentation,
+    });
+
     // must be after doc, testing
     this.composeWith('pob:core:gitignore', {
       root: !inLerna,
@@ -291,8 +296,6 @@ export default class PobLibGenerator extends Generator {
   writing() {
     // Re-read the content at this point because a composed generator might modify it.
     const pkg = this.fs.readJSON(this.destinationPath('package.json'));
-    const isNpmPackageLock = this.fs.exists('package-lock.json');
-    const isNpm = isNpmPackageLock || inNpmLerna;
 
     if (pkg.engines) {
       delete pkg.engines.yarn;
@@ -313,44 +316,12 @@ export default class PobLibGenerator extends Generator {
         delete pkg.scripts.release;
         delete pkg.scripts.version;
       }
+    } else if (withBabel) {
+      packageUtils.addScripts(pkg, {
+        clean: 'rm -Rf dist',
+      });
     } else {
-      if (
-        this.fs.exists(
-          this.destinationPath('.github/workflows/release-please.yml'),
-        )
-      ) {
-        packageUtils.removeDevDependencies(pkg, ['standard-version']);
-        packageUtils.removeScripts(pkg, ['release', 'preversion']);
-      } else {
-        packageUtils.addDevDependencies(pkg, ['standard-version']);
-        if (pkg.name !== 'pob-monorepo') {
-          packageUtils.addScripts(pkg, {
-            release:
-              "repository-check-dirty && yarn preversion && standard-version -a -m 'chore(release): %s [skip ci]' && git push --follow-tags origin master && npm publish",
-            preversion: [
-              `${isNpm ? 'npm' : 'yarn'} run lint`,
-              withBabel && `${isNpm ? 'npm' : 'yarn'} run build`,
-              this.pobjson.documentation &&
-                `${isNpm ? 'npm' : 'yarn'} run generate:docs`,
-              'repository-check-dirty',
-            ]
-              .filter(Boolean)
-              .join(' && '),
-          });
-
-          if (pkg.scripts.version === 'pob-version') {
-            delete pkg.scripts.version;
-          }
-        }
-      }
-
-      if (withBabel) {
-        packageUtils.addScripts(pkg, {
-          clean: 'rm -Rf dist',
-        });
-      } else {
-        delete pkg.scripts.clean;
-      }
+      delete pkg.scripts.clean;
     }
 
     if (!withBabel) {

package/lib/generators/lib/release/LibReleaseGenerator.js

@@ -0,0 +1,80 @@
+import Generator from 'yeoman-generator';
+import inLerna from '../../../utils/inLerna.js';
+import * as packageUtils from '../../../utils/package.js';
+
+export default class LibReleaseGenerator extends Generator {
+  constructor(args, opts) {
+    super(args, opts);
+
+    this.option('enable', {
+      type: Boolean,
+      required: true,
+      desc: 'If releasing is enabled',
+    });
+
+    this.option('withBabel', {
+      type: Boolean,
+      required: false,
+      defaults: undefined,
+      desc: 'Babel enabled.',
+    });
+
+    this.option('documentation', {
+      type: Boolean,
+      required: true,
+      desc: 'Include documentation',
+    });
+  }
+
+  writing() {
+    const pkg = this.fs.readJSON(this.destinationPath('package.json'));
+
+    const isReleasePleaseEnabled =
+      this.options.enable &&
+      this.fs.exists(
+        this.destinationPath('.github/workflows/release-please.yml'),
+      );
+    const isStandardVersionEnabled =
+      this.options.enable && !isReleasePleaseEnabled;
+
+    if (!isStandardVersionEnabled) {
+      packageUtils.removeDevDependencies(pkg, ['standard-version']);
+      packageUtils.removeScripts(pkg, ['release', 'preversion']);
+    } else {
+      packageUtils.addDevDependencies(pkg, ['standard-version']);
+      packageUtils.addScripts(pkg, {
+        release:
+          "repository-check-dirty && yarn preversion && standard-version -a -m 'chore(release): %s [skip ci]' && git push --follow-tags origin master && npm publish",
+        preversion: [
+          'yarn run lint',
+          this.options.withBabel && 'yarn run build',
+          this.options.documentation && 'yarn run generate:docs',
+          'repository-check-dirty',
+        ]
+          .filter(Boolean)
+          .join(' && '),
+      });
+
+      if (pkg.scripts.version === 'pob-version') {
+        delete pkg.scripts.version;
+      }
+    }
+
+    if (!isReleasePleaseEnabled) {
+      this.fs.delete(
+        this.destinationPath('.github/workflows/release-please.yml'),
+      );
+    } else {
+      this.fs.copyTpl(
+        this.templatePath('release-please.yml.ejs'),
+        this.destinationPath('.github/workflows/release-please.yml'),
+        {
+          isLerna: !!inLerna,
+          // publish: ...
+        },
+      );
+    }
+
+    this.fs.writeJSON(this.destinationPath('package.json'), pkg);
+  }
+}

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

@@ -0,0 +1,34 @@
+name: release-please
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  release-please:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: GoogleCloudPlatform/release-please-action@v2
+        id: release
+        with:
+          token: ${{ secrets.GH_TOKEN }}
+          release-type: node
+          package-name: release-please-action
+
+      # publish:
+      - uses: actions/checkout@v2
+        # 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@v2
+        with:
+          node-version: 14
+          registry-url: 'https://registry.npmjs.org'
+        if: ${{ steps.release.outputs.release_created }}
+
+      - run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+        if: ${{ steps.release.outputs.release_created }}

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

@@ -177,37 +177,29 @@ export default class MonorepoLernaGenerator extends Generator {
       'lint:eslint':
         monorepoConfig &&
         monorepoConfig.eslint &&
-        // TODO yarn --cwd doesnt work inside script in package with yarn 2
-        (this.packagesConfig.length < 25 ||
-          this.options.packageManager === 'yarn')
+        this.packagesConfig.length < 25
           ? 'eslint --report-unused-disable-directives --resolve-plugins-relative-to . --quiet .'
+          : // eslint-disable-next-line unicorn/no-nested-ternary
+          this.options.packageManager === 'yarn'
+          ? 'yarn workspaces foreach --parallel -Av run lint'
           : 'lerna run --stream lint',
-      preversion: [
-        monorepoConfig &&
-        monorepoConfig.eslint &&
-        (this.packagesConfig.length < 25 ||
-          this.options.packageManager === 'yarn')
-          ? `${packageManager} run lint`
-          : `${packageManager} run lint:prettier && ${packageManager} run lint:eslint${
-              useYarnWorkspacesCommand ? '' : ' --since'
-            }`,
-        withBabel && `${packageManager} run build`,
-        'repository-check-dirty',
-      ]
-        .filter(Boolean)
-        .join(' && '),
-      // cannot use this with lerna because it changes packages.json
-      // prepublishOnly: 'repository-check-dirty',
-      release: [
-        `${
-          this.options.packageManager === 'yarn' ? '' : 'cross-env '
-        }GH_TOKEN=$POB_GITHUB_TOKEN lerna version --conventional-commits --conventional-graduate --create-release=github -m 'chore: release'`,
-        !this.options.isAppProject && 'lerna publish from-git',
-      ]
-        .filter(Boolean)
-        .join(' && '),
     });
 
+    this.fs.copyTpl(
+      this.templatePath('workflow-publish.yml.ejs'),
+      this.destinationPath('.github/workflows/publish.yml'),
+      {
+        publish: !this.options.isAppProject,
+      },
+    );
+
+    packageUtils.removeScripts(
+      pkg,
+      [pkg.name !== 'pob-dependencies' && 'preversion', 'release'].filter(
+        Boolean,
+      ),
+    );
+
     packageUtils.addOrRemoveScripts(pkg, withTests, {
       test: `${
         useYarnWorkspacesCommand

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

@@ -0,0 +1,77 @@
+name: publish
+on:
+  workflow_dispatch:
+    inputs:
+      dry-run:
+        description: 'Dry run? (y/N)'
+        required: true
+        default: 'N'
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.GH_TOKEN }}
+          fetch-depth: 0
+
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 14
+
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: |
+            .yarn/unplugged
+            .yarn/build-state.yml
+            .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
+        run: yarn install --immutable --immutable-cache
+
+      - name: New version (dry run)
+        if: |
+          github.ref == 'refs/heads/main'
+          && contains(github.event.inputs.dry-run, 'y')
+        run: yarn lerna version --yes --no-push --conventional-commits --conventional-graduate --no-git-tag-version --loglevel=verbose
+
+      - name: Configure Git user
+        if: |
+          github.ref == 'refs/heads/main'
+          && contains(github.event.inputs.dry-run, 'y') == false
+        run: |
+          git config --global user.name 'github-actions[bot]'
+          git config --global user.email 'github-actions[bot]@users.noreply.github.com'
+
+      - name: New version
+        if: |
+          github.ref == 'refs/heads/main'
+          && contains(github.event.inputs.dry-run, 'y') == false
+        run: |
+          yarn lerna version --yes --push --conventional-commits --conventional-graduate --create-release=github -m 'chore: release [skip ci]'
+        env:
+          GH_TOKEN: ${{ secrets.GH_TOKEN }}
+          YARN_ENABLE_IMMUTABLE_INSTALLS: false
+<% if (publish) { -%>
+
+      - uses: actions/setup-node@v2
+        if: |
+          github.ref == 'refs/heads/main'
+          && contains(github.event.inputs.dry-run, 'y') == false
+        with:
+          node-version: 14
+          registry-url: 'https://registry.npmjs.org'
+
+      - run: lerna publish from-git --no-verify-access --yes
+        if: |
+          github.ref == 'refs/heads/main'
+          && contains(github.event.inputs.dry-run, 'y') == false
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+<% } -%>

package/lib/pob.js

@@ -29,6 +29,7 @@ import CoreYarnGenerator from './generators/core/yarn/CoreYarnGenerator.js';
 import PobLibGenerator from './generators/lib/PobLibGenerator.js';
 import LibDocGenerator from './generators/lib/doc/LibDocGenerator.js';
 import LibReadmeGenerator from './generators/lib/readme/LibReadmeGenerator.js';
+import LibReleaseGenerator from './generators/lib/release/LibReleaseGenerator.js';
 import PobMonorepoGenerator from './generators/monorepo/PobMonorepoGenerator.js';
 import MonorepoLernaGenerator from './generators/monorepo/lerna/MonorepoLernaGenerator.js';
 import MonorepoTypescriptGenerator from './generators/monorepo/typescript/MonorepoTypescriptGenerator.js';
@@ -187,6 +188,11 @@ env.registerStub(
   'pob:lib:readme',
   `${__dirname}/generators/lib/readme/LibReadmeGenerator.js`,
 );
+env.registerStub(
+  LibReleaseGenerator,
+  'pob:lib:release',
+  `${__dirname}/generators/lib/release/LibReleaseGenerator.js`,
+);
 env.registerStub(
   PobMonorepoGenerator,
   'pob:monorepo',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pob",
-  "version": "8.7.0",
+  "version": "8.8.2",
   "description": "Pile of bones, library generator with git/babel/typescript/typedoc/readme/jest",
   "keywords": [
     "skeleton"
@@ -63,12 +63,12 @@
     "mem-fs-editor": "8.1.2",
     "minimist-argv": "^1.1.0",
     "parse-author": "^2.0.0",
-    "pob-dependencies": "^5.8.0",
+    "pob-dependencies": "^5.9.2",
     "prettier": "2.4.1",
     "semver": "^7.3.4",
     "update-notifier": "^5.0.1",
     "yeoman-environment": "^3.5.1",
     "yeoman-generator": "^5.4.0"
   },
-  "gitHead": "9a766ac7b8e8090527bb7a5aca2c80a29605bb81"
+  "gitHead": "fb02f559e09921ba0fb110a26cae9dca8053ac80"
 }