pob 18.2.0 → 18.3.0

package/CHANGELOG.md

@@ -3,6 +3,29 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [18.3.0](https://github.com/christophehurpeau/pob/compare/pob@18.2.0...pob@18.3.0) (2024-02-17)
+
+
+### Features
+
+* add directory in extraEntries for usage in files ([17839e6](https://github.com/christophehurpeau/pob/commit/17839e65d6a4f5c50e8f7e4e9da635fc3e0b7382))
+* custom test folder ([f3214b9](https://github.com/christophehurpeau/pob/commit/f3214b9554dd2ce057786dad762a9eef07a25c41))
+* **deps:** update dependency semver to v7.6.0 ([#1930](https://github.com/christophehurpeau/pob/issues/1930)) ([dfc8761](https://github.com/christophehurpeau/pob/commit/dfc8761b8123fbb5a9bdf25ba296a20043e25aae))
+* **deps:** update dependency yeoman-environment to v4.2.1 ([#1901](https://github.com/christophehurpeau/pob/issues/1901)) ([e8bb372](https://github.com/christophehurpeau/pob/commit/e8bb372cd141cedc2736913b84e861768636f26e))
+* **deps:** update dependency yeoman-environment to v4.3.0 ([#1917](https://github.com/christophehurpeau/pob/issues/1917)) ([453fdd9](https://github.com/christophehurpeau/pob/commit/453fdd96725e740306c9341595f1b9e1af15f3fc))
+* **deps:** update yarn monorepo ([#1918](https://github.com/christophehurpeau/pob/issues/1918)) ([288ed84](https://github.com/christophehurpeau/pob/commit/288ed84945daa7813dcfb692ee459676a119b9bf))
+
+
+### Bug Fixes
+
+* fix export when omitVersionInFileName is set ([501367f](https://github.com/christophehurpeau/pob/commit/501367f0072f9ac41ace22312c0576afd7b1645a))
+* fix jest enabled condition ([c10f8b1](https://github.com/christophehurpeau/pob/commit/c10f8b19139d41ef1565a5e7314dbdee5d67cdba))
+* fix srcDirectory for app library ([7df6ba1](https://github.com/christophehurpeau/pob/commit/7df6ba14228326ee9b00b3fa2ec7af1204398860))
+
+Version bump for dependency: yarn-workspace-utils
+Version bump for dependency: root
+
+
 ## [18.2.0](https://github.com/christophehurpeau/pob/compare/pob@18.1.1...pob@18.2.0) (2023-12-31)
 
 

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

@@ -1,3 +1,4 @@
+import fs from 'node:fs';
 import path from 'node:path';
 import Generator from 'yeoman-generator';
 import inMonorepo from '../../../utils/inMonorepo.js';
@@ -211,6 +212,9 @@ export default class CommonTestingGenerator extends Generator {
       }
     })();
 
+    const hasTestFolder =
+      !this.options.monorepo && fs.existsSync(this.destinationPath('test'));
+
     const createTestCommand = ({
       coverage,
       coverageLcov,
@@ -256,11 +260,9 @@ export default class CommonTestingGenerator extends Generator {
               : ''
           }node ${
             this.options.typescript ? `${tsTestLoaderOption} ` : ''
-          }--test ${
-            this.options.monorepo
-              ? workspacesPattern
-              : this.options.srcDirectory
-          }/${this.options.typescript ? '**/*.test.ts' : '**/*.test.js'}`;
+          }--test ${this.options.monorepo ? `${workspacesPattern}/` : ''}${`${
+            hasTestFolder ? 'test/*' : `${this.options.srcDirectory}/**/*.test`
+          }.${this.options.typescript ? 'ts' : 'js'}`}`;
         }
         default: {
           throw new Error(`Invalid runner: "${testRunner}"`);
@@ -271,7 +273,9 @@ export default class CommonTestingGenerator extends Generator {
     const jestConfigPath = this.destinationPath('jest.config.json');
     packageUtils.addOrRemoveDevDependencies(
       pkg,
-      (enableForMonorepo || !globalTesting) && testRunner === 'jest',
+      this.options.enable &&
+        (enableForMonorepo || !globalTesting) &&
+        testRunner === 'jest',
       ['jest', '@types/jest'],
     );
 

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

@@ -335,21 +335,24 @@ export default class CommonTranspilerGenerator extends Generator {
 
         const defaultNodeEnvVersion = defaultNodeEnv && defaultNodeEnv.version;
 
-        envs.forEach(({ target, version, formats }) => {
+        envs.forEach(({ target, version, formats, omitVersionInFileName }) => {
           if (target === 'node' && entry === 'browser') return;
 
           const exportTarget = {};
 
           if (target === 'node') {
             const cjsExt = pkg.type === 'module' ? 'cjs' : 'cjs.js';
+            const filenameWithoutExt = `${entryDistName}-${target}${
+              omitVersionInFileName ? '' : version
+            }`;
             if (!formats || formats.includes('es')) {
-              exportTarget.import = `./${this.options.buildDirectory}/${entryDistName}-${target}${version}.mjs`;
+              exportTarget.import = `./${this.options.buildDirectory}/${filenameWithoutExt}.mjs`;
 
               if (formats && formats.includes('cjs')) {
-                exportTarget.require = `./${this.options.buildDirectory}/${entryDistName}-${target}${version}.${cjsExt}`;
+                exportTarget.require = `./${this.options.buildDirectory}/${filenameWithoutExt}.${cjsExt}`;
               }
             } else if (formats && formats.includes('cjs')) {
-              exportTarget.default = `./${this.options.buildDirectory}/${entryDistName}-${target}${version}.${cjsExt}`;
+              exportTarget.default = `./${this.options.buildDirectory}/${filenameWithoutExt}.${cjsExt}`;
             }
             // eslint: https://github.com/benmosher/eslint-plugin-import/issues/2132
             // jest: https://github.com/facebook/jest/issues/9771

package/lib/generators/core/npm/CoreNpmGenerator.js

@@ -60,6 +60,13 @@ export default class CoreNpmGenerator extends Generator {
           }
         });
       }
+      if (pkg.pob?.extraEntries) {
+        pkg.pob?.extraEntries.forEach((extraEntry) => {
+          if (extraEntry.directory) {
+            files.add(extraEntry.directory);
+          }
+        });
+      }
 
       pkg.files = [...files].filter(Boolean);
     } else {

package/lib/generators/lib/PobLibGenerator.js

@@ -292,6 +292,7 @@ export default class PobLibGenerator extends Generator {
       packageManager: this.options.packageManager,
       isApp: false,
       splitCIJobs: false,
+      srcDirectory: withBabel || withTypescript ? 'src' : 'lib',
     });
 
     // must be after testing

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pob",
-  "version": "18.2.0",
+  "version": "18.3.0",
   "description": "Pile of bones, library generator with git/babel/typescript/typedoc/readme/jest",
   "keywords": [
     "skeleton"
@@ -39,16 +39,16 @@
   "pob": {},
   "prettier": "@pob/root/prettier-config",
   "dependencies": {
-    "@pob/eslint-config": "53.0.0",
-    "@pob/eslint-config-typescript": "53.1.0",
-    "@pob/eslint-config-typescript-react": "53.0.0",
+    "@pob/eslint-config": "54.0.0",
+    "@pob/eslint-config-typescript": "54.0.0",
+    "@pob/eslint-config-typescript-react": "54.0.0",
     "@pob/sort-eslint-config": "5.2.1",
     "@pob/sort-object": "6.2.1",
     "@pob/sort-pkg": "7.0.0",
     "@types/inquirer": "9.0.7",
-    "@yarnpkg/cli": "4.0.2",
-    "@yarnpkg/core": "4.0.2",
-    "@yarnpkg/fslib": "3.0.1",
+    "@yarnpkg/cli": "4.1.0",
+    "@yarnpkg/core": "4.0.3",
+    "@yarnpkg/fslib": "3.0.2",
     "@yeoman/types": "1.1.2",
     "eslint": "8.56.0",
     "findup-sync": "^5.0.0",
@@ -62,15 +62,15 @@
     "mem-fs-editor": "11.0.0",
     "minimist": "1.2.8",
     "parse-author": "2.0.0",
-    "pob-dependencies": "11.0.1",
+    "pob-dependencies": "11.1.0",
     "prettier": "2.8.8",
-    "semver": "7.5.4",
+    "semver": "7.6.0",
     "validate-npm-package-name": "^5.0.0",
-    "yarn-workspace-utils": "3.1.2",
-    "yeoman-environment": "4.1.3",
+    "yarn-workspace-utils": "3.2.0",
+    "yeoman-environment": "4.3.0",
     "yeoman-generator": "7.1.1"
   },
   "devDependencies": {
-    "@pob/root": "9.1.0"
+    "@pob/root": "9.2.0"
   }
 }