pob 9.13.0 → 9.14.1

package/CHANGELOG.md

@@ -3,6 +3,59 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [9.14.1](https://github.com/christophehurpeau/pob/compare/pob@9.14.0...pob@9.14.1) (2022-01-22)
+
+
+### Bug Fixes
+
+* **pob:** vscode generator monorepo option ([cb589e8](https://github.com/christophehurpeau/pob/commit/cb589e80168eaf114a5b22bc4e454ec59d449097))
+* **pob:** vscode generator tsdk path for monorepo ([fc92541](https://github.com/christophehurpeau/pob/commit/fc92541f5926a6892186c086940c966420e4ef83))
+
+
+
+
+
+# [9.14.0](https://github.com/christophehurpeau/pob/compare/pob@9.13.2...pob@9.14.0) (2022-01-20)
+
+
+### Bug Fixes
+
+* **deps:** update dependency @yarnpkg/parsers to v2.5.0-rc.9 ([#1165](https://github.com/christophehurpeau/pob/issues/1165)) ([bdb496f](https://github.com/christophehurpeau/pob/commit/bdb496febb6ec534a0ca0ac24cb32fe16b639e79))
+* full vscode workspace config ([f3aa63d](https://github.com/christophehurpeau/pob/commit/f3aa63de6cc2b597c3114eb34757e94347cf5f3f))
+* remove tasks from workspace config ([cc4b1a7](https://github.com/christophehurpeau/pob/commit/cc4b1a7efe39e2d7f13ac3079a32c58d3cd86c75))
+
+
+### Features
+
+* **deps:** update dependency eslint to v8.7.0 ([#1164](https://github.com/christophehurpeau/pob/issues/1164)) ([9ec0c31](https://github.com/christophehurpeau/pob/commit/9ec0c3156cf5ed5d1f9e3e4ce4636b77da826850))
+* **pob:** generate vscode monorepo workspace ([23ceaae](https://github.com/christophehurpeau/pob/commit/23ceaae63bc1abc58061366d90f8cd5c397bf232))
+
+
+
+
+
+## [9.13.2](https://github.com/christophehurpeau/pob/compare/pob@9.13.1...pob@9.13.2) (2022-01-15)
+
+
+### Bug Fixes
+
+* **@pob/root:** fix use default github token for gh-pages workflow ([784ce66](https://github.com/christophehurpeau/pob/commit/784ce6633d5d5d14cdcf63aeb5a83ed036434673))
+
+
+
+
+
+## [9.13.1](https://github.com/christophehurpeau/pob/compare/pob@9.13.0...pob@9.13.1) (2022-01-15)
+
+
+### Bug Fixes
+
+* **pob:** multiple newlines in gitignore template ([f00c5be](https://github.com/christophehurpeau/pob/commit/f00c5bed9a6200d3ded4737ffcdab175eb56b2c5))
+
+
+
+
+
 # [9.13.0](https://github.com/christophehurpeau/pob/compare/pob@9.12.3...pob@9.13.0) (2022-01-15)
 
 

package/lib/generators/app/PobAppGenerator.js

@@ -178,6 +178,15 @@ export default class PobAppGenerator extends Generator {
       updateOnly: this.options.updateOnly,
     });
 
+    this.composeWith('pob:core:vscode', {
+      root: !inLerna,
+      monorepo: false,
+      packageManager: this.options.packageManager,
+      yarnNodeLinker: this.options.yarnNodeLinker,
+      typescript: babel,
+      testing: this.appConfig.testing,
+    });
+
     // only for gitignore
     if (this.fs.exists('.env.example')) {
       ignorePaths.push('/.env*', '!/.env.example');

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

@@ -9,8 +9,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-        with:
-          token: ${{ secrets.GH_TOKEN }}
 
       - uses: actions/setup-node@v2
         with:

package/lib/generators/core/gitignore/templates/gitignore.ejs

@@ -7,12 +7,12 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 <% } -%>
-
 <% if (paths) { -%>
+
 <%= paths %>
 <% } -%>
-
 <% if (root) { -%>
+
 # IDE
 /.settings
 /.project
@@ -20,19 +20,18 @@ yarn-error.log*
 !/.vscode
 *.sublime-project
 *.sublime-workspace
-
 <% if (documentation) { -%>
+
 # generated documentation directory
 /docs
 <% } -%>
-
 <% if (testing) { -%>
+
 # jest default coverage directory
 /coverage
 <% } -%>
-
-
 <% if (typescript && buildInGit) { -%>
+
 # Typescript
 tsbuildinfo
 <% } -%>

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

@@ -1,6 +1,9 @@
 import Generator from 'yeoman-generator';
 import { readJSON5 } from '../../../utils/json5.js';
-import { copyAndFormatTpl } from '../../../utils/writeAndFormat.js';
+import {
+  copyAndFormatTpl,
+  writeAndFormatJson,
+} from '../../../utils/writeAndFormat.js';
 
 export default class CoreVSCodeGenerator extends Generator {
   constructor(args, opts) {
@@ -20,6 +23,20 @@ export default class CoreVSCodeGenerator extends Generator {
       desc: 'yarn|npm.',
     });
 
+    this.option('monorepo', {
+      type: Boolean,
+      required: false,
+      defaults: false,
+      desc: 'is monorepo',
+    });
+
+    this.option('testing', {
+      type: Boolean,
+      required: false,
+      defaults: false,
+      desc: 'Testing enabled',
+    });
+
     this.option('yarnNodeLinker', {
       type: String,
       required: false,
@@ -33,10 +50,21 @@ export default class CoreVSCodeGenerator extends Generator {
       defaults: false,
       desc: 'Typescript enabled',
     });
+
+    this.option('packageNames', {
+      type: String,
+      required: false,
+    });
+
+    this.option('packageLocations', {
+      type: String,
+      required: false,
+    });
   }
 
   writing() {
     if (this.options.root) {
+      const pkg = this.fs.readJSON(this.destinationPath('package.json'));
       copyAndFormatTpl(
         this.fs,
         this.templatePath('extensions.json.ejs'),
@@ -55,6 +83,8 @@ export default class CoreVSCodeGenerator extends Generator {
           pnp: this.options.yarnNodeLinker === 'pnp',
           npm: this.options.packageManager === 'npm',
           typescript: this.options.typescript,
+          testing: this.options.testing,
+          module: pkg.type === 'module',
         },
       );
 
@@ -72,6 +102,59 @@ export default class CoreVSCodeGenerator extends Generator {
           tasks: JSON.stringify(tasksConfig.tasks || [], null, 2),
         },
       );
+
+      if (this.options.monorepo) {
+        const packageNames = JSON.parse(this.options.packageNames);
+        const packageLocations = JSON.parse(this.options.packageLocations);
+        const folders = packageLocations.map((location, i) => ({
+          name: packageNames[i],
+          path: `../${location}`,
+        }));
+        folders.sort((a, b) => a.name.localeCompare(b.name, 'en'));
+
+        const extensions = readJSON5(
+          this.fs,
+          this.destinationPath('.vscode/extensions.json'),
+          {},
+        );
+        const settings = readJSON5(
+          this.fs,
+          this.destinationPath('.vscode/settings.json'),
+          {},
+        );
+
+        const projectName = pkg.name.replace('/', '-');
+        writeAndFormatJson(
+          this.fs,
+          this.destinationPath(`.vscode/${projectName}.code-workspace`),
+          {
+            extensions,
+            settings: {
+              ...settings,
+              ...(settings['typescript.tsdk']
+                ? { 'typescript.tsdk': '✨ root/node_modules/typescript/lib' }
+                : {}),
+              ...(this.options.testing
+                ? {
+                    'jest.jestCommandLine':
+                      'NODE_OPTIONS=--experimental-vm-modules node_modules/.bin/jest',
+                    // disable all folders to enable only root.
+                    'jest.disabledWorkspaceFolders': folders.map(
+                      (folder) => folder.name,
+                    ),
+                  }
+                : {}),
+            },
+            folders: [
+              {
+                name: '✨ root',
+                path: '..',
+              },
+              ...folders,
+            ],
+          },
+        );
+      }
     } else {
       this.fs.delete('.vscode');
     }

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

@@ -29,6 +29,11 @@
     "source.organizeImports": false
   },
 
+<% if (testing && module) { -%>
+  // jest
+  "jest.jestCommandLine": "NODE_OPTIONS=--experimental-vm-modules node_modules/.bin/jest",
+<% } -%>
+
   // eslint config
   "eslint.workingDirectories": ["."],
   "eslint.options": {

package/lib/generators/lib/PobLibGenerator.js

@@ -285,6 +285,15 @@ export default class PobLibGenerator extends Generator {
       updateOnly: this.options.updateOnly,
     });
 
+    this.composeWith('pob:core:vscode', {
+      root: !inLerna,
+      monorepo: false,
+      packageManager: this.options.packageManager,
+      yarnNodeLinker: this.options.yarnNodeLinker,
+      typescript: withBabel,
+      testing: this.pobjson.testing,
+    });
+
     // must be after doc, testing
     this.composeWith('pob:core:gitignore', {
       root: !inLerna,

package/lib/generators/monorepo/PobMonorepoGenerator.js

@@ -215,6 +215,18 @@ export default class PobMonorepoGenerator extends Generator {
       packagePaths: JSON.stringify(packagePaths),
       packageManager: this.options.packageManager,
     });
+
+    this.composeWith('pob:core:vscode', {
+      root: true,
+      monorepo: true,
+      packageManager: this.options.packageManager,
+      yarnNodeLinker: this.options.yarnNodeLinker,
+      typescript: this.pobLernaConfig.typescript,
+      testing: this.pobLernaConfig.testing,
+      packageNames: JSON.stringify(packageNames),
+      packageLocations: JSON.stringify(this.packageLocations),
+    });
+
     // Always add a gitignore, because npm publish uses it.
     this.composeWith('pob:core:gitignore', {
       root: true,

package/lib/generators/pob/PobBaseGenerator.js

@@ -149,15 +149,6 @@ 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,
-      yarnNodeLinker: this.projectConfig.yarnNodeLinker,
-      typescript: !!(pkg.devDependencies && pkg.devDependencies.typescript),
-    });
-
     this.composeWith('pob:core:yarn', {
       type: this.projectConfig.type,
       enable: this.isRoot && this.projectConfig.packageManager === 'yarn',

package/lib/utils/writeAndFormat.js

@@ -1,9 +1,10 @@
 import prettier from 'prettier';
 
-export function writeAndFormat(fs, destinationPath, content) {
+export function writeAndFormat(fs, destinationPath, content, { parser } = {}) {
   fs.write(
     destinationPath,
     prettier.format(content, {
+      parser,
       filepath: destinationPath,
       trailingComma: 'all',
       singleQuote: true,
@@ -13,7 +14,10 @@ export function writeAndFormat(fs, destinationPath, content) {
 }
 
 export function writeAndFormatJson(fs, destinationPath, value) {
-  writeAndFormat(fs, destinationPath, JSON.stringify(value, null, 2));
+  writeAndFormat(fs, destinationPath, JSON.stringify(value, null, 2), {
+    // project.code-workspace is json
+    parser: destinationPath.endsWith('json') ? undefined : 'json',
+  });
 }
 export function copyAndFormatTpl(fs, templatePath, destinationPath, options) {
   fs.copyTpl(templatePath, destinationPath, options);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pob",
-  "version": "9.13.0",
+  "version": "9.14.1",
   "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.8",
-    "eslint": "8.6.0",
+    "@yarnpkg/parsers": "2.5.0-rc.9",
+    "eslint": "8.7.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.7.0",
+    "pob-dependencies": "6.10.0",
     "prettier": "2.5.1",
     "semver": "^7.3.4",
     "yeoman-environment": "^3.5.1",
     "yeoman-generator": "^5.4.0"
   },
-  "gitHead": "10fc86e0d2cf78d9b2b1299a708ce69b32fbfedc"
+  "gitHead": "8e6c43e4b3090d88bc6f844e3f57de685a88ac96"
 }