Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: OverlayPlugin/cactbot
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.32.11
Choose a base ref
...
head repository: OverlayPlugin/cactbot
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Loading
Showing 361 changed files with 20,184 additions and 4,178 deletions.
7 changes: 6 additions & 1 deletion .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// @ts-check
'use strict';

const path = require('path');
@@ -7,6 +8,7 @@ const path = require('path');
const rulesDirPlugin = require('eslint-plugin-rulesdir');
rulesDirPlugin.RULES_DIR = path.join(__dirname, 'eslint');

/** @type {import('eslint').Linter.Config} */
const settings = {
'env': {
'browser': true,
@@ -34,9 +36,11 @@ const settings = {
'parser': '@typescript-eslint/parser',
'parserOptions': {
'ecmaVersion': 2022,
'project': ['./tsconfig.eslint.json'],
'sourceType': 'module',
},
'plugins': [
'@typescript-eslint',
'deprecation',
'import',
'rulesdir',
@@ -209,7 +213,7 @@ const tsOverrides = {
'files': ['*.ts'],
'parser': '@typescript-eslint/parser',
'parserOptions': {
'project': ['./tsconfig.json'],
'project': ['./tsconfig.eslint.json'],
'tsconfigRootDir': __dirname,
},
'plugins': ['@typescript-eslint', 'prefer-arrow', 'unicorn'],
@@ -264,6 +268,7 @@ const overrides = [
{
'files': ['*.cjs'],
'parserOptions': {
...settings.parserOptions,
'sourceType': 'script',
},
},
2 changes: 1 addition & 1 deletion .github/actions/setup-js-env/action.yml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ description: "run actions/setup-node and `npm ci`"
runs:
using: "composite"
steps:
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: '20'
cache: 'npm'
2 changes: 1 addition & 1 deletion .github/scripts/npm-package.cjs
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ async function main() {
fs.rmSync('dist', { recursive: true, force: true });
fs.mkdirSync('npm-package');

await exec('npx ttsc --declaration');
await exec('npx tsc -p tsconfig.npm.json --declaration');
fs.renameSync('dist/ui', 'npm-package/ui');
fsExtra.copySync('types', 'npm-package/types', {});
fs.renameSync('dist/resources', 'npm-package/resources');
6 changes: 3 additions & 3 deletions .github/workflows/build-artifact.yml
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ jobs:
msbuild:
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: ./.github/actions/setup-js-env

@@ -43,7 +43,7 @@ jobs:
- name: Check dependencies cache
id: cache-dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ./plugin/ThirdParty
key: |
@@ -76,7 +76,7 @@ jobs:
run: ./util/publish.sh

- name: Upload artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: cactbot-${{ env.artifact_sha }}
path: publish/cactbot-release/
2 changes: 1 addition & 1 deletion .github/workflows/css-lint.yml
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ jobs:
stylelint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: ./.github/actions/setup-js-env

2 changes: 1 addition & 1 deletion .github/workflows/javascript-lint.yml
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ jobs:
eslint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: ./.github/actions/setup-js-env

6 changes: 3 additions & 3 deletions .github/workflows/label-pr.yml
Original file line number Diff line number Diff line change
@@ -73,7 +73,7 @@ jobs:
needs: job_picker
if: needs.job_picker.outputs.run == 'pr_review'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
# Force checkout the main repo (base branch) so that repo secrets
# are not available to unexpected/malicious PR code.
@@ -104,7 +104,7 @@ jobs:
needs: job_picker
if: needs.job_picker.outputs.run == 'push_commit'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
# Force checkout the main repo (base branch) so that repo secrets
# are not available to unexpected/malicious PR code.
@@ -117,7 +117,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Label linked issues
if: join(steps.find-linked-issues.outputs.issues) != ''
if: steps.find-linked-issues.outputs.issues != ''
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
2 changes: 1 addition & 1 deletion .github/workflows/lint-pr-title.yaml
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ jobs:
main:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
# Force checkout the main repo (base branch) so that repo secrets
# are not available to unexpected/malicious PR code.
2 changes: 1 addition & 1 deletion .github/workflows/markdown-lint.yml
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ jobs:
markdownlint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: ./.github/actions/setup-js-env

2 changes: 1 addition & 1 deletion .github/workflows/post-process.yml
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ jobs:
postprocess:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: ./.github/actions/setup-js-env

56 changes: 0 additions & 56 deletions .github/workflows/python-lint.yml

This file was deleted.

10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ jobs:
do_release: ${{ steps.check_tag.outputs.do_release }}
steps:
- name: Checkout Code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

@@ -44,7 +44,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

@@ -64,7 +64,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
steps:
- name: Checkout Code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

@@ -75,7 +75,7 @@ jobs:

- name: Check dependencies cache
id: cache-dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ./plugin/ThirdParty
key: |
@@ -156,7 +156,7 @@ jobs:
if: ${{ github.repository == 'OverlayPlugin/cactbot' }}
steps:
- name: Checkout Code
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: ./.github/actions/setup-js-env

2 changes: 1 addition & 1 deletion .github/workflows/test-sync-files.yml
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ jobs:
main:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: ./.github/actions/setup-js-env

2 changes: 1 addition & 1 deletion .github/workflows/test-validate-versions.yml
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ jobs:
main:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: ./.github/actions/setup-js-env

2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: ./.github/actions/setup-js-env

7 changes: 5 additions & 2 deletions .github/workflows/update-gh-pages.yml
Original file line number Diff line number Diff line change
@@ -28,7 +28,10 @@ jobs:
needs: check-gh-pages
if: needs.check-gh-pages.outputs.found == 'true'
steps:
- uses: actions/checkout@v3
- name: Checkout Code
uses: actions/checkout@v4
with:
fetch-depth: 0

- uses: ./.github/actions/setup-js-env

@@ -38,7 +41,7 @@ jobs:
npm run build-gh-pages
- name: Deploy
uses: peaceiris/actions-gh-pages@v3
uses: peaceiris/actions-gh-pages@v4
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./dist
4 changes: 2 additions & 2 deletions .github/workflows/update-triggers-branch.yml
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ jobs:
needs: check-triggers
if: needs.check-triggers.outputs.found == 'true'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: ./.github/actions/setup-js-env

@@ -37,7 +37,7 @@ jobs:
npm run process-triggers
- name: Deploy
uses: peaceiris/actions-gh-pages@v3
uses: peaceiris/actions-gh-pages@v4
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./dist/triggers/ui/raidboss/data
2 changes: 1 addition & 1 deletion .github/workflows/workflow-lint.yml
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ jobs:
main:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install yamllint
run: |
4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -19,10 +19,6 @@ node_modules
.DS_Store
util/DEPS.cache

# Python
__pycache__
*.py[cod]
*$py.class
# Environments
.env
.venv
17 changes: 9 additions & 8 deletions .mocharc.cjs
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
'use strict';

module.exports = {
recursive: true,
colors: true,
reporter: 'progress',
exclude: [
'recursive': true,
'colors': true,
'reporter': 'progress',
'exclude': [
// Run via test_data_files.js.
'test/helper/*',
],
loader: [
'ts-node/esm',
'node-option': [
'experimental-specifier-resolution=node',
'loader=ts-node/esm',
],
extension: [
'extension': [
'.js',
'.cjs',
'.mjs',
@@ -20,5 +21,5 @@ module.exports = {
],
// The default 2000ms timeout for mocha sometimes doesn't work for larger trigger files.
// TODO: probably we should make tests faster??
timeout: 5000,
'timeout': 5000,
};
4 changes: 1 addition & 3 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -5,8 +5,6 @@
"dbaeumer.vscode-eslint",
"EditorConfig.EditorConfig",
"maikotan.cactbot-highlight",
"dprint.dprint",
"ms-python.black-formatter",
"ms-python.pylint"
"dprint.dprint"
]
}
Loading