Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into practice-canary
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] committed May 8, 2024
2 parents 95a3e05 + c244332 commit d3c8dd0
Show file tree
Hide file tree
Showing 61 changed files with 2,767 additions and 842 deletions.
6 changes: 0 additions & 6 deletions .changeset/eleven-items-grow.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/quick-wombats-nail.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/real-boxes-approve.md

This file was deleted.

16 changes: 0 additions & 16 deletions .changeset/silent-doors-count.md

This file was deleted.

2 changes: 1 addition & 1 deletion examples/basic-typescript-pages/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"icons": "npx @svgr/cli --typescript --replace-attr-values \"#000=currentColor\" --out-dir generated/icons -- public/icons"
},
"dependencies": {
"@makeswift/runtime": "^0.16.1",
"@makeswift/runtime": "^0.17.0",
"@radix-ui/react-accordion": "^1.1.2",
"@radix-ui/react-tabs": "^1.0.4",
"clsx": "^2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/basic-typescript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"icons": "npx @svgr/cli --typescript --replace-attr-values \"#000=currentColor\" --out-dir generated/icons -- public/icons"
},
"dependencies": {
"@makeswift/runtime": "0.16.1",
"@makeswift/runtime": "^0.17.0",
"@radix-ui/react-accordion": "^1.1.2",
"@radix-ui/react-tabs": "^1.0.4",
"clsx": "^2.0.0",
Expand Down
24 changes: 17 additions & 7 deletions examples/bigcommerce-catalyst/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion examples/bigcommerce-catalyst/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@bigcommerce/catalyst-client": "^0.1.1",
"@graphql-typed-document-node/core": "^3.2.0",
"@icons-pack/react-simple-icons": "^9.3.0",
"@makeswift/runtime": "^0.16.1",
"@makeswift/runtime": "^0.17.0",
"@radix-ui/react-accordion": "^1.1.2",
"@radix-ui/react-checkbox": "^1.0.4",
"@radix-ui/react-dialog": "^1.0.5",
Expand Down
2 changes: 1 addition & 1 deletion examples/bigcommerce/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"dependencies": {
"@headlessui/react": "1.6.6",
"@makeswift/runtime": "^0.16.1",
"@makeswift/runtime": "^0.17.0",
"i18next": "22.1.4",
"next": "^14.2.3",
"next-i18next": "13.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/shopify/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"dependencies": {
"@headlessui/react": "1.6.6",
"@makeswift/runtime": "^0.16.1",
"@makeswift/runtime": "^0.17.0",
"next": "^14.2.3",
"react": "^18.3.1",
"react-dom": "^18.3.1",
Expand Down
2 changes: 1 addition & 1 deletion examples/thirdweb/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@chakra-ui/react": "^2.5.5",
"@emotion/react": "11",
"@emotion/styled": "11",
"@makeswift/runtime": "^0.16.1",
"@makeswift/runtime": "^0.17.0",
"@thirdweb-dev/react": "^3.14.20",
"@thirdweb-dev/sdk": "^3.10.40",
"classnames": "2.3.1",
Expand Down
17 changes: 13 additions & 4 deletions packages/prop-controllers/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,26 @@
# @makeswift/prop-controllers

## 0.2.0-canary.1
## 0.2.1

### Minor Changes
### Patch Changes

- 87e1665: Add data type to legacy `Grid` prop controller and move it to `@makeswift/prop-controllers`.
- 9a439d5: Update `BackgroundsDescriptorV1` version field to be optional to match previous behavior.

## 0.2.0-canary.0
## 0.2.0

### Minor Changes

- f5c3617: Add data type to legacy `TableFormFields` prop controller and move it to `@makeswift/prop-controllers`.
- bb82576: Add data type to legacy `Image` prop controller and move it to `@makeswift/prop-controllers`.
- 860f92a: Add data type to legacy `Backgrounds` prop controller and move it to `@makeswift/prop-controllers`.
- 61d43cc: Add data type to legacy `Images` prop controller and move it to `@makeswift/prop-controllers`.
- 092784c: Add data type to legacy `ElementID` prop controller and move it to `@makeswift/prop-controllers`.
- 87e1665: Add data type to legacy `Grid` prop controller and move it to `@makeswift/prop-controllers`.

### Patch Changes

- 4b0d47c: Use correct copy method for ElementID.
- 4d38a0b: Fix v2 data values not properly transformed for `ResponsiveValue` option.

## 0.1.1

Expand Down
2 changes: 1 addition & 1 deletion packages/prop-controllers/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@makeswift/prop-controllers",
"version": "0.2.0-canary.1",
"version": "0.2.1",
"license": "MIT",
"type": "module",
"files": [
Expand Down

0 comments on commit d3c8dd0

Please sign in to comment.