fix(snap): electron 1 template is broken

Close electron-userland#2808

package.json

@@ -29,15 +29,15 @@
   "////": "All typings are added into root `package.json` to avoid duplication errors in the IDE compiler (several `node.d.ts` files).",
   "dependencies": {
     "7zip-bin": "~3.1.0",
-    "app-builder-bin": "1.8.5",
+    "app-builder-bin": "1.8.6",
     "archiver": "^2.1.1",
     "async-exit-hook": "^2.0.1",
     "aws-sdk": "^2.224.1",
     "bluebird-lst": "^1.0.5",
     "chalk": "^2.3.2",
     "chromium-pickle-js": "^0.2.0",
     "debug": "^3.1.0",
-    "ejs": "^2.5.8",
+    "ejs": "^2.5.9",
     "electron-download-tf": "4.3.4",
     "electron-is-dev": "^0.3.0",
     "electron-osx-sign": "0.4.10",

packages/builder-util/package.json

@@ -11,7 +11,7 @@
     "out"
   ],
   "dependencies": {
-    "app-builder-bin": "1.8.5",
+    "app-builder-bin": "1.8.6",
     "temp-file": "^3.1.1",
     "fs-extra-p": "^4.5.2",
     "is-ci": "^1.1.0",

packages/electron-builder-lib/package.json

@@ -42,7 +42,7 @@
   "homepage": "https://github.com/electron-userland/electron-builder",
   "dependencies": {
     "7zip-bin": "~3.1.0",
-    "app-builder-bin": "1.8.5",
+    "app-builder-bin": "1.8.6",
     "async-exit-hook": "^2.0.1",
     "bluebird-lst": "^1.0.5",
     "chromium-pickle-js": "^0.2.0",
@@ -64,7 +64,7 @@
     "debug": "^3.1.0",
     "lazy-val": "^1.0.3",
     "temp-file": "^3.1.1",
-    "ejs": "^2.5.8"
+    "ejs": "^2.5.9"
   },
   "typings": "./out/index.d.ts"
 }

scripts/snap-template.sh

@@ -4,7 +4,8 @@ rm -rf ~/squashfs-root
 #unsquashfs /media/psf/test/electron-builder-test/dist/se-electron2_1.1.0_amd64.snap
 unsquashfs /media/psf/test/electron-builder-test/dist/se-wo-template_1.1.0_amd64.snap
 rm -rf ~/squashfs-root/app ~/squashfs-root/snap ~/squashfs-root/meta ~/squashfs-root/command.sh
-#mksquashfs ~/squashfs-root /media/psf/test/electron-template-2.snap -comp xz -noappend -comp xz -no-xattrs -no-fragments -all-root
-mksquashfs ~/squashfs-root /media/psf/test/electron-template-1.snap -comp xz -noappend -comp xz -no-xattrs -no-fragments -all-root
+#mksquashfs ~/squashfs-root /media/psf/test/electron-template-2.snap -comp xz -noappend -no-xattrs -no-fragments -all-root
+mksquashfs ~/squashfs-root /media/psf/test/electron-template-1.snap -comp xz -noappend -no-xattrs -no-fragments -all-root
 
-shasum -a 512 /Volumes/test/electron-template-2.snap | xxd -r -p | base64
+shasum -a 512 /Volumes/test/electron-template-1.2.1.snap | xxd -r -p | base64
+#shasum -a 512 /Volumes/test/electron-template-2.2.1.snap | xxd -r -p | base64

test/src/linux/snapTest.ts

@@ -30,7 +30,7 @@ test.ifAll.ifDevOrLinuxCi("snap electron 2", app({
       artifactName: "${name}_v${version}.${ext}",
     },
     productName: "Sep Electron 2",
-    electronVersion: "2.0.0-beta.1",
+    electronVersion: "2.0.0-beta.7",
   },
 }))
 
@@ -54,7 +54,7 @@ test.skip("snap full electron 2", app({
     extraMetadata: {
       name: "se-electron2",
     },
-    electronVersion: "2.0.0-beta.5",
+    electronVersion: "2.0.0-beta.7",
     productName: "Snap Electron 2 App (full build)",
     snap: {
       useTemplateApp: false,

yarn.lock

@@ -411,25 +411,25 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-[email protected].5:
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/app-builder-bin-linux/-/app-builder-bin-linux-1.8.5.tgz#bf001d3ef347e1179680a1760fea83d0832fc344"
+[email protected].6:
+  version "1.8.6"
+  resolved "https://registry.yarnpkg.com/app-builder-bin-linux/-/app-builder-bin-linux-1.8.6.tgz#81176bbcb2929958a90f2184afb54df90b7210a3"
 
-[email protected].5:
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/app-builder-bin-mac/-/app-builder-bin-mac-1.8.5.tgz#31282504d232081a9de94d377736bf904bbfbd53"
+[email protected].6:
+  version "1.8.6"
+  resolved "https://registry.yarnpkg.com/app-builder-bin-mac/-/app-builder-bin-mac-1.8.6.tgz#20d7233c5cadf00472e7b0ccaf85627b53f90787"
 
-[email protected].5:
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/app-builder-bin-win/-/app-builder-bin-win-1.8.5.tgz#d7eefc1dff6052e137a3c5d68cd6e68ba862054b"
+[email protected].6:
+  version "1.8.6"
+  resolved "https://registry.yarnpkg.com/app-builder-bin-win/-/app-builder-bin-win-1.8.6.tgz#d09f78fb1dd5a5f8ea231294828fd5c9ad0358a5"
 
-[email protected].5:
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.8.5.tgz#ac0c0fad3c348ff3bde367e49b25cf5edc414407"
+[email protected].6:
+  version "1.8.6"
+  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.8.6.tgz#85604ece9c1b63ed0437abe92ddaf41c88c3f2e4"
   optionalDependencies:
-    app-builder-bin-linux "1.8.5"
-    app-builder-bin-mac "1.8.5"
-    app-builder-bin-win "1.8.5"
+    app-builder-bin-linux "1.8.6"
+    app-builder-bin-mac "1.8.6"
+    app-builder-bin-win "1.8.6"
 
 append-transform@^0.4.0:
   version "0.4.0"
@@ -1882,9 +1882,9 @@ [email protected]:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
 
-ejs@^2.5.8:
-  version "2.5.8"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.8.tgz#2ab6954619f225e6193b7ac5f7c39c48fefe4380"
+ejs@^2.5.9:
+  version "2.5.9"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.9.tgz#7ba254582a560d267437109a68354112475b0ce5"
 
 electron-builder-tslint-config@^1.1.0:
   version "1.1.0"