pob 9.16.2 → 10.2.1

package/CHANGELOG.md

@@ -3,6 +3,73 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [10.2.1](https://github.com/christophehurpeau/pob/compare/pob@10.2.0...pob@10.2.1) (2022-02-19)
+
+
+### Bug Fixes
+
+* **deps:** update dependency @yarnpkg/parsers to v2.5.0-rc.14 ([#1213](https://github.com/christophehurpeau/pob/issues/1213)) ([82319b2](https://github.com/christophehurpeau/pob/commit/82319b27f6091cbb19851573d650620cfa361519))
+* only enable incremental for composite tsconfigs ([b73a16a](https://github.com/christophehurpeau/pob/commit/b73a16a15a09f68cde3ad22d01331418c3a5d92c))
+* **pob:** clean script ([6f2646e](https://github.com/christophehurpeau/pob/commit/6f2646e150e5ca4c889f5657811273a44eb68549))
+
+
+
+
+
+# [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)
+
+
+### Features
+
+* **deps:** update @pob/eslint-config to v49 (major) ([#1203](https://github.com/christophehurpeau/pob/issues/1203)) ([c063b55](https://github.com/christophehurpeau/pob/commit/c063b553eb15e3d3422f149b89ac1f9f12958e43))
+
+
+
+
+
+# [10.0.0](https://github.com/christophehurpeau/pob/compare/pob@9.16.2...pob@10.0.0) (2022-02-12)
+
+
+### Bug Fixes
+
+* **deps:** update dependency @yarnpkg/parsers to v2.5.0-rc.12 ([#1195](https://github.com/christophehurpeau/pob/issues/1195)) ([90c432e](https://github.com/christophehurpeau/pob/commit/90c432e9c714db95901bec29f3899d4ac8f24bd8))
+* **deps:** update dependency @yarnpkg/parsers to v2.5.0-rc.13 ([#1200](https://github.com/christophehurpeau/pob/issues/1200)) ([8351d60](https://github.com/christophehurpeau/pob/commit/8351d60fee9b6629fbba5876eaf142af3a3bc544))
+* **pob:** nextjs generator ([5f814dd](https://github.com/christophehurpeau/pob/commit/5f814dd9243c46d5b96fdc8b01adadaa044f2734))
+
+
+### Features
+
+* **deps:** update dependency eslint to v8.9.0 ([#1202](https://github.com/christophehurpeau/pob/issues/1202)) ([0c59870](https://github.com/christophehurpeau/pob/commit/0c59870f0cb4e9c7bf5a478446164de297c44ea8))
+* **pob:** add watch in monorepo with rollup ([eba1e69](https://github.com/christophehurpeau/pob/commit/eba1e693149807b5a139eda1036b8d131e7a7228))
+* **pob:** improve nextjs config ([17c4daf](https://github.com/christophehurpeau/pob/commit/17c4dafd3af2f982e0e0b260b7d5352f1e9f8c36))
+* use react jsx-runtime ([5c8bd2b](https://github.com/christophehurpeau/pob/commit/5c8bd2ba8fc1153537a26e3439852fab4c7878de))
+
+
+### BREAKING CHANGES
+
+* requires react with jsx-supported runtime
+
+
+
+
+
 ## [9.16.2](https://github.com/christophehurpeau/pob/compare/pob@9.16.1...pob@9.16.2) (2022-02-06)
 
 

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',
@@ -103,13 +104,15 @@ export default class PobAppGenerator extends Generator {
   }
 
   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 +126,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
@@ -135,6 +138,7 @@ export default class PobAppGenerator extends Generator {
 
     this.composeWith('pob:common:typescript', {
       enable: babel,
+      // nextjs now supports src rootDir: this.appConfig.type === 'next.js' ? '.' : 'src',
       builddefs: false,
       dom: browser,
       jsx,
@@ -144,11 +148,13 @@ export default class PobAppGenerator extends Generator {
         if (
           this.appConfig.type === 'alp' ||
           this.appConfig.type === 'pobpack' ||
-          this.appConfig.type === 'node'
+          this.appConfig.type === 'node' ||
+          this.appConfig.type === 'alp-node' ||
+          this.appConfig.type === 'next.js'
         ) {
           return './src';
         }
-        if (this.appConfig.type === 'next.js') return '.';
+        // if (this.appConfig.type === 'next.js') return '.';
         return '';
       })(),
     });
@@ -172,10 +178,12 @@ export default class PobAppGenerator extends Generator {
       babel,
       node,
       browser,
+      // nextjs now supports src rootAsSrc: this.appConfig.type === 'next.js',
       enableSrcResolver: true,
       packageManager: this.options.packageManager,
       yarnNodeLinker: this.options.yarnNodeLinker,
       ignorePaths: ignorePaths.join('\n'),
+      buildDirectory: 'build',
     });
 
     this.composeWith('pob:common:release', {
@@ -217,6 +225,12 @@ export default class PobAppGenerator extends Generator {
         });
         break;
     }
+
+    execSync(
+      `rm -Rf ${['lib-*', 'coverage', 'docs', 'dist']
+        .filter(Boolean)
+        .join(' ')}`,
+    );
   }
 
   writing() {

package/lib/generators/app/ignorePaths.js

@@ -1,7 +1,8 @@
 export const appIgnorePaths = {
   alp: (config) => ['# alp paths', '/build', '/public', '/data'],
-  'next.js': (config) => ['# next.js paths', '/.next', '/out'],
+  '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/app/nextjs/AppNextjsGenerator.js

@@ -17,8 +17,9 @@ export default class AppNextjsGenerator extends Generator {
     const pkg = this.fs.readJSON(this.destinationPath('package.json'));
 
     packageUtils.addScripts(pkg, {
+      start: 'next dev',
+      'start:prod': 'next start',
       build: 'next build',
-      start: 'next',
     });
 
     this.fs.writeJSON(this.destinationPath('package.json'), pkg);

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

@@ -47,6 +47,13 @@ export default class CommonLintGenerator extends Generator {
       desc: 'Enable resolving from src directory',
     });
 
+    this.option('rootAsSrc', {
+      type: Boolean,
+      required: false,
+      defaults: false,
+      desc: 'src directory is root',
+    });
+
     this.option('appTypes', {
       type: String,
       required: false,
@@ -71,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() {
@@ -368,19 +381,16 @@ export default class CommonLintGenerator extends Generator {
     this.fs.delete(`${eslintrcBadPath}.yml`);
     this.fs.delete(`${eslintrcBadPath}.js`);
 
-    const rootEslintrcPath = this.destinationPath('.eslintrc.json');
+    const rootEslintrcPath = this.options.rootAsSrc
+      ? false
+      : this.destinationPath('.eslintrc.json');
 
-    const srcEslintrcPath = this.destinationPath(
-      `${useBabel ? 'src/' : 'lib/'}.eslintrc.json`,
-    );
+    const srcEslintrcPath = this.options.rootAsSrc
+      ? this.destinationPath('.eslintrc.json')
+      : this.destinationPath(`${useBabel ? 'src/' : 'lib/'}.eslintrc.json`);
 
     const useTypescript = useBabel;
-
-    try {
-      if (this.fs.exists(rootEslintrcPath)) {
-        ensureJsonFileFormatted(rootEslintrcPath);
-      }
-
+    const getRootIgnorePatterns = () => {
       const ignorePatterns = new Set();
 
       if (inLerna && !inLerna.root && (this.options.typescript || pkg.types)) {
@@ -392,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');
@@ -401,26 +411,41 @@ 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);
           });
       }
 
-      const rootEslintrcConfig = updateEslintConfig(
-        this.fs.readJSON(rootEslintrcPath, {}),
-        {
-          extendsConfig: extendsConfigRoot,
-          ignorePatterns:
-            ignorePatterns.size === 0 ? undefined : [...ignorePatterns],
-        },
-      );
+      return ignorePatterns;
+    };
+
+    if (rootEslintrcPath) {
+      try {
+        if (this.fs.exists(rootEslintrcPath)) {
+          ensureJsonFileFormatted(rootEslintrcPath);
+        }
+
+        const rootIgnorePatterns = getRootIgnorePatterns();
+
+        const rootEslintrcConfig = updateEslintConfig(
+          this.fs.readJSON(rootEslintrcPath, {}),
+          {
+            extendsConfig: extendsConfigRoot,
+            ignorePatterns:
+              rootIgnorePatterns.size === 0
+                ? undefined
+                : [...rootIgnorePatterns],
+          },
+        );
 
-      writeAndFormatJson(this.fs, rootEslintrcPath, rootEslintrcConfig);
-    } catch (err) {
-      console.warn(`Could not parse/edit ${rootEslintrcPath}: `, err);
+        writeAndFormatJson(this.fs, rootEslintrcPath, rootEslintrcConfig);
+      } catch (err) {
+        console.warn(`Could not parse/edit ${rootEslintrcPath}: `, err);
+      }
     }
+    // no else: dont delete root eslintrc, src is root
 
     if ((inLerna && inLerna.root) || this.options.monorepo) {
       if (this.fs.exists(srcEslintrcPath)) {
@@ -432,6 +457,13 @@ export default class CommonLintGenerator extends Generator {
           ensureJsonFileFormatted(srcEslintrcPath);
         }
 
+        const ignorePatterns = this.options.rootAsSrc
+          ? getRootIgnorePatterns()
+          : new Set();
+        if (useTypescript || pkg.types) {
+          ignorePatterns.add('*.d.ts');
+        }
+
         const srcEslintrcConfig = updateEslintConfig(
           this.fs.readJSON(srcEslintrcPath, {}),
           {
@@ -439,7 +471,8 @@ export default class CommonLintGenerator extends Generator {
             jestOverride,
             useTypescript: useBabel,
             globalEslint,
-            ignorePatterns: useTypescript || pkg.types ? ['*.d.ts'] : undefined,
+            ignorePatterns:
+              ignorePatterns.size === 0 ? undefined : [...ignorePatterns],
             settings: {
               'import/resolver': this.options.enableSrcResolver
                 ? {

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/testing/templates/babel.config.cjs.ejs

@@ -12,8 +12,10 @@ module.exports = function babelConfig(api) {
       <% if (hasReact) { %>, [
         '@babel/preset-react',
         {
+          runtime: 'automatic',
           development: false,
           useBuiltIns: true,
+          useSpread: true,
         },
       ]<% } %>
       <% if (hasLinaria) { %>, [

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

@@ -14,6 +14,12 @@ export default class CommonTypescriptGenerator extends Generator {
       desc: 'enable typescript',
     });
 
+    this.option('rootDir', {
+      type: String,
+      defaults: 'src',
+      desc: 'customize rootDir',
+    });
+
     this.option('jsx', {
       type: Boolean,
       defaults: true,
@@ -67,11 +73,12 @@ 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;
       let composite;
-      let monorepoPackageNames;
+      let monorepoPackageBuildReferences;
       let monorepoPackageSrcPaths;
 
       if (inLerna && !inLerna.root) {
@@ -89,26 +96,39 @@ export default class CommonTypescriptGenerator extends Generator {
             ['typescript'],
           );
 
-          monorepoPackageNames = yoConfig.pob.monorepo.packageNames.filter(
-            (packageName) =>
-              ((pkg.dependencies && pkg.dependencies[packageName]) ||
-                (pkg.devDependencies && pkg.devDependencies[packageName]) ||
-                (pkg.peerDependencies && pkg.peerDependencies[packageName])) &&
-              existsSync(
+          const packageLocations = new Map(
+            yoConfig.pob.monorepo.packageNames
+              .filter(
+                (packageName) =>
+                  (pkg.dependencies && pkg.dependencies[packageName]) ||
+                  (pkg.devDependencies && pkg.devDependencies[packageName]) ||
+                  (pkg.peerDependencies && pkg.peerDependencies[packageName]),
+              )
+              .map((packageName) => [
+                packageName,
                 `../../${
                   packageName[0] === '@'
                     ? packageName
                     : `packages/${packageName}`
-                }/tsconfig.build.json`,
-              ),
+                }`,
+              ]),
           );
 
-          monorepoPackageSrcPaths = monorepoPackageNames.map(
-            (packageName) =>
-              `${
-                packageName[0] === '@' ? packageName : `packages/${packageName}`
-              }/${existsSync(`../${packageName}/src`) ? 'src' : 'lib'}`,
+          monorepoPackageSrcPaths = [...packageLocations.entries()].map(
+            ([packageName, packageLocation]) => [
+              packageName,
+              `${packageLocation}/${
+                existsSync(`${packageLocation}/src`) ? 'src' : 'lib'
+              }`,
+            ],
           );
+          monorepoPackageBuildReferences = yoConfig.pob.monorepo.packageNames
+            .filter((packageName) =>
+              existsSync(
+                `${packageLocations.get(packageName)}/tsconfig.build.json`,
+              ),
+            )
+            .map((packageName) => packageLocations.get(packageName));
         }
       }
 
@@ -117,8 +137,9 @@ export default class CommonTypescriptGenerator extends Generator {
         this.templatePath('tsconfig.json.ejs'),
         tsconfigPath,
         {
-          monorepoPackageNames,
           monorepoPackageSrcPaths,
+          monorepoPackageBuildReferences,
+          rootDir: this.options.rootDir,
           jsx,
           composite,
           dom,
@@ -126,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)
@@ -138,8 +165,8 @@ export default class CommonTypescriptGenerator extends Generator {
             inMonorepo: inLerna && !inLerna.root,
             jsx,
             composite,
-            monorepoPackageNames,
             monorepoPackageSrcPaths,
+            monorepoPackageBuildReferences,
           },
         );
       } else {
@@ -148,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.build.json.ejs

@@ -2,7 +2,6 @@
   "extends": "./tsconfig.json",
 
   "compilerOptions": {
-    "rootDir": "src",
     "noEmit": false,
     "declaration": true,
     "declarationMap": true,
@@ -23,11 +22,11 @@
     "src/**/*.test.tsx",
 <% } -%>
     "src/**/__tests__/**"
-  ]<% if (monorepoPackageNames && monorepoPackageNames.length) { %>,<% } -%>
-<% if (monorepoPackageNames && monorepoPackageNames.length) { %>
+  ]<% if (monorepoPackageBuildReferences && monorepoPackageBuildReferences.length) { %>,<% } -%>
+<% if (monorepoPackageBuildReferences && monorepoPackageBuildReferences.length) { %>
   "references": [
-<% monorepoPackageNames.forEach((packageName, index) => { -%>
-    { "path": "../<%= packageName %>/tsconfig.build.json" }<%= index === monorepoPackageNames.length -1 ? '' : ',' %>
+<% monorepoPackageBuildReferences.forEach((monorepoPackageSrcPath, index) => { -%>
+      { "path": "<%= monorepoPackageSrcPath %>/tsconfig.json" }<%= index === monorepoPackageBuildReferences.length -1 ? '' : ',' %>
 <% }) -%>
 ]<% } -%>
 }

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

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

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

@@ -1,16 +1,21 @@
 {
   "include": [
-    "src/**/*.ts"<% if (jsx) { -%>,
-    "src/**/*.tsx"<% } %>
+    "<%= rootDir %>/**/*.ts"<% if (jsx) { -%>,
+    "<%= rootDir %>/**/*.tsx"<% } %>
   ],
+<% if(rootDir === '.') { -%>
+  "exclude": [
+    "node_modules"
+  ],
+<% } -%>
   "compilerOptions": {
-    "rootDir": "src",
+    "rootDir": "<%= rootDir %>",
 <% 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,
+    "composite": true,
     "noEmit": false,
     "noEmitOnError": true,
     "declaration": true,
@@ -26,7 +31,7 @@
     "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 */
-    <%= jsx ? '' : '// ' %>"jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
+    <%= jsx ? '' : '// ' %>"jsx": "react-jsx",                     /* 'react-jsx' is used with react/jsx-runtime (react >=17 || >= 16.14.0 | >= 15.7.0) */
     "isolatedModules": true,                  /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
 
     /* Enable all strict type-checking options. */
@@ -46,18 +51,18 @@
     <% if (resolveJsonModule) { -%>
     "resolveJsonModule": <%= resolveJsonModule %>,
     <% } -%>
-    "baseUrl": "<%= baseUrl %>"<% if (monorepoPackageNames) { %>,<% } %> /* Base directory to resolve non-absolute module names. */
-    <% if (monorepoPackageNames && monorepoPackageNames.length !== 0) { -%>
+    "baseUrl": "<%= baseUrl %>"<% if (monorepoPackageSrcPaths) { %>,<% } %> /* Base directory to resolve non-absolute module names. */
+    <% if (monorepoPackageSrcPaths && monorepoPackageSrcPaths.length !== 0) { -%>
     "paths": {
-      <% monorepoPackageNames.forEach((packageName, index) => { %>
-      "<%= packageName %>": ["../../../<%= monorepoPackageSrcPaths[index] %>"],
-      "<%= packageName %>/*": ["../../../<%= monorepoPackageSrcPaths[index] %>/*"]<%= index === monorepoPackageNames.length -1 ? '' : ',' -%>
+      <% monorepoPackageSrcPaths.forEach(([packageName, packageLocation], index) => { %>
+      "<%= packageName %>": ["../<%= packageLocation %>"],
+      "<%= packageName %>/*": ["../<%= packageLocation %>/*"]<%= index === monorepoPackageSrcPaths.length -1 ? '' : ',' -%>
       <% }) %>
     }<% } %>
-  }<% if (monorepoPackageNames && monorepoPackageNames.length) { -%>,
+  }<% if (monorepoPackageBuildReferences && monorepoPackageBuildReferences.length) { -%>,
   "references": [
-    <% monorepoPackageNames.forEach((packageName, index) => { -%>
-        { "path": "../<%= packageName %>/tsconfig.json" }<%= index === monorepoPackageNames.length -1 ? '' : ',' %>
+    <% monorepoPackageBuildReferences.forEach((monorepoPackageSrcPath, index) => { -%>
+        { "path": "<%= monorepoPackageSrcPath %>/tsconfig.json" }<%= index === monorepoPackageBuildReferences.length -1 ? '' : ',' %>
     <% }) -%>
   ],
   <% } -%>

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

@@ -1,12 +1,6 @@
 {
   "extends": "./tsconfig.json",
 
-
-  "compilerOptions": {
-    "rootDirs": [],
-    "rootDir": "src"
-  },
-
   "typedocOptions": {
     "entryPoints": [
       <%- entryPoints.map(entryPoint => `"${entryPoint}"`).join(', ') %>

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,9 +297,10 @@ 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',
       });
       packageUtils.addOrRemoveDevDependencies(pkg, rollupConfigs.length, [
         '@babel/core',

package/lib/pob.js

@@ -6,6 +6,7 @@ import path from 'path';
 import argv from 'minimist-argv';
 import yeoman from 'yeoman-environment';
 import PobAppGenerator from './generators/app/PobAppGenerator.js';
+import AppNextjsGenerator from './generators/app/nextjs/AppNextjsGenerator.js';
 import CommonBabelGenerator from './generators/common/babel/CommonBabelGenerator.js';
 import CommonLintGenerator from './generators/common/format-lint/CommonLintGenerator.js';
 import CommonHuskyGenerator from './generators/common/husky/CommonHuskyGenerator.js';
@@ -78,6 +79,11 @@ env.registerStub(
   'pob:app',
   `${__dirname}/generators/app/PobAppGenerator.js`,
 );
+env.registerStub(
+  AppNextjsGenerator,
+  'pob:app:nextjs',
+  `${__dirname}/generators/app/nextjs/AppNextjsGenerator.js`,
+);
 env.registerStub(
   CommonBabelGenerator,
   'pob:common:babel',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pob",
-  "version": "9.16.2",
+  "version": "10.2.1",
   "description": "Pile of bones, library generator with git/babel/typescript/typedoc/readme/jest",
   "keywords": [
     "skeleton"
@@ -41,14 +41,14 @@
   "dependencies": {
     "@lerna/package-graph": "^4.0.0",
     "@lerna/project": "^4.0.0",
-    "@pob/eslint-config": "48.1.1",
-    "@pob/eslint-config-typescript": "48.1.1",
-    "@pob/eslint-config-typescript-react": "48.1.1",
+    "@pob/eslint-config": "49.0.0",
+    "@pob/eslint-config-typescript": "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",
-    "@yarnpkg/parsers": "2.5.0-rc.11",
-    "eslint": "8.8.0",
+    "@yarnpkg/parsers": "2.5.0-rc.14",
+    "eslint": "8.9.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.12.1",
+    "pob-dependencies": "6.16.0",
     "prettier": "2.5.1",
     "semver": "^7.3.4",
     "yeoman-environment": "^3.5.1",
     "yeoman-generator": "^5.4.0"
   },
-  "gitHead": "97e55d45699b7fa32b72635f3f202e9d3cf326df"
+  "gitHead": "f23f89112a35d2df5b8e6da96dee061043b4c362"
 }