Skip to content

Commit

Permalink
Merge pull request #46 from dsrkafuu/dev
Browse files Browse the repository at this point in the history
7.0 SUPPORT
  • Loading branch information
dsrkafuu authored Jul 1, 2024
2 parents 46a4b19 + ba129b0 commit ba94ea3
Show file tree
Hide file tree
Showing 23 changed files with 2,538 additions and 1,844 deletions.
6 changes: 5 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
const { getESLintConfig } = require('@dsrca/config');

module.exports = getESLintConfig('react');
module.exports = getESLintConfig('react', {
rules: {
'@typescript-eslint/ban-ts-comment': 'off',
},
});
10 changes: 5 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ jobs:
sync:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
with:
version: 7
- uses: actions/setup-node@v3
version: 8
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
cache: pnpm
- name: Peform build test
run: |
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<br />

![](https://img.shields.io/github/package-json/v/dsrkafuu/skyline-overlay)
![](https://img.shields.io/badge/ffxiv-endwalker-orange)
![](https://img.shields.io/badge/ffxiv-dawntrail-orange)
[![](https://img.shields.io/github/license/dsrkafuu/skyline-overlay)](https://github.com/dsrkafuu/skyline-overlay/blob/main/LICENSE)
[![](https://img.shields.io/lgtm/grade/javascript/github/dsrkafuu/skyline-overlay)](https://lgtm.com/projects/g/dsrkafuu/skyline-overlay/context:javascript)

Expand Down
61 changes: 29 additions & 32 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{
"engines": {
"node": ">=18",
"pnpm": ">=7"
"node": ">=20",
"pnpm": ">=8"
},
"private": true,
"name": "skyline-overlay",
"version": "3.8.1",
"version": "4.0.0",
"versionCode": "Iseri Nina",
"description": "A modern customizable horizon FFXIV miniparse overlay.",
"license": "Apache-2.0",
"author": "DSRKafuU <dsrkafuu@outlook.com> (https://dsrkafuu.net)",
Expand All @@ -20,45 +21,41 @@
"script:modSource": "node \"./scripts/modSource.js\"",
"script:removeTrash": "node \"./scripts/removeTrash.js\"",
"build": "cross-env NODE_ENV=production run-s script:genIconIdx script:genMeta eslint typecheck bundle script:removeTrash",
"dev": "cross-env NODE_ENV=development run-s script:genIconIdx script:genMeta serve"
"dev": "cross-env NODE_ENV=development VITE_GA_ID=TEST run-s script:genIconIdx script:genMeta serve"
},
"dependencies": {
"@reduxjs/toolkit": "^1.9.5",
"clsx": "^1.2.1",
"ffxiv-overlay-api": "^4.7.0",
"immer": "^9.0.21",
"@reduxjs/toolkit": "^2.2.6",
"clsx": "^2.1.1",
"ffxiv-overlay-api": "^4.8.0",
"immer": "^10.1.1",
"normalize.css": "^8.0.1",
"react": "^18.2.0",
"react": "^18.3.1",
"react-colorful": "^5.6.1",
"react-dom": "^18.2.0",
"react-redux": "^8.0.5",
"stable-hash": "^0.0.3"
"react-dom": "^18.3.1",
"react-redux": "^9.1.2",
"stable-hash": "^0.0.4",
"workbox-window": "^7.1.0"
},
"devDependencies": {
"@babel/core": "^7.22.1",
"@dsrca/config": "^3.3.1",
"@types/node": "^20.2.5",
"@types/react": "^18.2.7",
"@types/react-dom": "^18.2.4",
"@typescript-eslint/eslint-plugin": "^5.59.7",
"@typescript-eslint/parser": "^5.59.7",
"@vitejs/plugin-react": "^4.0.0",
"@babel/core": "^7.24.7",
"@dsrca/config": "^3.6.0",
"@types/node": "^20.14.9",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@vitejs/plugin-react": "^4.3.1",
"chalk": "^4.1.2",
"cross-env": "^7.0.3",
"eslint": "^8.41.0",
"eslint-plugin-react": "^7.32.2",
"eslint-plugin-react-hooks": "^4.6.0",
"glob": "^8.1.0",
"eslint": "^8.57.0",
"glob": "^10.4.2",
"npm-run-all": "^4.1.5",
"prettier": "^2.8.8",
"rollup-plugin-visualizer": "^5.9.0",
"sass": "^1.62.1",
"typescript": "^5.0.4",
"vite": "^4.3.8",
"prettier": "^3.3.2",
"rollup-plugin-visualizer": "^5.12.0",
"sass": "^1.77.6",
"typescript": "^4.9.5",
"vite": "^5.3.2",
"vite-plugin-html-env": "^1.2.8",
"vite-plugin-pwa": "^0.15.1",
"vite-plugin-svgr": "^3.2.0",
"workbox-window": "^6.6.0"
"vite-plugin-pwa": "^0.20.0",
"vite-plugin-svgr": "^4.2.0"
},
"pnpm": {
"peerDependencyRules": {
Expand Down
Loading

0 comments on commit ba94ea3

Please sign in to comment.