merge in upstream changes

Author: Hweinstock

.eslintrc.js

@@ -206,8 +206,15 @@ module.exports = {
                         message:
                             'Avoid child_process, use ChildProcess from `shared/utilities/processUtils.ts` instead.',
                     },
+                    {
+                        name: '..',
+                        message:
+                            'Avoid importing from index.ts files as it can lead to circular dependencies. Import from the module directly instead.',
+                    },
                 ],
             },
         ],
+
+        'prettier/prettier': ['error', { endOfLine: 'auto' }],
     },
 }

.github/workflows/filterDuplicates.js

@@ -4,7 +4,7 @@
  * the program exits with an error and logs the filtered report to console.
  *
  * Usage:
- *      node filterDuplicates.js run [path_to_git_diff] [path_to_jscpd_report]
+ *      node filterDuplicates.js run [path_to_git_diff] [path_to_jscpd_report] [commit_hash] [repo_name]
  *
  * Tests:
  *      node filterDuplicates.js test
@@ -84,25 +84,40 @@ function filterDuplicates(report, changes) {
     return duplicates
 }
 
+function formatDuplicates(duplicates, commitHash, repoName) {
+    const baseUrl = `https://github.com/${repoName}`
+    return duplicates.map((dupe) => {
+        return {
+            first: formUrl(dupe.firstFile, commitHash),
+            second: formUrl(dupe.secondFile, commitHash),
+            numberOfLines: dupe.lines,
+        }
+    })
+    function formUrl(file, commitHash) {
+        return `${baseUrl}/blob/${commitHash}/${file.name}#L${file.start}-L${file.end}`
+    }
+}
+
 async function run() {
     const rawDiffPath = process.argv[3]
     const jscpdReportPath = process.argv[4]
+    const commitHash = process.argv[5]
+    const repoName = process.argv[6]
     const changes = await parseDiff(rawDiffPath)
     const jscpdReport = JSON.parse(await fs.readFile(jscpdReportPath, 'utf8'))
     const filteredDuplicates = filterDuplicates(jscpdReport, changes)
 
     console.log('%s files changes', changes.size)
     console.log('%s duplicates found', filteredDuplicates.length)
     if (filteredDuplicates.length > 0) {
-        console.log(filteredDuplicates)
+        console.log(formatDuplicates(filteredDuplicates, commitHash, repoName))
         process.exit(1)
     }
 }
 
 /**
  * Mini-test Suite
  */
-console.log(__dirname)
 const testDiffFile = path.resolve(__dirname, 'test/test_diff.txt')
 let testCounter = 0
 function assertEqual(actual, expected) {

.github/workflows/node.js.yml

@@ -101,7 +101,10 @@ jobs:
                   path: ./jscpd-report.json
 
             - name: Check for Duplicates
-              run: node "$GITHUB_WORKSPACE/.github/workflows/filterDuplicates.js" run diff_output.txt jscpd-report.json
+              env:
+                  COMMIT_HASH: ${{ github.sha}}
+                  REPO_NAME: ${{ github.repository }}
+              run: node "$GITHUB_WORKSPACE/.github/workflows/filterDuplicates.js" run diff_output.txt jscpd-report.json $COMMIT_HASH $REPO_NAME
 
     macos:
         needs: lint-commits

package-lock.json

@@ -0,0 +1,58 @@
+{
+	"date": "2025-01-09",
+	"version": "1.42.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q /doc: Improve button text phrasing"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q /dev: Fix issue when files are deleted while preparing context"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Code Transformation: allow POSTGRESQL as target DB for SQL conversions"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Fix context menu displaying when typing @, even though input is disallowed"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q can update mvn and gradle build files"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "/transform: use correct documentation link in SQL conversion help message"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Up/down history navigation only triggering on first/last line of prompt input"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q /test: Fix to redirect /test to generate tests in chat for external files out of workspace scope."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "/review: Code block extends beyond page margins in code issue detail view"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Code Transformation: retry project upload up to 3 times"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q Code Transformation: add view summary button in chat"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q: new code syntax highlighter for improved accuracy"
+		},
+		{
+			"type": "Removal",
+			"description": "Settings: No longer migrate old CodeWhisperer settings or initialize telemetry setting from AWS Toolkit."
+		}
+	]
+}

packages/amazonq/.changes/1.42.0.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Fix inline completion supplementalContext length exceeding maximum in certain cases"
+}

packages/amazonq/.changes/next-release/Bug Fix-525ae1a7-9ded-4bd1-8357-0a4c0e7fe33f.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "User-selected customizations are sometimes not being persisted."
+}