pob 15.0.3 → 15.2.0

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

@@ -116,11 +116,13 @@ export default class CommonLintGenerator extends Generator {
   writing() {
     const pkg = this.fs.readJSON(this.destinationPath('package.json'));
     const babelEnvs = (pkg.pob && pkg.pob.babelEnvs) || [];
+    // const typescriptTargets = (pkg.pob && pkg.pob.typescriptTargets) || [];
     const useBabel =
       this.options.babel !== 'undefined'
         ? this.options.babel === 'true'
         : babelEnvs.length > 0;
-    const hasReact = useBabel && packageUtils.hasReact(pkg);
+    const useTypescript = useBabel || pkg.pob?.typescript;
+    const hasReact = useTypescript && packageUtils.hasReact(pkg);
     const useNode = !useBabel || babelEnvs.some((env) => env.target === 'node');
     const useNodeOnly =
       !useBabel ||
@@ -310,12 +312,12 @@ export default class CommonLintGenerator extends Generator {
             ['@typescript-eslint/eslint-plugin', '@typescript-eslint/parser'],
           );
         } else {
-          packageUtils.addOrRemoveDevDependencies(pkg, useBabel, [
+          packageUtils.addOrRemoveDevDependencies(pkg, useTypescript, [
             '@pob/eslint-config-typescript',
           ]);
           packageUtils.addOrRemoveDevDependencies(
             pkg,
-            useBabel && shouldHavePluginsDependencies,
+            useTypescript && shouldHavePluginsDependencies,
             ['@typescript-eslint/eslint-plugin', '@typescript-eslint/parser'],
           );
 
@@ -363,10 +365,13 @@ export default class CommonLintGenerator extends Generator {
         ];
       }
 
-      if (useBabel) {
+      if (useTypescript) {
         return [
           '@pob/eslint-config-typescript',
           useNodeOnly && '@pob/eslint-config-typescript/node',
+          // useTypescript &&
+          //   pkg.pob?.rollup === false &&
+          //   '@pob/eslint-config-typescript/tsc-emit',
           this.options.isApp && '@pob/eslint-config-typescript/app',
           hasReact &&
             `@pob/eslint-config-typescript-react${
@@ -382,7 +387,7 @@ export default class CommonLintGenerator extends Generator {
       ];
     })();
 
-    const ext = !useBabel
+    const ext = !useTypescript
       ? `{${pkg.type === 'commonjs' ? 'mjs' : 'cjs'},js}`
       : `${hasReact ? '{ts,tsx}' : 'ts'}`;
 
@@ -405,7 +410,7 @@ export default class CommonLintGenerator extends Generator {
       //   testsOverride.extends = ['pob/babel'];
       // }
 
-      if (useBabel) {
+      if (useTypescript) {
         testsOverride.extends = ['@pob/eslint-config-typescript/test'];
       }
     }
@@ -423,19 +428,14 @@ export default class CommonLintGenerator extends Generator {
       ? this.destinationPath('.eslintrc.json')
       : this.destinationPath(
           `${
-            useBabel ? `${this.options.srcDirectory}/` : 'lib/'
+            useTypescript ? `${this.options.srcDirectory}/` : 'lib/'
           }.eslintrc.json`,
         );
 
-    const useTypescript = useBabel;
     const getRootIgnorePatterns = () => {
       const ignorePatterns = new Set();
 
-      if (
-        inMonorepo &&
-        !inMonorepo.root &&
-        (this.options.typescript || pkg.types)
-      ) {
+      if (inMonorepo && !inMonorepo.root && (useTypescript || pkg.types)) {
         ignorePatterns.add('*.d.ts');
       }
 
@@ -443,7 +443,7 @@ export default class CommonLintGenerator extends Generator {
         ignorePatterns.add('/docs');
       }
 
-      if ((!inMonorepo || !inMonorepo.root) && useBabel) {
+      if ((!inMonorepo || !inMonorepo.root) && useTypescript) {
         const buildPath = `/${this.options.buildDirectory}`;
         if (
           !this.options.rootIgnorePaths ||
@@ -517,7 +517,7 @@ export default class CommonLintGenerator extends Generator {
           {
             extendsConfig: extendsConfigSrc,
             testsOverride,
-            useTypescript: useBabel,
+            useTypescript,
             globalEslint,
             ignorePatterns:
               ignorePatterns.size === 0 ? undefined : [...ignorePatterns],

package/lib/generators/common/release/CommonReleaseGenerator.js

@@ -24,6 +24,12 @@ export default class CommonReleaseGenerator extends Generator {
       desc: 'Babel enabled.',
     });
 
+    this.option('withTypescript', {
+      type: Boolean,
+      required: false,
+      default: undefined,
+      desc: 'Typescript enabled.',
+    });
     this.option('isMonorepo', {
       type: Boolean,
       default: false,
@@ -100,7 +106,8 @@ export default class CommonReleaseGenerator extends Generator {
       packageUtils.addScripts(pkg, {
         preversion: [
           'yarn run lint',
-          this.options.withBabel && 'yarn run build',
+          this.options.withBabel ||
+            (this.options.withTypescript && 'yarn run build'),
           'repository-check-dirty',
         ]
           .filter(Boolean)

package/lib/generators/common/testing/CommonTestingGenerator.js

@@ -83,6 +83,12 @@ export default class CommonTestingGenerator extends Generator {
       desc: 'is app',
     });
 
+    this.option('e2eTesting', {
+      type: String,
+      default: '',
+      desc: 'e2e testing package path',
+    });
+
     this.option('splitCIJobs', {
       type: Boolean,
       required: true,
@@ -109,14 +115,15 @@ export default class CommonTestingGenerator extends Generator {
     });
   }
 
-  default() {
+  async default() {
     if (!inMonorepo || inMonorepo.root) {
-      this.composeWith('pob:core:ci', {
+      await this.composeWith('pob:core:ci', {
         enable: this.options.ci,
         enableReleasePlease: this.options.enableReleasePlease,
         enableYarnVersion: this.options.enableYarnVersion,
         disableYarnGitCache: this.options.disableYarnGitCache,
         testing: this.options.enable,
+        e2eTesting: this.options.e2eTesting,
         build: this.options.build,
         typescript: this.options.typescript,
         documentation: this.options.documentation,
@@ -127,7 +134,7 @@ export default class CommonTestingGenerator extends Generator {
         onlyLatestLTS: this.options.onlyLatestLTS,
       });
     } else {
-      this.composeWith('pob:core:ci', {
+      await this.composeWith('pob:core:ci', {
         enable: false,
       });
     }
@@ -156,8 +163,9 @@ export default class CommonTestingGenerator extends Generator {
       this.options.monorepo
       ? yoConfigPobMonorepo.typescript
       : packageUtils.transpileWithBabel(pkg);
+    const withTypescript = transpileWithBabel || pkg.pob?.typescript;
     let hasReact =
-      transpileWithBabel &&
+      withTypescript &&
       (this.options.monorepo
         ? yoConfigPobMonorepo.react ?? packageUtils.hasReact(pkg)
         : packageUtils.hasReact(pkg));
@@ -285,6 +293,7 @@ export default class CommonTestingGenerator extends Generator {
       } else {
         const babelEnvs = pkg.pob?.babelEnvs || [];
         const transpileWithBabel = packageUtils.transpileWithBabel(pkg);
+        const withTypescript = babelEnvs.length > 0 || pkg.pob?.typescript;
 
         const shouldUseExperimentalVmModules =
           pkg.type === 'module' && !inMonorepo;
@@ -308,9 +317,10 @@ export default class CommonTestingGenerator extends Generator {
         });
 
         if (this.options.runner === 'jest') {
-          const srcDirectory = transpileWithBabel
-            ? this.options.srcDirectory
-            : 'lib';
+          const srcDirectory =
+            transpileWithBabel || withTypescript
+              ? this.options.srcDirectory
+              : 'lib';
 
           const jestConfig = this.fs.readJSON(jestConfigPath, pkg.jest ?? {});
           delete pkg.jest;
@@ -318,20 +328,20 @@ export default class CommonTestingGenerator extends Generator {
             cacheDirectory: './node_modules/.cache/jest',
             testMatch: [
               `<rootDir>/${srcDirectory}/**/__tests__/**/*.${
-                transpileWithBabel ? 'ts' : '?(m)js'
+                withTypescript ? 'ts' : '?(m)js'
               }${hasReact ? '?(x)' : ''}`,
               `<rootDir>/${srcDirectory}/**/*.test.${
-                transpileWithBabel ? 'ts' : '?(m)js'
+                withTypescript ? 'ts' : '?(m)js'
               }${hasReact ? '?(x)' : ''}`,
             ],
             collectCoverageFrom: [
-              `${srcDirectory}/**/*.${transpileWithBabel ? 'ts' : '?(m)js'}${
+              `${srcDirectory}/**/*.${withTypescript ? 'ts' : '?(m)js'}${
                 hasReact ? '?(x)' : ''
               }`,
             ],
             moduleFileExtensions: [
-              transpileWithBabel && 'ts',
-              transpileWithBabel && hasReact && 'tsx',
+              withTypescript && 'ts',
+              withTypescript && hasReact && 'tsx',
               'js',
               // 'jsx',
               'json',
@@ -369,8 +379,8 @@ export default class CommonTestingGenerator extends Generator {
 
           if (shouldUseExperimentalVmModules) {
             jestConfig.extensionsToTreatAsEsm = [
-              transpileWithBabel && '.ts',
-              transpileWithBabel && hasReact && '.tsx',
+              withTypescript && '.ts',
+              withTypescript && hasReact && '.tsx',
             ].filter(Boolean);
           } else {
             delete jestConfig.extensionsToTreatAsEsm;