Skip to content

Commit 2c7bf82

Browse files
committed
fix: Ossar tests failing with new eslint file format
Signed-off-by: Gordon Smith <GordonJSmith@gmail.com>
1 parent 9e83548 commit 2c7bf82

File tree

6 files changed

+27
-73
lines changed

6 files changed

+27
-73
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 4 additions & 3 deletions
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

Lines changed: 0 additions & 48 deletions
This file was deleted.

eslint.config.js

Lines changed: 13 additions & 12 deletions
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

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
"update-major": "npm run update-major-root && lerna run update-major"
7676
},
7777
"devDependencies": {
78-
"@eslint/js": "9.16.0",
78+
"@eslint/js": "^9.16.0",
7979
"@hpcc-js/esbuild-plugins": "1.2.0",
8080
"@types/emscripten": "1.39.13",
8181
"@types/node": "22.10.1",
@@ -87,8 +87,8 @@
8787
"@vitest/coverage-v8": "2.1.8",
8888
"assemblyscript": "0.27.31",
8989
"chokidar-cli": "3.0.0",
90-
"eslint": "9.16.0",
91-
"globals": "15.13.0",
90+
"eslint": "^9.16.0",
91+
"globals": "^15.13.0",
9292
"happy-dom": "^15.11.7",
9393
"lerna": "8.1.9",
9494
"npm-run-all": "4.1.5",
@@ -100,7 +100,7 @@
100100
"typedoc": "0.27.4",
101101
"typedoc-plugin-markdown": "4.3.2",
102102
"typescript": "5.7.2",
103-
"typescript-eslint": "8.18.0",
103+
"typescript-eslint": "^8.18.0",
104104
"vitepress": "1.5.0",
105105
"vitest": "2.1.8"
106106
},
@@ -118,4 +118,4 @@
118118
"url": "https://github.com/hpcc-systems/hpcc-js-wasm/issues"
119119
},
120120
"homepage": "https://hpcc-systems.github.io/hpcc-js-wasm/"
121-
}
121+
}

packages/expat/src/expat.ts

Lines changed: 1 addition & 1 deletion
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)