Merge pull request #474 from Synthetixio/dev

promote dev to master
Synthetixio · Aug 30, 2022 · c0b480a · c0b480a
2 parents 8c5e760 + a2d2a55
commit c0b480a
Show file tree

Hide file tree

Showing 12 changed files with 19,472 additions and 25,226 deletions.
diff --git a/.github/workflows/audit_and_lint.yml b/.github/workflows/audit_and_lint.yml
@@ -19,13 +19,13 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # pin@v2
+        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # pin@v2
 
       - name: Audit dependencies
         run: npm audit --audit-level=critical
 
       - name: Lockfile lint
-        run: lockfile-lint -p package-lock.json --type npm --allowed-hosts npm --validate-https --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
@@ -41,13 +41,13 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # pin@v2
+        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # pin@v2
 
       - name: Set npm cache directory
         run: npm config set cache .npm-cache --global
         continue-on-error: true
 
-      - uses: actions/cache@136d96b4aee02b1f0de3ba493b1d47135042d9c0 # pin@v2
+      - uses: actions/cache@fd5de65bc895cf536527842281bea11763fefd77 # pin@v2
         with:
           path: |
             .npm-cache
@@ -72,7 +72,7 @@ jobs:
       - 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@1ed1437484560351c5be56cf73a48a279d116b78 # pin@codeql-bundle-20210517
+        uses: github/codeql-action/upload-sarif@c7f292ea4f542c473194b33813ccd4c207a6c725 # pin@codeql-bundle-20210517
         with:
           sarif_file: lint-results.sarif
         continue-on-error: true
@@ -98,7 +98,7 @@ jobs:
   #       continue-on-error: true
 
   #     - name: Cache node modules
-  #       uses: actions/cache@136d96b4aee02b1f0de3ba493b1d47135042d9c0 # pin@v2
+  #       uses: actions/cache@fd5de65bc895cf536527842281bea11763fefd77 # pin@v2
   #       with:
   #         path: |
   #           .npm-cache

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -14,13 +14,13 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # pin@v2
+        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # pin@v2
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@1ed1437484560351c5be56cf73a48a279d116b78
+        uses: github/codeql-action/init@c7f292ea4f542c473194b33813ccd4c207a6c725
         with:
           queries: security-and-quality
           languages: javascript
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@1ed1437484560351c5be56cf73a48a279d116b78
+        uses: github/codeql-action/analyze@c7f292ea4f542c473194b33813ccd4c207a6c725
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # pin@v2
+        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # pin@v2
         with:
           fetch-depth: 0
           ref: master
@@ -32,7 +32,7 @@ jobs:
         run: npm config set cache .npm-cache --global
         continue-on-error: true
 
-      - uses: actions/cache@136d96b4aee02b1f0de3ba493b1d47135042d9c0 # pin@v2
+      - uses: actions/cache@fd5de65bc895cf536527842281bea11763fefd77 # pin@v2
         with:
           path: |
             .npm-cache

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-16
+16.17
diff --git a/README.md b/README.md
@@ -22,6 +22,8 @@ For usage examples, feel free to take a look at [kwenta](https://github.com/kwen
 
 For additional custom commands and their examples, [check here](https://github.com/synthetixio/synpress/blob/master/support/index.d.ts).
 
+To see in which direction Synpress is headed to, take a look at this [planning board](https://github.com/orgs/Synthetixio/projects/14).
+
 **Features:**
 
 - metamask support

diff --git a/commands/puppeteer.js b/commands/puppeteer.js
@@ -20,7 +20,7 @@ module.exports = {
     return activeTabName;
   },
   init: async () => {
-    const debuggerDetails = await fetch('http://localhost:9222/json/version'); //DevSkim: ignore DS137138
+    const debuggerDetails = await fetch('http://127.0.0.1:9222/json/version'); //DevSkim: ignore DS137138
     const debuggerDetailsConfig = await debuggerDetails.json();
     const webSocketDebuggerUrl = debuggerDetailsConfig.webSocketDebuggerUrl;
 

diff --git a/launcher.js b/launcher.js
@@ -1,14 +1,10 @@
 const cypress = require('cypress');
 const helpers = require('./helpers');
-const synpressConfigPath = `${helpers.getSynpressPath()}/synpress.json`;
+const synpressConfigPath = `${helpers.getSynpressPath()}/synpress.config.js`;
 
 process.env.CYPRESS_REMOTE_DEBUGGING_PORT = 9222;
 
-const fixturesFolder = `${helpers.getSynpressPath()}/fixtures`;
-const pluginsFile = `${helpers.getSynpressPath()}/plugins/index.js`;
-const supportFile = `${helpers.getSynpressPath()}/support/index.js`;
-
-const defaultConfig = `fixturesFolder=${fixturesFolder},pluginsFile=${pluginsFile},supportFile=${supportFile}`;
+const defaultConfig = ``;
 
 const defaultArguments = [
   'cypress',