Merge pull request #1118 from imolorhe/staging

Staging

.all-contributorsrc

@@ -125,7 +125,26 @@
       "contributions": [
         "bug"
       ]
+    },
+    {
+      "login": "dies",
+      "name": "Serhiy Dmytryshyn",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/80762?v=4",
+      "profile": "https://github.com/dies",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "adieuadieu",
+      "name": "Marco Lüthy",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/438848?v=4",
+      "profile": "https://github.com/adieuadieu",
+      "contributions": [
+        "financial"
+      ]
     }
   ],
-  "contributorsPerLine": 7
+  "contributorsPerLine": 7,
+  "skipCi": true
 }

.github/FUNDING.yml

@@ -1,6 +1,6 @@
 # These are supported funding model platforms
 
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+github: imolorhe # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
 patreon: imolorhe # Replace with a single Patreon username
 open_collective: altair # Replace with a single Open Collective username
 ko_fi: imolorhe # Replace with a single Ko-fi username

.scss-lint.yml

@@ -168,7 +168,7 @@ linters:
 
   Shorthand:
     enabled: true
-    allowed_shorthands: [1, 2, 3]
+    allowed_shorthands: [1, 2, 3, 4]
 
   SingleLinePerProperty:
     enabled: true
@@ -182,7 +182,7 @@ linters:
     style: one_space # or 'no_space', or 'at_least_one_space'
 
   SpaceAfterPropertyColon:
-    enabled: true
+    enabled: false
     style: one_space # or 'no_space', or 'at_least_one_space', or 'aligned'
 
   SpaceAfterPropertyName:

.travis.yml

@@ -35,7 +35,7 @@ script:
 - ng lint
 - if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then yarn test-single-run; fi # Test altair itself
 - if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then yarn webdriver-update-ci; ng e2e --webdriver-update=false; fi # Run e2e test
-- if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then bin/start_ci_test_server.sh; yarn test-all; bin/stop_ci_test_server.sh; fi # All other tests e.g. lerna, electron, etc
+- if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then yarn test-all:ci; fi # All other tests e.g. lerna, electron, etc
 after_success:
   - if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then if [ ! -z "$SURGE_TOKEN" ]; then chmod ugo+x bin/surge_deploy.sh; bin/surge_deploy.sh; fi fi
 before_deploy:

README.md

@@ -47,7 +47,7 @@ There's a [chrome extension](https://chrome.google.com/webstore/detail/altair-gr
 
 There are apps for [mac, windows and linux users](https://altair.sirmuel.design/) as well.
 
-You can also install using cask:
+For mac users, you can also install using cask:
 
 ```
 $ brew cask install altair-graphql-client
@@ -65,6 +65,18 @@ For arch linux users, an AUR package [aur/altair](https://aur.archlinux.org/pack
 $ yay -S altair
 ```
 
+For windows users, you can install using [appget](https://appget.net/packages/i/altair-graphql):
+
+```
+$ appget install altair-graphql
+```
+
+or [chocolatey](https://chocolatey.org/packages/altair-graphql):
+
+```
+$ choco install altair-graphql
+```
+
 ### Usage with express
 You can use altair with an express server using [altair-express-middleware](https://www.npmjs.com/package/altair-express-middleware). Read more about how to use this [here](packages/altair-express-middleware/README.md).
 
@@ -73,6 +85,8 @@ You can use altair with a koa server using [altair-koa-middleware](https://www.n
 
 ## Features
 
+![add fragment](src/assets/img/readme/add-fragment.gif "Altair GraphQL Client")
+
 - Headers
 - Variables
 - Response Stats
@@ -81,7 +95,6 @@ You can use altair with a koa server using [altair-koa-middleware](https://www.n
 - Syntax highlighting
 - Error highlighting
 - Add queries and fragments from documentation
-![add fragment](src/assets/img/readme/add-fragment.gif "Altair GraphQL Client")
 - Upload files via GraphQL
 - Autocompletion of fields, arguments, types, etc
 - Autofill all fields at cursor
@@ -158,27 +171,34 @@ Support this project by becoming a sponsor. Your logo will show up here with a l
 Thanks goes to these wonderful people ([emoji key](https://github.com/all-contributors/all-contributors#emoji-key)):
 
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
-<!-- prettier-ignore -->
+<!-- prettier-ignore-start -->
+<!-- markdownlint-disable -->
 <table>
   <tr>
-    <td align="center"><a href="https://github.com/DaniloCaruso"><img src="https://avatars1.githubusercontent.com/u/4080177?v=4" width="100px;" alt="Danilo Caruso"/><br /><sub><b>Danilo Caruso</b></sub></a><br /><a href="#translation-DaniloCaruso" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://github.com/IgorSzymanski"><img src="https://avatars0.githubusercontent.com/u/12682069?v=4" width="100px;" alt="Igor Szymanski"/><br /><sub><b>Igor Szymanski</b></sub></a><br /><a href="#translation-IgorSzymanski" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://github.com/kporten"><img src="https://avatars2.githubusercontent.com/u/1839345?v=4" width="100px;" alt="Kevin Porten"/><br /><sub><b>Kevin Porten</b></sub></a><br /><a href="#translation-kporten" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://0xabcdef.com/"><img src="https://avatars0.githubusercontent.com/u/690661?v=4" width="100px;" alt="JongChan Choi"/><br /><sub><b>JongChan Choi</b></sub></a><br /><a href="#translation-disjukr" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://twitter.com/alexey_rodionov"><img src="https://avatars1.githubusercontent.com/u/7892779?v=4" width="100px;" alt="Alexey Rodionov"/><br /><sub><b>Alexey Rodionov</b></sub></a><br /><a href="https://github.com/imolorhe/altair/commits?author=FluorescentHallucinogen" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://github.com/kurisutofu"><img src="https://avatars0.githubusercontent.com/u/742894?v=4" width="100px;" alt="kurisutofu"/><br /><sub><b>kurisutofu</b></sub></a><br /><a href="#translation-kurisutofu" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://github.com/Claercio"><img src="https://avatars1.githubusercontent.com/u/5834593?v=4" width="100px;" alt="Claércio Santos"/><br /><sub><b>Claércio Santos</b></sub></a><br /><a href="#translation-Claercio" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/DaniloCaruso"><img src="https://avatars1.githubusercontent.com/u/4080177?v=4" width="100px;" alt=""/><br /><sub><b>Danilo Caruso</b></sub></a><br /><a href="#translation-DaniloCaruso" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/IgorSzymanski"><img src="https://avatars0.githubusercontent.com/u/12682069?v=4" width="100px;" alt=""/><br /><sub><b>Igor Szymanski</b></sub></a><br /><a href="#translation-IgorSzymanski" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/kporten"><img src="https://avatars2.githubusercontent.com/u/1839345?v=4" width="100px;" alt=""/><br /><sub><b>Kevin Porten</b></sub></a><br /><a href="#translation-kporten" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://0xabcdef.com/"><img src="https://avatars0.githubusercontent.com/u/690661?v=4" width="100px;" alt=""/><br /><sub><b>JongChan Choi</b></sub></a><br /><a href="#translation-disjukr" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://twitter.com/alexey_rodionov"><img src="https://avatars1.githubusercontent.com/u/7892779?v=4" width="100px;" alt=""/><br /><sub><b>Alexey Rodionov</b></sub></a><br /><a href="https://github.com/imolorhe/altair/commits?author=FluorescentHallucinogen" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/kurisutofu"><img src="https://avatars0.githubusercontent.com/u/742894?v=4" width="100px;" alt=""/><br /><sub><b>kurisutofu</b></sub></a><br /><a href="#translation-kurisutofu" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/Claercio"><img src="https://avatars1.githubusercontent.com/u/5834593?v=4" width="100px;" alt=""/><br /><sub><b>Claércio Santos</b></sub></a><br /><a href="#translation-Claercio" title="Translation">🌍</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://janjaromirhorak.cz/"><img src="https://avatars3.githubusercontent.com/u/16863691?v=4" width="100px;" alt=""/><br /><sub><b>jenda</b></sub></a><br /><a href="#translation-janjaromirhorak" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/pcharbon70"><img src="https://avatars2.githubusercontent.com/u/20699793?v=4" width="100px;" alt=""/><br /><sub><b>pcharbon70</b></sub></a><br /><a href="#translation-pcharbon70" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/juca-cruz"><img src="https://avatars1.githubusercontent.com/u/5823011?v=4" width="100px;" alt=""/><br /><sub><b>Juan Cruz</b></sub></a><br /><a href="#translation-juca-cruz" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/victormihaita"><img src="https://avatars0.githubusercontent.com/u/43206741?v=4" width="100px;" alt=""/><br /><sub><b>Victor Mihaita</b></sub></a><br /><a href="#translation-victormihaita" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/qonn"><img src="https://avatars1.githubusercontent.com/u/43688724?v=4" width="100px;" alt=""/><br /><sub><b>Furqan Anas</b></sub></a><br /><a href="https://github.com/imolorhe/altair/commits?author=qonn" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/vladshcherbin"><img src="https://avatars1.githubusercontent.com/u/6711845?v=4" width="100px;" alt=""/><br /><sub><b>Vlad Shcherbin</b></sub></a><br /><a href="https://github.com/imolorhe/altair/issues?q=author%3Avladshcherbin" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://github.com/dies"><img src="https://avatars1.githubusercontent.com/u/80762?v=4" width="100px;" alt=""/><br /><sub><b>Serhiy Dmytryshyn</b></sub></a><br /><a href="#translation-dies" title="Translation">🌍</a></td>
   </tr>
   <tr>
-    <td align="center"><a href="https://janjaromirhorak.cz/"><img src="https://avatars3.githubusercontent.com/u/16863691?v=4" width="100px;" alt="jenda"/><br /><sub><b>jenda</b></sub></a><br /><a href="#translation-janjaromirhorak" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://github.com/pcharbon70"><img src="https://avatars2.githubusercontent.com/u/20699793?v=4" width="100px;" alt="pcharbon70"/><br /><sub><b>pcharbon70</b></sub></a><br /><a href="#translation-pcharbon70" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://github.com/juca-cruz"><img src="https://avatars1.githubusercontent.com/u/5823011?v=4" width="100px;" alt="Juan Cruz"/><br /><sub><b>Juan Cruz</b></sub></a><br /><a href="#translation-juca-cruz" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://github.com/victormihaita"><img src="https://avatars0.githubusercontent.com/u/43206741?v=4" width="100px;" alt="Victor Mihaita"/><br /><sub><b>Victor Mihaita</b></sub></a><br /><a href="#translation-victormihaita" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://github.com/qonn"><img src="https://avatars1.githubusercontent.com/u/43688724?v=4" width="100px;" alt="Furqan Anas"/><br /><sub><b>Furqan Anas</b></sub></a><br /><a href="https://github.com/imolorhe/altair/commits?author=qonn" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://github.com/vladshcherbin"><img src="https://avatars1.githubusercontent.com/u/6711845?v=4" width="100px;" alt="Vlad Shcherbin"/><br /><sub><b>Vlad Shcherbin</b></sub></a><br /><a href="https://github.com/imolorhe/altair/issues?q=author%3Avladshcherbin" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://github.com/adieuadieu"><img src="https://avatars1.githubusercontent.com/u/438848?v=4" width="100px;" alt=""/><br /><sub><b>Marco Lüthy</b></sub></a><br /><a href="#financial-adieuadieu" title="Financial">💵</a></td>
   </tr>
 </table>
 
+<!-- markdownlint-enable -->
+<!-- prettier-ignore-end -->
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!

bin/run_ext_firefox.sh

@@ -1,2 +1,2 @@
 # Running the extension in firefox
-./node_modules/web-ext/bin/web-ext run --source-dir chrome-extension
+./node_modules/web-ext/bin/web-ext run --source-dir chrome-extension --verbose

bin/start_ci_test_server.sh

@@ -5,6 +5,6 @@ cd ..
 git clone --depth=1 https://github.com/XKojiMedia/ezio-tester.git
 cd ezio-tester
 yarn
-yarn dev &
-CI_TEST_SERVER_ID=$!
+yarn dev
+# CI_TEST_SERVER_ID=$!
 # pwd

bin/start_local_test_server.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+pwd
+cd ..
+cd ezio-tester
+# yarn
+yarn dev
+# CI_TEST_SERVER_ID=$!
+# pwd

chrome-ext-files/manifest.json

@@ -3,7 +3,7 @@
   "name": "Altair GraphQL Client",
   "short_name": "Altair",
   "description": "The only graphQL client you'll ever need.",
-  "version": "2.3.8",
+  "version": "2.4.0",
   "icons": {
     "16": "assets/img/altair_logo_128.png",
     "48": "assets/img/altair_logo_128.png",
@@ -13,13 +13,11 @@
     "default_icon": "assets/img/altair_logo_128.png"
   },
   "permissions": [
-      "http://*/",
-      "https://*/",
       "tabs",
       "storage",
       "notifications"
   ],
-  "content_security_policy": "script-src 'self' 'sha256-1Sj1x3xsk3UVwnakQHbO0yQ3Xm904avQIfGThrdrjcc=' https://cdn.jsdelivr.net; object-src 'self';",
+  "content_security_policy": "script-src 'self' 'unsafe-inline' 'sha256-oPmnC5nXVn+02vhnLdwVkTp/s4vphtZzgjwEBldwPHs=' 'sha256-I9mRIuFvittlnAABX/bWvVih++ioTekeCFcwe4j3YTo=' https://cdn.jsdelivr.net; object-src 'self';",
   "background": {
       "scripts": ["js/background.js"]
   },

docs/Gemfile

@@ -10,7 +10,7 @@ source "https://rubygems.org"
 # Happy Jekylling!
 # gem "jekyll", "3.5.1"
 
-gem "github-pages", ">= 172", group: :jekyll_plugins
+gem "github-pages", ">= 200", group: :jekyll_plugins
 
 # This is the default theme for new Jekyll sites. You may change this to anything you like.
 # gem "minima", "~> 2.0"

docs/Gemfile.lock

@@ -25,18 +25,18 @@ GEM
       ffi (>= 1.3.0)
     eventmachine (1.2.7)
     execjs (2.7.0)
-    faraday (0.16.1)
+    faraday (0.17.0)
       multipart-post (>= 1.2, < 3)
-    ffi (1.11.1)
+    ffi (1.11.2)
     forwardable-extended (2.6.0)
     gemoji (3.0.1)
-    github-pages (200)
+    github-pages (202)
       activesupport (= 4.2.11.1)
       github-pages-health-check (= 1.16.1)
       jekyll (= 3.8.5)
       jekyll-avatar (= 0.6.0)
       jekyll-coffeescript (= 1.1.1)
-      jekyll-commonmark-ghpages (= 0.1.5)
+      jekyll-commonmark-ghpages (= 0.1.6)
       jekyll-default-layout (= 0.1.4)
       jekyll-feed (= 0.11.0)
       jekyll-gist (= 1.5.0)
@@ -73,15 +73,15 @@ GEM
       mercenary (~> 0.3)
       minima (= 2.5.0)
       nokogiri (>= 1.10.4, < 2.0)
-      rouge (= 2.2.1)
+      rouge (= 3.11.0)
       terminal-table (~> 1.4)
     github-pages-health-check (1.16.1)
       addressable (~> 2.3)
       dnsruby (~> 1.60)
       octokit (~> 4.0)
       public_suffix (~> 3.0)
       typhoeus (~> 1.3)
-    html-pipeline (2.12.0)
+    html-pipeline (2.12.2)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.6.0)
@@ -108,10 +108,10 @@ GEM
     jekyll-commonmark (1.3.1)
       commonmarker (~> 0.14)
       jekyll (>= 3.7, < 5.0)
-    jekyll-commonmark-ghpages (0.1.5)
+    jekyll-commonmark-ghpages (0.1.6)
       commonmarker (~> 0.17.6)
-      jekyll-commonmark (~> 1)
-      rouge (~> 2)
+      jekyll-commonmark (~> 1.2)
+      rouge (>= 2.0, < 4.0)
     jekyll-default-layout (0.1.4)
       jekyll (~> 3.0)
     jekyll-feed (0.11.0)
@@ -204,9 +204,9 @@ GEM
       jekyll (~> 3.5)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    minitest (5.12.2)
+    minitest (5.13.0)
     multipart-post (2.1.1)
-    nokogiri (1.10.4)
+    nokogiri (1.10.5)
       mini_portile2 (~> 2.4.0)
     octokit (4.14.0)
       sawyer (~> 0.8.0, >= 0.5.3)
@@ -216,7 +216,7 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
-    rouge (2.2.1)
+    rouge (3.11.0)
     ruby-enum (0.7.2)
       i18n
     ruby_dep (1.5.0)
@@ -243,7 +243,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  github-pages (>= 172)
+  github-pages (>= 200)
   tzinfo-data
 
 BUNDLED WITH

docs/_config.yml

@@ -46,6 +46,7 @@ releases:
     image: windows_logo.svg
     unique_term: exe
     link:
+    extra: choco install altair-graphql
   -
     name: chrome
     image: chrome_icon.svg

lerna.json

@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "2.3.8",
+  "version": "2.4.0",
   "registry": "https://registry.npmjs.org/",
   "npmClient": "yarn"
 }