Skip to content

Commit

Permalink
Merge branch 'master' of github.com:vanilla-extract-css/vanilla-extra…
Browse files Browse the repository at this point in the history
…ct into replace-outdent
  • Loading branch information
askoufis committed Apr 29, 2024
2 parents dd24d77 + 6066606 commit 4dbae05
Show file tree
Hide file tree
Showing 52 changed files with 993 additions and 841 deletions.
5 changes: 5 additions & 0 deletions .changeset/afraid-planets-mix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@vanilla-extract/integration': patch
---

Remove `lodash` dependency
21 changes: 0 additions & 21 deletions .changeset/eighty-shirts-lie.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/gentle-ligers-act.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@vanilla-extract/vite-plugin': patch
---

Fixes a bug that was causing output CSS files to not update during watch mode
4 changes: 2 additions & 2 deletions .github/workflows/deploy-site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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@v3
with:
node-version: ${{ matrix.node }}
node-version-file: ${{ matrix.node == '' && '.nvmrc' || '' }}
Expand Down Expand Up @@ -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' || '' }}
Expand All @@ -75,12 +75,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-file: '.nvmrc'
cache: 'pnpm'
Expand All @@ -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
Expand Down
8 changes: 8 additions & 0 deletions examples/remix/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# vanilla-extract-example-remix

## 0.0.1

### Patch Changes

- Updated dependencies [[`df9fe3ee3fc0057bc14a2333a405f8229f80c214`](https://github.com/vanilla-extract-css/vanilla-extract/commit/df9fe3ee3fc0057bc14a2333a405f8229f80c214)]:
- @vanilla-extract/css@1.15.0
6 changes: 3 additions & 3 deletions 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.0",
"version": "0.0.1",
"private": true,
"type": "module",
"scripts": {
Expand All @@ -12,15 +12,15 @@
"@remix-run/node": "^2.8.0",
"@remix-run/react": "^2.8.0",
"@remix-run/serve": "^2.8.0",
"@vanilla-extract/css": "*",
"@vanilla-extract/css": "workspace:*",
"isbot": "^4",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@remix-run/dev": "^2.8.0",
"@types/react": "^18.2.55",
"@vanilla-extract/vite-plugin": "*",
"@vanilla-extract/vite-plugin": "workspace:*",
"vite": "^5.0.11"
}
}
7 changes: 7 additions & 0 deletions examples/webpack-react/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# vanilla-extract-example-webpack-react

## 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
Expand Down
4 changes: 2 additions & 2 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.27",
"version": "0.0.28",
"main": "src/index.ts",
"author": "SEEK",
"scripts": {
Expand All @@ -22,7 +22,7 @@
"@babel/preset-env": "^7.23.9",
"@babel/preset-react": "^7.23.3",
"@babel/preset-typescript": "^7.23.3",
"@vanilla-extract/css": "1.14.2",
"@vanilla-extract/css": "1.15.0",
"@vanilla-extract/sprinkles": "^1.6.1",
"@vanilla-extract/webpack-plugin": "^2.3.3",
"babel-loader": "^9.1.3",
Expand Down
7 changes: 7 additions & 0 deletions fixtures/features/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @fixtures/features

## 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
Expand Down
4 changes: 2 additions & 2 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.25",
"version": "0.0.26",
"main": "src/index.ts",
"sideEffects": true,
"author": "SEEK",
"private": true,
"dependencies": {
"@vanilla-extract/css": "1.14.2",
"@vanilla-extract/css": "1.15.0",
"@vanilla-extract/dynamic": "2.1.0"
}
}
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.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
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.8",
"version": "0.0.9",
"main": "src/index.ts",
"author": "SEEK",
"private": true,
"dependencies": {
"@vanilla-extract/css": "1.14.2"
"@vanilla-extract/css": "1.15.0"
}
}
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.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
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.25",
"version": "0.0.26",
"main": "src/index.ts",
"author": "SEEK",
"private": true,
"dependencies": {
"@vanilla-extract/css": "1.14.2"
"@vanilla-extract/css": "1.15.0"
}
}
11 changes: 11 additions & 0 deletions fixtures/next-app-router/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# @fixtures/next-app-router

## 0.0.1

### Patch Changes

- Updated dependencies [[`df9fe3ee3fc0057bc14a2333a405f8229f80c214`](https://github.com/vanilla-extract-css/vanilla-extract/commit/df9fe3ee3fc0057bc14a2333a405f8229f80c214)]:
- @vanilla-extract/css@1.15.0
- @fixtures/features@0.0.26
- @fixtures/recipes@0.0.30
- @fixtures/sprinkles@0.0.31
18 changes: 9 additions & 9 deletions 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.0",
"version": "0.0.1",
"private": true,
"scripts": {
"dev": "next dev",
Expand All @@ -13,20 +13,20 @@
"clean:prod": "rm -rf dist"
},
"dependencies": {
"@fixtures/features": "*",
"@fixtures/recipes": "*",
"@fixtures/sprinkles": "*",
"@vanilla-extract/css": "*",
"@vanilla-extract/recipes": "*",
"@vanilla-extract/sprinkles": "*",
"@fixtures/features": "workspace:*",
"@fixtures/recipes": "workspace:*",
"@fixtures/sprinkles": "workspace:*",
"@vanilla-extract/css": "workspace:*",
"@vanilla-extract/recipes": "workspace:*",
"@vanilla-extract/sprinkles": "workspace:*",
"next": "npm:[email protected]",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@types/react": "^18.2.55",
"@vanilla-extract/next-plugin": "*",
"@vanilla-extract/webpack-plugin": "*"
"@vanilla-extract/next-plugin": "workspace:*",
"@vanilla-extract/webpack-plugin": "workspace:*"
},
"browserslist": [
">0.3%",
Expand Down
11 changes: 11 additions & 0 deletions fixtures/next-pages-router/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# @fixtures/next-pages-router

## 0.0.1

### Patch Changes

- Updated dependencies [[`df9fe3ee3fc0057bc14a2333a405f8229f80c214`](https://github.com/vanilla-extract-css/vanilla-extract/commit/df9fe3ee3fc0057bc14a2333a405f8229f80c214)]:
- @vanilla-extract/css@1.15.0
- @fixtures/features@0.0.26
- @fixtures/recipes@0.0.30
- @fixtures/sprinkles@0.0.31
18 changes: 9 additions & 9 deletions 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.0",
"version": "0.0.1",
"private": true,
"scripts": {
"dev": "next dev",
Expand All @@ -13,20 +13,20 @@
"clean:prod": "rm -rf dist"
},
"dependencies": {
"@fixtures/features": "*",
"@fixtures/recipes": "*",
"@fixtures/sprinkles": "*",
"@vanilla-extract/css": "*",
"@vanilla-extract/recipes": "*",
"@vanilla-extract/sprinkles": "*",
"@fixtures/features": "workspace:*",
"@fixtures/recipes": "workspace:*",
"@fixtures/sprinkles": "workspace:*",
"@vanilla-extract/css": "workspace:*",
"@vanilla-extract/recipes": "workspace:*",
"@vanilla-extract/sprinkles": "workspace:*",
"next": "12.3.4",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@types/react": "^18.2.55",
"@vanilla-extract/next-plugin": "*",
"@vanilla-extract/webpack-plugin": "*"
"@vanilla-extract/next-plugin": "workspace:*",
"@vanilla-extract/webpack-plugin": "workspace:*"
},
"browserslist": [
">0.3%",
Expand Down
Loading

0 comments on commit 4dbae05

Please sign in to comment.