pob 9.15.1 → 9.16.0

package/CHANGELOG.md

@@ -3,6 +3,31 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [9.16.0](https://github.com/christophehurpeau/pob/compare/pob@9.15.1...pob@9.16.0) (2022-02-05)
+
+
+### Bug Fixes
+
+* **pob:** add monorpeo generaterd rollup config file to ignored paths ([c08328b](https://github.com/christophehurpeau/pob/commit/c08328b9f4970b3488bcd0bfe9f23bcc282144f7))
+* dont delete vscode directory inside monorepo ([837bfe5](https://github.com/christophehurpeau/pob/commit/837bfe577cbf5c892fab95f0f19ff19c9e971f1e))
+* **deps:** update dependency @yarnpkg/parsers to v2.5.0-rc.11 ([#1187](https://github.com/christophehurpeau/pob/issues/1187)) ([70d8a9a](https://github.com/christophehurpeau/pob/commit/70d8a9acfa0325349d465a0ee0539937535026d8))
+* **pob:** ci tsc before eslint to build cache ([92d60de](https://github.com/christophehurpeau/pob/commit/92d60de3d616ed712d7ee4ba42d4d702670afd41))
+* **pob:** generate vscode config for eslint in monorepo workspace ([ebdb9cc](https://github.com/christophehurpeau/pob/commit/ebdb9cc1f8c5b4e5ac325e37fa44c20616779a6a))
+* **pob:** make sure build-state.yml doesnt exists ([322d582](https://github.com/christophehurpeau/pob/commit/322d5826627ba74a188f381e37a1365fe390baa2))
+* dont set isolatedModules to false now that composite is supported with isolatedModules ([5d0816d](https://github.com/christophehurpeau/pob/commit/5d0816d9da90765aba168bd694d2a8e7f696ec46))
+
+
+### Features
+
+* better composite tsc config ([edef88e](https://github.com/christophehurpeau/pob/commit/edef88ef046c18498f6909c3dbeef2289cb418f9))
+* much faster monorepo build with only one rollup command ([c4bafc3](https://github.com/christophehurpeau/pob/commit/c4bafc3be0c06a0a2446d37d176a043835693752))
+* support linaria in jest config ([2e26479](https://github.com/christophehurpeau/pob/commit/2e26479be7016a383c74ee14669aa3a19d3a5a75))
+* **deps:** update @pob/eslint-config to v48.1.0 ([#1188](https://github.com/christophehurpeau/pob/issues/1188)) ([75dd637](https://github.com/christophehurpeau/pob/commit/75dd6373d04359e12beb3b48f54ae2a541af4765))
+
+
+
+
+
 ## [9.15.1](https://github.com/christophehurpeau/pob/compare/pob@9.15.0...pob@9.15.1) (2022-01-29)
 
 **Note:** Version bump only for package pob

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

@@ -271,16 +271,18 @@ export default class CommonBabelGenerator extends Generator {
     if (this.options.isApp) {
       packageUtils.removeScripts(['watch']);
       packageUtils.addOrRemoveScripts(pkg, useBabel, {
-        build: 'pob-build',
-        start: 'pob-watch',
-        clean: 'rm -Rf dist',
+        'clean:build': 'rm -Rf dist',
+        build: 'yarn clean:build && rollup --config rollup.config.mjs',
+        start: 'yarn clean:build && rollup --config rollup.config.mjs --watch',
+        clean: 'yarn clean:build',
       });
     } else {
       packageUtils.removeScripts(['start']);
       packageUtils.addOrRemoveScripts(pkg, useBabel, {
-        build: 'pob-build',
-        watch: 'pob-watch',
-        clean: 'rm -Rf dist',
+        'clean:build': 'rm -Rf dist',
+        build: 'yarn clean:build && rollup --config rollup.config.mjs',
+        watch: 'yarn clean:build && rollup --config rollup.config.mjs --watch',
+        clean: 'yarn clean:build',
       });
     }
 
@@ -340,7 +342,6 @@ export default class CommonBabelGenerator extends Generator {
     ]);
 
     packageUtils.removeDevDependencies(pkg, [
-      'rollup',
       'babel-preset-env', // now @babel/preset-env
       'babel-preset-jsdoc',
       'babel-plugin-add-jsdoc-annotations',

package/lib/generators/common/babel/templates/lib.rollup.config.mjs.txt

@@ -1,3 +1,5 @@
 import createRollupConfig from 'pob-babel/createRollupConfig.js';
 
-export default createRollupConfig({});
+export default createRollupConfig({
+  cwd: new URL('.', import.meta.url).pathname,
+});

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

@@ -394,6 +394,9 @@ export default class CommonLintGenerator extends Generator {
       if ((!inLerna || !inLerna.root) && useBabel) {
         ignorePatterns.add('/dist', '/test');
       }
+      if (inLerna && inLerna.root) {
+        ignorePatterns.add('/rollup.config.mjs');
+      }
 
       if (this.options.ignorePaths) {
         this.options.ignorePaths

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

@@ -272,6 +272,9 @@ export default class CommonTestingGenerator extends Generator {
                 ])
                 .join(', '),
           hasReact,
+          hasLinaria:
+            !!pkg.devDependencies?.['@linaria/babel-preset'] ||
+            !!pkg.devDependencies?.['alp-dev'],
           testing: this.options.testing,
           jestExperimentalESM: pkg.type === 'module',
         },

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

@@ -16,6 +16,9 @@ module.exports = function babelConfig(api) {
           useBuiltIns: true,
         },
       ]<% } %>
+      <% if (hasLinaria) { %>, [
+        '@linaria/babel-preset'
+      ]<% } %>
     ],
   };
 };

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

@@ -120,6 +120,7 @@ export default class CommonTypescriptGenerator extends Generator {
           monorepoPackageNames,
           monorepoPackageSrcPaths,
           jsx,
+          composite,
           dom,
           baseUrl: this.options.baseUrl,
           resolveJsonModule: this.options.resolveJsonModule,

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

@@ -2,18 +2,15 @@
   "extends": "./tsconfig.json",
 
   "compilerOptions": {
+    "rootDir": "src",
     "noEmit": false,
+    "declaration": true,
+    "declarationMap": true,
     "emitDeclarationOnly": true,
-    "rootDirs": [],
-    "rootDir": "src",
-    "outDir": "dist",
-<% if(composite) { -%>
+    "outDir": "dist"<% if(composite) { -%>,
     "composite": true,
-    "tsBuildInfoFile": "dist/tsbuildinfo",
+    "tsBuildInfoFile": "dist/tsbuildinfo"
 <% } -%>
-    "isolatedModules": false,
-    "declaration": true,
-    "declarationMap": true
   },
 
   "exclude": [

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

@@ -4,13 +4,25 @@
     "src/**/*.tsx"<% } %>
   ],
   "compilerOptions": {
+    "rootDir": "src",
+<% if(!composite) { -%>
     /* No emit in default config file. See build config file for config to build declaration files */
     "noEmit": true,
+<% } else { -%>
+    "composite": true,
+    "incremental": true,
+    "noEmit": false,
+    "noEmitOnError": true,
+    "declaration": true,
+    "declarationMap": true,
+    "emitDeclarationOnly": true,
+    "outDir": "node_modules/.cache/tsc",
+    "tsBuildInfoFile": "node_modules/.cache/tsc/tsbuildinfo",
+<% } -%>
+
     /* No need to check .d.ts files */
     "skipLibCheck": true,
 
-    "rootDirs": ["src"<% /*(monorepoPackageNames || []).forEach((packageName, index) => { -%>, "../../<%= monorepoPackageSrcPaths[index] %>"<% })*/ -%>],
-
     "target": "esnext",                       /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */
     "module": "esnext",                       /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
     "lib": [<%- dom ? '"dom", ' : '' %>"esnext"],                 /* Polyfills are imported either by babel or with polyfill.io */
@@ -34,14 +46,19 @@
     <% if (resolveJsonModule) { -%>
     "resolveJsonModule": <%= resolveJsonModule %>,
     <% } -%>
-    "baseUrl": "<%= baseUrl %>"<% if (monorepoPackageNames) { %>,<% } %><%= '                            '.slice(0, -(baseUrl.length + (monorepoPackageNames ? 1 : 0))) %>/* Base directory to resolve non-absolute module names. */
+    "baseUrl": "<%= baseUrl %>"<% if (monorepoPackageNames) { %>,<% } %> /* Base directory to resolve non-absolute module names. */
     <% if (monorepoPackageNames && monorepoPackageNames.length !== 0) { -%>
-
     "paths": {
       <% monorepoPackageNames.forEach((packageName, index) => { %>
       "<%= packageName %>": ["../../../<%= monorepoPackageSrcPaths[index] %>"],
       "<%= packageName %>/*": ["../../../<%= monorepoPackageSrcPaths[index] %>/*"]<%= index === monorepoPackageNames.length -1 ? '' : ',' -%>
       <% }) %>
     }<% } %>
-  }
+  }<% if (monorepoPackageNames && monorepoPackageNames.length) { -%>,
+  "references": [
+    <% monorepoPackageNames.forEach((packageName, index) => { -%>
+        { "path": "../<%= packageName %>/tsconfig.json" }<%= index === monorepoPackageNames.length -1 ? '' : ',' %>
+    <% }) -%>
+  ],
+  <% } -%>
 }

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

@@ -63,16 +63,16 @@ jobs:
       - name: Prettier
         run: <%= packageManager %> run lint:prettier
         if: startsWith(matrix.node-version, '16.')
-
-      - name: Eslint
-        run: <%= packageManager %> run lint:eslint
-        if: startsWith(matrix.node-version, '16.')
 <% if (typescript) { -%>
 
       - name: Typescript
         run: yarn run tsc
         if: startsWith(matrix.node-version, '16.')
 <% } -%>
+
+      - name: Eslint
+        run: <%= packageManager %> run lint:eslint
+        if: startsWith(matrix.node-version, '16.')
 <% if (codecov) { -%>
 
       - name: Generate Test Coverage

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

@@ -112,6 +112,16 @@ export default class CoreVSCodeGenerator extends Generator {
         }));
         folders.sort((a, b) => a.name.localeCompare(b.name, 'en'));
 
+        packageLocations.forEach((location) => {
+          writeAndFormatJson(
+            this.fs,
+            this.destinationPath(`${location}/.vscode/settings.json`),
+            {
+              'eslint.workingDirectories': ['../../'],
+            },
+          );
+        });
+
         const extensions = readJSON5(
           this.fs,
           this.destinationPath('.vscode/extensions.json'),
@@ -156,7 +166,7 @@ export default class CoreVSCodeGenerator extends Generator {
         );
       }
     } else {
-      this.fs.delete('.vscode');
+      // this.fs.delete('.vscode');
     }
   }
 }

package/lib/generators/core/yarn/CoreYarnGenerator.js

@@ -112,6 +112,7 @@ export default class CoreYarnGenerator extends Generator {
   }
 
   end() {
+    this.fs.delete(this.destinationPath('.yarn/build-state.yml'));
     if (this.options.enable) {
       if (this.options.yarnNodeLinker === 'pnp') {
         this.spawnCommandSync('yarn', ['dlx', '@yarnpkg/sdks', 'vscode']);

package/lib/generators/lib/doc/templates/tsconfig.doc.json.ejs

@@ -4,8 +4,7 @@
 
   "compilerOptions": {
     "rootDirs": [],
-    "rootDir": "src",
-    "isolatedModules": false
+    "rootDir": "src"
   },
 
   "typedocOptions": {

package/lib/generators/monorepo/PobMonorepoGenerator.js

@@ -4,6 +4,8 @@ import path from 'path';
 import { PackageGraph } from '@lerna/package-graph';
 import { Project as LernaProject } from '@lerna/project';
 import Generator from 'yeoman-generator';
+import * as packageUtils from '../../utils/package.js';
+import { copyAndFormatTpl } from '../../utils/writeAndFormat.js';
 
 const getAppTypes = (configs) => {
   const appConfigs = configs.filter(
@@ -101,8 +103,7 @@ export default class PobMonorepoGenerator extends Generator {
     this.packageNames = this.packages.map((pkg) => pkg.name);
     this.packageConfigs = this.packageLocations.map((location) => {
       try {
-        return JSON.parse(fs.readFileSync(`${location}/.yo-rc.json`, 'utf-8'))
-          .pob;
+        return JSON.parse(fs.readFileSync(`${location}/.yo-rc.json`)).pob;
       } catch {
         console.warn(`warn: could not read pob config in ${location}`);
         return {};
@@ -251,6 +252,46 @@ export default class PobMonorepoGenerator extends Generator {
     );
   }
 
+  writing() {
+    if (!this.options.isAppProject) {
+      const pkg = this.fs.readJSON(this.destinationPath('package.json'), {});
+
+      const rollupConfigs = [];
+      this.packageLocations.forEach((location) => {
+        const rollupPath = `${location}/rollup.config.mjs`;
+        const rollupConfig = this.fs.read(this.destinationPath(rollupPath), {
+          defaults: null,
+        });
+        if (rollupConfig) {
+          rollupConfigs.push(rollupPath);
+        }
+      });
+
+      if (rollupConfigs.length > 0) {
+        copyAndFormatTpl(
+          this.fs,
+          this.templatePath('monorepo.rollup.config.mjs.ejs'),
+          this.destinationPath('rollup.config.mjs'),
+          {
+            configLocations: rollupConfigs,
+          },
+        );
+      } else {
+        this.fs.delete('rollup.config.mjs');
+      }
+      packageUtils.addOrRemoveScripts(pkg, rollupConfigs.length > 0, {
+        'clean:build': `(${pkg.workspaces
+          .map((workspaces) => `rm -Rf ${workspaces}/dist`)
+          .join(' && ')}) || true`,
+        build: 'yarn clean:build && rollup --config rollup.config.mjs',
+      });
+      packageUtils.addOrRemoveDevDependencies(pkg, rollupConfigs.length, [
+        'pob-babel',
+      ]);
+      this.fs.writeJSON(this.destinationPath('package.json'), pkg);
+    }
+  }
+
   end() {
     console.log('save config');
     this.config.save();

package/lib/generators/monorepo/lerna/MonorepoLernaGenerator.js

@@ -89,8 +89,6 @@ export default class MonorepoLernaGenerator extends Generator {
   }
 
   writing() {
-    console.log('lerna: writing');
-
     const getPackagePobConfig = (config) => ({
       babelEnvs: [],
       ...(config && config.pob),

package/lib/generators/monorepo/templates/monorepo.rollup.config.mjs.ejs

@@ -0,0 +1,9 @@
+<% configLocations.forEach((location, index) => { -%>
+import configs<%= index + 1 %> from './<%= location %>';
+<% }) -%>
+
+export default [
+  <% configLocations.forEach((location, index) => { -%>
+    ...configs<%= index + 1 %>,
+  <% }) -%>
+];

package/lib/utils/inLerna.js

@@ -13,13 +13,11 @@ const rootMonorepo =
 
 const rootMonorepoPkg =
   rootMonorepo &&
-  JSON.parse(
-    fs.readFileSync(path.resolve(rootMonorepo, 'package.json'), 'utf-8'),
-  );
+  JSON.parse(fs.readFileSync(path.resolve(rootMonorepo, 'package.json')));
 
 const getInLernaThings = () => {
   const rootYoConfig = JSON.parse(
-    fs.readFileSync(path.resolve(rootMonorepo, '.yo-rc.json'), 'utf-8'),
+    fs.readFileSync(path.resolve(rootMonorepo, '.yo-rc.json')),
   );
   const cwd = process.cwd();
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pob",
-  "version": "9.15.1",
+  "version": "9.16.0",
   "description": "Pile of bones, library generator with git/babel/typescript/typedoc/readme/jest",
   "keywords": [
     "skeleton"
@@ -41,13 +41,13 @@
   "dependencies": {
     "@lerna/package-graph": "^4.0.0",
     "@lerna/project": "^4.0.0",
-    "@pob/eslint-config": "48.0.5",
-    "@pob/eslint-config-typescript": "48.0.6",
-    "@pob/eslint-config-typescript-react": "48.0.7",
+    "@pob/eslint-config": "48.1.0",
+    "@pob/eslint-config-typescript": "48.1.0",
+    "@pob/eslint-config-typescript-react": "48.1.0",
     "@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.10",
+    "@yarnpkg/parsers": "2.5.0-rc.11",
     "eslint": "8.8.0",
     "findup-sync": "^5.0.0",
     "git-remote-url": "^1.0.1",
@@ -61,11 +61,11 @@
     "mem-fs-editor": "9.4.0",
     "minimist-argv": "^1.1.0",
     "parse-author": "^2.0.0",
-    "pob-dependencies": "6.11.1",
+    "pob-dependencies": "6.12.0",
     "prettier": "2.5.1",
     "semver": "^7.3.4",
     "yeoman-environment": "^3.5.1",
     "yeoman-generator": "^5.4.0"
   },
-  "gitHead": "966b414b24a2f6289c0801666c3b1c9d2cf986ac"
+  "gitHead": "d4e58687bcfd00c82a36f2ea2d4dc371114da41a"
 }