pob 9.5.0 → 9.6.0

package/CHANGELOG.md

@@ -3,6 +3,39 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [9.6.0](https://github.com/christophehurpeau/pob/compare/pob@9.5.0...pob@9.6.0) (2021-12-12)
+
+
+### Bug Fixes
+
+* **pob:** move babel config generator to testing generator and configure for monorepo ([1d2a4e6](https://github.com/christophehurpeau/pob/commit/1d2a4e6f97adae84b8e4e045e36aa10c47913e5f))
+* package locations in mongorepo generator ([63e7f62](https://github.com/christophehurpeau/pob/commit/63e7f62e934e6703066ac16ddb4fff7975811295))
+* **pob:** dont remove preversion script for pob-dependencies ([f62355d](https://github.com/christophehurpeau/pob/commit/f62355d35ab186a9c680fee4836e4aaa5293d77b))
+* **pob:** only add test-setup in ignored build tsconfig when package is not in a monorepo ([dba09fd](https://github.com/christophehurpeau/pob/commit/dba09fdec9a15617274ffe7acdb39c627ba84ab6))
+* add missing clean script in apps ([a871c2c](https://github.com/christophehurpeau/pob/commit/a871c2c74386d9af0febf62ae09962ba092f6a29))
+* add src/test-setup.ts in build exclude ([118efc9](https://github.com/christophehurpeau/pob/commit/118efc90130d07c1689db1f58ccab7762eefe0dd))
+* allow extendable renovate config ([5d9a053](https://github.com/christophehurpeau/pob/commit/5d9a053f0485fa66586fb237b7770f450799c045))
+* allow to extends renovate config ([e61b0b7](https://github.com/christophehurpeau/pob/commit/e61b0b792f63e9e938a9172a102089ff9eb3aa2f))
+* doesJsCheckPackagesExists should be let ([6aac69f](https://github.com/christophehurpeau/pob/commit/6aac69f1a2eb6df4e98d4289da2e4b245a278e94))
+* dont create and delete check-package script in workspace packages ([3398ef5](https://github.com/christophehurpeau/pob/commit/3398ef56a97933149eaea02cea58949cadfc61b2))
+* dont delete plugin dependencies in eslint-config-pob ([31fe081](https://github.com/christophehurpeau/pob/commit/31fe08106647624317f277d2e31f820911445532))
+* get eslint dependency versions from @pob/eslint-config ([4100cc5](https://github.com/christophehurpeau/pob/commit/4100cc5a342b1cc970f614de99692600f9ec89f9))
+* order pob-babel/plugin-run.cjs ([57d6c8b](https://github.com/christophehurpeau/pob/commit/57d6c8bfbcfd756a23f96b436614db8991cf1ed2))
+* read vscode tasks file ([436c480](https://github.com/christophehurpeau/pob/commit/436c480d4538b68893b3521573ab50199d63a23e))
+* **pob:** esm condition for babel.config.cjs ([6aeb96f](https://github.com/christophehurpeau/pob/commit/6aeb96fd7648484755c595310008b0dff20fa6a4))
+* **pob:** global testing config ([fc56a6d](https://github.com/christophehurpeau/pob/commit/fc56a6d28413a8ae2c7a45235f853b5123005c84))
+
+
+### Features
+
+* configure pob-lcov-reporter for pob monorepo ([e7f40c4](https://github.com/christophehurpeau/pob/commit/e7f40c4dc9a2400e48a1497ac4ea0bdc5f842a15))
+* **pob:** add default check-package-dependencies script if it doesnt exists and package type is module ([7e54041](https://github.com/christophehurpeau/pob/commit/7e540417e34d908f06f6263d668f9cbb4d9c7990))
+* update eslint 8 and eslint-config-pob ([f881f05](https://github.com/christophehurpeau/pob/commit/f881f05852e00c22a35178979e1425445413ce70))
+
+
+
+
+
 # [9.5.0](https://github.com/christophehurpeau/pob/compare/pob@9.4.0...pob@9.5.0) (2021-12-11)
 
 

package/lib/.eslintrc.json

@@ -7,5 +7,21 @@
     "no-nested-ternary": "off",
     "no-console": "off",
     "complexity": "off"
-  }
+  },
+  "overrides": [
+    {
+      "files": ["**/*.test.{cjs,js}", "__tests__/**/*.{cjs,js}"],
+      "env": {
+        "jest": true
+      },
+      "rules": {
+        "import/no-extraneous-dependencies": [
+          "error",
+          {
+            "devDependencies": true
+          }
+        ]
+      }
+    }
+  ]
 }

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

@@ -1,7 +1,6 @@
 import fs from 'fs';
 import semver from 'semver';
 import Generator from 'yeoman-generator';
-import inLerna from '../../../utils/inLerna.js';
 import * as packageUtils from '../../../utils/package.js';
 
 export default class CommonBabelGenerator extends Generator {
@@ -278,12 +277,14 @@ export default class CommonBabelGenerator extends Generator {
       packageUtils.addOrRemoveScripts(pkg, useBabel, {
         build: 'pob-build',
         start: 'pob-watch',
+        clean: 'rm -Rf dist',
       });
     } else {
       packageUtils.removeScripts(['start']);
       packageUtils.addOrRemoveScripts(pkg, useBabel, {
         build: 'pob-build',
         watch: 'pob-watch',
+        clean: 'rm -Rf dist',
       });
     }
 
@@ -688,7 +689,6 @@ export default class CommonBabelGenerator extends Generator {
     const pkg = this.fs.readJSON(this.destinationPath('package.json'));
 
     const useBabel = this.babelEnvs && this.babelEnvs.length > 0;
-    const hasReact = useBabel && packageUtils.hasReact(pkg);
 
     /* pob-babel config */
 
@@ -723,21 +723,6 @@ export default class CommonBabelGenerator extends Generator {
       );
     }
 
-    if (useBabel && this.options.testing && !inLerna) {
-      // cjs for jest compat
-      this.fs.copyTpl(
-        this.templatePath('babel.config.cjs.ejs'),
-        this.destinationPath('babel.config.cjs'),
-        {
-          hasReact,
-          testing: this.options.testing,
-          jestExperimentalESM: !inLerna,
-        },
-      );
-    } else {
-      this.fs.delete('babel.config.cjs');
-    }
-
     this.fs.writeJSON(this.destinationPath('package.json'), pkg);
   }
 }

package/lib/generators/common/babel/templates/app.rollup.config.mjs.ejs

@@ -1,5 +1,5 @@
-import run from 'pob-babel/plugin-run';
 import createRollupConfig from 'pob-babel/createRollupConfig.js';
+import run from 'pob-babel/plugin-run.cjs';
 
 const watch = process.env.ROLLUP_WATCH === 'true';
 

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

@@ -159,14 +159,9 @@ export default class CommonLintGenerator extends Generator {
       'babel-eslint',
       'eslint-config-pob',
       'eslint-config-prettier',
-      'eslint-plugin-babel',
-      'eslint-plugin-flowtype',
-      'eslint-plugin-prefer-class-properties',
-      'eslint-plugin-prettier',
-      'eslint-plugin-react',
-      'eslint-plugin-react-hooks',
       'typescript-eslint-parser',
       'standard',
+      'eslint-import-resolver-node',
     ]);
 
     if (!pkg.name.startsWith('@pob/eslint-config')) {
@@ -174,11 +169,18 @@ export default class CommonLintGenerator extends Generator {
         'eslint-plugin-jsx-a11y',
         'eslint-config-airbnb',
         'eslint-config-airbnb-base',
+        'eslint-plugin-babel',
+        'eslint-plugin-flowtype',
+        'eslint-plugin-prefer-class-properties',
+        'eslint-plugin-prettier',
+        'eslint-plugin-react',
+        'eslint-plugin-react-hooks',
       ]);
     }
 
     const yoConfigPobMonorepo = inLerna && inLerna.pobMonorepoConfig;
     const globalEslint = yoConfigPobMonorepo && yoConfigPobMonorepo.eslint;
+    const globalTesting = yoConfigPobMonorepo && yoConfigPobMonorepo.testing;
     const composite = yoConfigPobMonorepo && yoConfigPobMonorepo.typescript;
     const { rootPackageManager, rootYarnNodeLinker } = inLerna || {};
     const lernaProjectType =
@@ -202,7 +204,6 @@ export default class CommonLintGenerator extends Generator {
           '@pob/eslint-config-react',
           '@typescript-eslint/eslint-plugin',
           '@typescript-eslint/parser',
-          'eslint-import-resolver-node',
           'eslint-plugin-node',
           'eslint-plugin-unicorn',
           'eslint-plugin-import',
@@ -244,7 +245,7 @@ export default class CommonLintGenerator extends Generator {
         packageUtils.addOrRemoveDevDependencies(
           pkg,
           shouldHavePluginsDependencies,
-          ['eslint-plugin-node', 'eslint-import-resolver-node'],
+          ['eslint-plugin-node'],
         );
 
         if ((inLerna && inLerna.root) || this.options.monorepo) {
@@ -337,18 +338,19 @@ export default class CommonLintGenerator extends Generator {
       ? `{${pkg.type === 'commonjs' ? 'mjs' : 'cjs'},js}`
       : `${hasReact ? '{ts,tsx}' : 'ts'}`;
 
-    const jestOverride = !pkg.jest
-      ? null
-      : {
-          files: [`**/*.test.${ext}`, `__tests__/**/*.${ext}`],
-          env: { jest: true },
-          rules: {
-            'import/no-extraneous-dependencies': [
-              'error',
-              { devDependencies: true },
-            ],
-          },
-        };
+    const jestOverride =
+      !pkg.jest && !globalTesting
+        ? null
+        : {
+            files: [`**/*.test.${ext}`, `__tests__/**/*.${ext}`],
+            env: { jest: true },
+            rules: {
+              'import/no-extraneous-dependencies': [
+                'error',
+                { devDependencies: true },
+              ],
+            },
+          };
 
     if (jestOverride) {
       // if (!useBabel) {

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

@@ -1,6 +1,7 @@
 import Generator from 'yeoman-generator';
 import inLerna from '../../../utils/inLerna.js';
 import * as packageUtils from '../../../utils/package.js';
+import { copyAndFormatTpl } from '../../../utils/writeAndFormat.js';
 
 export default class CommonTestingGenerator extends Generator {
   constructor(args, opts) {
@@ -82,6 +83,7 @@ export default class CommonTestingGenerator extends Generator {
     const yoConfigPobMonorepo = inLerna && inLerna.pobMonorepoConfig;
     const globalTesting = yoConfigPobMonorepo && yoConfigPobMonorepo.testing;
     const enableForMonorepo = this.options.monorepo && globalTesting;
+    const transpileWithBabel = yoConfigPobMonorepo.typescript;
 
     if (!this.options.enable) {
       packageUtils.removeDevDependencies(pkg, ['jest', '@types/jest']);
@@ -104,7 +106,11 @@ export default class CommonTestingGenerator extends Generator {
       packageUtils.addOrRemoveDevDependencies(
         pkg,
         enableForMonorepo || !globalTesting,
-        ['pob-lcov-reporter', 'jest', '@types/jest'],
+        [
+          pkg.name !== 'pob-monorepo' && 'pob-lcov-reporter',
+          'jest',
+          '@types/jest',
+        ],
       );
 
       if (this.options.monorepo && !globalTesting) {
@@ -120,7 +126,6 @@ export default class CommonTestingGenerator extends Generator {
             ? 'NODE_OPTIONS=--experimental-vm-modules '
             : ''
         }jest`;
-        const transpileWithBabel = yoConfigPobMonorepo.typescript;
 
         packageUtils.addScripts(pkg, {
           test: jestCommand,
@@ -132,14 +137,32 @@ export default class CommonTestingGenerator extends Generator {
           ].join(' ; '),
         });
 
+        const workspacesWithoutStar = pkg.workspaces.map((workspace) => {
+          if (!workspace.endsWith('/*')) {
+            throw new Error(`Invalid workspace format: ${workspace}`);
+          }
+          return workspace.slice(0, -2);
+        });
+        const workspacesPattern =
+          workspacesWithoutStar.length === 1
+            ? workspacesWithoutStar[0]
+            : `(${workspacesWithoutStar.join('|')})`;
+        const hasReact = packageUtils.hasReact(pkg);
+
         if (!pkg.jest) pkg.jest = {};
         Object.assign(pkg.jest, {
           cacheDirectory: './node_modules/.cache/jest',
           testEnvironment: 'node',
+          testMatch: [
+            `<rootDir>/${workspacesPattern}/*/(src|lib)/**/__tests__/**/*.${
+              transpileWithBabel ? '(ts|js|cjs|mjs)' : '(js|cjs|mjs)'
+            }${hasReact ? '?(x)' : ''}`,
+            `<rootDir>/${workspacesPattern}/*/(src|lib)/**/*.test.${
+              transpileWithBabel ? '(ts|js|cjs|mjs)' : '(js|cjs|mjs)'
+            }${hasReact ? '?(x)' : ''}`,
+          ],
         });
 
-        const hasReact = false;
-
         if (shouldUseExperimentalVmModules) {
           pkg.jest.extensionsToTreatAsEsm = [
             transpileWithBabel && '.ts',
@@ -160,7 +183,7 @@ export default class CommonTestingGenerator extends Generator {
         const transpileWithBabel = packageUtils.transpileWithBabel(pkg);
 
         const shouldUseExperimentalVmModules =
-          pkg.type === 'module' || (transpileWithBabel && !inLerna);
+          pkg.type === 'module' && !inLerna;
 
         const jestCommand = `${
           shouldUseExperimentalVmModules
@@ -233,6 +256,34 @@ export default class CommonTestingGenerator extends Generator {
       }
     }
 
+    if (
+      transpileWithBabel &&
+      ((this.options.monorepo && globalTesting) || !globalTesting)
+    ) {
+      const hasReact = transpileWithBabel && packageUtils.hasReact(pkg);
+      // cjs for jest compat
+      copyAndFormatTpl(
+        this.fs,
+        this.templatePath('babel.config.cjs.ejs'),
+        this.destinationPath('babel.config.cjs'),
+        {
+          only: !this.options.monorepo
+            ? "'src'"
+            : pkg.workspaces
+                .flatMap((workspace) => [
+                  `'${workspace}/src'`,
+                  `'${workspace}/lib'`,
+                ])
+                .join(', '),
+          hasReact,
+          testing: this.options.testing,
+          jestExperimentalESM: pkg.type === 'module',
+        },
+      );
+    } else {
+      this.fs.delete('babel.config.cjs');
+    }
+
     this.fs.writeJSON(this.destinationPath('package.json'), pkg);
   }
 }

package/lib/generators/common/testing/templates/babel.config.cjs.ejs

@@ -0,0 +1,12 @@
+'use strict';
+
+module.exports = function babelConfig(api) {
+  const isTest = api.env('test');
+
+  if (!isTest) return {};
+
+  return {
+    only: [<%- only %>],
+    presets: [[require.resolve('pob-babel/preset.cjs')<% if (!jestExperimentalESM) { %>, { modules: 'commonjs' }<% } %>]],
+  };
+};

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

@@ -127,6 +127,7 @@ export default class CommonTypescriptGenerator extends Generator {
           this.templatePath('tsconfig.build.json.ejs'),
           tsconfigBuildPath,
           {
+            inMonorepo: inLerna && !inLerna.root,
             jsx,
             composite,
             monorepoPackageNames,

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

@@ -18,6 +18,9 @@
 
   "exclude": [
     "dist/**",
+<% if (!inMonorepo) { -%>
+    "src/test-setup.ts",
+<% } -%>
     "src/**/*.test.ts",
 <% if(jsx) { -%>
     "src/**/*.test.tsx",

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

@@ -164,10 +164,19 @@ export default class CorePackageGenerator extends Generator {
       const doesMjsCheckPackagesExists = this.fs.exists(
         this.destinationPath('scripts/check-packages.mjs'),
       );
-      const doesJsCheckPackagesExists = this.fs.exists(
+      let doesJsCheckPackagesExists = this.fs.exists(
         this.destinationPath('scripts/check-packages.js'),
       );
 
+      if (pkg.type === 'module' && !doesJsCheckPackagesExists) {
+        doesJsCheckPackagesExists = true;
+        this.fs.copyTpl(
+          this.templatePath('check-packages.js.ejs'),
+          this.destinationPath('scripts/check-packages.js'),
+          {},
+        );
+      }
+
       packageUtils.addOrRemoveScripts(
         pkg,
         doesMjsCheckPackagesExists || doesJsCheckPackagesExists,
@@ -177,13 +186,31 @@ export default class CorePackageGenerator extends Generator {
           }`,
         },
       );
+    } else if (inLerna && !inLerna.root) {
+      if (this.fs.exists('scripts/check-package.js')) {
+        this.fs.delete('scripts/check-package.js');
+      }
+      if (this.fs.exists('scripts/check-package.mjs')) {
+        this.fs.delete('scripts/check-package.mjs');
+      }
+      packageUtils.removeScripts(pkg, ['checks']);
     } else {
       const doesMjsCheckPackageExists = this.fs.exists(
         this.destinationPath('scripts/check-package.mjs'),
       );
-      const doesJsCheckPackageExists = this.fs.exists(
+      let doesJsCheckPackageExists = this.fs.exists(
         this.destinationPath('scripts/check-package.js'),
       );
+
+      if (pkg.type === 'module' && !doesJsCheckPackageExists) {
+        doesJsCheckPackageExists = true;
+        this.fs.copyTpl(
+          this.templatePath('check-package.js.ejs'),
+          this.destinationPath('scripts/check-package.js'),
+          {},
+        );
+      }
+
       packageUtils.addOrRemoveScripts(
         pkg,
         doesMjsCheckPackageExists || doesJsCheckPackageExists,

package/lib/generators/core/package/templates/check-package.js.ejs

@@ -0,0 +1,3 @@
+import { createCheckPackage } from 'check-package-dependencies';
+
+createCheckPackage().checkRecommended({});

package/lib/generators/core/package/templates/check-packages.js.ejs

@@ -0,0 +1,5 @@
+import { createCheckPackageWithWorkspaces } from 'check-package-dependencies';
+
+createCheckPackageWithWorkspaces().checkRecommended({
+  isLibrary: () => true,
+});

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

@@ -1,5 +1,6 @@
 import Generator from 'yeoman-generator';
 import inLerna from '../../../utils/inLerna.js';
+import { writeAndFormatJson } from '../../../utils/writeAndFormat.js';
 
 export default class CoreRenovateGenerator extends Generator {
   constructor(args, opts) {
@@ -58,11 +59,25 @@ export default class CoreRenovateGenerator extends Generator {
 
   writing() {
     if (this.enableRenovate) {
-      this.fs.copy(
-        this.templatePath(
-          this.options.app ? 'renovate.app.json' : 'renovate.lib.json',
-        ),
+      const pkg = this.fs.readJSON(this.destinationPath('package.json'), {});
+      const renovateConfig = this.fs.readJSON(
         this.destinationPath('renovate.json'),
+        {},
+      );
+
+      if (this.options.app) {
+        renovateConfig.extends = ['config:js-app', '@pob'];
+      } else {
+        renovateConfig.extends = [
+          'config:js-lib',
+          pkg.name === 'pob-monorepo' ? undefined : '@pob',
+        ].filter(Boolean);
+      }
+
+      writeAndFormatJson(
+        this.fs,
+        this.destinationPath('renovate.json'),
+        renovateConfig,
       );
     } else if (this.fs.exists(this.destinationPath('renovate.json'))) {
       this.fs.delete(this.destinationPath('renovate.json'));

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

@@ -1,4 +1,5 @@
 import Generator from 'yeoman-generator';
+import { readJSON5 } from '../../../utils/json5.js';
 import { copyAndFormatTpl } from '../../../utils/writeAndFormat.js';
 
 export default class CoreVSCodeGenerator extends Generator {
@@ -56,12 +57,19 @@ export default class CoreVSCodeGenerator extends Generator {
           typescript: this.options.typescript,
         },
       );
+
+      const tasksConfig = readJSON5(
+        this.fs,
+        this.destinationPath('.vscode/tasks.json'),
+        {},
+      );
       copyAndFormatTpl(
         this.fs,
         this.templatePath('tasks.json.ejs'),
         this.destinationPath('.vscode/tasks.json'),
         {
           typescript: this.options.typescript,
+          tasks: JSON.stringify(tasksConfig.tasks || [], null, 2),
         },
       );
     } else {

package/lib/generators/core/vscode/templates/tasks.json.ejs

@@ -2,6 +2,5 @@
   // See https://go.microsoft.com/fwlink/?LinkId=733558
   // for the documentation about the tasks.json format
   "version": "2.0.0",
-  "tasks": [
-  ]
+  "tasks": <%- tasks %>
 }

package/lib/generators/lib/PobLibGenerator.js

@@ -320,13 +320,6 @@ export default class PobLibGenerator extends Generator {
         delete pkg.scripts.version;
       }
     }
-    if (withBabel && (!inLerna || !inLerna.root)) {
-      packageUtils.addScripts(pkg, {
-        clean: 'rm -Rf dist',
-      });
-    } else {
-      delete pkg.scripts.clean;
-    }
 
     if (!withBabel) {
       if (

package/lib/generators/lib/release/LibReleaseGenerator.js

@@ -39,7 +39,10 @@ export default class LibReleaseGenerator extends Generator {
 
     if (!isStandardVersionEnabled) {
       packageUtils.removeDevDependencies(pkg, ['standard-version']);
-      packageUtils.removeScripts(pkg, ['release', 'preversion']);
+      packageUtils.removeScripts(pkg, [
+        'release',
+        pkg.name === 'pob-dependencies' ? null : 'preversion',
+      ]);
     } else {
       packageUtils.addDevDependencies(pkg, ['standard-version']);
       packageUtils.addScripts(pkg, {

package/lib/generators/monorepo/PobMonorepoGenerator.js

@@ -1,4 +1,5 @@
 import fs from 'fs';
+import path from 'path';
 import { PackageGraph } from '@lerna/package-graph';
 import { Project as LernaProject } from '@lerna/project';
 import Generator from 'yeoman-generator';
@@ -82,10 +83,15 @@ export default class PobMonorepoGenerator extends Generator {
       const batch = [...graph.values()].filter(
         (node) => node.localDependencies.size === 0,
       );
+      batch.sort((a, b) => a.name.localeCompare(b.name, 'en'));
 
       // batches are composed of Package instances, not PackageGraphNodes
       this.packages.push(...batch.map((node) => node.pkg));
-      this.packageLocations.push(...batch.map((node) => node.location));
+      this.packageLocations.push(
+        ...batch.map((node) =>
+          path.relative(this.destinationPath(), node.location),
+        ),
+      );
 
       // pruning the graph changes the node.localDependencies.size test
       graph.prune(...batch);
@@ -165,32 +171,14 @@ export default class PobMonorepoGenerator extends Generator {
     const pkg = this.fs.readJSON(this.destinationPath('package.json'), {});
 
     const packageNames = this.packageNames;
-
-    const basePackageName = pkg.name.startsWith('@')
-      ? `${pkg.name.replace(/-monorepo$/, '')}-`
-      : `@${pkg.name}/`;
-
-    const packagePaths = packageNames
-      .map((packageName) =>
-        this.options.isAppProject && packageName.startsWith(basePackageName)
-          ? `packages/${packageName.slice(basePackageName.length)}`
-          : `${packageName[0] === '@' ? '' : 'packages/'}${packageName}`,
-      )
-      .filter(
-        this.pobLernaConfig.typescript
-          ? (packagePath) => fs.existsSync(`${packagePath}/tsconfig.json`)
-          : Boolean,
-      );
+    const packagePaths = this.packageLocations.filter(
+      this.pobLernaConfig.typescript
+        ? (packagePath) => fs.existsSync(`${packagePath}/tsconfig.json`)
+        : Boolean,
+    );
 
     if (packagePaths.length === 0 && packageNames.length > 0) {
-      console.log(
-        packageNames,
-        packageNames.map((packageName) =>
-          this.options.isAppProject && packageName.startsWith(basePackageName)
-            ? `packages/${packageName.slice(basePackageName.length)}`
-            : `${packageName[0] === '@' ? '' : 'packages/'}${packageName}`,
-        ),
-      );
+      console.log(packageNames, packagePaths);
       throw new Error('packages should not be empty');
     }
 

package/lib/pob.js

@@ -286,16 +286,14 @@ const options = {
   force: argv.force,
 };
 
-(async () => {
-  try {
-    await env.run('pob', options);
-  } catch (err) {
-    if (err) {
-      console.error(err.stack || err.message || err);
-      process.exit(1);
-    }
+try {
+  await env.run('pob', options);
+} catch (err) {
+  if (err) {
+    console.error(err.stack || err.message || err);
+    process.exit(1);
   }
-})();
+}
 
 // generator.on('error', (err) => {
 //   console.error(err.stack || err.message || err);

package/lib/utils/dependenciesPackages.cjs

@@ -0,0 +1,10 @@
+'use strict';
+
+// eslint-disable-next-line import/no-extraneous-dependencies
+exports.pobEslintConfig = require('@pob/eslint-config/package.json');
+
+// eslint-disable-next-line import/no-extraneous-dependencies
+exports.pobEslintConfigTypescript = require('@pob/eslint-config-typescript/package.json');
+
+// eslint-disable-next-line import/no-extraneous-dependencies
+exports.pobEslintConfigTypescriptReact = require('@pob/eslint-config-typescript-react/package.json');

package/lib/utils/json5.js

@@ -0,0 +1,7 @@
+import JSON5 from 'json5';
+
+export function readJSON5(fs, destinationPath, defaults) {
+  const content = fs.read(destinationPath, null);
+  if (content === null) return defaults;
+  return JSON5.parse(content);
+}

package/lib/utils/package.js

@@ -3,6 +3,11 @@ import sortPkg from '@pob/sort-pkg';
 import parseAuthor from 'parse-author';
 import pobDependencies from 'pob-dependencies';
 import semver from 'semver';
+import {
+  pobEslintConfig,
+  pobEslintConfigTypescript,
+  pobEslintConfigTypescriptReact,
+} from './dependenciesPackages.cjs';
 
 export { default as parseAuthor } from 'parse-author';
 
@@ -62,7 +67,7 @@ function internalAddToObject(pkg, key, object) {
 
 function internalRemoveFromObject(pkg, key, keys) {
   if (!pkg[key]) return;
-  keys.forEach((k) => {
+  keys.filter(Boolean).forEach((k) => {
     delete pkg[key][k];
   });
   if (Object.keys(pkg[key]).length === 0) {
@@ -78,6 +83,26 @@ const internalRemoveDependencies = (pkg, type, dependencyKeys) => {
 };
 
 const getVersionFromDependencyName = (dependency) => {
+  if (
+    [
+      // 'eslint-import-resolver-node',
+      'eslint-plugin-import',
+      'eslint-plugin-node',
+      'eslint-plugin-unicorn',
+    ].includes(dependency)
+  ) {
+    return pobEslintConfig.dependencies[dependency];
+  }
+  if (['eslint-plugin-jsx-a11y', 'eslint-plugin-react'].includes(dependency)) {
+    return pobEslintConfigTypescriptReact.dependencies[dependency];
+  }
+  if (
+    ['@typescript-eslint/eslint-plugin', '@typescript-eslint/parser'].includes(
+      dependency,
+    )
+  ) {
+    return pobEslintConfigTypescript.dependencies[dependency];
+  }
   return pobDependencies[dependency];
 };
 
@@ -88,7 +113,7 @@ const internalAddDependencies = (pkg, type, dependencies, cleaned, prefix) => {
   const removeDependencies = [];
 
   const dependenciesToCheck = [];
-  dependencies.forEach((dependency) => {
+  dependencies.filter(Boolean).forEach((dependency) => {
     if (ignoreDependencies[dependency] || pkg.name === dependency) {
       removeDependencies.push(dependency);
     } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pob",
-  "version": "9.5.0",
+  "version": "9.6.0",
   "description": "Pile of bones, library generator with git/babel/typescript/typedoc/readme/jest",
   "keywords": [
     "skeleton"
@@ -57,18 +57,19 @@
     "github-username": "^6.0.0",
     "got": "^11.8.1",
     "inquirer-npm-name": "^4.0.0",
+    "json5": "^2.2.0",
     "lodash.camelcase": "^4.3.0",
     "lodash.kebabcase": "^4.1.1",
     "mem-fs": "1.2.0",
     "mem-fs-editor": "8.1.2",
     "minimist-argv": "^1.1.0",
     "parse-author": "^2.0.0",
-    "pob-dependencies": "^6.1.0",
+    "pob-dependencies": "^6.2.0",
     "prettier": "2.5.1",
     "semver": "^7.3.4",
     "update-notifier": "^5.0.1",
     "yeoman-environment": "^3.5.1",
     "yeoman-generator": "^5.4.0"
   },
-  "gitHead": "48b073ef8e253234b0b08f69a250befe044dcc58"
+  "gitHead": "60c7c5d5ced2306853000642d05efb12e6115f4b"
 }

package/lib/generators/common/babel/templates/babel.config.cjs.ejs

@@ -1,14 +0,0 @@
-'use strict';
-
-const path = require('path');
-
-module.exports = function babelConfig(api) {
-  const isTest = api.env('test');
-
-  if (!isTest) return {};
-
-  return {
-    only: [path.resolve(__dirname, 'src')],
-    presets: [[require.resolve('pob-babel/preset')<% if (!jestExperimentalESM) { %>, { modules: 'commonjs' }<% } %>]],
-  };
-};

package/lib/generators/core/renovate/templates/renovate.app.json

@@ -1,3 +0,0 @@
-{
-  "extends": ["config:js-app", "@pob"]
-}

package/lib/generators/core/renovate/templates/renovate.lib.json

@@ -1,3 +0,0 @@
-{
-  "extends": ["config:js-lib", "@pob"]
-}