Skip to content

Commit 8cee8d8

Browse files
authored
Merge pull request #291 from GordonSmith/OSSAR_FAILING
fix: Ossar tests failing with new eslint file format
2 parents 9e83548 + 1e753a3 commit 8cee8d8

File tree

6 files changed

+20
-66
lines changed

6 files changed

+20
-66
lines changed

.github/workflows/codeql-analysis.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939

4040
# Initializes the CodeQL tools for scanning.
4141
- name: Initialize CodeQL
42-
uses: github/codeql-action/init@v2
42+
uses: github/codeql-action/init@v3
4343
with:
4444
languages: ${{ matrix.language }}
4545
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -50,7 +50,7 @@ jobs:
5050
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5151
# If this step fails, then you should remove it and run the build manually (see below)
5252
- name: Autobuild
53-
uses: github/codeql-action/autobuild@v2
53+
uses: github/codeql-action/autobuild@v3
5454

5555
# ℹ️ Command-line programs to run using the OS shell.
5656
# 📚 https://git.io/JvXDl
@@ -64,4 +64,5 @@ jobs:
6464
# make release
6565

6666
- name: Perform CodeQL Analysis
67-
uses: github/codeql-action/analyze@v2
67+
uses: github/codeql-action/analyze@v3
68+

.github/workflows/ossar-analysis.yml

-48
This file was deleted.

eslint.config.js

+13-12
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@ import globals from "globals";
22
import pluginJs from "@eslint/js";
33
import tseslint from "typescript-eslint";
44

5+
6+
/** @type {import('eslint').Linter.Config[]} */
57
export default [
68
{
7-
files: ["**/*.{js,mjs,cjs,ts}"],
9+
files: [
10+
"**/*.{js,mjs,cjs,ts}"
11+
]
812
},
913
{
1014
languageOptions: {
11-
globals: {
12-
...globals.browser,
13-
...globals.node
14-
}
15+
globals: globals.browser
1516
}
1617
},
1718
pluginJs.configs.recommended,
@@ -20,15 +21,15 @@ export default [
2021
rules: {
2122
"@typescript-eslint/no-explicit-any": "off",
2223
"@typescript-eslint/no-unused-expressions": "off",
23-
"@typescript-eslint/no-namespace": "off",
2424
"@typescript-eslint/no-unused-vars": [
25-
"error", // or "error"
25+
"error",
2626
{
27-
"argsIgnorePattern": "^_",
28-
// "varsIgnorePattern": "^_",
29-
// "caughtErrorsIgnorePattern": "^_"
27+
"args": "none",
28+
"varsIgnorePattern": "^_"
3029
}
31-
]
30+
],
31+
"@typescript-eslint/no-namespace": "off",
3232
}
33-
},
33+
}
34+
3435
];

package-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
"chokidar-cli": "3.0.0",
9090
"eslint": "9.16.0",
9191
"globals": "15.13.0",
92-
"happy-dom": "^15.11.7",
92+
"happy-dom": "15.11.7",
9393
"lerna": "8.1.9",
9494
"npm-run-all": "4.1.5",
9595
"playwright": "1.49.1",

packages/expat/src/expat.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ export class StackParser implements IParser {
144144
return retVal;
145145
}
146146

147-
endElement(_tag: string): StackElement {
147+
endElement(tag: string): StackElement {
148148
return this._stack.pop()!;
149149
}
150150

0 commit comments

Comments
 (0)