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

Fixes tgui dependencies #1012

Merged
merged 5 commits into from
Nov 24, 2023
Merged
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
79 changes: 44 additions & 35 deletions tgui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,45 +20,54 @@
"tgui:tsc": "tsc"
},
"dependencies": {
"@babel/core": "^7.18.0",
"@babel/eslint-parser": "^7.17.0",
"@babel/plugin-proposal-class-properties": "^7.17.12",
"@babel/plugin-transform-jscript": "^7.17.12",
"@babel/preset-env": "^7.18.0",
"@babel/preset-typescript": "^7.17.12",
"@types/jest": "^27.5.1",
"@types/jsdom": "^16.2.14",
"@types/node": "^17.0.35",
"@types/webpack": "^5.28.0",
"@types/webpack-env": "^1.17.0",
"@typescript-eslint/parser": "^5.25.0",
"babel-jest": "^28.1.0",
"babel-loader": "^8.2.5",
"babel-plugin-inferno": "^6.4.0",
"@babel/code-frame": "^7.23.4",
"@babel/core": "^7.23.3",
"@babel/eslint-parser": "^7.23.3",
"@babel/generator": "^7.23.4",
"@babel/helper-environment-visitor": "^7.22.20",
"@babel/helper-function-name": "^7.23.0",
"@babel/helper-hoist-variables": "^7.22.5",
"@babel/helper-split-export-declaration": "^7.22.6",
"@babel/parser": "^7.23.4",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-transform-jscript": "^7.23.3",
"@babel/preset-env": "^7.23.3",
"@babel/preset-typescript": "^7.23.3",
"@babel/types": "^7.23.4",
"@types/jest": "^27.5.2",
"@types/jsdom": "^16.2.15",
"@types/node": "^17.0.45",
"@types/webpack": "^5.28.5",
"@types/webpack-env": "^1.18.4",
"@typescript-eslint/parser": "^5.62.0",
"babel-jest": "^28.1.3",
"babel-loader": "^8.3.0",
"babel-plugin-inferno": "^6.7.0",
"babel-plugin-transform-remove-console": "^6.9.4",
"common": "workspace:*",
"css-loader": "^6.7.1",
"css-loader": "^6.8.1",
"debug": "^4.3.4",
"eslint": "^8.16.0",
"eslint-config-prettier": "^8.5.0",
"eslint": "^8.54.0",
"eslint-config-prettier": "^8.10.0",
"eslint-plugin-radar": "^0.2.1",
"eslint-plugin-react": "^7.30.0",
"eslint-plugin-unused-imports": "^2.0.0",
"inferno": "^7.4.11",
"jest": "^28.1.0",
"jest-circus": "^28.1.0",
"jest-environment-jsdom": "^28.1.0",
"jsdom": "^19.0.0",
"katex": "^0.15.1",
"mini-css-extract-plugin": "^2.6.0",
"sass": "^1.52.1",
"sass-loader": "^13.0.0",
"style-loader": "^3.3.1",
"terser-webpack-plugin": "^5.3.1",
"typescript": "^4.6.4",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-unused-imports": "^3.0.0",
"globals": "^13.23.0",
"inferno": "^8.2.2",
"jest": "^28.1.3",
"jest-circus": "^28.1.3",
"jest-environment-jsdom": "^28.1.3",
"jsdom": "^22.1.0",
"katex": "^0.15.6",
"mini-css-extract-plugin": "^2.7.6",
"sass": "^1.69.5",
"sass-loader": "^13.3.2",
"style-loader": "^3.3.3",
"terser-webpack-plugin": "^5.3.9",
"typescript": "^4.9.5",
"url-loader": "^4.1.1",
"webpack": "^5.76.0",
"webpack-bundle-analyzer": "^4.5.0",
"webpack-cli": "^4.9.2"
"webpack": "^5.89.0",
"webpack-bundle-analyzer": "^4.10.1",
"webpack-cli": "^4.10.0"
}
}
2 changes: 1 addition & 1 deletion tgui/packages/tgfont/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "tgfont",
"version": "1.0.0",
"dependencies": {
"fantasticon": "^1.2.2"
"fantasticon": "^1.2.3"
},
"scripts": {
"build": "node mkdist.cjs && fantasticon --config config.cjs"
Expand Down
8 changes: 4 additions & 4 deletions tgui/packages/tgui-dev-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"version": "4.3.0",
"type": "module",
"dependencies": {
"axios": "^1.6.0",
"glob": "^7.1.7",
"source-map": "^0.7.3",
"axios": "^1.6.2",
"glob": "^7.2.3",
"source-map": "^0.7.4",
"stacktrace-parser": "^0.1.10",
"ws": "^7.5.3"
"ws": "^7.5.9"
}
}
4 changes: 2 additions & 2 deletions tgui/packages/tgui-panel/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"version": "4.3.0",
"dependencies": {
"common": "workspace:*",
"dompurify": "^2.3.1",
"inferno": "^7.4.8",
"dompurify": "^2.4.7",
"inferno": "^7.4.11",
"tgui": "workspace:*",
"tgui-dev-server": "workspace:*",
"tgui-polyfill": "workspace:*"
Expand Down
6 changes: 3 additions & 3 deletions tgui/packages/tgui-polyfill/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"name": "tgui-polyfill",
"version": "4.3.0",
"dependencies": {
"core-js": "^3.16.1",
"regenerator-runtime": "^0.13.9",
"unfetch": "^4.2.0"
"core-js": "^3.33.3",
"regenerator-runtime": "^0.13.11",
"unfetch": "^5.0.0"
}
}
20 changes: 10 additions & 10 deletions tgui/packages/tgui/components/LabeledList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { Box, unit } from './Box';
import { Divider } from './Divider';

type LabeledListProps = {
children?: any;
readonly children?: any;
};

export const LabeledList = (props: LabeledListProps) => {
Expand All @@ -25,15 +25,15 @@ export const LabeledList = (props: LabeledListProps) => {
LabeledList.defaultHooks = pureComponentHooks;

type LabeledListItemProps = {
className?: string | BooleanLike;
label?: string | BooleanLike;
labelColor?: string | BooleanLike;
color?: string | BooleanLike;
textAlign?: string | BooleanLike;
buttons?: InfernoNode,
readonly className?: string | BooleanLike;
readonly label?: string | BooleanLike;
readonly labelColor?: string | BooleanLike;
readonly color?: string | BooleanLike;
readonly textAlign?: string | BooleanLike;
readonly buttons?: InfernoNode,
/** @deprecated */
content?: any,
children?: InfernoNode;
readonly content?: any,
readonly children?: InfernoNode;
};

const LabeledListItem = (props: LabeledListItemProps) => {
Expand Down Expand Up @@ -86,7 +86,7 @@ const LabeledListItem = (props: LabeledListItemProps) => {
LabeledListItem.defaultHooks = pureComponentHooks;

type LabeledListDividerProps = {
size?: number;
readonly size?: number;
};

const LabeledListDivider = (props: LabeledListDividerProps) => {
Expand Down
6 changes: 3 additions & 3 deletions tgui/packages/tgui/components/Popper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import { createPopper, OptionsGeneric } from "@popperjs/core";
import { Component, findDOMfromVNode, InfernoNode, render } from "inferno";

type PopperProps = {
popperContent: InfernoNode;
options?: Partial<OptionsGeneric<unknown>>;
additionalStyles?: CSSProperties,
readonly popperContent: InfernoNode;
readonly options?: Partial<OptionsGeneric<unknown>>;
readonly additionalStyles?: CSSProperties,
};

export class Popper extends Component<PopperProps> {
Expand Down
16 changes: 8 additions & 8 deletions tgui/packages/tgui/components/Section.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ import { addScrollableNode, removeScrollableNode } from '../events';
import { BoxProps, computeBoxClassName, computeBoxProps } from './Box';

interface SectionProps extends BoxProps {
className?: string;
title?: string;
buttons?: InfernoNode;
fill?: boolean;
fitted?: boolean;
scrollable?: boolean;
readonly className?: string;
readonly title?: string;
readonly buttons?: InfernoNode;
readonly fill?: boolean;
readonly fitted?: boolean;
readonly scrollable?: boolean;
/** @deprecated This property no longer works, please remove it. */
level?: boolean;
readonly level?: boolean;
/** @deprecated Please use `scrollable` property */
overflowY?: any;
readonly overflowY?: any;
}

export class Section extends Component<SectionProps> {
Expand Down
6 changes: 3 additions & 3 deletions tgui/packages/tgui/components/Stack.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import { classes } from 'common/react';
import { Flex, FlexItemProps, FlexProps } from './Flex';

interface StackProps extends FlexProps {
vertical?: boolean;
fill?: boolean;
readonly vertical?: boolean;
readonly fill?: boolean;
}

export const Stack = (props: StackProps) => {
Expand Down Expand Up @@ -44,7 +44,7 @@ const StackItem = (props: FlexProps) => {
Stack.Item = StackItem;

interface StackDividerProps extends FlexItemProps {
hidden?: boolean;
readonly hidden?: boolean;
}

const StackDivider = (props: StackDividerProps) => {
Expand Down
6 changes: 3 additions & 3 deletions tgui/packages/tgui/components/Tooltip.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import { createPopper, Placement, VirtualElement } from '@popperjs/core';
import { Component, findDOMfromVNode, InfernoNode, render } from 'inferno';

type TooltipProps = {
children?: InfernoNode;
content: InfernoNode;
position?: Placement,
readonly children?: InfernoNode;
readonly content: InfernoNode;
readonly position?: Placement,
};

type TooltipState = {
Expand Down
2 changes: 1 addition & 1 deletion tgui/packages/tgui/interfaces/ComponentPrinter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const canProduce = (
};

const MaterialCost = (props: {
materials: Design["materials"],
readonly materials: Design["materials"],
}) => {
return (
<Stack>
Expand Down
10 changes: 5 additions & 5 deletions tgui/packages/tgui/interfaces/DecalPainter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,11 @@ export const DecalPainter = (props, context) => {
};

type IconButtonParams = {
decal: string;
dir: number;
color: string;
label: string;
selected: boolean;
readonly decal: string;
readonly dir: number;
readonly color: string;
readonly label: string;
readonly selected: boolean;
};

const IconButton = (props: IconButtonParams, context) => {
Expand Down
2 changes: 1 addition & 1 deletion tgui/packages/tgui/interfaces/ExodroneConsole.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -749,7 +749,7 @@ const EventScreen = (props, context) => {


type AdventureScreenProps = {
hide_status?: boolean
readonly hide_status?: boolean
}

export const AdventureScreen = (props: AdventureScreenProps, context) => {
Expand Down
2 changes: 1 addition & 1 deletion tgui/packages/tgui/interfaces/RequestKiosk.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export const RequestKioskContent = (props, context) => {
title="Request Applicants">
{applicants?.map(applicant => (
applicant.request_id === request.acc_number && (
<Flex>
<Flex key={applicant.request_id}>
<Flex.Item
grow={1}
p={0.5}
Expand Down
4 changes: 2 additions & 2 deletions tgui/packages/tgui/interfaces/StripMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ const getGridSpotKey = (spot: [number, number]): GridSpotKey => {
};

const CornerText = (props: {
align: "left" | "right";
children: string;
readonly align: "left" | "right";
readonly children: string;
}): JSX.Element => {
const { align, children } = props;

Expand Down
4 changes: 2 additions & 2 deletions tgui/packages/tgui/interfaces/common/InputButtons.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ type InputButtonsData = {
};

type InputButtonsProps = {
input: string | number;
message?: string;
readonly input: string | number;
readonly message?: string;
};

export const InputButtons = (props: InputButtonsProps, context) => {
Expand Down
20 changes: 10 additions & 10 deletions tgui/packages/tgui/interfaces/common/Materials.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export type Material = {
};

interface MaterialIconProps extends BoxProps {
material: keyof typeof MATERIAL_KEYS;
readonly material: keyof typeof MATERIAL_KEYS;
}

export const MaterialIcon = (props: MaterialIconProps) => {
Expand All @@ -43,8 +43,8 @@ export const MaterialIcon = (props: MaterialIconProps) => {
};

const EjectMaterial = (props: {
material: Material,
onEject: (amount: number) => void,
readonly material: Material,
readonly onEject: (amount: number) => void,
}, context) => {
const {
name,
Expand Down Expand Up @@ -82,8 +82,8 @@ const EjectMaterial = (props: {
};

export const Materials = (props: {
materials: Material[],
onEject: (ref: string, amount: number) => void,
readonly materials: Material[],
readonly onEject: (ref: string, amount: number) => void,
}) => {
return (
<Flex wrap>
Expand Down Expand Up @@ -111,11 +111,11 @@ export enum MaterialFormatting {
}

export const MaterialAmount = (props: {
name: keyof typeof MATERIAL_KEYS,
amount: number,
formatting?: MaterialFormatting,
color?: string,
style?: Record<string, string>,
readonly name: keyof typeof MATERIAL_KEYS,
readonly amount: number,
readonly formatting?: MaterialFormatting,
readonly color?: string,
readonly style?: Record<string, string>,
}) => {
const {
name,
Expand Down
14 changes: 7 additions & 7 deletions tgui/packages/tgui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
"name": "tgui",
"version": "4.3.0",
"dependencies": {
"@popperjs/core": "^2.9.3",
"@popperjs/core": "^2.11.8",
"common": "workspace:*",
"dateformat": "^4.5.1",
"dompurify": "^2.3.1",
"inferno": "^7.4.8",
"inferno-vnode-flags": "^7.4.8",
"dateformat": "^4.6.3",
"dompurify": "^2.4.7",
"inferno": "^7.4.11",
"inferno-vnode-flags": "^7.4.11",
"js-yaml": "^4.1.0",
"katex": "^0.15.1",
"marked": "^4.0.10",
"katex": "^0.15.6",
"marked": "^4.3.0",
"tgui-dev-server": "workspace:*",
"tgui-polyfill": "workspace:*"
}
Expand Down
Loading
Loading