Skip to content

Commit

Permalink
Linaria 6 (adazzle#3407)
Browse files Browse the repository at this point in the history
* Install new @wyw-in-js packages

* Update imports

* -1

* Revert "-1"

This reverts commit e68977a.

* Revert "Update imports"

This reverts commit 5848bfe.

* Use the new packages

* Rename
  • Loading branch information
amanmahajan7 authored Dec 14, 2023
1 parent 25a8382 commit aeb1cb2
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
5 changes: 3 additions & 2 deletions package.json
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",
"@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
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
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

0 comments on commit aeb1cb2

Please sign in to comment.