Merge branch 'master' into develop

Author: jarrodek

.travis.yml

@@ -1,4 +1,4 @@
-matrix:
+jobs:
   include:
   - os: osx
     osx_image: xcode10.2
@@ -8,7 +8,6 @@ matrix:
     - ELECTRON_CACHE=$HOME/.cache/electron
     - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
   - os: linux
-    sudo: required
     language: node_js
     node_js: stable
     services:
@@ -34,7 +33,3 @@ env:
   - secure: vqjLjFS1r21KkSV6g5rrnHnEDvytxFZUZGglmVBfEMWMTLmUt6tpUOZ9fQhNK02Lwoqabx+jwqkqQH3n2Qh4rdgrHciaZz8rVpB+BNRbGpk8Av9pvJEFt5P2UUfjgthgBEUCAkcMlFAWvVgGoiaZPTLufxh9YZvjilG6QrZq6907+YZmxanFfQs/YpCwhG1S36BZ5ce3FxWk7z46DETD3LIe5ThImdmxruEv31F1pNNfInoDGg1qucQiZ2Icd6e+TK6tHH76KJbWc7kaJFSaubu1zIepmUNAxwdLN13nCPcxZaTkPs+LkCel3/C0hD/GLYEc48qC6zQDiQ61/JbUqtfZqShR5qpWhG0jETwpJqlUGNeWjO8KaPUcsolDy49Iiyy+ZMN8g7qiVcxqInLM3BT0Do3vyEZA3Z3WxXDF5wGeHy8PhUbFa3wZdRxtTgNoXCPJCPAzZIPYNUbby6auhWraBHU5UfyitH+CDP34FPaM9eG9TcJbEmdoA9rB9RYEH2T6OxGN/IntSuSP1cdkN/gi4c1ZsWlZSpCS9l5emakrGa4CMl7PKUBhefvKmn/UeYi+REHR2+iNOBYGBBAzfuwSn2iLg//Cg0SdDOs557vKFozVjM2u35Qp1zoncvEZWPSL3WaVGNzmlV35yjgculysZt1tEQpLWGIBmNjEa0c=
   - secure: rBRZZG8d933qFaCaakId+GMrZFHVPHr1hJtpy/2UN8wvqvnbo9ChHGer79cfhohc23Ligx+OhdSLSVl+bC4uesVX1kUssiFUFFDcYciEsJHplO1CtvPkApsEUJL3cndrvYrA52HPOmhtpuh74Npxdn8LrPyiNnLCTdNSt86dp/w8ve2N2ZI3CSEO9nG9L+rMqEkGC5fLQxXNsD4bJoDomg9tntXQYO2anyLnHa767SkbsbfHmrrF5BRPcX8i6/ZPtqG1hOnD72rHJwN0mpLJVsL7htbs9iyMkMciQn5j+BTfV00o51Id3rR0AxrAJUPfb+62i3s7vwJh9cyOTSJ7tBQSxe5EGa0gUlikHJ3elhDFylZXQM/Tmch5yJ0btNWQTsJI7ZwWe+RImDmPtWcNijxU144VdLq8nPz7rBuV4ouIgnnLA1QUT9IjS9vR09xa0DBH2Amjoea2bj7wHj86gfb/ECMkTfRysLrs+DVysC0pqAOONuvz6mBF7OLvK7uN08w6LG3VwwHJ28K52cudiHNv1NXv9hwWxPzizg3VG6WhTlA8y/wSoNDf3Q0UROfPouwx+AM+ojpM5gYVApAwHZvAjsn/Nu+lMQVT3xfnnr+SehTJprK+9Yv1HAFMJNFKbN71w7pdUx05B/YWxMxElg6Pp8s6mlntrsFbCNJ6lCo=
   - secure: os+mH9yyl753fv3ro3mat5wzmw6BpHIOva4JFF3BtCUqZ6wIZgUyS9TwglEwpVuS1DGzzEBqwMF83azvJ63cdlLrSAkfVPtqfWxnhHQeCEN9vy1n0PBFaYOkteeng1ltHdiwSq9wNNNeiYT3cHPWhUwZM/kGelGm/AAGlQn6ZQXJp3c0g9xjnynaMpVpvRXOiBwKW4iWvIhSPDNLVJRzyGB2laZAwQFkiyA6+d3yrsMz4iJmqpicedBg1JrSe7ssIOjZ11Ypa8D875BN6hQQFCEuFr/vtEhrnettvEkmVBD83eVA9hTj5CyqlYf3nwY10kQ5VoiFuDIv67AFI+7Ty7+OSKU9TjItdXfyoGjLF+9k1NEFCDR+MvGUWLx9VV2QEw8WJ8N3ngmchk0vCqgQ/bSB1K9qCTlDiQfvGtjmnMWdG2LxewIRQlQWueYhMOvDvDEECmAYlvn32TY/w9ay3wp/uxZkJZuIDv+plE6GK+QMr3EuR/0p6RpQnpNljDbXOYHxBQ9kwbsanUoecgXjPypZkulpAPSwICMQ7SO07rJEdGZqaGquraeiERT91t+7j/2+c3I3h5YTj2IYj4EdD+0a9Dt8cO3skfw3Y4r/ThYKtK/TLpShtCQWGPGpOpGgjhTRIDb8wr612Fsc45pD+VgrtH1ZA4pr7NyApXpvJQE=
-before_install:
-- openssl aes-256-cbc -K $encrypted_cb8606543db7_key -iv $encrypted_cb8606543db7_iv
-  -in certs.tar.enc -out certs.tar -d
-- tar xvf certs.tar

certs.tar.enc

@@ -1,7 +1,7 @@
 {
   "name": "advanced-rest-client",
   "description": "The Advanced REST Client desktop application.",
-  "version": "0.0.0-develop.noversion",
+  "version": "15.0.1",
   "homepage": "https://advancedrestclient.com",
   "license": "Apache-2.0",
   "author": {
@@ -50,7 +50,7 @@
     "@anypoint-web-components/anypoint-dialog": "^0.1.1",
     "@api-components/api-candidates-dialog": "^3.0.0",
     "@api-components/api-documentation": "^4.0.4",
-    "@api-components/api-navigation": "^4.0.3",
+    "@api-components/api-navigation": "^4.0.4",
     "@pika/web": "^0.6.1",
     "@polymer/app-layout": "^3.1.0",
     "@polymer/app-route": "^3.0.2",
@@ -62,18 +62,19 @@
     "chai": "^4.2.0",
     "cors": "^2.8.5",
     "cross-env": "^6.0.3",
-    "electron": "8.0.0-beta.7",
+    "electron": "^8.0.1",
     "electron-builder": "^22.2.0",
-    "electron-mocha": "^8.2.0",
+    "electron-mocha": "^8.2.1",
+    "electron-windows-store": "^2.1.0",
     "eslint-config-google": "^0.14.0",
     "esm": "^3.2.25",
     "express": "^4.17.1",
     "express-session": "^1.17.0",
     "glob": "^7.1.6",
     "lit-element": "^2.2.1",
     "mocha": "^7.0.0",
-    "sinon": "^8.0.1",
-    "spectron": "^10.0.0",
+    "sinon": "^9.0.0",
+    "spectron": "^10.0.1",
     "web-animations-js": "^2.3.2"
   },
   "dependencies": {
@@ -88,18 +89,18 @@
     "amf-client-js": "^4.0.3",
     "camelcase": "^5.3.1",
     "codemirror": "^5.50.0",
-    "crypto-js": "^3.1.9-1",
-    "electron-log": "^4.0.3",
+    "crypto-js": "^3.3.0",
+    "electron-log": "^4.0.6",
     "electron-prompt": "^1.5.0",
-    "electron-updater": "4.2.0",
+    "electron-updater": "4.2.2",
     "fs-extra": "^8.1.0",
     "jexl": "^2.2.2",
     "jsonlint": "^1.6.3",
     "live-plugin-manager": "^0.14.0",
     "mime-types": "^2.1.25",
     "node-fetch": "^2.6.0",
     "ntlm": "^0.1.3",
-    "semver": "^7.1.1",
+    "semver": "^7.1.3",
     "uuid": "^3.3.3",
     "winston": "^3.2.1",
     "yargs": "^15.0.2"

package-lock.json

@@ -3,6 +3,14 @@ if [ $TRAVIS_BRANCH != 'alpha' ] && [ $TRAVIS_BRANCH != 'master' ] && [ $TRAVIS_
   exit 0
 fi
 
+echo "Decrypting signing keys..."
+openssl aes-256-cbc -K $encrypted_cb8606543db7_key -iv $encrypted_cb8606543db7_iv -in certs.tar.enc -out certs.tar -d
+echo "Extracting certificates to certs/..."
+tar xvf certs.tar
+echo "Copying certificate files to main directory..."
+cp certs/advancedrestclient.pfx .
+cp certs/arc-mac-certs.p12 .
+
 export CSC_NAME="Pawel Psztyc"
 export WIN_CSC_LINK="advancedrestclient.pfx"
 export CSC_LINK="arc-mac-certs.p12"

package.json

@@ -0,0 +1,68 @@
+const convertToWindowsStore = require('electron-windows-store');
+const ebuilder = require('electron-builder');
+const path = require('path');
+const fs = require('fs-extra');
+
+/**
+ * A script that performs Windows build and signing then it converts
+ * the build into APPX package that can be ditributed in Windows store.
+ *
+ * The build script assumes the following variables are set:
+ * - CSC_NAME
+ * - CSC_LINK
+ * - WIN_CSC_LINK
+ * - CSC_KEY_PASSWORD
+ * - WIN_CSC_KEY_PASSWORD
+ */
+class WindowsStoreBuild {
+  async getConverterOpts() {
+    const version = await this.getVersion();
+    return {
+      inputDirectory: path.join(__dirname, '..', 'dist', 'win-unpacked'),
+      outputDirectory: path.join(__dirname, '..', 'dist', 'win-store'),
+      packageVersion: version,
+      packageName: 'AdvancedRestClient',
+      packageDisplayName: 'Advanced REST Client',
+      packageDescription: 'The Advanced REST Client desktop application.',
+      assets: path.join(__dirname, '..', 'build', 'appx'),
+      deploy: false,
+      publisher: 'CN=D213CA20-88CE-42AC-A9F2-C5D41BF04550',
+      publisherDisplayName: 'Pawel Psztyc',
+      identityName: '48695PawelPsztyc.advanced-rest-client',
+    };
+  }
+
+  async getVersion() {
+    const file = path.join(__dirname, '..', 'package.json');
+    const pkg = await fs.readJson(file);
+    return `${pkg.version}.0`;
+  }
+
+  async getWinConfig() {
+    const file = path.join(__dirname, '..', 'package.json');
+    const pkg = await fs.readJson(file);
+    return pkg.build;
+  }
+
+  async buildWindows() {
+    const config = await this.getWinConfig();
+    const Platform = ebuilder.Platform;
+    const opts = {
+      targets: Platform.WINDOWS.createTarget('nsis'),
+      config,
+    };
+    return await ebuilder.build(opts);
+  }
+
+  async convert() {
+    const options = await this.getConverterOpts();
+    await convertToWindowsStore(options);
+  }
+
+  async build() {
+    await this.buildWindows();
+    await this.convert();
+  }
+}
+
+new WindowsStoreBuild().build();

tasks/arc-publish.sh

@@ -0,0 +1,10 @@
+set CSC_NAME=Pawel Psztyc
+set CSC_LINK=advancedrestclient.pfx
+set WIN_CSC_LINK=advancedrestclient.pfx
+
+: The password is set in the profile's variables
+
+./node_modules/.bin/electron-builder -w
+electron-windows-store --input-directory dist\win-unpacked --output-directory dist\arc-win --package-version 15.0.1.0 --package-name AdvancedRestClient --publisher-display-name 'Pawel Psztyc' --publisher 'CN=D213CA20-88CE-42AC-A9F2-C5D41BF04550' --assets 'build\appx' --identity-name '48695PawelPsztyc.advanced-rest-client'
+
+: Publish to https://partner.microsoft.com/en-us/dashboard/products/9NMQQT55RBRC/submissions/