pob 11.3.0 → 11.4.0

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [11.4.0](https://github.com/christophehurpeau/pob/compare/pob@11.3.0...pob@11.4.0) (2022-11-18)
+
+
+### Bug Fixes
+
+* fix clean:build script in workspace ([990dbb9](https://github.com/christophehurpeau/pob/commit/990dbb9815d550fb154d25deb7540e175a58f409))
+* **pob:** fix removed @pob/root ([79f2b1f](https://github.com/christophehurpeau/pob/commit/79f2b1f1ea8e20a60f7ccecf796e1cd8d8fdb706))
+* **pob:** packageUtils ([ce3df65](https://github.com/christophehurpeau/pob/commit/ce3df6583c415b5e59fafdc8ea300730237bdbef))
+
+
+### Features
+
+* **deps:** update dependency eslint to v8.28.0 ([#1458](https://github.com/christophehurpeau/pob/issues/1458)) ([dab9337](https://github.com/christophehurpeau/pob/commit/dab93371c4e8ff4e424e97c6ffad8232ac2e68aa))
+* simplify tsconfig ([83e1ad1](https://github.com/christophehurpeau/pob/commit/83e1ad11dac522c93821fb91dc1b2ccdebd0be16))
+
+
+
+
+
 # [11.3.0](https://github.com/christophehurpeau/pob/compare/pob@11.2.0...pob@11.3.0) (2022-11-15)
 
 

package/lib/generators/common/babel/CommonBabelGenerator.js

@@ -249,14 +249,15 @@ export default class CommonBabelGenerator extends Generator {
     if (this.entries) {
       this.entries.forEach((entry) => {
         const entryDestPath = this.destinationPath(`${entry}.js`);
-        if (this.options.isApp && entry !== 'index') {
-          this.fs.write(
-            entryDestPath,
-            `// resolution for eslint-plugin-import\nexport * from './src/${entry}/index.ts';\n`,
-          );
-        } else {
-          this.fs.delete(entryDestPath);
-        }
+        // TODO check nightingale before uncomment this
+        // if (this.options.isApp && entry !== 'index') {
+        //   this.fs.write(
+        //     entryDestPath,
+        //     `// resolution for eslint-plugin-import\nexport * from './src/${entry}/index.ts';\n`,
+        //   );
+        // } else {
+        this.fs.delete(entryDestPath);
+        // }
       });
     }
     //
@@ -299,7 +300,7 @@ export default class CommonBabelGenerator extends Generator {
 
     const shouldBuildDefinitions = !this.options.isApp && useBabel;
     packageUtils.addOrRemoveScripts(pkg, shouldBuildDefinitions, {
-      'build:definitions': 'tsc -p tsconfig.build.json',
+      'build:definitions': 'tsc -p',
     });
 
     if (shouldBuildDefinitions) {
@@ -469,7 +470,7 @@ export default class CommonBabelGenerator extends Generator {
       // see pkg.exports instead.
       delete pkg.main;
       if (!this.options.isApp) {
-        pkg.types = `./${this.options.buildDirectory}/index.d.ts`;
+        pkg.types = `./${this.options.buildDirectory}/definitions/index.d.ts`;
       }
     } else {
       if (!pkg.main) {

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

@@ -38,12 +38,12 @@ function updateParserAndPlugins(
 
     if (!globalEslint) {
       config.parserOptions = {
-        project: './tsconfig.eslint.json',
+        project: './tsconfig.json',
         createDefaultProgram: true, // fix for lint-staged
       };
     } else {
       config.parserOptions = {
-        project: `${relativePath}/tsconfig.eslint.json`,
+        project: `${relativePath}/tsconfig.json`,
       };
     }
   } else {

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

@@ -103,7 +103,7 @@ export default class CommonHuskyGenerator extends Generator {
       // this.fs.delete('.git/hooks/husky.local.sh');
     } else {
       packageUtils.removeDevDependencies(pkg, [
-        '@pob/root',
+        pkg.name !== 'pob' && '@pob/root',
         '@pob/commitlint-config',
       ]);
       this.fs.delete(this.destinationPath('lint-staged.config.cjs'));

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

@@ -193,7 +193,7 @@ export default class CommonTestingGenerator extends Generator {
           delete pkg.scripts['generate:test-coverage'];
           delete pkg.scripts['test:watch'];
         }
-        pkg.addScripts(pkg, {
+        packageUtils.addScripts(pkg, {
           test: `yarn ../../ run test -- ${path
             .relative('../..', '.')
             .replace('\\', '/')}`,

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

@@ -91,13 +91,15 @@ export default class CommonTypescriptGenerator extends Generator {
     );
 
     const tsconfigPath = this.destinationPath('tsconfig.json');
+    const tsconfigCheckPath = this.destinationPath('tsconfig.check.json');
     const tsconfigEslintPath = this.destinationPath('tsconfig.eslint.json');
     const tsconfigBuildPath = this.destinationPath('tsconfig.build.json');
+
     if (this.options.enable) {
       const { jsx, dom } = this.options;
       let composite;
       let monorepoPackageReferences;
-      let monorepoPackageBuildReferences;
+      // let monorepoPackageBuildReferences;
       let monorepoPackageSrcPaths;
 
       if (inLerna && !inLerna.root) {
@@ -153,21 +155,34 @@ export default class CommonTypescriptGenerator extends Generator {
               existsSync(`${packageLocations.get(packageName)}/tsconfig.json`),
             )
             .map((packageName) => packageLocations.get(packageName));
-          monorepoPackageBuildReferences = yoConfig.pob.monorepo.packageNames
-            .filter((packageName) =>
-              existsSync(
-                `${packageLocations.get(packageName)}/tsconfig.build.json`,
-              ),
-            )
-            .map((packageName) => packageLocations.get(packageName));
+          // monorepoPackageBuildReferences = yoConfig.pob.monorepo.packageNames
+          //   .filter((packageName) =>
+          //     existsSync(
+          //       `${packageLocations.get(packageName)}/tsconfig.build.json`,
+          //     ),
+          //   )
+          //   .map((packageName) => packageLocations.get(packageName));
         }
       }
 
+      if (this.fs.exists(tsconfigEslintPath)) {
+        this.fs.delete(tsconfigEslintPath);
+      }
+      if (this.fs.exists(tsconfigCheckPath)) {
+        this.fs.delete(tsconfigCheckPath);
+      }
+
+      /*
+      Only using one file:
+      - allows IDE and typedoc to behave correctly
+      - generate useless definition files for not excluded tests files. However, it also use them for cache.
+      */
       copyAndFormatTpl(
         this.fs,
         this.templatePath('tsconfig.json.ejs'),
         tsconfigPath,
         {
+          emit: this.options.builddefs,
           monorepoPackageSrcPaths,
           monorepoPackageReferences,
           rootDir: this.options.rootDir,
@@ -181,36 +196,32 @@ export default class CommonTypescriptGenerator extends Generator {
           forceAllowJs: this.options.forceAllowJs,
         },
       );
-      copyAndFormatTpl(
-        this.fs,
-        this.templatePath('tsconfig.eslint.json.ejs'),
-        tsconfigEslintPath,
-        {},
-      );
-      if (
-        this.options.builddefs // &&
-        // (!composite || monorepoPackageNames.length !== 0)
-      ) {
-        copyAndFormatTpl(
-          this.fs,
-          this.templatePath('tsconfig.build.json.ejs'),
-          tsconfigBuildPath,
-          {
-            inMonorepo: inLerna && !inLerna.root,
-            jsx,
-            composite,
-            monorepoPackageSrcPaths,
-            monorepoPackageBuildReferences,
-          },
-        );
-      } else {
-        this.fs.delete(tsconfigBuildPath);
-      }
+
+      // if (
+      //   this.options.builddefs // &&
+      //   // (!composite || monorepoPackageNames.length !== 0)
+      // ) {
+      //   copyAndFormatTpl(
+      //     this.fs,
+      //     this.templatePath('tsconfig.build.json.ejs'),
+      //     tsconfigBuildPath,
+      //     {
+      //       inMonorepo: inLerna && !inLerna.root,
+      //       jsx,
+      //       composite,
+      //       monorepoPackageSrcPaths,
+      //       monorepoPackageBuildReferences,
+      //     },
+      //   );
+      // } else {
+      this.fs.delete(tsconfigBuildPath);
+      // }
     } else {
       if (pkg.scripts) delete pkg.scripts.tsc;
       this.fs.delete(tsconfigPath);
-      this.fs.delete(tsconfigEslintPath);
       this.fs.delete(tsconfigBuildPath);
+      this.fs.delete(tsconfigCheckPath);
+      this.fs.delete(tsconfigEslintPath);
     }
 
     this.fs.writeJSON(this.destinationPath('package.json'), pkg);

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

@@ -3,14 +3,6 @@
 
   "compilerOptions": {
     "noEmit": false,
-    "declaration": true,
-    "declarationMap": true,
-    "emitDeclarationOnly": true,
-    "outDir": "dist",
-    "newLine": "lf"<% if(composite) { -%>,
-    "composite": true,
-    "tsBuildInfoFile": "dist/tsbuildinfo"
-<% } -%>
   },
 
   "exclude": [

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

@@ -0,0 +1,13 @@
+{
+  "extends": "./tsconfig.json",
+
+  "compilerOptions": {
+    "noEmit": true,
+  }<% if (monorepoPackageCheckReferences && monorepoPackageCheckReferences.length) { %>,<% } -%>
+<% if (monorepoPackageCheckReferences && monorepoPackageCheckReferences.length) { %>
+  "references": [
+<% monorepoPackageCheckReferences.forEach((monorepoPackageSrcPath, index) => { -%>
+      { "path": "<%= monorepoPackageSrcPath %>/tsconfig.check.json" }<%= index === monorepoPackageCheckReferences.length -1 ? '' : ',' %>
+<% }) -%>
+]<% } -%>
+}

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

@@ -10,19 +10,25 @@
 <% } -%>
   "compilerOptions": {
     "rootDir": "<%= rootDir %>",
-<% if(!composite) { -%>
-    /* No emit in default config file. See build config file for config to build declaration files */
-    "noEmit": true,
+    "newLine": "lf",
+<% if (emit) { -%>
+    "outDir": "dist/definitions",
+    "tsBuildInfoFile": "dist/definitions/tsbuildinfo",
+<% } else if (composite) { -%>
+    "outDir": "node_modules/.cache/tsc",
+    "tsBuildInfoFile": "node_modules/.cache/tsc/tsbuildinfo",
 <% } else { -%>
-    "incremental": true,
-    "composite": true,
-    "noEmit": false,
+    "noEmit": true,
+<% } -%>
+<% if (composite || emit) { -%>
     "noEmitOnError": true,
     "declaration": true,
     "declarationMap": true,
     "emitDeclarationOnly": true,
-    "outDir": "node_modules/.cache/tsc",
-    "tsBuildInfoFile": "node_modules/.cache/tsc/tsbuildinfo",
+<% } -%>
+<% if(composite) { -%>
+    "incremental": true,
+    "composite": true,
 <% } -%>
 
     /* No need to check .d.ts files */

package/lib/generators/core/npm/templates/npmignore.ejs

@@ -17,9 +17,7 @@
 /*.config.mjs
 <% if (babel) { -%>
 /tsconfig.json
-/tsconfig.build.json
-/tsconfig.eslint.json
-/dist/tsbuildinfo
+/dist/definitions/tsbuildinfo
 <% if (typedoc) { -%>
 /tsconfig.doc.json
 <% } -%>

package/lib/generators/lib/doc/templates/tsconfig.doc.json.ejs

@@ -12,7 +12,7 @@
     "readme": "<%= readme %>",
     "out": "docs",
     "excludePrivate": true,
-    "gitRevision": "master"
+    "gitRevision": "main"
   },
 
   "exclude": [

package/lib/generators/lib/doc/templates/tsconfig.doc.json.lerna.ejs

@@ -22,7 +22,7 @@
 
   "references": [
 <% packagePaths.forEach((packagePath, index) => { -%>
-    { "path": "<%= packagePath %>/tsconfig.build.json" }<%= index === packagePaths.length -1 ? '' : ',' %>
+    { "path": "<%= packagePath %>/tsconfig.json" }<%= index === packagePaths.length -1 ? '' : ',' %>
 <% }) -%>
   ],
 

package/lib/generators/monorepo/PobMonorepoGenerator.js

@@ -315,9 +315,7 @@ export default class PobMonorepoGenerator extends Generator {
         this.fs.delete('rollup.config.mjs');
       }
       packageUtils.addOrRemoveScripts(pkg, rollupConfigs.length > 0, {
-        'clean:build': `(${pkg.workspaces
-          .map((workspaces) => `rm -Rf ${workspaces}/dist ${workspaces}/build`)
-          .join(' ; ')}) || true`,
+        'clean:build': 'yarn workspaces foreach run clean:build',
         build: 'yarn clean:build && rollup --config rollup.config.mjs',
         watch: 'yarn clean:build && rollup --config rollup.config.mjs --watch',
       });

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

@@ -109,10 +109,7 @@ export default class MonorepoLernaGenerator extends Generator {
     ];
 
     if (withBabel) {
-      lernaConfig.command.publish.ignoreChanges.push(
-        '**/tsconfig.json',
-        '**/tsconfig.build.json',
-      );
+      lernaConfig.command.publish.ignoreChanges.push('**/tsconfig.json');
     }
 
     writeAndFormatJson(

package/lib/generators/monorepo/typescript/MonorepoTypescriptGenerator.js

@@ -1,4 +1,3 @@
-import { existsSync } from 'fs';
 import Generator from 'yeoman-generator';
 import * as packageUtils from '../../../utils/package.js';
 import { copyAndFormatTpl } from '../../../utils/writeAndFormat.js';
@@ -48,14 +47,12 @@ export default class MonorepoTypescriptGenerator extends Generator {
       'typescript',
     ]);
 
-    const tsconfigPath = this.destinationPath('tsconfig.json');
-    const tsconfigBuildPath = this.destinationPath('tsconfig.build.json');
     if (this.options.enable) {
       packageUtils.addScripts(pkg, {
         tsc: 'tsc -b',
       });
       packageUtils.addOrRemoveScripts(pkg, !this.options.isAppProject, {
-        'build:definitions': 'tsc -b tsconfig.build.json',
+        'build:definitions': 'tsc -b',
       });
 
       delete pkg.scripts.postbuild;
@@ -63,7 +60,35 @@ export default class MonorepoTypescriptGenerator extends Generator {
       if (!this.options.isAppProject) {
         pkg.scripts.build += ' && yarn run build:definitions';
       }
+    } else if (pkg.scripts) {
+      delete pkg.scripts.tsc;
+      if (
+        pkg.scripts.postbuild === 'tsc -b tsconfig.build.json' ||
+        pkg.scripts.postbuild === 'tsc -b'
+      ) {
+        delete pkg.scripts.postbuild;
+      }
+      delete pkg.scripts['build:definitions'];
+    }
+
+    if (pkg.scripts) {
+      delete pkg.scripts['typescript-check'];
+    }
+
+    this.fs.writeJSON(this.destinationPath('package.json'), pkg);
+  }
+
+  // after pob ran in workspaces
+  end() {
+    const tsconfigPath = this.destinationPath('tsconfig.json');
+    const tsconfigCheckPath = this.destinationPath('tsconfig.check.json');
+    const tsconfigBuildPath = this.destinationPath('tsconfig.build.json');
 
+    if (!this.options.enable) {
+      this.fs.delete(tsconfigPath);
+      this.fs.delete(tsconfigCheckPath);
+      this.fs.delete(tsconfigBuildPath);
+    } else {
       const packagePaths = JSON.parse(this.options.packagePaths);
 
       copyAndFormatTpl(
@@ -74,40 +99,33 @@ export default class MonorepoTypescriptGenerator extends Generator {
           packagePaths,
         },
       );
-      if (this.options.isAppProject) {
-        this.fs.delete(tsconfigBuildPath);
-      } else {
-        copyAndFormatTpl(
-          this.fs,
-          this.templatePath('tsconfig.build.json.ejs'),
-          tsconfigBuildPath,
-          {
-            packagePaths: packagePaths.filter((packagePath) =>
-              existsSync(
-                `${packagePath}/tsconfig${
-                  this.options.isAppProject ? '' : '.build'
-                }.json`,
-              ),
-            ),
-          },
-        );
-      }
-    } else {
-      if (pkg.scripts) {
-        delete pkg.scripts.tsc;
-        if (pkg.scripts.postbuild === 'tsc -b tsconfig.build.json') {
-          delete pkg.scripts.postbuild;
-        }
-        delete pkg.scripts['build:definitions'];
-      }
-      this.fs.delete(tsconfigPath);
-      this.fs.delete(tsconfigBuildPath);
-    }
 
-    if (pkg.scripts) {
-      delete pkg.scripts['typescript-check'];
+      this.fs.delete(tsconfigCheckPath);
+      this.fs.delete(tsconfigBuildPath);
+      // if (this.options.isAppProject) {
+      // } else {
+      //   copyAndFormatTpl(
+      //     this.fs,
+      //     this.templatePath('tsconfig.check.json.ejs'),
+      //     tsconfigCheckPath,
+      //     {
+      //       packagePaths: packagePaths.filter((packagePath) =>
+      //         existsSync(`${packagePath}/tsconfig.check.json`),
+      //       ),
+      //     },
+      //   );
+
+      //   copyAndFormatTpl(
+      //     this.fs,
+      //     this.templatePath('tsconfig.build.json.ejs'),
+      //     tsconfigBuildPath,
+      //     {
+      //       packagePaths: packagePaths.filter((packagePath) =>
+      //         existsSync(`${packagePath}/tsconfig.build.json`),
+      //       ),
+      //     },
+      //   );
+      // }
     }
-
-    this.fs.writeJSON(this.destinationPath('package.json'), pkg);
   }
 }

package/lib/generators/monorepo/typescript/templates/tsconfig.check.json.ejs

@@ -0,0 +1,8 @@
+{
+  "files": [],
+  "references": [
+<% packagePaths.forEach((packagePath, index) => { -%>
+    { "path": "<%= packagePath %>/tsconfig.check.json" }<%= index === packagePaths.length -1 ? '' : ',' %>
+<% }) -%>
+  ]
+}

package/lib/generators/pob/PobBaseGenerator.js

@@ -177,7 +177,7 @@ export default class PobBaseGenerator extends Generator {
         'yarnhook',
         'lerna',
         '@pob/lerna-light',
-        '@pob/root',
+        pkg.name !== 'pob' && '@pob/root',
       ]);
       delete pkg.commitlint;
       delete pkg.husky;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pob",
-  "version": "11.3.0",
+  "version": "11.4.0",
   "description": "Pile of bones, library generator with git/babel/typescript/typedoc/readme/jest",
   "keywords": [
     "skeleton"
@@ -30,7 +30,7 @@
   "scripts": {
     "format": "prettier --write",
     "lint": "yarn run lint:eslint",
-    "lint:eslint": "cd ../.. && yarn run eslint --report-unused-disable-directives --resolve-plugins-relative-to . --quiet packages/pob"
+    "lint:eslint": "yarn ../.. run eslint --report-unused-disable-directives --resolve-plugins-relative-to . --quiet packages/pob"
   },
   "prettier": "@pob/root/prettier-config",
   "pob": {},
@@ -40,10 +40,10 @@
     "@pob/eslint-config": "49.4.0",
     "@pob/eslint-config-typescript": "49.4.0",
     "@pob/eslint-config-typescript-react": "49.4.0",
-    "@pob/sort-eslint-config": "4.0.0",
-    "@pob/sort-object": "5.0.0",
-    "@pob/sort-pkg": "5.0.0",
-    "eslint": "8.27.0",
+    "@pob/sort-eslint-config": "4.1.0",
+    "@pob/sort-object": "5.1.0",
+    "@pob/sort-pkg": "5.1.0",
+    "eslint": "8.28.0",
     "findup-sync": "^5.0.0",
     "git-remote-url": "^1.0.1",
     "github-username": "^6.0.0",
@@ -57,14 +57,14 @@
     "minimist": "1.2.7",
     "node-fetch": "3.3.0",
     "parse-author": "2.0.0",
-    "pob-dependencies": "7.1.1",
+    "pob-dependencies": "7.2.0",
     "prettier": "2.7.1",
     "semver": "7.3.8",
     "yeoman-environment": "3.12.1",
     "yeoman-generator": "5.7.0"
   },
   "devDependencies": {
-    "@pob/root": "7.1.1"
+    "@pob/root": "7.2.0"
   },
-  "gitHead": "33e161c4d1126092c4ab2dfa490a03ac6359e663"
+  "gitHead": "e251d920020bbd336916da28d2681a45b5acf807"
 }

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

@@ -1,7 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-
-  "compilerOptions": {
-    "noEmit": true,
-  }
-}