pob 10.1.0 → 10.2.0

package/CHANGELOG.md

@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [10.2.0](https://github.com/christophehurpeau/pob/compare/pob@10.1.0...pob@10.2.0) (2022-02-13)
+
+
+### Bug Fixes
+
+* **deps:** update dependency @pob/eslint-config-typescript-react to v49.0.1 ([#1204](https://github.com/christophehurpeau/pob/issues/1204)) ([5fc0b39](https://github.com/christophehurpeau/pob/commit/5fc0b39970645a99188f8a74fb473535a6d38461))
+* **pob:** create eslint specific tsconfig ([fb80eac](https://github.com/christophehurpeau/pob/commit/fb80eaccce5c48dfe4af98c411ef3839c11f3be8))
+
+
+### Features
+
+* build directory for apps and alp-rollup-plugin-config ([0d57816](https://github.com/christophehurpeau/pob/commit/0d57816fbe0ac0a86d0bf7204aed42c3313366df))
+
+
+
+
+
 # [10.1.0](https://github.com/christophehurpeau/pob/compare/pob@10.0.0...pob@10.1.0) (2022-02-12)
 
 

package/lib/generators/app/PobAppGenerator.js

@@ -1,3 +1,4 @@
+import { execSync } from 'child_process';
 import Generator from 'yeoman-generator';
 import inLerna from '../../utils/inLerna.js';
 import inNpmLerna from '../../utils/inNpmLerna.js';
@@ -5,7 +6,7 @@ import * as packageUtils from '../../utils/package.js';
 import { appIgnorePaths } from './ignorePaths.js';
 
 const appsWithTypescript = ['alp', 'next.js', 'pobpack'];
-const appsWithNode = ['alp', 'next.js'];
+const appsWithBrowser = ['alp', 'next.js'];
 
 export default class PobAppGenerator extends Generator {
   constructor(args, opts) {
@@ -66,7 +67,7 @@ export default class PobAppGenerator extends Generator {
         name: 'type',
         message: 'What kind of app is this ?',
         default: (config && config.type) || 'alp',
-        choices: ['alp', 'pobpack', 'next.js', 'node', 'other'],
+        choices: ['alp', 'pobpack', 'next.js', 'node', 'alp-node', 'other'],
       },
       {
         type: 'confirm',
@@ -98,18 +99,26 @@ export default class PobAppGenerator extends Generator {
       },
     ]);
 
+    execSync(
+      `rm -Rf ${['lib-*', 'coverage', 'docs', 'dist']
+        .filter(Boolean)
+        .join(' ')}`,
+    );
+
     this.config.set('app', this.appConfig);
     this.config.save();
   }
 
   default() {
-    if (this.appConfig.type === 'node') {
+    if (this.appConfig.type === 'node' || this.appConfig.type === 'alp-node') {
       this.composeWith('pob:common:babel', {
         updateOnly: this.options.updateOnly,
         isApp: true,
+        useAppConfig: this.appConfig.type === 'alp-node',
         testing: this.appConfig.testing,
         documentation: false,
         fromPob: this.options.fromPob,
+        buildDirectory: 'build',
       });
     }
 
@@ -123,7 +132,7 @@ export default class PobAppGenerator extends Generator {
     const babel =
       babelEnvs.length > 0 || appsWithTypescript.includes(this.appConfig.type);
     const node = true;
-    const browser = appsWithNode.includes(this.appConfig.type);
+    const browser = appsWithBrowser.includes(this.appConfig.type);
     const jsx =
       babelEnvs.length > 0 && pkg.pob.jsx !== undefined
         ? pkg.pob.jsx
@@ -146,6 +155,7 @@ export default class PobAppGenerator extends Generator {
           this.appConfig.type === 'alp' ||
           this.appConfig.type === 'pobpack' ||
           this.appConfig.type === 'node' ||
+          this.appConfig.type === 'alp-node' ||
           this.appConfig.type === 'next.js'
         ) {
           return './src';
@@ -179,6 +189,7 @@ export default class PobAppGenerator extends Generator {
       packageManager: this.options.packageManager,
       yarnNodeLinker: this.options.yarnNodeLinker,
       ignorePaths: ignorePaths.join('\n'),
+      buildDirectory: 'build',
     });
 
     this.composeWith('pob:common:release', {

package/lib/generators/app/ignorePaths.js

@@ -2,6 +2,7 @@ export const appIgnorePaths = {
   alp: (config) => ['# alp paths', '/build', '/public', '/data'],
   'next.js': (config) => ['# next.js paths', '/.next', '/out', '/build'],
   pobpack: (config) => ['/build', '/public'],
-  node: (config) => ['/dist'],
+  node: (config) => ['/build'],
+  'alp-node': (config) => ['/build'],
   other: (config) => [],
 };

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

@@ -2,6 +2,7 @@ import fs from 'fs';
 import semver from 'semver';
 import Generator from 'yeoman-generator';
 import * as packageUtils from '../../../utils/package.js';
+import { copyAndFormatTpl } from '../../../utils/writeAndFormat.js';
 
 export default class CommonBabelGenerator extends Generator {
   constructor(args, opts) {
@@ -32,6 +33,18 @@ export default class CommonBabelGenerator extends Generator {
       required: false,
       defaults: false,
     });
+
+    this.option('useAppConfig', {
+      type: Boolean,
+      required: false,
+      defaults: false,
+    });
+
+    this.option('buildDirectory', {
+      type: String,
+      required: false,
+      defaults: 'dist',
+    });
   }
 
   initializing() {
@@ -271,7 +284,7 @@ export default class CommonBabelGenerator extends Generator {
     if (this.options.isApp) {
       packageUtils.removeScripts(['watch']);
       packageUtils.addOrRemoveScripts(pkg, useBabel, {
-        'clean:build': 'rm -Rf dist',
+        'clean:build': `rm -Rf ${this.options.buildDirectory}`,
         build: 'yarn clean:build && rollup --config rollup.config.mjs',
         start: 'yarn clean:build && rollup --config rollup.config.mjs --watch',
         clean: 'yarn clean:build',
@@ -279,7 +292,7 @@ export default class CommonBabelGenerator extends Generator {
     } else {
       packageUtils.removeScripts(['start']);
       packageUtils.addOrRemoveScripts(pkg, useBabel, {
-        'clean:build': 'rm -Rf dist',
+        'clean:build': `rm -Rf ${this.options.buildDirectory}`,
         build: 'yarn clean:build && rollup --config rollup.config.mjs',
         watch: 'yarn clean:build && rollup --config rollup.config.mjs --watch',
         clean: 'yarn clean:build',
@@ -712,13 +725,22 @@ export default class CommonBabelGenerator extends Generator {
     /* pob-babel config */
 
     packageUtils.removeDevDependencies(pkg, ['@rollup/plugin-run']);
+    packageUtils.addOrRemoveDependencies(
+      pkg,
+      useBabel && this.options.isApp && this.options.useAppConfig,
+      ['alp-rollup-plugin-config'],
+    );
 
     this.fs.delete('rollup.config.js');
     if (useBabel) {
       if (this.options.isApp) {
-        this.fs.copy(
+        copyAndFormatTpl(
+          this.fs,
           this.templatePath('app.rollup.config.mjs.ejs'),
           this.destinationPath('rollup.config.mjs'),
+          {
+            config: this.options.useAppConfig,
+          },
         );
       } else {
         this.fs.copy(

package/lib/generators/common/babel/templates/app.rollup.config.mjs.ejs

@@ -1,3 +1,6 @@
+<% if (config) { -%>
+import config from 'alp-rollup-plugin-config';
+<% } -%>
 import createRollupConfig from 'pob-babel/createRollupConfig.js';
 import run from 'pob-babel/plugin-run.cjs';
 
@@ -5,5 +8,12 @@ const watch = process.env.ROLLUP_WATCH === 'true';
 
 export default createRollupConfig({
   cwd: new URL('.', import.meta.url).pathname,
-  plugins: [watch && run({ execArgv: ['--enable-source-maps'] })],
+  outDirectory: 'build',
+  plugins: [
+<% if (config) { -%>
+    config({
+      targets: [{ src: 'src/config/**/*.yml' }],
+    }),
+<% } -%>
+    watch && run({ execArgv: ['--enable-source-maps'] })],
 });

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

@@ -78,6 +78,12 @@ export default class CommonLintGenerator extends Generator {
       defaults: 'node-modules',
       desc: 'Defines what linker should be used for installing Node packages (useful to enable the node-modules plugin), one of: pnp, node-modules.',
     });
+
+    this.option('buildDirectory', {
+      type: String,
+      required: false,
+      defaults: 'dist',
+    });
   }
 
   writing() {
@@ -396,7 +402,7 @@ export default class CommonLintGenerator extends Generator {
       }
 
       if ((!inLerna || !inLerna.root) && useBabel) {
-        ignorePatterns.add('/dist', '/test');
+        ignorePatterns.add(`/${this.options.buildDirectory}`, '/test');
       }
       if (inLerna && inLerna.root && this.options.typescript) {
         ignorePatterns.add('/rollup.config.mjs');
@@ -405,7 +411,7 @@ export default class CommonLintGenerator extends Generator {
       if (this.options.ignorePaths) {
         this.options.ignorePaths
           .split('\n')
-          .filter((path) => path !== '/dist' && path)
+          .filter((path) => path !== `/${this.options.buildDirectory}` && path)
           .forEach((ignorePath) => {
             if (ignorePath.startsWith('#')) return;
             ignorePatterns.add(ignorePath);

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

@@ -38,12 +38,12 @@ function updateParserAndPlugins(
 
     if (!globalEslint) {
       config.parserOptions = {
-        project: './tsconfig.json',
+        project: './tsconfig.eslint.json',
         createDefaultProgram: true, // fix for lint-staged
       };
     } else {
       config.parserOptions = {
-        project: `${relativePath}/tsconfig.json`,
+        project: `${relativePath}/tsconfig.eslint.json`,
       };
     }
   } else {

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

@@ -73,6 +73,7 @@ export default class CommonTypescriptGenerator extends Generator {
     );
 
     const tsconfigPath = this.destinationPath('tsconfig.json');
+    const tsconfigEslintPath = this.destinationPath('tsconfig.eslint.json');
     const tsconfigBuildPath = this.destinationPath('tsconfig.build.json');
     if (this.options.enable) {
       const { jsx, dom } = this.options;
@@ -146,6 +147,12 @@ export default class CommonTypescriptGenerator extends Generator {
           resolveJsonModule: this.options.resolveJsonModule,
         },
       );
+      copyAndFormatTpl(
+        this.fs,
+        this.templatePath('tsconfig.eslint.json.ejs'),
+        tsconfigEslintPath,
+        {},
+      );
       if (
         this.options.builddefs // &&
         // (!composite || monorepoPackageNames.length !== 0)
@@ -168,6 +175,7 @@ export default class CommonTypescriptGenerator extends Generator {
     } else {
       if (pkg.scripts) delete pkg.scripts.tsc;
       this.fs.delete(tsconfigPath);
+      this.fs.delete(tsconfigEslintPath);
       this.fs.delete(tsconfigBuildPath);
     }
 

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

@@ -0,0 +1,7 @@
+{
+  "extends": "./tsconfig.json",
+
+  "compilerOptions": {
+    "noEmit": true,
+  }
+}

package/lib/generators/monorepo/PobMonorepoGenerator.js

@@ -31,6 +31,17 @@ const hasDist = (packages, configs) =>
       ),
   );
 
+const hasBuild = (packages, configs) =>
+  configs.some(
+    (config, index) =>
+      !!(
+        config &&
+        config.project &&
+        config.project.type === 'app' &&
+        config.app.type === 'alp-node'
+      ),
+  );
+
 export default class PobMonorepoGenerator extends Generator {
   constructor(args, opts) {
     super(args, opts);
@@ -206,7 +217,12 @@ export default class PobMonorepoGenerator extends Generator {
       packageManager: this.options.packageManager,
       yarnNodeLinker: this.options.yarnNodeLinker,
       appTypes: JSON.stringify(getAppTypes(this.packageConfigs)),
-      ignorePaths: hasDist(this.packages, this.packageConfigs) ? '/dist' : '',
+      ignorePaths: [
+        hasDist(this.packages, this.packageConfigs) && '/dist',
+        hasBuild(this.packages, this.packageConfigs) && '/build',
+      ]
+        .filter(Boolean)
+        .join('\n'),
     });
 
     this.composeWith('pob:lib:doc', {
@@ -281,7 +297,7 @@ export default class PobMonorepoGenerator extends Generator {
       }
       packageUtils.addOrRemoveScripts(pkg, rollupConfigs.length > 0, {
         'clean:build': `(${pkg.workspaces
-          .map((workspaces) => `rm -Rf ${workspaces}/dist`)
+          .map((workspaces) => `rm -Rf ${workspaces}/dist ${workspaces}/build`)
           .join(' && ')}) || true`,
         build: 'yarn clean:build && rollup --config rollup.config.mjs',
         watch: 'yarn clean:build && rollup --config rollup.config.mjs --watch',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pob",
-  "version": "10.1.0",
+  "version": "10.2.0",
   "description": "Pile of bones, library generator with git/babel/typescript/typedoc/readme/jest",
   "keywords": [
     "skeleton"
@@ -43,7 +43,7 @@
     "@lerna/project": "^4.0.0",
     "@pob/eslint-config": "49.0.0",
     "@pob/eslint-config-typescript": "49.0.0",
-    "@pob/eslint-config-typescript-react": "49.0.0",
+    "@pob/eslint-config-typescript-react": "49.0.1",
     "@pob/sort-eslint-config": "^3.0.1",
     "@pob/sort-object": "^4.0.1",
     "@pob/sort-pkg": "^4.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.14.0",
+    "pob-dependencies": "6.15.0",
     "prettier": "2.5.1",
     "semver": "^7.3.4",
     "yeoman-environment": "^3.5.1",
     "yeoman-generator": "^5.4.0"
   },
-  "gitHead": "a2c45c96006ec7d270c9d25386055411985932e6"
+  "gitHead": "0652ebee362a0e15f2d0cc1f936e461c7e32effd"
 }