fix: Modify the import method of the builder-util package (#8330)

.changeset/rich-eels-notice.md

@@ -0,0 +1,5 @@
+---
+"builder-util": patch
+---
+
+import builder-util from root instead of out

.eslintrc.js

@@ -10,7 +10,7 @@ module.exports = {
     "plugin:@typescript-eslint/recommended-requiring-type-checking",
   ],
   parserOptions: {
-    project: ["./packages/*/tsconfig.json", "./test/tsconfig.json"],
+    project: ["./packages/*/tsconfig.json"],
   },
   rules: {
     semi: "off",
@@ -41,6 +41,6 @@ module.exports = {
         // "allowExpressions": false,
       },
     ],
-    "@typescript-eslint/no-redundant-type-constituents": "off"
+    "@typescript-eslint/no-redundant-type-constituents": "off",
   },
 }

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

@@ -1,4 +1,4 @@
-import { FileTransformer } from "builder-util/out/fs"
+import { FileTransformer } from "builder-util"
 import { AsarIntegrity } from "./asar/integrity"
 import { Platform, PlatformPackager, ElectronPlatformName, AfterPackContext } from "./index"
 

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

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

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

@@ -1,4 +1,4 @@
-import { statOrNull } from "builder-util/out/fs"
+import { statOrNull } from "builder-util"
 import { Node, readAsar } from "./asar"
 
 /** @internal */

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

@@ -1,5 +1,5 @@
 import { AsyncTaskManager, log } from "builder-util"
-import { FileCopier, Filter, MAX_FILE_REQUESTS } from "builder-util/out/fs"
+import { FileCopier, Filter, MAX_FILE_REQUESTS } from "builder-util"
 import { symlink, createReadStream, createWriteStream, Stats } from "fs"
 import { writeFile, readFile, mkdir } from "fs/promises"
 import * as path from "path"

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

@@ -1,6 +1,6 @@
 import BluebirdPromise from "bluebird-lst"
 import { log } from "builder-util"
-import { CONCURRENCY } from "builder-util/out/fs"
+import { CONCURRENCY } from "builder-util"
 import { mkdir } from "fs-extra"
 import { isBinaryFileSync } from "isbinaryfile"
 import * as path from "path"

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

@@ -3,7 +3,7 @@ import { homedir } from "os"
 import * as path from "path"
 import { TmpDir } from "temp-file"
 import { InvalidConfigurationError } from "builder-util"
-import { statOrNull } from "builder-util/out/fs"
+import { statOrNull } from "builder-util"
 import { download } from "../binDownload"
 
 /** @private */

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

@@ -1,7 +1,7 @@
 import BluebirdPromise from "bluebird-lst"
-import { exec, InvalidConfigurationError, isEmptyOrSpaces, isEnvTrue, isPullRequest, log, TmpDir, retry } from "builder-util/out/util"
-import { copyFile, unlinkIfExists } from "builder-util/out/fs"
-import { Fields, Logger } from "builder-util/out/log"
+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 { rename } from "fs/promises"
 import { Lazy } from "lazy-val"

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

@@ -1,4 +1,4 @@
-import { InvalidConfigurationError, asArray, log } from "builder-util/out/util"
+import { InvalidConfigurationError, asArray, log } from "builder-util"
 import { getBin } from "../binDownload"
 import { WindowsConfiguration } from "../options/winOptions"
 import { executeAppBuilderAsJson } from "../util/appBuilder"

packages/app-builder-lib/src/electron/ElectronFramework.ts

@@ -1,6 +1,6 @@
 import BluebirdPromise from "bluebird-lst"
 import { asArray, executeAppBuilder, log } from "builder-util"
-import { CONCURRENCY, copyDir, DO_NOT_USE_HARD_LINKS, statOrNull, unlinkIfExists } from "builder-util/out/fs"
+import { CONCURRENCY, copyDir, DO_NOT_USE_HARD_LINKS, statOrNull, unlinkIfExists } from "builder-util"
 import { emptyDir, readdir, rename } from "fs-extra"
 import * as path from "path"
 import { Configuration } from "../configuration"

packages/app-builder-lib/src/electron/electronMac.ts

@@ -1,6 +1,6 @@
 import BluebirdPromise from "bluebird-lst"
 import { asArray, getPlatformIconFileName, InvalidConfigurationError, log } from "builder-util"
-import { copyOrLinkFile, unlinkIfExists } from "builder-util/out/fs"
+import { copyOrLinkFile, unlinkIfExists } from "builder-util"
 import { rename, utimes } from "fs/promises"
 import * as path from "path"
 import { filterCFBundleIdentifier } from "../appInfo"

packages/app-builder-lib/src/electron/electronVersion.ts

@@ -2,7 +2,7 @@ import { getProjectRootPath } from "@electron/rebuild/lib/search-module"
 
 import { InvalidConfigurationError, log } from "builder-util"
 import { parseXml } from "builder-util-runtime"
-import { httpExecutor } from "builder-util/out/nodeHttpExecutor"
+import { httpExecutor } from "builder-util"
 import { readJson } from "fs-extra"
 import { Lazy } from "lazy-val"
 import * as path from "path"

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

@@ -1,6 +1,5 @@
 import BluebirdPromise from "bluebird-lst"
-import { asArray, log } from "builder-util"
-import { copyDir, copyOrLinkFile, Filter, statOrNull, FileTransformer, USE_HARD_LINKS } from "builder-util/out/fs"
+import { asArray, log, copyDir, copyOrLinkFile, Filter, statOrNull, FileTransformer, USE_HARD_LINKS } from "builder-util"
 import { mkdir } from "fs/promises"
 import { Minimatch } from "minimatch"
 import * as path from "path"

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

@@ -1,5 +1,4 @@
-import { debug, log, deepAssign } from "builder-util"
-import { FileTransformer } from "builder-util/out/fs"
+import { debug, log, deepAssign, FileTransformer } from "builder-util"
 import { readFile } from "fs/promises"
 import * as path from "path"
 import { Configuration } from "./configuration"

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

@@ -1,6 +1,5 @@
-import { executeFinally } from "builder-util/out/promise"
 import { PublishOptions } from "electron-publish/out/publisher"
-import { log, InvalidConfigurationError } from "builder-util"
+import { log, InvalidConfigurationError, executeFinally } from "builder-util"
 import { asArray } from "builder-util-runtime"
 import { Packager } from "./packager"
 import { PackagerOptions } from "./packagerApi"

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

@@ -1,11 +1,9 @@
 import BluebirdPromise from "bluebird-lst"
-import { deepAssign, Arch, AsyncTaskManager, exec, InvalidConfigurationError, log, use, getArchSuffix } from "builder-util"
+import { deepAssign, Arch, AsyncTaskManager, exec, InvalidConfigurationError, log, use, getArchSuffix, copyFile, statOrNull, unlinkIfExists, orIfFileNotExist } from "builder-util"
 import { PerFileSignOptions, SignOptions } from "@electron/osx-sign/dist/cjs/types"
 import { mkdir, readdir } from "fs/promises"
 import { Lazy } from "lazy-val"
 import * as path from "path"
-import { copyFile, statOrNull, unlinkIfExists } from "builder-util/out/fs"
-import { orIfFileNotExist } from "builder-util/out/promise"
 import { AppInfo } from "./appInfo"
 import { CertType, CodeSigningInfo, createKeychain, CreateKeychainOptions, findIdentity, Identity, isSignAllowed, removeKeychain, reportError, sign } from "./codeSign/macCodeSign"
 import { DIR_TARGET, Platform, Target } from "./core"

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

@@ -1,12 +1,25 @@
-import { addValue, Arch, archFromString, AsyncTaskManager, DebugLogger, deepAssign, InvalidConfigurationError, log, safeStringifyJson, serializeToYaml, TmpDir } from "builder-util"
+import {
+  addValue,
+  Arch,
+  archFromString,
+  AsyncTaskManager,
+  DebugLogger,
+  deepAssign,
+  InvalidConfigurationError,
+  log,
+  safeStringifyJson,
+  serializeToYaml,
+  TmpDir,
+  executeFinally,
+  orNullIfFileNotExist,
+  getArtifactArchName,
+} from "builder-util"
 import { CancellationToken } from "builder-util-runtime"
-import { executeFinally, orNullIfFileNotExist } from "builder-util/out/promise"
 import { EventEmitter } from "events"
 import { mkdirs, chmod, outputFile } from "fs-extra"
 import * as isCI from "is-ci"
 import { Lazy } from "lazy-val"
 import * as path from "path"
-import { getArtifactArchName } from "builder-util/out/arch"
 import { AppInfo } from "./appInfo"
 import { readAsarJson } from "./asar/asar"
 import { AfterPackContext, Configuration } from "./configuration"

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

@@ -1,8 +1,6 @@
 import BluebirdPromise from "bluebird-lst"
 import { Arch, asArray, AsyncTaskManager, debug, DebugLogger, deepAssign, getArchSuffix, InvalidConfigurationError, isEmptyOrSpaces, log } from "builder-util"
-import { defaultArchFromString, getArtifactArchName } from "builder-util/out/arch"
-import { FileTransformer, statOrNull } from "builder-util/out/fs"
-import { orIfFileNotExist } from "builder-util/out/promise"
+import { defaultArchFromString, getArtifactArchName, FileTransformer, statOrNull, orIfFileNotExist } from "builder-util"
 import { readdir } from "fs/promises"
 import { Lazy } from "lazy-val"
 import { Minimatch } from "minimatch"

packages/app-builder-lib/src/presets/rectCra.ts

@@ -1,5 +1,5 @@
 import { log } from "builder-util"
-import { statOrNull } from "builder-util/out/fs"
+import { statOrNull } from "builder-util"
 import * as path from "path"
 import { Configuration } from "../configuration"
 

packages/app-builder-lib/src/publish/BitbucketPublisher.ts

@@ -1,5 +1,5 @@
 import { Arch, InvalidConfigurationError, isEmptyOrSpaces, log } from "builder-util"
-import { httpExecutor } from "builder-util/out/nodeHttpExecutor"
+import { httpExecutor } from "builder-util"
 import { ClientRequest, RequestOptions } from "http"
 import { HttpPublisher, PublishContext } from "electron-publish"
 import { BitbucketOptions } from "builder-util-runtime/out/publishOptions"

packages/app-builder-lib/src/publish/KeygenPublisher.ts

@@ -1,5 +1,5 @@
 import { Arch, InvalidConfigurationError, log, isEmptyOrSpaces } from "builder-util"
-import { httpExecutor } from "builder-util/out/nodeHttpExecutor"
+import { httpExecutor } from "builder-util"
 import { ClientRequest, RequestOptions } from "http"
 import { HttpPublisher, PublishContext } from "electron-publish"
 import { KeygenOptions } from "builder-util-runtime/out/publishOptions"

packages/app-builder-lib/src/targets/AppxTarget.ts

@@ -1,6 +1,6 @@
 import BluebirdPromise from "bluebird-lst"
 import { Arch, asArray, deepAssign, InvalidConfigurationError, log } from "builder-util"
-import { copyOrLinkFile, walk } from "builder-util/out/fs"
+import { copyOrLinkFile, walk } from "builder-util"
 import { emptyDir, readdir, readFile, writeFile } from "fs-extra"
 import * as path from "path"
 import { AppXOptions } from "../"

packages/app-builder-lib/src/targets/FpmTarget.ts

@@ -1,5 +1,5 @@
 import { Arch, executeAppBuilder, getArchSuffix, log, TmpDir, toLinuxArchString, use, serializeToYaml, asArray } from "builder-util"
-import { unlinkIfExists } from "builder-util/out/fs"
+import { unlinkIfExists } from "builder-util"
 import { outputFile, stat } from "fs-extra"
 import { mkdir, readFile } from "fs/promises"
 import * as path from "path"

packages/app-builder-lib/src/targets/MsiTarget.ts

@@ -2,7 +2,7 @@ import BluebirdPromise from "bluebird-lst"
 import { Arch, asArray, log, deepAssign } from "builder-util"
 import { UUID } from "builder-util-runtime"
 import { getBinFromUrl } from "../binDownload"
-import { walk } from "builder-util/out/fs"
+import { walk } from "builder-util"
 import { createHash } from "crypto"
 import * as ejs from "ejs"
 import { readFile, writeFile } from "fs/promises"

packages/app-builder-lib/src/targets/archive.ts

@@ -1,5 +1,5 @@
 import { debug7z, exec, log } from "builder-util"
-import { exists, unlinkIfExists, statOrNull } from "builder-util/out/fs"
+import { exists, unlinkIfExists, statOrNull } from "builder-util"
 import { move } from "fs-extra"
 import * as path from "path"
 import { create, CreateOptions, FileOptions } from "tar"

packages/app-builder-lib/src/targets/nsis/NsisTarget.ts

@@ -1,7 +1,7 @@
 import BluebirdPromise from "bluebird-lst"
 import { Arch, asArray, AsyncTaskManager, exec, executeAppBuilder, getPlatformIconFileName, InvalidConfigurationError, log, spawnAndWrite, use, getPath7za } from "builder-util"
 import { CURRENT_APP_INSTALLER_FILE_NAME, CURRENT_APP_PACKAGE_FILE_NAME, PackageFileInfo, UUID } from "builder-util-runtime"
-import { exists, statOrNull, walk } from "builder-util/out/fs"
+import { exists, statOrNull, walk } from "builder-util"
 import _debug from "debug"
 import * as fs from "fs"
 import { readFile, stat, unlink } from "fs-extra"

packages/app-builder-lib/src/targets/nsis/nsisUtil.ts

@@ -1,7 +1,7 @@
 import { Arch, log } from "builder-util"
 import { PackageFileInfo } from "builder-util-runtime"
 import { getBinFromUrl, getBinFromCustomLoc } from "../../binDownload"
-import { copyFile, dirSize } from "builder-util/out/fs"
+import { copyFile, dirSize } from "builder-util"
 import * as path from "path"
 import { getTemplatePath } from "../../util/pathManager"
 import { NsisTarget } from "./NsisTarget"

packages/app-builder-lib/src/targets/pkg.ts

@@ -1,5 +1,4 @@
-import { Arch, debug, exec, use } from "builder-util"
-import { statOrNull } from "builder-util/out/fs"
+import { Arch, debug, exec, use, statOrNull } from "builder-util"
 import { PkgOptions } from "../options/pkgOptions"
 import { executeAppBuilderAndWriteJson, executeAppBuilderAsJson } from "../util/appBuilder"
 import { getNotLocalizedLicenseFile } from "../util/license"

packages/app-builder-lib/src/util/AppFileWalker.ts

@@ -1,4 +1,4 @@
-import { Filter, FileConsumer } from "builder-util/out/fs"
+import { Filter, FileConsumer } from "builder-util"
 import { readlink, stat, Stats } from "fs-extra"
 import { FileMatcher } from "../fileMatcher"
 import { Packager } from "../packager"

packages/app-builder-lib/src/util/NodeModuleCopyHelper.ts

@@ -1,5 +1,5 @@
 import BluebirdPromise from "bluebird-lst"
-import { CONCURRENCY } from "builder-util/out/fs"
+import { CONCURRENCY } from "builder-util"
 import { lstat, readdir } from "fs-extra"
 import * as path from "path"
 import { excludedNames, FileMatcher } from "../fileMatcher"

packages/app-builder-lib/src/util/appFileCopier.ts

@@ -1,6 +1,5 @@
 import BluebirdPromise from "bluebird-lst"
-import { AsyncTaskManager, log } from "builder-util"
-import { CONCURRENCY, FileCopier, FileTransformer, Link, MAX_FILE_REQUESTS, statOrNull, walk } from "builder-util/out/fs"
+import { AsyncTaskManager, log, CONCURRENCY, FileCopier, FileTransformer, Link, MAX_FILE_REQUESTS, statOrNull, walk } from "builder-util"
 import { Stats } from "fs"
 import { mkdir, readlink } from "fs/promises"
 import { ensureSymlink } from "fs-extra"

packages/app-builder-lib/src/util/cacheManager.ts

@@ -1,7 +1,5 @@
 import BluebirdPromise from "bluebird-lst"
-import { Arch, log } from "builder-util"
-import { copyFile } from "builder-util/out/fs"
-import { orNullIfFileNotExist } from "builder-util/out/promise"
+import { Arch, log, copyFile, orNullIfFileNotExist } from "builder-util"
 import { Hash } from "crypto"
 import { readJson, writeJson } from "fs-extra"
 import { mkdir, readFile } from "fs/promises"

packages/app-builder-lib/src/util/config.ts

@@ -1,5 +1,4 @@
-import { DebugLogger, deepAssign, InvalidConfigurationError, log, safeStringifyJson } from "builder-util"
-import { statOrNull } from "builder-util/out/fs"
+import { DebugLogger, deepAssign, InvalidConfigurationError, log, safeStringifyJson, statOrNull } from "builder-util"
 import { readJson } from "fs-extra"
 import { Lazy } from "lazy-val"
 import * as path from "path"

packages/app-builder-lib/src/util/filter.ts

@@ -1,4 +1,4 @@
-import { Filter } from "builder-util/out/fs"
+import { Filter } from "builder-util"
 import { Stats } from "fs-extra"
 import { Minimatch } from "minimatch"
 import * as path from "path"

packages/app-builder-lib/src/util/macosVersion.ts

@@ -1,7 +1,7 @@
 import { readFile } from "fs-extra"
 import { Lazy } from "lazy-val"
 import * as semver from "semver"
-import { log } from "builder-util/out/log"
+import { log } from "builder-util"
 import { release as osRelease } from "os"
 
 const macOsVersion = new Lazy<string>(async () => {

packages/app-builder-lib/src/util/repositoryInfo.ts

@@ -1,4 +1,4 @@
-import { orNullIfFileNotExist } from "builder-util/out/promise"
+import { orNullIfFileNotExist } from "builder-util"
 import { readFile } from "fs-extra"
 import GitHost, { fromUrl } from "hosted-git-info"
 import * as path from "path"

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

@@ -1,7 +1,6 @@
 import BluebirdPromise from "bluebird-lst"
-import { Arch, asArray, InvalidConfigurationError, log, use, executeAppBuilder } from "builder-util"
+import { Arch, asArray, InvalidConfigurationError, log, use, executeAppBuilder, CopyFileTransformer, FileTransformer, walk } from "builder-util"
 import { MemoLazy, parseDn } from "builder-util-runtime"
-import { CopyFileTransformer, FileTransformer, walk } from "builder-util/out/fs"
 import { createHash } from "crypto"
 import { readdir } from "fs/promises"
 import * as isCI from "is-ci"

packages/builder-util/src/util.ts

@@ -17,12 +17,15 @@ if (process.env.JEST_WORKER_ID == null) {
 
 export { safeStringifyJson } from "builder-util-runtime"
 export { TmpDir } from "temp-file"
-export { log, debug } from "./log"
+export * from "./log"
 export { Arch, getArchCliNames, toLinuxArchString, getArchSuffix, ArchType, archFromString, defaultArchFromString } from "./arch"
 export { AsyncTaskManager } from "./asyncTaskManager"
 export { DebugLogger } from "./DebugLogger"
+export { httpExecutor, NodeHttpExecutor } from "./nodeHttpExecutor"
+export * from "./promise"
+export * from "./arch"
 
-export { copyFile, exists } from "./fs"
+export * from "./fs"
 export { asArray } from "builder-util-runtime"
 
 export { deepAssign } from "./deepAssign"

packages/dmg-builder/src/dmg.ts

@@ -4,9 +4,8 @@ import { MacPackager } from "app-builder-lib/out/macPackager"
 import { createBlockmap } from "app-builder-lib/out/targets/differentialUpdateInfoBuilder"
 import { executeAppBuilderAsJson } from "app-builder-lib/out/util/appBuilder"
 import { sanitizeFileName } from "app-builder-lib/out/util/filename"
-import { Arch, AsyncTaskManager, exec, getArchSuffix, InvalidConfigurationError, isEmptyOrSpaces, log } from "builder-util"
+import { Arch, AsyncTaskManager, exec, getArchSuffix, InvalidConfigurationError, isEmptyOrSpaces, log, copyDir, copyFile, exists, statOrNull } from "builder-util"
 import { CancellationToken } from "builder-util-runtime"
-import { copyDir, copyFile, exists, statOrNull } from "builder-util/out/fs"
 import { stat } from "fs-extra"
 import * as path from "path"
 import { TmpDir } from "temp-file"

packages/dmg-builder/src/dmgUtil.ts

@@ -1,5 +1,5 @@
 import { PlatformPackager } from "app-builder-lib"
-import { executeFinally } from "builder-util/out/promise"
+import { executeFinally } from "builder-util"
 import * as path from "path"
 import { hdiUtil } from "./hdiuil"
 

packages/electron-builder-squirrel-windows/src/squirrelPack.ts

@@ -1,5 +1,4 @@
-import { Arch, debug, exec, log, spawn, isEmptyOrSpaces, getPath7za } from "builder-util"
-import { copyFile, walk } from "builder-util/out/fs"
+import { Arch, debug, exec, log, spawn, isEmptyOrSpaces, getPath7za, copyFile, walk } from "builder-util"
 import { compute7zCompressArgs } from "app-builder-lib/out/targets/archive"
 import { execWine, prepareWindowsExecutableArgs as prepareArgs } from "app-builder-lib/out/wine"
 import { WinPackager } from "app-builder-lib/out/winPackager"

packages/electron-builder/src/cli/cli.ts

@@ -1,12 +1,11 @@
 #! /usr/bin/env node
 
-import { InvalidConfigurationError, log } from "builder-util"
+import { InvalidConfigurationError, log, ExecError } from "builder-util"
 import * as chalk from "chalk"
 import { readJson } from "fs-extra"
 import * as isCi from "is-ci"
 import * as path from "path"
 import { loadEnv } from "read-config-file"
-import { ExecError } from "builder-util/out/util"
 import { build, configureBuildCommand, createYargs } from "../builder"
 import { createSelfSignedCert } from "./create-self-signed-cert"
 import { configureInstallAppDepsCommand, installAppDeps } from "./install-app-deps"

packages/electron-builder/src/cli/create-self-signed-cert.ts

@@ -1,6 +1,5 @@
 import { sanitizeFileName } from "app-builder-lib/out/util/filename"
-import { exec, log, spawn, TmpDir } from "builder-util"
-import { unlinkIfExists } from "builder-util/out/fs"
+import { exec, log, spawn, TmpDir, unlinkIfExists } from "builder-util"
 import * as chalk from "chalk"
 import { getSignVendorPath } from "app-builder-lib/out/codeSign/windowsCodeSign"
 import { mkdir } from "fs/promises"