pob 9.6.1 → 9.7.0

package/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [9.7.0](https://github.com/christophehurpeau/pob/compare/pob@9.6.1...pob@9.7.0) (2021-12-12)
+
+
+### Bug Fixes
+
+* remove dependency generator-license ([f087175](https://github.com/christophehurpeau/pob/commit/f0871751cbd883b4a7e64f56853da73d1c2daef0))
+* remove resolutions in pob ([04940d3](https://github.com/christophehurpeau/pob/commit/04940d36da39cc3771b241ff695b2ad54f28c5d3))
+* update generator-license ([ef71b4d](https://github.com/christophehurpeau/pob/commit/ef71b4d2e0cb47736436945e4865df4e8eccd890))
+* use lerna version with exact param ([9dd6a5c](https://github.com/christophehurpeau/pob/commit/9dd6a5c8d965cd4af40db3d93e022e6824baf97a))
+
+
+### Features
+
+* support workspace:* in dependencies ([258a5e8](https://github.com/christophehurpeau/pob/commit/258a5e88ad890f0e2f429d63f8011e8d01c3ebe3))
+* update @yarnpkg/parsers ([f778458](https://github.com/christophehurpeau/pob/commit/f778458f8e49f610f52e1111846d9465f54576a6))
+
+
+
+
+
 ## [9.6.1](https://github.com/christophehurpeau/pob/compare/pob@9.6.0...pob@9.6.1) (2021-12-12)
 
 

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

@@ -128,6 +128,13 @@ export default class CorePackageGenerator extends Generator {
           choices: ['commonjs', 'module'],
           when: !pkg.type,
         },
+        {
+          name: 'license',
+          message: 'License Type',
+          type: 'list',
+          choices: ['MIT', 'ISC', 'UNLICENSED'],
+          when: !pkg.license,
+        },
       ].filter(Boolean),
     );
 
@@ -232,6 +239,18 @@ export default class CorePackageGenerator extends Generator {
       author.url ? ` (${author.url})` : ''
     }`;
 
+    if (!pkg.license) {
+      pkg.license = props.license;
+      this.fs.copyTpl(
+        this.templatePath(`licenses/${props.license}.ejs`),
+        this.destinationPath('LICENSE'),
+        {
+          year: new Date().getFullYear(),
+          author: pkg.author,
+        },
+      );
+    }
+
     if (pkg.private) {
       if (!pkg.description) delete pkg.description;
       if (!pkg.keywords || pkg.keywords.length === 0) delete pkg.keywords;

package/lib/generators/core/package/templates/licenses/ISC.ejs

@@ -0,0 +1,15 @@
+Copyright (c) <%- year %> <%- author %>
+
+Permission to use, copy, modify, and/or distribute this software for
+any purpose with or without fee is hereby granted, provided that the
+above copyright notice and this permission notice appear in all
+copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.

package/lib/generators/core/package/templates/licenses/MIT.ejs

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) <%- year %> <%- author %>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

package/lib/generators/core/package/templates/licenses/UNLICENSED.ejs

@@ -0,0 +1,2 @@
+Copyright (c) <%- year %> <%- author %>
+All rights reserved.

package/lib/generators/monorepo/lerna/templates/workflow-publish.yml.ejs

@@ -39,7 +39,7 @@ jobs:
         if: |
           github.ref == 'refs/heads/main'
           && contains(github.event.inputs.dry-run, 'y')
-        run: yarn lerna version --yes --no-push --conventional-commits --conventional-graduate --no-git-tag-version --loglevel=verbose
+        run: yarn lerna version --yes --no-push --exact --conventional-commits --conventional-graduate --no-git-tag-version --loglevel=verbose
 
       - name: Configure Git user
         if: |
@@ -54,7 +54,7 @@ jobs:
           github.ref == 'refs/heads/main'
           && contains(github.event.inputs.dry-run, 'y') == false
         run: |
-          yarn lerna version --yes --push --conventional-commits --conventional-graduate --create-release=github -m 'chore: release [skip ci]'
+          yarn lerna version --yes --push --exact --conventional-commits --conventional-graduate --create-release=github -m 'chore: release [skip ci]'
         env:
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
           YARN_ENABLE_IMMUTABLE_INSTALLS: false

package/lib/generators/pob/PobBaseGenerator.js

@@ -43,13 +43,6 @@ export default class PobBaseGenerator extends Generator {
       required: true,
       desc: "Don't check diff",
     });
-
-    this.option('license', {
-      type: Boolean,
-      required: false,
-      defaults: true,
-      desc: 'Include a license',
-    });
   }
 
   rootGeneratorName() {
@@ -145,20 +138,6 @@ export default class PobBaseGenerator extends Generator {
     this.fs.delete('Makefile');
     this.fs.delete(this.destinationPath('.commitrc.js'));
 
-    const pkg = this.fs.readJSON(this.destinationPath('package.json'), {});
-    if (
-      this.options.license &&
-      !this.fs.exists(this.destinationPath('LICENSE'))
-    ) {
-      const author = packageUtils.parsePkgAuthor(pkg) || {};
-      this.composeWith('generator-license/app', {
-        name: author.name,
-        email: author.email,
-        website: author.url,
-        defaultLicense: 'ISC',
-      });
-    }
-
     this.composeWith('pob:core:editorconfig');
 
     this.composeWith('pob:core:clean', {
@@ -170,6 +149,8 @@ export default class PobBaseGenerator extends Generator {
       app: this.projectConfig.type === 'app',
     });
 
+    const pkg = this.fs.readJSON(this.destinationPath('package.json'), {});
+
     this.composeWith('pob:core:vscode', {
       root: this.isRoot,
       packageManager: this.projectConfig.packageManager,

package/lib/utils/package.js

@@ -145,7 +145,10 @@ const internalAddDependencies = (pkg, type, dependencies, cleaned, prefix) => {
           ? `${prefix || ''}${potentialNewVersionCleaned}`
           : potentialNewVersion;
       try {
-        if (
+        if (currentVersion === 'workspace:*') {
+          // the package is in the monorepo
+          return;
+        } else if (
           !currentVersion ||
           semver.gt(potentialNewVersionCleaned, cleanVersion(currentVersion))
         ) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pob",
-  "version": "9.6.1",
+  "version": "9.7.0",
   "description": "Pile of bones, library generator with git/babel/typescript/typedoc/readme/jest",
   "keywords": [
     "skeleton"
@@ -38,21 +38,14 @@
     "arrowParens": "always"
   },
   "pob": {},
-  "resolutions": {
-    "yeoman-generator": "4.13.0"
-  },
-  "resolutionsExplained": {
-    "yeoman-generator": "generator-license has a dependency to yeoman-generator@2.0.5"
-  },
   "dependencies": {
     "@lerna/package-graph": "^4.0.0",
     "@lerna/project": "^4.0.0",
     "@pob/sort-eslint-config": "^3.0.1",
     "@pob/sort-object": "^4.0.1",
     "@pob/sort-pkg": "^4.0.1",
-    "@yarnpkg/parsers": "^2.2.0",
+    "@yarnpkg/parsers": "2.5.0-rc.6",
     "findup-sync": "^5.0.0",
-    "generator-license": "^5.4.0",
     "git-remote-url": "^1.0.1",
     "github-username": "^6.0.0",
     "got": "^11.8.1",
@@ -64,12 +57,12 @@
     "mem-fs-editor": "8.1.2",
     "minimist-argv": "^1.1.0",
     "parse-author": "^2.0.0",
-    "pob-dependencies": "^6.2.1",
+    "pob-dependencies": "6.3.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": "c4e9e72111816af56f3303a4c04988011428b06e"
+  "gitHead": "64c950f50f9ebd3fd0a135bc911a9edd6b70f23f"
 }