From a8c9ffd9e3bb613a88360c51321318e8eb50aa76 Mon Sep 17 00:00:00 2001 From: develar Date: Fri, 16 Jun 2017 10:02:01 +0200 Subject: [PATCH] refactor: merge electron-builder-core into electron-builder, transform node-gyp-rebuild bin to subcommand BREAKING CHANGE: Please use `node-gyp-rebuild` as `electron-buider node-gyp-rebuild` now --- docs/Home.md | 1 - docs/Options.md | 6 +- docs/_Sidebar.md | 1 - docs/api/electron-builder-core.md | 186 ------- docs/api/electron-builder.md | 499 ++++++++++-------- package.json | 4 +- packages/electron-builder-core/package.json | 14 - packages/electron-builder-core/readme.md | 3 - packages/electron-builder-core/tsconfig.json | 17 - .../package.json | 4 +- .../src/squirrelWindows.ts | 2 +- packages/electron-builder/package.json | 4 +- packages/electron-builder/src/builder.ts | 2 +- packages/electron-builder/src/cli/cli.ts | 16 +- .../src/cli/install-app-deps.ts | 2 +- .../src/cli/node-gyp-rebuild.ts | 31 -- .../src/core.ts | 0 packages/electron-builder/src/index.ts | 2 +- .../electron-builder/src/linuxPackager.ts | 2 +- packages/electron-builder/src/macPackager.ts | 2 +- packages/electron-builder/src/metadata.ts | 2 +- .../src/options/linuxOptions.ts | 2 +- .../src/options/macOptions.ts | 2 +- .../src/options/winOptions.ts | 2 +- packages/electron-builder/src/packager.ts | 6 +- packages/electron-builder/src/packagerApi.ts | 2 +- .../electron-builder/src/platformPackager.ts | 6 +- .../src/publish/PublishManager.ts | 2 +- .../src/targets/ArchiveTarget.ts | 2 +- .../src/targets/LinuxTargetHelper.ts | 1 + .../electron-builder/src/targets/appImage.ts | 2 +- packages/electron-builder/src/targets/appx.ts | 2 +- .../electron-builder/src/targets/archive.ts | 2 +- packages/electron-builder/src/targets/dmg.ts | 2 +- packages/electron-builder/src/targets/fpm.ts | 2 +- packages/electron-builder/src/targets/nsis.ts | 3 +- packages/electron-builder/src/targets/pkg.ts | 2 +- packages/electron-builder/src/targets/snap.ts | 2 +- .../src/targets/targetFactory.ts | 2 +- .../src/{ => util}/asarUtil.ts | 8 +- .../src/{ => util}/readInstalled.ts | 0 .../src/{ => util}/repositoryInfo.ts | 4 +- .../electron-builder/src/{ => util}/yarn.ts | 2 +- packages/electron-builder/src/winPackager.ts | 2 +- packages/jsdoc2md.js | 5 - packages/npm-publish.sh | 1 - packages/update-deps.js | 2 +- .../{muon.js.snap => muonTest.js.snap} | 0 test/src/RepoSlugTest.ts | 2 +- test/src/helpers/CheckingPackager.ts | 3 +- test/src/helpers/setVersions.ts | 36 +- test/src/helpers/winHelper.ts | 2 +- test/src/mac/macArchiveTest.ts | 2 +- test/src/{muon.ts => muonTest.ts} | 2 +- test/src/windows/installerTest.ts | 3 +- 55 files changed, 378 insertions(+), 540 deletions(-) delete mode 100644 docs/api/electron-builder-core.md delete mode 100644 packages/electron-builder-core/package.json delete mode 100644 packages/electron-builder-core/readme.md delete mode 100644 packages/electron-builder-core/tsconfig.json delete mode 100644 packages/electron-builder/src/cli/node-gyp-rebuild.ts rename packages/{electron-builder-core => electron-builder}/src/core.ts (100%) rename packages/electron-builder/src/{ => util}/asarUtil.ts (98%) rename packages/electron-builder/src/{ => util}/readInstalled.ts (100%) rename packages/electron-builder/src/{ => util}/repositoryInfo.ts (93%) rename packages/electron-builder/src/{ => util}/yarn.ts (99%) rename test/out/__snapshots__/{muon.js.snap => muonTest.js.snap} (100%) rename test/src/{muon.ts => muonTest.ts} (88%) diff --git a/docs/Home.md b/docs/Home.md index d97ad7e5b46..28eef561b7c 100644 --- a/docs/Home.md +++ b/docs/Home.md @@ -18,7 +18,6 @@ **Programmatic API** * [[electron-builder]] -* [[electron-builder-core]] * [[electron-builder-util]] * [[electron-builder-http]] * [[electron-publish]] diff --git a/docs/Options.md b/docs/Options.md index c93f1a0b96c..ccfa92255c2 100644 --- a/docs/Options.md +++ b/docs/Options.md @@ -173,7 +173,7 @@ Configuration Options For example, `"category": "public.app-category.developer-tools"` will set the application category to *Developer Tools*. Valid values are listed in [Apple's documentation](https://developer.apple.com/library/ios/documentation/General/Reference/InfoPlistKeyReference/Articles/LaunchServicesKeys.html#//apple_ref/doc/uid/TP40009250-SW8). - * `target` Array<[TargetConfig](electron-builder-core#TargetConfig) | "default" | "dmg" | "mas" | "mas-dev" | "pkg" | "7z" | "zip" | "tar.xz" | "tar.lz" | "tar.gz" | "tar.bz2" | "dir"> | "default" | "dmg" | "mas" | "mas-dev" | "pkg" | "7z" | "zip" | "tar.xz" | "tar.lz" | "tar.gz" | "tar.bz2" | "dir" | [TargetConfig](electron-builder-core#TargetConfig) - The target package type: list of `default`, `dmg`, `mas`, `pkg`, `7z`, `zip`, `tar.xz`, `tar.lz`, `tar.gz`, `tar.bz2`, `dir`. Defaults to `default` (dmg and zip for Squirrel.Mac). + * `target` Array<[TargetConfig](electron-builder#TargetConfig) | "default" | "dmg" | "mas" | "mas-dev" | "pkg" | "7z" | "zip" | "tar.xz" | "tar.lz" | "tar.gz" | "tar.bz2" | "dir"> | "default" | "dmg" | "mas" | "mas-dev" | "pkg" | "7z" | "zip" | "tar.xz" | "tar.lz" | "tar.gz" | "tar.bz2" | "dir" | [TargetConfig](electron-builder#TargetConfig) - The target package type: list of `default`, `dmg`, `mas`, `pkg`, `7z`, `zip`, `tar.xz`, `tar.lz`, `tar.gz`, `tar.bz2`, `dir`. Defaults to `default` (dmg and zip for Squirrel.Mac). * `identity` String - The name of certificate to use when signing. Consider using environment variables [CSC_LINK or CSC_NAME](https://github.com/electron-userland/electron-builder/wiki/Code-Signing) instead of specifying this option. MAS installer identity is specified in the [mas](#MasBuildOptions-identity). * `icon` = `build/icon.icns` String - The path to application icon. * `entitlements` String - The path to entitlements file for signing the app. `build/entitlements.mac.plist` will be used if exists (it is a recommended way to set). MAS entitlements is specified in the [mas](#MasBuildOptions-entitlements). @@ -218,7 +218,7 @@ Configuration Options * `artifactName` String - The [artifact file name pattern](https://github.com/electron-userland/electron-builder/wiki/Options#artifact-file-name-pattern). * `publish` String | [GithubOptions](Publishing-Artifacts#GithubOptions) | [S3Options](Publishing-Artifacts#S3Options) | [GenericServerOptions](Publishing-Artifacts#GenericServerOptions) | [BintrayOptions](Publishing-Artifacts#BintrayOptions) | Array * `win` - Windows options. - * `target` = `nsis` String | [TargetConfig](electron-builder-core#TargetConfig) | Array - Target package type: list of `nsis`, `nsis-web` (Web installer), `portable` (portable app without installation), `appx`, `squirrel`, `7z`, `zip`, `tar.xz`, `tar.lz`, `tar.gz`, `tar.bz2`, `dir`. AppX package can be built only on Windows 10. + * `target` = `nsis` String | [TargetConfig](electron-builder#TargetConfig) | Array - Target package type: list of `nsis`, `nsis-web` (Web installer), `portable` (portable app without installation), `appx`, `squirrel`, `7z`, `zip`, `tar.xz`, `tar.lz`, `tar.gz`, `tar.bz2`, `dir`. AppX package can be built only on Windows 10. To use Squirrel.Windows please install `electron-builder-squirrel-windows` dependency. * `signingHashAlgorithms` = `['sha1', 'sha256']` Array<"sha1" | "sha256"> - Array of signing algorithms used. For AppX `sha256` is always used. @@ -304,7 +304,7 @@ Configuration Options * `useAppIdAsId` Boolean - Use `appId` to identify package instead of `name`. * `linux` - Linux options. * `packageCategory` String - The [package category](https://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-Section). Not applicable for AppImage. - * `target` = `AppImage` String | [TargetConfig](electron-builder-core#TargetConfig) | Array - Target package type: list of `AppImage`, `snap`, `deb`, `rpm`, `freebsd`, `pacman`, `p5p`, `apk`, `7z`, `zip`, `tar.xz`, `tar.lz`, `tar.gz`, `tar.bz2`, `dir`. + * `target` = `AppImage` String | [TargetConfig](electron-builder#TargetConfig) | Array - Target package type: list of `AppImage`, `snap`, `deb`, `rpm`, `freebsd`, `pacman`, `p5p`, `apk`, `7z`, `zip`, `tar.xz`, `tar.lz`, `tar.gz`, `tar.bz2`, `dir`. electron-builder [docker image](https://github.com/electron-userland/electron-builder/wiki/Docker) can be used to build Linux targets on any platform. See [Multi platform build](https://github.com/electron-userland/electron-builder/wiki/Multi-Platform-Build). See: [Please do not put an AppImage into another archive like a .zip or .tar.gz](https://github.com/probonopd/AppImageKit/wiki/Creating-AppImages#common-mistake) * `maintainer` String - The maintainer. Defaults to [author](#Metadata-author). diff --git a/docs/_Sidebar.md b/docs/_Sidebar.md index d97ad7e5b46..28eef561b7c 100644 --- a/docs/_Sidebar.md +++ b/docs/_Sidebar.md @@ -18,7 +18,6 @@ **Programmatic API** * [[electron-builder]] -* [[electron-builder-core]] * [[electron-builder-util]] * [[electron-builder-http]] * [[electron-publish]] diff --git a/docs/api/electron-builder-core.md b/docs/api/electron-builder-core.md deleted file mode 100644 index 67cbdc95005..00000000000 --- a/docs/api/electron-builder-core.md +++ /dev/null @@ -1,186 +0,0 @@ - - -## electron-builder-core - -* [electron-builder-core](#module_electron-builder-core) - * [`.BeforeBuildContext`](#BeforeBuildContext) - * [`.SourceRepositoryInfo`](#SourceRepositoryInfo) - * [`.TargetConfig`](#TargetConfig) - * [`.TargetSpecificOptions`](#TargetSpecificOptions) - * [.Platform](#Platform) - * [`.createTarget(type, archs)`](#module_electron-builder-core.Platform+createTarget) ⇒ Map<[Platform](#Platform) \| Map<[Arch](#Arch) \| Array<String>>> - * [`.current()`](#module_electron-builder-core.Platform+current) ⇒ [Platform](#Platform) - * [`.fromString(name)`](#module_electron-builder-core.Platform+fromString) ⇒ [Platform](#Platform) - * [`.toString()`](#module_electron-builder-core.Platform+toString) ⇒ String - * [.Target](#Target) - * [`.build(appOutDir, arch)`](#module_electron-builder-core.Target+build) ⇒ Promise<any> - * [`.finishBuild()`](#module_electron-builder-core.Target+finishBuild) ⇒ Promise<any> - * [`.Arch`](#Arch) : enum - * [`.archFromString(name)`](#module_electron-builder-core.archFromString) ⇒ [Arch](#Arch) - * [`.getArchSuffix(arch)`](#module_electron-builder-core.getArchSuffix) ⇒ String - * [`.toLinuxArchString(arch)`](#module_electron-builder-core.toLinuxArchString) ⇒ "armv7l" \| "i386" \| "amd64" - - - -### `BeforeBuildContext` -**Kind**: interface of [electron-builder-core](#module_electron-builder-core) -**Properties** - -| Name | Type | -| --- | --- | -| **appDir**| String | -| **electronVersion**| String | -| **platform**| [Platform](#Platform) | -| **arch**| String | - - - -### `SourceRepositoryInfo` -**Kind**: interface of [electron-builder-core](#module_electron-builder-core) -**Properties** - -| Name | Type | -| --- | --- | -| type| String | -| domain| String | -| **user**| String | -| **project**| String | - - - -### `TargetConfig` -**Kind**: interface of [electron-builder-core](#module_electron-builder-core) -**Properties** - -| Name | Type | Description | -| --- | --- | --- | -| **target**| String | The target name. e.g. `snap`. | -| arch| Array<"x64" \| "ia32" \| "armv7l"> \| String | The arch or list of archs. | - - - -### `TargetSpecificOptions` -**Kind**: interface of [electron-builder-core](#module_electron-builder-core) -**Properties** - -| Name | Type | Description | -| --- | --- | --- | -| artifactName| String \| null | The [artifact file name pattern](https://github.com/electron-userland/electron-builder/wiki/Options#artifact-file-name-pattern). | -| publish| null \| String \| [GithubOptions](Publishing-Artifacts#GithubOptions) \| [S3Options](Publishing-Artifacts#S3Options) \| [GenericServerOptions](Publishing-Artifacts#GenericServerOptions) \| [BintrayOptions](Publishing-Artifacts#BintrayOptions) \| Array | | - - - -### Platform -**Kind**: class of [electron-builder-core](#module_electron-builder-core) -**Properties** - -| Name | Type | -| --- | --- | -| MAC = new Platform("mac", "mac", "darwin")| [Platform](#Platform) | -| LINUX = new Platform("linux", "linux", "linux")| [Platform](#Platform) | -| WINDOWS = new Platform("windows", "win", "win32")| [Platform](#Platform) | -| OSX = Platform.MAC| [Platform](#Platform) | - - -* [.Platform](#Platform) - * [`.createTarget(type, archs)`](#module_electron-builder-core.Platform+createTarget) ⇒ Map<[Platform](#Platform) \| Map<[Arch](#Arch) \| Array<String>>> - * [`.current()`](#module_electron-builder-core.Platform+current) ⇒ [Platform](#Platform) - * [`.fromString(name)`](#module_electron-builder-core.Platform+fromString) ⇒ [Platform](#Platform) - * [`.toString()`](#module_electron-builder-core.Platform+toString) ⇒ String - - - -#### `platform.createTarget(type, archs)` ⇒ Map<[Platform](#Platform) \| Map<[Arch](#Arch) \| Array<String>>> -**Kind**: instance method of [Platform](#Platform) - -| Param | Type | -| --- | --- | -| type | String \| Array<String> \| null | -| archs | Array<[Arch](#Arch)> | - - - -#### `platform.current()` ⇒ [Platform](#Platform) -**Kind**: instance method of [Platform](#Platform) - - -#### `platform.fromString(name)` ⇒ [Platform](#Platform) -**Kind**: instance method of [Platform](#Platform) - -| Param | Type | -| --- | --- | -| name | String | - - - -#### `platform.toString()` ⇒ String -**Kind**: instance method of [Platform](#Platform) - - -### Target -**Kind**: class of [electron-builder-core](#module_electron-builder-core) -**Properties** - -| Name | Type | -| --- | --- | -| outDir| String | -| options| [TargetSpecificOptions](#TargetSpecificOptions) \| null \| undefined | - - -* [.Target](#Target) - * [`.build(appOutDir, arch)`](#module_electron-builder-core.Target+build) ⇒ Promise<any> - * [`.finishBuild()`](#module_electron-builder-core.Target+finishBuild) ⇒ Promise<any> - - - -#### `target.build(appOutDir, arch)` ⇒ Promise<any> -**Kind**: instance method of [Target](#Target) - -| Param | Type | -| --- | --- | -| appOutDir | String | -| arch | [Arch](#Arch) | - - - -#### `target.finishBuild()` ⇒ Promise<any> -**Kind**: instance method of [Target](#Target) - - -### `electron-builder-core.Arch` : enum -**Kind**: enum of [electron-builder-core](#module_electron-builder-core) -**Properties** - -| Name | -| --- | -| **ia32**| -| **x64**| -| **armv7l**| - - - -### `electron-builder-core.archFromString(name)` ⇒ [Arch](#Arch) -**Kind**: method of [electron-builder-core](#module_electron-builder-core) - -| Param | Type | -| --- | --- | -| name | String | - - - -### `electron-builder-core.getArchSuffix(arch)` ⇒ String -**Kind**: method of [electron-builder-core](#module_electron-builder-core) - -| Param | Type | -| --- | --- | -| arch | [Arch](#Arch) | - - - -### `electron-builder-core.toLinuxArchString(arch)` ⇒ "armv7l" \| "i386" \| "amd64" -**Kind**: method of [electron-builder-core](#module_electron-builder-core) - -| Param | Type | -| --- | --- | -| arch | [Arch](#Arch) | - diff --git a/docs/api/electron-builder.md b/docs/api/electron-builder.md index 0abb5deb958..85c71d9129c 100644 --- a/docs/api/electron-builder.md +++ b/docs/api/electron-builder.md @@ -10,6 +10,8 @@
electron-builder/out/codeSign
+
electron-builder/out/core
+
electron-builder/out/linuxPackager
electron-builder/out/macPackager
@@ -30,8 +32,6 @@
electron-builder/out/targets/fpm
-
electron-builder/out/targets/LinuxTargetHelper
-
electron-builder/out/targets/nsis
electron-builder/out/targets/pkg
@@ -63,16 +63,27 @@ * [`.CommonNsisOptions`](#CommonNsisOptions) * [`.ForgeOptions`](#ForgeOptions) * [`.LinuxTargetSpecificOptions`](#LinuxTargetSpecificOptions) ⇐ [CommonLinuxOptions](#CommonLinuxOptions) - * [`.PlatformSpecificBuildOptions`](#PlatformSpecificBuildOptions) ⇐ [TargetSpecificOptions](electron-builder-core#TargetSpecificOptions) + * [`.PlatformSpecificBuildOptions`](#PlatformSpecificBuildOptions) ⇐ [TargetSpecificOptions](#TargetSpecificOptions) * [.Packager](#Packager) ⇐ [BuildInfo](#BuildInfo) * [`.addAfterPackHandler(handler)`](#module_electron-builder.Packager+addAfterPackHandler) * [`.afterPack(context)`](#module_electron-builder.Packager+afterPack) ⇒ Promise<void> * [`.artifactCreated(handler)`](#module_electron-builder.Packager+artifactCreated) ⇒ [Packager](#Packager) * [`.build()`](#module_electron-builder.Packager+build) ⇒ Promise<[BuildResult](#BuildResult)> * [`.dispatchArtifactCreated(event)`](#module_electron-builder.Packager+dispatchArtifactCreated) + * [.Platform](#Platform) + * [`.createTarget(type, archs)`](#module_electron-builder.Platform+createTarget) ⇒ Map<[Platform](#Platform) \| Map<module:electron-builder/out/core.Arch \| Array<String>>> + * [`.current()`](#module_electron-builder.Platform+current) ⇒ [Platform](#Platform) + * [`.fromString(name)`](#module_electron-builder.Platform+fromString) ⇒ [Platform](#Platform) + * [`.toString()`](#module_electron-builder.Platform+toString) ⇒ String + * [.Target](#Target) + * [`.build(appOutDir, arch)`](#module_electron-builder.Target+build) ⇒ Promise<any> + * [`.finishBuild()`](#module_electron-builder.Target+finishBuild) ⇒ Promise<any> + * [`.Arch`](#Arch) : enum + * [`.archFromString(name)`](#module_electron-builder.archFromString) ⇒ module:electron-builder/out/core.Arch * [`.build(rawOptions)`](#module_electron-builder.build) ⇒ Promise<Array<String>> * [`.buildForge(forgeOptions, options)`](#module_electron-builder.buildForge) ⇒ Promise<Array<String>> - * [`.createTargets(platforms, type, arch)`](#module_electron-builder.createTargets) ⇒ Map<[Platform](electron-builder-core#Platform) \| Map<[Arch](electron-builder-core#Arch) \| Array<String>>> + * [`.createTargets(platforms, type, arch)`](#module_electron-builder.createTargets) ⇒ Map<[Platform](#Platform) \| Map<module:electron-builder/out/core.Arch \| Array<String>>> + * [`.getArchSuffix(arch)`](#module_electron-builder.getArchSuffix) ⇒ String @@ -85,8 +96,8 @@ | **appOutDir**| String | | **packager**| [PlatformPackager](#PlatformPackager)<any> | | **electronPlatformName**| String | -| **arch**| [Arch](electron-builder-core#Arch) | -| **targets**| Array<[Target](electron-builder-core#Target)> | +| **arch**| module:electron-builder/out/core.Arch | +| **targets**| Array<[Target](#Target)> | @@ -97,8 +108,8 @@ | Name | Type | | --- | --- | | **packager**| [PlatformPackager](#PlatformPackager)<any> | -| target| [Target](electron-builder-core#Target) \| null | -| arch| [Arch](electron-builder-core#Arch) \| null | +| target| [Target](#Target) \| null | +| arch| module:electron-builder/out/core.Arch \| null | | file| String | | data| Buffer | | safeArtifactName| String | @@ -123,7 +134,7 @@ | **isTwoPackageJsonProjectLayoutUsed**| Boolean | | **appInfo**| [AppInfo](#AppInfo) | | **tempDirManager**| [TmpDir](electron-builder-util#TmpDir) | -| **repositoryInfo**| Promise< \| [SourceRepositoryInfo](electron-builder-core#SourceRepositoryInfo)> | +| **repositoryInfo**| Promise< \| [SourceRepositoryInfo](#SourceRepositoryInfo)> | | **isPrepackedAppAsar**| Boolean | | prepackaged| String \| null | | **cancellationToken**| [CancellationToken](electron-builder-http#CancellationToken) | @@ -160,7 +171,7 @@ | Name | Type | | --- | --- | | **outDir**| String | -| **platformToTargets**| Map<[Platform](electron-builder-core#Platform) \| Map<String \| [Target](electron-builder-core#Target)>> | +| **platformToTargets**| Map<[Platform](#Platform) \| Map<String \| [Target](#Target)>> | @@ -206,7 +217,7 @@ ### `LinuxTargetSpecificOptions` ⇐ [CommonLinuxOptions](#CommonLinuxOptions) **Kind**: interface of [electron-builder](Options#module_electron-builder) -**Extends**: [CommonLinuxOptions](#CommonLinuxOptions), [TargetSpecificOptions](electron-builder-core#TargetSpecificOptions) +**Extends**: [CommonLinuxOptions](#CommonLinuxOptions), [TargetSpecificOptions](#TargetSpecificOptions) **Properties** | Name | Type | Description | @@ -216,9 +227,9 @@ -### `PlatformSpecificBuildOptions` ⇐ [TargetSpecificOptions](electron-builder-core#TargetSpecificOptions) +### `PlatformSpecificBuildOptions` ⇐ [TargetSpecificOptions](#TargetSpecificOptions) **Kind**: interface of [electron-builder](Options#module_electron-builder) -**Extends**: [TargetSpecificOptions](electron-builder-core#TargetSpecificOptions) +**Extends**: [TargetSpecificOptions](#TargetSpecificOptions) **Properties** | Name | Type | @@ -228,7 +239,7 @@ | extraResources| Array<String \| [FilePattern](Options#FilePattern)> \| [FilePattern](Options#FilePattern) \| String \| null | | asarUnpack| Array<String> \| String \| null | | asar| [AsarOptions](Options#AsarOptions) \| Boolean \| null | -| target| Array<String \| [TargetConfig](electron-builder-core#TargetConfig)> \| String \| [TargetConfig](electron-builder-core#TargetConfig) \| null | +| target| Array<String \| [TargetConfig](#TargetConfig)> \| String \| [TargetConfig](#TargetConfig) \| null | | icon| String \| null | | fileAssociations| Array<[FileAssociation](Options#FileAssociation)> \| [FileAssociation](Options#FileAssociation) | | forceCodeSigning| Boolean | @@ -254,7 +265,7 @@ | eventEmitter = new EventEmitter()| internal:EventEmitter | | **appInfo**| [AppInfo](#AppInfo) | | tempDirManager = new TmpDir()| [TmpDir](electron-builder-util#TmpDir) | -| **repositoryInfo**| Promise< \| [SourceRepositoryInfo](electron-builder-core#SourceRepositoryInfo)> | +| **repositoryInfo**| Promise< \| [SourceRepositoryInfo](#SourceRepositoryInfo)> | | prepackaged| String \| null | @@ -307,6 +318,104 @@ | --- | --- | | event | [ArtifactCreated](#ArtifactCreated) | + + +### Platform +**Kind**: class of [electron-builder](Options#module_electron-builder) +**Properties** + +| Name | Type | +| --- | --- | +| MAC = new Platform("mac", "mac", "darwin")| [Platform](#Platform) | +| LINUX = new Platform("linux", "linux", "linux")| [Platform](#Platform) | +| WINDOWS = new Platform("windows", "win", "win32")| [Platform](#Platform) | +| OSX = Platform.MAC| [Platform](#Platform) | + + +* [.Platform](#Platform) + * [`.createTarget(type, archs)`](#module_electron-builder.Platform+createTarget) ⇒ Map<[Platform](#Platform) \| Map<module:electron-builder/out/core.Arch \| Array<String>>> + * [`.current()`](#module_electron-builder.Platform+current) ⇒ [Platform](#Platform) + * [`.fromString(name)`](#module_electron-builder.Platform+fromString) ⇒ [Platform](#Platform) + * [`.toString()`](#module_electron-builder.Platform+toString) ⇒ String + + + +#### `platform.createTarget(type, archs)` ⇒ Map<[Platform](#Platform) \| Map<module:electron-builder/out/core.Arch \| Array<String>>> +**Kind**: instance method of [Platform](#Platform) + +| Param | Type | +| --- | --- | +| type | String \| Array<String> \| null | +| archs | Array<module:electron-builder/out/core.Arch> | + + + +#### `platform.current()` ⇒ [Platform](#Platform) +**Kind**: instance method of [Platform](#Platform) + + +#### `platform.fromString(name)` ⇒ [Platform](#Platform) +**Kind**: instance method of [Platform](#Platform) + +| Param | Type | +| --- | --- | +| name | String | + + + +#### `platform.toString()` ⇒ String +**Kind**: instance method of [Platform](#Platform) + + +### Target +**Kind**: class of [electron-builder](Options#module_electron-builder) +**Properties** + +| Name | Type | +| --- | --- | +| outDir| String | +| options| [TargetSpecificOptions](#TargetSpecificOptions) \| null \| undefined | + + +* [.Target](#Target) + * [`.build(appOutDir, arch)`](#module_electron-builder.Target+build) ⇒ Promise<any> + * [`.finishBuild()`](#module_electron-builder.Target+finishBuild) ⇒ Promise<any> + + + +#### `target.build(appOutDir, arch)` ⇒ Promise<any> +**Kind**: instance method of [Target](#Target) + +| Param | Type | +| --- | --- | +| appOutDir | String | +| arch | module:electron-builder/out/core.Arch | + + + +#### `target.finishBuild()` ⇒ Promise<any> +**Kind**: instance method of [Target](#Target) + + +### `electron-builder.Arch` : enum +**Kind**: enum of [electron-builder](Options#module_electron-builder) +**Properties** + +| Name | +| --- | +| **ia32**| +| **x64**| +| **armv7l**| + + + +### `electron-builder.archFromString(name)` ⇒ module:electron-builder/out/core.Arch +**Kind**: method of [electron-builder](Options#module_electron-builder) + +| Param | Type | +| --- | --- | +| name | String | + ### `electron-builder.build(rawOptions)` ⇒ Promise<Array<String>> @@ -328,15 +437,24 @@ -### `electron-builder.createTargets(platforms, type, arch)` ⇒ Map<[Platform](electron-builder-core#Platform) \| Map<[Arch](electron-builder-core#Arch) \| Array<String>>> +### `electron-builder.createTargets(platforms, type, arch)` ⇒ Map<[Platform](#Platform) \| Map<module:electron-builder/out/core.Arch \| Array<String>>> **Kind**: method of [electron-builder](Options#module_electron-builder) | Param | Type | | --- | --- | -| platforms | Array<[Platform](electron-builder-core#Platform)> | +| platforms | Array<[Platform](#Platform)> | | type | String \| null | | arch | String \| null | + + +### `electron-builder.getArchSuffix(arch)` ⇒ String +**Kind**: method of [electron-builder](Options#module_electron-builder) + +| Param | Type | +| --- | --- | +| arch | module:electron-builder/out/core.Arch | + ## electron-builder/out/appInfo @@ -453,6 +571,74 @@ | name | String | | keychain | String | + + +## electron-builder/out/core + +* [electron-builder/out/core](#module_electron-builder/out/core) + * [`.BeforeBuildContext`](#BeforeBuildContext) + * [`.SourceRepositoryInfo`](#SourceRepositoryInfo) + * [`.TargetConfig`](#TargetConfig) + * [`.TargetSpecificOptions`](#TargetSpecificOptions) + * [`.toLinuxArchString(arch)`](#module_electron-builder/out/core.toLinuxArchString) ⇒ "armv7l" \| "i386" \| "amd64" + + + +### `BeforeBuildContext` +**Kind**: interface of [electron-builder/out/core](#module_electron-builder/out/core) +**Properties** + +| Name | Type | +| --- | --- | +| **appDir**| String | +| **electronVersion**| String | +| **platform**| [Platform](#Platform) | +| **arch**| String | + + + +### `SourceRepositoryInfo` +**Kind**: interface of [electron-builder/out/core](#module_electron-builder/out/core) +**Properties** + +| Name | Type | +| --- | --- | +| type| String | +| domain| String | +| **user**| String | +| **project**| String | + + + +### `TargetConfig` +**Kind**: interface of [electron-builder/out/core](#module_electron-builder/out/core) +**Properties** + +| Name | Type | Description | +| --- | --- | --- | +| **target**| String | The target name. e.g. `snap`. | +| arch| Array<"x64" \| "ia32" \| "armv7l"> \| String | The arch or list of archs. | + + + +### `TargetSpecificOptions` +**Kind**: interface of [electron-builder/out/core](#module_electron-builder/out/core) +**Properties** + +| Name | Type | Description | +| --- | --- | --- | +| artifactName| String \| null | The [artifact file name pattern](https://github.com/electron-userland/electron-builder/wiki/Options#artifact-file-name-pattern). | +| publish| null \| String \| [GithubOptions](Publishing-Artifacts#GithubOptions) \| [S3Options](Publishing-Artifacts#S3Options) \| [GenericServerOptions](Publishing-Artifacts#GenericServerOptions) \| [BintrayOptions](Publishing-Artifacts#BintrayOptions) \| Array | | + + + +### `electron-builder/out/core.toLinuxArchString(arch)` ⇒ "armv7l" \| "i386" \| "amd64" +**Kind**: method of [electron-builder/out/core](#module_electron-builder/out/core) + +| Param | Type | +| --- | --- | +| arch | module:electron-builder/out/core.Arch | + ## electron-builder/out/linuxPackager @@ -487,7 +673,7 @@ | --- | --- | | executableName| String | | **defaultTarget**| Array<String> | -| **platform**| [Platform](electron-builder-core#Platform) | +| **platform**| [Platform](#Platform) | * [.LinuxPackager](#LinuxPackager) ⇐ [PlatformPackager](#PlatformPackager) @@ -528,7 +714,7 @@ | Param | Type | | --- | --- | | ext | String | -| arch | [Arch](electron-builder-core#Arch) \| null | +| arch | module:electron-builder/out/core.Arch \| null | | skipArchIfX64 | | @@ -548,8 +734,8 @@ | Param | Type | | --- | --- | | file | String | -| target | [Target](electron-builder-core#Target) \| null | -| arch | [Arch](electron-builder-core#Arch) \| null | +| target | [Target](#Target) \| null | +| arch | module:electron-builder/out/core.Arch \| null | | safeArtifactName | String | @@ -577,9 +763,9 @@ | Param | Type | | --- | --- | -| targetSpecificOptions | [TargetSpecificOptions](electron-builder-core#TargetSpecificOptions) \| undefined \| null | +| targetSpecificOptions | [TargetSpecificOptions](#TargetSpecificOptions) \| undefined \| null | | ext | String | -| arch | [Arch](electron-builder-core#Arch) \| null | +| arch | module:electron-builder/out/core.Arch \| null | | defaultPattern | String | | skipArchIfX64 | | @@ -603,7 +789,7 @@ | Param | Type | | --- | --- | | ext | String \| null | -| arch | [Arch](electron-builder-core#Arch) | +| arch | module:electron-builder/out/core.Arch | | deployment | Boolean | | classifier | String \| null | @@ -639,8 +825,8 @@ | Param | Type | | --- | --- | | outDir | String | -| arch | [Arch](electron-builder-core#Arch) | -| targets | Array<[Target](electron-builder-core#Target)> | +| arch | module:electron-builder/out/core.Arch | +| targets | Array<[Target](#Target)> | | postAsyncTasks | Array<Promise<any>> | @@ -705,7 +891,7 @@ | --- | --- | | codeSigningInfo| Promise<[CodeSigningInfo](#CodeSigningInfo)> | | **defaultTarget**| Array<String> | -| **platform**| [Platform](electron-builder-core#Platform) | +| **platform**| [Platform](#Platform) | * [.MacPackager](#MacPackager) ⇐ [PlatformPackager](#PlatformPackager) @@ -772,8 +958,8 @@ | Param | Type | | --- | --- | | outDir | String | -| arch | [Arch](electron-builder-core#Arch) | -| targets | Array<[Target](electron-builder-core#Target)> | +| arch | module:electron-builder/out/core.Arch | +| targets | Array<[Target](#Target)> | | postAsyncTasks | Array<Promise<any>> | @@ -784,7 +970,7 @@ | Param | Type | | --- | --- | | ext | String | -| arch | [Arch](electron-builder-core#Arch) \| null | +| arch | module:electron-builder/out/core.Arch \| null | | skipArchIfX64 | | @@ -804,8 +990,8 @@ | Param | Type | | --- | --- | | file | String | -| target | [Target](electron-builder-core#Target) \| null | -| arch | [Arch](electron-builder-core#Arch) \| null | +| target | [Target](#Target) \| null | +| arch | module:electron-builder/out/core.Arch \| null | | safeArtifactName | String | @@ -815,9 +1001,9 @@ | Param | Type | | --- | --- | -| targetSpecificOptions | [TargetSpecificOptions](electron-builder-core#TargetSpecificOptions) \| undefined \| null | +| targetSpecificOptions | [TargetSpecificOptions](#TargetSpecificOptions) \| undefined \| null | | ext | String | -| arch | [Arch](electron-builder-core#Arch) \| null | +| arch | module:electron-builder/out/core.Arch \| null | | defaultPattern | String | | skipArchIfX64 | | @@ -841,7 +1027,7 @@ | Param | Type | | --- | --- | | ext | String \| null | -| arch | [Arch](electron-builder-core#Arch) | +| arch | module:electron-builder/out/core.Arch | | deployment | Boolean | | classifier | String \| null | @@ -898,12 +1084,12 @@ ## electron-builder/out/packager -### `electron-builder/out/packager.normalizePlatforms(rawPlatforms)` ⇒ Array<[Platform](electron-builder-core#Platform)> +### `electron-builder/out/packager.normalizePlatforms(rawPlatforms)` ⇒ Array<[Platform](#Platform)> **Kind**: method of [electron-builder/out/packager](#module_electron-builder/out/packager) | Param | Type | | --- | --- | -| rawPlatforms | Array<String \| [Platform](electron-builder-core#Platform)> \| String \| [Platform](electron-builder-core#Platform) \| undefined \| null | +| rawPlatforms | Array<String \| [Platform](#Platform)> \| String \| [Platform](#Platform) \| undefined \| null | @@ -943,7 +1129,7 @@ | config| [Config](Options#Config) | | platformSpecificBuildOptions| module:electron-builder/out/platformPackager.DC | | **resourceList**| Promise<Array<String>> | -| **platform**| [Platform](electron-builder-core#Platform) | +| **platform**| [Platform](#Platform) | | appInfo| [AppInfo](#AppInfo) | | **defaultTarget**| Array<String> | | **relativeBuildResourcesDirname**| String | @@ -980,7 +1166,7 @@ | Param | Type | | --- | --- | | ext | String | -| arch | [Arch](electron-builder-core#Arch) \| null | +| arch | module:electron-builder/out/core.Arch \| null | | skipArchIfX64 | | @@ -1011,8 +1197,8 @@ | Param | Type | | --- | --- | | file | String | -| target | [Target](electron-builder-core#Target) \| null | -| arch | [Arch](electron-builder-core#Arch) \| null | +| target | [Target](#Target) \| null | +| arch | module:electron-builder/out/core.Arch \| null | | safeArtifactName | String | @@ -1040,9 +1226,9 @@ | Param | Type | | --- | --- | -| targetSpecificOptions | [TargetSpecificOptions](electron-builder-core#TargetSpecificOptions) \| undefined \| null | +| targetSpecificOptions | [TargetSpecificOptions](#TargetSpecificOptions) \| undefined \| null | | ext | String | -| arch | [Arch](electron-builder-core#Arch) \| null | +| arch | module:electron-builder/out/core.Arch \| null | | defaultPattern | String | | skipArchIfX64 | | @@ -1066,7 +1252,7 @@ | Param | Type | | --- | --- | | ext | String \| null | -| arch | [Arch](electron-builder-core#Arch) | +| arch | module:electron-builder/out/core.Arch | | deployment | Boolean | | classifier | String \| null | @@ -1102,8 +1288,8 @@ | Param | Type | | --- | --- | | outDir | String | -| arch | [Arch](electron-builder-core#Arch) | -| targets | Array<[Target](electron-builder-core#Target)> | +| arch | module:electron-builder/out/core.Arch | +| targets | Array<[Target](#Target)> | | postAsyncTasks | Array<Promise<any>> | @@ -1213,7 +1399,7 @@ | --- | --- | | packager | [PlatformPackager](#PlatformPackager)<any> | | targetSpecificOptions | [PlatformSpecificBuildOptions](#PlatformSpecificBuildOptions) \| null \| undefined | -| arch | [Arch](electron-builder-core#Arch) \| null | +| arch | module:electron-builder/out/core.Arch \| null | @@ -1224,21 +1410,21 @@ | --- | --- | | packager | [PlatformPackager](#PlatformPackager)<any> | | publishConfigs | Array<[PublishConfiguration](Publishing-Artifacts#PublishConfiguration)> \| null | -| arch | [Arch](electron-builder-core#Arch) \| null | +| arch | module:electron-builder/out/core.Arch \| null | ## electron-builder/out/targets/appImage * [electron-builder/out/targets/appImage](#module_electron-builder/out/targets/appImage) - * [.AppImageTarget](#AppImageTarget) ⇐ [Target](electron-builder-core#Target) + * [.AppImageTarget](#AppImageTarget) ⇐ [Target](#Target) * [`.build(appOutDir, arch)`](#module_electron-builder/out/targets/appImage.AppImageTarget+build) ⇒ Promise<any> -### AppImageTarget ⇐ [Target](electron-builder-core#Target) +### AppImageTarget ⇐ [Target](#Target) **Kind**: class of [electron-builder/out/targets/appImage](#module_electron-builder/out/targets/appImage) -**Extends**: [Target](electron-builder-core#Target) +**Extends**: [Target](#Target) **Properties** | Name | Type | @@ -1253,27 +1439,27 @@ | Param | Type | | --- | --- | | appOutDir | String | -| arch | [Arch](electron-builder-core#Arch) | +| arch | module:electron-builder/out/core.Arch | ## electron-builder/out/targets/appx * [electron-builder/out/targets/appx](#module_electron-builder/out/targets/appx) - * [.AppXTarget](#AppXTarget) ⇐ [Target](electron-builder-core#Target) + * [.AppXTarget](#AppXTarget) ⇐ [Target](#Target) * [`.build(appOutDir, arch)`](#module_electron-builder/out/targets/appx.AppXTarget+build) ⇒ Promise<any> * [`.quoteString(s)`](#module_electron-builder/out/targets/appx.quoteString) ⇒ String -### AppXTarget ⇐ [Target](electron-builder-core#Target) +### AppXTarget ⇐ [Target](#Target) **Kind**: class of [electron-builder/out/targets/appx](#module_electron-builder/out/targets/appx) -**Extends**: [Target](electron-builder-core#Target) +**Extends**: [Target](#Target) **Properties** | Name | Type | | --- | --- | -| options = Object.assign({}, this.packager.platformSpecificBuildOptions, this.packager.config.appx)| [AppXOptions](Options#AppXOptions) | +| options = deepAssign({}, this.packager.platformSpecificBuildOptions, this.packager.config.appx)| [AppXOptions](Options#AppXOptions) | @@ -1283,7 +1469,7 @@ | Param | Type | | --- | --- | | appOutDir | String | -| arch | [Arch](electron-builder-core#Arch) | +| arch | module:electron-builder/out/core.Arch | @@ -1299,14 +1485,14 @@ ## electron-builder/out/targets/ArchiveTarget * [electron-builder/out/targets/ArchiveTarget](#module_electron-builder/out/targets/ArchiveTarget) - * [.ArchiveTarget](#ArchiveTarget) ⇐ [Target](electron-builder-core#Target) + * [.ArchiveTarget](#ArchiveTarget) ⇐ [Target](#Target) * [`.build(appOutDir, arch)`](#module_electron-builder/out/targets/ArchiveTarget.ArchiveTarget+build) ⇒ Promise<any> -### ArchiveTarget ⇐ [Target](electron-builder-core#Target) +### ArchiveTarget ⇐ [Target](#Target) **Kind**: class of [electron-builder/out/targets/ArchiveTarget](#module_electron-builder/out/targets/ArchiveTarget) -**Extends**: [Target](electron-builder-core#Target) +**Extends**: [Target](#Target) **Properties** | Name | Type | @@ -1321,14 +1507,14 @@ | Param | Type | | --- | --- | | appOutDir | String | -| arch | [Arch](electron-builder-core#Arch) | +| arch | module:electron-builder/out/core.Arch | ## electron-builder/out/targets/dmg * [electron-builder/out/targets/dmg](#module_electron-builder/out/targets/dmg) - * [.DmgTarget](#DmgTarget) ⇐ [Target](electron-builder-core#Target) + * [.DmgTarget](#DmgTarget) ⇐ [Target](#Target) * [`.build(appPath, arch)`](#module_electron-builder/out/targets/dmg.DmgTarget+build) ⇒ Promise<void> * [`.computeDmgOptions()`](#module_electron-builder/out/targets/dmg.DmgTarget+computeDmgOptions) ⇒ Promise<[DmgOptions](Options#DmgOptions)> * [`.computeVolumeName(custom)`](#module_electron-builder/out/targets/dmg.DmgTarget+computeVolumeName) ⇒ String @@ -1336,9 +1522,9 @@ -### DmgTarget ⇐ [Target](electron-builder-core#Target) +### DmgTarget ⇐ [Target](#Target) **Kind**: class of [electron-builder/out/targets/dmg](#module_electron-builder/out/targets/dmg) -**Extends**: [Target](electron-builder-core#Target) +**Extends**: [Target](#Target) **Properties** | Name | Type | @@ -1346,7 +1532,7 @@ | options = this.packager.config.dmg || Object.create(null)| [DmgOptions](Options#DmgOptions) | -* [.DmgTarget](#DmgTarget) ⇐ [Target](electron-builder-core#Target) +* [.DmgTarget](#DmgTarget) ⇐ [Target](#Target) * [`.build(appPath, arch)`](#module_electron-builder/out/targets/dmg.DmgTarget+build) ⇒ Promise<void> * [`.computeDmgOptions()`](#module_electron-builder/out/targets/dmg.DmgTarget+computeDmgOptions) ⇒ Promise<[DmgOptions](Options#DmgOptions)> * [`.computeVolumeName(custom)`](#module_electron-builder/out/targets/dmg.DmgTarget+computeVolumeName) ⇒ String @@ -1359,7 +1545,7 @@ | Param | Type | | --- | --- | | appPath | String | -| arch | [Arch](electron-builder-core#Arch) | +| arch | module:electron-builder/out/core.Arch | @@ -1390,14 +1576,14 @@ ## electron-builder/out/targets/fpm * [electron-builder/out/targets/fpm](#module_electron-builder/out/targets/fpm) - * [.FpmTarget](#FpmTarget) ⇐ [Target](electron-builder-core#Target) + * [.FpmTarget](#FpmTarget) ⇐ [Target](#Target) * [`.build(appOutDir, arch)`](#module_electron-builder/out/targets/fpm.FpmTarget+build) ⇒ Promise<any> -### FpmTarget ⇐ [Target](electron-builder-core#Target) +### FpmTarget ⇐ [Target](#Target) **Kind**: class of [electron-builder/out/targets/fpm](#module_electron-builder/out/targets/fpm) -**Extends**: [Target](electron-builder-core#Target) +**Extends**: [Target](#Target) **Properties** | Name | Type | @@ -1412,53 +1598,7 @@ | Param | Type | | --- | --- | | appOutDir | String | -| arch | [Arch](electron-builder-core#Arch) | - - - -## electron-builder/out/targets/LinuxTargetHelper - -* [electron-builder/out/targets/LinuxTargetHelper](#module_electron-builder/out/targets/LinuxTargetHelper) - * [.LinuxTargetHelper](#LinuxTargetHelper) - * [`.computeDesktopEntry(targetSpecificOptions, exec, destination, extra)`](#module_electron-builder/out/targets/LinuxTargetHelper.LinuxTargetHelper+computeDesktopEntry) ⇒ Promise<String> - * [`.getDescription(options)`](#module_electron-builder/out/targets/LinuxTargetHelper.LinuxTargetHelper+getDescription) ⇒ String - - - -### LinuxTargetHelper -**Kind**: class of [electron-builder/out/targets/LinuxTargetHelper](#module_electron-builder/out/targets/LinuxTargetHelper) -**Properties** - -| Name | Type | -| --- | --- | -| icons| Promise<Array<Array<String>>> | -| maxIconPath| String \| null | - - -* [.LinuxTargetHelper](#LinuxTargetHelper) - * [`.computeDesktopEntry(targetSpecificOptions, exec, destination, extra)`](#module_electron-builder/out/targets/LinuxTargetHelper.LinuxTargetHelper+computeDesktopEntry) ⇒ Promise<String> - * [`.getDescription(options)`](#module_electron-builder/out/targets/LinuxTargetHelper.LinuxTargetHelper+getDescription) ⇒ String - - - -#### `linuxTargetHelper.computeDesktopEntry(targetSpecificOptions, exec, destination, extra)` ⇒ Promise<String> -**Kind**: instance method of [LinuxTargetHelper](#LinuxTargetHelper) - -| Param | Type | -| --- | --- | -| targetSpecificOptions | [LinuxTargetSpecificOptions](#LinuxTargetSpecificOptions) | -| exec | String | -| destination | String \| null | -| extra | Object<String, any> | - - - -#### `linuxTargetHelper.getDescription(options)` ⇒ String -**Kind**: instance method of [LinuxTargetHelper](#LinuxTargetHelper) - -| Param | Type | -| --- | --- | -| options | [LinuxBuildOptions](Options#LinuxBuildOptions) | +| arch | module:electron-builder/out/core.Arch | @@ -1468,9 +1608,6 @@ * [.AppPackageHelper](#AppPackageHelper) * [`.finishBuild()`](#module_electron-builder/out/targets/nsis.AppPackageHelper+finishBuild) ⇒ Promise<any> * [`.packArch(arch, target)`](#module_electron-builder/out/targets/nsis.AppPackageHelper+packArch) ⇒ Promise<String> - * [.NsisTarget](#NsisTarget) ⇐ [Target](electron-builder-core#Target) - * [`.build(appOutDir, arch)`](#module_electron-builder/out/targets/nsis.NsisTarget+build) ⇒ Promise<void> - * [`.finishBuild()`](#module_electron-builder/out/targets/nsis.NsisTarget+finishBuild) ⇒ Promise<any> @@ -1492,54 +1629,23 @@ | Param | Type | | --- | --- | -| arch | [Arch](electron-builder-core#Arch) | -| target | [NsisTarget](#NsisTarget) | - - - -### NsisTarget ⇐ [Target](electron-builder-core#Target) -**Kind**: class of [electron-builder/out/targets/nsis](#module_electron-builder/out/targets/nsis) -**Extends**: [Target](electron-builder-core#Target) -**Properties** - -| Name | Type | -| --- | --- | -| options| [NsisOptions](Options#NsisOptions) | -| **isWebInstaller**| Boolean | - - -* [.NsisTarget](#NsisTarget) ⇐ [Target](electron-builder-core#Target) - * [`.build(appOutDir, arch)`](#module_electron-builder/out/targets/nsis.NsisTarget+build) ⇒ Promise<void> - * [`.finishBuild()`](#module_electron-builder/out/targets/nsis.NsisTarget+finishBuild) ⇒ Promise<any> - - +| arch | module:electron-builder/out/core.Arch | +| target | module:electron-builder/out/targets/nsis.NsisTarget | -#### `nsisTarget.build(appOutDir, arch)` ⇒ Promise<void> -**Kind**: instance method of [NsisTarget](#NsisTarget) - -| Param | Type | -| --- | --- | -| appOutDir | String | -| arch | [Arch](electron-builder-core#Arch) | - - - -#### `nsisTarget.finishBuild()` ⇒ Promise<any> -**Kind**: instance method of [NsisTarget](#NsisTarget) ## electron-builder/out/targets/pkg * [electron-builder/out/targets/pkg](#module_electron-builder/out/targets/pkg) - * [.PkgTarget](#PkgTarget) ⇐ [Target](electron-builder-core#Target) + * [.PkgTarget](#PkgTarget) ⇐ [Target](#Target) * [`.build(appPath, arch)`](#module_electron-builder/out/targets/pkg.PkgTarget+build) ⇒ Promise<any> * [`.prepareProductBuildArgs(identity, keychain)`](#module_electron-builder/out/targets/pkg.prepareProductBuildArgs) ⇒ Array<String> -### PkgTarget ⇐ [Target](electron-builder-core#Target) +### PkgTarget ⇐ [Target](#Target) **Kind**: class of [electron-builder/out/targets/pkg](#module_electron-builder/out/targets/pkg) -**Extends**: [Target](electron-builder-core#Target) +**Extends**: [Target](#Target) **Properties** | Name | Type | @@ -1554,7 +1660,7 @@ | Param | Type | | --- | --- | | appPath | String | -| arch | [Arch](electron-builder-core#Arch) | +| arch | module:electron-builder/out/core.Arch | @@ -1571,14 +1677,14 @@ ## electron-builder/out/targets/snap * [electron-builder/out/targets/snap](#module_electron-builder/out/targets/snap) - * [.SnapTarget](#SnapTarget) ⇐ [Target](electron-builder-core#Target) + * [.SnapTarget](#SnapTarget) ⇐ [Target](#Target) * [`.build(appOutDir, arch)`](#module_electron-builder/out/targets/snap.SnapTarget+build) ⇒ Promise<any> -### SnapTarget ⇐ [Target](electron-builder-core#Target) +### SnapTarget ⇐ [Target](#Target) **Kind**: class of [electron-builder/out/targets/snap](#module_electron-builder/out/targets/snap) -**Extends**: [Target](electron-builder-core#Target) +**Extends**: [Target](#Target) **Properties** | Name | Type | @@ -1593,24 +1699,24 @@ | Param | Type | | --- | --- | | appOutDir | String | -| arch | [Arch](electron-builder-core#Arch) | +| arch | module:electron-builder/out/core.Arch | ## electron-builder/out/targets/targetFactory * [electron-builder/out/targets/targetFactory](#module_electron-builder/out/targets/targetFactory) - * [.NoOpTarget](#NoOpTarget) ⇐ [Target](electron-builder-core#Target) + * [.NoOpTarget](#NoOpTarget) ⇐ [Target](#Target) * [`.build(appOutDir, arch)`](#module_electron-builder/out/targets/targetFactory.NoOpTarget+build) ⇒ Promise<any> - * [`.computeArchToTargetNamesMap(raw, options, platform)`](#module_electron-builder/out/targets/targetFactory.computeArchToTargetNamesMap) ⇒ Map<[Arch](electron-builder-core#Arch) \| Array<String>> - * [`.createCommonTarget(target, outDir, packager)`](#module_electron-builder/out/targets/targetFactory.createCommonTarget) ⇒ [Target](electron-builder-core#Target) - * [`.createTargets(nameToTarget, rawList, outDir, packager, cleanupTasks)`](#module_electron-builder/out/targets/targetFactory.createTargets) ⇒ Array<[Target](electron-builder-core#Target)> + * [`.computeArchToTargetNamesMap(raw, options, platform)`](#module_electron-builder/out/targets/targetFactory.computeArchToTargetNamesMap) ⇒ Map<module:electron-builder/out/core.Arch \| Array<String>> + * [`.createCommonTarget(target, outDir, packager)`](#module_electron-builder/out/targets/targetFactory.createCommonTarget) ⇒ [Target](#Target) + * [`.createTargets(nameToTarget, rawList, outDir, packager, cleanupTasks)`](#module_electron-builder/out/targets/targetFactory.createTargets) ⇒ Array<[Target](#Target)> -### NoOpTarget ⇐ [Target](electron-builder-core#Target) +### NoOpTarget ⇐ [Target](#Target) **Kind**: class of [electron-builder/out/targets/targetFactory](#module_electron-builder/out/targets/targetFactory) -**Extends**: [Target](electron-builder-core#Target) +**Extends**: [Target](#Target) **Properties** | Name | Type | @@ -1626,22 +1732,22 @@ | Param | Type | | --- | --- | | appOutDir | String | -| arch | [Arch](electron-builder-core#Arch) | +| arch | module:electron-builder/out/core.Arch | -### `electron-builder/out/targets/targetFactory.computeArchToTargetNamesMap(raw, options, platform)` ⇒ Map<[Arch](electron-builder-core#Arch) \| Array<String>> +### `electron-builder/out/targets/targetFactory.computeArchToTargetNamesMap(raw, options, platform)` ⇒ Map<module:electron-builder/out/core.Arch \| Array<String>> **Kind**: method of [electron-builder/out/targets/targetFactory](#module_electron-builder/out/targets/targetFactory) | Param | Type | | --- | --- | -| raw | Map<[Arch](electron-builder-core#Arch) \| Array<String>> | +| raw | Map<module:electron-builder/out/core.Arch \| Array<String>> | | options | [PlatformSpecificBuildOptions](#PlatformSpecificBuildOptions) | -| platform | [Platform](electron-builder-core#Platform) | +| platform | [Platform](#Platform) | -### `electron-builder/out/targets/targetFactory.createCommonTarget(target, outDir, packager)` ⇒ [Target](electron-builder-core#Target) +### `electron-builder/out/targets/targetFactory.createCommonTarget(target, outDir, packager)` ⇒ [Target](#Target) **Kind**: method of [electron-builder/out/targets/targetFactory](#module_electron-builder/out/targets/targetFactory) | Param | Type | @@ -1652,12 +1758,12 @@ -### `electron-builder/out/targets/targetFactory.createTargets(nameToTarget, rawList, outDir, packager, cleanupTasks)` ⇒ Array<[Target](electron-builder-core#Target)> +### `electron-builder/out/targets/targetFactory.createTargets(nameToTarget, rawList, outDir, packager, cleanupTasks)` ⇒ Array<[Target](#Target)> **Kind**: method of [electron-builder/out/targets/targetFactory](#module_electron-builder/out/targets/targetFactory) | Param | Type | | --- | --- | -| nameToTarget | Map<String \| [Target](electron-builder-core#Target)> | +| nameToTarget | Map<String \| [Target](#Target)> | | rawList | Array<String> | | outDir | String | | packager | [PlatformPackager](#PlatformPackager)<any> | @@ -1666,42 +1772,17 @@ ## electron-builder/out/targets/WebInstallerTarget - -* [electron-builder/out/targets/WebInstallerTarget](#module_electron-builder/out/targets/WebInstallerTarget) - * [.WebInstallerTarget](#WebInstallerTarget) ⇐ [NsisTarget](#NsisTarget) - * [`.build(appOutDir, arch)`](#module_electron-builder/out/targets/nsis.NsisTarget+build) ⇒ Promise<void> - * [`.finishBuild()`](#module_electron-builder/out/targets/nsis.NsisTarget+finishBuild) ⇒ Promise<any> - -### WebInstallerTarget ⇐ [NsisTarget](#NsisTarget) +### WebInstallerTarget ⇐ module:electron-builder/out/targets/nsis.NsisTarget **Kind**: class of [electron-builder/out/targets/WebInstallerTarget](#module_electron-builder/out/targets/WebInstallerTarget) -**Extends**: [NsisTarget](#NsisTarget) +**Extends**: module:electron-builder/out/targets/nsis.NsisTarget **Properties** | Name | Type | | --- | --- | | **isWebInstaller**| Boolean | - -* [.WebInstallerTarget](#WebInstallerTarget) ⇐ [NsisTarget](#NsisTarget) - * [`.build(appOutDir, arch)`](#module_electron-builder/out/targets/nsis.NsisTarget+build) ⇒ Promise<void> - * [`.finishBuild()`](#module_electron-builder/out/targets/nsis.NsisTarget+finishBuild) ⇒ Promise<any> - - - -#### `webInstallerTarget.build(appOutDir, arch)` ⇒ Promise<void> -**Kind**: instance method of [WebInstallerTarget](#WebInstallerTarget) - -| Param | Type | -| --- | --- | -| appOutDir | String | -| arch | [Arch](electron-builder-core#Arch) | - - - -#### `webInstallerTarget.finishBuild()` ⇒ Promise<any> -**Kind**: instance method of [WebInstallerTarget](#WebInstallerTarget) ## electron-builder/out/windowsCodeSign @@ -1874,7 +1955,7 @@ })]**| [Lazy](electron-builder-util#Lazy)< \| Array> | | **isForceCodeSigningVerification**| Boolean | | **defaultTarget**| Array<String> | -| **platform**| [Platform](electron-builder-core#Platform) | +| **platform**| [Platform](#Platform) | * [.WinPackager](#WinPackager) ⇐ [PlatformPackager](#PlatformPackager) @@ -1941,7 +2022,7 @@ | Param | Type | | --- | --- | | ext | String | -| arch | [Arch](electron-builder-core#Arch) \| null | +| arch | module:electron-builder/out/core.Arch \| null | | skipArchIfX64 | | @@ -1961,8 +2042,8 @@ | Param | Type | | --- | --- | | file | String | -| target | [Target](electron-builder-core#Target) \| null | -| arch | [Arch](electron-builder-core#Arch) \| null | +| target | [Target](#Target) \| null | +| arch | module:electron-builder/out/core.Arch \| null | | safeArtifactName | String | @@ -1990,9 +2071,9 @@ | Param | Type | | --- | --- | -| targetSpecificOptions | [TargetSpecificOptions](electron-builder-core#TargetSpecificOptions) \| undefined \| null | +| targetSpecificOptions | [TargetSpecificOptions](#TargetSpecificOptions) \| undefined \| null | | ext | String | -| arch | [Arch](electron-builder-core#Arch) \| null | +| arch | module:electron-builder/out/core.Arch \| null | | defaultPattern | String | | skipArchIfX64 | | @@ -2016,7 +2097,7 @@ | Param | Type | | --- | --- | | ext | String \| null | -| arch | [Arch](electron-builder-core#Arch) | +| arch | module:electron-builder/out/core.Arch | | deployment | Boolean | | classifier | String \| null | @@ -2048,8 +2129,8 @@ | Param | Type | | --- | --- | | outDir | String | -| arch | [Arch](electron-builder-core#Arch) | -| targets | Array<[Target](electron-builder-core#Target)> | +| arch | module:electron-builder/out/core.Arch | +| targets | Array<[Target](#Target)> | | postAsyncTasks | Array<Promise<any>> | diff --git a/package.json b/package.json index d0d0a3668fb..e122ca45d45 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "private": true, "license": "MIT", "scripts": { - "compile": "ts-babel packages/asar-integrity packages/electron-builder-http packages/electron-builder-core packages/electron-builder-util packages/electron-publish packages/electron-builder packages/electron-builder-squirrel-windows packages/electron-updater packages/electron-publisher-s3 test && node ./test/vendor/yarn.js schema", + "compile": "ts-babel packages/asar-integrity packages/electron-builder-http packages/electron-builder-util packages/electron-publish packages/electron-builder packages/electron-builder-squirrel-windows packages/electron-updater packages/electron-publisher-s3 test && node ./test/vendor/yarn.js schema", "lint": "node test/out/helpers/lint.js", "pretest": "node ./test/vendor/yarn.js compile && node ./test/vendor/yarn.js lint && node ./test/vendor/yarn.js lint-deps", "lint-deps": "node ./test/out/helpers/checkDeps.js", @@ -19,7 +19,7 @@ "set-versions": "node test/out/helpers/setVersions.js", "npm-publish": "yarn set-versions && yarn compile && ./packages/npm-publish.sh && conventional-changelog -p angular -i CHANGELOG.md -s", "schema": "typescript-json-schema packages/electron-builder/tsconfig.json Config --out packages/electron-builder/scheme.json --noExtraProps --useTypeOfKeyword --strictNullChecks --titles --required", - "jsdoc": "ts2jsdoc packages/electron-builder-http packages/electron-updater packages/electron-builder-util packages/electron-builder packages/electron-builder-core packages/electron-publish", + "jsdoc": "ts2jsdoc packages/electron-builder-http packages/electron-updater packages/electron-builder-util packages/electron-builder packages/electron-publish", "jsdoc2md": "node packages/jsdoc2md.js", "api": "node ./test/vendor/yarn.js jsdoc && node ./test/vendor/yarn.js jsdoc2md" }, diff --git a/packages/electron-builder-core/package.json b/packages/electron-builder-core/package.json deleted file mode 100644 index efa7279bd1c..00000000000 --- a/packages/electron-builder-core/package.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "electron-builder-core", - "version": "0.0.0-semantic-release", - "main": "out/core.js", - "author": "Vladimir Krivosheev", - "license": "MIT", - "repository": "electron-userland/electron-builder", - "bugs": "https://github.com/electron-userland/electron-builder/issues", - "homepage": "https://github.com/electron-userland/electron-builder", - "files": [ - "out" - ], - "typings": "./out/electron-builder-core.d.ts" -} diff --git a/packages/electron-builder-core/readme.md b/packages/electron-builder-core/readme.md deleted file mode 100644 index 7ab253ec7dd..00000000000 --- a/packages/electron-builder-core/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# electron-builder-core - -Part of [electron-builder](https://github.com/electron-userland/electron-builder). \ No newline at end of file diff --git a/packages/electron-builder-core/tsconfig.json b/packages/electron-builder-core/tsconfig.json deleted file mode 100644 index 2660ecda0c2..00000000000 --- a/packages/electron-builder-core/tsconfig.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "extends": "../tsconfig-base.json", - "compilerOptions": { - "outDir": "out" - }, - "jsdoc": { - "out": "../../jsdoc/out/core", - "access": "public" - }, - "declaration": true, - "include": [ - "src/**/*.ts" - ], - "files": [ - "../electron-builder-http/out/electron-builder-http.d.ts" - ] -} \ No newline at end of file diff --git a/packages/electron-builder-squirrel-windows/package.json b/packages/electron-builder-squirrel-windows/package.json index aa35f664875..4c7cdef1518 100644 --- a/packages/electron-builder-squirrel-windows/package.json +++ b/packages/electron-builder-squirrel-windows/package.json @@ -12,10 +12,12 @@ ], "dependencies": { "electron-builder-util": "~0.0.0-semantic-release", - "electron-builder-core": "~0.0.0-semantic-release", "bluebird-lst": "^1.0.2", "fs-extra-p": "^4.3.0", "archiver": "^1.3.0" }, + "peerDependencies": { + "electron-builder": "~0.0.0-semantic-release" + }, "typings": "./out/electron-builder-squirrel-windows.d.ts" } diff --git a/packages/electron-builder-squirrel-windows/src/squirrelWindows.ts b/packages/electron-builder-squirrel-windows/src/squirrelWindows.ts index da4a170e8da..e5ab5d42d65 100644 --- a/packages/electron-builder-squirrel-windows/src/squirrelWindows.ts +++ b/packages/electron-builder-squirrel-windows/src/squirrelWindows.ts @@ -1,4 +1,4 @@ -import { Arch, getArchSuffix, Target } from "electron-builder-core" +import { Arch, getArchSuffix, Target } from "electron-builder" import { getBinFromGithub } from "electron-builder-util/out/binDownload" import { log, warn } from "electron-builder-util/out/log" import { SquirrelWindowsOptions } from "electron-builder/out/options/winOptions" diff --git a/packages/electron-builder/package.json b/packages/electron-builder/package.json index 8292da1220f..15251488d58 100644 --- a/packages/electron-builder/package.json +++ b/packages/electron-builder/package.json @@ -14,8 +14,7 @@ "electron-builder": "./out/cli/cli.js", "elb": "./out/cli/cli.js", "build": "./out/cli/cli.js", - "install-app-deps": "./out/cli/install-app-deps.js", - "node-gyp-rebuild": "./out/cli/node-gyp-rebuild.js" + "install-app-deps": "./out/cli/install-app-deps.js" }, "repository": "electron-userland/electron-builder", "engines": { @@ -57,7 +56,6 @@ "chalk": "^1.1.3", "chromium-pickle-js": "^0.2.0", "cuint": "^0.2.2", - "electron-builder-core": "0.0.0-semantic-release", "electron-builder-http": "0.0.0-semantic-release", "electron-builder-util": "0.0.0-semantic-release", "electron-download-tf": "4.3.1", diff --git a/packages/electron-builder/src/builder.ts b/packages/electron-builder/src/builder.ts index 3ae1de199f2..b73b08eb2be 100644 --- a/packages/electron-builder/src/builder.ts +++ b/packages/electron-builder/src/builder.ts @@ -1,11 +1,11 @@ import BluebirdPromise from "bluebird-lst" import { underline } from "chalk" -import { Arch, archFromString, DIR_TARGET, Platform } from "electron-builder-core" import { CancellationToken } from "electron-builder-http/out/CancellationToken" import { addValue, isEmptyOrSpaces } from "electron-builder-util" import { warn } from "electron-builder-util/out/log" import { executeFinally } from "electron-builder-util/out/promise" import { PublishOptions } from "electron-publish" +import { Arch, archFromString, DIR_TARGET, Platform } from "./core" import { normalizePlatforms, Packager } from "./packager" import { PackagerOptions } from "./packagerApi" import { PublishManager } from "./publish/PublishManager" diff --git a/packages/electron-builder/src/cli/cli.ts b/packages/electron-builder/src/cli/cli.ts index 6cd824559a6..ae3cfd100e6 100644 --- a/packages/electron-builder/src/cli/cli.ts +++ b/packages/electron-builder/src/cli/cli.ts @@ -1,7 +1,8 @@ #! /usr/bin/env node import { cyan, dim, green, reset, underline } from "chalk" -import { warn } from "electron-builder-util/out/log" +import { exec } from "electron-builder-util" +import { log, warn } from "electron-builder-util/out/log" import { printErrorAndExit } from "electron-builder-util/out/promise" import { readJson } from "fs-extra-p" import isCi from "is-ci" @@ -9,12 +10,15 @@ import * as path from "path" import updateNotifier from "update-notifier" import yargs from "yargs" import { build, configureBuildCommand } from "../builder" +import { getElectronVersion, loadConfig } from "../util/readPackageJson" +import { getGypEnv } from "../util/yarn" import { createSelfSignedCert } from "./create-self-signed-cert" import { configureInstallAppDepsCommand, installAppDeps } from "./install-app-deps" yargs .command(["build", "*"], "Build", configureBuildCommand, wrap(build)) .command("install-app-deps", "Install app deps", configureInstallAppDepsCommand, wrap(installAppDeps)) + .command("node-gyp-rebuild", "Rebuild own native code", configureInstallAppDepsCommand /* yes, args the same as for install app deps */, wrap(rebuildAppNativeCode)) .command("create-self-signed-cert", "Create self-signed code signing cert for Windows apps", yargs => yargs .option("publisher", { @@ -57,4 +61,14 @@ function checkIsOutdated() { } }) .catch(e => warn(`Cannot check updates: ${e}`)) +} + +async function rebuildAppNativeCode(args: any) { + const projectDir = process.cwd() + const config = await loadConfig(projectDir) + log(`Execute node-gyp rebuild for ${args.platform}:${args.arch}`) + // this script must be used only for electron + await exec(process.platform === "win32" ? "node-gyp.cmd" : "node-gyp", ["rebuild"], { + env: getGypEnv({version: await getElectronVersion(config, projectDir), useCustomDist: true}, args.platform, args.arch, true), + }) } \ No newline at end of file diff --git a/packages/electron-builder/src/cli/install-app-deps.ts b/packages/electron-builder/src/cli/install-app-deps.ts index 150b80f5fc7..967345eca43 100644 --- a/packages/electron-builder/src/cli/install-app-deps.ts +++ b/packages/electron-builder/src/cli/install-app-deps.ts @@ -6,7 +6,7 @@ import { log, warn } from "electron-builder-util/out/log" import { printErrorAndExit } from "electron-builder-util/out/promise" import yargs from "yargs" import { getElectronVersion, loadConfig } from "../util/readPackageJson" -import { installOrRebuild } from "../yarn" +import { installOrRebuild } from "../util/yarn" declare const PACKAGE_VERSION: string diff --git a/packages/electron-builder/src/cli/node-gyp-rebuild.ts b/packages/electron-builder/src/cli/node-gyp-rebuild.ts deleted file mode 100644 index e3427e11b92..00000000000 --- a/packages/electron-builder/src/cli/node-gyp-rebuild.ts +++ /dev/null @@ -1,31 +0,0 @@ -#! /usr/bin/env node - -import { exec } from "electron-builder-util" -import { log } from "electron-builder-util/out/log" -import { printErrorAndExit } from "electron-builder-util/out/promise" -import yargs from "yargs" -import { getElectronVersion, loadConfig } from "../util/readPackageJson" -import { getGypEnv } from "../yarn" - -const args: any = yargs - .option("platform", { - choices: ["linux", "darwin", "win32"], - default: process.platform, - }) - .option("arch", { - choices: ["ia32", "x64", "armv7l"], - default: process.arch, - }).argv - -async function main() { - const projectDir = process.cwd() - const config = await loadConfig(projectDir) - log(`Execute node-gyp rebuild for ${args.platform}:${args.arch}`) - // this script must be used only for electron - await exec(process.platform === "win32" ? "node-gyp.cmd" : "node-gyp", ["rebuild"], { - env: getGypEnv({version: await getElectronVersion(config, projectDir), useCustomDist: true}, args.platform, args.arch, true), - }) -} - -main() - .catch(printErrorAndExit) \ No newline at end of file diff --git a/packages/electron-builder-core/src/core.ts b/packages/electron-builder/src/core.ts similarity index 100% rename from packages/electron-builder-core/src/core.ts rename to packages/electron-builder/src/core.ts diff --git a/packages/electron-builder/src/index.ts b/packages/electron-builder/src/index.ts index 333e2342b48..a1c28dd5dad 100644 --- a/packages/electron-builder/src/index.ts +++ b/packages/electron-builder/src/index.ts @@ -1,6 +1,6 @@ export { Packager, BuildResult } from "./packager" export { PackagerOptions, ArtifactCreated, BuildInfo } from "./packagerApi" -export { getArchSuffix, Platform, Arch, archFromString, Target, DIR_TARGET } from "electron-builder-core" +export { getArchSuffix, Platform, Arch, archFromString, Target, DIR_TARGET } from "./core" export { build, CliOptions, createTargets } from "./builder" export { Metadata, Config, AfterPackContext, MetadataDirectories, Protocol, FileAssociation, PlatformSpecificBuildOptions, AuthorMetadata, RepositoryInfo, AsarOptions, FilePattern } from "./metadata" export { MacOptions, DmgOptions, MasBuildOptions, MacOsTargetName, PkgOptions, DmgContent, DmgWindow } from "./options/macOptions" diff --git a/packages/electron-builder/src/linuxPackager.ts b/packages/electron-builder/src/linuxPackager.ts index fcfd07e24e3..2dbca8a330a 100644 --- a/packages/electron-builder/src/linuxPackager.ts +++ b/packages/electron-builder/src/linuxPackager.ts @@ -1,7 +1,7 @@ -import { DIR_TARGET, Platform, Target } from "electron-builder-core" import { rename } from "fs-extra-p" import * as path from "path" import sanitizeFileName from "sanitize-filename" +import { DIR_TARGET, Platform, Target } from "./core" import { LinuxBuildOptions } from "./options/linuxOptions" import { BuildInfo } from "./packagerApi" import { PlatformPackager } from "./platformPackager" diff --git a/packages/electron-builder/src/macPackager.ts b/packages/electron-builder/src/macPackager.ts index 047feda8299..7b913a60b45 100644 --- a/packages/electron-builder/src/macPackager.ts +++ b/packages/electron-builder/src/macPackager.ts @@ -1,5 +1,4 @@ import BluebirdPromise from "bluebird-lst" -import { Arch, DIR_TARGET, Platform, Target } from "electron-builder-core" import { exec, isPullRequest } from "electron-builder-util" import { deepAssign } from "electron-builder-util/out/deepAssign" import { log, task, warn } from "electron-builder-util/out/log" @@ -8,6 +7,7 @@ import { ensureDir } from "fs-extra-p" import * as path from "path" import { AppInfo } from "./appInfo" import { appleCertificatePrefixes, CodeSigningInfo, createKeychain, findIdentity } from "./codeSign" +import { Arch, DIR_TARGET, Platform, Target } from "./core" import { MacOptions, MasBuildOptions } from "./options/macOptions" import { BuildInfo } from "./packagerApi" import { PlatformPackager } from "./platformPackager" diff --git a/packages/electron-builder/src/metadata.ts b/packages/electron-builder/src/metadata.ts index ee6e9f0d489..f9551bb1cf9 100644 --- a/packages/electron-builder/src/metadata.ts +++ b/packages/electron-builder/src/metadata.ts @@ -1,6 +1,6 @@ import { AsarIntegrityOptions } from "asar-integrity" -import { Arch, BeforeBuildContext, CompressionLevel, Target, TargetConfig, TargetSpecificOptions } from "electron-builder-core" import { Publish } from "electron-builder-http/out/publishOptions" +import { Arch, BeforeBuildContext, CompressionLevel, Target, TargetConfig, TargetSpecificOptions } from "./core" import { DebOptions, LinuxBuildOptions, LinuxTargetSpecificOptions, SnapOptions } from "./options/linuxOptions" import { DmgOptions, MacOptions, MasBuildOptions, PkgOptions } from "./options/macOptions" import { AppXOptions, NsisOptions, NsisWebOptions, PortableOptions, SquirrelWindowsOptions, WinBuildOptions } from "./options/winOptions" diff --git a/packages/electron-builder/src/options/linuxOptions.ts b/packages/electron-builder/src/options/linuxOptions.ts index e34eadabde2..589a1bb158e 100644 --- a/packages/electron-builder/src/options/linuxOptions.ts +++ b/packages/electron-builder/src/options/linuxOptions.ts @@ -1,4 +1,4 @@ -import { TargetConfigType, TargetSpecificOptions } from "electron-builder-core" +import { TargetConfigType, TargetSpecificOptions } from "../core" import { PlatformSpecificBuildOptions } from "../metadata" export interface LinuxBuildOptions extends CommonLinuxOptions, PlatformSpecificBuildOptions { diff --git a/packages/electron-builder/src/options/macOptions.ts b/packages/electron-builder/src/options/macOptions.ts index 7cd595f97da..b2540c9b832 100644 --- a/packages/electron-builder/src/options/macOptions.ts +++ b/packages/electron-builder/src/options/macOptions.ts @@ -1,4 +1,4 @@ -import { TargetConfig, TargetSpecificOptions } from "electron-builder-core" +import { TargetConfig, TargetSpecificOptions } from "../core" import { PlatformSpecificBuildOptions } from "../metadata" export type MacOsTargetName = "default" | "dmg" | "mas" | "mas-dev" | "pkg" | "7z" | "zip" | "tar.xz" | "tar.lz" | "tar.gz" | "tar.bz2" | "dir" diff --git a/packages/electron-builder/src/options/winOptions.ts b/packages/electron-builder/src/options/winOptions.ts index d019840c314..bb180684ad6 100644 --- a/packages/electron-builder/src/options/winOptions.ts +++ b/packages/electron-builder/src/options/winOptions.ts @@ -1,4 +1,4 @@ -import { TargetConfigType, TargetSpecificOptions } from "electron-builder-core" +import { TargetConfigType, TargetSpecificOptions } from "../core" import { PlatformSpecificBuildOptions } from "../metadata" export interface WinBuildOptions extends PlatformSpecificBuildOptions { diff --git a/packages/electron-builder/src/packager.ts b/packages/electron-builder/src/packager.ts index 0c623a89cd5..2dc03511ff2 100644 --- a/packages/electron-builder/src/packager.ts +++ b/packages/electron-builder/src/packager.ts @@ -1,5 +1,4 @@ import BluebirdPromise from "bluebird-lst" -import { Arch, Platform, SourceRepositoryInfo, Target } from "electron-builder-core" import { CancellationToken } from "electron-builder-http/out/CancellationToken" import { computeDefaultAppDirectory, debug, exec, isEmptyOrSpaces, Lazy, safeStringifyJson, use } from "electron-builder-util" import { deepAssign } from "electron-builder-util/out/deepAssign" @@ -12,16 +11,17 @@ import * as path from "path" import { lt as isVersionLessThan } from "semver" import { AppInfo } from "./appInfo" import { readAsarJson } from "./asar" +import { Arch, Platform, SourceRepositoryInfo, Target } from "./core" import MacPackager from "./macPackager" import { AfterPackContext, Config, Metadata } from "./metadata" import { ArtifactCreated, BuildInfo, PackagerOptions } from "./packagerApi" import { PlatformPackager } from "./platformPackager" import { reactCra } from "./presets/rect-cra" -import { getRepositoryInfo } from "./repositoryInfo" import { computeArchToTargetNamesMap, createTargets, NoOpTarget } from "./targets/targetFactory" import { doLoadConfig, getElectronVersion, loadConfig, readPackageJson, validateConfig } from "./util/readPackageJson" +import { getRepositoryInfo } from "./util/repositoryInfo" +import { getGypEnv, installOrRebuild } from "./util/yarn" import { WinPackager } from "./winPackager" -import { getGypEnv, installOrRebuild } from "./yarn" function addHandler(emitter: EventEmitter, event: string, handler: Function) { emitter.on(event, handler) diff --git a/packages/electron-builder/src/packagerApi.ts b/packages/electron-builder/src/packagerApi.ts index 0891055af73..ee1e380b5b0 100644 --- a/packages/electron-builder/src/packagerApi.ts +++ b/packages/electron-builder/src/packagerApi.ts @@ -1,8 +1,8 @@ -import { Arch, Platform, SourceRepositoryInfo, Target } from "electron-builder-core" import { CancellationToken } from "electron-builder-http/out/CancellationToken" import { PublishConfiguration } from "electron-builder-http/out/publishOptions" import { TmpDir } from "electron-builder-util/out/tmp" import { AppInfo } from "./appInfo" +import { Arch, Platform, SourceRepositoryInfo, Target } from "./core" import { AfterPackContext, Config, Metadata } from "./metadata" import { PlatformPackager } from "./platformPackager" diff --git a/packages/electron-builder/src/platformPackager.ts b/packages/electron-builder/src/platformPackager.ts index 2dc7b850b18..7e1f5fd08ea 100644 --- a/packages/electron-builder/src/platformPackager.ts +++ b/packages/electron-builder/src/platformPackager.ts @@ -1,6 +1,5 @@ import { computeData } from "asar-integrity" import BluebirdPromise from "bluebird-lst" -import { Arch, getArchSuffix, Platform, Target, TargetSpecificOptions } from "electron-builder-core" import { asArray, isEmptyOrSpaces, Lazy, use } from "electron-builder-util" import { deepAssign } from "electron-builder-util/out/deepAssign" import { copyDir, statOrNull, unlinkIfExists } from "electron-builder-util/out/fs" @@ -9,13 +8,14 @@ import { readdir, rename } from "fs-extra-p" import { Minimatch } from "minimatch" import * as path from "path" import { AppInfo } from "./appInfo" -import { AsarPackager, checkFileInArchive, ELECTRON_COMPILE_SHIM_FILENAME } from "./asarUtil" +import { Arch, getArchSuffix, Platform, Target, TargetSpecificOptions } from "./core" import { copyFiles, createFileMatcher, FileMatcher, getFileMatchers } from "./fileMatcher" import { createTransformer, isElectronCompileUsed } from "./fileTransformer" import { AsarOptions, Config, FileAssociation, PlatformSpecificBuildOptions } from "./metadata" import { unpackElectron, unpackMuon } from "./packager/dirPackager" import { BuildInfo, PackagerOptions } from "./packagerApi" -import { dependencies } from "./readInstalled" +import { AsarPackager, checkFileInArchive, ELECTRON_COMPILE_SHIM_FILENAME } from "./util/asarUtil" +import { dependencies } from "./util/readInstalled" export abstract class PlatformPackager { readonly packagerOptions: PackagerOptions diff --git a/packages/electron-builder/src/publish/PublishManager.ts b/packages/electron-builder/src/publish/PublishManager.ts index a9cbfe20582..68896444ba1 100644 --- a/packages/electron-builder/src/publish/PublishManager.ts +++ b/packages/electron-builder/src/publish/PublishManager.ts @@ -1,6 +1,5 @@ import { hashFile } from "asar-integrity" import BluebirdPromise from "bluebird-lst" -import { Arch, Platform, Target } from "electron-builder-core" import { CancellationToken } from "electron-builder-http/out/CancellationToken" import { BintrayOptions, GenericServerOptions, GithubOptions, githubUrl, PublishConfiguration, PublishProvider, S3Options, s3Url, UpdateInfo, VersionInfo } from "electron-builder-http/out/publishOptions" import { asArray, debug, isEmptyOrSpaces, isPullRequest, Lazy, safeStringifyJson } from "electron-builder-util" @@ -17,6 +16,7 @@ import * as path from "path" import { prerelease } from "semver" import { WriteStream as TtyWriteStream } from "tty" import * as url from "url" +import { Arch, Platform, Target } from "../core" import { PlatformSpecificBuildOptions } from "../metadata" import { Packager } from "../packager" import { ArtifactCreated, BuildInfo } from "../packagerApi" diff --git a/packages/electron-builder/src/targets/ArchiveTarget.ts b/packages/electron-builder/src/targets/ArchiveTarget.ts index fa2fffcc37d..eef72f3947c 100644 --- a/packages/electron-builder/src/targets/ArchiveTarget.ts +++ b/packages/electron-builder/src/targets/ArchiveTarget.ts @@ -1,6 +1,6 @@ -import { Arch, Platform, Target } from "electron-builder-core" import { log } from "electron-builder-util/out/log" import * as path from "path" +import { Arch, Platform, Target } from "../core" import { PlatformPackager } from "../platformPackager" import { archive, tar } from "./archive" diff --git a/packages/electron-builder/src/targets/LinuxTargetHelper.ts b/packages/electron-builder/src/targets/LinuxTargetHelper.ts index fb8df339833..1883e41a185 100644 --- a/packages/electron-builder/src/targets/LinuxTargetHelper.ts +++ b/packages/electron-builder/src/targets/LinuxTargetHelper.ts @@ -8,6 +8,7 @@ import { LinuxBuildOptions, LinuxTargetSpecificOptions } from "../options/linuxO export const installPrefix = "/opt" +/** @private */ export class LinuxTargetHelper { readonly icons: Promise>> diff --git a/packages/electron-builder/src/targets/appImage.ts b/packages/electron-builder/src/targets/appImage.ts index 58c19e8efc0..6fad26b4eff 100644 --- a/packages/electron-builder/src/targets/appImage.ts +++ b/packages/electron-builder/src/targets/appImage.ts @@ -1,5 +1,4 @@ import BluebirdPromise from "bluebird-lst" -import { Arch, Target } from "electron-builder-core" import { exec } from "electron-builder-util" import { getBin } from "electron-builder-util/out/binDownload" import { unlinkIfExists } from "electron-builder-util/out/fs" @@ -7,6 +6,7 @@ import { log } from "electron-builder-util/out/log" import { chmod, close, createReadStream, createWriteStream, open, write } from "fs-extra-p" import * as path from "path" import { v1 as uuid1 } from "uuid-1345" +import { Arch, Target } from "../core" import { LinuxPackager } from "../linuxPackager" import { LinuxBuildOptions } from "../options/linuxOptions" import { LinuxTargetHelper } from "./LinuxTargetHelper" diff --git a/packages/electron-builder/src/targets/appx.ts b/packages/electron-builder/src/targets/appx.ts index bb53421e156..a02e3ad8ed4 100644 --- a/packages/electron-builder/src/targets/appx.ts +++ b/packages/electron-builder/src/targets/appx.ts @@ -1,11 +1,11 @@ import BluebirdPromise from "bluebird-lst" -import { Arch, getArchSuffix, Target } from "electron-builder-core" import { exec, spawn, use } from "electron-builder-util" import { deepAssign } from "electron-builder-util/out/deepAssign" import { copyDir, copyFile } from "electron-builder-util/out/fs" import { asyncAll } from "electron-builder-util/out/promise" import { emptyDir, readdir, readFile, writeFile } from "fs-extra-p" import * as path from "path" +import { Arch, getArchSuffix, Target } from "../core" import { AppXOptions } from "../options/winOptions" import { getSignVendorPath, isOldWin6 } from "../windowsCodeSign" import { WinPackager } from "../winPackager" diff --git a/packages/electron-builder/src/targets/archive.ts b/packages/electron-builder/src/targets/archive.ts index 72110c0ce4f..7ad2dbd9d7e 100644 --- a/packages/electron-builder/src/targets/archive.ts +++ b/packages/electron-builder/src/targets/archive.ts @@ -1,9 +1,9 @@ import { path7za } from "7zip-bin" -import { CompressionLevel } from "electron-builder-core" import { debug7zArgs, spawn } from "electron-builder-util" import { exists } from "electron-builder-util/out/fs" import { unlink } from "fs-extra-p" import * as path from "path" +import { CompressionLevel } from "../core" class CompressionDescriptor { constructor(public flag: string, public env: string, public minLevel: string, public maxLevel: string = "-9") { diff --git a/packages/electron-builder/src/targets/dmg.ts b/packages/electron-builder/src/targets/dmg.ts index d164a98a050..f422e1c1120 100644 --- a/packages/electron-builder/src/targets/dmg.ts +++ b/packages/electron-builder/src/targets/dmg.ts @@ -1,5 +1,4 @@ import BluebirdPromise from "bluebird-lst" -import { Arch, Target } from "electron-builder-core" import { debug, exec, isEmptyOrSpaces, spawn } from "electron-builder-util" import { deepAssign } from "electron-builder-util/out/deepAssign" import { copyFile, exists, statOrNull } from "electron-builder-util/out/fs" @@ -8,6 +7,7 @@ import { executeFinally } from "electron-builder-util/out/promise" import { outputFile, readFile, remove, unlink } from "fs-extra-p" import * as path from "path" import sanitizeFileName from "sanitize-filename" +import { Arch, Target } from "../core" import { DmgOptions, MacOptions } from "../options/macOptions" import { PlatformPackager } from "../platformPackager" import { addLicenseToDmg } from "./dmgLicense" diff --git a/packages/electron-builder/src/targets/fpm.ts b/packages/electron-builder/src/targets/fpm.ts index 5a85a9b2c91..8eec14592fa 100644 --- a/packages/electron-builder/src/targets/fpm.ts +++ b/packages/electron-builder/src/targets/fpm.ts @@ -1,5 +1,4 @@ import BluebirdPromise from "bluebird-lst" -import { Arch, Target, toLinuxArchString } from "electron-builder-core" import { exec, smarten, use } from "electron-builder-util" import { getBin } from "electron-builder-util/out/binDownload" import { unlinkIfExists } from "electron-builder-util/out/fs" @@ -7,6 +6,7 @@ import { log, warn } from "electron-builder-util/out/log" import { TmpDir } from "electron-builder-util/out/tmp" import { ensureDir, outputFile, readFile } from "fs-extra-p" import * as path from "path" +import { Arch, Target, toLinuxArchString } from "../core" import * as errorMessages from "../errorMessages" import { LinuxPackager } from "../linuxPackager" import { DebOptions, LinuxTargetSpecificOptions } from "../options/linuxOptions" diff --git a/packages/electron-builder/src/targets/nsis.ts b/packages/electron-builder/src/targets/nsis.ts index 5365409f9fc..3c441608d67 100644 --- a/packages/electron-builder/src/targets/nsis.ts +++ b/packages/electron-builder/src/targets/nsis.ts @@ -1,6 +1,5 @@ import BluebirdPromise from "bluebird-lst" import _debug from "debug" -import { Arch, Target } from "electron-builder-core" import { asArray, debug, doSpawn, exec, getPlatformIconFileName, handleProcess, isEmptyOrSpaces, use } from "electron-builder-util" import { getBinFromGithub } from "electron-builder-util/out/binDownload" import { copyFile } from "electron-builder-util/out/fs" @@ -11,6 +10,7 @@ import { safeLoad } from "js-yaml" import * as path from "path" import sanitizeFileName from "sanitize-filename" import { v5 as uuid5 } from "uuid-1345" +import { Arch, Target } from "../core" import { NsisOptions, PortableOptions } from "../options/winOptions" import { normalizeExt } from "../platformPackager" import { WinPackager } from "../winPackager" @@ -74,6 +74,7 @@ export class AppPackageHelper { } } +/** @private */ export class NsisTarget extends Target { readonly options: NsisOptions diff --git a/packages/electron-builder/src/targets/pkg.ts b/packages/electron-builder/src/targets/pkg.ts index 7aee967e18b..fb1f0850c68 100644 --- a/packages/electron-builder/src/targets/pkg.ts +++ b/packages/electron-builder/src/targets/pkg.ts @@ -1,10 +1,10 @@ import BluebirdPromise from "bluebird-lst" -import { Arch, Target } from "electron-builder-core" import { exec, use } from "electron-builder-util" import { statOrNull } from "electron-builder-util/out/fs" import { unlink } from "fs-extra-p" import * as path from "path" import { findIdentity } from "../codeSign" +import { Arch, Target } from "../core" import MacPackager from "../macPackager" import { PkgOptions } from "../options/macOptions" import { filterCFBundleIdentifier } from "../packager/mac" diff --git a/packages/electron-builder/src/targets/snap.ts b/packages/electron-builder/src/targets/snap.ts index 98065c83d2d..52b9cbdde86 100644 --- a/packages/electron-builder/src/targets/snap.ts +++ b/packages/electron-builder/src/targets/snap.ts @@ -1,4 +1,3 @@ -import { Arch, Target, toLinuxArchString } from "electron-builder-core" import { replaceDefault, spawn } from "electron-builder-util" import { copyFile } from "electron-builder-util/out/fs" import { log } from "electron-builder-util/out/log" @@ -6,6 +5,7 @@ import { emptyDir, outputFile } from "fs-extra-p" import { safeDump } from "js-yaml" import { homedir } from "os" import * as path from "path" +import { Arch, Target, toLinuxArchString } from "../core" import { LinuxPackager } from "../linuxPackager" import { SnapOptions } from "../options/linuxOptions" import { LinuxTargetHelper } from "./LinuxTargetHelper" diff --git a/packages/electron-builder/src/targets/targetFactory.ts b/packages/electron-builder/src/targets/targetFactory.ts index c3b99511809..7ff7e0949f6 100644 --- a/packages/electron-builder/src/targets/targetFactory.ts +++ b/packages/electron-builder/src/targets/targetFactory.ts @@ -1,5 +1,5 @@ -import { Arch, archFromString, DEFAULT_TARGET, DIR_TARGET, Platform, Target, TargetConfig } from "electron-builder-core" import { addValue, asArray } from "electron-builder-util" +import { Arch, archFromString, DEFAULT_TARGET, DIR_TARGET, Platform, Target, TargetConfig } from "../core" import { PlatformSpecificBuildOptions } from "../metadata" import { PlatformPackager } from "../platformPackager" import { ArchiveTarget } from "./ArchiveTarget" diff --git a/packages/electron-builder/src/asarUtil.ts b/packages/electron-builder/src/util/asarUtil.ts similarity index 98% rename from packages/electron-builder/src/asarUtil.ts rename to packages/electron-builder/src/util/asarUtil.ts index ff0cefa7a96..2ea7960dba2 100644 --- a/packages/electron-builder/src/asarUtil.ts +++ b/packages/electron-builder/src/util/asarUtil.ts @@ -4,10 +4,10 @@ import { CONCURRENCY, FileCopier, FileTransformer, Filter, MAX_FILE_REQUESTS, st import { log } from "electron-builder-util/out/log" import { createReadStream, createWriteStream, ensureDir, readFile, readlink, stat, Stats, writeFile } from "fs-extra-p" import * as path from "path" -import { AsarFilesystem, Node, readAsar } from "./asar" -import { createElectronCompilerHost } from "./fileTransformer" -import { AsarOptions } from "./metadata" -import { PlatformPackager } from "./platformPackager" +import { AsarFilesystem, Node, readAsar } from "../asar" +import { createElectronCompilerHost } from "../fileTransformer" +import { AsarOptions } from "../metadata" +import { PlatformPackager } from "../platformPackager" import { dependencies } from "./readInstalled" const isBinaryFile: any = BluebirdPromise.promisify(require("isbinaryfile")) diff --git a/packages/electron-builder/src/readInstalled.ts b/packages/electron-builder/src/util/readInstalled.ts similarity index 100% rename from packages/electron-builder/src/readInstalled.ts rename to packages/electron-builder/src/util/readInstalled.ts diff --git a/packages/electron-builder/src/repositoryInfo.ts b/packages/electron-builder/src/util/repositoryInfo.ts similarity index 93% rename from packages/electron-builder/src/repositoryInfo.ts rename to packages/electron-builder/src/util/repositoryInfo.ts index 545d91a03cb..a54439cfc62 100644 --- a/packages/electron-builder/src/repositoryInfo.ts +++ b/packages/electron-builder/src/util/repositoryInfo.ts @@ -1,8 +1,8 @@ -import { SourceRepositoryInfo } from "electron-builder-core" import { readFile } from "fs-extra-p" import { fromUrl as parseRepositoryUrl } from "hosted-git-info" import * as path from "path" -import { Metadata, RepositoryInfo } from "./metadata" +import { SourceRepositoryInfo } from "../core" +import { Metadata, RepositoryInfo } from "../metadata" export function getRepositoryInfo(projectDir: string, metadata?: Metadata, devMetadata?: Metadata): Promise { return _getInfo(projectDir, (devMetadata == null ? null : devMetadata.repository) || (metadata == null ? null : metadata.repository)) diff --git a/packages/electron-builder/src/yarn.ts b/packages/electron-builder/src/util/yarn.ts similarity index 99% rename from packages/electron-builder/src/yarn.ts rename to packages/electron-builder/src/util/yarn.ts index adb5b25673d..90edb28e270 100644 --- a/packages/electron-builder/src/yarn.ts +++ b/packages/electron-builder/src/util/yarn.ts @@ -4,7 +4,7 @@ import { exists } from "electron-builder-util/out/fs" import { log, warn } from "electron-builder-util/out/log" import { homedir } from "os" import * as path from "path" -import { Config } from "./metadata" +import { Config } from "../metadata" import { readInstalled } from "./readInstalled" /** @internal */ diff --git a/packages/electron-builder/src/winPackager.ts b/packages/electron-builder/src/winPackager.ts index cf41ee3cced..98066caf0ac 100644 --- a/packages/electron-builder/src/winPackager.ts +++ b/packages/electron-builder/src/winPackager.ts @@ -1,5 +1,4 @@ import BluebirdPromise from "bluebird-lst" -import { DIR_TARGET, Platform, Target } from "electron-builder-core" import { parseDn } from "electron-builder-http/out/rfc2253Parser" import { asArray, exec, Lazy, use } from "electron-builder-util" import { log, warn } from "electron-builder-util/out/log" @@ -7,6 +6,7 @@ import { close, open, read, readFile, rename } from "fs-extra-p" import * as forge from "node-forge" import * as path from "path" import { downloadCertificate } from "./codeSign" +import { DIR_TARGET, Platform, Target } from "./core" import { WinBuildOptions } from "./options/winOptions" import { BuildInfo } from "./packagerApi" import { PlatformPackager } from "./platformPackager" diff --git a/packages/jsdoc2md.js b/packages/jsdoc2md.js index c3ad2e13363..f7cc3a0c487 100644 --- a/packages/jsdoc2md.js +++ b/packages/jsdoc2md.js @@ -27,10 +27,6 @@ async function main() { "util/**/*.js", ], {cwd: source}) - const coreFiles = await globby([ - "core/**/*.js", - ], {cwd: source}) - const httpFiles = await globby([ "http/**/*.js", "!http/electron-builder-http-out-publishOptions.js", @@ -68,7 +64,6 @@ async function main() { {page: "api/electron-publish.md", pageUrl: "electron-publish", files: publishFiles}, {page: "api/electron-builder-util.md", pageUrl: "electron-builder-util", files: utilFiles}, - {page: "api/electron-builder-core.md", pageUrl: "electron-builder-core", files: coreFiles}, {page: "api/electron-builder-http.md", pageUrl: "electron-builder-http", files: httpFiles}, ] diff --git a/packages/npm-publish.sh b/packages/npm-publish.sh index 6f6cb370d93..5b68df0fdec 100755 --- a/packages/npm-publish.sh +++ b/packages/npm-publish.sh @@ -5,7 +5,6 @@ ln -f README.md packages/electron-builder/README.md npm publish packages/asar-integrity || true npm publish packages/electron-builder-http || true -npm publish packages/electron-builder-core || true npm publish packages/electron-builder-util || true npm publish packages/electron-publish || true npm publish packages/electron-publisher-s3 || true diff --git a/packages/update-deps.js b/packages/update-deps.js index de0282073b3..f5d8079166d 100644 --- a/packages/update-deps.js +++ b/packages/update-deps.js @@ -7,7 +7,7 @@ function main() { return } - return spawn("ncu", ["--upgradeAll", "--reject", "electron-builder-http,electron-builder-util,electron-builder-core,electron-publish,electron-forge-maker-appimage,electron-forge-maker-nsis,electron-forge-maker-snap"], {cwd: projectDir, stdio: ["ignore", "inherit", "inherit"]}) + return spawn("ncu", ["--upgradeAll", "--reject", "electron-builder-http,electron-builder-util,electron-publish,electron-forge-maker-appimage,electron-forge-maker-nsis,electron-forge-maker-snap"], {cwd: projectDir, stdio: ["ignore", "inherit", "inherit"]}) }) } diff --git a/test/out/__snapshots__/muon.js.snap b/test/out/__snapshots__/muonTest.js.snap similarity index 100% rename from test/out/__snapshots__/muon.js.snap rename to test/out/__snapshots__/muonTest.js.snap diff --git a/test/src/RepoSlugTest.ts b/test/src/RepoSlugTest.ts index 914b3fb7bc8..3932767a9d7 100644 --- a/test/src/RepoSlugTest.ts +++ b/test/src/RepoSlugTest.ts @@ -1,4 +1,4 @@ -import { getRepositoryInfo } from "electron-builder/out/repositoryInfo" +import { getRepositoryInfo } from "electron-builder/out/util/repositoryInfo" function checkInfo(info: any) { delete info.pathmatch diff --git a/test/src/helpers/CheckingPackager.ts b/test/src/helpers/CheckingPackager.ts index e2361ff3cb5..e3ea50bc593 100644 --- a/test/src/helpers/CheckingPackager.ts +++ b/test/src/helpers/CheckingPackager.ts @@ -1,5 +1,4 @@ -import { BuildInfo, MacOptions } from "electron-builder" -import { Arch, Target } from "electron-builder-core" +import { Arch, BuildInfo, MacOptions, Target } from "electron-builder" import SquirrelWindowsTarget from "electron-builder-squirrel-windows" import OsXPackager from "electron-builder/out/macPackager" import { DmgTarget } from "electron-builder/out/targets/dmg" diff --git a/test/src/helpers/setVersions.ts b/test/src/helpers/setVersions.ts index 6ab22be083c..611511e80b1 100644 --- a/test/src/helpers/setVersions.ts +++ b/test/src/helpers/setVersions.ts @@ -62,26 +62,28 @@ async function setDepVersions(packages: Array, packageData: Array) let changed = false for (let depIndex = 0; depIndex < packages.length; depIndex++) { const depPackageName = packages[depIndex] - let oldVersion = packageJson.dependencies == null ? null : packageJson.dependencies[depPackageName] - if (oldVersion == null) { - continue - } + for (const depType of ["dependencies", "peerDependencies"]) { + let oldVersion = packageJson[depType] == null ? null : packageJson[depType][depPackageName] + if (oldVersion == null) { + continue + } - let range = "" - if (oldVersion.startsWith("~") || oldVersion.startsWith("^")) { - range = oldVersion[0] - oldVersion = oldVersion.substring(1) - } + let range = "" + if (oldVersion.startsWith("~") || oldVersion.startsWith("^")) { + range = oldVersion[0] + oldVersion = oldVersion.substring(1) + } - const newVersion = versions[depIndex] - if (oldVersion == newVersion || newVersion === "0.0.0-semantic-release") { - console.log(`Skip ${depPackageName} for ${packageName} — version ${newVersion} is actual`) - continue - } + const newVersion = versions[depIndex] + if (oldVersion == newVersion || newVersion === "0.0.0-semantic-release") { + console.log(`Skip ${depPackageName} for ${packageName} — version ${newVersion} is actual`) + continue + } - changed = true - packageJson.dependencies[depPackageName] = range + newVersion - console.log(`Set ${depPackageName} to ${newVersion} from ${oldVersion} for ${packageName}`) + changed = true + packageJson[depType][depPackageName] = range + newVersion + console.log(`Set ${depPackageName} to ${newVersion} from ${oldVersion} for ${packageName}`) + } } if (changed) { diff --git a/test/src/helpers/winHelper.ts b/test/src/helpers/winHelper.ts index 22c6c1907de..fd9fe69acef 100644 --- a/test/src/helpers/winHelper.ts +++ b/test/src/helpers/winHelper.ts @@ -1,5 +1,5 @@ import BluebirdPromise from "bluebird-lst" -import { Arch, Platform } from "electron-builder-core" +import { Arch, Platform } from "electron-builder" import { walk } from "electron-builder-util/out/fs" import { readAsarJson } from "electron-builder/out/asar" import { outputFile, readFile } from "fs-extra-p" diff --git a/test/src/mac/macArchiveTest.ts b/test/src/mac/macArchiveTest.ts index 852468e49e1..c99fd00c71a 100644 --- a/test/src/mac/macArchiveTest.ts +++ b/test/src/mac/macArchiveTest.ts @@ -1,5 +1,5 @@ import BluebirdPromise from "bluebird-lst" -import { Platform } from "electron-builder-core" +import { Platform } from "electron-builder" import { exec } from "electron-builder-util" import { readFile, symlink } from "fs-extra-p" import * as path from "path" diff --git a/test/src/muon.ts b/test/src/muonTest.ts similarity index 88% rename from test/src/muon.ts rename to test/src/muonTest.ts index b7798766155..f5c349b9a3a 100644 --- a/test/src/muon.ts +++ b/test/src/muonTest.ts @@ -1,4 +1,4 @@ -import { DIR_TARGET, Platform } from "electron-builder-core" +import { DIR_TARGET, Platform } from "electron-builder" import { app } from "./helpers/packTester" test.ifAll.ifDevOrLinuxCi("muon linux", app({ diff --git a/test/src/windows/installerTest.ts b/test/src/windows/installerTest.ts index 4ceb1e5897b..d34dd6dec2a 100644 --- a/test/src/windows/installerTest.ts +++ b/test/src/windows/installerTest.ts @@ -1,5 +1,4 @@ -import { Arch, Platform } from "electron-builder" -import { archFromString } from "electron-builder-core" +import { Arch, archFromString, Platform } from "electron-builder" import { readFile } from "fs-extra-p" import { safeLoad } from "js-yaml" import * as path from "path"