Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Pixi.js #719

Draft
wants to merge 11 commits into
base: master
Choose a base branch
from
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
1,425 changes: 636 additions & 789 deletions package-lock.json

Large diffs are not rendered by default.

29 changes: 9 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"dev:vite": "vite",
"format": "npm run test:prettier -- --write",
"build": "vite build",
"schema-types": "del-cli src/nodecg/generated && nodecg schema-types -o src/nodecg/generated",
"schema-types": "del-cli src/nodecg/generated && nodecg schema-types -o src/nodecg/generated && ts-node --esm scripts/rename-schema-types-files.mts",
"test": "run-s schema-types test:*",
"test:prettier": "prettier \"**/*.{ts,tsx,json,html,yml,css,scss,md}\" --check",
"test:lint": "eslint --ext .ts,.tsx .",
Expand All @@ -29,8 +29,8 @@
},
"dependencies": {
"@googleapis/sheets": "^4.0.2",
"@twurple/api": "^5.3.4",
"@twurple/auth": "^5.3.4",
"@twurple/api": "^6.2.0",
"@twurple/auth": "^6.2.0",
"app-root-path": "^3.1.0",
"date-fns": "^2.30.0",
"express": "^4.18.2",
Expand Down Expand Up @@ -78,7 +78,6 @@
"nodecg-cli": "^8.6.4",
"npm-run-all": "^4.1.5",
"onchange": "^7.1.0",
"pixi.js": "^7.2.4",
"prettier": "^2.8.8",
"react": "^18.2.0",
"react-dom": "^18.2.0",
Expand All @@ -88,6 +87,7 @@
"simple-git-hooks": "^2.8.1",
"sort-package-json": "^2.4.1",
"styled-components": "^5.3.10",
"ts-node": "^10.9.1",
"ts-nodecg": "^0.3.1",
"typescript": "~5.0.4",
"vite": "^4.3.5"
Expand All @@ -110,22 +110,6 @@
"headerColor": "#00BEBE",
"workspace": "2-misc"
},
{
"name": "edit-tourny",
"title": "走者情報入れ替え",
"file": "edit-tourny.html",
"width": 8,
"headerColor": "#00BEBE",
"workspace": "1-special"
},
{
"name": "current-runners",
"title": "現在のゲームの走者",
"file": "current-runners.html",
"width": 2,
"headerColor": "#00BEBE",
"workspace": "1-special"
},
{
"name": "countdown",
"title": "カウントダウン",
Expand Down Expand Up @@ -194,6 +178,11 @@
"width": 1920,
"height": 1030
},
{
"file": "background.html",
"width": 1920,
"height": 1030
},
{
"file": "omnibar.html",
"width": 1920,
Expand Down
17 changes: 0 additions & 17 deletions schemas/lib/participant.json

This file was deleted.

36 changes: 34 additions & 2 deletions schemas/lib/run.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,43 @@
},
"runners": {
"type": "array",
"items": {"$ref": "participant.json"}
"items": {
"type": "object",
"additionalProperties": false,
"properties": {
"pk": {"type": "number"},
"name": {"type": "string"},
"twitch": {"type": "string"},
"nico": {"type": "string"},
"twitter": {"type": "string"},
"camera": {
"type": "boolean",
"description": "人ごとのカメラ使用有無"
}
},
"required": ["pk", "name"]
}
},
"commentators": {
"type": "array",
"items": {"$ref": "participant.json"}
"items": {
"oneOf": [
{
"type": "object",
"additionalProperties": false,
"properties": {
"name": {"type": "string"},
"twitch": {"type": "string"},
"nico": {"type": "string"},
"twitter": {"type": "string"}
},
"required": ["name"]
},
{"type": "null"}
]
},
"minItems": 2,
"maxItems": 2
},
"twitchGameId": {
"type": "string"
Expand Down
10 changes: 10 additions & 0 deletions scripts/rename-schema-types-files.mts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import * as fs from "node:fs/promises";
import {globby} from "globby";

await fs.rm("./src/nodecg/generated/index.d.ts");

const typesFiles = await globby("./src/nodecg/generated/*.d.ts");

await Promise.all(
typesFiles.map((file) => fs.rename(file, file.replace(/\.d\.ts$/, ".ts"))),
);
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import ListItemSecondaryAction from "@mui/material/ListItemSecondaryAction";
import ListItemText from "@mui/material/ListItemText";
import AddIcon from "@mui/icons-material/Add";
import {useState} from "react";
import {Announcements} from "../../../../nodecg/generated";
import {Announcements} from "../../../../nodecg/generated/announcements";

type Announcement = Announcements[number];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import EditIcon from "@mui/icons-material/Edit";
import DeleteIcon from "@mui/icons-material/Delete";
import UndoIcon from "@mui/icons-material/Undo";
import {useEffect, useState} from "react";
import {Announcements} from "../../../../nodecg/generated";
import {Announcements} from "../../../../nodecg/generated/announcements";

type Announcement = Announcements[number];

Expand Down
Loading