chore: vscode "organize imports" + change ObjectMap => Record (#8815)

Author: mmaietta

.changeset/forty-rabbits-admire.md

@@ -0,0 +1,11 @@
+---
+"app-builder-lib": patch
+"builder-util": patch
+"builder-util-runtime": patch
+"dmg-builder": patch
+"electron-builder": patch
+"electron-builder-squirrel-windows": patch
+"electron-publish": patch
+---
+
+chore: "organize imports" + change `ObjectMap` => `Record` for non-external properties (i.e. things that don't get processed for `scheme.json`)

packages/app-builder-lib/src/Framework.ts

@@ -1,6 +1,6 @@
 import { FileTransformer } from "builder-util"
 import { AsarIntegrity } from "./asar/integrity"
-import { Platform, PlatformPackager, ElectronPlatformName, AfterPackContext } from "./index"
+import { AfterPackContext, ElectronPlatformName, Platform, PlatformPackager } from "./index"
 
 export interface Framework {
   readonly name: string

packages/app-builder-lib/src/ProtonFramework.ts

@@ -1,4 +1,4 @@
-import { log, FileTransformer } from "builder-util"
+import { FileTransformer, log } from "builder-util"
 import { safeStringifyJson } from "builder-util-runtime"
 import { Platform } from "./core"
 import { NODE_MODULES_PATTERN } from "./fileTransformer"

packages/app-builder-lib/src/appInfo.ts

@@ -1,10 +1,10 @@
 import { isEmptyOrSpaces, log } from "builder-util"
+import { Nullish } from "builder-util-runtime"
+import { sanitizeFileName } from "builder-util/out/filename"
 import { prerelease } from "semver"
 import { PlatformSpecificBuildOptions } from "./options/PlatformSpecificBuildOptions"
 import { Packager } from "./packager"
 import { expandMacro } from "./util/macroExpander"
-import { sanitizeFileName } from "builder-util/out/filename"
-import { Nullish } from "builder-util-runtime"
 
 // fpm bug - rpm build --description is not escaped, well... decided to replace quite to smart quote
 // http://leancrew.com/all-this/2010/11/smart-quotes-in-javascript/

packages/app-builder-lib/src/asar/asar.ts

@@ -1,4 +1,3 @@
-import { ObjectMap } from "builder-util-runtime"
 import { createFromBuffer } from "chromium-pickle-js"
 import { close, open, read, readFile, Stats } from "fs-extra"
 import * as path from "path"
@@ -17,7 +16,7 @@ export interface NodeIntegrity {
 
 export class Node {
   // we don't use Map because later it will be stringified
-  files?: ObjectMap<Node>
+  files?: Record<string, Node>
 
   unpacked?: boolean
 
@@ -134,7 +133,7 @@ export class AsarFilesystem {
   }
 
   private newNode() {
-    return Object.create(null) as ObjectMap<Node>
+    return Object.create(null) as Record<string, Node>
   }
 }
 

packages/app-builder-lib/src/asar/integrity.ts

@@ -1,11 +1,11 @@
 import BluebirdPromise from "bluebird-lst"
+import { FilterStats, log, statOrNull, walk } from "builder-util"
 import { createHash } from "crypto"
 import { createReadStream } from "fs"
 import { readdir } from "fs/promises"
 import * as path from "path"
-import { readAsarHeader, NodeIntegrity } from "./asar"
 import { FileMatcher } from "../fileMatcher"
-import { statOrNull, walk, FilterStats, log } from "builder-util"
+import { NodeIntegrity, readAsarHeader } from "./asar"
 
 export interface AsarIntegrityOptions {
   readonly resourcesPath: string

packages/app-builder-lib/src/asar/unpackDetector.ts

@@ -1,4 +1,4 @@
-import { log, FilterStats } from "builder-util"
+import { FilterStats, log } from "builder-util"
 import { isBinaryFileSync } from "isbinaryfile"
 import * as path from "path"
 import { ResolvedFileSet } from "../util/appFileCopier"

packages/app-builder-lib/src/codeSign/codesign.ts

@@ -1,9 +1,8 @@
+import { InvalidConfigurationError, statOrNull } from "builder-util"
 import { outputFile } from "fs-extra"
 import { homedir } from "os"
 import * as path from "path"
 import { TmpDir } from "temp-file"
-import { InvalidConfigurationError } from "builder-util"
-import { statOrNull } from "builder-util"
 import { download } from "../binDownload"
 
 /** @private */

packages/app-builder-lib/src/codeSign/macCodeSign.ts

@@ -1,19 +1,17 @@
+import { signAsync } from "@electron/osx-sign"
+import { SignOptions } from "@electron/osx-sign/dist/cjs/types"
+import { Identity as _Identity } from "@electron/osx-sign/dist/cjs/util-identities"
 import BluebirdPromise from "bluebird-lst"
-import { exec, InvalidConfigurationError, isEmptyOrSpaces, isEnvTrue, isPullRequest, log, TmpDir, retry } from "builder-util"
-import { copyFile, unlinkIfExists } from "builder-util"
-import { Fields, Logger } from "builder-util"
-import { randomBytes, createHash } from "crypto"
+import { copyFile, exec, Fields, InvalidConfigurationError, isEmptyOrSpaces, isEnvTrue, isPullRequest, log, Logger, retry, TmpDir, unlinkIfExists } from "builder-util"
+import { Nullish } from "builder-util-runtime"
+import { createHash, randomBytes } from "crypto"
 import { rename } from "fs/promises"
 import { Lazy } from "lazy-val"
 import { homedir, tmpdir } from "os"
 import * as path from "path"
 import { getTempName } from "temp-file"
 import { isAutoDiscoveryCodeSignIdentity } from "../util/flags"
 import { importCertificate } from "./codesign"
-import { Identity as _Identity } from "@electron/osx-sign/dist/cjs/util-identities"
-import { SignOptions } from "@electron/osx-sign/dist/cjs/types"
-import { signAsync } from "@electron/osx-sign"
-import { Nullish } from "builder-util-runtime"
 
 export const appleCertificatePrefixes = ["Developer ID Application:", "Developer ID Installer:", "3rd Party Mac Developer Application:", "3rd Party Mac Developer Installer:"]
 

packages/app-builder-lib/src/codeSign/signManager.ts

@@ -1,9 +1,9 @@
+import { MemoLazy, Nullish } from "builder-util-runtime"
 import { Lazy } from "lazy-val"
-import { WindowsSignOptions } from "./windowsCodeSign"
 import { Target } from "../core"
-import { MemoLazy, Nullish } from "builder-util-runtime"
-import { FileCodeSigningInfo, CertificateFromStoreInfo } from "./windowsSignToolManager"
 import { WindowsConfiguration } from "../options/winOptions"
+import { WindowsSignOptions } from "./windowsCodeSign"
+import { CertificateFromStoreInfo, FileCodeSigningInfo } from "./windowsSignToolManager"
 
 export interface SignManager {
   readonly computedPublisherName: Lazy<Array<string> | null>