Update bundle settings

2026-09-13 18:13:02 +00:00 · 2019-03-05 15:17:52 +01:00
48 changed files with 40 additions and 192 deletions
@@ -30,7 +30,6 @@ install:
 script:
  - yarn run build
  - yarn test
-  - export TRAVIS_BUILD_NUMBER="" # Override travis build number since it is uses for tagging the binary version https://github.com/electron-userland/electron-builder/issues/3730
  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run -e GH_TOKEN=$GH_TOKEN -e GIT_TAG=$TRAVIS_TAG --rm -v `pwd`:/app uitest sh -c "cd app && docker/testMounted.sh"; fi
  - if [[ "$TRAVIS_TAG" != "" ]]; then yarn run prepare-release; fi
  - if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$TRAVIS_TAG" != "" ]]; then yarn run package linux; fi
@@ -74,8 +74,8 @@ This greatly helps to improve the software quality and reliability.
 It basically sends: app version, processor architecture, operating system, used memory, user interactions and error stacks.

 <details>
-<summary><p>Example telemetry</p>
-</summary>
+<summary>Example telemetry</summary>
+<p>

 ```javascript
 { system: { arch: 'x64', platform: 'darwin' },
@@ -92,6 +92,7 @@ It basically sends: app version, processor architecture, operating system, used
  transactionId: '53bf9aac-e695-40cc-9a81-b1cf3398843d' }
 ```

+</p>
 </details>

 Even thoug the data is purely technical, an option to disable telemetry is planned. [#52](https://github.com/thomasnordquist/MQTT-Explorer/issues/52)
@@ -74,8 +74,8 @@ This greatly helps to improve the software quality and reliability.
 It basically sends: app version, processor architecture, operating system, used memory, user interactions and error stacks.

 <details>
-<summary><p>Example telemetry</p>
-</summary>
+<summary>Example telemetry</summary>
+<p>

 ```javascript
 { system: { arch: 'x64', platform: 'darwin' },
@@ -92,6 +92,7 @@ It basically sends: app version, processor architecture, operating system, used
  transactionId: '53bf9aac-e695-40cc-9a81-b1cf3398843d' }
 ```

+</p>
 </details>

 Even thoug the data is purely technical, an option to disable telemetry is planned. [#52](https://github.com/thomasnordquist/MQTT-Explorer/issues/52)
@@ -9,7 +9,3 @@ logo: https://user-images.githubusercontent.com/7721625/52227945-5280b580-28b1-1
 plugins:
  - jekyll-seo-tag
 google_analytics: UA-133696837-1
-
-markdown: kramdown
-kramdown:
-  parse_block_html: true
@@ -0,0 +1,6 @@
+<html>
+  <head>
+    {% include head.html %}
+    {% seo %}
+  </head>
+</html>
@@ -1,79 +0,0 @@
-<!DOCTYPE html>
-<html lang="{{ site.lang | default: "en-US" }}">
-  <head>
-    <meta charset='utf-8'>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <link rel="stylesheet" href="{{ '/assets/css/style.css?v=' | append: site.github.build_revision | relative_url }}" media="screen" type="text/css">
-    <link rel="stylesheet" href="{{ '/assets/css/print.css' | relative_url }}" media="print" type="text/css">
-
-    <!--[if lt IE 9]>
-    <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
-    <![endif]-->
-
-    {% seo %}
-  </head>
-
-  <body>
-    <header>
-      <div class="inner">
-        <a href="{{ '/' | absolute_url }}">
-          <h1 style="display: inline">
-            <img src="./icon.png" style="
-              height: 1em;
-              display: inline;
-              vertical-align: top;
-              margin-top: -0.04em;
-            "></img>
-            {{ site.title | default: site.github.repository_name }}
-          </h1>
-        </a>
-        <h2>{{ site.description | default: site.github.project_tagline }}</h2>
-        {% if site.github.is_project_page %}
-          <a href="{{ site.github.repository_url }}" class="button"><small>View project on</small> GitHub</a>
-        {% endif %}
-        {% if site.github.is_user_page %}
-          <a href="{{ site.github.owner_url }}" class="button"><small>Follow me on</small> GitHub</a>
-        {% endif %}
-      </div>
-    </header>
-
-    <div id="content-wrapper">
-      <div class="inner clearfix">
-        <section id="main-content">
-          {{ content }}
-        </section>
-
-        <aside id="sidebar">
-          {% if site.show_downloads %}
-            <a href="{{ site.github.zip_url }}" class="button">
-              <small>Download</small>
-              .zip file
-            </a>
-            <a href="{{ site.github.tar_url }}" class="button">
-              <small>Download</small>
-              .tar.gz file
-            </a>
-          {% endif %}
-
-          {% if site.github.is_project_page %}
-            <p class="repo-owner"><a href="{{ site.github.repository_url }}">{{ site.github.repository_name }}</a> is maintained by <a href="{{ site.github.owner_url }}">{{ site.github.owner_name }}</a>.</p>
-          {% endif %}
-
-          <p>This page was generated by <a href="https://pages.github.com">GitHub Pages</a>.</p>
-        </aside>
-      </div>
-    </div>
-
-    {% if site.google_analytics %}
-      <script>
-        (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-        (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-        })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-        ga('create', '{{ site.google_analytics }}', 'auto');
-        ga('send', 'pageview');
-      </script>
-    {% endif %}
-  </body>
-</html>
@@ -1,6 +1,6 @@
 {
  "name": "MQTT-Explorer",
-  "version": "0.2.3",
+  "version": "0.2.1",
  "description": "Explore your message queues",
  "main": "dist/src/electron.js",
  "scripts": {
@@ -21,41 +21,37 @@
  },
  "build": {
    "appId": "mqtt-explorer",
-    "productName": "MQTT Explorer",
    "nodeGypRebuild": false,
    "mac": {
      "appId": "de.t7n.apps.mqtt-explorer",
      "category": "public.app-category.developer-tools",
      "publish": [
        "github"
-      ],
-      "provisioningProfile": "res/MQTT_Explorer_Store_Distribution_Profile.provisionprofile",
-      "entitlements": "res/entitlements.mas.plist"
+      ]
    },
    "linux": {
      "category": "Development",
      "maintainer": "Thomas Nordquist"
    },
    "appx": {
-      "applicationId": "mqttexplorer",
+      "applicationId": "mqtt-explorer",
      "identityName": "51031thomas.nordquist.MQTT-Explorer",
      "publisherDisplayName": "Thomas Nordquist",
      "publisher": "CN=0A6DE643-4AA2-4FF2-9729-6935C9ED8C13",
-      "backgroundColor": "transparent"
+      "backgroundColor": "#FFFFFF"
    },
    "directories": {
      "app": "./",
      "buildResources": "res",
      "output": "build"
    },
-    "afterAllArtifactBuild": "./dist/scripts/afterAllArtifactBuild.js"
+    "afterAllArtifactBuild": "./dist/scripts/afterPack.js"
  },
  "author": "Thomas Nordquist",
  "email": "xxnerowingerxx@gmail.com",
  "homepage": "https://github.com",
  "license": "ISC",
  "devDependencies": {
-    "@types/adm-zip": "^0.4.32",
    "@types/chai": "^4.1.7",
    "@types/fs-extra": "^5.0.5",
    "@types/lowdb": "^1.0.6",
@@ -65,7 +61,6 @@
    "@types/node": "^10.12.18",
    "@types/semver": "^5.5.0",
    "@types/sha1": "^1.1.1",
-    "adm-zip": "^0.4.13",
    "axios": "^0.18.0",
    "chai": "^4.2.0",
    "electron": "^4.0.6",
@@ -81,7 +81,7 @@ async function executeBuild() {

 export interface BuildInfo {
  platform: 'win' | 'linux' | 'mac'
-  package: 'portable' | 'nsis' | 'appx' | 'AppImage' | 'snap' | 'dmg' | 'zip' | 'mas' | 'mas-dev'
+  package: 'portable' | 'nsis' | 'appx' | 'AppImage' | 'snap' | 'dmg' | 'zip' | 'mas'
 }

 async function buildWithOptions(options: builder.CliOptions, buildInfo: BuildInfo) {
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-  <dict>
-    <key>com.apple.security.app-sandbox</key>
-    <true/>
-    <key>com.apple.security.network.client</key>
-    <true/>
-  </dict>
-</plist>
@@ -1,41 +0,0 @@
-BASE_IMAGE=icon.png
-
-function scale44() {
-    convert $BASE_IMAGE -resize "$1"x"$1" appx/Square44x44Logo.targetsize-"$1"_altform-unplated.png
-    convert $BASE_IMAGE -resize "$1"x"$1" -resize 66% -gravity center -background transparent -extent "$1"x"$1" appx/Square44x44Logo.targetsize-"$1".png
-}
-
-function storeLogo() {
-    SCALE=$1
-    PIXELS=$2
-    convert $BASE_IMAGE -resize "$PIXELS"x"$PIXELS" appx/StoreLogo-scale-"$SCALE"_altform-unplated.png
-}
-
-function store150() {
-    SCALE=$1
-    PIXELS=$2
-    PIXELSx2=$[ $2 * 2 ]
-    convert $BASE_IMAGE -gravity center -resize "$PIXELS"x"$PIXELS" -resize 50% -extent "$PIXELS"x"$PIXELS" appx/Square150x150Logo-scale-$SCALE.png
-    convert $BASE_IMAGE -gravity center -resize "$PIXELS"x"$PIXELS" -resize 50% -extent "$PIXELS"x"$PIXELSx2" appx/Square150x300Logo-scale-$SCALE.png
-}
-
-# Create Square44x44Logo
-convert $BASE_IMAGE -resize 44x44 appx/Square44x44Logo.png
-scale44 16
-scale44 24
-scale44 32
-scale44 48
-scale44 256
-
-store150 100 150
-store150 150 225
-store150 200 300
-store150 300 450
-store150 400 600
-
-storeLogo 100 50
-storeLogo 150 75
-storeLogo 200 100
-storeLogo 400 200
-convert $BASE_IMAGE -resize 50x50 appx/StoreLogo.png
-
@@ -1,30 +0,0 @@
-import * as fs from 'fs-extra'
-import * as path from 'path'
-import { chdir } from 'process'
-import { exec } from './util'
-import * as AdmZip from 'adm-zip'
-
-export default async function (info: any) {
-  for (const artifact of info.artifactPaths) {
-    if (/\.snap$/.test(artifact)) {
-      const originalDir = __dirname
-      const dirname = path.dirname(artifact)
-      chdir(dirname)
-
-      await exec('sudo', ['unsquashfs', artifact])
-      await fs.remove(artifact)
-      await exec('sudo', ['chmod', '-R', 'g-s', 'squashfs-root'])
-      await exec('sudo', ['snap', 'run', 'snapcraft', 'pack', 'squashfs-root', '--output', artifact])
-      await fs.remove('squashfs-root')
-
-      chdir(originalDir)
-    }
-
-    if (/\.appx$/.test(artifact)) {
-      const zip = new AdmZip(artifact)
-      const data = zip.readAsText('AppxManifest.xml')
-      const newData = data.replace('uap:DefaultTile', 'uap:DefaultTile ShowName="allLogos"')
-      zip.updateFile('AppxManifest.xml', Buffer.from(newData))
-    }
-  }
-}
@@ -0,0 +1,22 @@
+import * as fs from 'fs-extra'
+import * as path from 'path'
+import { chdir } from 'process'
+import { exec } from './util'
+
+export default async function (info: any) {
+  for (const snapFile of info.artifactPaths) {
+    if (/\.snap$/.test(snapFile)) {
+      const originalDir = __dirname
+      const dirname = path.dirname(snapFile)
+      chdir(dirname)
+
+      await exec('sudo', ['unsquashfs', snapFile])
+      await fs.remove(snapFile)
+      await exec('sudo', ['chmod', '-R', 'g-s', 'squashfs-root'])
+      await exec('sudo', ['snap', 'run', 'snapcraft', 'pack', 'squashfs-root', '--output', snapFile])
+      await fs.remove('squashfs-root')
+
+      chdir(originalDir)
+    }
+  }
+}
@@ -114,13 +114,6 @@
    reflect-metadata "^0.1.12"
    tslib "^1.8.1"

-"@types/adm-zip@^0.4.32":
-  version "0.4.32"
-  resolved "https://registry.yarnpkg.com/@types/adm-zip/-/adm-zip-0.4.32.tgz#6de01309af60677065d2e52b417a023303220931"
-  integrity sha512-hv1O7ySn+XvP5OeDQcJFWwVb2v+GFGO1A9aMTQ5B/bzxb7WW21O8iRhVdsKKr8QwuiagzGmPP+gsUAYZ6bRddQ==
-  dependencies:
-    "@types/node" "*"
-
 "@types/chai@^4.1.7":
  version "4.1.7"
  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.1.7.tgz#1b8e33b61a8c09cbe1f85133071baa0dbf9fa71a"
@@ -208,11 +201,6 @@ about-window@^1.12.1:
  resolved "https://registry.yarnpkg.com/about-window/-/about-window-1.12.1.tgz#b81c10f6de58d38bce2aa5f31f61a82e6c3d6c2b"
  integrity sha512-P/fJACq7RBFpv5Ql0kIqpOYgFqQ8WdoZoB7wrKmDvwTSKVOMbUZMYnQYtnOW6dHmMCYuNrmQFf+MxvuhE+KrzQ==

-adm-zip@^0.4.13:
-  version "0.4.13"
-  resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.13.tgz#597e2f8cc3672151e1307d3e95cddbc75672314a"
-  integrity sha512-fERNJX8sOXfel6qCBCMPvZLzENBEhZTzKqg6vrOW5pvoEaQuJhRU4ndTAh6lHOxn1I6jnz2NHra56ZODM751uw==
-
 ajv-keywords@^3.2.0:
  version "3.2.0"
  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"