app-builder-lib - npm Package Compare versions

Comparing version 24.13.4-alpha.0 to 25.0.0-alpha.1

out/configuration.d.ts

@@ -125,2 +125,7 @@ import { Arch } from "builder-util";
     /**
+     * Use `legacy` app-builder binary for installing native dependencies, or @electron/rebuild in `sequential` or `parallel` compilation modes.
+     * @default legacy
+     */
+    readonly nativeRebuilder?: "legacy" | "sequential" | "parallel" | null;
+    /**
      * The build number. Maps to the `--iteration` flag for builds using FPM on Linux.
@@ -127,0 +132,0 @@ * If not defined, then it will fallback to `BUILD_NUMBER` or `TRAVIS_BUILD_NUMBER` or `APPVEYOR_BUILD_NUMBER` or `CIRCLE_BUILD_NUM` or `BUILD_BUILDNUMBER` or `CI_PIPELINE_IID` env.

out/electron/electronVersion.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.computeElectronVersion = exports.getElectronPackage = exports.getElectronVersionFromInstalled = exports.getElectronVersion = void 0;
+const search_module_1 = require("@electron/rebuild/lib/search-module");
 const builder_util_1 = require("builder-util");
@@ -57,4 +58,11 @@ const builder_util_runtime_1 = require("builder-util-runtime");
     }
-    const metadata = await (0, read_config_file_1.orNullIfFileNotExist)((0, fs_extra_1.readJson)(path.join(projectDir, "package.json")));
-    const dependency = metadata ? findFromPackageMetadata(metadata) : null;
+    const potentialRootDirs = [projectDir, await (0, search_module_1.getProjectRootPath)(projectDir)];
+    let dependency = null;
+    for await (const dir of potentialRootDirs) {
+        const metadata = await (0, read_config_file_1.orNullIfFileNotExist)((0, fs_extra_1.readJson)(path.join(dir, "package.json")));
+        dependency = metadata ? findFromPackageMetadata(metadata) : null;
+        if (dependency) {
+            break;
+        }
+    }
     if ((dependency === null || dependency === void 0 ? void 0 : dependency.name) === "electron-nightly") {
@@ -61,0 +69,0 @@ builder_util_1.log.info("You are using a nightly version of electron, be warned that those builds are highly unstable.");

out/util/packageMetadata.js

@@ -63,3 +63,3 @@ "use strict";
     if (devDependencies != null && ("electron-rebuild" in devDependencies || "@electron/rebuild" in devDependencies)) {
-        builder_util_1.log.info('@electron/rebuild not required if you use electron-builder, please consider to remove excess dependency from devDependencies\n\nTo ensure your native dependencies are always matched electron version, simply add script `"postinstall": "electron-builder install-app-deps" to your `package.json`');
+        builder_util_1.log.info('@electron/rebuild already used by electron-builder, please consider to remove excess dependency from devDependencies\n\nTo ensure your native dependencies are always matched electron version, simply add script `"postinstall": "electron-builder install-app-deps" to your `package.json`');
     }
@@ -66,0 +66,0 @@ if (errors.length > 0) {

out/util/yarn.js

@@ -8,2 +8,4 @@ "use strict";
 const path = require("path");
+const search_module_1 = require("@electron/rebuild/lib/search-module");
+const rebuild_1 = require("./rebuild/rebuild");
 const appBuilder_1 = require("./appBuilder");
@@ -24,6 +26,6 @@ async function installOrRebuild(config, appDir, options, forceInstall = false) {
     if (forceInstall || !isDependenciesInstalled) {
-        await installDependencies(appDir, effectiveOptions);
+        await installDependencies(config, appDir, effectiveOptions);
     }
     else {
-        await rebuild(appDir, effectiveOptions);
+        await rebuild(config, appDir, effectiveOptions);
     }
@@ -75,3 +77,3 @@ }
 }
-function installDependencies(appDir, options) {
+async function installDependencies(config, appDir, options) {
     const platform = options.platform || process.platform;
@@ -103,6 +105,9 @@ const arch = options.arch || process.arch;
     }
-    return (0, builder_util_1.spawn)(execPath, execArgs, {
+    await (0, builder_util_1.spawn)(execPath, execArgs, {
         cwd: appDir,
         env: getGypEnv(options.frameworkInfo, platform, arch, options.buildFromSource === true),
     });
+    // Some native dependencies no longer use `install` hook for building their native module, (yarn 3+ removed implicit link of `install` and `rebuild` steps)
+    // https://github.com/electron-userland/electron-builder/issues/8024
+    return rebuild(config, appDir, options);
 }
@@ -141,3 +146,3 @@ async function nodeGypRebuild(platform, arch, frameworkInfo) {
 /** @internal */
-async function rebuild(appDir, options) {
+async function rebuild(config, appDir, options) {
     const configuration = {
@@ -152,6 +157,29 @@ dependencies: await options.productionDeps.value,
     };
-    const env = getGypEnv(options.frameworkInfo, configuration.platform, configuration.arch, options.buildFromSource === true);
-    await (0, appBuilder_1.executeAppBuilderAndWriteJson)(["rebuild-node-modules"], configuration, { env, cwd: appDir });
+    if ([undefined, null, "legacy"].includes(config.nativeRebuilder)) {
+        const env = getGypEnv(options.frameworkInfo, configuration.platform, configuration.arch, options.buildFromSource === true);
+        return (0, appBuilder_1.executeAppBuilderAndWriteJson)(["rebuild-node-modules"], configuration, { env, cwd: appDir });
+    }
+    const { frameworkInfo: { version: electronVersion }, } = options;
+    const { arch, buildFromSource } = configuration;
+    const logInfo = {
+        electronVersion,
+        arch,
+        buildFromSource,
+        appDir: builder_util_1.log.filePath(appDir) || "./",
+    };
+    builder_util_1.log.info(logInfo, "executing @electron/rebuild");
+    const rebuildOptions = {
+        buildPath: appDir,
+        electronVersion,
+        arch,
+        debug: builder_util_1.log.isDebugEnabled,
+        projectRootPath: await (0, search_module_1.getProjectRootPath)(appDir),
+        mode: config.nativeRebuilder,
+    };
+    if (buildFromSource) {
+        rebuildOptions.prebuildTagPrefix = "totally-not-a-real-prefix-to-force-rebuild";
+    }
+    return (0, rebuild_1.rebuild)(rebuildOptions);
 }
 exports.rebuild = rebuild;
 //# sourceMappingURL=yarn.js.map

out/version.d.ts

@@ -1,1 +0,1 @@
-export declare const PACKAGE_VERSION = "24.13.4-alpha.0";
+export declare const PACKAGE_VERSION = "25.0.0-alpha.1";

out/version.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PACKAGE_VERSION = void 0;
-exports.PACKAGE_VERSION = "24.13.4-alpha.0";
+exports.PACKAGE_VERSION = "25.0.0-alpha.1";
 //# sourceMappingURL=version.js.map

package.json

 {
   "name": "app-builder-lib",
   "description": "electron-builder lib",
-  "version": "24.13.4-alpha.0",
+  "version": "25.0.0-alpha.1",
   "main": "out/index.js",
@@ -52,2 +52,3 @@ "files": [
     "@electron/osx-sign": "1.0.5",
+    "@electron/rebuild": "3.6.0",
     "@electron/universal": "1.5.1",
@@ -74,5 +75,5 @@ "@malept/flatpak-bundler": "^0.4.0",
     "temp-file": "^3.4.0",
-    "builder-util": "24.13.4-alpha.0",
-    "builder-util-runtime": "9.2.5-alpha.0",
-    "electron-publish": "24.13.4-alpha.0"
+    "builder-util": "25.0.0-alpha.1",
+    "builder-util-runtime": "9.2.5-alpha.1",
+    "electron-publish": "25.0.0-alpha.1"
   },
@@ -107,8 +108,8 @@ "///": "babel in devDependencies for proton tests",
     "@types/tar": "^6.1.3",
-    "dmg-builder": "24.13.4-alpha.0",
-    "electron-builder-squirrel-windows": "24.13.4-alpha.0"
+    "electron-builder-squirrel-windows": "25.0.0-alpha.1",
+    "dmg-builder": "25.0.0-alpha.1"
   },
   "peerDependencies": {
-    "electron-builder-squirrel-windows": "24.13.4-alpha.0",
-    "dmg-builder": "24.13.4-alpha.0"
+    "dmg-builder": "25.0.0-alpha.1",
+    "electron-builder-squirrel-windows": "25.0.0-alpha.1"
   },
@@ -115,0 +116,0 @@ "//": "electron-builder-squirrel-windows and dmg-builder added as dev dep for tests (as otherwise `require` doesn't work using Yarn 2)",

No alert changes

Improved metrics

Total package byte prevSize

2985220

increased by0.52%

Number of package files

371

increased by1.64%

Lines of code

23523

increased by0.64%

Worsened metrics

Dependency count

30

increased by3.45%

Number of medium supply chain risk alerts

3

increased by50%

Dependency changes

• + Added@electron/rebuild@3.6.0

• + Added@electron/rebuild@3.6.0(transitive)

• + Added@gar/promisify@1.1.3(transitive)

• + Added@malept/cross-spawn-promise@2.0.0(transitive)

• + Added@npmcli/fs@2.1.2(transitive)

• + Added@npmcli/move-file@2.0.1(transitive)

• + Added@sindresorhus/is@4.6.0(transitive)

• + Added@szmarczak/http-timer@4.0.6(transitive)

• + Added@types/cacheable-request@6.0.3(transitive)

• + Added@types/http-cache-semantics@4.0.4(transitive)

• + Added@types/keyv@3.1.4(transitive)

• + Added@types/responselike@1.0.3(transitive)

• + Addedabbrev@1.1.1(transitive)

• + Addedagentkeepalive@4.5.0(transitive)

• + Addedaggregate-error@3.1.0(transitive)

• + Addedaproba@2.0.0(transitive)

• + Addedare-we-there-yet@3.0.1(transitive)

• + Addedbuilder-util@25.0.0-alpha.1(transitive)

• + Addedbuilder-util-runtime@9.2.5-alpha.1(transitive)

• + Addedcacache@16.1.3(transitive)

• + Addedcacheable-lookup@5.0.4(transitive)

• + Addedcacheable-request@7.0.4(transitive)

• + Addedclean-stack@2.2.0(transitive)

• + Addedcli-cursor@3.1.0(transitive)

• + Addedcli-spinners@2.9.2(transitive)

• + Addedcliui@8.0.1(transitive)

• + Addedclone@1.0.4(transitive)

• + Addedclone-response@1.0.3(transitive)

• + Addedcolor-support@1.1.3(transitive)

• + Addedconsole-control-strings@1.1.0(transitive)

• + Addeddecompress-response@6.0.0(transitive)

• + Addeddefaults@1.0.4(transitive)

• + Addeddefer-to-connect@2.0.1(transitive)

• + Addeddelegates@1.0.0(transitive)

• + Addeddetect-libc@2.0.3(transitive)

• + Addeddmg-builder@25.0.0-alpha.1(transitive)

• + Addedelectron-builder-squirrel-windows@25.0.0-alpha.1(transitive)

• + Addedelectron-publish@25.0.0-alpha.1(transitive)

• + Addedencoding@0.1.13(transitive)

• + Addedenv-paths@2.2.1(transitive)

• + Addedescalade@3.1.2(transitive)

• + Addedexponential-backoff@3.1.1(transitive)

• + Addedgauge@4.0.4(transitive)

• + Addedget-caller-file@2.0.5(transitive)

• + Addedget-stream@5.2.0(transitive)

• + Addedglob@8.1.0(transitive)

• + Addedgot@11.8.6(transitive)

• + Addedhas-unicode@2.0.1(transitive)

• + Addedhttp-cache-semantics@4.1.1(transitive)

• + Addedhttp2-wrapper@1.0.3(transitive)

• + Addedhumanize-ms@1.2.1(transitive)

• + Addedimurmurhash@0.1.4(transitive)

• + Addedindent-string@4.0.0(transitive)

• + Addedinfer-owner@1.0.4(transitive)

• + Addedip-address@9.0.5(transitive)

• + Addedis-interactive@1.0.0(transitive)

• + Addedis-lambda@1.0.1(transitive)

• + Addedis-unicode-supported@0.1.0(transitive)

• + Addedjsbn@1.1.0(transitive)

• + Addedjson-buffer@3.0.1(transitive)

• + Addedkeyv@4.5.4(transitive)

• + Addedlog-symbols@4.1.0(transitive)

• + Addedlowercase-keys@2.0.0(transitive)

• + Addedlru-cache@7.18.3(transitive)

• + Addedmake-fetch-happen@10.2.1(transitive)

• + Addedmimic-fn@2.1.0(transitive)

• + Addedmimic-response@1.0.13.1.0(transitive)

• + Addedminipass-collect@1.0.2(transitive)

• + Addedminipass-fetch@2.1.2(transitive)

• + Addedminipass-flush@1.0.5(transitive)

• + Addedminipass-pipeline@1.2.4(transitive)

• + Addedminipass-sized@1.0.3(transitive)

• + Addednegotiator@0.6.3(transitive)

• + Addednode-abi@3.62.0(transitive)

• + Addednode-api-version@0.2.0(transitive)

• + Addednode-gyp@9.4.1(transitive)

• + Addednopt@6.0.0(transitive)

• + Addednormalize-url@6.1.0(transitive)

• + Addednpmlog@6.0.2(transitive)

• + Addedonetime@5.1.2(transitive)

• + Addedora@5.4.1(transitive)

• + Addedp-cancelable@2.1.1(transitive)

• + Addedp-map@4.0.0(transitive)

• + Addedpromise-inflight@1.0.1(transitive)

• + Addedpump@3.0.0(transitive)

• + Addedquick-lru@5.1.1(transitive)

• + Addedread-binary-file-arch@1.0.6(transitive)

• + Addedrequire-directory@2.1.1(transitive)

• + Addedresolve-alpn@1.2.1(transitive)

• + Addedresponselike@2.0.1(transitive)

• + Addedrestore-cursor@3.1.0(transitive)

• + Addedrimraf@3.0.2(transitive)

• + Addedset-blocking@2.0.0(transitive)

• + Addedsignal-exit@3.0.7(transitive)

• + Addedsocks@2.8.3(transitive)

• + Addedsocks-proxy-agent@7.0.0(transitive)

• + Addedsprintf-js@1.1.3(transitive)

• + Addedssri@9.0.1(transitive)

• + Addedunique-filename@2.0.1(transitive)

• + Addedunique-slug@3.0.0(transitive)

• + Addedwcwidth@1.0.1(transitive)

• + Addedwide-align@1.1.5(transitive)

• + Addedy18n@5.0.8(transitive)

• + Addedyargs@17.7.2(transitive)

• + Addedyargs-parser@21.1.1(transitive)

• - Removedbuilder-util@24.13.4-alpha.0(transitive)

• - Removedbuilder-util-runtime@9.2.5-alpha.0(transitive)

• - Removeddmg-builder@24.13.4-alpha.0(transitive)

• - Removedelectron-builder-squirrel-windows@24.13.4-alpha.0(transitive)

• - Removedelectron-publish@24.13.4-alpha.0(transitive)

• Updatedbuilder-util@25.0.0-alpha.1

• Updatedbuilder-util-runtime@9.2.5-alpha.1

• Updatedelectron-publish@25.0.0-alpha.1