Clean up and refactor some constants

Author: bendvc

packages/pwa-kit-extension-sdk/src/configs/webpack/overrides-resolver-loader.ts

@@ -11,7 +11,7 @@ import path from 'path'
 import resolve from 'resolve'
 
 // Local Imports
-import {buildCandidatePaths, getPackageName} from '../../shared/utils'
+import {buildCandidatePaths, getPackageName, SETUP_FILE_REGEX} from '../../shared/utils'
 
 // Types
 import type {ExtendedCompiler} from './types'
@@ -23,6 +23,12 @@ const OVERRIDABLE_FILE_NAME = '.force_overrides'
 const REQUIRES_REGEX = /require\(['"](\..*?)['"]\)/g
 const SRC = 'src'
 
+// Cache for processed overrides
+const OVERRIDABLE_CACHE = {
+    node: [] as string[],
+    web: [] as string[]
+}
+
 /**
  * Webpack loader to override the resolution of a module based on the PWA-Kit applications
  * extension configuration.
@@ -118,11 +124,6 @@ const OverrideResolverLoader = function (this: LoaderContext<any>) {
     })
 }
 
-const OVERRIDABLE_CACHE = {
-    node: [] as string[],
-    web: [] as string[]
-}
-
 /**
  * 
  * @param {*} source 
@@ -133,13 +134,14 @@ const validateOverrideSource = (source: string, options: any = {}) => {
     const {target = 'node', overridables = []} = options
     const isMonoRepo = true
     const isExtensionFile = source.includes(`${path.sep}${EXTENSION_PACKAGE_PREFIX}`)
+    const isSetupFile = SETUP_FILE_REGEX.test(source)
     const targetCache = OVERRIDABLE_CACHE[target as keyof typeof OVERRIDABLE_CACHE]
 
     // Exit early if we have:
     // 1. Processed this file already.
     // 2. The file is not an extension file.
-    // 3. TBD - The file is in the disallowed list.
-    if (targetCache.includes(source) || !isExtensionFile) {
+    // 3. The file is an extension setup file.
+    if (targetCache.includes(source) || !isExtensionFile || isSetupFile) {
         return false
     }
 

packages/pwa-kit-extension-sdk/src/shared/utils/extensibility.ts

@@ -20,9 +20,10 @@ import {
 import {expand} from './index'
 
 // CONSTANTS
-// const REACT_EXTENSIBILITY_FILE = 'setup-app'
-// const EXPRESS_EXTENSIBILITY_FILE = 'setup-server'
-// const SUPPORTED_FILE_TYPES = ['.ts', '.js']
+export const REACT_SETUP_FILE = 'setup-app'
+export const EXPRESS_SETUP_FILE = 'setup-server'
+export const SUPPORTED_FILE_TYPES = ['ts', 'js', 'tsx', 'jsx']
+export const SETUP_FILE_REGEX = new RegExp(`(${REACT_SETUP_FILE}|${EXPRESS_SETUP_FILE})\.(${SUPPORTED_FILE_TYPES.join('|')})$`, 'i')
 
 // TODO: Update this block comment.
 /**