fix(premerge): fix workspace plugin formatting, fix premerge checks (#…

…865) - [x] address eslint issues in the module-boundaries generator; - [x] revise conditional statements in the premerge job;
rfprod · Aug 28, 2024 · 621e034 · 621e034
1 parent 14bc508
commit 621e034
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 20 deletions.
diff --git a/.github/workflows/validate-pr.yml b/.github/workflows/validate-pr.yml
@@ -114,7 +114,7 @@ jobs:
     runs-on: ubuntu-latest
 
     strategy:
-      fail-fast: false
+      fail-fast: true
       max-parallel: 40
       matrix:
         projects: ${{ fromJSON(needs.checks.outputs.projects) }}
@@ -179,7 +179,7 @@ jobs:
     runs-on: ubuntu-latest
 
     strategy:
-      fail-fast: false
+      fail-fast: true
       max-parallel: 40
       matrix:
         projects: ${{ fromJSON(needs.checks.outputs.projects) }}
@@ -240,7 +240,7 @@ jobs:
     runs-on: ubuntu-latest
 
     strategy:
-      fail-fast: false
+      fail-fast: true
       max-parallel: 40
       matrix:
         projects: ${{ fromJSON(needs.checks.outputs.projects-build) }}
@@ -272,7 +272,7 @@ jobs:
     runs-on: ubuntu-latest
 
     strategy:
-      fail-fast: false
+      fail-fast: true
       max-parallel: 40
       matrix:
         projects: ${{ fromJSON(needs.checks.outputs.projects-build-storybook) }}
@@ -311,9 +311,9 @@ jobs:
         env:
           CHECKS_RESULT: ${{ needs.checks.outputs.success }}
           LINT_RESULT: ${{ needs.lint.outputs.success }}
-          LINT_AFFECTED_RESULT: ${{ needs.lint-affected.outputs.success || 'true' }}
+          LINT_AFFECTED_RESULT: ${{ needs.lint-affected.outputs.success || needs.checks.outputs.projects == '[]' }}
           TEST_RESULT: ${{ needs.test.outputs.success }}
-          TEST_AFFECTED_RESULT: ${{ needs.test-affected.outputs.success || 'true' }}
+          TEST_AFFECTED_RESULT: ${{ needs.test-affected.outputs.success || needs.checks.outputs.projects == '[]' }}
           BUILD_RESULT: ${{ needs.build.outputs.success }}
-          BUILD_AFFECTED_RESULT: ${{ needs.build-affected.outputs.success || 'true' }}
-          BUILD_AFFECTED_STORYBOOK_RESULT: ${{ needs.build-affected-storybook.outputs.success || 'true' }}
+          BUILD_AFFECTED_RESULT: ${{ needs.build-affected.outputs.success || needs.checks.outputs.projects-build == '[]' }}
+          BUILD_AFFECTED_STORYBOOK_RESULT: ${{ needs.build-affected-storybook.outputs.success || needs.checks.outputs.projects-build-storybook == '[]' }}
diff --git a/tools/workspace-plugin/.eslintrc.json b/tools/workspace-plugin/.eslintrc.json
@@ -13,10 +13,11 @@
       "files": ["module-boundaries.generator.ts"],
       "rules": {
         "@typescript-eslint/no-require-imports": "off",
+        "max-depth": ["error", 6],
         "max-lines-per-function": [
           "error",
           {
-            "max": 55,
+            "max": 59,
             "skipBlankLines": true,
             "skipComments": true
           }

diff --git a/tools/workspace-plugin/jest.config.ts b/tools/workspace-plugin/jest.config.ts
@@ -6,8 +6,8 @@ const config: Config.InitialOptions = {
     global: {
       branches: 24,
       functions: 55,
-      lines: 59,
-      statements: 59,
+      lines: 57,
+      statements: 57,
     },
   },
   displayName: 'workspace-plugin',

diff --git a/tools/workspace-plugin/src/generators/module-boundaries/module-boundaries.generator.ts b/tools/workspace-plugin/src/generators/module-boundaries/module-boundaries.generator.ts
@@ -26,9 +26,15 @@ const depConstraints = (configDir: string, verbose?: boolean) => {
   if (!configExists) {
     throw new Error(`The directory with the module boundary configurations does not exist: ${configDir}.`);
   }
-  verbose === true ? logger.log('configDir', configDir) : void 0;
+  if (verbose === true) {
+    logger.log('configDir', configDir);
+  }
+
   const configFiles = findFiles(configDir, '.js');
-  verbose === true ? logger.log('configFiles', configFiles) : void 0;
+  if (verbose === true) {
+    logger.log('configFiles', configFiles);
+  }
+
   const files = configFiles.stdout.length > 0 ? configFiles.stdout.split(' ') : [];
   const configs = files.map(file => {
     const config: {
@@ -75,7 +81,9 @@ const projectSourceRoots = (
     return accumulator;
   }, []);
 
-  verbose === true ? logger.log('scopes with constraints', scopes) : void 0;
+  if (verbose === true) {
+    logger.log('scopes with constraints', scopes);
+  }
 
   const projects = scopes.reduce((accumulator: ProjectConfiguration[], scope) => {
     const result = entries.find(entry => entry.tags?.includes(scope));
@@ -85,7 +93,9 @@ const projectSourceRoots = (
     return accumulator;
   }, []);
 
-  verbose === true ? logger.log('projects with constraints', projects) : void 0;
+  if (verbose === true) {
+    logger.log('projects with constraints', projects);
+  }
 
   const allBoundaryConfigs = constraints.reduce((accumulator: Array<TModuleBoundaryConfig['0'] & { file: string }>, item) => {
     const result = item.constraints.map(record => ({
@@ -96,7 +106,9 @@ const projectSourceRoots = (
     return accumulator;
   }, []);
 
-  verbose === true ? logger.log('all boundary configs', allBoundaryConfigs) : void 0;
+  if (verbose === true) {
+    logger.log('all boundary configs', allBoundaryConfigs);
+  }
 
   const sourceRoots = projects
     .map(project => ({
@@ -115,7 +127,9 @@ const projectSourceRoots = (
       return result;
     });
 
-  verbose === true ? logger.log('project source roots', sourceRoots) : void 0;
+  if (verbose === true) {
+    logger.log('project source roots', sourceRoots);
+  }
 
   return sourceRoots;
 };
@@ -128,7 +142,9 @@ export default async function (tree: Tree, schema: ISchematicContext) {
 
   const constraints = depConstraints(configDir);
 
-  schema.verbose === true ? logger.log('constraints', constraints) : void 0;
+  if (schema.verbose === true) {
+    logger.log('constraints', constraints);
+  }
 
   const sourceRoots = projectSourceRoots(tree, entries, constraints, schema.verbose);
 
@@ -146,13 +162,17 @@ export default async function (tree: Tree, schema: ISchematicContext) {
         const args = [src, '-type', 'f', '-name', '"*.ts"', '|', 'xargs', 'grep', `"${partialImportPath}"`, '--color=always'];
         try {
           execFileSync(cmd, args, { stdio: 'inherit', cwd: process.cwd(), env: process.env, shell: true });
-        } catch (e) {
+        } catch {
           const exception = {
             file: config.file,
             message: `The scope '${config.scope}' does not depend on the tag '${tag}'.`,
             sourceRoot: config.sourceRoot,
           };
-          schema.verbose === true ? logger.error(exception.message) : void 0;
+
+          if (schema.verbose === true) {
+            logger.error(exception.message);
+          }
+
           exceptions.push(exception);
         }
       }