Skip to content

Commit

Permalink
Merge branch 'master' into autocomplete-createTheme-tokens
Browse files Browse the repository at this point in the history
  • Loading branch information
askoufis authored Jun 14, 2024
2 parents f64a3d3 + b86f3f5 commit 99ba624
Show file tree
Hide file tree
Showing 72 changed files with 13,952 additions and 10,125 deletions.
5 changes: 5 additions & 0 deletions .changeset/four-humans-hammer.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@vanilla-extract/css': patch
---

Fixes a bug where declarations with identical selectors would not be merged correctly inside conditional rules
4 changes: 2 additions & 2 deletions examples/next/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
},
"devDependencies": {
"@types/react": "^18.2.55",
"@vanilla-extract/css": "^1.6.3",
"@vanilla-extract/next-plugin": "^2.0.0"
"@vanilla-extract/css": "workspace:^",
"@vanilla-extract/next-plugin": "workspace:^"
},
"browserslist": [
">0.3%",
Expand Down
7 changes: 7 additions & 0 deletions examples/remix/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# vanilla-extract-example-remix

## 0.0.3

### Patch Changes

- Updated dependencies [[`b8a99e4980710a34692034d5da43e584edbc3d17`](https://github.com/vanilla-extract-css/vanilla-extract/commit/b8a99e4980710a34692034d5da43e584edbc3d17)]:
- @vanilla-extract/css@1.15.2

## 0.0.2

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion examples/remix/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vanilla-extract-example-remix",
"version": "0.0.2",
"version": "0.0.3",
"private": true,
"type": "module",
"scripts": {
Expand Down
9 changes: 9 additions & 0 deletions examples/webpack-react/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# vanilla-extract-example-webpack-react

## 0.0.30

### Patch Changes

- Updated dependencies [[`b8a99e4980710a34692034d5da43e584edbc3d17`](https://github.com/vanilla-extract-css/vanilla-extract/commit/b8a99e4980710a34692034d5da43e584edbc3d17)]:
- @vanilla-extract/webpack-plugin@2.3.9
- @vanilla-extract/sprinkles@1.6.2
- @vanilla-extract/css@1.15.2

## 0.0.29

### Patch Changes
Expand Down
8 changes: 4 additions & 4 deletions examples/webpack-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"webpack",
"react"
],
"version": "0.0.29",
"version": "0.0.30",
"main": "src/index.ts",
"author": "SEEK",
"scripts": {
Expand All @@ -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.15.1",
"@vanilla-extract/sprinkles": "^1.6.1",
"@vanilla-extract/webpack-plugin": "^2.3.8",
"@vanilla-extract/css": "workspace:^",
"@vanilla-extract/sprinkles": "workspace:^",
"@vanilla-extract/webpack-plugin": "workspace:^",
"babel-loader": "^9.1.3",
"css-loader": "^6.9.1",
"html-webpack-plugin": "^5.3.1",
Expand Down
8 changes: 8 additions & 0 deletions fixtures/features/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @fixtures/features

## 0.0.28

### Patch Changes

- Updated dependencies [[`b8a99e4980710a34692034d5da43e584edbc3d17`](https://github.com/vanilla-extract-css/vanilla-extract/commit/b8a99e4980710a34692034d5da43e584edbc3d17)]:
- @vanilla-extract/dynamic@2.1.1
- @vanilla-extract/css@1.15.2

## 0.0.27

### Patch Changes
Expand Down
6 changes: 3 additions & 3 deletions fixtures/features/package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "@fixtures/features",
"version": "0.0.27",
"version": "0.0.28",
"main": "src/index.ts",
"sideEffects": true,
"author": "SEEK",
"private": true,
"dependencies": {
"@vanilla-extract/css": "1.15.1",
"@vanilla-extract/dynamic": "2.1.0"
"@vanilla-extract/css": "workspace:^",
"@vanilla-extract/dynamic": "workspace:^"
}
}
7 changes: 7 additions & 0 deletions fixtures/layers/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @fixtures/layers

## 0.0.11

### Patch Changes

- Updated dependencies [[`b8a99e4980710a34692034d5da43e584edbc3d17`](https://github.com/vanilla-extract-css/vanilla-extract/commit/b8a99e4980710a34692034d5da43e584edbc3d17)]:
- @vanilla-extract/css@1.15.2

## 0.0.10

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions fixtures/layers/package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "@fixtures/layers",
"version": "0.0.10",
"version": "0.0.11",
"main": "src/index.ts",
"author": "SEEK",
"private": true,
"dependencies": {
"@vanilla-extract/css": "1.15.1"
"@vanilla-extract/css": "workspace:^"
}
}
7 changes: 7 additions & 0 deletions fixtures/low-level/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @fixtures/low-level

## 0.0.28

### Patch Changes

- Updated dependencies [[`b8a99e4980710a34692034d5da43e584edbc3d17`](https://github.com/vanilla-extract-css/vanilla-extract/commit/b8a99e4980710a34692034d5da43e584edbc3d17)]:
- @vanilla-extract/css@1.15.2

## 0.0.27

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions fixtures/low-level/package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "@fixtures/low-level",
"version": "0.0.27",
"version": "0.0.28",
"main": "src/index.ts",
"author": "SEEK",
"private": true,
"dependencies": {
"@vanilla-extract/css": "1.15.1"
"@vanilla-extract/css": "workspace:^"
}
}
12 changes: 12 additions & 0 deletions fixtures/next-app-router/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# @fixtures/next-app-router

## 0.0.3

### Patch Changes

- Updated dependencies [[`b8a99e4980710a34692034d5da43e584edbc3d17`](https://github.com/vanilla-extract-css/vanilla-extract/commit/b8a99e4980710a34692034d5da43e584edbc3d17)]:
- @vanilla-extract/sprinkles@1.6.2
- @vanilla-extract/recipes@0.5.3
- @vanilla-extract/css@1.15.2
- @fixtures/sprinkles@0.0.33
- @fixtures/features@0.0.28
- @fixtures/recipes@0.0.32

## 0.0.2

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion fixtures/next-app-router/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@fixtures/next-app-router",
"description": "Next app router fixtures",
"version": "0.0.2",
"version": "0.0.3",
"private": true,
"scripts": {
"dev": "next dev",
Expand Down
12 changes: 12 additions & 0 deletions fixtures/next-pages-router/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# @fixtures/next-pages-router

## 0.0.3

### Patch Changes

- Updated dependencies [[`b8a99e4980710a34692034d5da43e584edbc3d17`](https://github.com/vanilla-extract-css/vanilla-extract/commit/b8a99e4980710a34692034d5da43e584edbc3d17)]:
- @vanilla-extract/sprinkles@1.6.2
- @vanilla-extract/recipes@0.5.3
- @vanilla-extract/css@1.15.2
- @fixtures/sprinkles@0.0.33
- @fixtures/features@0.0.28
- @fixtures/recipes@0.0.32

## 0.0.2

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion fixtures/next-pages-router/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@fixtures/next-pages-router",
"description": "Next pages router fixtures",
"version": "0.0.2",
"version": "0.0.3",
"private": true,
"scripts": {
"dev": "next dev",
Expand Down
8 changes: 8 additions & 0 deletions fixtures/recipes/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @fixtures/recipes

## 0.0.32

### Patch Changes

- Updated dependencies [[`b8a99e4980710a34692034d5da43e584edbc3d17`](https://github.com/vanilla-extract-css/vanilla-extract/commit/b8a99e4980710a34692034d5da43e584edbc3d17)]:
- @vanilla-extract/recipes@0.5.3
- @vanilla-extract/css@1.15.2

## 0.0.31

### Patch Changes
Expand Down
6 changes: 3 additions & 3 deletions fixtures/recipes/package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "@fixtures/recipes",
"version": "0.0.31",
"version": "0.0.32",
"main": "src/index.ts",
"sideEffects": true,
"author": "SEEK",
"private": true,
"dependencies": {
"@vanilla-extract/css": "1.15.1",
"@vanilla-extract/recipes": "0.5.2"
"@vanilla-extract/css": "workspace:^",
"@vanilla-extract/recipes": "workspace:^"
}
}
8 changes: 8 additions & 0 deletions fixtures/sprinkles/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @fixtures/sprinkles

## 0.0.33

### Patch Changes

- Updated dependencies [[`b8a99e4980710a34692034d5da43e584edbc3d17`](https://github.com/vanilla-extract-css/vanilla-extract/commit/b8a99e4980710a34692034d5da43e584edbc3d17)]:
- @vanilla-extract/sprinkles@1.6.2
- @vanilla-extract/css@1.15.2

## 0.0.32

### Patch Changes
Expand Down
6 changes: 3 additions & 3 deletions fixtures/sprinkles/package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "@fixtures/sprinkles",
"version": "0.0.32",
"version": "0.0.33",
"main": "src/index.ts",
"sideEffects": true,
"author": "SEEK",
"private": true,
"dependencies": {
"@vanilla-extract/css": "1.15.1",
"@vanilla-extract/sprinkles": "1.6.1"
"@vanilla-extract/css": "workspace:^",
"@vanilla-extract/sprinkles": "workspace:^"
}
}
7 changes: 7 additions & 0 deletions fixtures/template-string-paths/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @fixtures/template-string-paths

## 0.0.5

### Patch Changes

- Updated dependencies [[`b8a99e4980710a34692034d5da43e584edbc3d17`](https://github.com/vanilla-extract-css/vanilla-extract/commit/b8a99e4980710a34692034d5da43e584edbc3d17)]:
- @vanilla-extract/css@1.15.2

## 0.0.4

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions fixtures/template-string-paths/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "@fixtures/template-string-paths",
"version": "0.0.4",
"version": "0.0.5",
"main": "src/index.ts",
"sideEffects": true,
"author": "SEEK",
"private": true,
"dependencies": {
"@vanilla-extract/css": "1.15.1"
"@vanilla-extract/css": "workspace:^"
}
}
8 changes: 8 additions & 0 deletions fixtures/themed/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @fixtures/themed

## 0.0.28

### Patch Changes

- Updated dependencies [[`b8a99e4980710a34692034d5da43e584edbc3d17`](https://github.com/vanilla-extract-css/vanilla-extract/commit/b8a99e4980710a34692034d5da43e584edbc3d17)]:
- @vanilla-extract/dynamic@2.1.1
- @vanilla-extract/css@1.15.2

## 0.0.27

### Patch Changes
Expand Down
6 changes: 3 additions & 3 deletions fixtures/themed/package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "@fixtures/themed",
"version": "0.0.27",
"version": "0.0.28",
"main": "src/index.ts",
"sideEffects": true,
"author": "SEEK",
"private": true,
"dependencies": {
"@vanilla-extract/css": "1.15.1",
"@vanilla-extract/dynamic": "2.1.0"
"@vanilla-extract/css": "workspace:^",
"@vanilla-extract/dynamic": "workspace:^"
}
}
8 changes: 8 additions & 0 deletions fixtures/thirdparty/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @fixtures/thirdparty

## 0.0.6

### Patch Changes

- Updated dependencies [[`b8a99e4980710a34692034d5da43e584edbc3d17`](https://github.com/vanilla-extract-css/vanilla-extract/commit/b8a99e4980710a34692034d5da43e584edbc3d17)]:
- @vanilla-extract/css@1.15.2
- @fixtures/thirdparty-dep@0.0.6

## 0.0.5

### Patch Changes
Expand Down
6 changes: 3 additions & 3 deletions fixtures/thirdparty/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "@fixtures/thirdparty",
"version": "0.0.5",
"version": "0.0.6",
"main": "src/index.ts",
"author": "SEEK",
"private": true,
"dependencies": {
"@fixtures/thirdparty-dep": "0.0.5",
"@vanilla-extract/css": "1.15.1"
"@fixtures/thirdparty-dep": "workspace:*",
"@vanilla-extract/css": "workspace:*"
}
}
8 changes: 8 additions & 0 deletions fixtures/thirdparty/thirdparty-dep/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @fixtures/thirdparty-dep

## 0.0.6

### Patch Changes

- Updated dependencies [[`b8a99e4980710a34692034d5da43e584edbc3d17`](https://github.com/vanilla-extract-css/vanilla-extract/commit/b8a99e4980710a34692034d5da43e584edbc3d17)]:
- @vanilla-extract/css@1.15.2
- @fixtures/thirdparty-dep-dep@0.0.6

## 0.0.5

### Patch Changes
Expand Down
6 changes: 3 additions & 3 deletions fixtures/thirdparty/thirdparty-dep/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fixtures/thirdparty-dep",
"version": "0.0.5",
"version": "0.0.6",
"exports": {
".": {
"import": "./index.mjs"
Expand All @@ -10,7 +10,7 @@
"author": "SEEK",
"private": true,
"dependencies": {
"@fixtures/thirdparty-dep-dep": "0.0.5",
"@vanilla-extract/css": "1.15.1"
"@fixtures/thirdparty-dep-dep": "workspace:*",
"@vanilla-extract/css": "workspace:^"
}
}
Loading

0 comments on commit 99ba624

Please sign in to comment.