pob 15.0.2 → 15.0.3

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.
 
+## [15.0.3](https://github.com/christophehurpeau/pob/compare/pob@15.0.2...pob@15.0.3) (2023-11-05)
+
+
+### Bug Fixes
+
+* **pob:** ignore install plugin version for source package ([cf5312b](https://github.com/christophehurpeau/pob/commit/cf5312bbc94db00def686337c1e6e32822a584a7))
+* srcDirectory for yarn plugin package ([97a0977](https://github.com/christophehurpeau/pob/commit/97a097721d6296d576bd78521b4313fcbbe28860))
+
+Version bump for dependency: yarn-workspace-utils
+
+
 ## [15.0.2](https://github.com/christophehurpeau/pob/compare/pob@15.0.1...pob@15.0.2) (2023-11-05)
 
 Note: no notable changes

package/lib/generators/app/PobAppGenerator.js

@@ -128,7 +128,8 @@ export default class PobAppGenerator extends Generator {
   }
 
   default() {
-    const srcDir = this.appConfig.type === 'yarn-plugin' ? 'sources' : 'src';
+    const srcDirectory =
+      this.appConfig.type === 'yarn-plugin' ? 'sources' : 'src';
     const isAppLibrary = this.appConfig.type === 'node-library';
 
     if (
@@ -179,8 +180,8 @@ export default class PobAppGenerator extends Generator {
       isApp: true,
       isAppLibrary,
       // nextjs now supports src
-      rootDir: this.appConfig.type === 'expo' ? '.' : srcDir,
-      srcDir,
+      rootDir: this.appConfig.type === 'expo' ? '.' : srcDirectory,
+      srcDirectory,
       builddefs: false,
       dom: browser,
       jsx,
@@ -196,7 +197,7 @@ export default class PobAppGenerator extends Generator {
           this.appConfig.type === 'alp-node' ||
           this.appConfig.type === 'next.js'
         ) {
-          return './src';
+          return `./${srcDirectory}`;
         }
         if (this.appConfig.type === 'remix') {
           return '.';
@@ -225,7 +226,7 @@ export default class PobAppGenerator extends Generator {
         isApp: true,
         splitCIJobs: false,
         onlyLatestLTS: true,
-        srcDir,
+        srcDirectory,
       });
 
       this.composeWith('pob:common:format-lint', {
@@ -240,11 +241,15 @@ export default class PobAppGenerator extends Generator {
         packageManager: this.options.packageManager,
         yarnNodeLinker: this.options.yarnNodeLinker,
         rootIgnorePaths: ignorePaths.join('\n'),
+        srcDirectory,
         buildDirectory: this.appConfig.type === 'expo' ? '.expo' : 'build',
       });
 
       this.composeWith('pob:common:release', {
-        enable: !inMonorepo && this.appConfig.testing,
+        enable:
+          !inMonorepo &&
+          this.appConfig.testing &&
+          pkg.name !== 'yarn-plugin-conventional-version',
         enablePublish: false,
         withBabel: babel,
         isMonorepo: false,

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

@@ -100,6 +100,12 @@ export default class CommonLintGenerator extends Generator {
       desc: 'Defines what linker should be used for installing Node packages (useful to enable the node-modules plugin), one of: pnp, node-modules.',
     });
 
+    this.option('srcDirectory', {
+      type: String,
+      default: 'src',
+      desc: 'customize src directory. Default to src',
+    });
+
     this.option('buildDirectory', {
       type: String,
       required: false,
@@ -415,7 +421,11 @@ export default class CommonLintGenerator extends Generator {
 
     const srcEslintrcPath = this.options.rootAsSrc
       ? this.destinationPath('.eslintrc.json')
-      : this.destinationPath(`${useBabel ? 'src/' : 'lib/'}.eslintrc.json`);
+      : this.destinationPath(
+          `${
+            useBabel ? `${this.options.srcDirectory}/` : 'lib/'
+          }.eslintrc.json`,
+        );
 
     const useTypescript = useBabel;
     const getRootIgnorePatterns = () => {
@@ -515,7 +525,10 @@ export default class CommonLintGenerator extends Generator {
               'import/resolver': this.options.enableSrcResolver
                 ? {
                     node: {
-                      moduleDirectory: ['node_modules', 'src'],
+                      moduleDirectory: [
+                        'node_modules',
+                        this.options.srcDirectory,
+                      ],
                     },
                   }
                 : false,
@@ -532,7 +545,7 @@ export default class CommonLintGenerator extends Generator {
 
     // see monorepo/lerna/index.js
     if (!(inMonorepo && inMonorepo.root) && !this.options.monorepo) {
-      const srcDirectory = useBabel ? 'src' : 'lib';
+      const srcDirectory = useBabel ? this.options.srcDirectory : 'lib';
       const lintRootJsFiles = (useBabel && useNode) || !inMonorepo;
 
       const lintPaths = [srcDirectory, 'bin', 'scripts', 'migrations'].filter(

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

@@ -95,10 +95,10 @@ export default class CommonTestingGenerator extends Generator {
       desc: 'only latest lts',
     });
 
-    this.option('srcDir', {
+    this.option('srcDirectory', {
       type: String,
       default: 'src',
-      desc: 'customize srcDir, if different than rootDir',
+      desc: 'customize srcDirectory, default to "src"',
     });
 
     this.option('disableYarnGitCache', {
@@ -247,15 +247,15 @@ export default class CommonTestingGenerator extends Generator {
           const jestConfig = this.fs.readJSON(jestConfigPath, pkg.jest ?? {});
           delete pkg.jest;
 
-          const srcDir = this.options.srcDir;
+          const srcDirectory = this.options.srcDirectory;
           Object.assign(jestConfig, {
             cacheDirectory: './node_modules/.cache/jest',
             testEnvironment: 'node',
             testMatch: [
-              `<rootDir>/${workspacesPattern}/*/@(${srcDir}|lib)/**/__tests__/**/*.${
+              `<rootDir>/${workspacesPattern}/*/@(${srcDirectory}|lib)/**/__tests__/**/*.${
                 transpileWithBabel ? '(ts|js|cjs|mjs)' : '(js|cjs|mjs)'
               }${hasReact ? '?(x)' : ''}`,
-              `<rootDir>/${workspacesPattern}/*/@(${srcDir}|lib)/**/*.test.${
+              `<rootDir>/${workspacesPattern}/*/@(${srcDirectory}|lib)/**/*.test.${
                 transpileWithBabel ? '(ts|js|cjs|mjs)' : '(js|cjs|mjs)'
               }${hasReact ? '?(x)' : ''}`,
             ],
@@ -308,7 +308,9 @@ export default class CommonTestingGenerator extends Generator {
         });
 
         if (this.options.runner === 'jest') {
-          const srcDirectory = transpileWithBabel ? this.options.srcDir : 'lib';
+          const srcDirectory = transpileWithBabel
+            ? this.options.srcDirectory
+            : 'lib';
 
           const jestConfig = this.fs.readJSON(jestConfigPath, pkg.jest ?? {});
           delete pkg.jest;
@@ -400,10 +402,10 @@ export default class CommonTestingGenerator extends Generator {
         this.destinationPath('babel.config.cjs'),
         {
           only: !this.options.monorepo
-            ? `'${this.options.srcDir}'`
+            ? `'${this.options.srcDirectory}'`
             : pkg.workspaces
                 .flatMap((workspace) => [
-                  `'${workspace}/${this.options.srcDir}'`,
+                  `'${workspace}/${this.options.srcDirectory}'`,
                   `'${workspace}/lib'`,
                 ])
                 .join(', '),

package/lib/generators/common/typescript/CommonTypescriptGenerator.js

@@ -32,10 +32,10 @@ export default class CommonTypescriptGenerator extends Generator {
       desc: 'customize rootDir',
     });
 
-    this.option('srcDir', {
+    this.option('srcDirectory', {
       type: String,
       default: 'src',
-      desc: 'customize srcDir, if different than rootDir',
+      desc: 'customize srcDirectory, if different than rootDir',
     });
 
     this.option('jsx', {
@@ -205,7 +205,7 @@ export default class CommonTypescriptGenerator extends Generator {
           monorepoPackageSrcPaths,
           monorepoPackageReferences,
           rootDir: this.options.rootDir,
-          srcDir: this.options.srcDir || this.options.rootDir,
+          srcDirectory: this.options.srcDirectory || this.options.rootDir,
           jsx,
           jsxPreserve: this.options.jsxPreserve,
           composite,

package/lib/generators/common/typescript/templates/tsconfig.json.ejs

@@ -1,10 +1,10 @@
 {
   "include": [
-    "<%= srcDir %>/**/*.ts"<% if (jsx) { -%>,
-    "<%= srcDir %>/**/*.tsx"<% } %><% if (srcDir !== rootDir) { -%>,
+    "<%= srcDirectory %>/**/*.ts"<% if (jsx) { -%>,
+    "<%= srcDirectory %>/**/*.tsx"<% } %><% if (srcDirectory !== rootDir) { -%>,
     "<%= rootDir %>/*.ts"<% } %>
   ],
-<% if(srcDir === '.' || forceExcludeNodeModules) { -%>
+<% if(srcDirectory === '.' || forceExcludeNodeModules) { -%>
   "exclude": [
     "node_modules"
   ],

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

@@ -114,7 +114,7 @@ export default class CoreYarnGenerator extends Generator {
         removePluginIfInstalled(postinstallDevPluginName);
       }
 
-      if (pkg.workspaces) {
+      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',
@@ -126,11 +126,6 @@ export default class CoreYarnGenerator extends Generator {
             return !content.includes('Lifecycle script: preversion');
           },
         );
-      } else {
-        installPluginIfNotInstalled(
-          versionPluginName,
-          'https://raw.githubusercontent.com/christophehurpeau/yarn-plugin-conventional-version/main/bundles/%40yarnpkg/plugin-conventional-version.cjs',
-        );
       }
 
       if (

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pob",
-  "version": "15.0.2",
+  "version": "15.0.3",
   "description": "Pile of bones, library generator with git/babel/typescript/typedoc/readme/jest",
   "keywords": [
     "skeleton"
@@ -64,10 +64,10 @@
     "mem-fs-editor": "10.0.3",
     "minimist": "1.2.8",
     "parse-author": "2.0.0",
-    "pob-dependencies": "8.9.1",
+    "pob-dependencies": "8.9.2",
     "prettier": "2.8.8",
     "semver": "7.5.4",
-    "yarn-workspace-utils": "1.2.1",
+    "yarn-workspace-utils": "1.2.2",
     "yeoman-environment": "4.0.0-beta.5",
     "yeoman-generator": "6.0.0-rc.6"
   },