Merge branch 'main' into json-rpc-middleware-12

.github/scripts/fitness-functions/common/constants.ts

@@ -7,7 +7,4 @@ enum AUTOMATION_TYPE {
   PRE_PUSH_HOOK = 'pre-push-hook',
 }
 
-// only allow TS and TSX files in the app directory only
-const APP_FOLDER_JS_REGEX = /^(app).*\.(js|jsx)$/;
-
-export { EXCLUDE_REGEX, APP_FOLDER_JS_REGEX, AUTOMATION_TYPE };
+export { EXCLUDE_REGEX, AUTOMATION_TYPE };

.github/scripts/fitness-functions/common/shared.ts

@@ -33,34 +33,6 @@ function filterDiffByFilePath(diff: string, regex: RegExp): string {
   return filteredDiff;
 }
 
-function restrictedFilePresent(diff: string, regex: RegExp): boolean {
-  // split by `diff --git` and remove the first element which is empty
-  const diffBlocks = diff.split(`diff --git`).slice(1);
-  let jsOrJsxFilePresent = false;
-  diffBlocks
-    .map((block) => block.trim())
-    .filter((block) => {
-      block
-        // get the first line of the block which has the paths
-        .split('\n')[0]
-        .trim()
-        // split the two paths
-        .split(' ')
-        // remove `a/` and `b/` from the paths
-        .map((path) => path.substring(2))
-        // if at least one of the two paths matches the regex, filter the
-        // corresponding diff block in
-        .forEach((path) => {
-          if (regex.test(path)) {
-            // Not excluded, include in check
-            jsOrJsxFilePresent = true;
-          }
-        });
-      return jsOrJsxFilePresent;
-    })
-  return jsOrJsxFilePresent;
-}
-
 // This function returns all lines that are additions to files that are being
 // modified but that previously already existed. Example:
 // diff --git a/test.js b/test.js
@@ -139,7 +111,6 @@ function hasNumberOfCodeBlocksIncreased(
 
 export {
   filterDiffByFilePath,
-  restrictedFilePresent,
   filterDiffFileCreations,
   filterDiffLineAdditions,
   hasNumberOfCodeBlocksIncreased,

.github/scripts/fitness-functions/rules/index.ts

@@ -1,4 +1,3 @@
-import { preventJavaScriptFileAdditions } from './javascript-additions';
 import { preventCodeBlocksRule } from './prevent-code-blocks';
 
 const RULES: IRule[] = [
@@ -7,11 +6,6 @@ const RULES: IRule[] = [
     fn: preventCodeBlocksRule,
     docURL: '[WIP] No documentation exists for this rule yet.',
   },
-  {
-    name: 'Check for js or jsx file being added',
-    fn: preventJavaScriptFileAdditions,
-    docURL: '[WIP] No documentation exists for this rule yet.',
-  },
 ];
 
 interface IRule {
@@ -38,5 +32,5 @@ function runFitnessFunctionRule(rule: IRule, diff: string): void {
   }
 }
 
-export { RULES, runFitnessFunctionRule, preventJavaScriptFileAdditions };
+export { RULES, runFitnessFunctionRule };
 export type { IRule };