From 3b165c42e9680b0816bb79ab7a6ccd4147475e40 Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Mon, 14 Mar 2022 12:02:12 -0500 Subject: [PATCH] ISSUE-068 - Now Styled-Components can self-label. Updated babel-plugin-styled-components to a new version that works. Added extra option to macros settings to not bother showing the file names. --- .eslintrc.json | 16 +++++++++++++++- package.json | 7 ++++++- .../BroadcastDirectorUI/Chyrons/styles.ts | 6 +----- src/components/Broadcast/VideoFeed/styles.ts | 5 +---- .../Chyrons/Container/styles.ts | 3 +-- .../BroadcastGraphics/Chyrons/Driver/styles.ts | 16 +--------------- .../Common/AngledFlag/styles.ts | 8 +------- .../Common/DriverNumber/styles.ts | 5 +---- .../Common/DriverPortrait/styles.ts | 3 +-- .../Common/PositionFlag/styles.ts | 4 +--- .../BroadcastGraphics/Common/Spacer.styled.ts | 3 +-- .../BroadcastGraphics/Common/TeamGem/styles.ts | 4 +--- .../Common/VenetianBlindsTransition/styles.ts | 4 +--- .../TimingBoard/StatusIndicator/styles.ts | 7 +------ .../TimingBoard/TimingTower/styles.ts | 17 +---------------- .../BroadcastGraphics/TimingBoard/styles.ts | 2 +- .../Common/FullScreenContainer.styled.ts | 3 +-- src/components/Common/IndexHeading.styled.ts | 2 +- .../Common/Inputs/ProgressSlider/styles.ts | 6 +----- .../Common/Inputs/SlotSelector/styles.ts | 6 +----- src/components/Common/Inputs/Toggle/styles.ts | 9 +-------- src/components/Common/LayoutGrid.styled.ts | 4 +--- src/components/Common/MenuItem.styled.ts | 2 +- src/components/Common/MockupBlock.styled.ts | 3 +-- src/components/Menu/Menu.tsx | 2 -- src/components/Menu/styles.ts | 4 +--- .../OverlayTool/OverlayDisplay/styles.ts | 6 +----- .../Workspaces/CustomWorkSpaces/styles.ts | 3 +-- .../ChyronPrototype/styles.ts | 3 +-- .../PrototypingControls/GridSelection/styles.ts | 2 +- .../TimingTowerPrototype/styles.ts | 2 +- src/components/Workspaces/Workspace/styles.ts | 5 +---- .../Workspaces/WorkspaceList/styles.ts | 3 +-- src/fonts/fonts.ts | 2 +- src/index.tsx | 2 +- src/shared/theme.ts | 2 +- src/utils/styling.ts | 2 +- yarn.lock | 16 +++++++++++----- 38 files changed, 66 insertions(+), 133 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index 7fc714a..11033c9 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -63,6 +63,20 @@ "as-needed" ], "react/jsx-uses-react": "off", - "react/react-in-jsx-scope": "off" + "react/react-in-jsx-scope": "off", + "no-restricted-imports": [ + "error", + { + "paths": [ + { + "name": "styled-components", + "message": "Please import from styled-components/macro." + } + ], + "patterns": [ + "!styled-components/macro" + ] + } + ] } } diff --git a/package.json b/package.json index 6498043..0a03793 100644 --- a/package.json +++ b/package.json @@ -74,8 +74,13 @@ "devDependencies": { "@typescript-eslint/eslint-plugin": "^5.7.0", "@typescript-eslint/parser": "^5.7.0", - "babel-plugin-styled-components": "^2.0.2", + "babel-plugin-styled-components": "^2.0.6", "eslint": "^8.4.1", "eslint-plugin-react": "^7.27.1" + }, + "babelMacros": { + "styledComponents": { + "fileName": false + } } } diff --git a/src/components/Broadcast/BroadcastDirectorUI/Chyrons/styles.ts b/src/components/Broadcast/BroadcastDirectorUI/Chyrons/styles.ts index 869a386..eb0c5d3 100644 --- a/src/components/Broadcast/BroadcastDirectorUI/Chyrons/styles.ts +++ b/src/components/Broadcast/BroadcastDirectorUI/Chyrons/styles.ts @@ -1,9 +1,8 @@ -import styled from "styled-components"; +import styled from "styled-components/macro"; export const Title = styled.h4` font-family: ${p => p.theme.fonts.f1Italic}; `; -Title.displayName = "Title"; type ButtonProps = { disabled: boolean, @@ -26,16 +25,13 @@ export const Button = styled.button` box-shadow: inset 0px 0px 10px 4px rgba(255, 255, 255, 0.8); } `; -Button.displayName = "Button"; export const OpenButton = styled(Button)` background-color: ${({ disabled }) => disabled ? p => p.theme.colors.disabledGreen : p => p.theme.colors.activeGreen}; `; -OpenButton.displayName = "OpenButton"; export const CloseButton = styled(Button)` background-color: ${({ disabled }) => disabled ? p => p.theme.colors.disabledRed : p => p.theme.colors.activeRed}; `; -CloseButton.displayName = "CloseButton"; diff --git a/src/components/Broadcast/VideoFeed/styles.ts b/src/components/Broadcast/VideoFeed/styles.ts index ee129da..ef4e844 100644 --- a/src/components/Broadcast/VideoFeed/styles.ts +++ b/src/components/Broadcast/VideoFeed/styles.ts @@ -1,4 +1,4 @@ -import styled, { css } from "styled-components"; +import styled, { css } from "styled-components/macro"; type VideoFeedFrameProps = { centered?: boolean, @@ -19,14 +19,12 @@ export const VideoFeedFrame = styled.div` } `} `; -VideoFeedFrame.displayName = "VideoFeedFrame"; export const BackgroundImage = styled.img` height: 100%; max-width: 100%; object-fit: contain; `; -BackgroundImage.displayName = "BackgroundImage"; type BackgroundImageDivProps = { src: string, @@ -39,4 +37,3 @@ export const BackgroundImageDiv = styled.div` background-repeat: no-repeat; background-position: 0% 50%; `; -BackgroundImageDiv.displayName = "BackgroundImageDiv"; diff --git a/src/components/BroadcastGraphics/Chyrons/Container/styles.ts b/src/components/BroadcastGraphics/Chyrons/Container/styles.ts index 25d1963..7ce6563 100644 --- a/src/components/BroadcastGraphics/Chyrons/Container/styles.ts +++ b/src/components/BroadcastGraphics/Chyrons/Container/styles.ts @@ -1,8 +1,7 @@ -import styled from "styled-components"; +import styled from "styled-components/macro"; export const DoubleChyronContainer = styled.div` display: flex; justify-content: space-between; width: 1196px; `; -DoubleChyronContainer.displayName = "DoubleChyronContainer"; diff --git a/src/components/BroadcastGraphics/Chyrons/Driver/styles.ts b/src/components/BroadcastGraphics/Chyrons/Driver/styles.ts index 23b5198..6a36409 100644 --- a/src/components/BroadcastGraphics/Chyrons/Driver/styles.ts +++ b/src/components/BroadcastGraphics/Chyrons/Driver/styles.ts @@ -1,5 +1,5 @@ import { animated } from "@react-spring/web"; -import styled, { css, keyframes } from "styled-components"; +import styled, { css, keyframes } from "styled-components/macro"; import { Placement, Px, TransitionArgs } from "../../../../types/style"; import { Milliseconds } from "../../../../types/util"; @@ -21,7 +21,6 @@ export const AnimatedBaseContainer = animated(styled.div `${width}px`}; height: ${({ height }) => `${height}px`}; `); -AnimatedBaseContainer.displayName = "AnimatedBaseContainer"; const BaseShape = styled.div` position: absolute; @@ -44,7 +43,6 @@ export const AnimatedBaseOutline = animated(styled(BaseShape) commonTransition(transitionProps)} `); -AnimatedBaseOutline.displayName = "AnimatedBaseOutline"; export const BaseBlack = styled(BaseShape)` opacity: ${({ open }) => open ? 1 : 0.1}; @@ -54,7 +52,6 @@ export const BaseBlack = styled(BaseShape)` ${({ transitionProps }) => commonTransition(transitionProps)} `; -BaseBlack.displayName = "BaseBlack"; type BaseBackgroundColorProps = { teamColor: string, @@ -67,7 +64,6 @@ export const BaseBackgroundColor = styled(BaseShape) commonTransition(transitionProps)} `; -BaseBackgroundColor.displayName = "BaseBackgroundColor"; export const BaseLayout = styled(BaseShape)` position: absolute; @@ -85,7 +81,6 @@ export const BaseLayout = styled(BaseShape)` ${({ transitionProps }) => commonTransition(transitionProps)} `; -BaseLayout.displayName = "BaseLayout"; type TeamColorBarProps = { color: string, @@ -105,7 +100,6 @@ export const TeamColorBar = styled.div` ${({ transitionProps }) => commonTransition(transitionProps)} `; -TeamColorBar.displayName = "TeamColorBar"; export const TextContainer = styled.div` position: relative; @@ -114,20 +108,17 @@ export const TextContainer = styled.div` height: 100%; `; -TextContainer.displayName = "TextContainer"; export const NameContainer = styled.div` position: relative; top: 5px; `; -NameContainer.displayName = "NameContainer"; export const FirstName = styled.span` font-family: ${p => p.theme.fonts.f1Regular}; color: #fff; font-size: 25px; `; -FirstName.displayName = "FirstName"; export const LastName = styled.span` font-family: ${p => p.theme.fonts.f1Bold}; @@ -136,7 +127,6 @@ export const LastName = styled.span` font-size: 25px; margin-left: 5px; `; -LastName.displayName = "LastName"; export const NumberContainer = styled.div` position: relative; @@ -145,7 +135,6 @@ export const NumberContainer = styled.div` bottom: 3px; left: 10px; `; -NumberContainer.displayName = "NumberContainer"; const blinkingAnimation = keyframes` 0% { opacity: 0.4 } @@ -169,7 +158,6 @@ export const TeamName = styled.div` animation: ${blinkingAnimation} ${duration}ms step-end ${delay}ms; `} `; -TeamName.displayName = "TeamName"; type FlagContainerProps = { height: Px, @@ -194,7 +182,6 @@ export const FlagContainer = styled.div` ${({ transitionProps }) => commonTransition(transitionProps)} `; -FlagContainer.displayName = "FlagContainer"; type DriverPortraitContainerProps = TransitionProps & { placement: Placement, @@ -207,4 +194,3 @@ export const DriverPortraitContainer = styled.div` opacity: ${({ open }) => open ? 1 : 0}; ${({ transitionProps }) => commonTransition(transitionProps)} `; -DriverPortraitContainer.displayName = "DriverPortraitContainer"; diff --git a/src/components/BroadcastGraphics/Common/AngledFlag/styles.ts b/src/components/BroadcastGraphics/Common/AngledFlag/styles.ts index 1d3012c..3cb59b9 100644 --- a/src/components/BroadcastGraphics/Common/AngledFlag/styles.ts +++ b/src/components/BroadcastGraphics/Common/AngledFlag/styles.ts @@ -1,4 +1,4 @@ -import styled, { css } from "styled-components"; +import styled, { css } from "styled-components/macro"; import { TeamFlagStyle } from "../../../../domain/data/teams"; import { Px } from "../../../../types/style"; @@ -25,7 +25,6 @@ export const Container = styled.div` transparent 100% ); `; -Container.displayName = "Container"; type FlagContainerProps = { height: Px, @@ -68,7 +67,6 @@ export const FlagContainer = styled.div` ); `} `; -FlagContainer.displayName = "FlagContainer"; type FlagDivBaseProps = { src: string, @@ -92,7 +90,6 @@ export const CountryFlagDiv = styled(FlagDivBase)` ? css`background-position: center;` : css`background-position-x: ${xOffset}px`} `; -CountryFlagDiv.displayName = "CountryFlagDiv"; type TeamFlagDivProps = { style: TeamFlagStyle, @@ -156,7 +153,6 @@ export const Sheen = styled.div` border-left: 0.015em solid rgba(255, 255, 255, 0.1); `; -Sheen.displayName = "Sheen"; export const Slant = styled.div` position: absolute; @@ -166,7 +162,6 @@ export const Slant = styled.div` background: #1a1a28; transform: skewX(-45deg) translateX(${({ x = 0 }) => `${x}px`}); `; -Slant.displayName = "Slant"; export const FlagEdge = styled.div` position: absolute; @@ -184,4 +179,3 @@ export const FlagEdge = styled.div` black 100% ); `; -FlagEdge.displayName = "FlagEdge"; diff --git a/src/components/BroadcastGraphics/Common/DriverNumber/styles.ts b/src/components/BroadcastGraphics/Common/DriverNumber/styles.ts index 620c90c..1e3218d 100644 --- a/src/components/BroadcastGraphics/Common/DriverNumber/styles.ts +++ b/src/components/BroadcastGraphics/Common/DriverNumber/styles.ts @@ -1,10 +1,9 @@ -import styled from "styled-components"; +import styled from "styled-components/macro"; export const NumberContainer = styled.div` position: relative; display: inline; `; -NumberContainer.displayName = "NumberContainer"; type NumberProps = { fontFamily: string, @@ -24,7 +23,6 @@ export const StrokeNumber = styled.span` -webkit-text-stroke-color: ${({ strokeColor }) => strokeColor}; -webkit-text-stroke-width: ${({ strokeWidth }) => strokeWidth}; `; -StrokeNumber.displayName = "StrokeNumber"; type ShadowNumberProps = NumberProps & { shadowProperties: string, @@ -37,4 +35,3 @@ export const ShadowNumber = styled.span` text-shadow: ${({ shadowProperties }) => shadowProperties}; `; -ShadowNumber.displayName = "ShadowNumber"; diff --git a/src/components/BroadcastGraphics/Common/DriverPortrait/styles.ts b/src/components/BroadcastGraphics/Common/DriverPortrait/styles.ts index f509334..6ee9639 100644 --- a/src/components/BroadcastGraphics/Common/DriverPortrait/styles.ts +++ b/src/components/BroadcastGraphics/Common/DriverPortrait/styles.ts @@ -1,4 +1,4 @@ -import styled from "styled-components"; +import styled from "styled-components/macro"; import { Percent, Px } from "../../../../types/style"; @@ -26,4 +26,3 @@ export const PortraitDiv = styled.div` mask-repeat: no-repeat; mask-position: var(--position); `; -PortraitDiv.displayName = "PortraitDiv"; diff --git a/src/components/BroadcastGraphics/Common/PositionFlag/styles.ts b/src/components/BroadcastGraphics/Common/PositionFlag/styles.ts index 22967a5..a81cf28 100644 --- a/src/components/BroadcastGraphics/Common/PositionFlag/styles.ts +++ b/src/components/BroadcastGraphics/Common/PositionFlag/styles.ts @@ -1,4 +1,4 @@ -import styled from "styled-components"; +import styled from "styled-components/macro"; import { Px } from "../../../../types/style"; type PositionFlagBoxProps = { @@ -17,7 +17,6 @@ export const PositionFlagBox = styled.div` align-items: center; justify-content: center; `; -PositionFlagBox.displayName = "PositionFlagBox"; type PositionNumberProps = { size: Px, @@ -29,4 +28,3 @@ export const PositionNumber = styled.span` color: ${({ color }) => color}; margin-top: 2px; `; -PositionNumber.displayName = "PositionNumber"; diff --git a/src/components/BroadcastGraphics/Common/Spacer.styled.ts b/src/components/BroadcastGraphics/Common/Spacer.styled.ts index 2bd1888..1eb9afb 100644 --- a/src/components/BroadcastGraphics/Common/Spacer.styled.ts +++ b/src/components/BroadcastGraphics/Common/Spacer.styled.ts @@ -1,4 +1,4 @@ -import styled from "styled-components"; +import styled from "styled-components/macro"; type SpacerProps = { width?: string, @@ -8,4 +8,3 @@ export const Spacer = styled.div` width: ${({ width = "0" }) => width}; height: ${({ height = "0" }) => height}; `; -Spacer.displayName = "Spacer"; diff --git a/src/components/BroadcastGraphics/Common/TeamGem/styles.ts b/src/components/BroadcastGraphics/Common/TeamGem/styles.ts index 02ad60b..10c695a 100644 --- a/src/components/BroadcastGraphics/Common/TeamGem/styles.ts +++ b/src/components/BroadcastGraphics/Common/TeamGem/styles.ts @@ -1,4 +1,4 @@ -import styled from "styled-components"; +import styled from "styled-components/macro"; import { TeamGemStyle } from "../../../../domain/data/teams"; import { Px } from "../../../../types/style"; @@ -20,7 +20,6 @@ export const GemContainer = styled.div` mask-image: linear-gradient(to left, black 0%, black 80%, transparent 100%); clip-path: polygon(40% 0, 100% 0, 100% 100%, 0 100%, 0 50%); `; -GemContainer.displayName = "GemContainer"; type GemColorDivProps = { height: Px, @@ -57,4 +56,3 @@ export const GemLogoDiv = styled.div` )}; background-repeat: no-repeat; `; -GemLogoDiv.displayName = "GemDiv"; diff --git a/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/styles.ts b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/styles.ts index 73169a7..28d2b31 100644 --- a/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/styles.ts +++ b/src/components/BroadcastGraphics/Common/VenetianBlindsTransition/styles.ts @@ -1,5 +1,5 @@ import { animated } from "@react-spring/web"; -import styled, { css, keyframes } from "styled-components"; +import styled, { css, keyframes } from "styled-components/macro"; import { Degrees, Px } from "../../../../types/style"; import { Milliseconds } from "../../../../types/util"; @@ -58,7 +58,5 @@ export const VenetianBlindsFilter = styled.div` : null) } `; -VenetianBlindsFilter.displayName = "VenetianBlindsFilter"; export const AnimatedVenetianBlindsFilter = animated(VenetianBlindsFilter); -AnimatedVenetianBlindsFilter.displayName = "AnimatedVenetianBlindsFilter"; diff --git a/src/components/BroadcastGraphics/TimingBoard/StatusIndicator/styles.ts b/src/components/BroadcastGraphics/TimingBoard/StatusIndicator/styles.ts index 55354ea..1da5712 100644 --- a/src/components/BroadcastGraphics/TimingBoard/StatusIndicator/styles.ts +++ b/src/components/BroadcastGraphics/TimingBoard/StatusIndicator/styles.ts @@ -1,4 +1,4 @@ -import styled from "styled-components"; +import styled from "styled-components/macro"; import { BGStatusIndicatorModes } from "../../../../types/state"; import { DirectionalTransitionProps } from "../../../../types/style"; @@ -15,7 +15,6 @@ export const StatusIndicatorBase = styled.div` ${({ open, transitionOpeningProps, transitionClosingProps, transitionProps }) => commonDirectionalTransition(open, transitionOpeningProps, transitionClosingProps, transitionProps)} `; -StatusIndicatorBase.displayName = "StatusIndicatorBase"; export const StatusIndicatorLayout = styled.div` @@ -23,7 +22,6 @@ export const StatusIndicatorLayout = styled.div` width: 100%; height: 100%; `; -StatusIndicatorLayout.displayName = "StatusIndicatorLayout"; type IndicatorModeProps = { mode: BGStatusIndicatorModes, @@ -64,7 +62,6 @@ export const LapLine = styled.div` ${({ open, transitionOpeningProps, transitionClosingProps, transitionProps }) => commonDirectionalTransition(open, transitionOpeningProps, transitionClosingProps, transitionProps)} `; -LapLine.displayName = "LapLine"; type LapLabelProps = DirectionalTransitionProps & IndicatorModeProps; @@ -84,7 +81,6 @@ export const LapLabel = styled.span` ${({ open, transitionOpeningProps, transitionClosingProps, transitionProps }) => commonDirectionalTransition(open, transitionOpeningProps, transitionClosingProps, transitionProps)} `; -LapLabel.displayName = "LapLabel"; type LapCountProps = DirectionalTransitionProps & IndicatorModeProps; @@ -117,4 +113,3 @@ export const LapCount = styled.div` ${({ open, transitionOpeningProps, transitionClosingProps, transitionProps }) => commonDirectionalTransition(open, transitionOpeningProps, transitionClosingProps, transitionProps)} `; -LapCount.displayName = "LapCount"; diff --git a/src/components/BroadcastGraphics/TimingBoard/TimingTower/styles.ts b/src/components/BroadcastGraphics/TimingBoard/TimingTower/styles.ts index 715e4da..d09dcca 100644 --- a/src/components/BroadcastGraphics/TimingBoard/TimingTower/styles.ts +++ b/src/components/BroadcastGraphics/TimingBoard/TimingTower/styles.ts @@ -1,4 +1,4 @@ -import styled, { css } from "styled-components"; +import styled, { css } from "styled-components/macro"; import { animated } from "@react-spring/web"; import { @@ -33,7 +33,6 @@ export const RowsContainer = styled.div` ${({ open, transitionOpeningProps, transitionClosingProps, transitionProps }) => commonDirectionalTransition(open, transitionOpeningProps, transitionClosingProps, transitionProps)} `; -RowsContainer.displayName = "RowsContainer"; type AnimatedRowContainerProps = { retired?: boolean, @@ -59,7 +58,6 @@ export const AnimatedRowContainer = animated(styled.div.attrs retired && css`opacity: 0.7;`} `); -AnimatedRowContainer.displayName = "AnimatedRowContainer"; type RoundedProp = { roundedCornerTop?: Px, @@ -86,7 +84,6 @@ export const RowLeftHalf = styled(Rounded)` ${({ open, transitionOpeningProps, transitionClosingProps, transitionProps }) => commonDirectionalTransition(open, transitionOpeningProps, transitionClosingProps, transitionProps)} `; -RowLeftHalf.displayName = "RowLeftHalf"; type AnimatedRowLeftHalfOutlineProps = DirectionalTransitionProps & { startThickness: Px, @@ -110,7 +107,6 @@ export const AnimatedRowLeftHalfOutline = animated(styled(Rounded) commonDirectionalTransition(open, transitionOpeningProps, transitionClosingProps, transitionProps)} `); -AnimatedRowLeftHalfOutline.displayName = "AnimatedRowLeftHalfOutline"; export const RowLeftHalfLayout = styled.div` position: relative; @@ -123,7 +119,6 @@ export const RowLeftHalfLayout = styled.div` align-items: center; justify-content: flex-start; `; -RowLeftHalfLayout.displayName = "RowLeftHalfLayout"; type RowLeftHalfPosFlagContainerProps = { size: Px, @@ -133,7 +128,6 @@ export const RowLeftHalfPosFlagContainer = styled.div size}px; width: ${({ size }) => size}px; `; -RowLeftHalfPosFlagContainer.displayName = "RowLeftHalfPosFlagContainer"; export const RowLeftHalfPosFlagChangeContainer = styled.div` position: absolute; @@ -142,7 +136,6 @@ export const RowLeftHalfPosFlagChangeContainer = styled.div` opacity: ${({ open }) => open ? 1 : 0}; `; -RowLeftHalfPosFlagChangeContainer.displayName = "RowLeftHalfPosFlagChangeContainer"; export const RowLeftHalfGemContainer = styled.div` position: absolute; @@ -150,7 +143,6 @@ export const RowLeftHalfGemContainer = styled.div` top: 0; margin-top: 2px; `; -RowLeftHalfGemContainer.displayName = "RowLeftHalfGemContainer"; type RowRightHalfProps = DirectionalTransitionProps & { hugRight: boolean, @@ -176,7 +168,6 @@ export const RowRightHalf = styled(Rounded)` ${({ open, transitionOpeningProps, transitionClosingProps, transitionProps }) => commonDirectionalTransition(open, transitionOpeningProps, transitionClosingProps, transitionProps)} `; -RowRightHalf.displayName = "RowRightHalf"; export const RowRightHalfLayout = styled.div` width: 100%; @@ -188,14 +179,12 @@ export const RowRightHalfLayout = styled.div` justify-content: flex-end; padding-right: 8px; `; -RowRightHalfLayout.displayName = "RowRightHalfLayout"; export const DriverNameContainer = styled.div` position: relative; margin-left: ${p => p.theme.design.timingTower.nameLeftMarginPx}px; margin-top: ${p => p.theme.design.timingTower.nameTopMarginPx}px; `; -DriverNameContainer.displayName = "DriverNameContainer"; export const DriverName = styled.span` position: absolute; @@ -211,7 +200,6 @@ export const DriverName = styled.span` ${({ open, transitionOpeningProps, transitionClosingProps, transitionProps }) => commonDirectionalTransition(open, transitionOpeningProps, transitionClosingProps, transitionProps)} `; -DriverName.displayName = "DriverName"; export const DriverNameWipe = styled.div` width: ${({ open }) => open ? 800 : 200}px; @@ -224,7 +212,6 @@ export const DriverNameWipe = styled.div` ${({ open, transitionOpeningProps, transitionClosingProps, transitionProps }) => commonDirectionalTransition(open, transitionOpeningProps, transitionClosingProps, transitionProps)} `; -DriverNameWipe.displayName = "DriverNameWipe"; type TimeDiffProps = DirectionalTransitionProps & { xScale: Fraction, @@ -245,7 +232,6 @@ export const TimeDiff = styled.span` ${({ open, transitionOpeningProps, transitionClosingProps, transitionProps }) => commonDirectionalTransition(open, transitionOpeningProps, transitionClosingProps, transitionProps)} `; -TimeDiff.displayName = "TimeDiff"; export const FastestLapContainer = styled.div` position: absolute; @@ -275,4 +261,3 @@ export const FastestLapGem = styled.div` ${({ transitionProps }) => commonTransition(transitionProps)} `; -FastestLapGem.displayName = "FastestLapGem"; diff --git a/src/components/BroadcastGraphics/TimingBoard/styles.ts b/src/components/BroadcastGraphics/TimingBoard/styles.ts index 480b8a2..347222d 100644 --- a/src/components/BroadcastGraphics/TimingBoard/styles.ts +++ b/src/components/BroadcastGraphics/TimingBoard/styles.ts @@ -1,4 +1,4 @@ -import styled from "styled-components"; +import styled from "styled-components/macro"; export const TimingBoardLayout = styled.div` position: relative; diff --git a/src/components/Common/FullScreenContainer.styled.ts b/src/components/Common/FullScreenContainer.styled.ts index 0173b27..310467d 100644 --- a/src/components/Common/FullScreenContainer.styled.ts +++ b/src/components/Common/FullScreenContainer.styled.ts @@ -1,4 +1,4 @@ -import styled from "styled-components"; +import styled from "styled-components/macro"; type FullScreenContainerProps = { minHeight?: number, @@ -25,4 +25,3 @@ export const FullScreenContainer = styled.div` overflow-y: var(--overflowY); overflow-x: var(--overflowX); `; -FullScreenContainer.displayName = "FullScreenContainer"; diff --git a/src/components/Common/IndexHeading.styled.ts b/src/components/Common/IndexHeading.styled.ts index 8685a64..3745d20 100644 --- a/src/components/Common/IndexHeading.styled.ts +++ b/src/components/Common/IndexHeading.styled.ts @@ -1,4 +1,4 @@ -import styled from "styled-components"; +import styled from "styled-components/macro"; export const IndexHeading = styled.div` font-family: ${p => p.theme.fonts.f1Bold}; diff --git a/src/components/Common/Inputs/ProgressSlider/styles.ts b/src/components/Common/Inputs/ProgressSlider/styles.ts index 4ece8dd..ee79d20 100644 --- a/src/components/Common/Inputs/ProgressSlider/styles.ts +++ b/src/components/Common/Inputs/ProgressSlider/styles.ts @@ -1,5 +1,5 @@ import { animated } from "@react-spring/web"; -import styled from "styled-components"; +import styled from "styled-components/macro"; export const ProgressSliderBody = styled.div` position: relative; @@ -32,10 +32,8 @@ export const ProgressSliderBar = styled.div` )}; transition: background-color 0.2s ease; `; -ProgressSliderBar.displayName = "ProgressSliderBar"; export const AnimatedProgressSliderBar = animated(ProgressSliderBar); -AnimatedProgressSliderBar.displayName = "AnimatedProgressSliderBar"; type ProgressSliderBarHandleProps = { color?: string, @@ -61,7 +59,6 @@ export const ProgressSliderBarHandle = styled.div` opacity: 0.8; } `; -ProgressSliderBarHandle.displayName = "ProgressSliderBarHandle"; type ProgressSliderBarIndicatorProps = { left: number, @@ -90,4 +87,3 @@ export const ProgressSliderBarIndicator = styled.span` white-space: nowrap; text-overflow: ellipsis; `; -SlotWindow.displayName = "SlotWindow"; export const SlotText = styled.span` position: absolute; @@ -34,13 +33,10 @@ export const SlotText = styled.span` color: ${p => p.theme.colors.darkGrey}; user-select: none; `; -SlotText.displayName = "SlotText"; export const AnimatedSlotText = animated(SlotText); -AnimatedSlotText.displayName = "AnimatedSlotText"; export const SelectorLabel = styled.span` font-family: ${p => p.theme.fonts.f1Regular}; font-size: ${p => p.theme.fontSizes.label}; `; -SelectorLabel.displayName = "SelectorLabel"; diff --git a/src/components/Common/Inputs/Toggle/styles.ts b/src/components/Common/Inputs/Toggle/styles.ts index 5be4f32..583a082 100644 --- a/src/components/Common/Inputs/Toggle/styles.ts +++ b/src/components/Common/Inputs/Toggle/styles.ts @@ -1,4 +1,4 @@ -import styled, { css } from "styled-components"; +import styled, { css } from "styled-components/macro"; type ToggleContainerProps = { fontSize?: string; @@ -8,26 +8,22 @@ export const ToggleContainer = styled.div` align-items: flex-end; font-size: ${({ fontSize = "inherit" }) => fontSize}; `; -ToggleContainer.displayName = "ToggleContainer"; export const ToggleBody = styled.div` position: relative; display: inline-block; text-align: left; `; -ToggleBody.displayName = "ToggleBody"; export const ToggleInput = styled.input` display: none; `; -ToggleInput.displayName = "ToggleInput"; export const ToggleLabelText = styled.span` margin-right: 1ch; font-family: ${p => p.theme.fonts.f1Regular}; font-size: ${p => p.theme.fontSizes.label}; `; -ToggleLabelText.displayName = "ToggleLabelText"; export const ToggleLabel = styled.label` display: block; @@ -37,7 +33,6 @@ export const ToggleLabel = styled.label` width: 2.7em; cursor: pointer; `; -ToggleLabel.displayName = "ToggleLabel"; type ToggleBackgroundProps = { toggled: boolean, @@ -81,7 +76,6 @@ export const ToggleBackground = styled.div` } `)} `; -ToggleBackground.displayName = "ToggleBackground"; type ToggleCircleProps = { toggled: boolean, @@ -97,4 +91,3 @@ export const ToggleCircle = styled.div` top: 0; ${({ toggled }) => toggled ? css`right: 0;` : css`left: 0;`} `; -ToggleCircle.displayName = "ToggleCircle"; diff --git a/src/components/Common/LayoutGrid.styled.ts b/src/components/Common/LayoutGrid.styled.ts index cc8bd40..e3caced 100644 --- a/src/components/Common/LayoutGrid.styled.ts +++ b/src/components/Common/LayoutGrid.styled.ts @@ -1,4 +1,4 @@ -import styled from "styled-components"; +import styled from "styled-components/macro"; type SizeProp = number | Array; @@ -36,7 +36,6 @@ export const LayoutGrid = styled.div` height: calc(100% - ${({ headerOffset = 0 }) => headerOffset}px); width: 100%; `; -LayoutGrid.displayName = "LayoutGrid"; type LayoutGridItemProps = { column: number, @@ -50,4 +49,3 @@ export const LayoutGridItem = styled.div` grid-row: ${({ row }) => row} / span ${({ rowSpan = 1 }) => rowSpan};; `; -LayoutGridItem.displayName = "LayoutGridItem"; diff --git a/src/components/Common/MenuItem.styled.ts b/src/components/Common/MenuItem.styled.ts index 2ed6020..07f9cd8 100644 --- a/src/components/Common/MenuItem.styled.ts +++ b/src/components/Common/MenuItem.styled.ts @@ -1,4 +1,4 @@ -import styled, { css } from "styled-components"; +import styled, { css } from "styled-components/macro"; import { PadBox } from "@bedrock-layout/padbox"; const hoverRules = css` diff --git a/src/components/Common/MockupBlock.styled.ts b/src/components/Common/MockupBlock.styled.ts index 135599b..cb0c90e 100644 --- a/src/components/Common/MockupBlock.styled.ts +++ b/src/components/Common/MockupBlock.styled.ts @@ -1,4 +1,4 @@ -import styled from "styled-components"; +import styled from "styled-components/macro"; type MockupBlockProps = { color: string, @@ -16,4 +16,3 @@ export const MockupBlock = styled.div` background-color: ${({ color }) => color}; padding: 0.3em; `; -MockupBlock.displayName = "MockupBlock"; diff --git a/src/components/Menu/Menu.tsx b/src/components/Menu/Menu.tsx index d5c68f3..a14321a 100644 --- a/src/components/Menu/Menu.tsx +++ b/src/components/Menu/Menu.tsx @@ -21,7 +21,6 @@ export const MainMenu = React.forwardRef( /> ), ); -MainMenu.displayName = "MainMenu"; type MenuProps = { links: Array<{label: string, to: string}>, @@ -56,7 +55,6 @@ const Menu = React.forwardRef( ); }, ); -Menu.displayName = "Menu"; type MenuNavLinkProps = { to: string, diff --git a/src/components/Menu/styles.ts b/src/components/Menu/styles.ts index 5dee8cb..7a2c71c 100644 --- a/src/components/Menu/styles.ts +++ b/src/components/Menu/styles.ts @@ -1,11 +1,10 @@ import { InlineCluster } from "@bedrock-layout/inline-cluster"; import { PadBox } from "@bedrock-layout/padbox"; -import styled from "styled-components"; +import styled from "styled-components/macro"; export const Title = styled.h3` font-family: ${p => p.theme.fonts.f1Bold}; `; -Title.displayName = "Title"; export const MenuBar = styled(InlineCluster).attrs(() => ({ as: PadBox, @@ -17,4 +16,3 @@ export const MenuBar = styled(InlineCluster).attrs(() => ({ background-image: linear-gradient(to right, #f0f0f0, #fff); border-block-end: 1px solid ${p => p.theme.colors.darkGrey}; `; -MenuBar.displayName = "MenuBar"; diff --git a/src/components/OverlayTool/OverlayDisplay/styles.ts b/src/components/OverlayTool/OverlayDisplay/styles.ts index dad59bd..c6ce769 100644 --- a/src/components/OverlayTool/OverlayDisplay/styles.ts +++ b/src/components/OverlayTool/OverlayDisplay/styles.ts @@ -1,4 +1,4 @@ -import styled from "styled-components"; +import styled from "styled-components/macro"; /** * scale is a percentage (0-100%) @@ -20,7 +20,6 @@ export const OverlayImage = styled.img.attrs(({ outline-offset: -2px; } `; -OverlayImage.displayName = "OverlayImage"; type OverlayImageContainerProps = { opacity: number, @@ -41,12 +40,10 @@ export const OverlayImageContainer = styled.div.attrs` border-radius: 15px; `; -BasicBlock.displayName = "BasicBlock"; diff --git a/src/components/Workspaces/PrototypingControls/ChyronPrototype/styles.ts b/src/components/Workspaces/PrototypingControls/ChyronPrototype/styles.ts index 6f0499e..12048d1 100644 --- a/src/components/Workspaces/PrototypingControls/ChyronPrototype/styles.ts +++ b/src/components/Workspaces/PrototypingControls/ChyronPrototype/styles.ts @@ -1,7 +1,6 @@ -import styled from "styled-components"; +import styled from "styled-components/macro"; export const ChyronControlsContainer = styled.div` width: 420px; height: auto; `; -ChyronControlsContainer.displayName = "ChyronControlsContainer"; diff --git a/src/components/Workspaces/PrototypingControls/GridSelection/styles.ts b/src/components/Workspaces/PrototypingControls/GridSelection/styles.ts index 88f8bb6..30e1bff 100644 --- a/src/components/Workspaces/PrototypingControls/GridSelection/styles.ts +++ b/src/components/Workspaces/PrototypingControls/GridSelection/styles.ts @@ -1,5 +1,5 @@ import { PadBox } from "@bedrock-layout/padbox"; -import styled from "styled-components"; +import styled from "styled-components/macro"; type GridItemProps = { selected: boolean, diff --git a/src/components/Workspaces/PrototypingControls/TimingTowerPrototype/styles.ts b/src/components/Workspaces/PrototypingControls/TimingTowerPrototype/styles.ts index 886a9ad..01a3db4 100644 --- a/src/components/Workspaces/PrototypingControls/TimingTowerPrototype/styles.ts +++ b/src/components/Workspaces/PrototypingControls/TimingTowerPrototype/styles.ts @@ -1,4 +1,4 @@ -import styled from "styled-components"; +import styled from "styled-components/macro"; export const ClickSpan = styled.span` font-family: ${p => p.theme.fonts.f1Bold}; diff --git a/src/components/Workspaces/Workspace/styles.ts b/src/components/Workspaces/Workspace/styles.ts index 8cadbac..ec6a893 100644 --- a/src/components/Workspaces/Workspace/styles.ts +++ b/src/components/Workspaces/Workspace/styles.ts @@ -1,4 +1,4 @@ -import styled, { css, keyframes } from "styled-components"; +import styled, { css, keyframes } from "styled-components/macro"; import { PadBox } from "@bedrock-layout/padbox"; import { Dimensions } from "../../../types/state"; @@ -35,7 +35,6 @@ export const PreviewWindow = styled.div` animation: ${scrollAnimation} 5s linear infinite; `} `; -PreviewWindow.displayName = "PreviewWindow"; export const H2 = styled.h2` margin: 0.2em; @@ -43,7 +42,6 @@ export const H2 = styled.h2` font-family: ${p => p.theme.fonts.f1Regular}; max-inline-size: 600px; `; -H2.displayName = "H2"; export const ControlsContainer = styled(PadBox).attrs(() => ({ padding: "lg", @@ -53,4 +51,3 @@ export const ControlsContainer = styled(PadBox).attrs(() => ({ width: 800px; margin-bottom: 1em; `; -ControlsContainer.displayName = "ControlsContainer"; diff --git a/src/components/Workspaces/WorkspaceList/styles.ts b/src/components/Workspaces/WorkspaceList/styles.ts index 9e1f838..2a0d33e 100644 --- a/src/components/Workspaces/WorkspaceList/styles.ts +++ b/src/components/Workspaces/WorkspaceList/styles.ts @@ -1,4 +1,4 @@ -import styled from "styled-components"; +import styled from "styled-components/macro"; import { PadBox } from "@bedrock-layout/padbox"; type WorkspaceListBoxProps = { @@ -13,4 +13,3 @@ export const WorkspaceListBox = styled(PadBox).attrs(() => ({ border-right: 1px solid ${p => p.theme.colors.darkGrey}; overflow-y: scroll; `; -WorkspaceListBox.displayName = "WorkspaceListBox"; diff --git a/src/fonts/fonts.ts b/src/fonts/fonts.ts index 846e9a9..14a31a1 100644 --- a/src/fonts/fonts.ts +++ b/src/fonts/fonts.ts @@ -1,4 +1,4 @@ -import { createGlobalStyle } from "styled-components"; +import { createGlobalStyle } from "styled-components/macro"; import Formula1RegularWoff2 from "./Formula1-Regular.woff2"; import Formula1RegularTTF from "./Formula1-Regular.ttf"; diff --git a/src/index.tsx b/src/index.tsx index ef2c845..7e3ba9e 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -2,7 +2,7 @@ import React from "react"; import ReactDOM from "react-dom"; import { Provider } from "react-redux"; import { BrowserRouter, Route, Routes } from "react-router-dom"; -import { ThemeProvider } from "styled-components"; +import { ThemeProvider } from "styled-components/macro"; import "./clear.css"; diff --git a/src/shared/theme.ts b/src/shared/theme.ts index ca32eb4..5e6536e 100644 --- a/src/shared/theme.ts +++ b/src/shared/theme.ts @@ -1,4 +1,4 @@ -import { createGlobalStyle, ThemeProps } from "styled-components"; +import { createGlobalStyle, ThemeProps } from "styled-components/macro"; export const theme = { fonts: { diff --git a/src/utils/styling.ts b/src/utils/styling.ts index 34ecfa1..82f833c 100644 --- a/src/utils/styling.ts +++ b/src/utils/styling.ts @@ -1,4 +1,4 @@ -import { css }from "styled-components"; +import { css }from "styled-components/macro"; import { clamp } from "lodash"; import { Corner, Fraction, Placement, Px, TransitionArgs } from "../types/style"; diff --git a/yarn.lock b/yarn.lock index f94d5da..b202fd9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2877,15 +2877,16 @@ babel-plugin-polyfill-regenerator@^0.3.0: dependencies: "@babel/helper-define-polyfill-provider" "^0.3.0" -"babel-plugin-styled-components@>= 1.12.0", babel-plugin-styled-components@^2.0.2: - version "2.0.2" - resolved "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-2.0.2.tgz" - integrity sha512-7eG5NE8rChnNTDxa6LQfynwgHTVOYYaHJbUYSlOhk8QBXIQiMBKq4gyfHBBKPrxUcVBXVJL61ihduCpCQbuNbw== +"babel-plugin-styled-components@>= 1.12.0", babel-plugin-styled-components@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-2.0.6.tgz#6f76c7f7224b7af7edc24a4910351948c691fc90" + integrity sha512-Sk+7o/oa2HfHv3Eh8sxoz75/fFvEdHsXV4grdeHufX0nauCmymlnN0rGhIvfpMQSJMvGutJ85gvCGea4iqmDpg== dependencies: "@babel/helper-annotate-as-pure" "^7.16.0" "@babel/helper-module-imports" "^7.16.0" babel-plugin-syntax-jsx "^6.18.0" lodash "^4.17.11" + picomatch "^2.3.0" babel-plugin-syntax-jsx@^6.18.0: version "6.18.0" @@ -6975,6 +6976,11 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3: resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz" integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw== +picomatch@^2.3.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" + integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== + pirates@^4.0.1: version "4.0.4" resolved "https://registry.npmjs.org/pirates/-/pirates-4.0.4.tgz" @@ -8609,7 +8615,7 @@ style-loader@^3.3.1: styled-components@^5.3.3: version "5.3.3" - resolved "https://registry.npmjs.org/styled-components/-/styled-components-5.3.3.tgz" + resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-5.3.3.tgz#312a3d9a549f4708f0fb0edc829eb34bde032743" integrity sha512-++4iHwBM7ZN+x6DtPPWkCI4vdtwumQ+inA/DdAsqYd4SVgUKJie5vXyzotA00ttcFdQkCng7zc6grwlfIfw+lw== dependencies: "@babel/helper-module-imports" "^7.0.0"