Merge master into feature/emr

Author: aws-toolkit-automation

packages/amazonq/.changes/next-release/Bug Fix-5f545950-eae0-4ee9-bb41-3c0ac9b7dcb1.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q /dev not adding Dockerfiles in nested folders"
+}

packages/core/src/shared/filetypes.ts

@@ -348,16 +348,11 @@ export const codefileExtensions = new Set([
     '.zig',
 ])
 
-// Some well-known code files without an extension
-export const wellKnownCodeFiles = new Set(['Dockerfile', 'Dockerfile.build'])
+// Code file names without an extension
+export const codefileNames = new Set(['Dockerfile', 'Dockerfile.build'])
 
 /** Returns true if `filename` is a code file. */
 export function isCodeFile(filename: string): boolean {
-    if (codefileExtensions.has(path.extname(filename).toLowerCase())) {
-        return true
-    } else if (wellKnownCodeFiles.has(filename)) {
-        return true
-    } else {
-        return false
-    }
+    const ext = path.extname(filename).toLowerCase()
+    return codefileExtensions.has(ext) || codefileNames.has(path.basename(filename))
 }