tmpsave

package.json

@@ -11,8 +11,8 @@
   },
   "scripts": {
     "//": "do not wrap into single quotes - windows doesn't unwrap arg in this case",
-    "compile": "node scripts/copyRollupConfigs.js && tsc --emitDeclarationOnly --declaration && pnpm -r run compile2",
-    "compile2": "tsc --build",
+    "compile": "tsc --build",
+    "compile2": "node scripts/copyRollupConfigs.js && tsc --emitDeclarationOnly --declaration && pnpm -r run compile2",
     "lint": "eslint packages",
     "lint-staged": "lint-staged",
     "lint-deps": "node ./test/out/helpers/checkDeps.js",

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

@@ -57,7 +57,7 @@ export async function getConfig(
     if ((dependencies != null && "react-scripts" in dependencies) || (devDependencies != null && "react-scripts" in devDependencies)) {
       config.extends = "react-cra"
     } else if (devDependencies != null && "electron-webpack" in devDependencies) {
-      let file = "electron-webpack/src/electron-builder.js"
+      let file = "electron-webpack/out/electron-builder.js"
       try {
         file = require.resolve(file)
       } catch (_ignore) {

packages/electron-updater/src/NsisUpdater.ts

@@ -27,7 +27,7 @@ export class NsisUpdater extends BaseUpdater {
 
   /**
    * The verifyUpdateCodeSignature. You can pass [win-verify-signature](https://github.com/beyondkmp/win-verify-trust) or another custom verify function: ` (publisherName: string[], path: string) => Promise<string | null>`.
-   * The default verify function uses [windowsExecutableCodeSignatureVerifier](https://github.com/electron-userland/electron-builder/blob/master/packages/electron-updater/out/windowsExecutableCodeSignatureVerifier.ts)
+   * The default verify function uses [windowsExecutableCodeSignatureVerifier](https://github.com/electron-userland/electron-builder/blob/master/packages/electron-updater/src/windowsExecutableCodeSignatureVerifier.ts)
    */
   get verifyUpdateCodeSignature(): verifyUpdateCodeSignature {
     return this._verifyUpdateCodeSignature

test/src/ArtifactPublisherTest.ts

@@ -1,5 +1,5 @@
 import { Platform } from "app-builder-lib"
-import { createPublisher } from "app-builder-lib/out/publish/PublishManager"
+import { createPublisher } from "app-builder-lib/src/publish/PublishManager"
 import { Arch } from "builder-util"
 import { BitbucketOptions, CancellationToken, HttpError, KeygenOptions, S3Options, SpacesOptions } from "builder-util-runtime"
 import { publishArtifactsWithOptions } from "electron-builder"

test/src/BuildTest.ts

@@ -1,7 +1,7 @@
 import { checkBuildRequestOptions } from "app-builder-lib"
-import { doMergeConfigs } from "app-builder-lib/out/util/config/config"
+import { doMergeConfigs } from "app-builder-lib/src/util/config/config"
 import { Arch, createTargets, DIR_TARGET, Platform } from "electron-builder"
-import { createYargs } from "electron-builder/out/builder"
+import { createYargs } from "electron-builder/src/builder"
 import { promises as fs } from "fs"
 import { outputFile, outputJson } from "fs-extra"
 import * as path from "path"
@@ -11,7 +11,7 @@ import { verifySmartUnpack } from "./helpers/verifySmartUnpack"
 
 test("cli", async () => {
   // because these methods are internal
-  const { configureBuildCommand, normalizeOptions } = require("electron-builder/out/builder")
+  const { configureBuildCommand, normalizeOptions } = require("electron-builder/src/builder")
   const yargs = createYargs()
   configureBuildCommand(yargs)
 

test/src/RepoSlugTest.ts

@@ -1,4 +1,4 @@
-import { getRepositoryInfo } from "app-builder-lib/out/util/repositoryInfo"
+import { getRepositoryInfo } from "app-builder-lib/src/util/repositoryInfo"
 
 function checkInfo(info: any) {
   delete info.pathmatch

test/src/binDownloadTest.ts

@@ -1,4 +1,4 @@
-import { getBinFromUrl } from "app-builder-lib/out/binDownload"
+import { getBinFromUrl } from "app-builder-lib/src/binDownload"
 
 test("download binary from Github", async () => {
   const bin = await getBinFromUrl("linux-tools", "mac-10.12.3", "SQ8fqIRVXuQVWnVgaMTDWyf2TLAJjJYw3tRSqQJECmgF6qdM7Kogfa6KD49RbGzzMYIFca9Uw3MdsxzOPRWcYw==")

test/src/configurationValidationTest.ts

@@ -1,7 +1,7 @@
-import { validateConfiguration } from "app-builder-lib/out/util/config/config"
+import { validateConfiguration } from "app-builder-lib/src/util/config/config"
 import { DebugLogger } from "builder-util"
 import { Configuration, Platform } from "electron-builder"
-import { CliOptions, configureBuildCommand, createYargs, normalizeOptions } from "electron-builder/out/builder"
+import { CliOptions, configureBuildCommand, createYargs, normalizeOptions } from "electron-builder/src/builder"
 import { app, appThrows, linuxDirTarget } from "./helpers/packTester"
 
 test.ifAll.ifDevOrLinuxCi(

test/src/extraMetadataTest.ts

@@ -1,6 +1,6 @@
-import { readAsarJson } from "app-builder-lib/out/asar/asar"
+import { readAsarJson } from "app-builder-lib/src/asar/asar"
 import { DIR_TARGET, Platform } from "electron-builder"
-import { coerceTypes } from "electron-builder/out/builder"
+import { coerceTypes } from "electron-builder/src/builder"
 import { readJson } from "fs-extra"
 import * as path from "path"
 import { assertThat } from "./helpers/fileAssert"
@@ -55,7 +55,7 @@ test.ifDevOrLinuxCi("extra metadata (no asar)", createExtraMetadataTest(false))
 
 test("cli", async () => {
   // because these methods are internal
-  const { configureBuildCommand, normalizeOptions } = require("electron-builder/out/builder")
+  const { configureBuildCommand, normalizeOptions } = require("electron-builder/src/builder")
   const yargs = require("yargs")
     .strict()
     .fail((message: string, error: Error | null) => {

test/src/filenameUtilTest.ts

@@ -1,4 +1,4 @@
-import { getCompleteExtname } from "builder-util/out/filename"
+import { getCompleteExtname } from "builder-util/src/filename"
 
 // [inputFilename, expectedExtname]
 const tests = [

test/src/globTest.ts

@@ -1,5 +1,5 @@
 import { DIR_TARGET, Platform } from "app-builder-lib"
-import { readAsar } from "app-builder-lib/out/asar/asar"
+import { readAsar } from "app-builder-lib/src/asar/asar"
 import { outputFile } from "fs-extra"
 import * as fs from "fs/promises"
 import * as path from "path"

test/src/helpers/CheckingPackager.ts

@@ -1,8 +1,8 @@
 import { SignOptions as MacSignOptions } from "@electron/osx-sign/dist/cjs/types"
-import { Identity } from "app-builder-lib/out/codeSign/macCodeSign"
-import { MacPackager } from "app-builder-lib/out/macPackager"
-import { DoPackOptions } from "app-builder-lib/out/platformPackager"
-import { WinPackager } from "app-builder-lib/out/winPackager"
+import { Identity } from "app-builder-lib/src/codeSign/macCodeSign"
+import { MacPackager } from "app-builder-lib/src/macPackager"
+import { DoPackOptions } from "app-builder-lib/src/platformPackager"
+import { WinPackager } from "app-builder-lib/src/winPackager"
 import { AsyncTaskManager } from "builder-util"
 import { DmgTarget } from "dmg-builder"
 import { Arch, MacConfiguration, Packager, Target } from "electron-builder"

test/src/helpers/TestAppAdapter.ts

@@ -1,4 +1,4 @@
-import { ElectronAppAdapter } from "electron-updater/out/ElectronAppAdapter"
+import { ElectronAppAdapter } from "electron-updater/src/ElectronAppAdapter"
 
 // do not implement AppAdapter directly, test that our ElectronAppAdapter implementation is correct
 export class TestAppAdapter extends ElectronAppAdapter {

test/src/helpers/downloadElectron.ts

@@ -47,7 +47,7 @@ export function downloadAllRequiredElectronVersions(): Promise<any> {
         ? ["x64"]
         : platform === "win32"
           ? ["ia32", "x64"]
-          : require(`${path.join(__dirname, "../../..")}/packages/builder-util/out/util`).getArchCliNames()
+          : require(`${path.join(__dirname, "../../..")}/packages/builder-util/src/util`).getArchCliNames()
     for (const arch of archs) {
       if (gte(ELECTRON_VERSION, "19.0.0") && platform === "linux" && arch === "ia32") {
         // Chromium dropped support for ia32 linux binaries in 102.0.4999.0

test/src/helpers/packTester.ts

@@ -1,9 +1,9 @@
 import { PublishManager } from "app-builder-lib"
-import { readAsar } from "app-builder-lib/out/asar/asar"
-import { AsarIntegrity } from "app-builder-lib/out/asar/integrity"
-import { computeArchToTargetNamesMap } from "app-builder-lib/out/targets/targetFactory"
-import { getLinuxToolsPath } from "app-builder-lib/out/targets/tools"
-import { executeAppBuilderAsJson } from "app-builder-lib/out/util/appBuilder"
+import { readAsar } from "app-builder-lib/src/asar/asar"
+import { AsarIntegrity } from "app-builder-lib/src/asar/integrity"
+import { computeArchToTargetNamesMap } from "app-builder-lib/src/targets/targetFactory"
+import { getLinuxToolsPath } from "app-builder-lib/src/targets/tools"
+import { executeAppBuilderAsJson } from "app-builder-lib/src/util/appBuilder"
 import { addValue, copyDir, deepAssign, exec, executeFinally, FileCopier, getPath7x, getPath7za, log, spawn, USE_HARD_LINKS, walk } from "builder-util"
 import { CancellationToken, UpdateFileInfo } from "builder-util-runtime"
 import DecompressZip from "decompress-zip"

test/src/helpers/updaterTestUtil.ts

@@ -1,7 +1,7 @@
 import { NodeHttpExecutor, serializeToYaml, TmpDir } from "builder-util"
 import { AllPublishOptions, DownloadOptions } from "builder-util-runtime"
 import { AppUpdater, MacUpdater, NoOpLogger, NsisUpdater } from "electron-updater"
-import { TestOnlyUpdaterOptions } from "electron-updater/out/AppUpdater"
+import { TestOnlyUpdaterOptions } from "electron-updater/src/AppUpdater"
 import { outputFile, writeFile } from "fs-extra"
 import * as path from "path"
 import { assertThat } from "./fileAssert"

test/src/helpers/verifySmartUnpack.ts

@@ -1,4 +1,4 @@
-import { AsarFilesystem, readAsar } from "app-builder-lib/out/asar/asar"
+import { AsarFilesystem, readAsar } from "app-builder-lib/src/asar/asar"
 import { walk } from "builder-util"
 import { readFileSync } from "fs"
 import * as path from "path"

test/src/helpers/winHelper.ts

@@ -1,4 +1,4 @@
-import { readAsarJson } from "app-builder-lib/out/asar/asar"
+import { readAsarJson } from "app-builder-lib/src/asar/asar"
 import { walk } from "builder-util"
 import { Arch, Platform } from "electron-builder"
 import { outputFile } from "fs-extra"

test/src/mac/dmgTest.ts

@@ -1,6 +1,6 @@
 import { PlatformPackager } from "app-builder-lib"
 import { Arch, copyFile, exec } from "builder-util"
-import { attachAndExecute, getDmgTemplatePath } from "dmg-builder/out/dmgUtil"
+import { attachAndExecute, getDmgTemplatePath } from "dmg-builder/src/dmgUtil"
 import { Platform } from "electron-builder"
 import * as fs from "fs/promises"
 import * as path from "path"

test/src/mac/macCodeSignTest.ts

@@ -1,4 +1,4 @@
-import { createKeychain } from "app-builder-lib/out/codeSign/macCodeSign"
+import { createKeychain } from "app-builder-lib/src/codeSign/macCodeSign"
 import { removePassword, TmpDir } from "builder-util"
 import { CSC_LINK } from "../helpers/codeSignData"
 

test/src/macroExpanderTest.ts

@@ -1,4 +1,4 @@
-import { expandMacro } from "app-builder-lib/out/util/macroExpander"
+import { expandMacro } from "app-builder-lib/src/util/macroExpander"
 
 const appInfoStub: any = {
   sanitizedProductName: "1",

test/src/updater/differentialUpdateTest.ts

@@ -1,5 +1,5 @@
 import { Arch, Configuration, Platform } from "app-builder-lib"
-import { getBinFromUrl } from "app-builder-lib/out/binDownload"
+import { getBinFromUrl } from "app-builder-lib/src/binDownload"
 import { doSpawn, getArchSuffix } from "builder-util"
 import { GenericServerOptions, Nullish, S3Options } from "builder-util-runtime"
 import { AppImageUpdater, BaseUpdater, MacUpdater, NoOpLogger, NsisUpdater } from "electron-updater"

test/src/updater/macUpdaterTest.ts

@@ -1,5 +1,5 @@
 import { configureRequestOptionsFromUrl, GithubOptions } from "builder-util-runtime"
-import { MacUpdater } from "electron-updater/out/MacUpdater"
+import { MacUpdater } from "electron-updater/src/MacUpdater"
 import { EventEmitter } from "events"
 import { assertThat } from "../helpers/fileAssert"
 import { createTestAppAdapter, httpExecutor, trackEvents, tuneTestUpdater, writeUpdateConfig } from "../helpers/updaterTestUtil"

test/src/urlUtilTest.ts

@@ -1,4 +1,4 @@
-import { blockmapFiles, newUrlFromBase } from "electron-updater/out/util"
+import { blockmapFiles, newUrlFromBase } from "electron-updater/src/util"
 import { URL } from "url"
 
 test("newUrlFromBase", () => {