pob 11.7.0 → 11.8.1

package/CHANGELOG.md

@@ -3,6 +3,32 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [11.8.1](https://github.com/christophehurpeau/pob/compare/pob@11.8.0...pob@11.8.1) (2023-03-19)
+
+
+### Bug Fixes
+
+* configure target in preset to make sure it is applied ([ad4071d](https://github.com/christophehurpeau/pob/commit/ad4071da757291f6eaa63ade4cfc7ea783eeff57))
+
+
+
+## [11.8.0](https://github.com/christophehurpeau/pob/compare/pob@11.7.0...pob@11.8.0) (2023-03-19)
+
+
+### Features
+
+* add command to help migrate to monorepo ([5274068](https://github.com/christophehurpeau/pob/commit/52740680f63a0949a622831f38268d6d10007a07))
+* drop webpack 4 legacy aliases ([e714540](https://github.com/christophehurpeau/pob/commit/e7145401e52dfe3cc6eff40f2f220b4b81bce561))
+* **pob:** app add "node-library" ([bef77f5](https://github.com/christophehurpeau/pob/commit/bef77f5caee0b89aee5540c82146fea962acf6ff))
+
+
+### Bug Fixes
+
+* fix "pob add" use monorepoArg ([92d4ca5](https://github.com/christophehurpeau/pob/commit/92d4ca5faf27fc1c054fd6c28cb5b8e8256d9f87))
+* fix vscode config jestCommandLine ([434d7ad](https://github.com/christophehurpeau/pob/commit/434d7adfb4e73ba3021d516a149bcd1fb287a479))
+
+
+
 ## [11.7.0](https://github.com/christophehurpeau/pob/compare/pob@11.6.0...pob@11.7.0) (2023-03-13)
 
 

package/lib/generators/app/PobAppGenerator.js

@@ -73,6 +73,7 @@ export default class PobAppGenerator extends Generator {
           'next.js',
           'remix',
           'node',
+          'node-library', // monorepo library for app. Not a real library
           'alp-node',
           'other',
         ],
@@ -112,10 +113,14 @@ export default class PobAppGenerator extends Generator {
   }
 
   default() {
-    if (this.appConfig.type === 'node' || this.appConfig.type === 'alp-node') {
+    if (
+      this.appConfig.type === 'node' ||
+      this.appConfig.type === 'node-library' ||
+      this.appConfig.type === 'alp-node'
+    ) {
       this.composeWith('pob:common:babel', {
         updateOnly: this.options.updateOnly,
-        isApp: true,
+        isApp: this.appConfig.type !== 'node-library',
         useAppConfig: this.appConfig.type === 'alp-node',
         testing: this.appConfig.testing,
         documentation: false,

package/lib/generators/app/ignorePaths.js

@@ -10,6 +10,7 @@ export const appIgnorePaths = {
   remix: (config) => ['# remix paths', '/.cache', '/build', '/public/build'],
   pobpack: (config) => ['/build', '/public'],
   node: (config) => ['/build'],
+  'node-library': (config) => ['/build'],
   'alp-node': (config) => ['/build'],
   other: (config) => [],
 };

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

@@ -162,11 +162,11 @@ export default class CommonBabelGenerator extends Generator {
           default: browserVersions,
           choices: [
             {
-              name: 'Modern (babel-preset-modern-browsers)',
+              name: 'Modern',
               value: 'modern',
             },
             {
-              name: 'Supported (@babel/preset-env)',
+              name: 'Supported',
               value: 'supported',
             },
           ],
@@ -361,6 +361,7 @@ export default class CommonBabelGenerator extends Generator {
       'babel-preset-env', // now @babel/preset-env
       'babel-preset-jsdoc',
       'babel-plugin-add-jsdoc-annotations',
+      'babel-preset-modern-browsers',
     ]);
 
     packageUtils.addOrRemoveDevDependencies(
@@ -371,14 +372,6 @@ export default class CommonBabelGenerator extends Generator {
       ['@babel/preset-env'],
     );
 
-    packageUtils.addOrRemoveDevDependencies(
-      pkg,
-      this.babelEnvs.find(
-        (env) => env.target === 'browser' && env.version === 'modern',
-      ),
-      ['babel-preset-modern-browsers'],
-    );
-
     /* engines */
 
     if (hasTargetNode) {
@@ -424,13 +417,21 @@ export default class CommonBabelGenerator extends Generator {
     /* browserslist */
 
     if (hasTargetBrowser) {
-      pkg.browserslist = [
-        'defaults',
-        '> 0.2%',
-        'not ie < 12',
-        'not safari < 10',
-        'not ios_saf < 10',
-      ];
+      if (pkg.browserslist && pkg.browserslist.modern) {
+        delete pkg.browserslist.modern;
+      }
+      pkg.browserslist = {
+        ...(Array.isArray(pkg.browserslist) ? {} : pkg.browserslist),
+        production: [
+          'defaults',
+          '> 0.2%',
+          'not ie < 12',
+          'not safari < 10',
+          'not ios_saf < 10',
+        ],
+        // configured in babel preset
+        // modern: ['defaults and >1% and supports es6-module'],
+      };
     } else if (this.options.isApp && pkg.browserslist) {
       pkg.browserslist = {
         ...pkg.browserslist,
@@ -515,21 +516,10 @@ export default class CommonBabelGenerator extends Generator {
         (!env.formats || env.formats.includes('es')),
     );
 
-    const esModernBrowserEnv = this.babelEnvs.find(
-      (env) =>
-        env.target === 'browser' &&
-        env.version === 'modern' &&
-        (!env.formats || env.formats.includes('es')),
-    );
-
-    const esNodeEnv = this.babelEnvs.find(
-      (env) =>
-        env.target === 'node' && (!env.formats || env.formats.includes('es')),
-    );
-
     // Legacy "dev" builds
     delete pkg['module:browser'];
     delete pkg['module:browser-dev'];
+    delete pkg['module:modern-browsers'];
     delete pkg['module:modern-browsers-dev'];
     delete pkg['module:node'];
     delete pkg['module:node-dev'];
@@ -543,44 +533,6 @@ export default class CommonBabelGenerator extends Generator {
       delete pkg.browser;
     }
 
-    if (esModernBrowserEnv) {
-      pkg[
-        'module:modern-browsers'
-      ] = `./${this.options.buildDirectory}/index-browsermodern.es.js`;
-    } else {
-      delete pkg['module:modern-browsers'];
-    }
-
-    const aliases = (this.entries || []).filter((entry) => entry !== 'index');
-
-    if (useBabel && aliases.length > 0 && (esNodeEnv || esAllBrowserEnv)) {
-      [esNodeEnv, esAllBrowserEnv, esModernBrowserEnv]
-        .filter(Boolean)
-        .forEach((env) => {
-          const key = (() => {
-            if (env.target === 'node') return 'node';
-            if (env.version === 'modern') return 'modern-browsers';
-            return 'browser';
-          })();
-
-          const envAliases =
-            this.entries.includes('index') && env.target === 'node'
-              ? aliases.filter((alias) => alias !== 'browser')
-              : aliases;
-          if (envAliases.length === 0) return;
-          pkg[`module:aliases-${key}`] = {};
-
-          envAliases.forEach((aliasName) => {
-            const isBrowserOnly =
-              aliasName === 'browser' && env.target !== 'node';
-            const aliasDistName = isBrowserOnly ? 'index' : aliasName;
-            pkg[`module:aliases-${key}`][`./${aliasName}.js`] = `./${
-              this.options.buildDirectory
-            }/${aliasDistName}-${env.target}${env.version || ''}.es.js`;
-          });
-        });
-    }
-
     /* webpack 5 and node with ESM support */
     if (useBabel) {
       pkg.exports = {
@@ -690,23 +642,6 @@ export default class CommonBabelGenerator extends Generator {
 
     Object.keys(pkg).forEach((key) => {
       if (!key.startsWith('module:') && !key.startsWith('webpack:')) return;
-
-      // legacy
-      if (key.endsWith('-dev')) {
-        delete pkg[key];
-        return;
-      }
-
-      if (key.startsWith('module:aliases') && aliases.length > 0) {
-        if (key.startsWith('module:aliases-node') && esNodeEnv) return;
-        if (key.startsWith('module:aliases-browser') && esAllBrowserEnv) return;
-        if (
-          key.startsWith('module:aliases-modern-browsers') &&
-          esModernBrowserEnv
-        ) {
-          return;
-        }
-      }
       delete pkg[key];
     });
 
@@ -739,12 +674,17 @@ export default class CommonBabelGenerator extends Generator {
           this.destinationPath('rollup.config.mjs'),
           {
             config: this.options.useAppConfig,
+            outDirectory: this.options.buildDirectory,
           },
         );
       } else {
-        this.fs.copy(
-          this.templatePath('lib.rollup.config.mjs.txt'),
+        copyAndFormatTpl(
+          this.fs,
+          this.templatePath('lib.rollup.config.mjs.ejs'),
           this.destinationPath('rollup.config.mjs'),
+          {
+            outDirectory: this.options.buildDirectory,
+          },
         );
       }
     } else {

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

@@ -10,7 +10,7 @@ const watch = process.env.ROLLUP_WATCH === 'true';
 
 export default createRollupConfig({
   cwd: dirname(fileURLToPath(import.meta.url)),
-  outDirectory: 'build',
+  outDirectory: '<%= outDirectory %>',
   plugins: [
 <% if (config) { -%>
     config({

package/lib/generators/common/babel/templates/{lib.rollup.config.mjs.txt → lib.rollup.config.mjs.ejs}

@@ -4,4 +4,5 @@ import createRollupConfig from 'pob-babel/createRollupConfig.js';
 
 export default createRollupConfig({
   cwd: dirname(fileURLToPath(import.meta.url)),
+  outDirectory: '<%= outDirectory %>',
 });

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

@@ -207,7 +207,8 @@ export default class CommonLintGenerator extends Generator {
 
     const yoConfigPobMonorepo = inLerna && inLerna.pobMonorepoConfig;
     const globalEslint =
-      yoConfigPobMonorepo && yoConfigPobMonorepo.eslint !== false;
+      this.options.monorepo ||
+      (yoConfigPobMonorepo && yoConfigPobMonorepo.eslint !== false);
     const globalTesting = yoConfigPobMonorepo && yoConfigPobMonorepo.testing;
     const composite = yoConfigPobMonorepo && yoConfigPobMonorepo.typescript;
     const { rootPackageManager, rootYarnNodeLinker } = inLerna || {};

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

@@ -148,6 +148,8 @@ export default class CoreVSCodeGenerator extends Generator {
                 : {}),
               ...(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,

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

@@ -34,6 +34,12 @@
     "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/pob/PobBaseGenerator.js

@@ -164,7 +164,7 @@ export default class PobBaseGenerator extends Generator {
 
     if (!this.inLerna) {
       const splitCIJobs =
-        inLerna && inLerna.pobMonorepoConfig.packageNames.length > 8;
+        inLerna && inLerna.pobMonorepoConfig?.packageNames.length > 8;
       this.composeWith('pob:core:git', {
         onlyLatestLTS,
         splitCIJobs,

package/lib/pob.js

@@ -1,7 +1,13 @@
 #!/usr/bin/env node
 
-import { spawnSync } from 'child_process';
-import fs, { existsSync, writeFileSync, readFileSync } from 'fs';
+import { execSync, spawnSync } from 'child_process';
+import fs, {
+  existsSync,
+  writeFileSync,
+  readFileSync,
+  mkdirSync,
+  readdirSync,
+} from 'fs';
 import path from 'path';
 import minimist from 'minimist';
 import yeoman from 'yeoman-environment';
@@ -224,7 +230,7 @@ if (action === 'add') {
     );
   }
 
-  const packageName = monorepo ? argv._[2] : argv._[1];
+  const packageName = monorepoArg ? argv._[2] : argv._[1];
 
   if (!packageName) {
     console.error('Missing argument: packageName');
@@ -254,6 +260,48 @@ if (action === 'add') {
   process.exit(0);
 }
 
+if (action === 'migrate-to-monorepo') {
+  if (projectPkg.workspaces) {
+    throw new Error('workspaces field already exists in package.json');
+  }
+
+  mkdirSync('packages');
+  mkdirSync(`packages/${projectPkg.name}`);
+
+  readdirSync('.').forEach((filename) => {
+    if (
+      ![
+        '.git',
+        '.vscode',
+        '.github',
+        '.husky',
+        '.yarn',
+        '.yarnrc.yml',
+        'packages',
+        'lint-staged.config.js',
+        'yarn.lock',
+      ].includes(filename)
+    ) {
+      execSync(`mv "${filename}" "packages/${projectPkg.name}/"`);
+    }
+  });
+
+  const monorepoName = `${path.basename(process.cwd())}-monorepo`;
+  const monorepoPkg = {
+    name: monorepoName,
+    version: projectPkg.version,
+    author: projectPkg.author,
+    license: projectPkg.license,
+    repository: projectPkg.repository,
+    engines: projectPkg.engines,
+    packageManager: projectPkg.packageManager,
+  };
+
+  writeFileSync('package.json', JSON.stringify(monorepoPkg, null, 2));
+
+  monorepo = true;
+}
+
 const updateOnly = action === 'update';
 const init = action === 'init';
 const type = updateOnly || init ? null : action;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pob",
-  "version": "11.7.0",
+  "version": "11.8.1",
   "description": "Pile of bones, library generator with git/babel/typescript/typedoc/readme/jest",
   "keywords": [
     "skeleton"
@@ -43,7 +43,7 @@
     "@pob/eslint-config-typescript-react": "50.0.0",
     "@pob/sort-eslint-config": "4.1.1",
     "@pob/sort-object": "5.1.1",
-    "@pob/sort-pkg": "5.1.1",
+    "@pob/sort-pkg": "5.2.0",
     "eslint": "8.36.0",
     "findup-sync": "^5.0.0",
     "git-remote-url": "^1.0.1",
@@ -58,14 +58,14 @@
     "minimist": "1.2.8",
     "node-fetch": "3.3.1",
     "parse-author": "2.0.0",
-    "pob-dependencies": "7.5.0",
+    "pob-dependencies": "7.6.1",
     "prettier": "2.8.4",
     "semver": "7.3.8",
     "yeoman-environment": "3.15.1",
     "yeoman-generator": "5.8.0"
   },
   "devDependencies": {
-    "@pob/root": "7.5.0"
+    "@pob/root": "7.6.1"
   },
-  "gitHead": "760271a7f86157af842aba3d3383c97605532097"
+  "gitHead": "831fbb0a3e31c5f4654f8930df6e5de3d07ac90a"
 }