pob 9.15.1 → 10.0.0

package/CHANGELOG.md

@@ -3,6 +3,82 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [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)
+
+
+### Bug Fixes
+
+* add missing cwd in apps to work in monorepo ([d8357bc](https://github.com/christophehurpeau/pob/commit/d8357bceb325cb14b90a86bf0a89168aad58565b))
+* **deps:** update @pob/eslint-config to v48.1.1 ([#1193](https://github.com/christophehurpeau/pob/issues/1193)) ([bc8b133](https://github.com/christophehurpeau/pob/commit/bc8b1336982c6461e17645cef40d719cd1a8ac1c))
+* **pob:** add missing @babel/core in monorepo with pob-babel ([4595747](https://github.com/christophehurpeau/pob/commit/45957478be9d01e56ffcffc8d2f9bec3a9899b9a))
+
+
+
+
+
+## [9.16.1](https://github.com/christophehurpeau/pob/compare/pob@9.16.0...pob@9.16.1) (2022-02-06)
+
+
+### Bug Fixes
+
+* dont add rollup.config.mjs for non typescript monorepos ([848e578](https://github.com/christophehurpeau/pob/commit/848e57843d03eeb6fd9d5544eff085248110c711))
+* **pob:** always add engines ([7095ad3](https://github.com/christophehurpeau/pob/commit/7095ad3388d503f4a752403530c2e7c24b385248))
+
+
+
+
+
+# [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/app/PobAppGenerator.js

@@ -135,6 +135,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 +145,12 @@ 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 === 'next.js'
         ) {
           return './src';
         }
-        if (this.appConfig.type === 'next.js') return '.';
+        // if (this.appConfig.type === 'next.js') return '.';
         return '';
       })(),
     });
@@ -172,6 +174,7 @@ 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,

package/lib/generators/app/ignorePaths.js

@@ -1,6 +1,6 @@
 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'],
   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

@@ -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',
@@ -400,13 +401,8 @@ export default class CommonBabelGenerator extends Generator {
     } else {
       packageUtils.removeDependencies(pkg, ['@types/node']);
       packageUtils.removeDevDependencies(pkg, ['@types/node']);
-      if (pkg.engines && useBabel) {
-        delete pkg.engines.node;
-        if (Object.keys(pkg.engines).length === 0) delete pkg.engines;
-      } else {
-        // Supported LTS versions of node, that supports ESM modules.
-        pkg.engines.node = '^14.13.1 || >=16.0.0';
-      }
+      // Supported LTS versions of node, that supports ESM modules.
+      pkg.engines.node = '^14.13.1 || >=16.0.0';
     }
 
     /* browserslist */

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

@@ -4,5 +4,6 @@ import run from 'pob-babel/plugin-run.cjs';
 const watch = process.env.ROLLUP_WATCH === 'true';
 
 export default createRollupConfig({
+  cwd: new URL('.', import.meta.url).pathname,
   plugins: [watch && run({ execArgv: ['--enable-source-maps'] })],
 });

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

@@ -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,
@@ -368,19 +375,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)) {
@@ -394,6 +398,9 @@ export default class CommonLintGenerator extends Generator {
       if ((!inLerna || !inLerna.root) && useBabel) {
         ignorePatterns.add('/dist', '/test');
       }
+      if (inLerna && inLerna.root && this.options.typescript) {
+        ignorePatterns.add('/rollup.config.mjs');
+      }
 
       if (this.options.ignorePaths) {
         this.options.ignorePaths
@@ -405,19 +412,34 @@ export default class CommonLintGenerator extends Generator {
           });
       }
 
-      const rootEslintrcConfig = updateEslintConfig(
-        this.fs.readJSON(rootEslintrcPath, {}),
-        {
-          extendsConfig: extendsConfigRoot,
-          ignorePatterns:
-            ignorePatterns.size === 0 ? undefined : [...ignorePatterns],
-        },
-      );
+      return ignorePatterns;
+    };
 
-      writeAndFormatJson(this.fs, rootEslintrcPath, rootEslintrcConfig);
-    } catch (err) {
-      console.warn(`Could not parse/edit ${rootEslintrcPath}: `, err);
+    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);
+      }
     }
+    // no else: dont delete root eslintrc, src is root
 
     if ((inLerna && inLerna.root) || this.options.monorepo) {
       if (this.fs.exists(srcEslintrcPath)) {
@@ -429,6 +451,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, {}),
           {
@@ -436,7 +465,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/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

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

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,
@@ -71,7 +77,7 @@ export default class CommonTypescriptGenerator extends Generator {
     if (this.options.enable) {
       const { jsx, dom } = this.options;
       let composite;
-      let monorepoPackageNames;
+      let monorepoPackageBuildReferences;
       let monorepoPackageSrcPaths;
 
       if (inLerna && !inLerna.root) {
@@ -89,26 +95,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,9 +136,11 @@ export default class CommonTypescriptGenerator extends Generator {
         this.templatePath('tsconfig.json.ejs'),
         tsconfigPath,
         {
-          monorepoPackageNames,
           monorepoPackageSrcPaths,
+          monorepoPackageBuildReferences,
+          rootDir: this.options.rootDir,
           jsx,
+          composite,
           dom,
           baseUrl: this.options.baseUrl,
           resolveJsonModule: this.options.resolveJsonModule,
@@ -137,8 +158,8 @@ export default class CommonTypescriptGenerator extends Generator {
             inMonorepo: inLerna && !inLerna.root,
             jsx,
             composite,
-            monorepoPackageNames,
             monorepoPackageSrcPaths,
+            monorepoPackageBuildReferences,
           },
         );
       } else {

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

@@ -3,17 +3,13 @@
 
   "compilerOptions": {
     "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": [
@@ -26,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.json.ejs

@@ -1,20 +1,37 @@
 {
   "include": [
-    "src/**/*.ts"<% if (jsx) { -%>,
-    "src/**/*.tsx"<% } %>
+    "<%= rootDir %>/**/*.ts"<% if (jsx) { -%>,
+    "<%= rootDir %>/**/*.tsx"<% } %>
   ],
+<% if(rootDir === '.') { -%>
+  "exclude": [
+    "node_modules"
+  ],
+<% } -%>
   "compilerOptions": {
+    "rootDir": "<%= rootDir %>",
+    "incremental": true,
+<% if(!composite) { -%>
     /* No emit in default config file. See build config file for config to build declaration files */
     "noEmit": true,
+<% } else { -%>
+    "composite": 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 */
-    <%= 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. */
@@ -34,14 +51,19 @@
     <% if (resolveJsonModule) { -%>
     "resolveJsonModule": <%= resolveJsonModule %>,
     <% } -%>
-    "baseUrl": "<%= baseUrl %>"<% if (monorepoPackageNames) { %>,<% } %><%= '                            '.slice(0, -(baseUrl.length + (monorepoPackageNames ? 1 : 0))) %>/* 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 (monorepoPackageBuildReferences && monorepoPackageBuildReferences.length) { -%>,
+  "references": [
+    <% monorepoPackageBuildReferences.forEach((monorepoPackageSrcPath, index) => { -%>
+        { "path": "<%= monorepoPackageSrcPath %>/tsconfig.json" }<%= index === monorepoPackageBuildReferences.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

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

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,48 @@ 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',
+        watch: 'yarn clean:build && rollup --config rollup.config.mjs --watch',
+      });
+      packageUtils.addOrRemoveDevDependencies(pkg, rollupConfigs.length, [
+        '@babel/core',
+        '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/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/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": "10.0.0",
   "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.0.5",
-    "@pob/eslint-config-typescript": "48.0.6",
-    "@pob/eslint-config-typescript-react": "48.0.7",
+    "@pob/eslint-config": "48.1.1",
+    "@pob/eslint-config-typescript": "48.1.1",
+    "@pob/eslint-config-typescript-react": "48.1.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.10",
-    "eslint": "8.8.0",
+    "@yarnpkg/parsers": "2.5.0-rc.13",
+    "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.11.1",
+    "pob-dependencies": "6.13.0",
     "prettier": "2.5.1",
     "semver": "^7.3.4",
     "yeoman-environment": "^3.5.1",
     "yeoman-generator": "^5.4.0"
   },
-  "gitHead": "966b414b24a2f6289c0801666c3b1c9d2cf986ac"
+  "gitHead": "b0b1e856f4414edbc599882778d1ee33715bc62b"
 }