Skip to content

Commit adeaa34

Browse files
authored
fix: regenerating schema to account for electron-universal options x64ArchFiles (#6983)
1 parent b0e1b6f commit adeaa34

File tree

5 files changed

+25
-10
lines changed

5 files changed

+25
-10
lines changed

.changeset/three-apricots-battle.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"app-builder-lib": patch
3+
"builder-util-runtime": patch
4+
"builder-util": patch
5+
---
6+
7+
fix: regenerate schema.json for `x64ArchFiles` in mac universal options

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s && git add CHANGELOG.md",
2828
"generate-changeset": "pnpm changeset",
2929
"generate-docs": "pnpm compile && pnpm jsdoc && pnpm jsdoc2md2html",
30+
"generate-schema": "typescript-json-schema packages/app-builder-lib/tsconfig-scheme.json Configuration --out packages/app-builder-lib/scheme.json --noExtraProps --useTypeOfKeyword --strictNullChecks --required && node ./scripts/fix-schema.js",
3031
"ci:test": "node ./test/out/helpers/runTests.js",
31-
"ci:version": "pnpm changelog && changeset version && node scripts/update-package-version-export.js && pnpm run schema && pnpm run generate-docs && pnpm run prettier && git add .",
32+
"ci:version": "pnpm changelog && changeset version && node scripts/update-package-version-export.js && pnpm run generate-schema && pnpm run generate-docs && pnpm run prettier && git add .",
3233
"ci:publish": "pnpm compile && pnpm publish -r && changeset tag",
33-
"schema": "typescript-json-schema packages/app-builder-lib/tsconfig-scheme.json Configuration --out packages/app-builder-lib/scheme.json --noExtraProps --useTypeOfKeyword --strictNullChecks --required && node ./scripts/fix-schema.js",
3434
"jsdoc": "ts2jsdoc packages/builder-util-runtime packages/builder-util packages/app-builder-lib packages/electron-builder packages/electron-publish packages/electron-updater packages/dmg-builder",
3535
"jsdoc2md2html": "node scripts/jsdoc2md2html.js",
3636
"prepare": "husky install",

packages/app-builder-lib/CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@
366366

367367
- [#6185](https://github.com/electron-userland/electron-builder/pull/6185) [`f6a30535`](https://github.com/electron-userland/electron-builder/commit/f6a3053563bd50dc77010d2910086c81acdf613e) Thanks [@mmaietta](https://github.com/mmaietta)! - fix: Support Windows 11 in VMs
368368

369-
* [#6193](https://github.com/electron-userland/electron-builder/pull/6193) [`7f933d00`](https://github.com/electron-userland/electron-builder/commit/7f933d0004a0a5f808a2a1c71dca7362cab2728e) Thanks [@mmaietta](https://github.com/mmaietta)! - fix: adding snapStore to AllPublishOptions so that it properly is generated via `pnpm schema`
369+
* [#6193](https://github.com/electron-userland/electron-builder/pull/6193) [`7f933d00`](https://github.com/electron-userland/electron-builder/commit/7f933d0004a0a5f808a2a1c71dca7362cab2728e) Thanks [@mmaietta](https://github.com/mmaietta)! - fix: adding snapStore to AllPublishOptions so that it properly is generated via `pnpm generate-schema`
370370

371371
* Updated dependencies [[`7f933d00`](https://github.com/electron-userland/electron-builder/commit/7f933d0004a0a5f808a2a1c71dca7362cab2728e)]:
372372

packages/app-builder-lib/scheme.json

+14-6
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@
563563
]
564564
},
565565
"desktop": {
566-
"description": "The [Desktop file](https://developer.gnome.org/integration-guide/stable/desktop-files.html.en) entries (name to value)."
566+
"description": "The [Desktop file](https://developer.gnome.org/documentation/guidelines/maintainer/integrating.html#desktop-files) entries (name to value)."
567567
},
568568
"executableArgs": {
569569
"anyOf": [
@@ -1140,7 +1140,7 @@
11401140
]
11411141
},
11421142
"desktop": {
1143-
"description": "The [Desktop file](https://developer.gnome.org/integration-guide/stable/desktop-files.html.en) entries (name to value)."
1143+
"description": "The [Desktop file](https://developer.gnome.org/documentation/guidelines/maintainer/integrating.html#desktop-files) entries (name to value)."
11441144
},
11451145
"executableArgs": {
11461146
"anyOf": [
@@ -1684,7 +1684,7 @@
16841684
]
16851685
},
16861686
"desktop": {
1687-
"description": "The [Desktop file](https://developer.gnome.org/integration-guide/stable/desktop-files.html.en) entries (name to value)."
1687+
"description": "The [Desktop file](https://developer.gnome.org/documentation/guidelines/maintainer/integrating.html#desktop-files) entries (name to value)."
16881688
},
16891689
"detectUpdateChannel": {
16901690
"default": true,
@@ -1971,7 +1971,7 @@
19711971
}
19721972
],
19731973
"default": "AppImage",
1974-
"description": "Target package type: list of `AppImage`, `snap`, `deb`, `rpm`, `freebsd`, `pacman`, `p5p`, `apk`, `7z`, `zip`, `tar.xz`, `tar.lz`, `tar.gz`, `tar.bz2`, `dir`.\n\nelectron-builder [docker image](/multi-platform-build#docker) can be used to build Linux targets on any platform.\n\nPlease [do not put an AppImage into another archive](https://github.com/probonopd/AppImageKit/wiki/Creating-AppImages#common-mistake) like a .zip or .tar.gz."
1974+
"description": "Target package type: list of `AppImage`, `flatpak`, `snap`, `deb`, `rpm`, `freebsd`, `pacman`, `p5p`, `apk`, `7z`, `zip`, `tar.xz`, `tar.lz`, `tar.gz`, `tar.bz2`, `dir`.\n\nelectron-builder [docker image](/multi-platform-build#docker) can be used to build Linux targets on any platform.\n\nPlease [do not put an AppImage into another archive](https://github.com/probonopd/AppImageKit/wiki/Creating-AppImages#common-mistake) like a .zip or .tar.gz."
19751975
},
19761976
"vendor": {
19771977
"description": "The vendor. Defaults to [author](/configuration/configuration#Metadata-author).",
@@ -2052,7 +2052,7 @@
20522052
]
20532053
},
20542054
"desktop": {
2055-
"description": "The [Desktop file](https://developer.gnome.org/integration-guide/stable/desktop-files.html.en) entries (name to value)."
2055+
"description": "The [Desktop file](https://developer.gnome.org/documentation/guidelines/maintainer/integrating.html#desktop-files) entries (name to value)."
20562056
},
20572057
"executableArgs": {
20582058
"anyOf": [
@@ -2813,6 +2813,10 @@
28132813
],
28142814
"default": "distribution",
28152815
"description": "Whether to sign app for development or for distribution."
2816+
},
2817+
"x64ArchFiles": {
2818+
"description": "Minimatch pattern of paths that are allowed to be x64 binaries in both\nASAR files\n\nThis option has no effect unless building for \"universal\" arch and applies\nonly if `mergeASARs` is `true`.",
2819+
"type": "string"
28162820
}
28172821
},
28182822
"type": "object"
@@ -3427,6 +3431,10 @@
34273431
],
34283432
"default": "distribution",
34293433
"description": "Whether to sign app for development or for distribution."
3434+
},
3435+
"x64ArchFiles": {
3436+
"description": "Minimatch pattern of paths that are allowed to be x64 binaries in both\nASAR files\n\nThis option has no effect unless building for \"universal\" arch and applies\nonly if `mergeASARs` is `true`.",
3437+
"type": "string"
34303438
}
34313439
},
34323440
"type": "object"
@@ -5015,7 +5023,7 @@
50155023
]
50165024
},
50175025
"desktop": {
5018-
"description": "The [Desktop file](https://developer.gnome.org/integration-guide/stable/desktop-files.html.en) entries (name to value)."
5026+
"description": "The [Desktop file](https://developer.gnome.org/documentation/guidelines/maintainer/integrating.html#desktop-files) entries (name to value)."
50195027
},
50205028
"environment": {
50215029
"anyOf": [

packages/builder-util-runtime/CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464

6565
### Patch Changes
6666

67-
- [#6193](https://github.com/electron-userland/electron-builder/pull/6193) [`7f933d00`](https://github.com/electron-userland/electron-builder/commit/7f933d0004a0a5f808a2a1c71dca7362cab2728e) Thanks [@mmaietta](https://github.com/mmaietta)! - fix: adding snapStore to AllPublishOptions so that it properly is generated via `pnpm schema`
67+
- [#6193](https://github.com/electron-userland/electron-builder/pull/6193) [`7f933d00`](https://github.com/electron-userland/electron-builder/commit/7f933d0004a0a5f808a2a1c71dca7362cab2728e) Thanks [@mmaietta](https://github.com/mmaietta)! - fix: adding snapStore to AllPublishOptions so that it properly is generated via `pnpm generate-schema`
6868

6969
## 8.8.0
7070

0 commit comments

Comments
 (0)