Skip to content

Commit

Permalink
Merge pull request #291 from GordonSmith/OSSAR_FAILING
Browse files Browse the repository at this point in the history
fix:  Ossar tests failing with new eslint file format
  • Loading branch information
GordonSmith authored Dec 10, 2024
2 parents 9e83548 + 1e753a3 commit 8cee8d8
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 66 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:

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

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

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3

48 changes: 0 additions & 48 deletions .github/workflows/ossar-analysis.yml

This file was deleted.

25 changes: 13 additions & 12 deletions eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,17 @@ import globals from "globals";
import pluginJs from "@eslint/js";
import tseslint from "typescript-eslint";


/** @type {import('eslint').Linter.Config[]} */
export default [
{
files: ["**/*.{js,mjs,cjs,ts}"],
files: [
"**/*.{js,mjs,cjs,ts}"
]
},
{
languageOptions: {
globals: {
...globals.browser,
...globals.node
}
globals: globals.browser
}
},
pluginJs.configs.recommended,
Expand All @@ -20,15 +21,15 @@ export default [
rules: {
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-unused-expressions": "off",
"@typescript-eslint/no-namespace": "off",
"@typescript-eslint/no-unused-vars": [
"error", // or "error"
"error",
{
"argsIgnorePattern": "^_",
// "varsIgnorePattern": "^_",
// "caughtErrorsIgnorePattern": "^_"
"args": "none",
"varsIgnorePattern": "^_"
}
]
],
"@typescript-eslint/no-namespace": "off",
}
},
}

];
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
"chokidar-cli": "3.0.0",
"eslint": "9.16.0",
"globals": "15.13.0",
"happy-dom": "^15.11.7",
"happy-dom": "15.11.7",
"lerna": "8.1.9",
"npm-run-all": "4.1.5",
"playwright": "1.49.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/expat/src/expat.ts
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ export class StackParser implements IParser {
return retVal;
}

endElement(_tag: string): StackElement {
endElement(tag: string): StackElement {
return this._stack.pop()!;
}

Expand Down

0 comments on commit 8cee8d8

Please sign in to comment.