Skip to content

Commit 3dc76a1

Browse files
authored
Merge pull request #245 from rtCamp/fix/security-vuls-vite-lodash
Fix: Vite and lodash related security vulnerability
2 parents 1fe3497 + 3f7995c commit 3dc76a1

File tree

5 files changed

+85
-227
lines changed

5 files changed

+85
-227
lines changed

babel.config.cjs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@ module.exports = function (api) {
1313
],
1414
"@babel/preset-typescript",
1515
],
16-
plugins: [
17-
["@babel/plugin-transform-react-jsx", { runtime: "automatic" }],
18-
["babel-plugin-styled-components"],
19-
],
16+
plugins: [],
2017
sourceMaps: true,
2118
};
2219
};

package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
"format": "prettier --write \"./**/*.{js,jsx,mjs,cjs,ts,tsx,json}\""
3131
},
3232
"devDependencies": {
33-
"@babel/plugin-transform-react-jsx": "^7.22.5",
3433
"@babel/preset-env": "^7.22.5",
3534
"@babel/preset-react": "^7.22.5",
3635
"@babel/preset-typescript": "^7.22.5",
@@ -51,7 +50,6 @@
5150
"@vitest/browser": "^3.2.4",
5251
"@vitest/coverage-v8": "^3.2.4",
5352
"babel-jest": "^30.1.2",
54-
"babel-plugin-styled-components": "^2.1.4",
5553
"baseline-browser-mapping": "^2.9.15",
5654
"eslint": "^9.39.2",
5755
"eslint-plugin-jest": "^29.12.1",
@@ -100,7 +98,8 @@
10098
"flatted@<3.4.2": "^3.4.2",
10199
"brace-expansion@>=4.0.0 <5.0.5": "^5.0.5",
102100
"picomatch@>=4.0.0 <4.0.4": "^4.0.4",
103-
"yaml@>=2.0.0 <2.8.3": "^2.8.3"
101+
"yaml@>=2.0.0 <2.8.3": "^2.8.3",
102+
"vite@>=7.0.0 <=7.3.1": "^7.3.2"
104103
}
105104
}
106105
}

packages/frappe-ui-react/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"@tiptap/starter-kit": "^3.17.1",
5959
"clsx": "^2.1.1",
6060
"dayjs": "^1.11.19",
61-
"dompurify": "^3.3.2",
61+
"dompurify": "^3.4.0",
6262
"echarts": "^6.0.0",
6363
"feather-icons": "^4.29.2",
6464
"lowlight": "^3.3.0",
@@ -67,7 +67,6 @@
6767
"react-dom": "^19.2.4",
6868
"react-grid-layout": "^1.5.3",
6969
"react-resizable": "^3.1.3",
70-
"styled-components": "^6.3.8",
7170
"tailwindcss": "^4.1.18"
7271
},
7372
"devDependencies": {

packages/frappe-ui-react/src/components/calendar/calendarTimeMarker.tsx

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { useContext, useEffect, useMemo, useState } from "react";
2-
import styled from "styled-components";
32

43
import { CalendarContext } from "./calendarContext";
54

@@ -8,21 +7,6 @@ interface CalendarTimeMarkerProps {
87
redundantCellHeight?: number;
98
}
109

11-
const StyledDiv = styled.div`
12-
&:before {
13-
content: "";
14-
display: block;
15-
width: 12px;
16-
height: 12px;
17-
background-color: red;
18-
border-radius: 50%;
19-
position: absolute;
20-
left: -8px;
21-
top: 50%;
22-
transform: translateY(-50%);
23-
}
24-
`;
25-
2610
export const CalendarTimeMarker = ({
2711
date,
2812
redundantCellHeight = 0,
@@ -60,7 +44,9 @@ export const CalendarTimeMarker = ({
6044
className="absolute left-0 right-0 z-10 w-full pl-2"
6145
style={topPositionStyle}
6246
>
63-
<StyledDiv className="relative h-0.5 bg-red-600" />
47+
<div className="relative h-0.5 bg-red-600">
48+
<span className="absolute -left-2 top-1/2 block h-3 w-3 -translate-y-1/2 rounded-full bg-red-600" />
49+
</div>
6450
</div>
6551
);
6652
};

0 commit comments

Comments
 (0)