Merge branch 'master' into pTests/registerNewFiles

Author: Hweinstock

.eslintrc.js

@@ -173,13 +173,15 @@ module.exports = {
                             "Avoid importing from the core lib's dist/ folders; please use directly from the core lib defined exports.",
                     },
                 ],
+                // The following will place an error on the `fs-extra` import since we do not want it to be used for browser compatibility reasons.
+                paths: [
+                    {
+                        name: 'fs-extra',
+                        message:
+                            'Avoid fs-extra, use shared/fs/fs.ts. Notify the Toolkit team if your required functionality is not available.',
+                    },
+                ],
             },
-            // The following will place an error on the `fs-extra` import since we do not want it to be used for browser compatibility reasons.
-            // {
-            //     name: 'fs-extra',
-            //     message:
-            //         'Avoid fs-extra, use shared/fs/fs.ts. Notify the Toolkit team if your required functionality is not available.',
-            // },
         ],
     },
 }

docs/vscode_behaviors.md

@@ -12,10 +12,10 @@ for each extension.
 -   The Extension Host process has at most 5 seconds to shut down, after which it will exit. [1]
 -   The vscode API will be unreliable at deactivation time. So certain VSC APIs like the filesystem may not work. [1]
     -   The VSC Filesystem API has been confirmed to not work
-- In `Run & Debug` mode, closing the Debug IDE instance behaves differently depending on how it is closed
-    - The regular close button in the Debug IDE instance results in a graceful shutdown
-    - The red square in the root IDE instance to stop the debugging session results on a non-graceful shutdown, meaning `deactivate()` is not run.
-- `Reload Window` triggers `deactivate()`
+-   In `Run & Debug` mode, closing the Debug IDE instance behaves differently depending on how it is closed
+    -   The regular close button in the Debug IDE instance results in a graceful shutdown
+    -   The red square in the root IDE instance to stop the debugging session results on a non-graceful shutdown, meaning `deactivate()` is not run.
+-   `Reload Window` triggers `deactivate()`
 
 Sources:
 
@@ -25,8 +25,7 @@ Sources:
 ## State (`globalState`, `Memento`)
 
 TODO:
-- How it behaves between remote (ssh) and local
-- How it is not completely reliable. Reads/writes have no guarantee to work (though we are fine in most cases)
-- How it can break as observed with crash monitoring work. At a certain point writes were seemingly succeeding, but did not actually propagate to all IDE instances.
-
 
+-   How it behaves between remote (ssh) and local
+-   How it is not completely reliable. Reads/writes have no guarantee to work (though we are fine in most cases)
+-   How it can break as observed with crash monitoring work. At a certain point writes were seemingly succeeding, but did not actually propagate to all IDE instances.

package-lock.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q extension may fail to start if AWS Toolkit extension fails to start"
+}

packages/amazonq/.changes/next-release/Bug Fix-3f76aff8-1622-4647-aafe-3210cf0c3b74.json

@@ -0,0 +1,4 @@
+{
+	"type": "Removal",
+	"description": "Minimum required VSCode version is now 1.83"
+}

packages/amazonq/.changes/next-release/Removal-c259464a-0437-47e6-be6c-8df023ad477c.json

@@ -1046,6 +1046,6 @@
     },
     "engines": {
         "npm": "^10.1.0",
-        "vscode": "^1.68.0"
+        "vscode": "^1.83.0"
     }
 }

packages/amazonq/package.json

@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+/* eslint-disable no-restricted-imports */
 import * as fs from 'fs-extra'
 import * as path from 'path'
 

packages/amazonq/scripts/build/copyFiles.ts

@@ -36,7 +36,7 @@ describe('HumanInTheLoopManager', async function () {
         )
         const outputPathResult = path.join(outputDirectoryPath, 'pom.xml')
         assertEqualPaths(newPomFilePath.fsPath, outputPathResult)
-        const newPomFileContents = await fs.readFileAsString(newPomFilePath.path)
+        const newPomFileContents = await fs.readFileText(newPomFilePath.path)
         assert.strictEqual(
             stripStringWhitespace(newPomFileContents),
             stripStringWhitespace(`<?xml version="1.0" encoding="UTF-8"?>

packages/amazonq/test/unit/amazonqGumby/humanInTheLoopManager.test.ts

@@ -4,11 +4,11 @@
  */
 import assert from 'assert'
 import sinon from 'sinon'
-import fs from 'fs-extra'
 import os from 'os'
 import { DiffModel, AddedChangeNode, ModifiedChangeNode } from 'aws-core-vscode/codewhisperer/node'
 import path from 'path'
 import { getTestResourceFilePath } from './amazonQGumbyUtil'
+import { fs } from 'aws-core-vscode/shared'
 
 describe('DiffModel', function () {
     afterEach(() => {
@@ -20,7 +20,7 @@ describe('DiffModel', function () {
 
         const workspacePath = 'workspace'
 
-        sinon.replace(fs, 'existsSync', (path) => {
+        sinon.replace(fs, 'exists', async (path) => {
             const pathStr = path.toString()
             if (pathStr.includes(workspacePath)) {
                 return false
@@ -42,9 +42,9 @@ describe('DiffModel', function () {
 
         const workspacePath = os.tmpdir()
 
-        sinon.replace(fs, 'existsSync', (path) => true)
+        sinon.replace(fs, 'exists', async (path) => true)
 
-        fs.writeFileSync(
+        await fs.writeFile(
             path.join(workspacePath, 'README.md'),
             'This guide walks you through using Gradle to build a simple Java project.'
         )
@@ -56,6 +56,6 @@ describe('DiffModel', function () {
 
         assert.strictEqual(change instanceof ModifiedChangeNode, true)
 
-        fs.rmSync(path.join(workspacePath, 'README.md'))
+        await fs.delete(path.join(workspacePath, 'README.md'), { recursive: true })
     })
 })

packages/amazonq/test/unit/amazonqGumby/transformationResultsHandler.test.ts

@@ -23,7 +23,7 @@ describe('package validations', function () {
      */
     it('has synced contributes.icons with core/package.json', async function () {
         const corePackageJson = JSON.parse(
-            await fs.readFileAsString(path.resolve(__dirname, '../../../../core/package.json'))
+            await fs.readFileText(path.resolve(__dirname, '../../../../core/package.json'))
         )
         assert.deepStrictEqual(packageJson.contributes.icons, corePackageJson.contributes.icons)
     })