pob 8.10.0 → 8.10.1

package/CHANGELOG.md

@@ -3,6 +3,21 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [8.10.1](https://github.com/christophehurpeau/pob/compare/pob@8.10.0...pob@8.10.1) (2021-12-05)
+
+
+### Bug Fixes
+
+* **pob:** only install release workflow if ci is enabled ([8e2fc45](https://github.com/christophehurpeau/pob/commit/8e2fc45ec5435a149b4580b09ae4636e3dbc0fdf))
+* **pob:** start script for apps ([623cfb5](https://github.com/christophehurpeau/pob/commit/623cfb5e5a9af9978b5533962ec7fb3b85035a3b))
+* init new monorepo ([7a212de](https://github.com/christophehurpeau/pob/commit/7a212deb2feb480c19b5243a201f31a7b2ce45c3))
+* monorepo add ([3ae8bfb](https://github.com/christophehurpeau/pob/commit/3ae8bfb487b8a88b62ad8692789ecdddf01ec376))
+* **deps:** update dependency prettier to v2.5.1 ([#1122](https://github.com/christophehurpeau/pob/issues/1122)) ([ba903e3](https://github.com/christophehurpeau/pob/commit/ba903e3c63ff90eab7938d5aecbd9d37fac68293))
+
+
+
+
+
 # [8.10.0](https://github.com/christophehurpeau/pob/compare/pob@8.9.0...pob@8.10.0) (2021-11-28)
 
 

package/lib/generators/app/PobAppGenerator.js

@@ -87,6 +87,7 @@ export default class PobAppGenerator extends Generator {
         name: 'ci',
         message: 'Do you want ci ?',
         default: !config || config.ci === undefined ? true : config.ci,
+        when: () => !inLerna,
       },
     ]);
 

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

@@ -267,10 +267,19 @@ export default class CommonBabelGenerator extends Generator {
 
     /* scripts */
 
-    packageUtils.addOrRemoveScripts(pkg, useBabel, {
-      build: 'pob-build',
-      watch: 'pob-watch',
-    });
+    if (this.options.isApp) {
+      packageUtils.removeScripts(['watch']);
+      packageUtils.addOrRemoveScripts(pkg, useBabel, {
+        build: 'pob-build',
+        start: 'pob-watch',
+      });
+    } else {
+      packageUtils.removeScripts(['start']);
+      packageUtils.addOrRemoveScripts(pkg, useBabel, {
+        build: 'pob-build',
+        watch: 'pob-watch',
+      });
+    }
 
     const shouldBuildDefinitions = !this.options.isApp && useBabel;
     packageUtils.addOrRemoveScripts(pkg, shouldBuildDefinitions, {

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

@@ -12,6 +12,13 @@ export default class CommonLintGenerator extends Generator {
   constructor(args, opts) {
     super(args, opts);
 
+    this.option('monorepo', {
+      type: Boolean,
+      required: false,
+      defaults: false,
+      description: 'Is root monorepo',
+    });
+
     this.option('babel', {
       type: String,
       required: false,
@@ -104,7 +111,7 @@ export default class CommonLintGenerator extends Generator {
       arrowParens: 'always',
     };
 
-    if (!inLerna || inLerna.root) {
+    if (!inLerna || inLerna.root || this.options.monorepo) {
       const ignorePatterns = new Set(
         this.options.ignorePaths.split('\n').filter(Boolean),
       );
@@ -125,7 +132,7 @@ export default class CommonLintGenerator extends Generator {
         this.templatePath('prettierignore.ejs'),
         this.destinationPath('.prettierignore'),
         {
-          inRoot: !inLerna || inLerna.root,
+          inRoot: !inLerna || inLerna.root || this.options.monorepo,
           documentation: this.options.documentation,
           packageManager: this.options.packageManager,
           yarnNodeLinker: this.options.yarnNodeLinker,
@@ -181,7 +188,7 @@ export default class CommonLintGenerator extends Generator {
 
     if (
       globalEslint &&
-      !(inLerna && inLerna.root) &&
+      !((inLerna && inLerna.root) || this.options.monorepo) &&
       (rootPackageManager !== 'yarn' || rootYarnNodeLinker === 'node-modules')
     ) {
       packageUtils.removeDevDependencies(
@@ -205,15 +212,17 @@ export default class CommonLintGenerator extends Generator {
     } else {
       packageUtils.addOrRemoveDevDependencies(
         pkg,
-        (inLerna && inLerna.root) || !globalEslint,
+        (inLerna && inLerna.root) || this.options.monorepo || !globalEslint,
         ['prettier'],
       );
       packageUtils.addOrRemoveDevDependencies(
         pkg,
         !globalEslint ||
           (inLerna && inLerna.root) ||
+          this.options.monorepo ||
           lernaProjectType === 'app' ||
-          rootPackageManager === 'yarn' ||
+          (rootPackageManager === 'yarn' &&
+            rootYarnNodeLinker !== 'node-modules') ||
           !!(pkg.peerDependencies && pkg.peerDependencies.eslint),
         ['eslint'],
       );
@@ -241,7 +250,7 @@ export default class CommonLintGenerator extends Generator {
           ['eslint-plugin-node', 'eslint-import-resolver-node'],
         );
 
-        if (inLerna && inLerna.root) {
+        if ((inLerna && inLerna.root) || this.options.monorepo) {
           if (this.options.typescript) {
             packageUtils.updateDevDependenciesIfPresent(pkg, [
               '@pob/eslint-config-typescript',
@@ -410,7 +419,7 @@ export default class CommonLintGenerator extends Generator {
       console.warn(`Could not parse/edit ${rootEslintrcPath}: `, err);
     }
 
-    if (inLerna && inLerna.root) {
+    if ((inLerna && inLerna.root) || this.options.monorepo) {
       if (this.fs.exists(srcEslintrcPath)) {
         this.fs.delete(srcEslintrcPath);
       }
@@ -448,7 +457,7 @@ export default class CommonLintGenerator extends Generator {
     }
 
     // see monorepo/lerna/index.js
-    if (!(inLerna && inLerna.root)) {
+    if (!(inLerna && inLerna.root) && !this.options.monorepo) {
       const srcDirectory = useBabel ? 'src' : 'lib';
       const lintRootJsFiles = (useBabel && useNode) || !inLerna;
 

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

@@ -37,9 +37,14 @@ const configureProtectionRule = async (owner, repo) => {
           allow_deletions: false,
         },
       });
+      if (branch === 'master') {
+        console.warn('You should rename your "master" branch to "main"');
+      }
     } catch (err) {
-      console.error(`Failed to configure ${branch} branch protection`);
-      console.error(err.stack || err.message || err);
+      if (branch === 'main') {
+        console.error(`Failed to configure ${branch} branch protection`);
+        console.error(err.stack || err.message || err);
+      }
     }
   }
 };
@@ -79,14 +84,17 @@ export default class CoreGitGithubGenerator extends Generator {
     const repo = this.options.repoName;
 
     const pkg = this.fs.readJSON(this.destinationPath('package.json'), {});
+    const name = pkg.name.endsWith('-monorepo')
+      ? pkg.name.slice(0, -'-monorepo'.length)
+      : pkg.name;
 
     if (this.options.shouldCreate) {
       try {
         if (this.options.shouldCreate) {
           try {
-            await gh('user/repos', {
+            await gh.post('user/repos', {
               json: {
-                name: pkg.name,
+                name,
                 description: pkg.description,
                 homepage: null,
                 private: false,
@@ -103,13 +111,33 @@ export default class CoreGitGithubGenerator extends Generator {
         }
 
         const cwd = this.destinationPath();
-        this.spawnCommandSync('git', ['add', '--all', '.'], { cwd });
+        try {
+          this.spawnCommandSync('git', ['add', '--all', '.'], { cwd });
+        } catch (err) {
+          this.spawnCommandSync('git', ['init'], { cwd });
+          this.spawnCommandSync('git', ['add', '--all', '.'], { cwd });
+          this.spawnCommandSync(
+            'git',
+            [
+              'remote',
+              'add',
+              'origin',
+              `git@github.com:christophehurpeau/${name}.git`,
+            ],
+            { cwd },
+          );
+          console.error('Failed to create repository');
+          console.error(err.stack || err.message || err);
+        }
         this.spawnCommandSync(
           'git',
           ['commit', '-m', 'chore: initial commit [skip ci]'],
           { cwd },
         );
-        this.spawnCommandSync('git', ['push', '-u', 'origin', 'master'], {
+        this.spawnCommandSync('git', ['branch', '-M', 'main'], {
+          cwd,
+        });
+        this.spawnCommandSync('git', ['push', '-u', 'origin', 'main'], {
           cwd,
         });
 

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

@@ -9,6 +9,20 @@ export default class CorePackageGenerator extends Generator {
   constructor(args, opts) {
     super(args, opts);
 
+    this.option('monorepo', {
+      type: Boolean,
+      required: true,
+      defaults: false,
+      desc: 'is monorepo',
+    });
+
+    this.option('isRoot', {
+      type: Boolean,
+      required: true,
+      defaults: false,
+      desc: 'is root',
+    });
+
     this.option('private', {
       type: Boolean,
       required: false,
@@ -29,7 +43,9 @@ export default class CorePackageGenerator extends Generator {
     }
 
     if (!this.options.updateOnly) {
-      if (this.options.private || (inLerna && inLerna.root)) {
+      if (this.options.monorepo && this.options.isRoot) {
+        pkg.private = true;
+      } else if (this.options.private) {
         pkg.private = true;
       } else {
         const { isPrivate } = await this.prompt({
@@ -46,7 +62,7 @@ export default class CorePackageGenerator extends Generator {
       }
     }
 
-    if (inLerna && inLerna.root) {
+    if (this.options.monorepo && this.options.isRoot) {
       if (!pkg.name) {
         const { name } = await this.prompt({
           name: 'name',
@@ -77,7 +93,7 @@ export default class CorePackageGenerator extends Generator {
     const props = await this.prompt(
       [
         !this.options.updateOnly &&
-          !(inLerna && inLerna.root) && {
+          !(this.options.monorepo && this.options.isRoot) && {
             name: 'description',
             message: 'Description',
             default: pkg.description,
@@ -115,7 +131,7 @@ export default class CorePackageGenerator extends Generator {
       ? pkg.description
       : props.description || pkg.description;
 
-    if (inLerna && !inLerna.root) {
+    if (this.options.monorepo && !this.options.isRoot) {
       const rootMonorepoPkg = inLerna.rootMonorepoPkg;
       const rootRepositoryUrl =
         typeof rootMonorepoPkg.repository === 'string'
@@ -136,9 +152,9 @@ export default class CorePackageGenerator extends Generator {
       fs.unlinkSync(this.destinationPath('yarn-error.log'));
     }
 
-    if (inLerna && !inLerna.root) {
+    if (this.options.monorepo && !this.options.isRoot) {
       packageUtils.removeScripts(pkg, ['checks']);
-    } else if (inLerna && inLerna.root) {
+    } else if (this.options.monorepo && this.options.isRoot) {
       const doesMjsCheckPackagesExists = this.fs.exists(
         this.destinationPath('scripts/check-packages.mjs'),
       );
@@ -206,6 +222,7 @@ export default class CorePackageGenerator extends Generator {
 
   writing() {
     const pkg = this.fs.readJSON(this.destinationPath('package.json'), {});
+    if (!pkg.scripts) pkg.scripts = {};
 
     const installPostinstallScript = (scriptName) => {
       if (
@@ -217,7 +234,7 @@ export default class CorePackageGenerator extends Generator {
     };
 
     const uninstallPostinstallScript = (scriptName) => {
-      if (pkg.scripts[scriptName]) {
+      if (pkg.scripts && pkg.scripts[scriptName]) {
         if (pkg.scripts[scriptName] === 'pob-root-postinstall') {
           delete pkg.scripts[scriptName];
         } else if (
@@ -231,9 +248,9 @@ export default class CorePackageGenerator extends Generator {
         }
       }
     };
-    if (inLerna || pkg.private) {
+    if (this.options.monorepo || pkg.private) {
       uninstallPostinstallScript('postinstallDev');
-      if (!inLerna || inLerna.root) {
+      if (this.options.isRoot) {
         installPostinstallScript('postinstall');
       } else {
         uninstallPostinstallScript('postinstall');

package/lib/generators/lib/PobLibGenerator.js

@@ -273,7 +273,7 @@ export default class PobLibGenerator extends Generator {
     });
 
     this.composeWith('pob:lib:release', {
-      enable: !inLerna,
+      enable: !inLerna && this.pobjson.testing && this.pobjson.testing.ci,
       withBabel: babelEnvs.length > 0,
       documentation: !!this.pobjson.documentation,
     });

package/lib/generators/monorepo/PobMonorepoGenerator.js

@@ -207,6 +207,7 @@ export default class PobMonorepoGenerator extends Generator {
     this.composeWith('pob:common:husky', {});
 
     this.composeWith('pob:common:format-lint', {
+      monorepo: true,
       documentation: this.pobLernaConfig.documentation,
       typescript: this.pobLernaConfig.typescript,
       testing: this.pobLernaConfig.testing,

package/lib/generators/pob/PobBaseGenerator.js

@@ -7,12 +7,19 @@ export default class PobBaseGenerator extends Generator {
   constructor(args, opts) {
     super(args, opts, { customInstallTask: true });
 
+    /** @deprecated use monorepo option instead */
     this.option('lerna', {
       type: Boolean,
       required: false,
       desc: 'Lerna monorepo',
     });
 
+    this.option('monorepo', {
+      type: Boolean,
+      required: false,
+      desc: 'monorepo',
+    });
+
     this.option('type', {
       type: String,
       required: true,
@@ -53,7 +60,7 @@ export default class PobBaseGenerator extends Generator {
     // prettier package.json to ensure diff is correct
     ensureJsonFileFormatted(this.destinationPath('package.json'));
 
-    if (this.options.lerna) {
+    if (this.options.monorepo || this.options.lerna) {
       this.useLerna = true;
       this.inLerna = false;
       this.isRoot = true;
@@ -123,6 +130,8 @@ export default class PobBaseGenerator extends Generator {
     this.composeWith('pob:core:package', {
       updateOnly: this.options.updateOnly,
       private: this.useLerna,
+      monorepo: this.useLerna,
+      isRoot: this.isRoot,
     });
 
     if (this.useLerna) {
@@ -207,6 +216,8 @@ export default class PobBaseGenerator extends Generator {
       switch (this.projectConfig.type) {
         case 'lib':
           this.composeWith('pob:lib', {
+            monorepo: this.useLerna,
+            isRoot: this.isRoot,
             updateOnly: this.options.updateOnly,
             fromPob: this.options.fromPob,
             packageManager: this.projectConfig.packageManager,
@@ -215,6 +226,8 @@ export default class PobBaseGenerator extends Generator {
           break;
         case 'app':
           this.composeWith('pob:app', {
+            monorepo: this.useLerna,
+            isRoot: this.isRoot,
             updateOnly: this.options.updateOnly,
             fromPob: this.options.fromPob,
             packageManager: this.projectConfig.packageManager,

package/lib/pob.js

@@ -37,9 +37,9 @@ import PobBaseGenerator from './generators/pob/PobBaseGenerator.js';
 import { __dirname } from './pob-dirname.cjs';
 
 const printUsage = () => {
-  console.error('Usage: pob [lerna] [lib|app]');
-  console.error('       pob [lerna] update [--force]');
-  console.error('       pob lerna convert-npm');
+  console.error('Usage: pob [monorepo] [lib|app|init]');
+  console.error('       pob [monorepo] update [--force]');
+  console.error('       pob monorepo convert-npm');
   console.error('       pob add <packageName>');
 };
 
@@ -209,32 +209,27 @@ env.registerStub(
   `${__dirname}/generators/monorepo/typescript/MonorepoTypescriptGenerator.js`,
 );
 
-let lerna = argv._[0] === 'lerna';
-const action = lerna ? argv._[1] : argv._[0];
+let monorepo = argv._[0] === 'lerna' || argv._[0] === 'monorepo';
+const action = monorepo ? argv._[1] : argv._[0];
 const projectPkg = readJson(path.resolve('./package.json'));
 
 if (action === 'add') {
-  if (!existsSync('lerna.json')) {
-    console.error('Not in lerna package');
-    process.exit(1);
+  if (!projectPkg.workspaces) {
+    throw new Error(
+      'Missing workspaces field in package.json: not a lerna repo',
+    );
   }
 
-  const packageName = argv._[1];
+  const packageName = monorepo ? argv._[2] : argv._[1];
 
   if (!packageName) {
     console.error('Missing argument: packageName');
     printUsage();
     process.exit(1);
   }
-
-  const pkg = JSON.parse(readFileSync('package.json'));
-  if (!pkg.workspaces) {
-    throw new Error(
-      'Missing workspaces field in package.json: not a lerna repo',
-    );
-  }
-
-  const packagesPath = pkg.workspaces[0].replace(/\/\*$/, '');
+  const packagesPath = packageName.startsWith('@')
+    ? packageName
+    : projectPkg.workspaces[0].replace(/\/\*$/, '');
 
   fs.mkdirSync(`${packagesPath}/${packageName}`, { recursive: true });
   writeFileSync(`${packagesPath}/${packageName}/.yo-rc.json`, '{}');
@@ -242,14 +237,20 @@ if (action === 'add') {
     `${packagesPath}/${packageName}/package.json`,
     JSON.stringify({ name: packageName, version: '1.0.0-pre' }, null, 2),
   );
-  spawnSync(process.argv[0], [process.argv[1], 'lib'], {
+  console.log('> Creating new Package');
+  spawnSync(process.argv[0], [process.argv[1]], {
     cwd: `${packagesPath}/${packageName}`,
     stdio: 'inherit',
   });
+
+  console.log('> Updating monorepo');
+  spawnSync(process.argv[0], [process.argv[1], 'update'], {
+    stdio: 'inherit',
+  });
   process.exit(0);
 }
 
-if (lerna && action === 'convert-npm') {
+if (monorepo && action === 'convert-npm') {
   execSync('sed -i \'/"npmClient": "yarn",/d\' ./lerna.json', {
     stdio: 'inherit',
   });
@@ -260,7 +261,8 @@ if (lerna && action === 'convert-npm') {
 }
 
 const updateOnly = action === 'update';
-const type = updateOnly ? null : action;
+const init = action === 'init';
+const type = updateOnly || init ? null : action;
 const fromPob = updateOnly && argv._[1] === 'from-pob';
 
 if (!existsSync('.yo-rc.json')) {
@@ -272,13 +274,14 @@ if (!existsSync('.yo-rc.json')) {
 }
 
 if (existsSync('lerna.json') || (projectPkg && projectPkg.lerna)) {
-  lerna = true;
+  monorepo = true;
 }
 
 const options = {
   type,
+  init,
   updateOnly,
-  lerna,
+  monorepo,
   fromPob,
   force: argv.force,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pob",
-  "version": "8.10.0",
+  "version": "8.10.1",
   "description": "Pile of bones, library generator with git/babel/typescript/typedoc/readme/jest",
   "keywords": [
     "skeleton"
@@ -63,12 +63,12 @@
     "mem-fs-editor": "8.1.2",
     "minimist-argv": "^1.1.0",
     "parse-author": "^2.0.0",
-    "pob-dependencies": "^5.11.0",
-    "prettier": "2.5.0",
+    "pob-dependencies": "^5.12.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": "0e6a3cfc36ebda0daa441a33b96288fbb08d8c21"
+  "gitHead": "22fce6512461fa2282baf86a31d090002abca7ac"
 }