refactor: use font base mixing from text package

abelflopes · abelflopes · commit 9af8f0729ca1 · 2023-12-28T21:27:58.000Z
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/components/button/package.json b/packages/components/button/package.json
@@ -33,6 +33,7 @@
   "dependencies": {
     "@react-ck/react-utils": "^1.0.0",
     "@react-ck/scss-utils": "^1.1.2",
+    "@react-ck/text": "^1.2.6",
     "classnames": "^2.3.2"
   }
 }
diff --git a/packages/components/button/src/styles/index.module.scss b/packages/components/button/src/styles/index.module.scss
@@ -1,4 +1,5 @@
 @import "@react-ck/theme";
+@import "@react-ck/text";
 
 .root {
   @include font-base;
diff --git a/packages/components/card/package.json b/packages/components/card/package.json
@@ -31,6 +31,7 @@
     "react": "^18.2.0"
   },
   "dependencies": {
+    "@react-ck/text": "^1.2.6",
     "@react-ck/theme": "^1.4.1",
     "classnames": "^2.3.2"
   }
diff --git a/packages/components/card/src/styles/index.module.scss b/packages/components/card/src/styles/index.module.scss
@@ -1,4 +1,5 @@
 @import "@react-ck/theme";
+@import "@react-ck/text";
 
 .root {
   @include font-base;
diff --git a/packages/components/chip/package.json b/packages/components/chip/package.json
@@ -31,6 +31,7 @@
     "react": "^18.2.0"
   },
   "dependencies": {
+    "@react-ck/text": "^1.2.6",
     "@react-ck/theme": "^1.4.1",
     "classnames": "^2.3.2"
   }
diff --git a/packages/components/chip/src/styles/index.module.scss b/packages/components/chip/src/styles/index.module.scss
@@ -1,4 +1,5 @@
 @import "@react-ck/theme";
+@import "@react-ck/text";
 
 .root {
   @include font-base;
diff --git a/packages/components/empty-state/src/styles/index.module.scss b/packages/components/empty-state/src/styles/index.module.scss
@@ -1,4 +1,5 @@
 @import "@react-ck/theme";
+@import "@react-ck/text";
 
 .root {
   @include font-base;
diff --git a/packages/components/input/package.json b/packages/components/input/package.json
@@ -32,6 +32,7 @@
   },
   "dependencies": {
     "@react-ck/scss-utils": "^1.1.2",
+    "@react-ck/text": "^1.2.6",
     "@react-ck/theme": "^1.4.1",
     "classnames": "^2.3.2"
   }
diff --git a/packages/components/input/src/styles/index.module.scss b/packages/components/input/src/styles/index.module.scss
@@ -1,5 +1,6 @@
 @import "@react-ck/theme";
 @import "@react-ck/scss-utils";
+@import "@react-ck/text";
 
 .root {
   @include font-base;
diff --git a/packages/components/select/package.json b/packages/components/select/package.json
@@ -32,6 +32,7 @@
   },
   "dependencies": {
     "@react-ck/scss-utils": "^1.1.2",
+    "@react-ck/text": "^1.2.6",
     "@react-ck/theme": "^1.4.1",
     "classnames": "^2.3.2"
   }
diff --git a/packages/components/select/src/styles/index.module.scss b/packages/components/select/src/styles/index.module.scss
@@ -1,5 +1,6 @@
 @import "@react-ck/theme";
 @import "@react-ck/scss-utils";
+@import "@react-ck/text";
 
 .root {
   @include font-base;
diff --git a/packages/components/table/package.json b/packages/components/table/package.json
@@ -32,6 +32,7 @@
   },
   "dependencies": {
     "@react-ck/scss-utils": "^1.1.2",
+    "@react-ck/text": "^1.2.6",
     "@react-ck/theme": "^1.4.1",
     "classnames": "^2.3.2"
   }
diff --git a/packages/components/table/src/styles/index.module.scss b/packages/components/table/src/styles/index.module.scss
@@ -1,5 +1,6 @@
 @import "@react-ck/theme";
 @import "@react-ck/scss-utils";
+@import "@react-ck/text";
 
 .root {
   @include font-base;
diff --git a/packages/components/text/package.json b/packages/components/text/package.json
@@ -4,6 +4,7 @@
   "version": "1.2.6",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
+  "sass": "src/styles/shared.scss",
   "files": [
     "/dist"
   ],
diff --git a/packages/components/text/src/styles/_mixins.scss b/packages/components/text/src/styles/_mixins.scss
@@ -1,4 +1,4 @@
-@import "functions";
+@import "@react-ck/theme";
 
 // TODO: move to typography
 @mixin font-base {
diff --git a/packages/components/text/src/styles/shared.scss b/packages/components/text/src/styles/shared.scss
@@ -0,0 +1 @@
+@import "mixins";
diff --git a/packages/components/textarea/package.json b/packages/components/textarea/package.json
@@ -32,6 +32,7 @@
   },
   "dependencies": {
     "@react-ck/scss-utils": "^1.1.2",
+    "@react-ck/text": "^1.2.6",
     "@react-ck/theme": "^1.4.1",
     "classnames": "^2.3.2"
   }
diff --git a/packages/components/textarea/src/styles/index.module.scss b/packages/components/textarea/src/styles/index.module.scss
@@ -1,5 +1,6 @@
 @import "@react-ck/theme";
 @import "@react-ck/scss-utils";
+@import "@react-ck/text";
 
 .root {
   @include font-base;
diff --git a/packages/docs/stories/src/empty-state.stories.tsx b/packages/docs/stories/src/empty-state.stories.tsx
@@ -2,7 +2,6 @@ import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
 import { Manager } from "@react-ck/manager";
 import { faker } from "@faker-js/faker";
-import { Text } from "@react-ck/text/src";
 import { configureStory } from "@react-ck/story-config";
 import { EmptyState } from "@react-ck/empty-state/src";
 
diff --git a/packages/providers/theme/src/styles/shared.scss b/packages/providers/theme/src/styles/shared.scss
@@ -1,3 +1 @@
 @import "functions";
-
-@import "mixins";

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@`
`33`	`33`	`"dependencies": {`
`34`	`34`	`"@react-ck/react-utils": "^1.0.0",`
`35`	`35`	`"@react-ck/scss-utils": "^1.1.2",`
	`36`	`+ "@react-ck/text": "^1.2.6",`
`36`	`37`	`"classnames": "^2.3.2"`
`37`	`38`	`}`
`38`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`@import "@react-ck/theme";`
	`2`	`+@import "@react-ck/text";`
`2`	`3`
`3`	`4`	`.root {`
`4`	`5`	`@include font-base;`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@`
`31`	`31`	`"react": "^18.2.0"`
`32`	`32`	`},`
`33`	`33`	`"dependencies": {`
	`34`	`+ "@react-ck/text": "^1.2.6",`
`34`	`35`	`"@react-ck/theme": "^1.4.1",`
`35`	`36`	`"classnames": "^2.3.2"`
`36`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@`
`32`	`32`	`},`
`33`	`33`	`"dependencies": {`
`34`	`34`	`"@react-ck/scss-utils": "^1.1.2",`
	`35`	`+ "@react-ck/text": "^1.2.6",`
`35`	`36`	`"@react-ck/theme": "^1.4.1",`
`36`	`37`	`"classnames": "^2.3.2"`
`37`	`38`	`}`