Skip to content

Commit

Permalink
Merge branch 'develop' into dependabot/npm_and_yarn/tailwindcss-3.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
lachlanjc committed Jan 16, 2024
2 parents e13813b + 8f6426c commit 796f0db
Show file tree
Hide file tree
Showing 43 changed files with 172 additions and 137 deletions.
4 changes: 2 additions & 2 deletions examples/next/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
"@emotion/react": "^11.11.1",
"@mdx-js/loader": "^2.3.0",
"@mdx-js/react": "^2.3.0",
"@next/mdx": "^13.4.5",
"@next/mdx": "^14.0.4",
"@theme-ui/css": "workspace:^",
"next": "^13.4.5",
"next": "^14.0.4",
"react": "^18.1.0",
"react-dom": "^18",
"theme-ui": "workspace:^"
Expand Down
2 changes: 1 addition & 1 deletion packages/color-modes/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/color-modes",
"version": "0.16.2-develop.1",
"version": "0.16.2-develop.2",
"main": "dist/theme-ui-color-modes.cjs.js",
"module": "dist/theme-ui-color-modes.esm.js",
"types": "dist/theme-ui-color-modes.cjs.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/color/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/color",
"version": "0.16.2-develop.1",
"version": "0.16.2-develop.2",
"source": "src/index.ts",
"main": "dist/theme-ui-color.cjs.js",
"module": "dist/theme-ui-color.esm.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/components",
"version": "0.16.2-develop.1",
"version": "0.16.2-develop.2",
"main": "dist/theme-ui-components.cjs.js",
"module": "dist/theme-ui-components.esm.js",
"types": "dist/theme-ui-components.cjs.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/core",
"version": "0.16.2-develop.1",
"version": "0.16.2-develop.2",
"source": "src/index.ts",
"main": "dist/theme-ui-core.cjs.js",
"module": "dist/theme-ui-core.esm.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/css/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/css",
"version": "0.16.2-develop.1",
"version": "0.16.2-develop.2",
"source": "src/index.ts",
"main": "dist/theme-ui-css.cjs.js",
"module": "dist/theme-ui-css.esm.js",
Expand Down
1 change: 1 addition & 0 deletions packages/css/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ export const multiples = {
export const scales = {
color: 'colors',
background: 'colors',
accentColor: 'colors',
backgroundColor: 'colors',
borderColor: 'colors',
caretColor: 'colors',
Expand Down
4 changes: 3 additions & 1 deletion packages/css/test/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -577,16 +577,18 @@ test('flexBasis uses theme.sizes', () => {
})
})

test('fill and stroke and caretColor use theme.colors', () => {
test('fill, stroke, caretColor, and accentColor use theme.colors', () => {
const style = css({
fill: 'primary',
stroke: 'secondary',
caretColor: 'primary',
accentColor: 'secondary',
})(theme)
expect(style).toEqual({
fill: 'tomato',
stroke: 'cyan',
caretColor: 'tomato',
accentColor: 'cyan',
})
})

Expand Down
2 changes: 1 addition & 1 deletion packages/custom-properties/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@theme-ui/custom-properties",
"description": "Generate CSS custom properties for use with Theme UI",
"version": "0.16.2-develop.1",
"version": "0.16.2-develop.2",
"source": "src/index.ts",
"main": "dist/theme-ui-custom-properties.cjs.js",
"module": "dist/theme-ui-custom-properties.esm.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/docs/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "docs",
"version": "0.16.2-develop.1",
"version": "0.16.2-develop.2",
"main": "dist/docs.cjs.js",
"author": "Brent Jackson <[email protected]>",
"license": "MIT",
Expand Down
1 change: 1 addition & 0 deletions packages/docs/src/pages/sx-prop.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ available.
| `letterSpacing` | `letterSpacings` |
| `color` | `colors` |
| `bg`, `backgroundColor` | `colors` |
| `accentColor` | `colors` |
| `borderColor` | `colors` |
| `caretColor` | `colors` |
| `outlineColor` | `colors` |
Expand Down
2 changes: 1 addition & 1 deletion packages/e2e/integration/docs-navigation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ describe('docs navigation', () => {
(link) => link.textContent === 'Packages'
)!

packagesLink.click()
packagesLink.click({ force: true })
})

for (const packageName of [
Expand Down
2 changes: 1 addition & 1 deletion packages/e2e/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "e2e",
"private": true,
"version": "0.16.2-develop.1",
"version": "0.16.2-develop.2",
"description": "Cypress tests ran against Theme UI docs and examples",
"scripts": {
"open": "cypress open",
Expand Down
2 changes: 1 addition & 1 deletion packages/gatsby-plugin-theme-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gatsby-plugin-theme-ui",
"version": "0.16.2-develop.1",
"version": "0.16.2-develop.2",
"main": "dist/gatsby-plugin-theme-ui.cjs.js",
"module": "dist/gatsby-plugin-theme-ui.esm.js",
"browser": {
Expand Down
2 changes: 1 addition & 1 deletion packages/gatsby-theme-style-guide/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gatsby-theme-style-guide",
"version": "0.16.2-develop.1",
"version": "0.16.2-develop.2",
"main": "dist/gatsby-theme-style-guide.cjs.js",
"license": "MIT",
"repository": "system-ui/theme-ui",
Expand Down
2 changes: 1 addition & 1 deletion packages/gatsby-theme-ui-layout/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gatsby-theme-ui-layout",
"version": "0.16.2-develop.1",
"version": "0.16.2-develop.2",
"main": "dist/gatsby-theme-ui-layout.cjs.js",
"repository": "system-ui/theme-ui",
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/global/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/global",
"version": "0.16.2-develop.1",
"version": "0.16.2-develop.2",
"repository": "system-ui/theme-ui",
"main": "dist/theme-ui-global.cjs.js",
"module": "dist/theme-ui-global.esm.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/match-media/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/match-media",
"version": "0.16.2-develop.1",
"version": "0.16.2-develop.2",
"description": "React hooks for theme-ui breakpoints",
"source": "src/index.ts",
"main": "dist/theme-ui-match-media.cjs.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/mdx/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/mdx",
"version": "0.16.2-develop.1",
"version": "0.16.2-develop.2",
"source": "src/index.ts",
"main": "dist/theme-ui-mdx.cjs.js",
"module": "dist/theme-ui-mdx.esm.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/preset-base/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/preset-base",
"version": "0.16.2-develop.1",
"version": "0.16.2-develop.2",
"main": "dist/theme-ui-preset-base.cjs.js",
"module": "dist/theme-ui-preset-base.esm.js",
"author": "Brent Jackson",
Expand Down
2 changes: 1 addition & 1 deletion packages/preset-bootstrap/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/preset-bootstrap",
"version": "0.16.2-develop.1",
"version": "0.16.2-develop.2",
"main": "dist/theme-ui-preset-bootstrap.cjs.js",
"module": "dist/theme-ui-preset-bootstrap.esm.js",
"types": "dist/theme-ui-preset-bootstrap.cjs.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/preset-bulma/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/preset-bulma",
"version": "0.16.2-develop.1",
"version": "0.16.2-develop.2",
"main": "dist/theme-ui-preset-bulma.cjs.js",
"module": "dist/theme-ui-preset-bulma.esm.js",
"source": "src/index.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/preset-dark/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/preset-dark",
"version": "0.16.2-develop.1",
"version": "0.16.2-develop.2",
"main": "dist/theme-ui-preset-dark.cjs.js",
"module": "dist/theme-ui-preset-dark.esm.js",
"types": "dist/theme-ui-preset-dark.cjs.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/preset-deep/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/preset-deep",
"version": "0.16.2-develop.1",
"version": "0.16.2-develop.2",
"main": "dist/theme-ui-preset-deep.cjs.js",
"module": "dist/theme-ui-preset-deep.esm.js",
"source": "src/index.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/preset-funk/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/preset-funk",
"version": "0.16.2-develop.1",
"version": "0.16.2-develop.2",
"main": "dist/theme-ui-preset-funk.cjs.js",
"module": "dist/theme-ui-preset-funk.esm.js",
"source": "src/index.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/preset-future/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/preset-future",
"version": "0.16.2-develop.1",
"version": "0.16.2-develop.2",
"main": "dist/theme-ui-preset-future.cjs.js",
"module": "dist/theme-ui-preset-future.esm.js",
"source": "src/index.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/preset-polaris/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/preset-polaris",
"version": "0.16.2-develop.1",
"version": "0.16.2-develop.2",
"main": "dist/theme-ui-preset-polaris.cjs.js",
"module": "dist/theme-ui-preset-polaris.esm.js",
"source": "src/index.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/preset-roboto/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/preset-roboto",
"version": "0.16.2-develop.1",
"version": "0.16.2-develop.2",
"main": "dist/theme-ui-preset-roboto.cjs.js",
"module": "dist/theme-ui-preset-roboto.esm.js",
"types": "dist/theme-ui-preset-roboto.cjs.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/preset-sketchy/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/preset-sketchy",
"version": "0.16.2-develop.1",
"version": "0.16.2-develop.2",
"main": "dist/theme-ui-preset-sketchy.cjs.js",
"module": "dist/theme-ui-preset-sketchy.esm.js",
"types": "dist/theme-ui-preset-sketchy.cjs.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/preset-swiss/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/preset-swiss",
"version": "0.16.2-develop.1",
"version": "0.16.2-develop.2",
"main": "dist/theme-ui-preset-swiss.cjs.js",
"module": "dist/theme-ui-preset-swiss.esm.js",
"types": "dist/theme-ui-preset-swiss.cjs.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/preset-system/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/preset-system",
"version": "0.16.2-develop.1",
"version": "0.16.2-develop.2",
"main": "dist/theme-ui-preset-system.cjs.js",
"module": "dist/theme-ui-preset-system.esm.js",
"types": "dist/theme-ui-preset-system.cjs.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/preset-tailwind/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/preset-tailwind",
"version": "0.16.2-develop.1",
"version": "0.16.2-develop.2",
"main": "dist/theme-ui-preset-tailwind.cjs.js",
"module": "dist/theme-ui-preset-tailwind.esm.js",
"types": "dist/theme-ui-preset-tailwind.cjs.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/preset-tosh/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/preset-tosh",
"version": "0.16.2-develop.1",
"version": "0.16.2-develop.2",
"main": "dist/theme-ui-preset-tosh.cjs.js",
"module": "dist/theme-ui-preset-tosh.esm.js",
"types": "dist/theme-ui-preset-tosh.cjs.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/presets/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/presets",
"version": "0.16.2-develop.1",
"version": "0.16.2-develop.2",
"main": "dist/theme-ui-presets.cjs.js",
"module": "dist/theme-ui-presets.esm.js",
"types": "dist/theme-ui-presets.cjs.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/prism/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/prism",
"version": "0.16.2-develop.1",
"version": "0.16.2-develop.2",
"main": "dist/theme-ui-prism.cjs.js",
"module": "dist/theme-ui-prism.esm.js",
"types": "dist/theme-ui-prism.cjs.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/style-guide/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/style-guide",
"version": "0.16.2-develop.1",
"version": "0.16.2-develop.2",
"main": "dist/theme-ui-style-guide.cjs.js",
"module": "dist/theme-ui-style-guide.esm.js",
"types": "dist/theme-ui-style-guide.cjs.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/tachyons/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@theme-ui/tachyons",
"description": "⚠ DEPRECATED: Generate static CSS for use outside of React with Theme UI and Tachyons",
"version": "0.16.2-develop.1",
"version": "0.16.2-develop.2",
"private": true,
"main": "dist/theme-ui-tachyons.cjs.js",
"module": "dist/theme-ui-tachyons.esm.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/tailwind/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@theme-ui/tailwind",
"description": "Generate static CSS for use outside of React with Theme UI and Tailwind.css",
"version": "0.16.2-develop.1",
"version": "0.16.2-develop.2",
"main": "dist/theme-ui-tailwind.cjs.js",
"module": "dist/theme-ui-tailwind.esm.js",
"source": "src/index.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/test-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/test-utils",
"version": "0.16.2-develop.1",
"version": "0.16.2-develop.2",
"private": true,
"license": "MIT",
"repository": "system-ui/theme-ui",
Expand Down
2 changes: 1 addition & 1 deletion packages/theme-provider/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/theme-provider",
"version": "0.16.2-develop.1",
"version": "0.16.2-develop.2",
"repository": "system-ui/theme-ui",
"main": "dist/theme-ui-theme-provider.cjs.js",
"module": "dist/theme-ui-theme-provider.esm.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/theme-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "theme-ui",
"version": "0.16.2-develop.1",
"version": "0.16.2-develop.2",
"description": "The Design Graph Framework",
"source": "src/index.ts",
"main": "dist/theme-ui.cjs.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/typography/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/typography",
"version": "0.16.2-develop.1",
"version": "0.16.2-develop.2",
"main": "dist/theme-ui-typography.cjs.js",
"module": "dist/theme-ui-typography.esm.js",
"source": "src/index.ts",
Expand Down
Loading

0 comments on commit 796f0db

Please sign in to comment.