Merge branch 'master' into master

parallax · Sep 25, 2024 · c10aeb1 · c10aeb1
2 parents e729d3c + f60dcfa
commit c10aeb1
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 29 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -1,16 +1,16 @@
-name: Continous Integration
+name: Continuous Integration
 
-on: [push, pull_request]
+on: [pull_request_target]
 
 jobs:
   test-saucelabs:
     name: Browser tests
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Install Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: npm
@@ -34,9 +34,9 @@ jobs:
     name: Node.js ${{ matrix.node-version }} test
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Install Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
           cache: npm
@@ -57,9 +57,9 @@ jobs:
     name: Typings tests (typescript@${{ matrix.ts-version.ts }})
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Install Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: npm
@@ -77,9 +77,9 @@ jobs:
     name: Lint
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Install Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: npm

diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml
@@ -11,8 +11,8 @@ jobs:
   publish-npm:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: 20
           registry-url: https://registry.npmjs.org/

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/stale@v3
+    - uses: actions/stale@v9
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-issue-message: 'This issue is stale because it has been open 90 days with no activity. It will be closed soon. Please comment/reopen if this issue is still relevant.'

diff --git a/.sauce.yml b/.sauce.yml
diff --git a/package.json b/package.json
@@ -57,7 +57,6 @@
     "jasmine": "3.5.0",
     "jasmine-core": "3.5.0",
     "jasmine-expect": "4.0.3",
-    "js-yaml": "3.13.1",
     "jsdoc": "^3.6.3",
     "karma": "5.1.0",
     "karma-babel-preprocessor": "8.0.1",

diff --git a/test/saucelabs/karma.conf.js b/test/saucelabs/karma.conf.js
@@ -1,7 +1,5 @@
 // Karma configuration
 "use strict";
-const yaml = require("js-yaml");
-const fs = require("fs");
 const karmaConfig = require("../karma.common.conf.js");
 
 const browsers = {
@@ -25,24 +23,16 @@ const browsers = {
 };
 
 module.exports = config => {
-  // Use ENV vars or .sauce.yml to get credentials
   if (
     !(
       process.env.SAUCE_USERNAME &&
       process.env.SAUCE_ACCESS_KEY &&
       process.env.SAUCE_ACCESS_KEY.length > 5
     )
   ) {
-    if (!fs.existsSync(".sauce.yml")) {
       // eslint-disable-next-line no-console
-      console.log("Create a .sauce.yml with your credentials");
+      console.error("Saucelabs credentials are missing. Define the SAUCE_USERNAME and SAUCE_ACCESS_KEY environment variables.");
       process.exit(1);
-    } else {
-      let sauceConfig = yaml.safeLoad(fs.readFileSync(".sauce.yml", "utf8"));
-      process.env.SAUCE_USERNAME = sauceConfig.addons.sauce_connect.username;
-      process.env.SAUCE_ACCESS_KEY =
-        sauceConfig.addons.sauce_connect.access_key;
-    }
   }
   config.set({
     ...karmaConfig,