Merge branch 'develop' into fix_oauth2_redirect

.github/workflows/release-publish.yml

@@ -164,21 +164,27 @@ jobs:
           snap: artifacts/ubuntu-latest-artifacts/insomnia/dist/Insomnia.Core-${{ env.RELEASE_VERSION }}.snap
           release: ${{ contains(github.event.inputs.version, 'beta') && 'beta' || 'stable' }}
 
-      - name: Upload .deb to pulp (stable only)
-        if: ${{ env.IS_PRERELEASE == 'false' }}
+      - name: Upload .deb to pulp and/or cloudsmith (stable only)
         uses: docker://kong/release-script:latest
         env:
           PULP_USERNAME: ${{ secrets.PULP_USERNAME }}
           PULP_PASSWORD: ${{ secrets.PULP_PASSWORD }}
           PULP_HOST: ${{ secrets.PULP_HOST }}
+          VERBOSE: ${{ runner.debug == '1' && '1' || '' }}
+          CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_API_KEY }}
+          CLOUDSMITH_DRY_RUN: ''
+          IGNORE_CLOUDSMITH_FAILURES: ${{ vars.IGNORE_CLOUDSMITH_FAILURES }}
+          USE_CLOUDSMITH: ${{ vars.USE_CLOUDSMITH }}
+          USE_PULP: ${{ vars.USE_PULP }}
         with:
-          entrypoint: /usr/src/code/entrypoint.sh
+          entrypoint: /entrypoint.sh
           args: >
             release
             --file artifacts/ubuntu-latest-artifacts/insomnia/dist/Insomnia.Core-${{ env.RELEASE_VERSION }}.deb
             --dist-name ubuntu
             --dist-version focal
             --package-type insomnia
+            ${{ env.IS_PRERELEASE == 'true' && '--internal' || '' }}
             --publish
 
       - name: Push Inso CLI docker image tags to Docker Hub

packages/insomnia/package.json

@@ -106,7 +106,7 @@
     "prettier": "2.4.1",
     "shell-quote": "^1.7.2",
     "swagger-ui-dist": "5.0.0-alpha.6",
-    "tough-cookie": "^2.3.1",
+    "tough-cookie": "^4.1.3",
     "uuid": "^8.3.2",
     "yaml": "^1.10.0",
     "yaml-source-map": "^2.1.1"
@@ -149,7 +149,7 @@
     "@types/shell-quote": "^1.7.0",
     "@types/styled-components": "^5.1.23",
     "@types/swagger-ui-dist": "3.30.1",
-    "@types/tough-cookie": "^2.3.7",
+    "@types/tough-cookie": "^4.0.2",
     "@types/uuid": "^8.3.4",
     "@types/vkbeautify": "^0.99.2",
     "@types/ws": "^8.5.4",
@@ -189,7 +189,7 @@
     "react-dnd-html5-backend": "^7.4.4",
     "react-dom": "^18.2.0",
     "react-redux": "^7.2.6",
-    "react-router-dom": "^6.4.2",
+    "react-router-dom": "^6.14.1",
     "react-stately": "3.21.0",
     "react-use": "^17.4.0",
     "redux": "^4.1.2",

packages/insomnia/src/__jest__/before-each.ts

@@ -1,11 +1,8 @@
-import * as fetch from '../account/fetch';
 import { database as db } from '../common/database';
 import * as models from '../models';
 
 export async function globalBeforeEach() {
   // Setup the local database in case it's used
-  fetch.setup('insomnia-tests', 'http://localhost:8000');
-
   await db.init(
     models.types(),
     {