pob 20.0.0 → 21.1.0

package/lib/generators/core/package/CorePackageGenerator.js

@@ -13,34 +13,34 @@ export default class CorePackageGenerator extends Generator {
       type: Boolean,
       required: true,
       default: false,
-      desc: "is monorepo",
+      description: "is monorepo",
     });
 
     this.option("inMonorepo", {
       type: Boolean,
       required: true,
       default: false,
-      desc: "in monorepo",
+      description: "in monorepo",
     });
 
     this.option("isRoot", {
       type: Boolean,
       required: true,
       default: false,
-      desc: "is root",
+      description: "is root",
     });
 
     this.option("private", {
       type: Boolean,
       required: false,
       default: false,
-      desc: "private package",
+      description: "private package",
     });
 
     this.option("packageType", {
       type: String,
       required: false,
-      desc: "package type",
+      description: "package type",
     });
   }
 
@@ -130,13 +130,13 @@ export default class CorePackageGenerator extends Generator {
           name: "authorName",
           message: "Author's Name",
           when: !pkg.authors && (!author || !author.name),
-          default: this.git.name(),
+          default: await this.git.name(),
         },
         {
           name: "authorEmail",
           message: "Author's Email",
           when: !pkg.authors && (!author || !author.email),
-          default: this.git.email(),
+          default: await this.git.email(),
         },
         {
           name: "authorUrl",
@@ -157,7 +157,7 @@ export default class CorePackageGenerator extends Generator {
           choices: ["MIT", "ISC", "UNLICENSED"],
           when: !pkg.license,
         },
-      ].filter(Boolean)
+      ].filter(Boolean),
     );
 
     if (!pkg.type) pkg.type = props.type;
@@ -199,10 +199,10 @@ export default class CorePackageGenerator extends Generator {
       packageUtils.removeDevDependencies(pkg, ["check-package-dependencies"]);
     } else if (this.options.isMonorepo && this.options.isRoot) {
       const doesMjsCheckPackagesExists = this.fs.exists(
-        this.destinationPath("scripts/check-packages.mjs")
+        this.destinationPath("scripts/check-packages.mjs"),
       );
       let doesJsCheckPackagesExists = this.fs.exists(
-        this.destinationPath("scripts/check-packages.js")
+        this.destinationPath("scripts/check-packages.js"),
       );
 
       if (pkg.type === "module" && !doesJsCheckPackagesExists) {
@@ -210,7 +210,7 @@ export default class CorePackageGenerator extends Generator {
         this.fs.copyTpl(
           this.templatePath("check-packages.js.ejs"),
           this.destinationPath("scripts/check-packages.js"),
-          {}
+          {},
         );
       }
 
@@ -225,7 +225,7 @@ export default class CorePackageGenerator extends Generator {
           checks: `node scripts/check-packages.${
             doesMjsCheckPackagesExists ? "mjs" : "js"
           }`,
-        }
+        },
       );
     } else if (inMonorepo && !inMonorepo.root) {
       if (this.fs.exists("scripts/check-package.js")) {
@@ -237,10 +237,10 @@ export default class CorePackageGenerator extends Generator {
       packageUtils.removeScripts(pkg, ["checks"]);
     } else {
       const doesMjsCheckPackageExists = this.fs.exists(
-        this.destinationPath("scripts/check-package.mjs")
+        this.destinationPath("scripts/check-package.mjs"),
       );
       let doesJsCheckPackageExists = this.fs.exists(
-        this.destinationPath("scripts/check-package.js")
+        this.destinationPath("scripts/check-package.js"),
       );
 
       if (pkg.type === "module") {
@@ -251,7 +251,7 @@ export default class CorePackageGenerator extends Generator {
             this.destinationPath("scripts/check-package.js"),
             {
               isLibrary: pkg.private !== true,
-            }
+            },
           );
         }
       }
@@ -266,7 +266,7 @@ export default class CorePackageGenerator extends Generator {
           checks: `node scripts/check-package.${
             doesMjsCheckPackageExists ? "mjs" : "js"
           }`,
-        }
+        },
       );
     }
 
@@ -290,7 +290,7 @@ export default class CorePackageGenerator extends Generator {
         {
           year: new Date().getFullYear(),
           author: pkg.author,
-        }
+        },
       );
     }
 
@@ -336,7 +336,7 @@ export default class CorePackageGenerator extends Generator {
           pkg.scripts[scriptName].startsWith("pob-root-postinstall && ")
         ) {
           pkg.scripts[scriptName] = pkg.scripts[scriptName].slice(
-            "pob-root-postinstall && ".length - 1
+            "pob-root-postinstall && ".length - 1,
           );
         } else if (pkg.scripts[scriptName].includes("pob-root-postinstall")) {
           throw new Error("Could not remove pob-root-postinstall");

package/lib/generators/core/renovate/CoreRenovateGenerator.js

@@ -10,21 +10,21 @@ export default class CoreRenovateGenerator extends Generator {
       type: Boolean,
       required: false,
       default: false,
-      desc: "disable",
+      description: "disable",
     });
 
     this.option("app", {
       type: Boolean,
       required: false,
       default: false,
-      desc: "is app (instead of lib)",
+      description: "is app (instead of lib)",
     });
 
     this.option("updateOnly", {
       type: Boolean,
       required: false,
       default: false,
-      desc: "Avoid asking questions",
+      description: "Avoid asking questions",
     });
   }
 
@@ -62,7 +62,7 @@ export default class CoreRenovateGenerator extends Generator {
       const pkg = this.fs.readJSON(this.destinationPath("package.json"), {});
       const renovateConfig = this.fs.readJSON(
         this.destinationPath("renovate.json"),
-        {}
+        {},
       );
 
       if (this.options.app) {
@@ -84,7 +84,7 @@ export default class CoreRenovateGenerator extends Generator {
       writeAndFormatJson(
         this.fs,
         this.destinationPath("renovate.json"),
-        renovateConfig
+        renovateConfig,
       );
     } else if (this.fs.exists(this.destinationPath("renovate.json"))) {
       this.fs.delete(this.destinationPath("renovate.json"));

package/lib/generators/core/sort-package/CoreSortPackageGenerator.js

@@ -8,7 +8,7 @@ export default class CoreSortPackageGenerator extends Generator {
     writeAndFormatJson(
       this.fs,
       this.destinationPath("package.json"),
-      packageUtils.sort(pkg)
+      packageUtils.sort(pkg),
     );
   }
 }

package/lib/generators/core/vscode/CoreVSCodeGenerator.js

@@ -10,48 +10,49 @@ export default class CoreVSCodeGenerator extends Generator {
       type: Boolean,
       required: false,
       default: "",
-      desc: "Is root",
+      description: "Is root",
     });
 
     this.option("packageManager", {
       type: String,
       required: false,
       default: "yarn",
-      desc: "yarn|npm.",
+      description: "yarn|npm.",
     });
 
     this.option("monorepo", {
       type: Boolean,
       required: false,
       default: false,
-      desc: "is monorepo",
+      description: "is monorepo",
     });
 
     this.option("testing", {
       type: Boolean,
       required: false,
       default: false,
-      desc: "Testing enabled",
+      description: "Testing enabled",
     });
 
     this.option("testRunner", {
       type: String,
       required: false,
-      desc: "Test runner (jest, vitest, ...)",
+      description: "Test runner (jest, vitest, ...)",
     });
 
     this.option("yarnNodeLinker", {
       type: String,
       required: false,
       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.",
+      description:
+        "Defines what linker should be used for installing Node packages (useful to enable the node-modules plugin), one of: pnp, node-modules.",
     });
 
     this.option("typescript", {
       type: Boolean,
       required: false,
       default: false,
-      desc: "Typescript enabled",
+      description: "Typescript enabled",
     });
 
     this.option("packageNames", {
@@ -75,7 +76,7 @@ export default class CoreVSCodeGenerator extends Generator {
         {
           yarn: this.options.packageManager === "yarn",
           pnp: this.options.yarnNodeLinker === "pnp",
-        }
+        },
       );
       copyAndFormatTpl(
         this.fs,
@@ -89,13 +90,13 @@ export default class CoreVSCodeGenerator extends Generator {
           testing: this.options.testing,
           testRunner: this.options.testRunner,
           module: pkg.type === "module",
-        }
+        },
       );
 
       const tasksConfig = readJSON5(
         this.fs,
         this.destinationPath(".vscode/tasks.json"),
-        {}
+        {},
       );
       const tasks = tasksConfig.tasks || [];
 
@@ -106,14 +107,14 @@ export default class CoreVSCodeGenerator extends Generator {
         {
           typescript: this.options.typescript,
           tasks: JSON.stringify(tasks, null, 2),
-        }
+        },
       );
 
       if (this.options.monorepo) {
         const projectName = pkg.name.replace("/", "-");
         // legacy project code-workspace
         this.fs.delete(
-          this.destinationPath(`.vscode/${projectName}.code-workspace`)
+          this.destinationPath(`.vscode/${projectName}.code-workspace`),
         );
       }
     } else {

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

@@ -16,27 +16,29 @@ export default class CoreYarnGenerator extends Generator {
       type: String,
       required: false,
       default: "app",
-      desc: "Project type",
+      description: "Project type",
     });
 
     this.option("enable", {
       type: Boolean,
       required: true,
-      desc: "Enable yarn",
+      description: "Enable yarn",
     });
 
     this.option("yarnNodeLinker", {
       type: String,
       required: false,
       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.",
+      description:
+        "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.",
+      description:
+        "Disable git cache. See https://yarnpkg.com/features/caching#offline-mirror.",
     });
   }
 
@@ -64,13 +66,13 @@ export default class CoreYarnGenerator extends Generator {
         this.destinationPath(".yarn/.gitignore"),
         {
           disableYarnGitCache: this.options.disableYarnGitCache,
-        }
+        },
       );
 
       const { stdout } = this.spawnSync(
         "yarn",
         ["plugin", "runtime", "--json"],
-        { stdio: "pipe" }
+        { stdio: "pipe" },
       );
       const installedPlugins = stdout.split("\n").map(JSON.parse);
 
@@ -87,7 +89,7 @@ export default class CoreYarnGenerator extends Generator {
       const installPluginIfNotInstalled = (
         name,
         nameOrUrl = name,
-        forceInstallIfInstalled = () => false
+        forceInstallIfInstalled = () => false,
       ) => {
         if (!isPluginInstalled(name)) {
           installPlugin(nameOrUrl);
@@ -103,29 +105,30 @@ export default class CoreYarnGenerator extends Generator {
       };
 
       const postinstallDevPluginName = "@yarnpkg/plugin-postinstall-dev";
-      const versionPluginName = "@yarnpkg/plugin-conventional-version";
+      const legacyVersionPluginName = "@yarnpkg/plugin-conventional-version";
 
       if (!inMonorepo && !pkg.private) {
         installPluginIfNotInstalled(
           postinstallDevPluginName,
-          "https://raw.githubusercontent.com/sachinraja/yarn-plugin-postinstall-dev/main/bundles/%40yarnpkg/plugin-postinstall-dev.js"
+          "https://raw.githubusercontent.com/sachinraja/yarn-plugin-postinstall-dev/main/bundles/%40yarnpkg/plugin-postinstall-dev.js",
         );
       } else {
         removePluginIfInstalled(postinstallDevPluginName);
       }
 
       if (pkg.name !== "yarn-plugin-conventional-version") {
-        installPluginIfNotInstalled(
-          versionPluginName,
-          "https://raw.githubusercontent.com/christophehurpeau/yarn-plugin-conventional-version/main/bundles/%40yarnpkg/plugin-conventional-version.cjs",
-          () => {
-            const content = fs.readFileSync(
-              ".yarn/plugins/@yarnpkg/plugin-conventional-version.cjs",
-              "utf8"
-            );
-            return !content.includes("Lifecycle script: preversion");
-          }
-        );
+        removePluginIfInstalled(legacyVersionPluginName);
+        //   installPluginIfNotInstalled(
+        //     versionPluginName,
+        //     "https://raw.githubusercontent.com/christophehurpeau/yarn-plugin-conventional-version/main/bundles/%40yarnpkg/plugin-conventional-version.cjs",
+        //     () => {
+        //       const content = fs.readFileSync(
+        //         ".yarn/plugins/@yarnpkg/plugin-conventional-version.cjs",
+        //         "utf8",
+        //       );
+        //       return !content.includes("Lifecycle script: preversion");
+        //     },
+        //   );
       }
 
       if (
@@ -137,13 +140,15 @@ export default class CoreYarnGenerator extends Generator {
       }
 
       // must be done after plugins installed
-      const configString = this.fs.read(".yarnrc.yml");
-      const config = yml.load(configString, {
-        schema: yml.FAILSAFE_SCHEMA,
-        json: true,
-      });
+      const configString = this.fs.read(".yarnrc.yml", { defaults: "" });
+      const config =
+        yml.load(configString, {
+          schema: yml.FAILSAFE_SCHEMA,
+          json: true,
+        }) || {};
       if (this.options.disableYarnGitCache) {
-        config.compressionLevel = "mixed"; // optimized for size
+        // leave default compressionLevel instead of this next line
+        // config.compressionLevel = "mixed"; // optimized for size
         config.enableGlobalCache = true;
         delete config.supportedArchitectures;
       } else {
@@ -171,7 +176,7 @@ export default class CoreYarnGenerator extends Generator {
         ".yarnrc.yml",
         yml.dump(sortObject(config), {
           lineWidth: 9999,
-        })
+        }),
       );
     } else {
       this.fs.delete(".yarn");

package/lib/generators/lib/PobLibGenerator.js

@@ -11,7 +11,7 @@ export default class PobLibGenerator extends Generator {
       type: Boolean,
       required: false,
       default: false,
-      desc: "Avoid asking questions",
+      description: "Avoid asking questions",
     });
 
     this.option("fromPob", {
@@ -23,21 +23,23 @@ export default class PobLibGenerator extends Generator {
     this.option("packageManager", {
       type: String,
       default: "yarn",
-      desc: "yarn or npm",
+      description: "yarn or npm",
     });
 
     this.option("yarnNodeLinker", {
       type: String,
       required: false,
       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.",
+      description:
+        "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.",
+      description:
+        "Disable git cache. See https://yarnpkg.com/features/caching#offline-mirror.",
     });
   }
 
@@ -72,7 +74,10 @@ export default class PobLibGenerator extends Generator {
     const pkg = this.fs.readJSON(this.destinationPath("package.json"));
     const pobPkgConfig = pkg.pob || {};
 
-    let babelEnvs = this.pobjson.envs || pobPkgConfig.babelEnvs;
+    let babelEnvs =
+      this.pobjson.envs ||
+      pobPkgConfig.babelEnvs ||
+      (pobPkgConfig.bundler === "rollup-babel" && pobPkgConfig.envs);
     const entries = this.pobjson.entries || pobPkgConfig.entries;
     const jsx =
       this.pobjson.withReact || pobPkgConfig.withReact || pobPkgConfig.jsx;
@@ -148,7 +153,9 @@ export default class PobLibGenerator extends Generator {
 
     delete pkg.pob.withReact;
     if (babelEnvs && babelEnvs.length > 0) {
-      pkg.pob.babelEnvs = babelEnvs;
+      delete pkg.pob.babelEnvs;
+      pkg.pob.bundler = "rollup-babel";
+      pkg.pob.envs = babelEnvs;
       pkg.pob.entries = entries;
       pkg.pob.jsx = jsx;
     }
@@ -247,13 +254,15 @@ export default class PobLibGenerator extends Generator {
 
   default() {
     const pkg = this.fs.readJSON(this.destinationPath("package.json"));
-    const babelEnvs = pkg.pob.babelEnvs || [];
+    const babelEnvs =
+      pkg.pob.babelEnvs ||
+      (pkg.pob.bundler === "rollup-babel" && pkg.pob.envs) ||
+      [];
 
     const withBabel = babelEnvs.length > 0;
     const withTypescript = withBabel || pkg.pob.typescript === true;
     const jsx = (withBabel || withTypescript) && pkg.pob.jsx === true;
-    const browser =
-      withBabel && babelEnvs.some((env) => env.target === "browser");
+    const browser = pkg.pob.envs?.some((env) => env.target === "browser");
 
     this.composeWith("pob:common:typescript", {
       enable: withTypescript,
@@ -373,7 +382,9 @@ export default class PobLibGenerator extends Generator {
       pkg.sideEffects = false;
     }
 
-    const withBabel = Boolean(pkg.pob.babelEnvs);
+    const withBabel = Boolean(
+      pkg.pob.babelEnvs || pkg.pob.bundler === "rollup-babel",
+    );
     const withTypescript = pkg.pob.typescript === true;
 
     packageUtils.removeDevDependencies(pkg, ["lerna", "@pob/lerna-light"]);
@@ -394,7 +405,7 @@ export default class PobLibGenerator extends Generator {
       ) {
         this.fs.move(
           this.destinationPath("index.js"),
-          this.destinationPath("lib/index.js")
+          this.destinationPath("lib/index.js"),
         );
       }
     }
@@ -414,15 +425,6 @@ export default class PobLibGenerator extends Generator {
 
     const { pobjson } = this;
 
-    // .includes('node6') && 'node6',
-    //   this.babelEnvs.includes('node8') && 'node8',
-    //   this.babelEnvs.includes('olderNode') && 'older-node',
-    //   this.babelEnvs.includes('moduleModernBrowsers') && 'module-modern-browsers',
-    //   this.babelEnvs.includes('moduleAllBrowsers') && 'module',
-    //   this.babelEnvs.includes('moduleNode8') && 'module-node8',
-    //   this.babelEnvs.includes('browsers') && 'browsers',
-    // ].filter(Boolean);
-
     this.config.set("lib", pobjson);
     this.config.save();
 

package/lib/generators/lib/doc/LibDocGenerator.js

@@ -11,20 +11,20 @@ export default class LibDocGenerator extends Generator {
       type: Boolean,
       required: false,
       default: true,
-      desc: "Enabled.",
+      description: "Enabled.",
     });
 
     this.option("testing", {
       type: Boolean,
       required: false,
       default: false,
-      desc: "Coverage.",
+      description: "Coverage.",
     });
 
     this.option("packageManager", {
       type: String,
       default: "yarn",
-      desc: "yarn or npm",
+      description: "yarn or npm",
     });
 
     this.option("packageNames", {
@@ -53,7 +53,7 @@ export default class LibDocGenerator extends Generator {
       if (inMonorepo && inMonorepo.root) {
         const existingConfig = this.fs.readJSON(
           this.destinationPath("tsconfig.doc.json"),
-          { typedocOptions: {} }
+          { typedocOptions: {} },
         );
         // "external-modulemap": ".*packages/([^/]+)/.*",
         const packagePaths = JSON.parse(this.options.packagePaths);
@@ -64,7 +64,7 @@ export default class LibDocGenerator extends Generator {
             return {
               path: pkgPath,
               packageJSON: this.fs.readJSON(
-                this.destinationPath(`${pkgPath}/package.json`)
+                this.destinationPath(`${pkgPath}/package.json`),
               ),
             };
           });
@@ -79,7 +79,7 @@ export default class LibDocGenerator extends Generator {
             // unshift:https://typedoc.org/guides/project-references/
             entryPoints.unshift(
               // `${path}/src/`,
-              ...entries.map((entry) => `${path}/src/${entry}.ts`)
+              ...entries.map((entry) => `${path}/src/${entry}.ts`),
             );
           }
         }
@@ -95,17 +95,17 @@ export default class LibDocGenerator extends Generator {
             repositoryUrl: pkg.homepage, // or pkg.repository.replace(/\.git$/, '')
             packageManager: this.options.packageManager,
             readme: existingConfig.typedocOptions.readme || "README.md",
-          }
+          },
         );
       } else {
         const entryPoints = ((pkg.pob && pkg.pob.entries) || []).map(
-          (entryName) => `src/${entryName}.ts`
+          (entryName) => `src/${entryName}.ts`,
         );
         copyAndFormatTpl(
           this.fs,
           this.templatePath("tsconfig.doc.json.ejs"),
           this.destinationPath("tsconfig.doc.json"),
-          { jsx, readme: "README.md", entryPoints }
+          { jsx, readme: "README.md", entryPoints },
         );
       }
     } else {

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

@@ -11,31 +11,31 @@ export default class LibReadmeGenerator extends Generator {
     this.option("privatePackage", {
       type: Boolean,
       required: true,
-      desc: "If the project is private",
+      description: "If the project is private",
     });
 
     this.option("documentation", {
       type: Boolean,
       required: true,
-      desc: "Include documentation",
+      description: "Include documentation",
     });
 
     this.option("testing", {
       type: Boolean,
       required: true,
-      desc: "Include testing badge",
+      description: "Include testing badge",
     });
 
     this.option("codecov", {
       type: Boolean,
       required: true,
-      desc: "Include codecov badge",
+      description: "Include codecov badge",
     });
 
     this.option("content", {
       type: String,
       required: false,
-      desc: "Readme content",
+      description: "Readme content",
     });
   }
 
@@ -68,7 +68,7 @@ export default class LibReadmeGenerator extends Generator {
     const match =
       repository &&
       repository.match(
-        /^(?:git@|https?:\/\/)(?:([^./:]+)(?:\.com)?[/:])?([^/:]+)\/([^./:]+)(?:.git)?/
+        /^(?:git@|https?:\/\/)(?:([^./:]+)(?:\.com)?[/:])?([^/:]+)\/([^./:]+)(?:.git)?/,
       );
     const [, gitHost, gitAccount, gitName] = match || [];
     try {
@@ -98,7 +98,7 @@ export default class LibReadmeGenerator extends Generator {
               : undefined,
           testing: this.options.testing,
           content,
-        }
+        },
       );
     } catch (error) {
       console.log(error.stack || error.message || error);