Skip to content

Commit

Permalink
feat: add sc minification + display class names
Browse files Browse the repository at this point in the history
  • Loading branch information
insertish committed Jan 14, 2022
1 parent 8dd18c9 commit 3fd56e4
Show file tree
Hide file tree
Showing 82 changed files with 523 additions and 110 deletions.
1 change: 1 addition & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{ "plugins": [["@babel/plugin-proposal-decorators", { "legacy": true }]] }
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
}
},
"dependencies": {
"@insertish/vite-plugin-babel-macros": "^1.0.5",
"color-rgba": "^2.3.0",
"fs-extra": "^10.0.0",
"klaw": "^3.0.0",
Expand All @@ -67,6 +68,7 @@
"vite": "^2.6.14"
},
"devDependencies": {
"@babel/plugin-proposal-decorators": "^7.16.7",
"@fontsource/atkinson-hyperlegible": "^4.4.5",
"@fontsource/bree-serif": "^4.4.5",
"@fontsource/comic-neue": "^4.4.5",
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/AgeGate.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { observer } from "mobx-react-lite";
import { useHistory } from "react-router-dom";
import { Channel } from "revolt.js/dist/maps/Channels";
import styled from "styled-components";
import styled from "styled-components/macro";

import { Text } from "preact-i18n";
import { useState } from "preact/hooks";
Expand Down
44 changes: 22 additions & 22 deletions src/components/common/AutoComplete.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Channel } from "revolt.js/dist/maps/Channels";
import { User } from "revolt.js/dist/maps/Users";
import styled, { css } from "styled-components";
import styled, { css } from "styled-components/macro";

import { StateUpdater, useState } from "preact/hooks";

Expand All @@ -14,19 +14,19 @@ import UserIcon from "./user/UserIcon";
export type AutoCompleteState =
| { type: "none" }
| ({ selected: number; within: boolean } & (
| {
type: "emoji";
matches: string[];
}
| {
type: "user";
matches: User[];
}
| {
type: "channel";
matches: Channel[];
}
));
| {
type: "emoji";
matches: string[];
}
| {
type: "user";
matches: User[];
}
| {
type: "channel";
matches: Channel[];
}
));

export type SearchClues = {
users?: { type: "channel"; id: string } | { type: "all" };
Expand Down Expand Up @@ -79,15 +79,15 @@ export function useAutoComplete(

if (current === ":" || current === "@" || current === "#") {
const search = content.slice(j + 1, content.length);
const minLen = current === ":" ? 2 : 1
const minLen = current === ":" ? 2 : 1;

if (search.length >= minLen) {
return [
current === "#"
? "channel"
: current === ":"
? "emoji"
: "user",
? "emoji"
: "user",
search.toLowerCase(),
j + 1,
];
Expand Down Expand Up @@ -167,8 +167,8 @@ export function useAutoComplete(
const matches = (
search.length > 0
? users.filter((user) =>
user.username.toLowerCase().match(regex),
)
user.username.toLowerCase().match(regex),
)
: users
)
.splice(0, 5)
Expand Down Expand Up @@ -199,8 +199,8 @@ export function useAutoComplete(
const matches = (
search.length > 0
? channels.filter((channel) =>
channel.name!.toLowerCase().match(regex),
)
channel.name!.toLowerCase().match(regex),
)
: channels
)
.splice(0, 5)
Expand Down Expand Up @@ -417,7 +417,7 @@ export default function AutoComplete({
<Emoji
emoji={
(emojiDictionary as Record<string, string>)[
match
match
]
}
size={20}
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/IconBase.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Attachment } from "revolt-api/types/Autumn";
import styled, { css } from "styled-components";
import styled, { css } from "styled-components/macro";

export interface IconBaseProps<T> {
target?: T;
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/ServerHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { observer } from "mobx-react-lite";
import { Link } from "react-router-dom";
import { ServerPermission } from "revolt.js/dist/api/permissions";
import { Server } from "revolt.js/dist/maps/Servers";
import styled, { css } from "styled-components";
import styled, { css } from "styled-components/macro";

import { Text } from "preact-i18n";

Expand Down
2 changes: 1 addition & 1 deletion src/components/common/ServerIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { observer } from "mobx-react-lite";
import { Server } from "revolt.js/dist/maps/Servers";
import styled from "styled-components";
import styled from "styled-components/macro";

import { useContext } from "preact/hooks";

Expand Down
2 changes: 1 addition & 1 deletion src/components/common/Tooltip.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Tippy, { TippyProps } from "@tippyjs/react";
import styled from "styled-components";
import styled from "styled-components/macro";

import { Text } from "preact-i18n";

Expand Down
2 changes: 1 addition & 1 deletion src/components/common/messaging/MessageBase.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { observer } from "mobx-react-lite";
import { Message } from "revolt.js/dist/maps/Messages";
import styled, { css, keyframes } from "styled-components";
import styled, { css, keyframes } from "styled-components/macro";
import { decodeTime } from "ulid";

import { Text } from "preact-i18n";
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/messaging/MessageBox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Axios, { CancelTokenSource } from "axios";
import { observer } from "mobx-react-lite";
import { ChannelPermission } from "revolt.js/dist/api/permissions";
import { Channel } from "revolt.js/dist/maps/Channels";
import styled, { css } from "styled-components";
import styled, { css } from "styled-components/macro";
import { ulid } from "ulid";

import { Text } from "preact-i18n";
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/messaging/SystemMessage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
import { observer } from "mobx-react-lite";
import { SystemMessage as SystemMessageI } from "revolt-api/types/Channels";
import { Message } from "revolt.js/dist/maps/Messages";
import styled from "styled-components";
import styled from "styled-components/macro";

import { attachContextMenu } from "preact-context-menu";

Expand Down
8 changes: 4 additions & 4 deletions src/components/common/messaging/attachments/Grid.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import styled from "styled-components";
import styled from "styled-components/macro";

import { Children } from "../../../../types/Preact";

const Grid = styled.div<{ width: number; height: number }>`
--width: ${props => props.width}px;
--height: ${props => props.height}px;
--width: ${(props) => props.width}px;
--height: ${(props) => props.height}px;
display: grid;
aspect-ratio: ${(props) => props.width} / ${(props) => props.height};
Expand Down Expand Up @@ -42,7 +42,7 @@ const Grid = styled.div<{ width: number; height: number }>`
overflow: hidden;
object-fit: contain;
// It's something
object-position: left;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { useHistory } from "react-router-dom";
import { RelationshipStatus } from "revolt-api/types/Users";
import { Channel } from "revolt.js/dist/maps/Channels";
import { Message } from "revolt.js/dist/maps/Messages";
import styled, { css } from "styled-components";
import styled, { css } from "styled-components/macro";

import { Text } from "preact-i18n";
import { useLayoutEffect, useState } from "preact/hooks";
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/messaging/attachments/Spoiler.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from "styled-components";
import styled from "styled-components/macro";

import { Text } from "preact-i18n";

Expand Down
2 changes: 1 addition & 1 deletion src/components/common/messaging/bars/FilePreview.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable react-hooks/rules-of-hooks */
import { XCircle, Plus, Share, X, File } from "@styled-icons/boxicons-regular";
import styled from "styled-components";
import styled from "styled-components/macro";

import { Text } from "preact-i18n";
import { useEffect, useState } from "preact/hooks";
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/messaging/bars/JumpToBottom.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { DownArrowAlt } from "@styled-icons/boxicons-regular";
import { observer } from "mobx-react-lite";
import { Channel } from "revolt.js/dist/maps/Channels";
import styled, { css } from "styled-components";
import styled, { css } from "styled-components/macro";

import { Text } from "preact-i18n";

Expand Down
2 changes: 1 addition & 1 deletion src/components/common/messaging/bars/ReplyBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { File, XCircle } from "@styled-icons/boxicons-solid";
import { observer } from "mobx-react-lite";
import { Channel } from "revolt.js/dist/maps/Channels";
import { Message } from "revolt.js/dist/maps/Messages";
import styled from "styled-components";
import styled from "styled-components/macro";

import { Text } from "preact-i18n";
import { StateUpdater, useEffect } from "preact/hooks";
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/messaging/bars/TypingIndicator.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { observer } from "mobx-react-lite";
import { RelationshipStatus } from "revolt-api/types/Users";
import { Channel } from "revolt.js/dist/maps/Channels";
import styled from "styled-components";
import styled from "styled-components/macro";

import { Text } from "preact-i18n";

Expand Down
2 changes: 1 addition & 1 deletion src/components/common/messaging/embed/EmbedInvite.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { observer } from "mobx-react-lite";
import { useHistory } from "react-router-dom";
import { RetrievedInvite } from "revolt-api/types/Invites";
import { Message } from "revolt.js/dist/maps/Messages";
import styled, { css } from "styled-components";
import styled, { css } from "styled-components/macro";

import { useContext, useEffect, useState } from "preact/hooks";

Expand Down
2 changes: 1 addition & 1 deletion src/components/common/user/UserBadges.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Shield } from "@styled-icons/boxicons-regular";
import { Badges } from "revolt-api/types/Users";
import styled from "styled-components";
import styled from "styled-components/macro";

import { Localizer, Text } from "preact-i18n";

Expand Down
2 changes: 1 addition & 1 deletion src/components/common/user/UserHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Cog } from "@styled-icons/boxicons-solid";
import { observer } from "mobx-react-lite";
import { Link } from "react-router-dom";
import { User } from "revolt.js/dist/maps/Users";
import styled from "styled-components";
import styled from "styled-components/macro";

import { openContextMenu } from "preact-context-menu";
import { Text, Localizer } from "preact-i18n";
Expand Down
7 changes: 2 additions & 5 deletions src/components/common/user/UserHover.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { User } from "revolt.js/dist/maps/Users";
import styled from "styled-components";
import styled from "styled-components/macro";

import { Children } from "../../../types/Preact";
import Tooltip from "../Tooltip";
Expand Down Expand Up @@ -42,10 +42,7 @@ export default function UserHover({ user, children }: Props) {
placement="right-end"
content={
<Base>
<Username
className="username"
user={user}
/>
<Username className="username" user={user} />
<span className="status">
<UserStatus user={user} />
</span>
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/user/UserIcon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { useParams } from "react-router-dom";
import { Masquerade } from "revolt-api/types/Channels";
import { Presence } from "revolt-api/types/Users";
import { User } from "revolt.js/dist/maps/Users";
import styled, { css } from "styled-components";
import styled, { css } from "styled-components/macro";

import { useApplicationState } from "../../../mobx/State";

Expand Down
2 changes: 1 addition & 1 deletion src/components/common/user/UserShort.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { useParams } from "react-router-dom";
import { Masquerade } from "revolt-api/types/Channels";
import { User } from "revolt.js/dist/maps/Users";
import { Nullable } from "revolt.js/dist/util/null";
import styled from "styled-components";
import styled from "styled-components/macro";

import { Text } from "preact-i18n";

Expand Down
2 changes: 1 addition & 1 deletion src/components/native/Titlebar.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Wrench } from "@styled-icons/boxicons-solid";
import styled, { css } from "styled-components";
import styled, { css } from "styled-components/macro";

import UpdateIndicator from "../common/UpdateIndicator";

Expand Down
2 changes: 1 addition & 1 deletion src/components/navigation/BottomNavigation.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Message, Group, Compass } from "@styled-icons/boxicons-solid";
import { observer } from "mobx-react-lite";
import { useHistory, useLocation } from "react-router";
import styled, { css } from "styled-components";
import styled, { css } from "styled-components/macro";

import ConditionalLink from "../../lib/ConditionalLink";

Expand Down
2 changes: 1 addition & 1 deletion src/components/navigation/SidebarBase.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled, { css } from "styled-components";
import styled, { css } from "styled-components/macro";

import { isTouchscreenDevice } from "../../lib/isTouchscreenDevice";

Expand Down
2 changes: 1 addition & 1 deletion src/components/navigation/left/HomeSidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
import { observer } from "mobx-react-lite";
import { Link, useLocation, useParams } from "react-router-dom";
import { RelationshipStatus } from "revolt-api/types/Users";
import styled, { css } from "styled-components";
import styled, { css } from "styled-components/macro";

import { Text } from "preact-i18n";
import { useContext, useEffect } from "preact/hooks";
Expand Down
2 changes: 1 addition & 1 deletion src/components/navigation/left/ServerListSidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Cog, Compass } from "@styled-icons/boxicons-solid";
import { observer } from "mobx-react-lite";
import { Link, useHistory, useLocation, useParams } from "react-router-dom";
import { RelationshipStatus } from "revolt-api/types/Users";
import styled, { css } from "styled-components";
import styled, { css } from "styled-components/macro";

import { attachContextMenu } from "preact-context-menu";
import { Text } from "preact-i18n";
Expand Down
2 changes: 1 addition & 1 deletion src/components/navigation/left/ServerSidebar.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { observer } from "mobx-react-lite";
import { Redirect, useParams } from "react-router";
import { Server } from "revolt.js/dist/maps/Servers";
import styled, { css } from "styled-components";
import styled, { css } from "styled-components/macro";

import { attachContextMenu } from "preact-context-menu";
import { useEffect } from "preact/hooks";
Expand Down
2 changes: 1 addition & 1 deletion src/components/navigation/right/MemberList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Link } from "react-router-dom";
import { GroupedVirtuoso } from "react-virtuoso";
import { Channel } from "revolt.js/dist/maps/Channels";
import { User } from "revolt.js/dist/maps/Users";
import styled, { css } from "styled-components";
import styled, { css } from "styled-components/macro";

import { Text } from "preact-i18n";
import { memo } from "preact/compat";
Expand Down
2 changes: 1 addition & 1 deletion src/components/navigation/right/Search.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Link, useParams } from "react-router-dom";
import { Message as MessageI } from "revolt.js/dist/maps/Messages";
import styled from "styled-components";
import styled from "styled-components/macro";

import { Text } from "preact-i18n";
import { useEffect, useState } from "preact/hooks";
Expand Down
2 changes: 1 addition & 1 deletion src/components/settings/appearance/EmojiSelector.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from "styled-components";
import styled from "styled-components/macro";

import { Text } from "preact-i18n";

Expand Down
2 changes: 1 addition & 1 deletion src/components/settings/appearance/ThemeBaseSelector.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from "styled-components";
import styled from "styled-components/macro";

import { Text } from "preact-i18n";

Expand Down
2 changes: 1 addition & 1 deletion src/components/settings/appearance/ThemeOverrides.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Pencil } from "@styled-icons/boxicons-regular";
import { observer } from "mobx-react-lite";
import styled from "styled-components";
import styled from "styled-components/macro";

import { useDebounceCallback } from "../../../lib/debounce";

Expand Down
Loading

0 comments on commit 3fd56e4

Please sign in to comment.