feat(snap): use template snap app if no custom stage/build packages

Author: develar

.idea/dictionaries/develar.xml

@@ -1,7 +1,10 @@
 FROM electronuserland/builder:base
 
-RUN curl -sL https://deb.nodesource.com/setup_9.x | bash - && apt-get install -y nodejs && \
+ENV NODE_VERSION 9.4.0
+
+# this package is used for snapcraft and we should not clear apt list - to avoid apt-get update during snap build
+RUN apt-get -qq update && \
+  curl -L https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz | tar xz -C /usr/local --strip-components=1 && \
+  unlink /usr/local/CHANGELOG.md && unlink /usr/local/LICENSE && unlink /usr/local/README.md && \
   # https://github.com/npm/npm/issues/4531
-  npm config set unsafe-perm true && \
-  # clean
-  apt-get clean && rm -rf /var/lib/apt/lists/*
+  npm config set unsafe-perm true

docker/9/Dockerfile

@@ -3,7 +3,7 @@ FROM buildpack-deps:xenial-curl
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN curl -L https://yarnpkg.com/latest.tar.gz | tar xvz && mv yarn-* /yarn && ln -s /yarn/bin/yarn /usr/bin/yarn && \
-  apt-get update -y && \
+  apt-get -qq update && apt-get -qq dist-upgrade && \
   # add repo for git-lfs
   curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash && \
   # git ssh for using as docker image on CircleCI

docker/base/Dockerfile

@@ -28,7 +28,7 @@
   "///": "All dependencies for all packages (hoisted)",
   "////": "All typings are added into root `package.json` to avoid duplication errors in the IDE compiler (several `node.d.ts` files).",
   "dependencies": {
-    "7zip-bin": "^2.4.1",
+    "7zip-bin": "~3.0.0",
     "archiver": "^2.1.1",
     "async-exit-hook": "^2.0.1",
     "aws-sdk": "^2.188.0",
@@ -45,7 +45,6 @@
     "hosted-git-info": "^2.5.0",
     "iconv-lite": "^0.4.19",
     "ini": "^1.3.5",
-    "int64-buffer": "^0.1.10",
     "is-ci": "^1.1.0",
     "isbinaryfile": "^3.0.2",
     "js-yaml": "^3.10.0",
@@ -102,7 +101,7 @@
     "ts-babel": "^4.1.8",
     "ts-jsdoc": "^2.0.6",
     "tslint": "^5.9.1",
-    "typescript": "^2.7.0-rc",
+    "typescript": "2.7.0-rc",
     "v8-compile-cache": "^1.1.2",
     "whitespace": "^2.1.0",
     "worker-farm": "^1.5.2"

package.json

@@ -20,7 +20,7 @@
     "debug": "^3.1.0",
     "builder-util-runtime": "^0.0.0-semantic-release",
     "source-map-support": "^0.5.3",
-    "7zip-bin": "^2.4.1",
+    "7zip-bin": "~3.0.0",
     "ini": "^1.3.5",
     "tunnel-agent": "^0.6.0",
     "semver": "^5.5.0",

packages/builder-util/package.json

@@ -4,6 +4,7 @@ import isCi from "is-ci"
 import * as path from "path"
 import Mode from "stat-mode"
 import { log } from "./log"
+import { exec } from "./util"
 import { orNullIfFileNotExist } from "./promise"
 
 export const MAX_FILE_REQUESTS = 8
@@ -290,6 +291,23 @@ export function copyDir(src: string, destination: string, options: CopyDirOption
     .then(() => BluebirdPromise.map(links, it => symlink(it.link, it.file), CONCURRENCY))
 }
 
+// https://unix.stackexchange.com/questions/202430/how-to-copy-a-directory-recursively-using-hardlinks-for-each-file
+export function copyDirUsingHardLinks(source: string, destination: string) {
+  if (process.platform !== "darwin") {
+    const args = ["-d", "--recursive", "--preserve=mode"]
+    args.push("--link")
+    args.push(source + "/", destination + "/")
+    return ensureDir(path.dirname(destination)).then(() => exec("cp", args))
+  }
+
+  // pax requires created dir
+  const promise = ensureDir(destination)
+  return promise
+    .then(() => exec("pax", ["-rwl", "-p", "amp" /* Do not preserve file access times, Do not preserve file modification times, Preserve the file mode	bits */, ".", destination], {
+      cwd: source,
+    }))
+}
+
 export const DO_NOT_USE_HARD_LINKS = (file: string) => false
 export const USE_HARD_LINKS = (file: string) => true
 

packages/builder-util/src/fs.ts

@@ -310,7 +310,7 @@ export function addValue<K, T>(map: Map<K, Array<T>>, key: K, value: T) {
 }
 
 export function replaceDefault(inList: Array<string> | null | undefined, defaultList: Array<string>): Array<string> {
-  if (inList == null) {
+  if (inList == null || (inList.length === 1 && inList[0] === "default")) {
     return defaultList
   }
 

packages/builder-util/src/util.ts

@@ -41,7 +41,7 @@
   "bugs": "https://github.com/electron-userland/electron-builder/issues",
   "homepage": "https://github.com/electron-userland/electron-builder",
   "dependencies": {
-    "7zip-bin": "^2.4.1",
+    "7zip-bin": "~3.0.0",
     "async-exit-hook": "^2.0.1",
     "bluebird-lst": "^1.0.5",
     "chromium-pickle-js": "^0.2.0",

packages/electron-builder-lib/package.json

@@ -28,7 +28,7 @@ export interface SnapOptions extends CommonLinuxOptions, TargetSpecificOptions {
   /**
    * The list of features that must be supported by the core in order for this snap to install.
    */
-  readonly assumes?: Array<string> | null
+  readonly assumes?: Array<string> | string | null
 
   /**
    * The list of debian packages needs to be installed for building this snap.

packages/electron-builder-lib/src/options/SnapOptions.ts

@@ -1,4 +1,4 @@
-import { computeData } from "asar-integrity"
+import { computeData, AsarIntegrity } from "asar-integrity"
 import BluebirdPromise from "bluebird-lst"
 import { Arch, asArray, AsyncTaskManager, debug, DebugLogger, exec, getArchSuffix, InvalidConfigurationError, isEmptyOrSpaces, log } from "builder-util"
 import { PackageBuilder } from "builder-util/out/api"
@@ -9,7 +9,6 @@ import { Lazy } from "lazy-val"
 import { Minimatch } from "minimatch"
 import * as path from "path"
 import { deepAssign } from "read-config-file/out/deepAssign"
-import { AsarIntegrity } from "asar-integrity"
 import { AppInfo } from "./appInfo"
 import { checkFileInArchive } from "./asar/asarFileChecker"
 import { AsarPackager } from "./asar/asarUtil"