app-builder-lib
Advanced tools
Comparing version 20.32.1 to 20.32.2
@@ -350,3 +350,3 @@ "use strict"; | ||
_builderUtil().log.info({ | ||
version: "20.32.1" | ||
version: "20.32.2" | ||
}, "electron-builder"); | ||
@@ -353,0 +353,0 @@ } catch (e) { |
@@ -136,5 +136,3 @@ "use strict"; | ||
let extendsSpec = config.extends; | ||
if (extendsSpec == null && extendsSpec !== null) { | ||
if (config.extends == null && config.extends !== null) { | ||
const metadata = (yield packageMetadata.value) || {}; | ||
@@ -145,4 +143,3 @@ const devDependencies = metadata.devDependencies; | ||
if (dependencies != null && "react-scripts" in dependencies || devDependencies != null && "react-scripts" in devDependencies) { | ||
extendsSpec = "react-cra"; | ||
config.extends = extendsSpec; | ||
config.extends = "react-cra"; | ||
} else if (devDependencies != null && "electron-webpack" in devDependencies) { | ||
@@ -163,10 +160,10 @@ let file = "electron-webpack/out/electron-builder.js"; | ||
if (extendsSpec === "react-cra") { | ||
if (config.extends === "react-cra") { | ||
parentConfig = yield (0, _rectCra().reactCra)(projectDir); | ||
_builderUtil().log.info({ | ||
preset: extendsSpec | ||
preset: config.extends | ||
}, "loaded parent configuration"); | ||
} else if (extendsSpec != null) { | ||
const parentConfigAndEffectiveFile = yield (0, _readConfigFile().loadParentConfig)(configRequest, extendsSpec); | ||
} else if (config.extends != null) { | ||
const parentConfigAndEffectiveFile = yield (0, _readConfigFile().loadParentConfig)(configRequest, config.extends); | ||
@@ -173,0 +170,0 @@ _builderUtil().log.info({ |
{ | ||
"name": "app-builder-lib", | ||
"description": "electron-builder lib", | ||
"version": "20.32.1", | ||
"version": "20.32.2", | ||
"main": "out/index.js", | ||
@@ -6,0 +6,0 @@ "files": [ |
Sorry, the diff of this file is not supported yet
2123392
21614