Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(appx): utilize applicationId verbatim when provided #8502

Merged
merged 2 commits into from
Sep 19, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
extract common configuration options to its own interface for better …
…readability on the docs site
  • Loading branch information
mmaietta committed Sep 19, 2024
commit ca5488ee1b4c5e31586357d3208452ac4e02265c
1 change: 0 additions & 1 deletion packages/app-builder-lib/scheme.json
Original file line number Diff line number Diff line change
Expand Up @@ -6596,7 +6596,6 @@
"type": "object"
}
},
"description": "Configuration Options",
"properties": {
"afterAllArtifactBuild": {
"anyOf": [
Expand Down
77 changes: 39 additions & 38 deletions packages/app-builder-lib/src/configuration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { NsisOptions, NsisWebOptions, PortableOptions } from "./targets/nsis/nsi
/**
* Configuration Options
*/
export interface Configuration extends PlatformSpecificBuildOptions, Hooks {
export interface CommonConfiguration {
/**
* The application id. Used as [CFBundleIdentifier](https://developer.apple.com/library/ios/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html#//apple_ref/doc/uid/20001431-102070) for MacOS and as
* [Application User Model ID](https://msdn.microsoft.com/en-us/library/windows/desktop/dd378459(v=vs.85).aspx) for Windows (NSIS target only, Squirrel.Windows not supported). It is strongly recommended that an explicit ID is set.
Expand Down Expand Up @@ -107,12 +107,6 @@ export interface Configuration extends PlatformSpecificBuildOptions, Hooks {
readonly p5p?: LinuxTargetSpecificOptions | null
readonly apk?: LinuxTargetSpecificOptions | null

/**
* Whether to include *all* of the submodules node_modules directories
* @default false
*/
includeSubNodeModules?: boolean

/**
* Whether to build the application native dependencies from source.
* @default false
Expand Down Expand Up @@ -157,6 +151,44 @@ export interface Configuration extends PlatformSpecificBuildOptions, Hooks {
*/
readonly downloadAlternateFFmpeg?: boolean

/**
* Inject properties to `package.json`.
*/
readonly extraMetadata?: any

/**
* Whether to fail if the application is not signed (to prevent unsigned app if code signing configuration is not correct).
* @default false
*/
readonly forceCodeSigning?: boolean

/**
* Whether to include PDB files.
* @default false
*/
readonly includePdb?: boolean

/**
* Whether to remove `scripts` field from `package.json` files.
*
* @default true
*/
readonly removePackageScripts?: boolean

/**
* Whether to remove `keywords` field from `package.json` files.
*
* @default true
*/
readonly removePackageKeywords?: boolean
}
export interface Configuration extends CommonConfiguration, PlatformSpecificBuildOptions, Hooks {
/**
* Whether to include *all* of the submodules node_modules directories
* @default false
*/
includeSubNodeModules?: boolean

/**
* Whether to use [electron-compile](http://github.com/electron/electron-compile) to compile app. Defaults to `true` if `electron-compile` in the dependencies. And `false` if in the `devDependencies` or doesn't specified.
*/
Expand Down Expand Up @@ -191,17 +223,6 @@ export interface Configuration extends PlatformSpecificBuildOptions, Hooks {
*/
extends?: Array<string> | string | null

/**
* Inject properties to `package.json`.
*/
readonly extraMetadata?: any

/**
* Whether to fail if the application is not signed (to prevent unsigned app if code signing configuration is not correct).
* @default false
*/
readonly forceCodeSigning?: boolean

/**
* *libui-based frameworks only* The version of NodeJS you are packaging for.
* You can set it to `current` to set the Node.js version that you use to run.
Expand All @@ -218,26 +239,6 @@ export interface Configuration extends PlatformSpecificBuildOptions, Hooks {
*/
readonly framework?: string | null

/**
* Whether to include PDB files.
* @default false
*/
readonly includePdb?: boolean

/**
* Whether to remove `scripts` field from `package.json` files.
*
* @default true
*/
readonly removePackageScripts?: boolean

/**
* Whether to remove `keywords` field from `package.json` files.
*
* @default true
*/
readonly removePackageKeywords?: boolean

/**
* Whether to disable sanity check asar package (useful for custom electron forks that implement their own encrypted integrity validation)
* @default false
Expand Down
1 change: 1 addition & 0 deletions packages/app-builder-lib/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export {
} from "./core"
export { getArchSuffix, Arch, archFromString } from "builder-util"
export {
CommonConfiguration,
Configuration,
AfterPackContext,
MetadataDirectories,
Expand Down
4 changes: 2 additions & 2 deletions pages/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ Env file `electron-builder.env` in the current dir ([example](https://github.com
* Name of optional property is normal, **required** is bold.
* Type is specified after property name: `Array<String> | String`. Union like this means that you can specify or string (`**/*`), or array of strings (`["**/*", "!foo.js"]`).

### Configuration
### Common Configuration

{!./app-builder-lib.Interface.Configuration.md!}
{!./app-builder-lib.Interface.CommonConfiguration.md!}

---

Expand Down
Loading