Merge pull request #879 from sasjs/fix/bump_axios_to_1_15_0

build(deps): bump and pin axios to v1.15.0
Merge branch 'master' into fix/bump_axios_to_1_15_0
2026-04-14 18:03:14 +00:00 · 2026-04-10 16:40:41 +01:00 · 2026-04-10 16:22:05 +01:00 · 2026-04-10 15:58:45 +01:00 · 2026-04-08 14:07:39 +02:00 · 2026-04-08 12:53:15 +02:00
7 changed files with 28 additions and 19 deletions
--- a/.github/workflows/server-tests.yml
+++ b/.github/workflows/server-tests.yml
@@ -97,6 +97,7 @@ jobs:
          npm i
          jq '.sasJsConfig.serverUrl |= "${{ secrets.SASJS_SERVER_URL }}"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
          jq '.sasJsConfig.serverType |= "SASJS"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
+          jq '.sasJsConfig.loginMechanism |= "Default"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
          jq '.userName |= "${{ secrets.SASJS_USERNAME }}"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
          jq '.password |= "${{ secrets.SASJS_PASSWORD }}"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json

@@ -110,8 +111,10 @@ jobs:
        shell: bash

      - name: Run cypress on sasjs
+        env:
+          TERM: dumb
        run: |
-          sed -i "s|sasjsTestsUrl: '.*'|sasjsTestsUrl: 'http://localhost:5173'|g" ./cypress.config.js
+          sed -i "s|sasjsTestsUrl: '.*'|sasjsTestsUrl: 'http://localhost:3000'|g" ./cypress.config.js
          sed -i "s|username: '.*'|username: '${{ secrets.SASJS_USERNAME }}'|g" ./cypress.config.js
          sed -i "s|password: '.*'|password: '${{ secrets.SASJS_PASSWORD }}'|g" ./cypress.config.js
          cat ./cypress.config.js
--- a/cypress.config.js
+++ b/cypress.config.js
@@ -9,7 +9,7 @@ module.exports = defineConfig({
    supportFile: 'cypress/support/index.js'
  },
  env: {
-    sasjsTestsUrl: 'http://localhost:5173',
+    sasjsTestsUrl: 'http://localhost:3000',
    username: '',
    password: '',
    screenshotOnRunFailure: false,
--- a/cypress/integration/sasjs.tests.ts
+++ b/cypress/integration/sasjs.tests.ts
@@ -9,10 +9,12 @@ context('sasjs-tests', function () {
  })

  beforeEach(() => {
-    cy.reload()
+    cy.visit(sasjsTestsUrl)
  })

  function loginIfNeeded() {
+    cy.get('login-form, tests-view', { timeout: 30000 }).should('exist')
+
    cy.get('body').then(($body) => {
      if ($body.find('login-form').length > 0) {
        cy.get('login-form')
--- a/package-lock.json
+++ b/package-lock.json
@@ -7,8 +7,8 @@
      "name": "@sasjs/adapter",
      "license": "ISC",
      "dependencies": {
-        "@sasjs/utils": "3.5.6",
-        "axios": "^1.13.5",
+        "@sasjs/utils": "^3.5.6",
+        "axios": "1.15.0",
        "axios-cookiejar-support": "5.0.5",
        "form-data": "4.0.4",
        "https": "1.0.0",
@@ -3527,14 +3527,14 @@
      "license": "MIT"
    },
    "node_modules/axios": {
-      "version": "1.13.5",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.5.tgz",
-      "integrity": "sha512-cz4ur7Vb0xS4/KUN0tPWe44eqxrIu31me+fbang3ijiNscE129POzipJJA6zniq2C/Z6sJCjMimjS8Lc/GAs8Q==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.15.0.tgz",
+      "integrity": "sha512-wWyJDlAatxk30ZJer+GeCWS209sA42X+N5jU2jy6oHTp7ufw8uzUTVFBX9+wTfAlhiJXGS0Bq7X6efruWjuK9Q==",
      "license": "MIT",
      "dependencies": {
        "follow-redirects": "^1.15.11",
        "form-data": "^4.0.5",
-        "proxy-from-env": "^1.1.0"
+        "proxy-from-env": "^2.1.0"
      }
    },
    "node_modules/axios-cookiejar-support": {
@@ -8564,9 +8564,7 @@
      }
    },
    "node_modules/lodash": {
-      "version": "4.17.23",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
-      "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==",
+      "version": "4.17.21",
      "dev": true,
      "license": "MIT"
    },
@@ -12417,10 +12415,13 @@
      }
    },
    "node_modules/proxy-from-env": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-      "license": "MIT"
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-2.1.0.tgz",
+      "integrity": "sha512-cJ+oHTW1VAEa8cJslgmUZrc+sjRKgAKl3Zyse6+PV38hZe/V6Z14TbCuXcan9F9ghlz4QrFr2c92TNF82UkYHA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      }
    },
    "node_modules/psl": {
      "version": "1.15.0",
--- a/package.json
+++ b/package.json
@@ -76,8 +76,8 @@
  },
  "main": "index.js",
  "dependencies": {
-    "@sasjs/utils": "3.5.6",
-    "axios": "^1.13.5",
+    "@sasjs/utils": "^3.5.6",
+    "axios": "1.15.0",
    "axios-cookiejar-support": "5.0.5",
    "form-data": "4.0.4",
    "https": "1.0.0",
--- a/sasjs-tests/sasjs/sasjsconfig.json
+++ b/sasjs-tests/sasjs/sasjsconfig.json
@@ -7,7 +7,7 @@
  "targets": [
    {
      "name": "4gl",
-      "serverUrl": "https://sas9.4gl.io",
+      "serverUrl": "https://sas.4gl.io",
      "serverType": "SASJS",
      "httpsAgentOptions": {
        "allowInsecureRequests": false
--- a/sasjs-tests/vite.config.js
+++ b/sasjs-tests/vite.config.js
@@ -1,5 +1,8 @@
 import { defineConfig } from 'vite'
 export default defineConfig({
+  server: {
+    port: 3000
+  },
  build: {
    assetsInlineLimit: 0,
    assetsDir: ''
Author	SHA1	Message	Date
Trevor Moody	b92487819a	Merge pull request #879 from sasjs/fix/bump_axios_to_1_15_0 build(deps): bump and pin axios to v1.15.0	2026-04-10 16:40:41 +01:00
Trevor Moody	3cc37e0b5b	Merge branch 'master' into fix/bump_axios_to_1_15_0	2026-04-10 16:22:05 +01:00
Trevor Moody	d87b9ecc34	fix(deps): bump and pin axios to v1.15.0	2026-04-10 15:58:45 +01:00
Sead Mulahasanović	3b00ae4bef	chore: merge pull request #878 from sasjs/fix/pin-axios-version chore: pin axios version	2026-04-08 14:07:39 +02:00
mulahasanovic	87efdfff2e	fix(ci): set correct loginMechanism and fix test reload	2026-04-08 12:53:15 +02:00
mulahasanovic	73556c9fdf	fix(ci): use CORS-whitelisted port for sasjs-tests dev server	2026-04-06 17:02:29 +02:00
mulahasanovic	72318ced00	ci: set TERM=dumb to suppress tput warnings	2026-04-06 10:44:38 +02:00
mulahasanovic	d7053ba628	test(cypress): wait for app init before checking login state	2026-04-01 21:02:46 +02:00
mulahasanovic	52371da4db	chore: pin axios version	2026-04-01 19:37:45 +02:00