Merge commit 'dcf3dbb48979291fb91301610de9e417e0ab7b79' into vb-custom

* commit 'dcf3dbb48979291fb91301610de9e417e0ab7b79': (43 commits) feat: LSTypeIsPackage for file associations fix: Trim suffix from wine version (electron-userland#1033) fix: Stub Executables missing in Squirrel.Windows 1.5.1 fix: order of platform and arch npm env vars (electron-userland#1029) feat: Set platform npm environment variable feat: Use Electron.Net to send http requests for auto updater docs: typo (electron-userland#1026) refactor: reexport HttpError feat(appx): more customizable manifest fields chore: prefer const feat: 32 bit appx fix: yarn detection feat: update Squirrel.Windows to 1.5.1 fix: update nsis to 3.0.1 docs: Added details about setting AUMID for Windows 8/8.1 notifications. fix: update nsis to 3.0.1 test: attempt to make Win CI green test: use yarn on Appveyor fix: ENOENT for symlinks because directory was not created fix(electron-auto-updater): load default provider only if custom was not set ... # Conflicts: # src/cli/install-app-deps.ts # src/cli/node-gyp-rebuild.ts # src/packager.ts # src/publish/restApiRequest.ts # src/targets/nsis.ts # src/util/httpRequest.ts # src/yarn.ts
voidbridge · Dec 24, 2016 · 45abb1a · 45abb1a
2 parents ca9d3df + dcf3dbb
commit 45abb1a
Show file tree

Hide file tree

Showing 131 changed files with 119,386 additions and 1,984 deletions.
diff --git a/.babelrc b/.babelrc
@@ -0,0 +1,43 @@
+{
+  env: {
+    development: {
+      plugins: [
+        [
+          "transform-async-to-module-method",
+          {
+            module: "bluebird-lst-c",
+            method: "coroutine"
+          }
+        ],
+        "transform-es2015-parameters",
+        "transform-es2015-spread",
+        "transform-es2015-destructuring",
+        "array-includes",
+        [
+          "transform-inline-imports-commonjs",
+          {
+            excludeModules: ["path"]
+          }
+        ],
+      ],
+    },
+    test: {
+      sourceMaps: "inline",
+      plugins: [
+        [
+          "transform-async-to-module-method",
+          {
+            module: "bluebird-lst-c",
+            method: "coroutine"
+          }
+        ],
+        [
+          "transform-inline-imports-commonjs",
+          {
+            excludeModules: ["path"]
+          }
+        ],
+      ]
+    }
+  }
+}
diff --git a/.gitignore b/.gitignore
@@ -1,16 +1,31 @@
 node_modules/
 *.log
-out/
+
+#**/out/**/*
+#!**/*js.snap
+
 dist/
+
 /.idea/compiler.xml
 /.idea/encodings.xml
-/.idea/copyright/profiles_settings.xml
 /.idea/workspace.xml
+/.idea/copyright/
 /.idea/deployment.xml
+/.idea/shelf/
+
+/docs/.idea/
+
 /typings/browser/
 /typings/browser.d.ts
 /typings/main.d.ts
+
 .DS_Store
-.idea/shelf/
+
 /test/typings/electron-builder.d.ts
-/test/typings/electron-auto-updater.d.ts
+/test/typings/electron-auto-updater.d.ts
+
+/nsis-auto-updater/out/
+/out/
+# to not exclude .js.snap (jest snapshots)
+/test/out/**/*.js
+/test/out/**/*.map
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
diff --git a/.idea/dictionaries/develar.xml b/.idea/dictionaries/develar.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/rc-producer.yml b/.idea/rc-producer.yml
diff --git a/.idea/runConfigurations/ArtifactPublisherTest.xml b/.idea/runConfigurations/ArtifactPublisherTest.xml
diff --git a/.idea/runConfigurations/BuildTest.xml b/.idea/runConfigurations/BuildTest.xml
diff --git a/.idea/runConfigurations/CodeSignTest.xml b/.idea/runConfigurations/CodeSignTest.xml
diff --git a/.idea/runConfigurations/RepoSlugTest.xml b/.idea/runConfigurations/RepoSlugTest.xml
diff --git a/.idea/runConfigurations/winPackagerTest__debug_logging_.xml b/.idea/runConfigurations/winPackagerTest__debug_logging_.xml
diff --git a/.idea/scopes/json5.xml b/.idea/scopes/json5.xml
diff --git a/.mention-bot b/.mention-bot
@@ -0,0 +1,3 @@
+{
+ "userBlacklist": ["develar"]
+}
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 matrix:
   include:
     - os: osx
-      env: TEST_FILES=BuildTest,extraMetadataTest,globTest,filesTest,ignoreTest,linux.* NODE_VERSION=7 PUBLISH_TO_NPM=true
+      env: TEST_FILES=BuildTest,extraMetadataTest,globTest,filesTest,ignoreTest,linux.* NODE_VERSION=6 PUBLISH_TO_NPM=true
 
     - os: osx
       env: TEST_FILES=windows.*,mac.* NODE_VERSION=7
@@ -29,9 +29,7 @@ before_install:
 install:
 - nvm install $NODE_VERSION
 - nvm use --delete-prefix $NODE_VERSION
-- mkdir -p ~/Library/Caches/Yarn
-- curl -o- -L https://yarnpkg.com/install.sh | bash
-- export PATH="$PATH:$HOME/.yarn/bin"
+- ln -sf $PWD/test/yarn.js /usr/local/bin/yarn
 - yarn install --pure-lockfile
 - if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" && "$AUTO_PUBLISH" != "false" && "$TRAVIS_TAG" == "" && "$PUBLISH_TO_NPM" == "true" ]]; then yarn add @develar/semantic-release@next --dev ; fi
 

diff --git a/MAINTAINING.md b/MAINTAINING.md
@@ -6,7 +6,7 @@ new version with tag `next` will be published if `fix`, `feat` or `BREAKING CHAN
 # Sync wiki
 To add `wiki` upstream:
 ```
-git remote add upstream https://github.com/electron-userland/electron-builder.wiki.git
+git remote add wiki git@github.com:electron-userland/electron-builder.wiki.git
 ```
 
-To sync: `npm run update-wiki`
+To sync: `yarn update-wiki`
diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ For an app that will be shipped to production, you should sign your application.
     "build": {
       "appId": "your.id",
       "mac": {
-        "category": "your.app.category.type",
+        "category": "your.app.category.type"
       },
       "win": {
         "iconUrl": "(windows-only) https link to icon"

diff --git a/appveyor.yml b/appveyor.yml
@@ -6,15 +6,13 @@ cache:
   - '%USERPROFILE%\.electron'
 
 environment:
-  RUN_IN_BAND: true
+  TEST_FILES: BuildTest,extraMetadataTest,filesTest,globTest
 
 install:
   - ps: Install-Product node 6 x64
-  # unknown yarn error
-  - npm install
-  - npm prune
+  - node ./test/yarn.js
 
 build: off
 
 test_script:
-  - npm run test
+  - node ./test/yarn.js test
diff --git a/docker/7/Dockerfile b/docker/7/Dockerfile
@@ -1,6 +1,6 @@
 FROM electronuserland/electron-builder:base
 
-ENV NODE_VERSION 7.1.0
+ENV NODE_VERSION 7.2.0
 
 # https://github.com/npm/npm/issues/4531
 RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.xz" \

diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile
@@ -1,4 +1,4 @@
-FROM buildpack-deps:yakkety-curl
+FROM buildpack-deps:xenial-curl
 
 # rpm is required for FPM to build rpm package
 # yasm is required to build p7zip
@@ -15,9 +15,8 @@ ENV USE_SYSTEM_7ZA true
 ENV DEBUG_COLORS true
 ENV FORCE_COLOR true
 
-RUN apt-key adv --fetch-keys http://dl.yarnpkg.com/debian/pubkey.gpg && echo "deb http://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
-apt-get update -y && \
-  apt-get install --no-install-recommends -y git snapcraft yarn xorriso bsdtar build-essential autoconf libssl-dev icnsutils graphicsmagick gcc-multilib g++-multilib libgnome-keyring-dev lzip rpm yasm && \
+RUN curl -L https://yarnpkg.com/latest.tar.gz | tar xvz && mv dist yarn && ln -s /yarn/bin/yarn /usr/local/bin/yarn  && apt-get update -y && \
+  apt-get install --no-install-recommends -y git snapcraft xorriso bsdtar build-essential autoconf libssl-dev icnsutils graphicsmagick gcc-multilib g++-multilib libgnome-keyring-dev lzip rpm yasm && \
   apt-get clean && \
   rm -rf /var/lib/apt/lists/* && \
   curl -L http://tukaani.org/xz/xz-$XZ_VERSION.tar.xz | tar -xJ && cd xz-$XZ_VERSION && ./configure && make && make install && cd .. && rm -rf xz-$XZ_VERSION && ldconfig && \
@@ -48,4 +47,5 @@ WORKDIR /project
 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
+ENV LC_ALL en_US.UTF-8
+ENV PATH "$HOME/.yarn/bin:$PATH"
diff --git a/docker/wine/Dockerfile b/docker/wine/Dockerfile
@@ -2,7 +2,7 @@ FROM electronuserland/electron-builder:latest
 
 # libgnome-keyring-dev — to build keytar
 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys F9CB8DB0 && \
-echo "deb http://ppa.launchpad.net/ubuntu-wine/ppa/ubuntu yakkety main " | tee /etc/apt/sources.list.d/wine.list && \
+echo "deb http://ppa.launchpad.net/ubuntu-wine/ppa/ubuntu xenial main " | tee /etc/apt/sources.list.d/wine.list && \
 dpkg --add-architecture i386 && \
 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \
 echo "deb http://download.mono-project.com/repo/debian wheezy main" | tee /etc/apt/sources.list.d/mono-xamarin.list && \

diff --git a/docs/Multi Platform Build.md b/docs/Multi Platform Build.md
@@ -81,4 +81,4 @@ dist: trusty
 
 ## Windows
 
-Use [Docker](https://github.com/electron-userland/electron-builder/wiki/Docker).
+Please use [Docker](https://github.com/electron-userland/electron-builder/wiki/Docker).
diff --git a/docs/NSIS.md b/docs/NSIS.md
@@ -38,4 +38,8 @@ So, it is better to use [GUID](http://stackoverflow.com/a/246935/1910191).
 You are not forced to explicitly specify it — name-based [UUID v5](https://en.wikipedia.org/wiki/Universally_unique_identifier#Version_5_.28SHA-1_hash_.26_namespace.29) will be generated from your [appId](https://github.com/electron-userland/electron-builder/wiki/Options#BuildMetadata-appId) or [name](https://github.com/electron-userland/electron-builder/wiki/Options#AppMetadata-name).
 It means that you **should not change appId** once your application in use (or name if `appId` was not set). Application product name (title) or description can be safely changed.
 
-You can explicitly set guid using option [nsis.guid](https://github.com/electron-userland/electron-builder/wiki/Options#NsisOptions-guid), but it is not recommended — consider using [appId](https://github.com/electron-userland/electron-builder/wiki/Options#BuildMetadata-appId).
+You can explicitly set guid using option [nsis.guid](https://github.com/electron-userland/electron-builder/wiki/Options#NsisOptions-guid), but it is not recommended — consider using [appId](https://github.com/electron-userland/electron-builder/wiki/Options#BuildMetadata-appId).
+
+It is also important to set the Application User Model ID (AUMID) to the [appId](https://github.com/electron-userland/electron-builder/wiki/Options#BuildMetadata-appId) of the application, in order for notifications on Windows 8/8.1 to function and for Window 10 notifications to display the app icon within the notifications by default. The AUIMD should be set within the Main process and before any BrowserWindows have been opened, it is normally the first piece of code executed.
+
+`app.setAppUserModelId(appId)`