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: xdy/xdy-pf2e-workbench
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v4.24.2
Choose a base ref
...
head repository: xdy/xdy-pf2e-workbench
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Loading
Showing 1,185 changed files with 47,963 additions and 69,277 deletions.
4 changes: 2 additions & 2 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
.vs/
*.iml
/.vscode
icons/\!dox/
static/assets/icons/\!dox/
/node_modules/
.DS_Store
**.env
@@ -22,6 +22,6 @@ main.bundle.js
#This project
foundryconfig.json
.eslintrc.js
webpack.config.ts
vite.config.ts
types/

58 changes: 0 additions & 58 deletions .eslintrc.js

This file was deleted.

120 changes: 120 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
{
"env": {
"browser": true,
"es6": true
},
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:import/errors",
"plugin:import/typescript",
"prettier"
],
"parserOptions": {
"ecmaVersion": 2023,
"sourceType": "module",
"project": "./tsconfig.json"
},
"ignorePatterns": [
"dist/"
],
"rules": {
"eqeqeq": [
"error",
"always"
],
"import/named": "off",
"import/no-default-export": "error",
"prettier/prettier": "error",
"no-console": "off",
"no-plusplus": [
"error",
{
"allowForLoopAfterthoughts": true
}
],
"no-unused-expressions": [
"error",
{
"allowShortCircuit": true
}
],
"spaced-comment": [
"error",
"always",
{
"markers": [
"/"
]
}
],
"@typescript-eslint/await-thenable": "error",
"@typescript-eslint/ban-ts-comment": "off",
//Just, nope. Not worth it.
"@typescript-eslint/ban-types": "off",
"@typescript-eslint/explicit-module-boundary-types": "off",
//TODO Handle later
"@typescript-eslint/lines-between-class-members": [
"error",
"always",
{
"exceptAfterSingleLine": true
}
],
"@typescript-eslint/prefer-namespace-keyword": "off",
"@typescript-eslint/no-empty-function": "off",
"@typescript-eslint/no-explicit-any": "error",
"@typescript-eslint/no-namespace": [
"error",
{
"allowDeclarations": true
}
],
"@typescript-eslint/no-empty-function": "off",
"@typescript-eslint/no-explicit-any": "off",
// TODO Handle this later
"@typescript-eslint/no-non-null-assertion": "off",
"@typescript-eslint/no-unsafe-declaration-merging": "off",
"@typescript-eslint/no-unused-vars": "off",
"@typescript-eslint/array-type": [
"error",
{
"default": "array"
}
]
},
"settings": {
"import/resolver": {
"node": {
"paths": [
"src",
"types",
"",
"dist"
],
"extensions": [
".css",
".js",
".json",
".jsx",
".scss",
".ts",
".tsx"
]
},
"eslint-import-resolver-typescript": true,
"typescript": true
},
"import/parsers": {
"@typescript-eslint/parser": [
".ts"
]
}
},
"plugins": [
"prettier",
"@typescript-eslint",
"import"
],
"parser": "@typescript-eslint/parser"
}
4 changes: 2 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -5,6 +5,6 @@
*.db text

# Definitively not text
*.jpg binary
*.png binary
*.webp binary
*.pdf binary
packs/leveldb/** binary
8 changes: 4 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -35,11 +35,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.
@@ -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
@@ -64,4 +64,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
64 changes: 64 additions & 0 deletions .github/workflows/manual_release
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
# release action with semantic release
name: Release

on:
workflow_dispatch:

permissions:
contents: write
issues: write
pull-requests: write

jobs:
release:
name: Release
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Use Node.js 18.x
uses: actions/setup-node@v3.8.1
with:
node-version: 18.x
cache: 'npm'

- name: Install
run: npm install

- name: Build packs
run: npm run build:packs

- name: Build
run: npm run build

- name: Release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
run: npx semantic-release

- name: Get tag
run: echo "WORKBENCH_VERSION=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV

# Publish the release to FoundryVTT's package repository only if push on main
# - name: Publish to Foundry Admin
# if: github.event_name == 'push' && (github.ref == 'refs/heads/main') && github.repository == 'xdy/xdy-pf2e-workbench'
# uses: Varriount/fvtt-autopublish@v1.0.9
# with:
# username: ${{ secrets.FOUNDRY_ADMIN_USERNAME }}
# password: ${{ secrets.FOUNDRY_ADMIN_PASSWORD }}
# module-id: 1702
# manifest-url: https://github.com/xdy/xdy-pf2e-workbench/releases/download/${{ env.WORKBENCH_VERSION }}/module.json
# manifest-file: module.json
#
- name: Install playwright
run: npx playwright install

- name: Publish to Foundry VTT Repo
id: publish_foundry_repo
if: github.event_name == 'push' && (github.ref == 'refs/heads/main') && github.repository == 'xdy/xdy-pf2e-workbench'
run: npx @ghost-fvtt/foundry-publish
env:
FVTT_MANIFEST_PATH: 'static/module.json'
FVTT_PACKAGE_ID: ${{ 1702 }}
FVTT_USERNAME: ${{ secrets.FOUNDRY_ADMIN_USERNAME }}
FVTT_PASSWORD: ${{ secrets.FOUNDRY_ADMIN_PASSWORD }}
Loading