Merge branch 'master' into readme-reupholster

.eslintrc.js

@@ -4,26 +4,21 @@ module.exports = {
     commonjs: true,
     es6: true
   },
-  extends: [
-    'standard',
-    'prettier'
-  ],
+  extends: ['standard', 'prettier'],
   globals: {
     Atomics: 'readonly',
     SharedArrayBuffer: 'readonly'
   },
   parserOptions: {
     ecmaVersion: 2018
   },
-  ignorePatterns: ['assets/',  'dist/', 'node_modules/'],
+  ignorePatterns: ['assets/', 'dist/', 'node_modules/'],
   rules: {
-    'camelcase': [1, {'properties': 'never'}],
+    camelcase: [1, { properties: 'never' }],
     'prettier/prettier': 'error'
   },
-  plugins: [
-    'prettier'
-  ],
+  plugins: ['prettier'],
   env: {
     jest: true
   }
-}
+};

.github/workflows/gitlab.yml

@@ -1,8 +1,5 @@
 name: GitLab
-on:
-  workflow_dispatch:
-  pull_request:
-  push:
+on: pull_request
 jobs:
   test:
     runs-on: ubuntu-latest

.github/workflows/test-deploy.yml

@@ -46,7 +46,7 @@ jobs:
           TEST_GITLAB_SHA: c4c13286e78dc252dd2611f31a755f10d343fbd4
           TEST_BBCLOUD_TOKEN: ${{ secrets.TEST_BBCLOUD_TOKEN }}
           TEST_BBCLOUD_REPO: https://bitbucket.org/iterative-ai/cml-qa-tests-dummy
-          TEST_BBCLOUD_SHA: 9bb9131ce0af294fe1c6eedca1f2bce3983e80bd
+          TEST_BBCLOUD_SHA: b511535a89f76d3d311b1c15e3e712b15c0b94e3
   packages:
     needs: [lint, test]
     runs-on: ubuntu-latest

.restyled.yaml

@@ -1,8 +1,4 @@
 restylers:
   - name: prettier
     arguments: ['--write']
-    include:
-      - 'src/**/*.js'
-      - 'bin/**/*.js'
-      - 'assets/*.json'
-      - './**/*.{yaml,yml,md,json}'
+    include: ['**/*.{js,json,md,yaml,yml}']

package.json

@@ -39,7 +39,7 @@
     "cml-pr": "bin/cml-pr.js"
   },
   "scripts": {
-    "lintfix": "eslint --fix ./",
+    "lintfix": "eslint --fix ./ && prettier --write '**/*.{js,json,md,yaml,yml}'",
     "lint": "eslint ./",
     "test": "jest --passWithNoTests",
     "do_snapshots": "jest --updateSnapshot"
@@ -51,9 +51,10 @@
   },
   "lint-staged": {
     "*.js": [
-      "eslint --fix"
+      "eslint --fix",
+      "prettier --write"
     ],
-    "*.{md,yaml,yml}": [
+    "*.{json,md,yaml,yml}": [
       "prettier --write"
     ]
   },