Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ fmt-ui-quick:
cd ui/v2.5 && \
files=$$(git diff --name-only --relative --diff-filter d . ../../graphql); \
if [ -n "$$files" ]; then \
npm run prettier -- --write $$files; \
npm run biome -- format --write $$files; \
fi

# does not run tsc checks, as they are slow
Expand All @@ -411,9 +411,9 @@ validate-ui-quick:
tsfiles=$$(git diff --name-only --relative --diff-filter d src | grep -e "\.tsx\?\$$"); \
scssfiles=$$(git diff --name-only --relative --diff-filter d src | grep "\.scss"); \
prettyfiles=$$(git diff --name-only --relative --diff-filter d . ../../graphql); \
if [ -n "$$tsfiles" ]; then npm run eslint -- $$tsfiles; fi && \
if [ -n "$$tsfiles" ]; then npm run biome -- check $$tsfiles; fi && \
if [ -n "$$scssfiles" ]; then npm run stylelint -- $$scssfiles; fi && \
if [ -n "$$prettyfiles" ]; then npm run prettier -- --check $$prettyfiles; fi
if [ -n "$$prettyfiles" ]; then npm run biome -- format --check $$prettyfiles; fi

# runs all of the backend PR-acceptance steps
.PHONY: validate-backend
Expand Down
11 changes: 1 addition & 10 deletions ui/v2.5/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ src/core/generated-graphql.ts

# dependencies
/node_modules
/.pnp
.pnp.js

# testing
/coverage
Expand All @@ -18,11 +16,4 @@ src/core/generated-graphql.ts
.env.local
.env.development.local
.env.test.local
.env.production.local

npm-debug.log*
yarn-debug.log*
yarn-error.log*

.eslintcache
.stylelintcache
.env.production.local
18 changes: 0 additions & 18 deletions ui/v2.5/.prettierignore

This file was deleted.

1 change: 1 addition & 0 deletions ui/v2.5/.stylelintcache
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[["1","2","3","4","5","6","7","8","9","10","11","12","13","14","15","16","17","18","19","20","21","22","23","24","25","26","27","28","29","30","31"],{"key":"32","value":"33"},{"key":"34","value":"35"},{"key":"36","value":"37"},{"key":"38","value":"39"},{"key":"40","value":"41"},{"key":"42","value":"43"},{"key":"44","value":"45"},{"key":"46","value":"47"},{"key":"48","value":"49"},{"key":"50","value":"51"},{"key":"52","value":"53"},{"key":"54","value":"55"},{"key":"56","value":"57"},{"key":"58","value":"59"},{"key":"60","value":"61"},{"key":"62","value":"63"},{"key":"64","value":"65"},{"key":"66","value":"67"},{"key":"68","value":"69"},{"key":"70","value":"71"},{"key":"72","value":"73"},{"key":"74","value":"75"},{"key":"76","value":"77"},{"key":"78","value":"79"},{"key":"80","value":"81"},{"key":"82","value":"83"},{"key":"84","value":"85"},{"key":"86","value":"87"},{"key":"88","value":"89"},{"key":"90","value":"91"},{"key":"92","value":"93"},"E:\\Documents\\Github\\stash\\_forks\\stash\\ui\\v2.5\\src\\sfw-mode.scss",{"size":1928,"mtime":1770524238999,"data":"94"},"E:\\Documents\\Github\\stash\\_forks\\stash\\ui\\v2.5\\src\\components\\Changelog\\styles.scss",{"size":385,"mtime":1773802861536,"data":"95"},"E:\\Documents\\Github\\stash\\_forks\\stash\\ui\\v2.5\\src\\components\\Galleries\\styles.scss",{"size":8177,"mtime":1774826040983,"data":"96"},"E:\\Documents\\Github\\stash\\_forks\\stash\\ui\\v2.5\\src\\components\\Help\\styles.scss",{"size":699,"mtime":1753370783408,"data":"97"},"E:\\Documents\\Github\\stash\\_forks\\stash\\ui\\v2.5\\src\\components\\Tagger\\styles.scss",{"size":6207,"mtime":1774826041001,"data":"98"},"E:\\Documents\\Github\\stash\\_forks\\stash\\ui\\v2.5\\src\\components\\ScenePlayer\\styles.scss",{"size":13180,"mtime":1774925138976,"data":"99"},"E:\\Documents\\Github\\stash\\_forks\\stash\\ui\\v2.5\\src\\components\\Studios\\styles.scss",{"size":1451,"mtime":1764030217133,"data":"100"},"E:\\Documents\\Github\\stash\\_forks\\stash\\ui\\v2.5\\src\\styles\\_theme.scss",{"size":2785,"mtime":1774944501529,"data":"101"},"E:\\Documents\\Github\\stash\\_forks\\stash\\ui\\v2.5\\src\\hooks\\Lightbox\\lightbox.scss",{"size":3436,"mtime":1763256352542,"data":"102"},"E:\\Documents\\Github\\stash\\_forks\\stash\\ui\\v2.5\\src\\components\\SceneFilenameParser\\styles.scss",{"size":771,"mtime":1753370783437,"data":"103"},"E:\\Documents\\Github\\stash\\_forks\\stash\\ui\\v2.5\\src\\components\\Shared\\Rating\\styles.scss",{"size":1516,"mtime":1753370783487,"data":"104"},"E:\\Documents\\Github\\stash\\_forks\\stash\\ui\\v2.5\\src\\components\\List\\styles.scss",{"size":20852,"mtime":1774948623593,"data":"105"},"E:\\Documents\\Github\\stash\\_forks\\stash\\ui\\v2.5\\src\\index.scss",{"size":24418,"mtime":1774944501527,"data":"106"},"E:\\Documents\\Github\\stash\\_forks\\stash\\ui\\v2.5\\src\\components\\SceneDuplicateChecker\\styles.scss",{"size":236,"mtime":1753370783435,"data":"107"},"E:\\Documents\\Github\\stash\\_forks\\stash\\ui\\v2.5\\src\\components\\Shared\\PackageManager\\styles.scss",{"size":1817,"mtime":1753370783485,"data":"108"},"E:\\Documents\\Github\\stash\\_forks\\stash\\ui\\v2.5\\src\\components\\Tags\\styles.scss",{"size":2205,"mtime":1753370783511,"data":"109"},"E:\\Documents\\Github\\stash\\_forks\\stash\\ui\\v2.5\\src\\components\\Dialogs\\IdentifyDialog\\styles.scss",{"size":621,"mtime":1753370783389,"data":"110"},"E:\\Documents\\Github\\stash\\_forks\\stash\\ui\\v2.5\\src\\styles\\_scrollbars.scss",{"size":757,"mtime":1753370783575,"data":"111"},"E:\\Documents\\Github\\stash\\_forks\\stash\\ui\\v2.5\\src\\components\\Groups\\styles.scss",{"size":3088,"mtime":1753370783406,"data":"112"},"E:\\Documents\\Github\\stash\\_forks\\stash\\ui\\v2.5\\src\\components\\Wall\\styles.scss",{"size":3223,"mtime":1763256352531,"data":"113"},"E:\\Documents\\Github\\stash\\_forks\\stash\\ui\\v2.5\\src\\components\\Scenes\\styles.scss",{"size":16393,"mtime":1774826040989,"data":"114"},"E:\\Documents\\Github\\stash\\_forks\\stash\\ui\\v2.5\\src\\components\\Settings\\styles.scss",{"size":6617,"mtime":1770524238966,"data":"115"},"E:\\Documents\\Github\\stash\\_forks\\stash\\ui\\v2.5\\src\\components\\Setup\\styles.scss",{"size":469,"mtime":1753370783468,"data":"116"},"E:\\Documents\\Github\\stash\\_forks\\stash\\ui\\v2.5\\src\\components\\Dialogs\\styles.scss",{"size":274,"mtime":1753370783389,"data":"117"},"E:\\Documents\\Github\\stash\\_forks\\stash\\ui\\v2.5\\src\\components\\Performers\\styles.scss",{"size":5463,"mtime":1772335955891,"data":"118"},"E:\\Documents\\Github\\stash\\_forks\\stash\\ui\\v2.5\\src\\styles\\_range.scss",{"size":2004,"mtime":1763256352576,"data":"119"},"E:\\Documents\\Github\\stash\\_forks\\stash\\ui\\v2.5\\src\\hooks\\Interactive\\interactive.scss",{"size":578,"mtime":1753370783536,"data":"120"},"E:\\Documents\\Github\\stash\\_forks\\stash\\ui\\v2.5\\src\\components\\FrontPage\\styles.scss",{"size":8634,"mtime":1772335955860,"data":"121"},"E:\\Documents\\Github\\stash\\_forks\\stash\\ui\\v2.5\\src\\components\\Images\\styles.scss",{"size":3206,"mtime":1774826040985,"data":"122"},"E:\\Documents\\Github\\stash\\_forks\\stash\\ui\\v2.5\\src\\components\\Shared\\styles.scss",{"size":22405,"mtime":1774826040998,"data":"123"},"E:\\Documents\\Github\\stash\\_forks\\stash\\ui\\v2.5\\src\\components\\Shared\\GridCard\\styles.scss",{"size":1307,"mtime":1753370783481,"data":"124"},{"hashOfConfig":"125"},{"hashOfConfig":"125"},{"hashOfConfig":"125"},{"hashOfConfig":"125"},{"hashOfConfig":"125"},{"hashOfConfig":"125"},{"hashOfConfig":"125"},{"hashOfConfig":"125"},{"hashOfConfig":"125"},{"hashOfConfig":"125"},{"hashOfConfig":"125"},{"hashOfConfig":"125"},{"hashOfConfig":"125"},{"hashOfConfig":"125"},{"hashOfConfig":"125"},{"hashOfConfig":"125"},{"hashOfConfig":"125"},{"hashOfConfig":"125"},{"hashOfConfig":"125"},{"hashOfConfig":"125"},{"hashOfConfig":"125"},{"hashOfConfig":"125"},{"hashOfConfig":"125"},{"hashOfConfig":"125"},{"hashOfConfig":"125"},{"hashOfConfig":"125"},{"hashOfConfig":"125"},{"hashOfConfig":"125"},{"hashOfConfig":"125"},{"hashOfConfig":"125"},{"hashOfConfig":"125"},"rzoR5icEoj"]
38 changes: 38 additions & 0 deletions ui/v2.5/biome.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"$schema": "https://biomejs.dev/schemas/2.4.10/schema.json",
"vcs": { "enabled": true, "clientKind": "git", "useIgnoreFile": true },
"files": {
"ignoreUnknown": false,
"includes": [
"**",
"../../graphql/**",
"!src/core/generated-graphql.ts",
"!src/pluginApi.d.ts"
]
},
"formatter": { "enabled": false, "indentStyle": "space" },
"linter": {
"enabled": true,
"domains": {
"react": "recommended",
"types": "recommended"
},
"rules": {
"recommended": false,
"style": { "noNestedTernary": "off", "useBlockStatements": "off" },
"correctness": {
"useExhaustiveDependencies": "off",
"useJsxKeyInIterable": "off"
},
"suspicious": {
"noExplicitAny": "off",
"noArrayIndexKey": "off"
}
}
},
"javascript": { "formatter": { "quoteStyle": "double" } },
"assist": {
"enabled": true,
"actions": { "source": { "organizeImports": "off" } }
}
}
18 changes: 3 additions & 15 deletions ui/v2.5/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
"validate": "npm run lint && npm run check && npm run format-check",
"lint": "npm run lint:js && npm run lint:css",
"lint:css": "stylelint --cache \"src/**/*.scss\"",
"lint:js": "eslint --cache src/",
"lint:js": "biome check src/",
"check": "tsc --noEmit",
"eslint": "eslint",
"prettier": "prettier",
"stylelint": "stylelint",
"format": "prettier --write . ../../graphql",
"format-check": "prettier --check . ../../graphql",
"format": "biome format --write . ../../graphql",
"format-check": "biome format --check . ../../graphql",
"gqlgen": "gql-gen --config codegen.ts",
"extract": "NODE_ENV=development extract-messages -l=en,de -o src/locale -d en --flat false 'src/**/!(*.test).tsx'"
},
Expand Down Expand Up @@ -109,21 +109,9 @@
"@types/videojs-mobile-ui": "^0.8.0",
"@types/videojs-seek-buttons": "^2.1.0",
"@typescript-eslint/eslint-plugin": "^5.52.0",
"@typescript-eslint/parser": "^5.52.0",
"@vitejs/plugin-legacy": "^5.4.3",
"@vitejs/plugin-react": "^5.1.0",
"eslint": "^8.34.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-airbnb-typescript": "^17.0.0",
"eslint-config-prettier": "^8.6.0",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-jsx-a11y": "^6.7.1",
"eslint-plugin-react": "^7.32.2",
"eslint-plugin-react-hooks": "^4.6.0",
"extract-react-intl-messages": "^4.1.1",
"postcss": "^8.4.31",
"postcss-scss": "^4.0.6",
"prettier": "^2.8.4",
"sass": "^1.58.1",
"stylelint": "^15.10.1",
"stylelint-order": "^6.0.2",
Expand Down
Loading
Loading