Merge branch 'master' into package-json-types-field

vanilla-extract-css · May 21, 2024 · afce0e0 · afce0e0
2 parents 067bc46 + 58bb8fa
commit afce0e0
Show file tree

Hide file tree

Showing 117 changed files with 2,626 additions and 1,051 deletions.
diff --git a/.github/workflows/deploy-site.yml b/.github/workflows/deploy-site.yml
@@ -10,12 +10,12 @@ jobs:
       CI: true
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@main
+        uses: actions/checkout@v4
 
       - uses: pnpm/action-setup@master
 
       - name: Set up Node.js
-        uses: actions/setup-node@main
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: 'pnpm'

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,15 +13,15 @@ jobs:
       CI: true
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@main
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           token: ${{ secrets.VANILLA_EXTRACT_CI_GITHUB_TOKEN }}
 
-      - uses: pnpm/action-setup@master
+      - uses: pnpm/action-setup@v3
 
       - name: Set up Node.js
-        uses: actions/setup-node@main
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: 'pnpm'

diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
@@ -10,16 +10,16 @@ jobs:
       CI: true
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@main
+        uses: actions/checkout@v4
         with:
           # This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits
           fetch-depth: 0
           token: ${{ secrets.VANILLA_EXTRACT_CI_GITHUB_TOKEN }}
 
-      - uses: pnpm/action-setup@master
+      - uses: pnpm/action-setup@v3
 
       - name: Set up Node.js
-        uses: actions/setup-node@main
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: 'pnpm'

diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -15,12 +15,12 @@ jobs:
       CI: true
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@main
+        uses: actions/checkout@v4
 
-      - uses: pnpm/action-setup@master
+      - uses: pnpm/action-setup@v3
 
       - name: Set up Node.js
-        uses: actions/setup-node@main
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
           node-version-file: ${{ matrix.node == '' && '.nvmrc' || '' }}
@@ -49,12 +49,12 @@ jobs:
       CI: true
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@main
+        uses: actions/checkout@v4
 
-      - uses: pnpm/action-setup@master
+      - uses: pnpm/action-setup@v3
 
       - name: Set up Node.js
-        uses: actions/setup-node@main
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
           node-version-file: ${{ matrix.node == '' && '.nvmrc' || '' }}
@@ -70,17 +70,17 @@ jobs:
         run: pnpm test:unit
   playwright:
     name: Playwright tests
-    runs-on: macos-11
+    runs-on: macos-14
     env:
       CI: true
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@main
+        uses: actions/checkout@v4
 
-      - uses: pnpm/action-setup@master
+      - uses: pnpm/action-setup@v3
 
       - name: Set up Node.js
-        uses: actions/setup-node@main
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: 'pnpm'
@@ -97,7 +97,7 @@ jobs:
       - name: Playwright tests
         run: pnpm test:playwright
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: test-results

diff --git a/docs/treat-migration-guide.md b/docs/treat-migration-guide.md
@@ -10,10 +10,6 @@ We've made sure that both treat and vanilla-extract can run simultaneously in th
 
 The file extension has changed from `*.treat.ts` to `*.css.ts`.
 
-## Babel plugin is required
-
-The Babel plugin was optional in treat, but it's required in vanilla-extract.
-
 ## `.css.ts` files can import other `.css.ts` files
 
 This wasn't possible in treat with `*.treat.ts` files. If you've had to work around this limitation in the past, you don't need to worry anymore!

diff --git a/examples/remix/CHANGELOG.md b/examples/remix/CHANGELOG.md
@@ -0,0 +1,15 @@
+# vanilla-extract-example-remix
+
+## 0.0.2
+
+### Patch Changes
+
+- Updated dependencies [[`e58cf9013c6f6cdfacb2a7936b3354e71138e9fb`](https://github.com/vanilla-extract-css/vanilla-extract/commit/e58cf9013c6f6cdfacb2a7936b3354e71138e9fb), [`3df9b4ebc5ad7e03e5c908c10216447b7089132a`](https://github.com/vanilla-extract-css/vanilla-extract/commit/3df9b4ebc5ad7e03e5c908c10216447b7089132a)]:
+  - @vanilla-extract/css@1.15.1
+
+## 0.0.1
+
+### Patch Changes
+
+- Updated dependencies [[`df9fe3ee3fc0057bc14a2333a405f8229f80c214`](https://github.com/vanilla-extract-css/vanilla-extract/commit/df9fe3ee3fc0057bc14a2333a405f8229f80c214)]:
+  - @vanilla-extract/css@1.15.0
diff --git a/examples/remix/package.json b/examples/remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vanilla-extract-example-remix",
-  "version": "0.0.0",
+  "version": "0.0.2",
   "private": true,
   "type": "module",
   "scripts": {
@@ -9,18 +9,18 @@
     "start": "remix-serve ./build/server/index.js"
   },
   "dependencies": {
-    "@remix-run/node": "^2.6.0",
-    "@remix-run/react": "^2.6.0",
-    "@remix-run/serve": "^2.6.0",
-    "@vanilla-extract/css": "*",
+    "@remix-run/node": "^2.8.0",
+    "@remix-run/react": "^2.8.0",
+    "@remix-run/serve": "^2.8.0",
+    "@vanilla-extract/css": "workspace:*",
     "isbot": "^4",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@remix-run/dev": "^2.6.0",
+    "@remix-run/dev": "^2.8.0",
     "@types/react": "^18.2.55",
-    "@vanilla-extract/vite-plugin": "*",
+    "@vanilla-extract/vite-plugin": "workspace:*",
     "vite": "^5.0.11"
   }
 }
diff --git a/examples/remix/vite.config.ts b/examples/remix/vite.config.ts
@@ -1,6 +1,6 @@
 import { defineConfig } from 'vite';
 import { vanillaExtractPlugin } from '@vanilla-extract/vite-plugin';
-import { unstable_vitePlugin as remix } from '@remix-run/dev';
+import { vitePlugin as remix } from '@remix-run/dev';
 
 export default defineConfig({
   css: {

diff --git a/examples/webpack-react/CHANGELOG.md b/examples/webpack-react/CHANGELOG.md
@@ -1,5 +1,27 @@
 # vanilla-extract-example-webpack-react
 
+## 0.0.29
+
+### Patch Changes
+
+- Updated dependencies [[`e58cf9013c6f6cdfacb2a7936b3354e71138e9fb`](https://github.com/vanilla-extract-css/vanilla-extract/commit/e58cf9013c6f6cdfacb2a7936b3354e71138e9fb), [`3df9b4ebc5ad7e03e5c908c10216447b7089132a`](https://github.com/vanilla-extract-css/vanilla-extract/commit/3df9b4ebc5ad7e03e5c908c10216447b7089132a)]:
+  - @vanilla-extract/css@1.15.1
+  - @vanilla-extract/webpack-plugin@2.3.8
+
+## 0.0.28
+
+### Patch Changes
+
+- Updated dependencies [[`df9fe3ee3fc0057bc14a2333a405f8229f80c214`](https://github.com/vanilla-extract-css/vanilla-extract/commit/df9fe3ee3fc0057bc14a2333a405f8229f80c214)]:
+  - @vanilla-extract/css@1.15.0
+
+## 0.0.27
+
+### Patch Changes
+
+- Updated dependencies [[`90f0315`](https://github.com/vanilla-extract-css/vanilla-extract/commit/90f03153bb7c4a8d5b448eab228c46203e9cdaed)]:
+  - @vanilla-extract/css@1.14.2
+
 ## 0.0.26
 
 ### Patch Changes

diff --git a/examples/webpack-react/package.json b/examples/webpack-react/package.json
@@ -10,7 +10,7 @@
     "webpack",
     "react"
   ],
-  "version": "0.0.26",
+  "version": "0.0.29",
   "main": "src/index.ts",
   "author": "SEEK",
   "scripts": {
@@ -22,9 +22,9 @@
     "@babel/preset-env": "^7.23.9",
     "@babel/preset-react": "^7.23.3",
     "@babel/preset-typescript": "^7.23.3",
-    "@vanilla-extract/css": "1.14.1",
+    "@vanilla-extract/css": "1.15.1",
     "@vanilla-extract/sprinkles": "^1.6.1",
-    "@vanilla-extract/webpack-plugin": "^2.3.3",
+    "@vanilla-extract/webpack-plugin": "^2.3.8",
     "babel-loader": "^9.1.3",
     "css-loader": "^6.9.1",
     "html-webpack-plugin": "^5.3.1",

diff --git a/fixtures/features/CHANGELOG.md b/fixtures/features/CHANGELOG.md
@@ -1,5 +1,26 @@
 # @fixtures/features
 
+## 0.0.27
+
+### Patch Changes
+
+- Updated dependencies [[`e58cf9013c6f6cdfacb2a7936b3354e71138e9fb`](https://github.com/vanilla-extract-css/vanilla-extract/commit/e58cf9013c6f6cdfacb2a7936b3354e71138e9fb), [`3df9b4ebc5ad7e03e5c908c10216447b7089132a`](https://github.com/vanilla-extract-css/vanilla-extract/commit/3df9b4ebc5ad7e03e5c908c10216447b7089132a)]:
+  - @vanilla-extract/css@1.15.1
+
+## 0.0.26
+
+### Patch Changes
+
+- Updated dependencies [[`df9fe3ee3fc0057bc14a2333a405f8229f80c214`](https://github.com/vanilla-extract-css/vanilla-extract/commit/df9fe3ee3fc0057bc14a2333a405f8229f80c214)]:
+  - @vanilla-extract/css@1.15.0
+
+## 0.0.25
+
+### Patch Changes
+
+- Updated dependencies [[`90f0315`](https://github.com/vanilla-extract-css/vanilla-extract/commit/90f03153bb7c4a8d5b448eab228c46203e9cdaed)]:
+  - @vanilla-extract/css@1.14.2
+
 ## 0.0.24
 
 ### Patch Changes

diff --git a/fixtures/features/package.json b/fixtures/features/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@fixtures/features",
-  "version": "0.0.24",
+  "version": "0.0.27",
   "main": "src/index.ts",
   "sideEffects": true,
   "author": "SEEK",
   "private": true,
   "dependencies": {
-    "@vanilla-extract/css": "1.14.1",
+    "@vanilla-extract/css": "1.15.1",
     "@vanilla-extract/dynamic": "2.1.0"
   }
 }
diff --git a/fixtures/features/src/html.ts b/fixtures/features/src/html.ts
@@ -0,0 +1,12 @@
+import * as styles from './features.css';
+import testNodes from '../test-nodes.json';
+
+export default `
+    <div id="${testNodes.mergedStyle}" class="${styles.mergedStyle}">Merged style</div>
+    <div id="${testNodes.styleWithComposition}" class="${styles.styleWithComposition}">Style with composition</div>
+    <div id="${testNodes.styleVariantsWithComposition}" class="${styles.styleVariantsWithComposition.variant}">Style variants with composition</div>
+    <div id="${testNodes.styleVariantsWithMappedComposition}" class="${styles.styleVariantsWithMappedComposition.variant}">Style variants with mapped composition</div>
+    <div id="${testNodes.compositionOnly}" class="${styles.compositionOnly}">Composition only</div>
+    <div id="${testNodes.styleCompositionInSelector}" class="${styles.styleCompositionInSelector}">Style composition in selector</div>
+    <div id="${testNodes.styleVariantsCompositionInSelector}" class="${styles.styleVariantsCompositionInSelector.variant}">Style variants composition in selector</div>
+  `;
diff --git a/fixtures/features/src/index.ts b/fixtures/features/src/index.ts
@@ -1,16 +1,7 @@
-import * as styles from './features.css';
-import testNodes from '../test-nodes.json';
+import html from './html';
 
 function render() {
-  document.body.innerHTML = `
-    <div id="${testNodes.mergedStyle}" class="${styles.mergedStyle}">Merged style</div>
-    <div id="${testNodes.styleWithComposition}" class="${styles.styleWithComposition}">Style with composition</div>
-    <div id="${testNodes.styleVariantsWithComposition}" class="${styles.styleVariantsWithComposition.variant}">Style variants with composition</div>
-    <div id="${testNodes.styleVariantsWithMappedComposition}" class="${styles.styleVariantsWithMappedComposition.variant}">Style variants with mapped composition</div>
-    <div id="${testNodes.compositionOnly}" class="${styles.compositionOnly}">Composition only</div>
-    <div id="${testNodes.styleCompositionInSelector}" class="${styles.styleCompositionInSelector}">Style composition in selector</div>
-    <div id="${testNodes.styleVariantsCompositionInSelector}" class="${styles.styleVariantsCompositionInSelector.variant}">Style variants composition in selector</div>
-  `;
+  document.body.innerHTML = html;
 }
 
 render();

diff --git a/fixtures/layers/CHANGELOG.md b/fixtures/layers/CHANGELOG.md
@@ -1,5 +1,26 @@
 # @fixtures/layers
 
+## 0.0.10
+
+### Patch Changes
+
+- Updated dependencies [[`e58cf9013c6f6cdfacb2a7936b3354e71138e9fb`](https://github.com/vanilla-extract-css/vanilla-extract/commit/e58cf9013c6f6cdfacb2a7936b3354e71138e9fb), [`3df9b4ebc5ad7e03e5c908c10216447b7089132a`](https://github.com/vanilla-extract-css/vanilla-extract/commit/3df9b4ebc5ad7e03e5c908c10216447b7089132a)]:
+  - @vanilla-extract/css@1.15.1
+
+## 0.0.9
+
+### Patch Changes
+
+- Updated dependencies [[`df9fe3ee3fc0057bc14a2333a405f8229f80c214`](https://github.com/vanilla-extract-css/vanilla-extract/commit/df9fe3ee3fc0057bc14a2333a405f8229f80c214)]:
+  - @vanilla-extract/css@1.15.0
+
+## 0.0.8
+
+### Patch Changes
+
+- Updated dependencies [[`90f0315`](https://github.com/vanilla-extract-css/vanilla-extract/commit/90f03153bb7c4a8d5b448eab228c46203e9cdaed)]:
+  - @vanilla-extract/css@1.14.2
+
 ## 0.0.7
 
 ### Patch Changes

diff --git a/fixtures/layers/package.json b/fixtures/layers/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@fixtures/layers",
-  "version": "0.0.7",
+  "version": "0.0.10",
   "main": "src/index.ts",
   "author": "SEEK",
   "private": true,
   "dependencies": {
-    "@vanilla-extract/css": "1.14.1"
+    "@vanilla-extract/css": "1.15.1"
   }
 }
diff --git a/fixtures/low-level/CHANGELOG.md b/fixtures/low-level/CHANGELOG.md
@@ -1,5 +1,26 @@
 # @fixtures/low-level
 
+## 0.0.27
+
+### Patch Changes
+
+- Updated dependencies [[`e58cf9013c6f6cdfacb2a7936b3354e71138e9fb`](https://github.com/vanilla-extract-css/vanilla-extract/commit/e58cf9013c6f6cdfacb2a7936b3354e71138e9fb), [`3df9b4ebc5ad7e03e5c908c10216447b7089132a`](https://github.com/vanilla-extract-css/vanilla-extract/commit/3df9b4ebc5ad7e03e5c908c10216447b7089132a)]:
+  - @vanilla-extract/css@1.15.1
+
+## 0.0.26
+
+### Patch Changes
+
+- Updated dependencies [[`df9fe3ee3fc0057bc14a2333a405f8229f80c214`](https://github.com/vanilla-extract-css/vanilla-extract/commit/df9fe3ee3fc0057bc14a2333a405f8229f80c214)]:
+  - @vanilla-extract/css@1.15.0
+
+## 0.0.25
+
+### Patch Changes
+
+- Updated dependencies [[`90f0315`](https://github.com/vanilla-extract-css/vanilla-extract/commit/90f03153bb7c4a8d5b448eab228c46203e9cdaed)]:
+  - @vanilla-extract/css@1.14.2
+
 ## 0.0.24
 
 ### Patch Changes

diff --git a/fixtures/low-level/package.json b/fixtures/low-level/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@fixtures/low-level",
-  "version": "0.0.24",
+  "version": "0.0.27",
   "main": "src/index.ts",
   "author": "SEEK",
   "private": true,
   "dependencies": {
-    "@vanilla-extract/css": "1.14.1"
+    "@vanilla-extract/css": "1.15.1"
   }
 }