Merge branch 'master' into dmsWork

Author: dhasani23

packages/amazonq/package.json

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

packages/core/package.json

@@ -5,7 +5,7 @@
     "license": "Apache-2.0",
     "engines": {
         "npm": "^10.1.0",
-        "vscode": "^1.68.0"
+        "vscode": "^1.83.0"
     },
     "exports": {
         ".": "./dist/src/extension.js",

packages/core/src/test/globalSetup.test.ts

@@ -25,10 +25,10 @@ import { disableAwsSdkWarning } from '../shared/awsClientBuilder'
 import { GlobalState } from '../shared/globalState'
 import { FeatureConfigProvider } from '../shared/featureConfig'
 import { mockFeatureConfigsData } from './fake/mockFeatureConfigData'
-import fs from 'node:fs/promises'
+import { fs } from '../shared'
+import { promises as nodefs } from 'fs' //eslint-disable-line no-restricted-imports
 
 disableAwsSdkWarning()
-
 const testReportDir = join(__dirname, '../../../../../.test-reports') // Root project, not subproject
 const testLogOutput = join(testReportDir, 'testLog.log')
 const globalSandbox = sinon.createSandbox()
@@ -42,10 +42,9 @@ let openExternalStub: sinon.SinonStub<Parameters<(typeof vscode)['env']['openExt
 export async function mochaGlobalSetup(extensionId: string) {
     return async function (this: Mocha.Runner) {
         // Clean up and set up test logs
-        try {
-            await fs.rm(testLogOutput)
-        } catch (e) {}
-        await fs.mkdir(testReportDir, { recursive: true })
+        // Use nodefs instead of our fs module (which uses globals.isWeb, which is not initialized yet).
+        await nodefs.rm(testLogOutput, { force: true })
+        await nodefs.mkdir(testReportDir, { recursive: true })
 
         sinon.stub(FeatureConfigProvider.prototype, 'listFeatureEvaluations').resolves({
             featureEvaluations: mockFeatureConfigsData,

packages/toolkit/package.json

@@ -53,7 +53,7 @@
     "browser": "./dist/src/extensionWeb",
     "engines": {
         "npm": "^10.1.0",
-        "vscode": "^1.68.0"
+        "vscode": "^1.83.0"
     },
     "scripts": {
         "vscode:prepublish": "npm run clean && npm run buildScripts && webpack --mode production",