Skip to content

Update @emotion/* dependencies #151

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.

Sign up for GitHub

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update @emotion/* dependencies #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5716924
install @emotion/*
Feb 11, 2022
3fc1cc9
Update src/styles.ts
MatiasCiccone Aug 15, 2022
320cc4d
Remove @emotion/serialize
Aug 19, 2022
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
5 changes: 2 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-diff-viewer",
"version": "3.1.1",
"version": "3.2.0",
"private": false,
"description": "A simple and beautiful text diff viewer component made with diff and React",
"keywords": [
Expand Down Expand Up @@ -29,10 +29,9 @@
"test:watch": "mocha --require ts-node/register --require enzyme.ts --watch-extensions ts,tsx --watch ./test/**"
},
"dependencies": {
"@emotion/css": "^11.7.1",
"classnames": "^2.2.6",
"create-emotion": "^10.0.14",
"diff": "^4.0.1",
"emotion": "^10.0.14",
"memoize-one": "^5.0.4",
"prop-types": "^15.6.2"
},
Expand Down
41 changes: 20 additions & 21 deletions src/styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { css, cx } from 'emotion';
import { Interpolation } from 'create-emotion';
import { css, CSSInterpolation, cx } from '@emotion/css';

export interface ReactDiffViewerStyles {
diffContainer?: string;
Expand Down Expand Up @@ -57,25 +56,25 @@ export interface ReactDiffViewerStylesOverride {
dark?: ReactDiffViewerStylesVariables;
light?: ReactDiffViewerStylesVariables;
};
diffContainer?: Interpolation;
diffRemoved?: Interpolation;
diffAdded?: Interpolation;
marker?: Interpolation;
emptyGutter?: Interpolation;
highlightedLine?: Interpolation;
lineNumber?: Interpolation;
highlightedGutter?: Interpolation;
contentText?: Interpolation;
gutter?: Interpolation;
line?: Interpolation;
wordDiff?: Interpolation;
wordAdded?: Interpolation;
wordRemoved?: Interpolation;
codeFoldGutter?: Interpolation;
emptyLine?: Interpolation;
content?: Interpolation;
titleBlock?: Interpolation;
splitView?: Interpolation;
diffContainer?: CSSInterpolation;
diffRemoved?: CSSInterpolation;
diffAdded?: CSSInterpolation;
marker?: CSSInterpolation;
emptyGutter?: CSSInterpolation;
highlightedLine?: CSSInterpolation;
lineNumber?: CSSInterpolation;
highlightedGutter?: CSSInterpolation;
contentText?: CSSInterpolation;
gutter?: CSSInterpolation;
line?: CSSInterpolation;
wordDiff?: CSSInterpolation;
wordAdded?: CSSInterpolation;
wordRemoved?: CSSInterpolation;
codeFoldGutter?: CSSInterpolation;
emptyLine?: CSSInterpolation;
content?: CSSInterpolation;
titleBlock?: CSSInterpolation;
splitView?: CSSInterpolation;
}

export default (
Expand Down
Loading