Skip to content

Commit 866ae11

Browse files
develardevelar
committed
fix(snap): do not add "adapter: none" for prepacked snap #2614 
1 parent 333a45d commit 866ae11

File tree

6 files changed

+27
-24
lines changed

6 files changed

+27
-24
lines changed

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
"////": "All typings are added into root `package.json` to avoid duplication errors in the IDE compiler (several `node.d.ts` files).",
3030
"dependencies": {
3131
"7zip-bin": "~3.1.0",
32-
"app-builder-bin": "1.3.7",
32+
"app-builder-bin": "1.3.8",
3333
"archiver": "^2.1.1",
3434
"async-exit-hook": "^2.0.1",
35-
"aws-sdk": "^2.199.0",
35+
"aws-sdk": "^2.201.0",
3636
"bluebird-lst": "^1.0.5",
3737
"chalk": "^2.3.0",
3838
"chromium-pickle-js": "^0.2.0",

‎packages/builder-util/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"out"
1212
],
1313
"dependencies": {
14-
"app-builder-bin": "1.3.7",
14+
"app-builder-bin": "1.3.8",
1515
"temp-file": "^3.1.1",
1616
"fs-extra-p": "^4.5.2",
1717
"is-ci": "^1.1.0",

‎packages/electron-builder-lib/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"homepage": "https://github.com/electron-userland/electron-builder",
4343
"dependencies": {
4444
"7zip-bin": "~3.1.0",
45-
"app-builder-bin": "1.3.7",
45+
"app-builder-bin": "1.3.8",
4646
"async-exit-hook": "^2.0.1",
4747
"bluebird-lst": "^1.0.5",
4848
"chromium-pickle-js": "^0.2.0",

‎packages/electron-builder-lib/src/targets/snap.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ export default class SnapTarget extends Target {
5353
apps: {
5454
[snapName]: {
5555
command: `bin/desktop-launch $SNAP/app/${this.packager.executableName}`,
56-
adapter: "none",
5756
environment: {
5857
TMPDIR: "$XDG_RUNTIME_DIR",
5958
PATH: "$SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$PATH",
@@ -79,6 +78,10 @@ export default class SnapTarget extends Target {
7978
},
8079
}
8180

81+
if (!this.isUseTemplateApp) {
82+
snap[snapName].adapter = "none"
83+
}
84+
8285
if (buildPackages.length > 0) {
8386
snap.parts.app["build-packages"] = buildPackages
8487
}

‎packages/electron-publisher-s3/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
],
1313
"dependencies": {
1414
"fs-extra-p": "^4.5.2",
15-
"aws-sdk": "^2.199.0",
15+
"aws-sdk": "^2.201.0",
1616
"mime": "^2.2.0",
1717
"electron-publish": "~0.0.0-semantic-release",
1818
"builder-util": "^0.0.0-semantic-release",

‎yarn.lock

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -275,25 +275,25 @@ anymatch@^1.3.0:
275275
micromatch "^2.1.5"
276276
normalize-path "^2.0.0"
277277

278-
app-builder-bin-linux@1.3.7:
279-
version "1.3.7"
280-
resolved "https://registry.yarnpkg.com/app-builder-bin-linux/-/app-builder-bin-linux-1.3.7.tgz#9eeb28f7f2c9eb91f4dcd02f03e9117b45891cae"
278+
app-builder-bin-linux@1.3.8:
279+
version "1.3.8"
280+
resolved "https://registry.yarnpkg.com/app-builder-bin-linux/-/app-builder-bin-linux-1.3.8.tgz#138eaddce970fb485b715e8c3cd88064aee4efb4"
281281

282-
app-builder-bin-mac@1.3.7:
283-
version "1.3.7"
284-
resolved "https://registry.yarnpkg.com/app-builder-bin-mac/-/app-builder-bin-mac-1.3.7.tgz#43705d9f0c75ef8ac2a07dcf9c31d9c0d3e27770"
282+
app-builder-bin-mac@1.3.8:
283+
version "1.3.8"
284+
resolved "https://registry.yarnpkg.com/app-builder-bin-mac/-/app-builder-bin-mac-1.3.8.tgz#ca7fa326ffeea0eb70cbdce1715ebb27b2ebb7a2"
285285

286-
app-builder-bin-win@1.3.7:
287-
version "1.3.7"
288-
resolved "https://registry.yarnpkg.com/app-builder-bin-win/-/app-builder-bin-win-1.3.7.tgz#f5ddef00b0822885fd376f4323aa48c14a5788bf"
286+
app-builder-bin-win@1.3.8:
287+
version "1.3.8"
288+
resolved "https://registry.yarnpkg.com/app-builder-bin-win/-/app-builder-bin-win-1.3.8.tgz#5f48cbe5ca9b200a11b7f786c7de486b53543df9"
289289

290-
app-builder-bin@1.3.7:
291-
version "1.3.7"
292-
resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.3.7.tgz#4df1bc9b9448935caaa2f45283655b0704ab994f"
290+
app-builder-bin@1.3.8:
291+
version "1.3.8"
292+
resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.3.8.tgz#f0f2f41d5fa30aad7b2543d7263d2139c8a918ec"
293293
optionalDependencies:
294-
app-builder-bin-linux "1.3.7"
295-
app-builder-bin-mac "1.3.7"
296-
app-builder-bin-win "1.3.7"
294+
app-builder-bin-linux "1.3.8"
295+
app-builder-bin-mac "1.3.8"
296+
app-builder-bin-win "1.3.8"
297297

298298
append-transform@^0.4.0:
299299
version "0.4.0"
@@ -484,9 +484,9 @@ atob@^2.0.0:
484484
version "2.0.3"
485485
resolved "https://registry.yarnpkg.com/atob/-/atob-2.0.3.tgz#19c7a760473774468f20b2d2d03372ad7d4cbf5d"
486486

487-
aws-sdk@^2.199.0:
488-
version "2.199.0"
489-
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.199.0.tgz#94c2484b030f299dda494c94bacc4f66e4b32de9"
487+
aws-sdk@^2.201.0:
488+
version "2.201.0"
489+
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.201.0.tgz#7a4528262d9097abe37ebf4e6bf9d1851db47003"
490490
dependencies:
491491
buffer "4.9.1"
492492
events "^1.1.1"

0 commit comments

Comments
 (0)