pob 10.4.0 → 10.6.0

package/CHANGELOG.md

@@ -3,6 +3,46 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [10.6.0](https://github.com/christophehurpeau/pob/compare/pob@10.5.0...pob@10.6.0) (2022-03-09)
+
+
+### Bug Fixes
+
+* autodetect monorepo ([6057838](https://github.com/christophehurpeau/pob/commit/60578383b053635808473aa165234b13747be4bf))
+* remove inNpmLerna ([154ba42](https://github.com/christophehurpeau/pob/commit/154ba4248c1f59c0d37967dee8b5aa3df91928d1))
+* when projectPkg doesnt exists ([12598fe](https://github.com/christophehurpeau/pob/commit/12598fe8079ab5f577bf1299ae12ef29c57f6036))
+
+
+### Features
+
+* add remix app ([104756a](https://github.com/christophehurpeau/pob/commit/104756a3dce93e23b1fc48825425903d9763e550))
+
+
+
+
+
+# [10.5.0](https://github.com/christophehurpeau/pob/compare/pob@10.4.1...pob@10.5.0) (2022-03-05)
+
+
+### Features
+
+* update actions/setup-node@v3 ([2ab3475](https://github.com/christophehurpeau/pob/commit/2ab3475da500ae3aaee0d9969eb7bb9bc207a8d0))
+
+
+
+
+
+## [10.4.1](https://github.com/christophehurpeau/pob/compare/pob@10.4.0...pob@10.4.1) (2022-03-05)
+
+
+### Bug Fixes
+
+* alp-rollup-plugin-config in devDependencies ([40e6a09](https://github.com/christophehurpeau/pob/commit/40e6a09a8bb9a78412a75834635c813bf377f756))
+
+
+
+
+
 # [10.4.0](https://github.com/christophehurpeau/pob/compare/pob@10.3.1...pob@10.4.0) (2022-03-05)
 
 

package/lib/generators/app/PobAppGenerator.js

@@ -1,12 +1,11 @@
 import { execSync } from 'child_process';
 import Generator from 'yeoman-generator';
 import inLerna from '../../utils/inLerna.js';
-import inNpmLerna from '../../utils/inNpmLerna.js';
 import * as packageUtils from '../../utils/package.js';
 import { appIgnorePaths } from './ignorePaths.js';
 
-const appsWithTypescript = ['alp', 'next.js', 'pobpack'];
-const appsWithBrowser = ['alp', 'next.js'];
+const appsWithTypescript = ['alp', 'next.js', 'remix', 'pobpack'];
+const appsWithBrowser = ['alp', 'next.js', 'remix'];
 
 export default class PobAppGenerator extends Generator {
   constructor(args, opts) {
@@ -67,7 +66,15 @@ 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', 'alp-node', 'other'],
+        choices: [
+          'alp',
+          'pobpack',
+          'next.js',
+          'remix',
+          'node',
+          'alp-node',
+          'other',
+        ],
       },
       {
         type: 'confirm',
@@ -154,44 +161,46 @@ export default class PobAppGenerator extends Generator {
         ) {
           return './src';
         }
-        // if (this.appConfig.type === 'next.js') return '.';
+        if (this.appConfig.type === 'remix') return '.';
         return '';
       })(),
     });
 
     this.composeWith('pob:common:remove-old-dependencies');
 
-    this.composeWith('pob:common:testing', {
-      enable: this.appConfig.testing,
-      testing: this.appConfig.testing,
-      typescript: babel,
-      documentation: false,
-      codecov: this.appConfig.codecov,
-      ci: this.appConfig.ci,
-      packageManager: this.options.packageManager,
-      isApp: true,
-    });
+    if (this.appConfig.type !== 'remix') {
+      this.composeWith('pob:common:testing', {
+        enable: this.appConfig.testing,
+        testing: this.appConfig.testing,
+        typescript: babel,
+        documentation: false,
+        codecov: this.appConfig.codecov,
+        ci: this.appConfig.ci,
+        packageManager: this.options.packageManager,
+        isApp: true,
+      });
 
-    this.composeWith('pob:common:format-lint', {
-      documentation: false,
-      testing: this.appConfig.testing,
-      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:format-lint', {
+        documentation: false,
+        testing: this.appConfig.testing,
+        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', {
-      enable: !inLerna && this.appConfig.testing && this.appConfig.ci,
-      withBabel: babel,
-      documentation: false,
-      updateOnly: this.options.updateOnly,
-    });
+      this.composeWith('pob:common:release', {
+        enable: !inLerna && this.appConfig.testing && this.appConfig.ci,
+        withBabel: babel,
+        documentation: false,
+        updateOnly: this.options.updateOnly,
+      });
+    }
 
     this.composeWith('pob:core:vscode', {
       root: !inLerna,
@@ -224,6 +233,9 @@ export default class PobAppGenerator extends Generator {
           export: this.appConfig.export,
         });
         break;
+      case 'remix':
+        this.composeWith('pob:app:remix', {});
+        break;
     }
 
     execSync(
@@ -237,10 +249,11 @@ export default class PobAppGenerator extends Generator {
     // Re-read the content at this point because a composed generator might modify it.
     const pkg = this.fs.readJSON(this.destinationPath('package.json'));
 
-    if (inNpmLerna) {
-      if (!pkg.engines) pkg.engines = {};
-      pkg.engines.yarn = '< 0.0.0';
-    } else if (pkg.engines) {
+    // if (isNpm) {
+    //   if (!pkg.engines) pkg.engines = {};
+    //   pkg.engines.yarn = '< 0.0.0';
+    // } else
+    if (pkg.engines) {
       delete pkg.engines.yarn;
     }
 

package/lib/generators/app/ignorePaths.js

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

package/lib/generators/app/remix/AppRemixGenerator.js

@@ -0,0 +1,17 @@
+import Generator from 'yeoman-generator';
+import * as packageUtils from '../../../utils/package.js';
+
+// run "yarn create remix remix" first, then "cd remix ; pob app"
+export default class AppRemixGenerator extends Generator {
+  writing() {
+    const pkg = this.fs.readJSON(this.destinationPath('package.json'));
+
+    packageUtils.addScripts(pkg, {
+      build: 'cross-env NODE_ENV=production remix build',
+      start: 'cross-env NODE_ENV=development remix dev',
+      'start:prod': 'cross-env NODE_ENV=production remix-serve build',
+    });
+
+    this.fs.writeJSON(this.destinationPath('package.json'), pkg);
+  }
+}

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

@@ -727,7 +727,8 @@ export default class CommonBabelGenerator extends Generator {
     /* pob-babel config */
 
     packageUtils.removeDevDependencies(pkg, ['@rollup/plugin-run']);
-    packageUtils.addOrRemoveDependencies(
+    packageUtils.removeDependencies(pkg, ['alp-rollup-plugin-config']);
+    packageUtils.addOrRemoveDevDependencies(
       pkg,
       useBabel && this.options.isApp && this.options.useAppConfig,
       ['alp-rollup-plugin-config'],

package/lib/generators/common/release/templates/release-please.yml.ejs

@@ -22,7 +22,7 @@ jobs:
         # a new release is created:
         if: ${{ steps.release.outputs.release_created }}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: 14
           registry-url: 'https://registry.npmjs.org'

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

@@ -10,7 +10,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: 16
 

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

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
 

package/lib/generators/monorepo/lerna/templates/workflow-publish.yml.ejs

@@ -16,7 +16,7 @@ jobs:
           token: ${{ secrets.GH_TOKEN }}
           fetch-depth: 0
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: 14
 
@@ -59,7 +59,7 @@ jobs:
           YARN_ENABLE_IMMUTABLE_INSTALLS: false
 <% if (publish) { -%>
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         if: |
           github.ref == 'refs/heads/main'
           && contains(github.event.inputs.dry-run, 'y') == false

package/lib/pob.js

@@ -7,6 +7,7 @@ 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 AppRemixGenerator from './generators/app/remix/AppRemixGenerator.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';
@@ -84,6 +85,11 @@ env.registerStub(
   'pob:app:nextjs',
   `${__dirname}/generators/app/nextjs/AppNextjsGenerator.js`,
 );
+env.registerStub(
+  AppRemixGenerator,
+  'pob:app:remix',
+  `${__dirname}/generators/app/nextjs/AppRemixGenerator.js`,
+);
 env.registerStub(
   CommonBabelGenerator,
   'pob:common:babel',
@@ -210,9 +216,12 @@ env.registerStub(
   `${__dirname}/generators/monorepo/typescript/MonorepoTypescriptGenerator.js`,
 );
 
-let monorepo = argv._[0] === 'lerna' || argv._[0] === 'monorepo';
-const action = monorepo ? argv._[1] : argv._[0];
 const projectPkg = readJson(path.resolve('./package.json'));
+let monorepo =
+  argv._[0] === 'lerna' ||
+  argv._[0] === 'monorepo' ||
+  !!(projectPkg && projectPkg.workspaces);
+const action = monorepo ? argv._[1] : argv._[0];
 
 if (action === 'add') {
   if (!projectPkg.workspaces) {

package/lib/utils/inLerna.js

@@ -23,7 +23,7 @@ const getInLernaThings = () => {
 
   return {
     rootMonorepoPkg,
-    lernaJsonPath,
+    lernaJsonPath: lernaJsonPath || path.resolve('lerna.json'),
     rootPath: rootMonorepo,
     root: rootMonorepo === cwd,
     rootPackageManager:
@@ -44,6 +44,9 @@ const getInLernaThings = () => {
   };
 };
 
-export default !(rootMonorepoPkg && (rootMonorepoPkg.lerna || !!lernaJsonPath))
+export default !(
+  rootMonorepoPkg &&
+  (rootMonorepoPkg.workspaces || rootMonorepoPkg.lerna || !!lernaJsonPath)
+)
   ? false
   : getInLernaThings();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pob",
-  "version": "10.4.0",
+  "version": "10.6.0",
   "description": "Pile of bones, library generator with git/babel/typescript/typedoc/readme/jest",
   "keywords": [
     "skeleton"
@@ -67,5 +67,5 @@
     "yeoman-environment": "^3.5.1",
     "yeoman-generator": "^5.4.0"
   },
-  "gitHead": "2e8a1622f20909fb5f9f6793ad85963bf094c23e"
+  "gitHead": "67aeeddf475269b9eb3d6319a8e128e7441695ec"
 }