Skip to content

Commit 72b9ee8

Browse files
authored
Update dependencies to Linaria 6.3.0 and replace Linaria imports with wyw-in-js equivalents (#1053)
1 parent 7e8fe7f commit 72b9ee8

File tree

7 files changed

+1364
-1400
lines changed

7 files changed

+1364
-1400
lines changed

.storybook/.babelrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
],
1919
"@babel/preset-react",
2020
"@babel/preset-typescript",
21-
"@linaria"
21+
"@wyw-in-js/babel-preset"
2222
],
2323
"plugins": ["@babel/plugin-proposal-class-properties"]
2424
}

.storybook/main.cjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ module.exports = {
1010

1111
async viteFinal(config) {
1212
const { mergeConfig } = await import("vite");
13-
const linaria = await import("@linaria/vite");
13+
const wyw = await import("@wyw-in-js/vite");
1414
return mergeConfig(config, {
15-
plugins: [linaria.default()],
15+
plugins: [wyw.default()],
1616
});
1717
},
1818

config/build-util.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ remove_all_css_imports() {
5050

5151
compile() {
5252
tsc -p tsconfig.$1.json --outdir ./dist/$1-tmp --declarationDir ./dist/dts-tmp
53-
linaria -r dist/$1-tmp/ -m esnext -o dist/$1-tmp/ dist/$1-tmp/**/*.js -t -i dist/$1-tmp -c ../../config/linaria.json > /dev/null
53+
wyw-in-js -r dist/$1-tmp/ -m esnext -o dist/$1-tmp/ dist/$1-tmp/**/*.js -t -i dist/$1-tmp -c ../../config/linaria.json > /dev/null
5454
remove_all_css_imports dist/$1-tmp
5555

5656
# replace dist/$1 (if it exists) with dist/$1-tmp

package-lock.json

Lines changed: 1354 additions & 1386 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,8 @@
3535
"@babel/preset-react": "^7.27.1",
3636
"@babel/preset-typescript": "^7.27.1",
3737
"@faker-js/faker": "^7.6.0",
38-
"@linaria/babel-preset": "^4.5.4",
39-
"@linaria/cli": "^4.5.4",
40-
"@linaria/core": "^4.5.4",
41-
"@linaria/esbuild": "^4.5.4",
42-
"@linaria/react": "^4.5.4",
43-
"@linaria/shaker": "^4.5.3",
44-
"@linaria/vite": "^4.5.4",
45-
"@linaria/webpack-loader": "^4.5.4",
38+
"@linaria/core": "^6.3.0",
39+
"@linaria/react": "^6.3.0",
4640
"@storybook/addon-docs": "^9.0.11",
4741
"@storybook/addon-links": "^9.0.11",
4842
"@storybook/addons": "^7.6.20",
@@ -67,6 +61,8 @@
6761
"@typescript-eslint/parser": "^6.21.0",
6862
"@typescript-eslint/typescript-estree": "^5.62.0",
6963
"@vitejs/plugin-react": "^4.5.2",
64+
"@wyw-in-js/cli": "^0.7.0",
65+
"@wyw-in-js/vite": "^0.7.0",
7066
"babel-loader": "^8.4.1",
7167
"chokidar-cli": "^3.0.0",
7268
"clean-css-cli": "^5.6.3",

packages/cells/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
],
5252
"dependencies": {
5353
"@glideapps/glide-data-grid": "6.0.4-alpha12",
54-
"@linaria/react": "^4.5.4",
54+
"@linaria/react": "^6.3.0",
5555
"@toast-ui/editor": "3.2.2",
5656
"@toast-ui/react-editor": "3.2.3",
5757
"react-select": "^5.10.1"

packages/core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
},
5858
"homepage": "https://grid.glideapps.com",
5959
"dependencies": {
60-
"@linaria/react": "^4.5.4",
60+
"@linaria/react": "^6.3.0",
6161
"canvas-hypertxt": "^1.0.3",
6262
"react-number-format": "^5.4.4"
6363
},

0 commit comments

Comments
 (0)