Merge pull request #482 from Synthetixio/dev

promote dev to master
Synthetixio · Sep 6, 2022 · 6a1a713 · 6a1a713
2 parents 9b8ab78 + 7d35df4
commit 6a1a713
Show file tree

Hide file tree

Showing 16 changed files with 233 additions and 123 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,25 +1,25 @@
 version: 2
 updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
+  - package-ecosystem: 'github-actions'
+    directory: '/'
     schedule:
-      interval: "daily"
+      interval: 'daily'
 
-  - package-ecosystem: "npm"
-    directory: "/"
+  - package-ecosystem: 'npm'
+    directory: '/'
     schedule:
-      interval: "daily"
+      interval: 'daily'
     open-pull-requests-limit: 5
-    target-branch: "dev"
+    target-branch: 'dev'
     allow:
-      - dependency-name: "cypress"
-        dependency-type: "production"
-      - dependency-name: "synthetix-*"
-        dependency-type: "production"
-      - dependency-name: "@synthetixio/*"
-        dependency-type: "production"
+      - dependency-name: 'cypress'
+        dependency-type: 'production'
+      - dependency-name: 'synthetix-*'
+        dependency-type: 'production'
+      - dependency-name: '@synthetixio/*'
+        dependency-type: 'production'
     labels:
-      - "npm"
-      - "dependencies"
+      - 'npm'
+      - 'dependencies'
     pull-request-branch-name:
-      separator: "-"
+      separator: '-'
diff --git a/.github/workflows/audit_and_lint.yml b/.github/workflows/audit_and_lint.yml
@@ -5,17 +5,20 @@ on:
   pull_request:
     branches: [master, dev]
 
+concurrency:
+  group: ${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   audit:
     # run only on master/dev branch and pull requests
-    if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.event_name == 'pull_request'
+    if:
+      github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' ||
+      github.event_name == 'pull_request'
     runs-on: ubuntu-latest
 
     container:
-      image: ghcr.io/synthetixio/docker-sec-tools/alpine:16.14
-      credentials:
-        username: synthetixio
-        password: ${{ secrets.GH_PACKAGES_READ_ONLY }}
+      image: synthetixio/docker-sec-tools:16.14-alpine
 
     steps:
       - name: Checkout
@@ -25,19 +28,21 @@ jobs:
         run: npm audit --audit-level=critical
 
       - name: Lockfile lint
-        run: lockfile-lint -p package-lock.json --type npm --allowed-hosts npm github.com --allowed-schemes "https:" "git+ssh:" --empty-hostname false
+        run:
+          lockfile-lint -p package-lock.json --type npm --allowed-hosts npm
+          github.com --allowed-schemes "https:" "git+ssh:" --empty-hostname
+          false
 
   build:
     needs: audit
     # run only on audit success or audit skipped
-    if: always() && (needs.audit.result == 'success' || needs.audit.result == 'skipped')
+    if:
+      always() && (needs.audit.result == 'success' || needs.audit.result ==
+      'skipped')
     runs-on: ubuntu-latest
 
     container:
-      image: ghcr.io/synthetixio/docker-node/alpine:16.14
-      credentials:
-        username: synthetixio
-        password: ${{ secrets.GH_PACKAGES_READ_ONLY }}
+      image: synthetixio/docker-node:16.14-alpine
 
     steps:
       - name: Checkout
@@ -66,13 +71,17 @@ jobs:
 
       - name: Lint
         # run only on master/dev branch and pull requests
-        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.event_name == 'pull_request'
+        if:
+          github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' ||
+          github.event_name == 'pull_request'
         run: npm run lint:sarif
 
       - name: Upload lint results
         # run if lint failed and only on master/dev branch and pull requests
-        if: always() && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.event_name == 'pull_request')
-        uses: github/codeql-action/upload-sarif@c7f292ea4f542c473194b33813ccd4c207a6c725 # pin@codeql-bundle-20210517
+        if:
+          always() && (github.ref == 'refs/heads/master' || github.ref ==
+          'refs/heads/dev' || github.event_name == 'pull_request')
+        uses: github/codeql-action/upload-sarif@b398f525a5587552e573b247ac661067fafa920b # pin@codeql-bundle-20210517
         with:
           sarif_file: lint-results.sarif
         continue-on-error: true

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -17,10 +17,10 @@ jobs:
         uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # pin@v2
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@c7f292ea4f542c473194b33813ccd4c207a6c725
+        uses: github/codeql-action/init@b398f525a5587552e573b247ac661067fafa920b
         with:
           queries: security-and-quality
           languages: javascript
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@c7f292ea4f542c473194b33813ccd4c207a6c725
+        uses: github/codeql-action/analyze@b398f525a5587552e573b247ac661067fafa920b
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -37,7 +37,9 @@ jobs:
           path: |
             .npm-cache
             node_modules
-          key: ${{ runner.os }}-ubuntu-node-16-${{ hashFiles('**/package-lock.json') }}
+          key:
+            ${{ runner.os }}-ubuntu-node-16-${{
+            hashFiles('**/package-lock.json') }}
           restore-keys: |
             ${{ runner.os }}-ubuntu-node-16-
         continue-on-error: true

diff --git a/.markdownlint.yaml b/.markdownlint.yaml
@@ -0,0 +1,10 @@
+# Autoformatter friendly markdownlint config (all formatting rules disabled)
+default: true
+blank_lines: false
+bullet: false
+html: false
+indentation: false
+line_length: false
+spaces: false
+url: false
+whitespace: false
diff --git a/.prettierrc.js b/.prettierrc.js
diff --git a/.prettierrc.yaml b/.prettierrc.yaml
@@ -0,0 +1,7 @@
+semi: true
+trailingComma: all
+singleQuote: true
+printWidth: 80
+tabWidth: 2
+arrowParens: avoid
+proseWrap: always
diff --git a/.trunk/.gitignore b/.trunk/.gitignore
@@ -0,0 +1,4 @@
+*out
+*logs
+plugins
+user_trunk.yaml
diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
@@ -0,0 +1,26 @@
+version: 0.1
+cli:
+  version: 0.16.1-beta
+  sha256:
+    darwin_arm64: 3fb733a9907ec366d86d06313d1b0c956a0f9e86cdbaeaaa72ecf29fb9de17a7
+    darwin_x86_64: d15589aaf2128d4a732f96f101ccfad433532d2027a9b809c74169371c7e270e
+    linux_x86_64: 87245d043c5f0c9bf5b21ff66a43df715f459068bd2e47964c7d517cca074007
+lint:
+  enabled:
+    - [email protected]
+    - [email protected]
+    - git-diff-check@SYSTEM
+    - [email protected]
+    - [email protected]
+    - [email protected]
+  ignore:
+    - linters: [ALL]
+      paths:
+        - node_modules/**
+        - tests/test-dapp
+        - downloads
+        - tests/e2e/videos
+        - tests/e2e/screenshots
+  threshold:
+    - linters: [ALL]
+      level: high