Skip to content
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

Linaria 6 #3407

Merged
merged 7 commits into from
Dec 14, 2023
Merged

Linaria 6 #3407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7252479
Install new @wyw-in-js packages
amanmahajan7 Dec 14, 2023
5848bfe
Update imports
amanmahajan7 Dec 14, 2023
e68977a
-1
amanmahajan7 Dec 14, 2023
17a7d11
Revert "-1"
amanmahajan7 Dec 14, 2023
64490e2
Revert "Update imports"
amanmahajan7 Dec 14, 2023
ac3badc
Use the new packages
amanmahajan7 Dec 14, 2023
e85f7fe
Rename
amanmahajan7 Dec 14, 2023
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: 3 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,7 @@
"@biomejs/biome": "1.4.1",
"@faker-js/faker": "^8.0.0",
"@ianvs/prettier-plugin-sort-imports": "^4.0.2",
"@linaria/rollup": "^5.0.3",
"@linaria/vite": "^5.0.3",
"@linaria/core": "^6.0.0",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be installed now

"@microsoft/api-extractor": "^7.23.0",
"@rollup/plugin-babel": "^6.0.3",
"@rollup/plugin-node-resolve": "^15.1.0",
Expand All @@ -80,6 +79,8 @@
"@typescript-eslint/parser": "^6.1.0",
"@vitejs/plugin-react": "^4.0.2",
"@vitest/coverage-v8": "^1.0.0",
"@wyw-in-js/rollup": "^0.2.2",
"@wyw-in-js/vite": "^0.2.2",
"babel-plugin-optimize-clsx": "^2.6.2",
"eslint": "^8.43.0",
"eslint-config-prettier": "^9.0.0",
Expand Down
4 changes: 2 additions & 2 deletions rollup.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { isAbsolute } from 'node:path';
import linaria from '@linaria/rollup';
import wyw from '@wyw-in-js/rollup';
import postcss from 'rollup-plugin-postcss';
import postcssNested from 'postcss-nested';
import { babel } from '@rollup/plugin-babel';
Expand All @@ -26,7 +26,7 @@ export default {
],
external: (id) => !id.startsWith('.') && !id.startsWith('@linaria:') && !isAbsolute(id),
plugins: [
linaria({
wyw({
preprocessor: 'none',
classNameSlug(hash) {
// We add the package version as suffix to avoid style conflicts
Expand Down
4 changes: 2 additions & 2 deletions vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import linaria from '@linaria/vite';
import react from '@vitejs/plugin-react';
import wyw from '@wyw-in-js/vite';
import postcssNested from 'postcss-nested';
import { defineConfig } from 'vite';

Expand All @@ -25,7 +25,7 @@ export default defineConfig({
plugins: [['optimize-clsx', { functionNames: ['getCellClassname'] }]]
}
}),
!isTest && linaria({ preprocessor: 'none' })
!isTest && wyw({ preprocessor: 'none' })
],
css: {
postcss: {
Expand Down