pob 9.10.0 → 9.12.2

package/CHANGELOG.md

@@ -3,6 +3,61 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [9.12.2](https://github.com/christophehurpeau/pob/compare/pob@9.12.1...pob@9.12.2) (2022-01-02)
+
+
+### Bug Fixes
+
+* **pob:** stop ci testing on node 14 on app projects ([c775697](https://github.com/christophehurpeau/pob/commit/c77569741136dc3feefcdc61f666092751be944c))
+
+
+
+
+
+## [9.12.1](https://github.com/christophehurpeau/pob/compare/pob@9.12.0...pob@9.12.1) (2022-01-02)
+
+
+### Bug Fixes
+
+* set globalEslint default to true ([8d7d3d5](https://github.com/christophehurpeau/pob/commit/8d7d3d5917b340b901b565a23356b21939059cb8))
+* use cjs for default main for jest which doesnt supports exports yet ([f97c897](https://github.com/christophehurpeau/pob/commit/f97c8972b35032078f4603d788b4a3e637d61637))
+
+
+
+
+
+# [9.12.0](https://github.com/christophehurpeau/pob/compare/pob@9.11.0...pob@9.12.0) (2022-01-01)
+
+
+### Features
+
+* **pob:** update release-please version ([8091222](https://github.com/christophehurpeau/pob/commit/80912226fedb9eb5e25936f2c9f4a719bf9605e9))
+
+
+
+
+
+# [9.11.0](https://github.com/christophehurpeau/pob/compare/pob@9.10.0...pob@9.11.0) (2022-01-01)
+
+
+### Bug Fixes
+
+* **pob:** legacy pkg.main cjs ([04dc5e2](https://github.com/christophehurpeau/pob/commit/04dc5e22e77b7383660b3bc62516d884670cf25a))
+* force package type module when lerna and root is module ([c8e89a8](https://github.com/christophehurpeau/pob/commit/c8e89a8d04936ea7035d86a646437ba74e54146b))
+* **deps:** update dependency @yarnpkg/parsers to v2.5.0-rc.7 ([#1148](https://github.com/christophehurpeau/pob/issues/1148)) ([8da56d4](https://github.com/christophehurpeau/pob/commit/8da56d4c1576908570c16da89caebad87a50c473))
+* **pob:** monorepo react testing detection ([3f95cbf](https://github.com/christophehurpeau/pob/commit/3f95cbf667f624301aab82a88080c526507fe662))
+* **pob:** test babel config with react ([726b954](https://github.com/christophehurpeau/pob/commit/726b95400eeef042bb22cafd1f4cdec23e0008df))
+* package main when only esm is used ([b02684f](https://github.com/christophehurpeau/pob/commit/b02684f03a7bdf5875ac4919aa69df6b4993532f))
+
+
+### Features
+
+* **deps:** update dependency eslint to v8.6.0 ([#1152](https://github.com/christophehurpeau/pob/issues/1152)) ([004bf4f](https://github.com/christophehurpeau/pob/commit/004bf4f78e200606813498ee4f211ed06fec659f))
+
+
+
+
+
 # [9.10.0](https://github.com/christophehurpeau/pob/compare/pob@9.9.1...pob@9.10.0) (2021-12-26)
 
 

package/lib/generators/app/PobAppGenerator.js

@@ -157,6 +157,7 @@ export default class PobAppGenerator extends Generator {
       codecov: false,
       ci: this.appConfig.ci,
       packageManager: this.options.packageManager,
+      isApp: true,
     });
 
     this.composeWith('pob:common:format-lint', {

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

@@ -125,10 +125,6 @@ export default class CommonBabelGenerator extends Generator {
           validate: (versions) => versions.length > 0,
           default: nodeVersions,
           choices: [
-            {
-              name: '12 (Maintenance LTS)',
-              value: '12',
-            },
             {
               name: '14 (Maintenance LTS)',
               value: '14',
@@ -468,7 +464,11 @@ export default class CommonBabelGenerator extends Generator {
       if (!pkg.main) {
         pkg.exports = './lib/index.js';
       }
-      pkg.main = './lib/index.js';
+      if (pkg.type === 'module' && this.fs.exists('./lib/index.cjs')) {
+        pkg.main = './lib/index.cjs';
+      } else {
+        pkg.main = './lib/index.js';
+      }
       if (!this.options.isApp) {
         if (this.fs.exists('./lib/index.ts')) {
           pkg.types = './lib/index.ts';
@@ -609,7 +609,12 @@ export default class CommonBabelGenerator extends Generator {
             // eslint: https://github.com/benmosher/eslint-plugin-import/issues/2132
             // jest: https://github.com/facebook/jest/issues/9771
             if (!pkg.main && exportName === '.') {
-              pkg.main = exportTarget.default || exportTarget.require;
+              pkg.main =
+                pkg.type === 'module'
+                  ? exportTarget.import
+                  : exportTarget.default ||
+                    exportTarget.require ||
+                    exportTarget.import;
             }
           } else if (target === 'browser') {
             if (formats.includes('es')) {

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

@@ -179,7 +179,8 @@ export default class CommonLintGenerator extends Generator {
     }
 
     const yoConfigPobMonorepo = inLerna && inLerna.pobMonorepoConfig;
-    const globalEslint = yoConfigPobMonorepo && yoConfigPobMonorepo.eslint;
+    const globalEslint =
+      yoConfigPobMonorepo && yoConfigPobMonorepo.eslint !== false;
     const globalTesting = yoConfigPobMonorepo && yoConfigPobMonorepo.testing;
     const composite = yoConfigPobMonorepo && yoConfigPobMonorepo.typescript;
     const { rootPackageManager, rootYarnNodeLinker } = inLerna || {};

package/lib/generators/common/release/templates/release-please.yml.ejs

@@ -9,7 +9,7 @@ jobs:
   release-please:
     runs-on: ubuntu-latest
     steps:
-      - uses: GoogleCloudPlatform/release-please-action@v2
+      - uses: GoogleCloudPlatform/release-please-action@v3
         id: release
         with:
           token: ${{ secrets.GH_TOKEN }}

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

@@ -48,6 +48,12 @@ export default class CommonTestingGenerator extends Generator {
       defaults: 'yarn',
       desc: 'yarn or npm',
     });
+
+    this.option('isApp', {
+      type: Boolean,
+      required: true,
+      desc: 'is app',
+    });
   }
 
   default() {
@@ -60,6 +66,7 @@ export default class CommonTestingGenerator extends Generator {
         documentation: this.options.documentation,
         codecov: this.options.codecov,
         packageManager: this.options.packageManager,
+        isApp: this.options.isApp,
       });
     } else {
       this.composeWith('pob:core:ci', {
@@ -86,6 +93,7 @@ export default class CommonTestingGenerator extends Generator {
     const transpileWithBabel = this.options.monorepo
       ? yoConfigPobMonorepo.typescript
       : pkg.pob && pkg.pob.babelEnvs && pkg.pob.babelEnvs.length > 0;
+    let hasReact = transpileWithBabel && packageUtils.hasReact(pkg);
 
     if (!this.options.enable) {
       packageUtils.removeDevDependencies(pkg, ['jest', '@types/jest']);
@@ -149,7 +157,9 @@ export default class CommonTestingGenerator extends Generator {
           workspacesWithoutStar.length === 1
             ? workspacesWithoutStar[0]
             : `(${workspacesWithoutStar.join('|')})`;
-        const hasReact = packageUtils.hasReact(pkg);
+        hasReact = yoConfigPobMonorepo.packageNames.some((pkgName) =>
+          pkgName.startsWith('react-'),
+        );
 
         if (!pkg.jest) pkg.jest = {};
         Object.assign(pkg.jest, {
@@ -204,7 +214,6 @@ export default class CommonTestingGenerator extends Generator {
           ].join(' ; '),
         });
 
-        const hasReact = transpileWithBabel && packageUtils.hasReact(pkg);
         const srcDirectory = transpileWithBabel ? 'src' : 'lib';
 
         if (!pkg.jest) pkg.jest = {};
@@ -262,7 +271,6 @@ export default class CommonTestingGenerator extends Generator {
       transpileWithBabel &&
       ((this.options.monorepo && globalTesting) || !globalTesting)
     ) {
-      const hasReact = transpileWithBabel && packageUtils.hasReact(pkg);
       // cjs for jest compat
       copyAndFormatTpl(
         this.fs,

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

@@ -7,6 +7,15 @@ module.exports = function babelConfig(api) {
 
   return {
     only: [<%- only %>],
-    presets: [[require.resolve('pob-babel/preset.cjs')<% if (!jestExperimentalESM) { %>, { modules: 'commonjs' }<% } %>]],
+    presets: [
+      [require.resolve('pob-babel/preset.cjs')<% if (!jestExperimentalESM) { %>, { modules: 'commonjs' }<% } %>]
+      <% if (hasReact) { %>, [
+        '@babel/preset-react',
+        {
+          development: false,
+          useBuiltIns: true,
+        },
+      ]<% } %>
+    ],
   };
 };

package/lib/generators/core/ci/CoreCIGenerator.js

@@ -54,6 +54,12 @@ export default class CoreCIGenerator extends Generator {
       required: true,
       desc: 'Include documentation generation',
     });
+
+    this.option('isApp', {
+      type: Boolean,
+      required: true,
+      desc: 'is app',
+    });
   }
 
   default() {
@@ -75,6 +81,7 @@ export default class CoreCIGenerator extends Generator {
           build: this.options.build,
           typescript: this.options.typescript,
           codecov: this.options.codecov,
+          supportsNode14: !this.options.isApp,
         },
       );
     } else {

package/lib/generators/core/ci/templates/github-action-node-workflow.yml.ejs

@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x, 16.x]
+        node-version: [<% if (supportsNode14) { -%>14.x, <% } -%>16.x]
 
     steps:
       - uses: actions/checkout@v2

package/lib/generators/core/git/CoreGitGenerator.js

@@ -13,6 +13,12 @@ export default class CoreGitGenerator extends Generator {
       defaults: '',
       desc: 'Should create the repo on github',
     });
+
+    this.option('isApp', {
+      type: String,
+      required: true,
+      desc: 'is app',
+    });
   }
 
   async initializing() {
@@ -94,6 +100,7 @@ export default class CoreGitGenerator extends Generator {
         shouldCreate: !this.originUrl,
         gitHostAccount: this.gitHostAccount,
         repoName: this.repoName,
+        isApp: this.options.isApp,
       });
     }
   }

package/lib/generators/core/git/generators/github/CoreGitGithubGenerator.js

@@ -15,14 +15,18 @@ const gh = got.extend({
   },
 });
 
-const configureProtectionRule = async (owner, repo) => {
+const configureProtectionRule = async (owner, repo, isApp) => {
   for (const branch of ['main', 'master']) {
     try {
       await gh.put(`repos/${owner}/${repo}/branches/${branch}/protection`, {
         json: {
           required_status_checks: {
             strict: false,
-            contexts: ['build (14.x)', 'build (16.x)', 'reviewflow'],
+            contexts: [
+              !isApp && 'build (14.x)',
+              'build (16.x)',
+              'reviewflow',
+            ].filter(Boolean),
           },
           enforce_admins: false, // true,
           required_pull_request_reviews: null,
@@ -67,6 +71,12 @@ export default class CoreGitGithubGenerator extends Generator {
       desc: 'repo name',
     });
 
+    this.option('isApp', {
+      type: String,
+      required: true,
+      desc: 'is app',
+    });
+
     if (!GITHUB_TOKEN && process.env.CI !== 'true') {
       throw new Error(
         'Missing POB_GITHUB_TOKEN. Create one with https://github.com/settings/tokens/new?scopes=repo&description=POB%20Generator and add it in your env variables.',
@@ -137,7 +147,7 @@ export default class CoreGitGithubGenerator extends Generator {
           cwd,
         });
 
-        configureProtectionRule(owner, repo);
+        configureProtectionRule(owner, repo, this.options.isApp);
 
         // await gh.put(`/repos/${owner}/${repo}/topics`, {
         //   names: pkg.keywords,
@@ -162,7 +172,7 @@ export default class CoreGitGithubGenerator extends Generator {
         },
       });
 
-      configureProtectionRule(owner, repo);
+      configureProtectionRule(owner, repo, this.options.isApp);
     }
   }
 }

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

@@ -139,6 +139,9 @@ export default class CorePackageGenerator extends Generator {
     );
 
     if (!pkg.type) pkg.type = props.type;
+    if (inLerna && !inLerna.root && inLerna.rootMonorepoPkg.type === 'module') {
+      pkg.type = 'module';
+    }
 
     pkg.description = this.options.updateOnly
       ? pkg.description

package/lib/generators/lib/PobLibGenerator.js

@@ -250,6 +250,7 @@ export default class PobLibGenerator extends Generator {
       codecov: this.pobjson.testing && this.pobjson.testing.codecov,
       ci: this.pobjson.testing && this.pobjson.testing.ci,
       packageManager: this.options.packageManager,
+      isApp: false,
     });
 
     // must be after testing

package/lib/generators/monorepo/PobMonorepoGenerator.js

@@ -193,6 +193,7 @@ export default class PobMonorepoGenerator extends Generator {
       codecov: this.pobLernaConfig.testing && this.pobLernaConfig.codecov,
       ci: this.pobLernaConfig.ci,
       packageManager: this.options.packageManager,
+      isApp: this.options.isAppProject,
     });
 
     this.composeWith('pob:common:format-lint', {

package/lib/generators/pob/PobBaseGenerator.js

@@ -165,7 +165,9 @@ export default class PobBaseGenerator extends Generator {
     });
 
     if (!this.inLerna) {
-      this.composeWith('pob:core:git');
+      this.composeWith('pob:core:git', {
+        isApp: this.projectConfig.type === 'app',
+      });
     } else {
       if (this.fs.exists('.git-hooks')) this.fs.delete('.git-hooks');
       if (this.fs.exists('git-hooks')) this.fs.delete('git-hooks');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pob",
-  "version": "9.10.0",
+  "version": "9.12.2",
   "description": "Pile of bones, library generator with git/babel/typescript/typedoc/readme/jest",
   "keywords": [
     "skeleton"
@@ -47,8 +47,8 @@
     "@pob/sort-eslint-config": "^3.0.1",
     "@pob/sort-object": "^4.0.1",
     "@pob/sort-pkg": "^4.0.1",
-    "@yarnpkg/parsers": "2.5.0-rc.6",
-    "eslint": "8.5.0",
+    "@yarnpkg/parsers": "2.5.0-rc.7",
+    "eslint": "8.6.0",
     "findup-sync": "^5.0.0",
     "git-remote-url": "^1.0.1",
     "github-username": "^6.0.0",
@@ -61,11 +61,11 @@
     "mem-fs-editor": "9.4.0",
     "minimist-argv": "^1.1.0",
     "parse-author": "^2.0.0",
-    "pob-dependencies": "6.5.0",
+    "pob-dependencies": "6.6.2",
     "prettier": "2.5.1",
     "semver": "^7.3.4",
     "yeoman-environment": "^3.5.1",
     "yeoman-generator": "^5.4.0"
   },
-  "gitHead": "c4a529a8e84d4aab433ecd39956ccc586ab75f8d"
+  "gitHead": "a24cc6360630314a3ed2ea8fd2cc0c5f02e300ce"
 }