fix: Fixed merge conflicts

Merge remote-tracking branch 'upstream/master' into remote-access

.github/lighthouse/budget.json

@@ -0,0 +1,50 @@
+[
+  {
+    "path": "/*",
+    "resourceSizes": [
+      {
+        "resourceType": "script",
+        "budget": 500
+      },
+      {
+        "resourceType": "stylesheet",
+        "budget": 120
+      },
+      {
+        "resourceType": "font",
+        "budget": 306
+      },
+      {
+        "resourceType": "image",
+        "budget": 50
+      },
+      {
+        "resourceType": "third-party",
+        "budget": 200
+      },
+      {
+        "resourceType": "document",
+        "budget": 180
+      },
+      {
+        "resourceType": "other",
+        "budget": 100
+      },
+      {
+        "resourceType": "total",
+        "budget": 650
+      }
+    ],
+    "timings": [
+      {
+        "metric": "interactive",
+        "budget": 5000
+      },
+      {
+        "metric": "first-meaningful-paint",
+        "budget": 2000
+      }
+    ]
+  }
+]
+

.github/lighthouse/lighthouserc.json

@@ -0,0 +1,10 @@
+{
+  "ci": {
+    "assert": {
+      "preset": "lighthouse:recommended",
+      "assertions": {
+        "first-contentful-paint": ["warn", { "minScore": 0.6 }]
+      }
+    }
+  }
+}

.github/workflows/lighthouse.yml

@@ -0,0 +1,48 @@
+# This is a basic workflow to help you get started with Actions
+
+name: Lighthouse CI
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+    - uses: actions/checkout@v2
+
+    # Runs a single command using the runners shell
+    - name: Run a one-line script
+      run: echo Hello, world!
+
+    # Runs a set of commands using the runners shell
+    - name: Run a multi-line script
+      run: |
+        echo Add other actions to build,
+        echo test, and deploy your project.
+
+    #runs the lighthouse
+    - name: Lighthouse CI Action
+      uses: treosh/lighthouse-ci-action@v2
+      with:
+        # List of URL(s) to analyze
+        urls: 'https://ui.ambianic.ai/'
+        budgetPath: '.github/lighthouse/budget.json' # test performance budgets
+        configPath: '.github/lighthouse/lighthouserc.json'
+        # Path to a LHCI lighthouserc.json file
+        # Opt-out of saving Lighthouse results as an action artifacts
+        uploadArtifacts: false
+        # Number of runs to do per URL
+        serverBaseUrl: ${{ secrets.LHCI_SERVER_URL }}
+        serverToken: ${{ secrets.LHCI_SERVER_TOKEN }}

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Semantic Versioning Changelog
 
+## [2.2.15](https://github.com/ambianic/ambianic-ui/compare/v2.2.14...v2.2.15) (2020-05-02)
+
+
+### Bug Fixes
+
+* adds config files ([a0fc02c](https://github.com/ambianic/ambianic-ui/commit/a0fc02c14d6938a35743fba3a27c29e471c0331e))
+
 ## [2.2.14](https://github.com/ambianic/ambianic-ui/compare/v2.2.13...v2.2.14) (2020-04-21)