revert changes on some files

Author: Hweinstock

packages/amazonq/scripts/build/copyFiles.ts

@@ -3,7 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { fs } from 'aws-core-vscode/shared'
+/* eslint-disable no-restricted-imports */
+import * as fs from 'fs-extra'
 import * as path from 'path'
 
 // Moves all dependencies into `dist`
@@ -77,7 +78,11 @@ async function copy(task: CopyTask): Promise<void> {
     const dst = path.resolve(outRoot, task.destination ?? task.target)
 
     try {
-        await fs.copy(src, dst)
+        await fs.copy(src, dst, {
+            recursive: true,
+            overwrite: true,
+            errorOnExist: false,
+        })
     } catch (error) {
         throw new Error(`Copy "${src}" to "${dst}" failed: ${error instanceof Error ? error.message : error}`)
     }

packages/core/scripts/build/copyFiles.ts

@@ -3,8 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+/* eslint-disable no-restricted-imports */
+import * as fs from 'fs-extra'
 import * as path from 'path'
-import { fs } from '../../src/shared'
 
 // Moves all dependencies into `dist`
 
@@ -50,7 +51,11 @@ async function copy(task: CopyTask): Promise<void> {
     const dst = path.resolve(outRoot, task.destination ?? task.target)
 
     try {
-        await fs.copy(src, dst)
+        await fs.copy(src, dst, {
+            recursive: true,
+            overwrite: true,
+            errorOnExist: false,
+        })
     } catch (error) {
         throw new Error(`Copy "${src}" to "${dst}" failed: ${error instanceof Error ? error.message : error}`)
     }

packages/core/scripts/build/generateServiceClient.ts

@@ -3,9 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+/* eslint-disable no-restricted-imports */
 import * as proc from 'child_process'
+import * as fs from 'fs-extra'
 import * as path from 'path'
-import { fs } from '../../src/shared'
 
 const repoRoot = path.join(process.cwd(), '../../') // root/packages/toolkit -> root/
 /**
@@ -32,17 +33,17 @@ async function generateServiceClients(serviceClientDefinitions: ServiceClientDef
 }
 
 /** When cloning aws-sdk-js, we want to pull the version actually used in package-lock.json. */
-async function getJsSdkVersion(): Promise<string> {
-    const json = (await fs.readFileBytes(path.resolve(repoRoot, 'package-lock.json'))).toString()
+function getJsSdkVersion(): string {
+    const json = fs.readFileSync(path.resolve(repoRoot, 'package-lock.json')).toString()
     const packageLock = JSON.parse(json)
 
     return packageLock['packages']['node_modules/aws-sdk']['version']
 }
 
 async function cloneJsSdk(dir: string): Promise<void> {
     // Output stderr while it clones so it doesn't look frozen
-    return new Promise<void>(async (resolve, reject) => {
-        const sdkversion = await getJsSdkVersion()
+    return new Promise<void>((resolve, reject) => {
+        const sdkversion = getJsSdkVersion()
         if (!sdkversion) {
             throw new Error('failed to get sdk version from package-lock.json')
         }
@@ -106,17 +107,17 @@ async function insertServiceClientsIntoJsSdk(
     jsSdkPath: string,
     serviceClientDefinitions: ServiceClientDefinition[]
 ): Promise<void> {
-    for (const serviceClientDefinition of serviceClientDefinitions) {
-        const apiVersion = await getApiVersion(serviceClientDefinition.serviceJsonPath)
+    serviceClientDefinitions.forEach((serviceClientDefinition) => {
+        const apiVersion = getApiVersion(serviceClientDefinition.serviceJsonPath)
 
         // Copy the Service Json into the JS SDK for generation
         const jsSdkServiceJsonPath = path.join(
             jsSdkPath,
             'apis',
             `${serviceClientDefinition.serviceName.toLowerCase()}-${apiVersion}.normal.json`
         )
-        await fs.copy(serviceClientDefinition.serviceJsonPath, jsSdkServiceJsonPath)
-    }
+        fs.copyFileSync(serviceClientDefinition.serviceJsonPath, jsSdkServiceJsonPath)
+    })
 
     const apiMetadataPath = path.join(jsSdkPath, 'apis', 'metadata.json')
     await patchServicesIntoApiMetadata(
@@ -131,8 +132,8 @@ interface ServiceJsonSchema {
     }
 }
 
-async function getApiVersion(serviceJsonPath: string): Promise<string> {
-    const json = (await fs.readFileBytes(serviceJsonPath)).toString()
+function getApiVersion(serviceJsonPath: string): string {
+    const json = fs.readFileSync(serviceJsonPath).toString()
     const serviceJson = JSON.parse(json) as ServiceJsonSchema
 
     return serviceJson.metadata.apiVersion
@@ -148,14 +149,14 @@ interface ApiMetadata {
 async function patchServicesIntoApiMetadata(apiMetadataPath: string, serviceNames: string[]): Promise<void> {
     console.log(`Patching services (${serviceNames.join(', ')}) into API Metadata...`)
 
-    const apiMetadataJson = (await fs.readFileBytes(apiMetadataPath)).toString()
+    const apiMetadataJson = fs.readFileSync(apiMetadataPath).toString()
     const apiMetadata = JSON.parse(apiMetadataJson) as ApiMetadata
 
     serviceNames.forEach((serviceName) => {
         apiMetadata[serviceName.toLowerCase()] = { name: serviceName }
     })
 
-    await fs.writeFile(apiMetadataPath, JSON.stringify(apiMetadata, undefined, 4))
+    fs.writeFileSync(apiMetadataPath, JSON.stringify(apiMetadata, undefined, 4))
 }
 
 /**
@@ -197,7 +198,7 @@ async function integrateServiceClient(repoPath: string, serviceJsonPath: string,
 
     console.log(`Integrating ${typingsFilename} ...`)
 
-    await fs.copy(sourceClientPath, destinationClientPath)
+    fs.copyFileSync(sourceClientPath, destinationClientPath)
 
     await sanitizeServiceClient(destinationClientPath)
 }
@@ -208,7 +209,7 @@ async function integrateServiceClient(repoPath: string, serviceJsonPath: string,
 async function sanitizeServiceClient(generatedClientPath: string): Promise<void> {
     console.log('Altering Service Client to fit the codebase...')
 
-    let fileContents = (await fs.readFileBytes(generatedClientPath)).toString()
+    let fileContents = fs.readFileSync(generatedClientPath).toString()
 
     // Add a header stating the file is autogenerated
     fileContents = `
@@ -222,7 +223,7 @@ ${fileContents}
 
     fileContents = fileContents.replace(/(import .* from.*)\.\.(.*)/g, '$1aws-sdk$2')
 
-    await fs.writeFile(generatedClientPath, fileContents)
+    fs.writeFileSync(generatedClientPath, fileContents)
 }
 
 // ---------------------------------------------------------------------------------------------------------------------

packages/toolkit/scripts/build/copyFiles.ts

@@ -3,7 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { fs } from 'aws-core-vscode/shared'
+/* eslint-disable no-restricted-imports */
+import * as fs from 'fs-extra'
 import * as path from 'path'
 
 // Copies various dependencies into "dist/".
@@ -104,7 +105,11 @@ async function copy(task: CopyTask): Promise<void> {
     const dst = path.resolve(outRoot, task.destination ?? task.target)
 
     try {
-        await fs.copy(src, dst)
+        await fs.copy(src, dst, {
+            recursive: true,
+            overwrite: true,
+            errorOnExist: false,
+        })
     } catch (error) {
         throw new Error(`Copy "${src}" to "${dst}" failed: ${error instanceof Error ? error.message : error}`)
     }

scripts/generateIcons.ts

@@ -5,16 +5,15 @@
 
 import webfont from 'webfont'
 import * as path from 'path'
-import * as nodefs from 'fs'
-import fs from '../packages/core/dist/src/shared/fs/fs'
+import * as fs from 'fs-extra'
 
 const fontId = 'aws-toolkit-icons'
 const projectDir = process.cwd() // root/packages/toolkit
 const rootDir = path.join(projectDir, '../..') // root/
 const iconsDir = path.join(projectDir, 'resources', 'icons')
 const fontsDir = path.join(projectDir, 'resources', 'fonts')
 const stylesheetsDir = path.join(projectDir, 'resources', 'css')
-const packageJson = JSON.parse(nodefs.readFileSync(path.join(projectDir, 'package.json'), { encoding: 'utf-8' }))
+const packageJson = JSON.parse(fs.readFileSync(path.join(projectDir, 'package.json'), { encoding: 'utf-8' }))
 const iconSources = [
     // Paths relative to packages/toolkit
     `resources/icons/**/*.svg`,
@@ -83,14 +82,14 @@ async function generateCloud9Icons(targets: { name: string; path: string }[], de
     console.log('Generating icons for Cloud9')
 
     async function replaceColor(file: string, color: string, dst: string): Promise<void> {
-        const contents = await fs.readFileText(file)
+        const contents = await fs.readFile(file, 'utf-8')
         const replaced = contents.replace(/currentColor/g, color)
         await fs.writeFile(dst, replaced)
     }
 
     for (const [theme, color] of Object.entries(themes)) {
         const themeDest = path.join(destination, theme)
-        await fs.mkdir(themeDest)
+        await fs.mkdirp(themeDest)
         await Promise.all(targets.map((t) => replaceColor(t.path, color, path.join(themeDest, `${t.name}.svg`))))
     }
 }
@@ -170,10 +169,8 @@ ${result.template}
     const cloud9Dest = path.join(iconsDir, 'cloud9', 'generated')
     const isValidIcon = (i: (typeof icons)[number]): i is Required<typeof i> => i.data !== undefined
 
-    await fs.mkdir(fontsDir)
-    if (result.woff) {
-        await fs.writeFile(dest, result.woff)
-    }
+    await fs.mkdirp(fontsDir)
+    await fs.writeFile(dest, result.woff)
     await fs.writeFile(stylesheetPath, template)
     await updatePackage(
         `./${relativeDest}`,
@@ -198,14 +195,14 @@ class GeneratedFilesManifest {
     public async emit(dir: string): Promise<void> {
         const dest = path.join(dir, 'generated.buildinfo')
         const data = JSON.stringify(this.files, undefined, 4)
-        await fs.mkdir(dir)
+        await fs.mkdirp(dir)
         await fs.writeFile(dest, data)
     }
 }
 
 async function loadCodiconMappings(): Promise<Record<string, number | undefined>> {
     const codicons = path.join(rootDir, 'node_modules', '@vscode', 'codicons', 'src')
-    const data = JSON.parse(await fs.readFileText(path.join(codicons, 'template', 'mapping.json')))
+    const data = JSON.parse(await fs.readFile(path.join(codicons, 'template', 'mapping.json'), 'utf-8'))
     const mappings: Record<string, number | undefined> = {}
     for (const [k, v] of Object.entries(data)) {
         if (typeof k === 'string' && typeof v === 'number') {