pob 20.0.0 → 21.0.0

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

@@ -11,7 +11,7 @@ export default class CommonHuskyGenerator extends Generator {
       type: String,
       required: false,
       default: "",
-      desc: "Destination of the generated files.",
+      description: "Destination of the generated files.",
     });
   }
 
@@ -51,7 +51,7 @@ export default class CommonHuskyGenerator extends Generator {
     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.js"),
       );
     }
 
@@ -72,12 +72,12 @@ export default class CommonHuskyGenerator extends Generator {
         if (pkg.type !== "module") {
           this.fs.copy(
             this.templatePath("lint-staged.config.cjs.txt"),
-            this.destinationPath("lint-staged.config.js")
+            this.destinationPath("lint-staged.config.js"),
           );
         } else {
           this.fs.copy(
             this.templatePath("lint-staged.config.js.txt"),
-            this.destinationPath("lint-staged.config.js")
+            this.destinationPath("lint-staged.config.js"),
           );
         }
       }

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/release/CommonReleaseGenerator.js

@@ -8,58 +8,59 @@ export default class CommonReleaseGenerator extends Generator {
     this.option("enable", {
       type: Boolean,
       required: true,
-      desc: "If releasing is enabled",
+      description: "If releasing is enabled",
     });
 
     this.option("enablePublish", {
       type: Boolean,
       required: true,
-      desc: "If publish on npm is enabled",
+      description: "If publish on npm is enabled",
     });
 
     this.option("withBabel", {
       type: Boolean,
       required: false,
       default: undefined,
-      desc: "Babel enabled.",
+      description: "Babel enabled.",
     });
 
     this.option("withTypescript", {
       type: Boolean,
       required: false,
       default: undefined,
-      desc: "Typescript enabled.",
+      description: "Typescript enabled.",
     });
     this.option("isMonorepo", {
       type: Boolean,
       default: false,
-      desc: "is monorepo",
+      description: "is monorepo",
     });
 
     this.option("enableYarnVersion", {
       type: Boolean,
       default: true,
-      desc: "enable yarn version conventional commits",
+      description: "enable yarn version conventional commits",
     });
 
     this.option("ci", {
       type: Boolean,
       required: true,
-      desc: "ci with github actions",
+      description: "ci with github actions",
     });
 
     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", {
       type: Boolean,
       required: false,
       default: false,
-      desc: "Avoid asking questions",
+      description: "Avoid asking questions",
     });
   }
 
@@ -68,7 +69,7 @@ export default class CommonReleaseGenerator extends Generator {
 
     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";
@@ -85,7 +86,7 @@ export default class CommonReleaseGenerator extends Generator {
           isMonorepoIndependent:
             this.options.isMonorepo &&
             (!pkg.version || pkg.version === "0.0.0"),
-        }
+        },
       );
     } else {
       this.fs.delete(this.destinationPath(".github/workflows/publish.yml"));
@@ -117,11 +118,11 @@ export default class CommonReleaseGenerator extends Generator {
 
     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"),
       );
     }
 

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]'
 <% } -%>

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

@@ -15,111 +15,112 @@ export default class CommonTestingGenerator extends Generator {
     this.option("monorepo", {
       type: Boolean,
       default: false,
-      desc: "is root monorepo",
+      description: "is root monorepo",
     });
 
     this.option("enable", {
       type: Boolean,
       default: true,
-      desc: "enable testing",
+      description: "enable testing",
     });
 
     this.option("runner", {
       type: String,
       default: "jest",
-      desc: "test runner (jest or node)",
+      description: "test runner (jest or node)",
     });
 
     this.option("enableReleasePlease", {
       type: Boolean,
       default: true,
-      desc: "enable release-please",
+      description: "enable release-please",
     });
 
     this.option("enableYarnVersion", {
       type: Boolean,
       default: true,
-      desc: "enable yarn version conventional commits",
+      description: "enable yarn version conventional commits",
     });
 
     this.option("ci", {
       type: Boolean,
       required: true,
-      desc: "ci",
+      description: "ci",
     });
 
     this.option("typescript", {
       type: Boolean,
       required: true,
-      desc: "typescript",
+      description: "typescript",
     });
 
     this.option("build", {
       type: Boolean,
       required: true,
-      desc: "build (with babel or typescript)",
+      description: "build (with babel or typescript)",
     });
 
     this.option("codecov", {
       type: Boolean,
       required: true,
-      desc: "Include codecov report",
+      description: "Include codecov report",
     });
 
     this.option("documentation", {
       type: Boolean,
       required: true,
-      desc: "Include documentation generation",
+      description: "Include documentation generation",
     });
 
     this.option("packageManager", {
       type: String,
       default: "yarn",
-      desc: "yarn or npm",
+      description: "yarn or npm",
     });
 
     this.option("isApp", {
       type: Boolean,
       required: true,
-      desc: "is app",
+      description: "is app",
     });
 
     this.option("e2eTesting", {
       type: String,
       default: "",
-      desc: "e2e testing package path",
+      description: "e2e testing package path",
     });
 
     this.option("splitCIJobs", {
       type: Boolean,
       required: true,
-      desc: "split CI jobs for faster result",
+      description: "split CI jobs for faster result",
     });
 
     this.option("onlyLatestLTS", {
       type: Boolean,
       required: true,
-      desc: "only latest lts",
+      description: "only latest lts",
     });
 
     this.option("srcDirectory", {
       type: String,
       default: "src",
-      desc: 'customize srcDirectory, default to "src"',
+      description: 'customize srcDirectory, default to "src"',
     });
 
     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("swc", {
       type: Boolean,
       required: false,
       default: false,
-      desc: "Use swc to transpile code.",
+      description: "Use swc to transpile code.",
     });
   }
 
@@ -170,9 +171,9 @@ export default class CommonTestingGenerator extends Generator {
     const transpileWithBabel = transpileWithEsbuild
       ? false
       : // eslint-disable-next-line unicorn/no-nested-ternary
-      this.options.monorepo
-      ? yoConfigPobMonorepo.typescript
-      : packageUtils.transpileWithBabel(pkg);
+        this.options.monorepo
+        ? yoConfigPobMonorepo.typescript
+        : packageUtils.transpileWithBabel(pkg);
     const withTypescript = transpileWithBabel || pkg.pob?.typescript;
     let hasReact =
       withTypescript &&
@@ -218,7 +219,7 @@ export default class CommonTestingGenerator extends Generator {
           pkg,
           sharedCondition &&
             (testRunner === "node" || (withTypescript && !transpileWithBabel)),
-          devDependenciesShared
+          devDependenciesShared,
         );
         if (devDependenciesWithJest) {
           packageUtils.addOrRemoveDevDependencies(
@@ -227,7 +228,7 @@ export default class CommonTestingGenerator extends Generator {
               withTypescript &&
               !transpileWithBabel &&
               testRunner === "jest",
-            devDependenciesWithJest
+            devDependenciesWithJest,
           );
         }
         if (devDependenciesWithNode) {
@@ -237,10 +238,10 @@ export default class CommonTestingGenerator extends Generator {
               withTypescript &&
               !transpileWithBabel &&
               testRunner === "node",
-            devDependenciesWithNode
+            devDependenciesWithNode,
           );
         }
-      }
+      },
     );
 
     if (
@@ -343,7 +344,7 @@ export default class CommonTestingGenerator extends Generator {
       this.options.enable &&
         (enableForMonorepo || !globalTesting) &&
         testRunner === "jest",
-      ["jest", "@types/jest"]
+      ["jest", "@types/jest"],
     );
 
     if (!this.options.enable) {
@@ -415,7 +416,7 @@ export default class CommonTestingGenerator extends Generator {
 
         if (isJestRunner) {
           hasReact = yoConfigPobMonorepo.packageNames.some((pkgName) =>
-            pkgName.startsWith("react-")
+            pkgName.startsWith("react-"),
           );
 
           const jestConfig = this.fs.readJSON(jestConfigPath, pkg.jest ?? {});
@@ -453,8 +454,8 @@ export default class CommonTestingGenerator extends Generator {
               Object.entries(jestConfig.transform).filter(
                 ([key, value]) =>
                   value !== "@swc/jest" &&
-                  !(Array.isArray(value) && value[0] === "@swc/jest")
-              )
+                  !(Array.isArray(value) && value[0] === "@swc/jest"),
+              ),
             );
             if (Object.keys(jestConfig.transform).length === 0) {
               delete jestConfig.transform;
@@ -473,7 +474,7 @@ export default class CommonTestingGenerator extends Generator {
             tsconfigTestPath,
             {
               nodeVersion,
-            }
+            },
           );
         } else {
           this.fs.delete(tsconfigTestPath);
@@ -491,9 +492,10 @@ export default class CommonTestingGenerator extends Generator {
               .replace("\\", "/")}`,
           });
         } else {
-          const babelEnvs = pkg.pob?.babelEnvs || [];
-          const transpileWithBabel = packageUtils.transpileWithBabel(pkg);
-          const withTypescript = babelEnvs.length > 0 || pkg.pob?.typescript;
+          const withTypescript =
+            pkg.pob?.envs?.length > 0 ||
+            pkg.pob?.bundler === "rollup-babel" ||
+            pkg.pob?.typescript;
 
           const shouldUseExperimentalVmModules =
             pkg.type === "module" && !inMonorepo;
@@ -519,10 +521,9 @@ export default class CommonTestingGenerator extends Generator {
           });
 
           if (testRunner === "jest") {
-            const srcDirectory =
-              transpileWithBabel || withTypescript
-                ? this.options.srcDirectory
-                : "lib";
+            const srcDirectory = this.options.build
+              ? this.options.srcDirectory
+              : "lib";
 
             const jestConfig = this.fs.readJSON(jestConfigPath, pkg.jest ?? {});
             delete pkg.jest;
@@ -577,8 +578,8 @@ export default class CommonTestingGenerator extends Generator {
                   Object.entries(jestConfig.transform).filter(
                     ([key, value]) =>
                       value !== "@swc/jest" &&
-                      !(Array.isArray(value) && value[0] === "@swc/jest")
-                  )
+                      !(Array.isArray(value) && value[0] === "@swc/jest"),
+                  ),
                 );
                 if (Object.keys(jestConfig.transform).length === 0) {
                   delete jestConfig.transform;
@@ -593,8 +594,8 @@ export default class CommonTestingGenerator extends Generator {
                         value &&
                         Array.isArray(value) &&
                         value[0] === "jest-esbuild"
-                      )
-                  )
+                      ),
+                  ),
                 );
                 if (Object.keys(jestConfig.transform).length === 0) {
                   delete jestConfig.transform;
@@ -612,8 +613,9 @@ export default class CommonTestingGenerator extends Generator {
             }
 
             if (
-              babelEnvs.length === 0 ||
-              babelEnvs.some((env) => env.target === "node")
+              !pkg.pob?.envs ||
+              pkg.pob?.envs.length === 0 ||
+              pkg.pob?.envs.some((env) => env.target === "node")
             ) {
               // jestConfig.testEnvironment = 'node'; this is the default now
               delete jestConfig.testEnvironment;
@@ -652,7 +654,7 @@ export default class CommonTestingGenerator extends Generator {
             !!pkg.devDependencies?.["alp-dev"],
           testing: this.options.testing,
           jestExperimentalESM: pkg.type === "module",
-        }
+        },
       );
     } else {
       this.fs.delete("babel.config.cjs");

package/lib/generators/common/transpiler/CommonTranspilerGenerator.js

@@ -12,14 +12,14 @@ export default class CommonTranspilerGenerator extends Generator {
       type: Boolean,
       required: false,
       default: false,
-      desc: "Avoid asking questions",
+      description: "Avoid asking questions",
     });
 
     this.option("testing", {
       type: Boolean,
       required: false,
       default: false,
-      desc: "Has testing.",
+      description: "Has testing.",
     });
 
     this.option("fromPob", {
@@ -62,7 +62,7 @@ export default class CommonTranspilerGenerator extends Generator {
       type: Boolean,
       required: false,
       default: false,
-      desc: "only latest lts",
+      description: "only latest lts",
     });
   }
 
@@ -137,15 +137,13 @@ export default class CommonTranspilerGenerator extends Generator {
       (pkg.pob.rollup === false
         ? "tsc"
         : pkg.pob.bundler ??
-          (pkg.pob.typescript ? "rollup-typescript" : "rollup"));
+          (pkg.pob.typescript ? "rollup-typescript" : "rollup-babel"));
     this.bundler = bundler;
 
     const cleanCommand = (() => {
       if (bundler === "rollup-typescript") return "pob-typescript-clean-out";
       if (bundler === "rollup-esbuild") return "pob-esbuild-clean-out";
-      if (bundler === "rollup") {
-        return "pob-babel-clean-out";
-      }
+      if (bundler === "rollup-babel") return "pob-babel-clean-out";
       if (bundler === "esbuild") return "pob-esbuild-clean-out";
       return null;
     })();
@@ -225,32 +223,32 @@ export default class CommonTranspilerGenerator extends Generator {
     packageUtils.addOrRemoveDevDependencies(
       pkg,
       bundler === "rollup-typescript",
-      ["@pob/rollup-typescript"]
+      ["@pob/rollup-typescript"],
     );
     packageUtils.addOrRemoveDevDependencies(
       pkg,
       bundler === "esbuild" && withTypescript,
-      ["@pob/esbuild"]
+      ["@pob/esbuild"],
     );
     packageUtils.addOrRemoveDevDependencies(
       pkg,
       bundler === "rollup-esbuild" && withTypescript,
-      ["@pob/rollup-esbuild"]
+      ["@pob/rollup-esbuild"],
     );
     packageUtils.addOrRemoveDependencies(
       pkg,
       (bundler === "tsc" || bundler === "rollup-typescript") && withTypescript,
       ["tslib"],
-      "^"
+      "^",
     );
 
     packageUtils.addOrRemoveDevDependencies(
       pkg,
-      bundler === "rollup" &&
+      bundler === "rollup-babel" &&
         this.options.isApp &&
         !this.options.isAppLibrary &&
         this.options.useAppConfig,
-      ["alp-rollup-plugin-config"]
+      ["alp-rollup-plugin-config"],
     );
 
     /* engines */
@@ -265,7 +263,7 @@ export default class CommonTranspilerGenerator extends Generator {
       console.warn("Setting pkg.sideEffects to true, as it was not defined");
     } else if (pkg.sideEffects) {
       console.warn(
-        "pkg.sideEffects is true, are you sure you can't set it to false ?"
+        "pkg.sideEffects is true, are you sure you can't set it to false ?",
       );
     }
 
@@ -284,9 +282,7 @@ export default class CommonTranspilerGenerator extends Generator {
       // see pkg.exports instead.
       delete pkg.main;
       if (!this.options.isApp) {
-        pkg.types = `./${
-          this.options.buildDirectory
-        }/${"definitions/"}index.d.ts`;
+        pkg.types = `./${this.options.buildDirectory}/${"definitions/"}index.d.ts`;
       } else if (this.options.isAppLibrary) {
         pkg.types = `./${this.options.srcDirectory}/index.ts`;
       }
@@ -330,7 +326,7 @@ export default class CommonTranspilerGenerator extends Generator {
       (env) =>
         env.target === "browser" &&
         env.version === undefined &&
-        (!env.formats || env.formats.includes("es"))
+        (!env.formats || env.formats.includes("es")),
     );
 
     // Legacy "dev" builds
@@ -521,6 +517,7 @@ export default class CommonTranspilerGenerator extends Generator {
   writing() {
     const pkg = this.fs.readJSON(this.destinationPath("package.json"));
     const entries = pkg.pob.entries || ["index"];
+    const envs = pkg.pob.envs || pkg.pob.babelEnvs;
 
     this.fs.delete("rollup.config.js");
     if (
@@ -538,7 +535,7 @@ export default class CommonTranspilerGenerator extends Generator {
             config: this.options.useAppConfig,
             outDirectory: this.options.buildDirectory,
             enableRun: !this.options.isAppLibrary && entries.includes("index"),
-          }
+          },
         );
       } else {
         copyAndFormatTpl(
@@ -548,14 +545,10 @@ export default class CommonTranspilerGenerator extends Generator {
           {
             rollupConfigLib: this.bundler,
             outDirectory: this.options.buildDirectory,
-          }
+          },
         );
       }
-    } else if (
-      !pkg.pob.babelEnvs ||
-      pkg.pob.babelEnvs.length === 0 ||
-      pkg.pob?.bundler === "esbuild"
-    ) {
+    } else if (!envs || envs.length === 0 || pkg.pob?.bundler === "esbuild") {
       this.fs.delete("rollup.config.mjs");
     }