chore(tailwind): remove uneccesseary folder nesting

kiwicom · Dec 19, 2023 · ac8ec3d · ac8ec3d
1 parent d95b80d
commit ac8ec3d
Show file tree

Hide file tree

Showing 23 changed files with 359 additions and 361 deletions.
diff --git a/...src/presets/__fixtures__/BorderRadius.tsx → ...-preset/src/__fixtures__/BorderRadius.tsx b/...src/presets/__fixtures__/BorderRadius.tsx → ...-preset/src/__fixtures__/BorderRadius.tsx
diff --git a/...reset/src/presets/__fixtures__/Button.tsx → ...ilwind-preset/src/__fixtures__/Button.tsx b/...reset/src/presets/__fixtures__/Button.tsx → ...ilwind-preset/src/__fixtures__/Button.tsx
diff --git a/...et/src/presets/__fixtures__/FontSizes.tsx → ...ind-preset/src/__fixtures__/FontSizes.tsx b/...et/src/presets/__fixtures__/FontSizes.tsx → ...ind-preset/src/__fixtures__/FontSizes.tsx
diff --git a/...t/src/presets/__fixtures__/FontWeight.tsx → ...nd-preset/src/__fixtures__/FontWeight.tsx b/...t/src/presets/__fixtures__/FontWeight.tsx → ...nd-preset/src/__fixtures__/FontWeight.tsx
diff --git a/...set/src/presets/__fixtures__/Headings.tsx → ...wind-preset/src/__fixtures__/Headings.tsx b/...set/src/presets/__fixtures__/Headings.tsx → ...wind-preset/src/__fixtures__/Headings.tsx
diff --git a/...t/src/presets/__fixtures__/LineHeight.tsx → ...nd-preset/src/__fixtures__/LineHeight.tsx b/...t/src/presets/__fixtures__/LineHeight.tsx → ...nd-preset/src/__fixtures__/LineHeight.tsx
diff --git a/...eset/src/presets/__fixtures__/Screens.tsx → ...lwind-preset/src/__fixtures__/Screens.tsx b/...eset/src/presets/__fixtures__/Screens.tsx → ...lwind-preset/src/__fixtures__/Screens.tsx
diff --git a/...set/src/presets/__fixtures__/Spacings.tsx → ...wind-preset/src/__fixtures__/Spacings.tsx b/...set/src/presets/__fixtures__/Spacings.tsx → ...wind-preset/src/__fixtures__/Spacings.tsx
diff --git a/...ests__/__snapshots__/configs.test.ts.snap → ...ests__/__snapshots__/configs.test.ts.snap b/...ests__/__snapshots__/configs.test.ts.snap → ...ests__/__snapshots__/configs.test.ts.snap
diff --git a/...esets/__tests__/button-component.test.tsx → ...t/src/__tests__/button-component.test.tsx b/...esets/__tests__/button-component.test.tsx → ...t/src/__tests__/button-component.test.tsx
@@ -2,8 +2,8 @@ import React from "react";
 import { getTokens } from "@kiwicom/orbit-design-tokens";
 
 import Button from "../__fixtures__/Button";
-import { render, screen } from "../../testUtils";
-import { firstToUpper } from "../foundation/helpers";
+import { render, screen } from "../testUtils";
+import firstToUpper from "../utils/firstToUpper";
 import cssVarsFoundation from "../foundation/cssVarsFoundation";
 
 const testIds = ["primary", "secondary", "info", "success", "warning", "critical"];

diff --git a/...set/src/presets/__tests__/configs.test.ts → ...wind-preset/src/__tests__/configs.test.ts b/...set/src/presets/__tests__/configs.test.ts → ...wind-preset/src/__tests__/configs.test.ts
@@ -4,7 +4,7 @@ import orbitPreset from "../..";
 
 describe("orbitPreset", () => {
   it("should match snapshot", () => {
-    const cfg = resolveConfig(orbitPreset());
+    const cfg = resolveConfig(orbitPreset({ disablePreflight: true }));
     expect(cfg).toMatchSnapshot();
     expect(cfg.corePlugins).not.toContain("preflight");
   });

diff --git a/...reset/src/presets/__tests__/font.test.tsx → ...ilwind-preset/src/__tests__/font.test.tsx b/...reset/src/presets/__tests__/font.test.tsx → ...ilwind-preset/src/__tests__/font.test.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import { defaultTokens } from "@kiwicom/orbit-design-tokens";
 
-import { render, screen } from "../../testUtils";
+import { render, screen } from "../testUtils";
 import FontSizes from "../__fixtures__/FontSizes";
 import FontWeight from "../__fixtures__/FontWeight";
 import LineHeight from "../__fixtures__/LineHeight";

diff --git a/...t/src/presets/__tests__/headings.test.tsx → ...nd-preset/src/__tests__/headings.test.tsx b/...t/src/presets/__tests__/headings.test.tsx → ...nd-preset/src/__tests__/headings.test.tsx
@@ -2,8 +2,8 @@ import React from "react";
 import { defaultTokens } from "@kiwicom/orbit-design-tokens";
 
 import Headings from "../__fixtures__/Headings";
-import { render, screen } from "../../testUtils";
-import { firstToUpper } from "../foundation/helpers";
+import { render, screen } from "../testUtils";
+import firstToUpper from "../utils/firstToUpper";
 
 const HEADINGS = [
   "title1",

diff --git a/packages/orbit-tailwind-preset/src/__tests__/helpers.test.ts b/packages/orbit-tailwind-preset/src/__tests__/helpers.test.ts
@@ -1,4 +1,4 @@
-import { getComponentLevelTokens } from "../presets/foundation/helpers";
+import getComponentLevelTokens from "../getComponentLevelTokens";
 
 describe("orbit-tailwind-preset", () => {
   it("should get component level token", () => {

diff --git a/...et/src/presets/__tests__/spacing.test.tsx → ...ind-preset/src/__tests__/spacing.test.tsx b/...et/src/presets/__tests__/spacing.test.tsx → ...ind-preset/src/__tests__/spacing.test.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import { defaultTokens } from "@kiwicom/orbit-design-tokens";
 
-import { render, screen } from "../../testUtils";
+import { render, screen } from "../testUtils";
 import Spacings from "../__fixtures__/Spacings";
 
 const SPACINGS = [

diff --git a/...c/presets/foundation/cssVarsFoundation.ts → ...reset/src/foundation/cssVarsFoundation.ts b/...c/presets/foundation/cssVarsFoundation.ts → ...reset/src/foundation/cssVarsFoundation.ts
diff --git a/...rc/presets/foundation/getTailwindTheme.ts → ...preset/src/foundation/getTailwindTheme.ts b/...rc/presets/foundation/getTailwindTheme.ts → ...preset/src/foundation/getTailwindTheme.ts
diff --git a/...nd-preset/src/presets/foundation/index.ts → ...t-tailwind-preset/src/foundation/index.ts b/...nd-preset/src/presets/foundation/index.ts → ...t-tailwind-preset/src/foundation/index.ts
diff --git a/...-preset/src/presets/foundation/helpers.ts → ...ind-preset/src/getComponentLevelTokens.ts b/...-preset/src/presets/foundation/helpers.ts → ...ind-preset/src/getComponentLevelTokens.ts
@@ -1,8 +1,6 @@
 import { defaultTokens } from "@kiwicom/orbit-design-tokens";
 
-export const kebabCase = (str: string) => str.replace(/([a-z])([A-Z])/g, "$1-$2").toLowerCase();
-
-export const firstToUpper = (str: string) => str.charAt(0).toUpperCase() + str.slice(1);
+import kebabCase from "./utils/kebabCase";
 
 export type ExportedComponentLevelTokens =
   | "alert"
@@ -43,7 +41,7 @@ type ExportedComponentLevelTypes =
   | "fontWeight"
   | "lineHeight";
 
-export const getComponentLevelTokens =
+const getComponentLevelTokens =
   (tokens: typeof defaultTokens = defaultTokens) =>
   (component: ExportedComponentLevelTokens, type: ExportedComponentLevelTypes) => {
     return Object.keys(tokens).reduce((acc, key) => {
@@ -67,3 +65,5 @@ export const getComponentLevelTokens =
       return acc;
     }, {});
   };
+
+export default getComponentLevelTokens;