pob 19.2.0 → 21.0.0

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

@@ -1,4 +1,4 @@
-import sortConfig from '@pob/sort-eslint-config';
+import sortConfig from "@pob/sort-eslint-config";
 
 function updateOverrides(config, testsOverride) {
   const existingTestsOverrideIndex = !config.overrides
@@ -49,12 +49,12 @@ function updateParserAndPlugins(
 ) {
   if (useTypescript) {
     // webstorm uses this to detect eslint .ts compat
-    config.parser = '@typescript-eslint/parser';
-    config.plugins = ['@typescript-eslint'];
+    config.parser = "@typescript-eslint/parser";
+    config.plugins = ["@typescript-eslint"];
 
     if (!globalEslint) {
       config.parserOptions = {
-        project: './tsconfig.json',
+        project: "./tsconfig.json",
         createDefaultProgram: true, // fix for lint-staged
       };
     } else {
@@ -65,8 +65,8 @@ function updateParserAndPlugins(
     }
   } else {
     if (
-      config.parser === 'typescript-eslint-parser' ||
-      config.parser === '@typescript-eslint/parser'
+      config.parser === "typescript-eslint-parser" ||
+      config.parser === "@typescript-eslint/parser"
     ) {
       delete config.parser;
     }
@@ -75,8 +75,8 @@ function updateParserAndPlugins(
     }
     if (
       config.plugins &&
-      (config.plugins[0] === 'typescript' ||
-        config.plugins[0] === '@typescript-eslint')
+      (config.plugins[0] === "typescript" ||
+        config.plugins[0] === "@typescript-eslint")
     ) {
       config.plugins.splice(0, 1);
     }
@@ -134,7 +134,7 @@ export default function updateEslintConfig(
     ...(config?.extends && Array.isArray(config.extends)
       ? config.extends.filter(
           (extendsValue) =>
-            extendsValue === '@pob/eslint-config-typescript/allow-unsafe',
+            extendsValue === "@pob/eslint-config-typescript/allow-unsafe",
         )
       : []),
   ];

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

@@ -1,24 +1,24 @@
-import { readlinkSync, rmSync } from 'node:fs';
-import Generator from 'yeoman-generator';
-import inMonorepo from '../../../utils/inMonorepo.js';
-import * as packageUtils from '../../../utils/package.js';
+import { readlinkSync, rmSync } from "node:fs";
+import Generator from "yeoman-generator";
+import inMonorepo from "../../../utils/inMonorepo.js";
+import * as packageUtils from "../../../utils/package.js";
 
 export default class CommonHuskyGenerator extends Generator {
   constructor(args, opts) {
     super(args, opts);
 
-    this.option('destination', {
+    this.option("destination", {
       type: String,
       required: false,
-      default: '',
-      desc: 'Destination of the generated files.',
+      default: "",
+      description: "Destination of the generated files.",
     });
   }
 
   writing() {
-    rmSync('git-hooks', { recursive: true, force: true });
+    rmSync("git-hooks", { recursive: true, force: true });
 
-    const gitHookDestination = this.destinationPath('.git/hooks/pre-commit');
+    const gitHookDestination = this.destinationPath(".git/hooks/pre-commit");
     let isSymlink;
 
     try {
@@ -29,68 +29,68 @@ export default class CommonHuskyGenerator extends Generator {
     }
 
     if (isSymlink) {
-      this.fs.delete('.git/hooks/prepare-commit-msg');
-      this.fs.delete('.git/hooks/post-checkout');
-      this.fs.delete('.git/hooks/post-merge');
-      this.fs.delete('.git/hooks/pre-commit');
+      this.fs.delete(".git/hooks/prepare-commit-msg");
+      this.fs.delete(".git/hooks/post-checkout");
+      this.fs.delete(".git/hooks/post-merge");
+      this.fs.delete(".git/hooks/pre-commit");
     }
 
-    this.fs.delete('.git-hooks/prepare-commit-msg');
-    this.fs.delete('.git-hooks/post-checkout');
-    this.fs.delete('.git-hooks/post-merge');
-    this.fs.delete('.git-hooks/pre-commit');
-    if (this.fs.exists('.git-hooks')) this.fs.delete('.git-hooks');
+    this.fs.delete(".git-hooks/prepare-commit-msg");
+    this.fs.delete(".git-hooks/post-checkout");
+    this.fs.delete(".git-hooks/post-merge");
+    this.fs.delete(".git-hooks/pre-commit");
+    if (this.fs.exists(".git-hooks")) this.fs.delete(".git-hooks");
 
-    if (this.fs.exists(this.destinationPath('.huskyrc.js'))) {
-      this.fs.delete(this.destinationPath('.huskyrc.js'));
+    if (this.fs.exists(this.destinationPath(".huskyrc.js"))) {
+      this.fs.delete(this.destinationPath(".huskyrc.js"));
     }
-    if (this.fs.exists(this.destinationPath('husky.config.js'))) {
-      this.fs.delete(this.destinationPath('husky.config.js'));
+    if (this.fs.exists(this.destinationPath("husky.config.js"))) {
+      this.fs.delete(this.destinationPath("husky.config.js"));
     }
 
-    if (this.fs.exists(this.destinationPath('lint-staged.config.cjs'))) {
+    if (this.fs.exists(this.destinationPath("lint-staged.config.cjs"))) {
       this.fs.move(
-        this.destinationPath('lint-staged.config.cjs'),
-        this.destinationPath('lint-staged.config.js'),
+        this.destinationPath("lint-staged.config.cjs"),
+        this.destinationPath("lint-staged.config.js"),
       );
     }
 
-    const pkg = this.fs.readJSON(this.destinationPath('package.json'));
-    packageUtils.removeDevDependencies(pkg, ['husky']);
+    const pkg = this.fs.readJSON(this.destinationPath("package.json"));
+    packageUtils.removeDevDependencies(pkg, ["husky"]);
 
     if (!inMonorepo || inMonorepo.root) {
-      if (pkg.name !== 'pob-monorepo') {
+      if (pkg.name !== "pob-monorepo") {
         packageUtils.removeDevDependencies(pkg, [
-          '@pob/repo-config',
-          'repository-check-dirty',
+          "@pob/repo-config",
+          "repository-check-dirty",
         ]);
-        packageUtils.addDevDependencies(pkg, ['@pob/root']);
+        packageUtils.addDevDependencies(pkg, ["@pob/root"]);
         // packageUtils.addOrRemoveDevDependencies(pkg, inMonorepo, {
         //   '@commitlint/config-lerna-scopes': '6.1.3',
         // });
 
-        if (pkg.type !== 'module') {
+        if (pkg.type !== "module") {
           this.fs.copy(
-            this.templatePath('lint-staged.config.cjs.txt'),
-            this.destinationPath('lint-staged.config.js'),
+            this.templatePath("lint-staged.config.cjs.txt"),
+            this.destinationPath("lint-staged.config.js"),
           );
         } else {
           this.fs.copy(
-            this.templatePath('lint-staged.config.js.txt'),
-            this.destinationPath('lint-staged.config.js'),
+            this.templatePath("lint-staged.config.js.txt"),
+            this.destinationPath("lint-staged.config.js"),
           );
         }
       }
 
       pkg.commitlint = {
         extends: [
-          '@pob/commitlint-config',
+          "@pob/commitlint-config",
           // '@commitlint/config-lerna-scopes',
         ].filter(Boolean),
       };
 
-      if (pkg.name !== 'pob-monorepo') {
-        packageUtils.addDevDependencies(pkg, ['@pob/commitlint-config']);
+      if (pkg.name !== "pob-monorepo") {
+        packageUtils.addDevDependencies(pkg, ["@pob/commitlint-config"]);
       }
 
       // if (packageUtils.hasLerna(pkg)) {
@@ -103,10 +103,10 @@ export default class CommonHuskyGenerator extends Generator {
       // this.fs.delete('.git/hooks/husky.local.sh');
     } else {
       packageUtils.removeDevDependencies(pkg, [
-        pkg.name !== 'pob' && '@pob/root',
-        '@pob/commitlint-config',
+        pkg.name !== "pob" && "@pob/root",
+        "@pob/commitlint-config",
       ]);
-      this.fs.delete(this.destinationPath('lint-staged.config.cjs'));
+      this.fs.delete(this.destinationPath("lint-staged.config.cjs"));
 
       delete pkg.commitlint;
     }
@@ -122,10 +122,10 @@ export default class CommonHuskyGenerator extends Generator {
       delete pkg.scripts.postrewrite;
       delete pkg.scripts.postpublish;
     }
-    delete pkg['lint-staged'];
+    delete pkg["lint-staged"];
     delete pkg.husky;
 
-    this.fs.writeJSON(this.destinationPath('package.json'), pkg);
+    this.fs.writeJSON(this.destinationPath("package.json"), pkg);
   }
 
   end() {}

package/lib/generators/common/husky/templates/lint-staged.config.js.txt

@@ -1,3 +1,3 @@
-import createLintStagedConfig from '@pob/root/createLintStagedConfig';
+import createLintStagedConfig from "@pob/root/createLintStagedConfig";
 
 export default createLintStagedConfig();

package/lib/generators/common/old-dependencies/CommonRemoveOldDependenciesGenerator.js

@@ -1,54 +1,54 @@
-import Generator from 'yeoman-generator';
-import * as packageUtils from '../../../utils/package.js';
+import Generator from "yeoman-generator";
+import * as packageUtils from "../../../utils/package.js";
 
 export default class CommonRemoveOldDependenciesGenerator extends Generator {
   writing() {
-    const pkg = this.fs.readJSON(this.destinationPath('package.json'));
+    const pkg = this.fs.readJSON(this.destinationPath("package.json"));
 
     // old pob dependencies
-    packageUtils.removeDependencies(pkg, ['flow-runtime']);
+    packageUtils.removeDependencies(pkg, ["flow-runtime"]);
     packageUtils.removeDevDependencies(pkg, [
-      'tcomb',
-      'tcomb-forked',
-      'flow-runtime',
-      'flow-bin',
-      'springbokjs-library',
-      'babel-preset-es2015',
-      'babel-preset-es2015-webpack',
-      'babel-preset-es2015-node5',
-      'babel-preset-es2015-node6',
-      'babel-preset-pob',
-      'babel-preset-latest',
-      'babel-preset-latest-node',
-      'babel-preset-stage-0',
-      'babel-preset-stage-1',
-      'babel-preset-modern-browsers-stage-1',
-      'babel-preset-flow',
-      'babel-preset-flow-tcomb',
-      'babel-preset-flow-tcomb-forked',
-      'babel-plugin-typecheck',
-      'babel-plugin-defines',
-      'babel-plugin-import-rename',
-      'babel-plugin-discard-module-references',
-      'babel-plugin-remove-dead-code',
-      'babel-plugin-react-require',
-      'babel-preset-react',
-      'babel-preset-pob-react',
-      'komet',
-      'komet-karma',
-      '@commitlint/cli',
-      '@commitlint/config-conventional',
-      'lint-staged',
-      'yarnhook',
-      'yarn-deduplicate', // in @pob/root (for yarn 1)
-      'yarn-berry-deduplicate', // use yarn dedupe with yarn 2
-      'yarn-update-lock',
-      '@pob/version',
-      'pob-release',
-      'eslint-plugin-typescript',
-      'xunit-file',
+      "tcomb",
+      "tcomb-forked",
+      "flow-runtime",
+      "flow-bin",
+      "springbokjs-library",
+      "babel-preset-es2015",
+      "babel-preset-es2015-webpack",
+      "babel-preset-es2015-node5",
+      "babel-preset-es2015-node6",
+      "babel-preset-pob",
+      "babel-preset-latest",
+      "babel-preset-latest-node",
+      "babel-preset-stage-0",
+      "babel-preset-stage-1",
+      "babel-preset-modern-browsers-stage-1",
+      "babel-preset-flow",
+      "babel-preset-flow-tcomb",
+      "babel-preset-flow-tcomb-forked",
+      "babel-plugin-typecheck",
+      "babel-plugin-defines",
+      "babel-plugin-import-rename",
+      "babel-plugin-discard-module-references",
+      "babel-plugin-remove-dead-code",
+      "babel-plugin-react-require",
+      "babel-preset-react",
+      "babel-preset-pob-react",
+      "komet",
+      "komet-karma",
+      "@commitlint/cli",
+      "@commitlint/config-conventional",
+      "lint-staged",
+      "yarnhook",
+      "yarn-deduplicate", // in @pob/root (for yarn 1)
+      "yarn-berry-deduplicate", // use yarn dedupe with yarn 2
+      "yarn-update-lock",
+      "@pob/version",
+      "pob-release",
+      "eslint-plugin-typescript",
+      "xunit-file",
     ]);
 
-    this.fs.writeJSON(this.destinationPath('package.json'), pkg);
+    this.fs.writeJSON(this.destinationPath("package.json"), pkg);
   }
 }

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

@@ -1,81 +1,82 @@
-import Generator from 'yeoman-generator';
-import * as packageUtils from '../../../utils/package.js';
+import Generator from "yeoman-generator";
+import * as packageUtils from "../../../utils/package.js";
 
 export default class CommonReleaseGenerator extends Generator {
   constructor(args, opts) {
     super(args, opts);
 
-    this.option('enable', {
+    this.option("enable", {
       type: Boolean,
       required: true,
-      desc: 'If releasing is enabled',
+      description: "If releasing is enabled",
     });
 
-    this.option('enablePublish', {
+    this.option("enablePublish", {
       type: Boolean,
       required: true,
-      desc: 'If publish on npm is enabled',
+      description: "If publish on npm is enabled",
     });
 
-    this.option('withBabel', {
+    this.option("withBabel", {
       type: Boolean,
       required: false,
       default: undefined,
-      desc: 'Babel enabled.',
+      description: "Babel enabled.",
     });
 
-    this.option('withTypescript', {
+    this.option("withTypescript", {
       type: Boolean,
       required: false,
       default: undefined,
-      desc: 'Typescript enabled.',
+      description: "Typescript enabled.",
     });
-    this.option('isMonorepo', {
+    this.option("isMonorepo", {
       type: Boolean,
       default: false,
-      desc: 'is monorepo',
+      description: "is monorepo",
     });
 
-    this.option('enableYarnVersion', {
+    this.option("enableYarnVersion", {
       type: Boolean,
       default: true,
-      desc: 'enable yarn version conventional commits',
+      description: "enable yarn version conventional commits",
     });
 
-    this.option('ci', {
+    this.option("ci", {
       type: Boolean,
       required: true,
-      desc: 'ci with github actions',
+      description: "ci with github actions",
     });
 
-    this.option('disableYarnGitCache', {
+    this.option("disableYarnGitCache", {
       type: Boolean,
       required: false,
       default: false,
-      desc: 'Disable git cache. See https://yarnpkg.com/features/caching#offline-mirror.',
+      description:
+        "Disable git cache. See https://yarnpkg.com/features/caching#offline-mirror.",
     });
 
-    this.option('updateOnly', {
+    this.option("updateOnly", {
       type: Boolean,
       required: false,
       default: false,
-      desc: 'Avoid asking questions',
+      description: "Avoid asking questions",
     });
   }
 
   writing() {
-    const pkg = this.fs.readJSON(this.destinationPath('package.json'));
+    const pkg = this.fs.readJSON(this.destinationPath("package.json"));
 
     if (this.options.enable && this.options.ci) {
       const useLegacyName = this.fs.exists(
-        this.destinationPath('.github/workflows/publish.yml'),
+        this.destinationPath(".github/workflows/publish.yml"),
       );
 
-      const name = useLegacyName ? 'publish.yml' : 'release.yml';
+      const name = useLegacyName ? "publish.yml" : "release.yml";
 
       // TODO rename release (release = version + publish)
       this.fs.copyTpl(
-        this.templatePath('workflow-release.yml.ejs'),
+        this.templatePath("workflow-release.yml.ejs"),
         this.destinationPath(`.github/workflows/${name}`),
         {
           enablePublish: this.options.enablePublish,
@@ -84,49 +85,49 @@ export default class CommonReleaseGenerator extends Generator {
           isMonorepo: this.options.isMonorepo,
           isMonorepoIndependent:
             this.options.isMonorepo &&
-            (!pkg.version || pkg.version === '0.0.0'),
+            (!pkg.version || pkg.version === "0.0.0"),
         },
       );
     } else {
-      this.fs.delete(this.destinationPath('.github/workflows/publish.yml'));
-      this.fs.delete(this.destinationPath('.github/workflows/release.yml'));
+      this.fs.delete(this.destinationPath(".github/workflows/publish.yml"));
+      this.fs.delete(this.destinationPath(".github/workflows/release.yml"));
     }
 
-    packageUtils.removeDevDependencies(pkg, ['standard-version']);
+    packageUtils.removeDevDependencies(pkg, ["standard-version"]);
     packageUtils.removeScripts(pkg, [
-      'release',
-      pkg.name === 'pob-dependencies' ? null : 'preversion',
+      "release",
+      pkg.name === "pob-dependencies" ? null : "preversion",
     ]);
 
-    if (pkg.scripts.version === 'pob-version') {
+    if (pkg.scripts.version === "pob-version") {
       delete pkg.scripts.version;
     }
 
     if (this.options.enable && !this.options.ci) {
       packageUtils.addScripts(pkg, {
         preversion: [
-          'yarn run lint',
+          "yarn run lint",
           this.options.withBabel ||
-            (this.options.withTypescript && 'yarn run build'),
-          'repository-check-dirty',
+            (this.options.withTypescript && "yarn run build"),
+          "repository-check-dirty",
         ]
           .filter(Boolean)
-          .join(' && '),
+          .join(" && "),
       });
     }
 
     if (
       this.fs.exists(
-        this.destinationPath('.github/workflows/release-please.yml'),
+        this.destinationPath(".github/workflows/release-please.yml"),
       )
     ) {
       this.fs.delete(
-        this.destinationPath('.github/workflows/release-please.yml'),
+        this.destinationPath(".github/workflows/release-please.yml"),
       );
     }
 
-    this.fs.delete(this.destinationPath('.release-please-manifest.json'));
+    this.fs.delete(this.destinationPath(".release-please-manifest.json"));
 
-    this.fs.writeJSON(this.destinationPath('package.json'), pkg);
+    this.fs.writeJSON(this.destinationPath("package.json"), pkg);
   }
 }

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

@@ -46,7 +46,7 @@ jobs:
       - name: New version (dry run)
         if: github.ref == 'refs/heads/main' && inputs.dry-run
 <% if (enableYarnVersion) { -%>
-        run: yarn version --dry-run<% if (isMonorepo && isMonorepoIndependent) { %> --bump-dependents-highest-as=${{ inputs.bump-dependents-highest-as }}<% } %>
+        run: yarn yarn-version version --dry-run<% if (isMonorepo && isMonorepoIndependent) { %> --bump-dependents-highest-as=${{ inputs.bump-dependents-highest-as }}<% } %>
 <% } else { -%>
         run: yarn lerna version --yes --no-push --exact --conventional-commits --conventional-graduate --changelog-preset conventional-changelog-conventionalcommits --no-git-tag-version --loglevel=verbose
 <% } -%>
@@ -60,7 +60,7 @@ jobs:
         if: github.ref == 'refs/heads/main' && !inputs.dry-run
         run: |
 <% if (enableYarnVersion) { -%>
-          yarn version --create-release=github <% if (isMonorepo && isMonorepoIndependent) { %> --bump-dependents-highest-as=${{ inputs.bump-dependents-highest-as }}<% } %> -m 'chore: release <%- isMonorepoIndependent ? '' : '%v ' %>[skip ci]<%- isMonorepoIndependent ? '\\n\\n%t' : '' %>'
+          yarn yarn-version version --create-release=github <% if (isMonorepo && isMonorepoIndependent) { %> --bump-dependents-highest-as=${{ inputs.bump-dependents-highest-as }}<% } %> -m 'chore: release <%- isMonorepoIndependent ? '' : '%v ' %>[skip ci]<%- isMonorepoIndependent ? '\\n\\n%t' : '' %>'
 <% } else { -%>
           yarn lerna version --yes --push --exact --conventional-commits --conventional-graduate --changelog-preset conventional-changelog-conventionalcommits --create-release=github -m 'chore: release [skip ci]'
 <% } -%>