Merge branch 'master' into dependabot/npm_and_yarn/cypress-3.8.3

.travis.yml

@@ -13,38 +13,40 @@
 
 language: node_js
 node_js:
- - "12"
+  - "12"
+
+os: linux
 
 addons:
- apt:
+  apt:
-  packages:
+    packages:
-   - libgconf-2-4 # cypress binary dependency
+      - libgconf-2-4 # cypress binary dependency
 
 env:
- - DEPLOY_ENV=POSTWOMAN_IO
+  - DEPLOY_ENV=POSTWOMAN_IO
 
 cache:
- npm: true
+  npm: true
- directories:
+  directories:
-  - "node_modules"
+    - "node_modules"
-  - ~/.cache
+    - ~/.cache
 
 branches:
- only:
+  only:
-  - "master"
+    - "master"
 
 install:
- - "npm install firebase-tools"
+  - "npm install firebase-tools"
- - "npm install"
+  - "npm install"
 
 before_script:
- - "npm run test"
+  - "npm run test"
 
 script:
- - "cd functions"
+  - "cd functions"
- - "npm install"
+  - "npm install"
- - "cd .."
+  - "cd .."
- - "npm run generate"
+  - "npm run generate"
 
 notifications:
   webhooks: https://www.travisbuddy.com

assets/css/styles.scss

@@ -592,7 +592,6 @@ pre {
 
 select {
   height: 37px;
-  background-color: var(--bg-dark-color);
   cursor: pointer;
   -webkit-appearance: none;
   -moz-appearance: none;

build.js

@@ -53,7 +53,7 @@ try {
 
     // Write version data into a file
     fs.writeFileSync(
-      PW_BUILD_DATA_DIR + "/version.json",
+      `${PW_BUILD_DATA_DIR}/version.json`,
       JSON.stringify(version)
     );
   })();

components/collections/addCollection.vue

@@ -57,7 +57,7 @@ export default {
   methods: {
     addNewCollection() {
       if (!this.$data.name) {
-        this.$toast.info('Please provide a valid name for the collection')
+        this.$toast.info("Please provide a valid name for the collection");
         return;
       }
       this.$store.commit("postwoman/addNewCollection", {

components/collections/editCollection.vue

@@ -60,7 +60,7 @@ export default {
   methods: {
     saveCollection() {
       if (!this.$data.name) {
-        this.$toast.info('Please provide a valid name for the collection');
+        this.$toast.info("Please provide a valid name for the collection");
         return;
       }
       const collectionUpdated = {

components/graphql/queryeditor.vue

@@ -34,7 +34,7 @@ export default {
     return {
       editor: null,
       cacheValue: "",
-      validationSchema: null 
+      validationSchema: null
     };
   },
 
@@ -88,7 +88,7 @@ export default {
         );
       }
     },
-    
+
     setValidationSchema(schema) {
       this.validationSchema = schema;
       this.parseContents(this.cacheValue);
@@ -101,16 +101,15 @@ export default {
 
           if (this.validationSchema) {
             this.editor.session.setAnnotations(
-              gql.validate(this.validationSchema, doc)
+              gql.validate(this.validationSchema, doc).map(err => {
-                .map((err) => {
+                return {
-                  return {
+                  row: err.locations[0].line - 1,
-                    row: err.locations[0].line - 1,
+                  column: err.locations[0].column - 1,
-                    column: err.locations[0].column - 1,
+                  text: err.message,
-                    text: err.message,
+                  type: "error"
-                    type: "error"
+                };
-                  }
+              })
-                })
+            );
-            )
           }
         } catch (e) {
           this.editor.session.setAnnotations([

functions/utils/debounce.js

@@ -3,13 +3,13 @@
 // functions which might be called frequently
 // NOTE : Don't use lambda functions as this doesn't get bound properly in them, use the 'function (args) {}' format
 const debounce = (func, delay) => {
-  let inDebounce
+  let inDebounce;
   return function() {
-    const context = this
+    const context = this;
-    const args = arguments
+    const args = arguments;
-    clearTimeout(inDebounce)
+    clearTimeout(inDebounce);
-    inDebounce = setTimeout(() => func.apply(context, args), delay)
+    inDebounce = setTimeout(() => func.apply(context, args), delay);
-  }
+  };
-}
+};
 
 export default debounce;

layouts/default.vue

@@ -664,9 +664,8 @@
 import intializePwa from "../assets/js/pwa";
 import * as version from "../.postwoman/version.json";
 import { hasChromeExtensionInstalled } from "../functions/strategies/ChromeStrategy";
-
+import firebase from "firebase/app";
-import firebase from 'firebase/app';
+import { fb } from "../functions/fb";
-import { fb } from '../functions/fb';
 
 export default {
   components: {

pages/graphql.vue

@@ -812,9 +812,7 @@ export default {
           }
         }
         this.gqlTypes = types;
-        
         this.$refs.queryEditor.setValidationSchema(schema);
-
         this.$nuxt.$loading.finish();
         const duration = Date.now() - startTime;
         this.$toast.info(this.$t("finished_in", { duration }), {