Skip to content

Commit 4782cf5

Browse files
committed
tailwind: v4
1 parent b1e3414 commit 4782cf5

File tree

9 files changed

+778
-337
lines changed

9 files changed

+778
-337
lines changed

packages/lexical/package.json

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
],
1212
"keywords": [
1313
"jupyter",
14-
"jupyterlab",
15-
"jupyterlab-extension",
1614
"react",
1715
"lexical"
1816
],
@@ -79,9 +77,11 @@
7977
"@lexical/table": "^0.33.1",
8078
"@lexical/utils": "^0.33.1",
8179
"@lexical/yjs": "^0.33.1",
80+
"autoprefixer": "^10.4.21",
8281
"katex": "^0.16.21",
8382
"lexical": "^0.33.1",
8483
"lodash-es": "^4.17.21",
84+
"postcss": "^8.5.6",
8585
"react": "18.3.1",
8686
"react-dom": "18.3.1",
8787
"react-json-tree": "^0.19.0",
@@ -94,9 +94,6 @@
9494
"@babel/preset-env": "^7.20.2",
9595
"@babel/preset-react": "^7.18.6",
9696
"@babel/preset-typescript": "^7.21.0",
97-
"@jupyterlab/builder": "^4.0.0",
98-
"@tailwindcss/forms": "^0.5.10",
99-
"@tailwindcss/typography": "^0.5.16",
10097
"@types/codemirror": "^5.60.4",
10198
"@types/katex": "^0.14.0",
10299
"@types/lodash-es": "^4.17.6",
@@ -111,7 +108,6 @@
111108
"@types/uuid": "^8.3.0",
112109
"@typescript-eslint/eslint-plugin": "^8.29.1",
113110
"@typescript-eslint/parser": "^8.29.1",
114-
"autoprefixer": "^10.4.21",
115111
"babel-loader": "^9.1.2",
116112
"bundle-loader": "^0.5.6",
117113
"css-loader": "^7.1.2",
@@ -128,8 +124,6 @@
128124
"jest": "^29.4.3",
129125
"mkdirp": "^1.0.3",
130126
"npm-run-all": "^4.1.5",
131-
"postcss": "^8.5.6",
132-
"postcss-loader": "^8.1.1",
133127
"prettier": "^3.5.3",
134128
"process": "^0.11.10",
135129
"raw-loader": "^4.0.2",
@@ -143,7 +137,7 @@
143137
"stylelint-config-standard": "^24.0.0",
144138
"stylelint-prettier": "^2.0.0",
145139
"svg-url-loader": "^7.1.1",
146-
"tailwindcss": "^3.4.17",
140+
"tailwindcss": "^4.0.0",
147141
"typedoc": "^0.28.2",
148142
"typescript": "^5.8.3",
149143
"url-loader": "^3.0.0",

packages/lexical/postcss.config.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
module.exports = {
2-
plugins: {
3-
tailwindcss: {},
4-
autoprefixer: {},
5-
},
6-
}
2+
plugins: [require('tailwindcss'), require('autoprefixer')],
3+
};

packages/lexical/style/index.css

Lines changed: 10 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -4,62 +4,21 @@
44
* MIT License
55
*/
66

7-
@tailwind base;
8-
@tailwind components;
9-
@tailwind utilities;
10-
117
/* Import base styles */
128
@import url('base.css');
139

14-
/* Import all lexical component styles */
15-
@import url('lexical/Button.css');
16-
@import url('lexical/CodeActionMenuPlugin.css');
17-
@import url('lexical/CommentEditorTheme.css');
18-
@import url('lexical/CommentPlugin.css');
19-
@import url('lexical/ContentEditable.css');
20-
@import url('lexical/Dialog.css');
21-
@import url('lexical/DraggableBlockPlugin.css');
22-
@import url('lexical/Editor.css');
23-
@import url('lexical/EquationEditor.css');
24-
@import url('lexical/FloatingTextFormatToolbarPlugin.css');
25-
@import url('lexical/ImageNode.css');
26-
@import url('lexical/Input.css');
27-
@import url('lexical/Jupyter.css');
28-
@import url('lexical/JupyterPlugin.css');
29-
@import url('lexical/KatexEquationAlterer.css');
30-
@import url('lexical/Modal.css');
31-
@import url('lexical/Placeholder.css');
32-
@import url('lexical/PrettierButton.css');
33-
@import url('lexical/Rich.css');
34-
@import url('lexical/TableOfContentsPlugin.css');
35-
@import url('lexical/Theme.css');
36-
@import url('lexical/ToolbarPlugin.css');
10+
/* Tailwind v4 theme configuration - CSS variables for theming */
11+
:root {
12+
--font-family-system: system-ui, -apple-system, BlinkMacSystemFont, '.SFNSText-Regular', sans-serif;
13+
--color-gray-light: #eee;
14+
--color-gray-medium: #ddd;
15+
--color-gray-dark: #333;
16+
}
17+
18+
/* Import tailwind.css which now contains all the Tailwind v4 compatible styles */
19+
@import url('tailwind.css');
3720

3821
/* Custom base styles */
3922
[contenteditable] {
4023
outline: 0px solid transparent;
4124
}
42-
43-
/* Custom component styles */
44-
@layer components {
45-
/* Button styles */
46-
.Button__root {
47-
@apply py-2.5 px-4 border-0 bg-gray-200 rounded cursor-pointer text-sm;
48-
}
49-
50-
.Button__root:hover {
51-
@apply bg-gray-300;
52-
}
53-
54-
.Button__small {
55-
@apply py-1.5 px-2.5 text-xs;
56-
}
57-
58-
.Button__disabled {
59-
@apply cursor-not-allowed;
60-
}
61-
62-
.Button__disabled:hover {
63-
@apply bg-gray-200;
64-
}
65-
}

packages/lexical/style/index.js

Lines changed: 0 additions & 7 deletions
This file was deleted.

packages/lexical/style/lexical/CommentPlugin.css

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@
44
* MIT License
55
*/
66

7-
/*
8-
* Copyright (c) 2021-2024 Datalayer, Inc.
9-
*
10-
* Datalayer License
11-
*/
12-
137
.CommentPlugin {
148
font-family: system-ui, -apple-system, BlinkMacSystemFont, '.SFNSText-Regular', sans-serif;
159
}

0 commit comments

Comments
 (0)