Skip to content

Commit

Permalink
Merge branch 'master' into refactor/site-structure
Browse files Browse the repository at this point in the history
  • Loading branch information
sukvvon authored Nov 19, 2024
2 parents e84e7a4 + 7047243 commit 6a53180
Show file tree
Hide file tree
Showing 38 changed files with 400 additions and 775 deletions.
8 changes: 7 additions & 1 deletion .changeset/config.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://unpkg.com/@changesets/config@1.5.0/schema.json",
"$schema": "https://unpkg.com/@changesets/config@3.0.3/schema.json",
"changelog": [
"@changesets/changelog-github",
{ "repo": "vanilla-extract-css/vanilla-extract" }
Expand All @@ -9,6 +9,12 @@
"access": "public",
"baseBranch": "master",
"updateInternalDependencies": "patch",
"snapshot": {
"useCalculatedVersion": true
},
"privatePackages": {
"tag": false, "version": false
},
"___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
"onlyUpdatePeerDependentsWhenOutOfRange": true
}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Checkout Repo
uses: actions/checkout@v4

- uses: pnpm/action-setup@master
- uses: pnpm/action-setup@v4

- name: Set up Node.js
uses: actions/setup-node@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
fetch-depth: 0
token: ${{ secrets.VANILLA_EXTRACT_CI_GITHUB_TOKEN }}

- uses: pnpm/action-setup@v3
- uses: pnpm/action-setup@v4

- name: Set up Node.js
uses: actions/setup-node@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
fetch-depth: 0
token: ${{ secrets.VANILLA_EXTRACT_CI_GITHUB_TOKEN }}

- uses: pnpm/action-setup@v3
- uses: pnpm/action-setup@v4

- name: Set up Node.js
uses: actions/setup-node@v4
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Checkout Repo
uses: actions/checkout@v4

- uses: pnpm/action-setup@v3
- uses: pnpm/action-setup@v4

- name: Set up Node.js
uses: actions/setup-node@v4
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
- name: Checkout Repo
uses: actions/checkout@v4

- uses: pnpm/action-setup@v3
- uses: pnpm/action-setup@v4

- name: Set up Node.js
uses: actions/setup-node@v4
Expand All @@ -77,7 +77,7 @@ jobs:
- name: Checkout Repo
uses: actions/checkout@v4

- uses: pnpm/action-setup@v3
- uses: pnpm/action-setup@v4

- name: Set up Node.js
uses: actions/setup-node@v4
Expand Down
6 changes: 6 additions & 0 deletions fixtures/features/src/html.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,9 @@ export default `
<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>
`;

// @ts-expect-error Vite env not defined
if (import.meta.hot) {
// @ts-expect-error Vite env not defined
import.meta.hot.accept();
}
7 changes: 0 additions & 7 deletions fixtures/features/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,3 @@ function render() {
}

render();

// Uncomment to enable HMR with Vite
// if (import.meta.hot) {
// import.meta.hot.accept('./features.css', () => {
// render();
// });
// }
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
"@babel/preset-env": "^7.23.9",
"@babel/preset-react": "^7.23.3",
"@babel/preset-typescript": "^7.23.3",
"@changesets/changelog-github": "^0.4.8",
"@changesets/cli": "^2.26.2",
"@changesets/changelog-github": "^0.5.0",
"@changesets/cli": "^2.27.8",
"@manypkg/cli": "^0.21.4",
"@playwright/test": "^1.43.1",
"@preconstruct/cli": "^2.8.2",
Expand Down
6 changes: 6 additions & 0 deletions packages/babel-plugin-debug-ids/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @vanilla-extract/babel-plugin-debug-ids

## 1.1.0

### Minor Changes

- [#1450](https://github.com/vanilla-extract-css/vanilla-extract/pull/1450) [`7b256d2`](https://github.com/vanilla-extract-css/vanilla-extract/commit/7b256d2a8ee815911ee96199abe78d6b7246c415) Thanks [@wuz](https://github.com/wuz)! - Add support for the new `createViewTransition` API

## 1.0.6

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/babel-plugin-debug-ids/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vanilla-extract/babel-plugin-debug-ids",
"version": "1.0.6",
"version": "1.1.0",
"description": "Zero-runtime Stylesheets-in-TypeScript",
"main": "dist/vanilla-extract-babel-plugin-debug-ids.cjs.js",
"module": "dist/vanilla-extract-babel-plugin-debug-ids.esm.js",
Expand Down
13 changes: 13 additions & 0 deletions packages/babel-plugin-debug-ids/src/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,19 @@ describe('babel plugin', () => {
`);
});

it('should handle createViewTransition assigned to const', () => {
const source = `
import { createViewTransition } from '@vanilla-extract/css';
const myViewTransition = createViewTransition();
`;

expect(transform(source)).toMatchInlineSnapshot(`
import { createViewTransition } from '@vanilla-extract/css';
const myViewTransition = createViewTransition("myViewTransition");
`);
});

it('should handle fontFace assigned to const', () => {
const source = `
import { fontFace } from '@vanilla-extract/css';
Expand Down
3 changes: 3 additions & 0 deletions packages/babel-plugin-debug-ids/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ const debuggableFunctionConfig = {
createContainer: {
maxParams: 1,
},
createViewTransition: {
maxParams: 1,
},
layer: {
maxParams: 2,
hasDebugId: ({ arguments: args }) => {
Expand Down
Loading

0 comments on commit 6a53180

Please sign in to comment.