pob 14.5.0 → 14.5.1

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [14.5.1](https://github.com/christophehurpeau/pob/compare/pob@14.5.0...pob@14.5.1) (2023-11-05)
+
+
+### Bug Fixes
+
+* force update plugin if lifecycle script is missing ([1e29b9d](https://github.com/christophehurpeau/pob/commit/1e29b9d8a2eb4108299afba653f66004ed21e49b))
+* **pob:** fix yarnrc dump options ([bf27b86](https://github.com/christophehurpeau/pob/commit/bf27b86ae1faccff12cbdefd26cdb05166b4b2f2))
+
+
+
+
 ## [14.5.0](https://github.com/christophehurpeau/pob/compare/pob@14.4.2...pob@14.5.0) (2023-11-05)
 
 

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

@@ -84,9 +84,15 @@ export default class CoreYarnGenerator extends Generator {
         this.spawnSync('yarn', ['plugin', 'remove', name]);
       };
 
-      const installPluginIfNotInstalled = (name, nameOrUrl = name) => {
+      const installPluginIfNotInstalled = (
+        name,
+        nameOrUrl = name,
+        forceInstallIfInstalled = () => false,
+      ) => {
         if (!isPluginInstalled(name)) {
           installPlugin(nameOrUrl);
+        } else if (forceInstallIfInstalled()) {
+          installPlugin(nameOrUrl);
         }
       };
 
@@ -109,14 +115,17 @@ export default class CoreYarnGenerator extends Generator {
       }
 
       if (pkg.workspaces) {
-        if (!pkg.devDependencies?.['@pob/lerna-light']) {
-          installPluginIfNotInstalled(
-            versionPluginName,
-            'https://raw.githubusercontent.com/christophehurpeau/yarn-plugin-conventional-version/main/bundles/%40yarnpkg/plugin-conventional-version.cjs',
-          );
-        } else {
-          removePluginIfInstalled(versionPluginName);
-        }
+        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');
+          },
+        );
       } else {
         installPluginIfNotInstalled(
           versionPluginName,
@@ -160,7 +169,13 @@ export default class CoreYarnGenerator extends Generator {
         delete config.yarnPath;
       }
 
-      writeAndFormat(this.fs, '.yarnrc.yml', yml.dump(sortObject(config), {}));
+      writeAndFormat(
+        this.fs,
+        '.yarnrc.yml',
+        yml.dump(sortObject(config), {
+          lineWidth: 9999,
+        }),
+      );
     } else {
       this.fs.delete('.yarn');
       this.fs.delete('.yarnrc.yml');

package/lib/generators/monorepo/PobMonorepoGenerator.js

@@ -218,8 +218,7 @@ export default class PobMonorepoGenerator extends Generator {
 
     this.composeWith('pob:common:husky', {});
 
-    const isYarnVersionEnabled =
-      this.pobLernaConfig.ci && !pkg.devDependencies?.['@pob/lerna-light'];
+    const isYarnVersionEnabled = this.pobLernaConfig.ci;
 
     const splitCIJobs = this.packageNames.length > 8;
 

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

@@ -100,7 +100,7 @@ export default class MonorepoLernaGenerator extends Generator {
     packageUtils.removeDevDependencies(pkg, ['lerna']);
 
     // TODO remove lerna completely
-    const isYarnVersionEnabled = !pkg.devDependencies?.['@pob/lerna-light'];
+    const isYarnVersionEnabled = true;
 
     const getPackagePobConfig = (config) => ({
       babelEnvs: [],

package/lib/generators/monorepo/workspaces/MonorepoWorkspacesGenerator.js

@@ -67,6 +67,7 @@ export default class MonorepoWorkspacesGenerator extends Generator {
     // package.json
     const pkg = this.fs.readJSON(this.destinationPath('package.json'), {});
     packageUtils.removeDependencies(pkg, ['@pob/lerna-light']);
+    packageUtils.removeDevDependencies(pkg, ['@pob/lerna-light']);
 
     if (this.npm) {
       if (!pkg.engines) pkg.engines = {};
@@ -76,9 +77,7 @@ export default class MonorepoWorkspacesGenerator extends Generator {
       delete pkg.engines.yarn;
     }
 
-    packageUtils.removeDevDependencies(pkg, ['@pob/lerna-light']);
-
-    const isYarnVersionEnabled = !pkg.devDependencies?.['@pob/lerna-light'];
+    const isYarnVersionEnabled = true;
 
     if (pkg.name !== 'pob-monorepo') {
       packageUtils.addDevDependencies(pkg, ['repository-check-dirty']);

package/lib/utils/writeAndFormat.js

@@ -9,6 +9,7 @@ export function writeAndFormat(fs, destinationPath, content, { parser } = {}) {
       trailingComma: 'all',
       singleQuote: !destinationPath.endsWith('.yml'),
       arrowParens: 'always',
+      printWidth: destinationPath === '.yarnrc.yml' ? 9999 : undefined,
     }),
   );
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pob",
-  "version": "14.5.0",
+  "version": "14.5.1",
   "description": "Pile of bones, library generator with git/babel/typescript/typedoc/readme/jest",
   "keywords": [
     "skeleton"
@@ -64,7 +64,7 @@
     "mem-fs-editor": "10.0.3",
     "minimist": "1.2.8",
     "parse-author": "2.0.0",
-    "pob-dependencies": "8.8.0",
+    "pob-dependencies": "8.8.1",
     "prettier": "2.8.8",
     "semver": "7.5.4",
     "yarn-workspace-utils": "1.1.0",