Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/main/babel-jest-29.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
ttsukagoshi authored Jan 28, 2024
2 parents 470a6a8 + 6733c14 commit c431be6
Show file tree
Hide file tree
Showing 8 changed files with 71 additions and 53 deletions.
5 changes: 5 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,8 @@ updates:
include: 'scope'
target-branch: 'main'
versioning-strategy: 'increase'
open-pull-requests-limit: 10
groups:
typescript-eslint:
patterns:
- '@typescript-eslint/*'
2 changes: 1 addition & 1 deletion .github/workflows/a11y_alt_text_bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ jobs:
if: ${{ github.event.issue || github.event.pull_request || github.event.discussion }}
steps:
- name: Get action 'github/accessibility-alt-text-bot'
uses: github/accessibility-alt-text-bot@v1.2.0 # Set to latest
uses: github/accessibility-alt-text-bot@v1.4.0 # Set to latest

8 changes: 4 additions & 4 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# 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 @@ -44,7 +44,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, 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.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
Expand All @@ -57,6 +57,6 @@ jobs:
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
with:
category: '/language:${{matrix.language}}'
2 changes: 1 addition & 1 deletion .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
# Checkout the code base #
##########################
- name: Checkout Code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
# Full git history is needed to get a proper list of changed files within `super-linter`
fetch-depth: 0
Expand Down
9 changes: 9 additions & 0 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Security Policy

## Supported Versions

Only the latest major version will be supported for security updates.

## Reporting a Vulnerability

If you encounter vulnerabilities, please report them using the [contact specified in our Terms and Conditions](https://www.scriptable-assets.page/terms-and-conditions/#contact).
86 changes: 42 additions & 44 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@
"@typescript-eslint/parser": "^5.59.2",
"babel-jest": "^29.7.0",
"babel-plugin-transform-import-meta": "^2.2.0",
"eslint": "^8.41.0",
"eslint": "^8.50.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-prettier": "^4.2.1",
"jest": "^29.5.0",
"prettier": "^2.8.8",
"prettier": "^3.0.3",
"ts-node": "^10.9.1",
"typescript": "^5.0.3"
},
Expand Down
8 changes: 7 additions & 1 deletion src/commands/run.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ export default async function (options: CommandOption): Promise<void> {
const urls: string[] = fs
.readFileSync(filePath /*, { encoding: config.encoding }*/)
.toString()
.trim()
.replace(/\r?\n/g, ',')
.split(',');

Expand All @@ -71,7 +72,12 @@ export default async function (options: CommandOption): Promise<void> {
let outputText: string = raw ? '' : REPORT_HEADER.join();
const rawAxeResults: RawAxeResults = {};
for (let i = 0; i < urls.length; i++) {
const url: string = urls[i];
const url: string = urls[i].trim();

if (!url) {
continue;
}

const page: puppeteer.Page = await browser.newPage();
await page.setBypassCSP(true);
/* Emulate device: left here as a potential option for the future
Expand Down

0 comments on commit c431be6

Please sign in to comment.