fix: export types of react & solid adapter, esm issues with vite & qwik

macaron-css · Apr 12, 2024 · 85a1e74 · 85a1e74
1 parent 9895043
commit 85a1e74
Show file tree

Hide file tree

Showing 22 changed files with 169 additions and 162 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/babel/tsconfig.json b/packages/babel/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "target": "ESNext",
-    "moduleResolution": "node",
+    "moduleResolution": "node16",
     "esModuleInterop": true,
     "declaration": true,
     "outDir": "build",
@@ -14,4 +14,4 @@
     "dist",
     "node_modules"
   ]
-}
+}
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -26,6 +26,11 @@
       "types": "./dist/dynamic.d.ts",
       "import": "./dist/dynamic.mjs",
       "require": "./dist/dynamic.js"
+    },
+    "./types": {
+      "types": "./dist/types.d.ts",
+      "import": "./dist/types.mjs",
+      "require": "./dist/types.js"
     }
   },
   "dependencies": {

diff --git a/packages/core/src/create-runtime-fn.ts b/packages/core/src/create-runtime-fn.ts
@@ -1,9 +1,9 @@
-import {
+import type {
   PatternResult,
   RuntimeFn,
   VariantGroups,
   VariantSelection,
-} from '@vanilla-extract/recipes/dist/declarations/src/types';
+} from './types';
 
 const shouldApplyCompound = <Variants extends VariantGroups>(
   compoundCheck: VariantSelection<Variants>,

diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -10,11 +10,11 @@ import { createRuntimeFn } from './create-runtime-fn';
 import type {
   PatternOptions,
   PatternResult,
+  RecipeVariants,
   RuntimeFn,
   VariantGroups,
   VariantSelection,
-  RecipeVariants,
-} from '@vanilla-extract/recipes/dist/declarations/src/types';
+} from './types';
 
 export type { RecipeVariants };
 

diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
@@ -0,0 +1,37 @@
+// Sourced from @vanilla-extract/recipes
+
+import type { ComplexStyleRule } from '@vanilla-extract/css';
+type RecipeStyleRule = ComplexStyleRule | string;
+export type VariantDefinitions = Record<string, RecipeStyleRule>;
+type BooleanMap<T> = T extends 'true' | 'false' ? boolean : T;
+export type VariantGroups = Record<string, VariantDefinitions>;
+export type VariantSelection<Variants extends VariantGroups> = {
+  [VariantGroup in keyof Variants]?: BooleanMap<keyof Variants[VariantGroup]>;
+};
+export type PatternResult<Variants extends VariantGroups> = {
+  defaultClassName: string;
+  variantClassNames: {
+    [P in keyof Variants]: {
+      [P in keyof Variants[keyof Variants]]: string;
+    };
+  };
+  defaultVariants: VariantSelection<Variants>;
+  compoundVariants: Array<[VariantSelection<Variants>, string]>;
+};
+export interface CompoundVariant<Variants extends VariantGroups> {
+  variants: VariantSelection<Variants>;
+  style: RecipeStyleRule;
+}
+export type PatternOptions<Variants extends VariantGroups> = {
+  base?: RecipeStyleRule;
+  variants?: Variants;
+  defaultVariants?: VariantSelection<Variants>;
+  compoundVariants?: Array<CompoundVariant<Variants>>;
+};
+export type RuntimeFn<Variants extends VariantGroups> = (
+  options?: VariantSelection<Variants>
+) => string;
+export type RecipeVariants<RecipeFn extends RuntimeFn<VariantGroups>> =
+  Parameters<RecipeFn>[0];
+
+export {};
diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "target": "ESNext",
-    "moduleResolution": "node",
+    "moduleResolution": "node16",
     "esModuleInterop": true,
     "declaration": true,
     "outDir": "build",
@@ -16,4 +16,4 @@
     "dist",
     "node_modules"
   ]
-}
+}
diff --git a/packages/esbuild/package.json b/packages/esbuild/package.json
@@ -14,7 +14,7 @@
     "@vanilla-extract/esbuild-plugin": "^2.0.5",
     "@vanilla-extract/integration": "^6.0.0",
     "esbuild": "^0.14.42",
-    "@macaron-css/integration": "1.0.0"
+    "@macaron-css/integration": "1.5.1"
   },
   "files": [
     "dist",

diff --git a/packages/esbuild/tsconfig.json b/packages/esbuild/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "target": "ESNext",
-    "moduleResolution": "node",
+    "moduleResolution": "node16",
     "esModuleInterop": true,
     "declaration": true,
     "outDir": "build",
@@ -16,4 +16,4 @@
     "node_modules",
     "build"
   ]
-}
+}
diff --git a/packages/qwik/package.json b/packages/qwik/package.json
@@ -2,25 +2,25 @@
   "name": "@macaron-css/qwik",
   "version": "1.5.1",
   "license": "MIT",
-  "main": "dist/index.js",
-  "module": "dist/index.mjs",
-  "types": "dist/index.d.ts",
+  "type": "module",
   "repository": {
     "type": "git",
     "url": "https://github.com/mokshit06/macaron.git",
     "directory": "packages/qwik"
   },
   "exports": {
     ".": {
-      "import": "./dist/index.mjs",
-      "require": "./dist/index.js"
+      "types": "./dist/index.d.mts",
+      "import": "./dist/index.mjs"
     },
-    "./dist/*": "./dist/*",
     "./runtime": {
-      "import": "./dist/runtime.mjs",
-      "require": "./dist/runtime.js"
+      "types": "./dist/index.d.mts",
+      "import": "./dist/runtime.mjs"
     }
   },
+  "dependencies": {
+    "@macaron-css/core": "1.5.1"
+  },
   "devDependencies": {
     "@builder.io/qwik": "^1.1.5",
     "@vanilla-extract/recipes": "^0.2.5"