Merge branch 'master' into syfxlin/next-plugin

vanilla-extract-css · Nov 9, 2023 · 602b1d0 · 602b1d0
2 parents 5394f37 + 42bdf7a
commit 602b1d0
Show file tree

Hide file tree

Showing 12 changed files with 3,821 additions and 5,199 deletions.
diff --git a/.changeset/grumpy-suns-doubt.md b/.changeset/grumpy-suns-doubt.md
@@ -0,0 +1,5 @@
+---
+"@vanilla-extract/recipes": patch
+---
+
+Improve IDE hover of `RecipeVariants` type by explicitly resolving its output
diff --git a/.changeset/strange-terms-hang.md b/.changeset/strange-terms-hang.md
@@ -0,0 +1,5 @@
+---
+'@vanilla-extract/css': patch
+---
+
+Replace dependency `ahocorasick` with `modern-ahocorasick`
diff --git a/.github/workflows/deploy-site.yml b/.github/workflows/deploy-site.yml
@@ -12,7 +12,7 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@main
 
-      - uses: pnpm/action-setup@v2.2.2
+      - uses: pnpm/action-setup@master
 
       - name: Set up Node.js
         uses: actions/setup-node@main

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -18,7 +18,7 @@ jobs:
           fetch-depth: 0
           token: ${{ secrets.VANILLA_EXTRACT_CI_GITHUB_TOKEN }}
 
-      - uses: pnpm/action-setup@v2.2.2
+      - uses: pnpm/action-setup@master
 
       - name: Set up Node.js
         uses: actions/setup-node@main

diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
@@ -16,7 +16,7 @@ jobs:
           fetch-depth: 0
           token: ${{ secrets.VANILLA_EXTRACT_CI_GITHUB_TOKEN }}
 
-      - uses: pnpm/action-setup@v2.2.2
+      - uses: pnpm/action-setup@master
 
       - name: Set up Node.js
         uses: actions/setup-node@main

diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -8,7 +8,7 @@ jobs:
       matrix:
         # Blank string allows us to test against version in nvmrc file
         # configured in 'Set up Node.js' down below.
-        node: [14, ''] # Add 'lts/*' to this list when ready
+        node: ['', 'lts/*']
     name: Lint & Test (${{ (matrix.node && matrix.node != 'lts/*') && format('node {0}', matrix.node) || matrix.node || 'nvmrc' }})
     runs-on: ubuntu-latest
     env:
@@ -17,7 +17,7 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@main
 
-      - uses: pnpm/action-setup@v2
+      - uses: pnpm/action-setup@master
 
       - name: Set up Node.js
         uses: actions/setup-node@main
@@ -42,7 +42,7 @@ jobs:
       matrix:
         # Blank string allows us to test against version in nvmrc file
         # configured in 'Set up Node.js' down below.
-        node: [''] # Add 'lts/*' to this list when ready
+        node: ['', 'lts/*']
     name: Windows Tests (${{ (matrix.node && matrix.node != 'lts/*') && format('node {0}', matrix.node) || matrix.node || 'nvmrc' }})
     runs-on: windows-latest
     env:
@@ -51,7 +51,7 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@main
 
-      - uses: pnpm/action-setup@v2
+      - uses: pnpm/action-setup@master
 
       - name: Set up Node.js
         uses: actions/setup-node@main
@@ -77,7 +77,7 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@main
 
-      - uses: pnpm/action-setup@v2
+      - uses: pnpm/action-setup@master
 
       - name: Set up Node.js
         uses: actions/setup-node@main

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v16.17.0
+v20.9.0
diff --git a/package.json b/package.json
@@ -24,14 +24,6 @@
     "prepare-release": "pnpm copy-readme-to-packages && pnpm build",
     "release": "pnpm prepare-release && changeset publish"
   },
-  "preconstruct": {
-    "packages": [
-      "packages/*"
-    ]
-  },
-  "volta": {
-    "node": "16.17.0"
-  },
   "dependencies": {
     "@babel/core": "^7.20.7",
     "@babel/preset-env": "^7.20.2",
@@ -60,10 +52,18 @@
     "typescript": "^4.9.4",
     "vitest": "^0.28.5"
   },
-  "packageManager": "[email protected]",
+  "preconstruct": {
+    "packages": [
+      "packages/*"
+    ]
+  },
+  "packageManager": "[email protected]",
   "pnpm": {
     "patchedDependencies": {
       "[email protected]": "patches/[email protected]"
     }
+  },
+  "volta": {
+    "node": "20.9.0"
   }
 }
diff --git a/packages/css/src/ahocorasick.d.ts b/packages/css/src/ahocorasick.d.ts
diff --git a/packages/recipes/src/types.ts b/packages/recipes/src/types.ts
@@ -1,5 +1,9 @@
 import type { ComplexStyleRule } from '@vanilla-extract/css';
 
+type Resolve<T> = {
+  [Key in keyof T]: T[Key];
+} & {};
+
 type RecipeStyleRule = ComplexStyleRule | string;
 
 export type VariantDefinitions = Record<string, RecipeStyleRule>;
@@ -48,5 +52,6 @@ export type RuntimeFn<Variants extends VariantGroups> = ((
   classNames: RecipeClassNames<Variants>;
 };
 
-export type RecipeVariants<RecipeFn extends RuntimeFn<VariantGroups>> =
-  Parameters<RecipeFn>[0];
+export type RecipeVariants<RecipeFn extends RuntimeFn<VariantGroups>> = Resolve<
+  Parameters<RecipeFn>[0]
+>;