Merge branch 'develop' into filter-scale-tuples

system-ui · Jan 5, 2024 · d979429 · d979429
2 parents 7f39af3 + e0de3a0
commit d979429
Show file tree

Hide file tree

Showing 42 changed files with 86 additions and 42 deletions.
diff --git a/packages/color-modes/package.json b/packages/color-modes/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@theme-ui/color-modes",
-  "version": "0.16.2-scale-tuples.0",
+  "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",

diff --git a/packages/color/package.json b/packages/color/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@theme-ui/color",
-  "version": "0.16.2-scale-tuples.0",
+  "version": "0.16.2-develop.2",
   "source": "src/index.ts",
   "main": "dist/theme-ui-color.cjs.js",
   "module": "dist/theme-ui-color.esm.js",

diff --git a/packages/components/package.json b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@theme-ui/components",
-  "version": "0.16.2-scale-tuples.0",
+  "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",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@theme-ui/core",
-  "version": "0.16.2-scale-tuples.0",
+  "version": "0.16.2-develop.2",
   "source": "src/index.ts",
   "main": "dist/theme-ui-core.cjs.js",
   "module": "dist/theme-ui-core.esm.js",

diff --git a/packages/css/package.json b/packages/css/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@theme-ui/css",
-  "version": "0.16.2-scale-tuples.0",
+  "version": "0.16.2-develop.2",
   "source": "src/index.ts",
   "main": "dist/theme-ui-css.cjs.js",
   "module": "dist/theme-ui-css.esm.js",

diff --git a/packages/css/src/index.ts b/packages/css/src/index.ts
@@ -112,6 +112,7 @@ export const multiples = {
 export const scales = {
   color: 'colors',
   background: 'colors',
+  accentColor: 'colors',
   backgroundColor: 'colors',
   borderColor: 'colors',
   caretColor: 'colors',

diff --git a/packages/css/test/index.ts b/packages/css/test/index.ts
@@ -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',
   })
 })
 

diff --git a/packages/custom-properties/package.json b/packages/custom-properties/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@theme-ui/custom-properties",
   "description": "Generate CSS custom properties for use with Theme UI",
-  "version": "0.16.2-scale-tuples.0",
+  "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",

diff --git a/packages/docs/package.json b/packages/docs/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "docs",
-  "version": "0.16.2-scale-tuples.0",
+  "version": "0.16.2-develop.2",
   "main": "dist/docs.cjs.js",
   "author": "Brent Jackson <[email protected]>",
   "license": "MIT",

diff --git a/packages/docs/src/pages/guides/jsx-pragma.mdx b/packages/docs/src/pages/guides/jsx-pragma.mdx
@@ -109,7 +109,7 @@ babel plugin.
 ```js
 // babel.config.js
 module.exports = {
-  presets: [
+  plugins: [
     [
       '@babel/plugin-transform-react-jsx',
       {

diff --git a/packages/docs/src/pages/sx-prop.mdx b/packages/docs/src/pages/sx-prop.mdx
@@ -60,6 +60,7 @@ available.
 | `letterSpacing`           | `letterSpacings` |
 | `color`                   | `colors`         |
 | `bg`, `backgroundColor`   | `colors`         |
+| `accentColor`             | `colors`         |
 | `borderColor`             | `colors`         |
 | `caretColor`              | `colors`         |
 | `outlineColor`            | `colors`         |

diff --git a/packages/e2e/package.json b/packages/e2e/package.json
@@ -1,7 +1,7 @@
 {
   "name": "e2e",
   "private": true,
-  "version": "0.16.2-scale-tuples.0",
+  "version": "0.16.2-develop.2",
   "description": "Cypress tests ran against Theme UI docs and examples",
   "scripts": {
     "open": "cypress open",

diff --git a/packages/gatsby-plugin-theme-ui/package.json b/packages/gatsby-plugin-theme-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gatsby-plugin-theme-ui",
-  "version": "0.16.2-scale-tuples.0",
+  "version": "0.16.2-develop.2",
   "main": "dist/gatsby-plugin-theme-ui.cjs.js",
   "module": "dist/gatsby-plugin-theme-ui.esm.js",
   "browser": {

diff --git a/packages/gatsby-theme-style-guide/package.json b/packages/gatsby-theme-style-guide/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gatsby-theme-style-guide",
-  "version": "0.16.2-scale-tuples.0",
+  "version": "0.16.2-develop.2",
   "main": "dist/gatsby-theme-style-guide.cjs.js",
   "license": "MIT",
   "repository": "system-ui/theme-ui",

diff --git a/packages/gatsby-theme-ui-layout/package.json b/packages/gatsby-theme-ui-layout/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gatsby-theme-ui-layout",
-  "version": "0.16.2-scale-tuples.0",
+  "version": "0.16.2-develop.2",
   "main": "dist/gatsby-theme-ui-layout.cjs.js",
   "repository": "system-ui/theme-ui",
   "peerDependencies": {

diff --git a/packages/global/package.json b/packages/global/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@theme-ui/global",
-  "version": "0.16.2-scale-tuples.0",
+  "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",

diff --git a/packages/match-media/package.json b/packages/match-media/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@theme-ui/match-media",
-  "version": "0.16.2-scale-tuples.0",
+  "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",

diff --git a/packages/mdx/package.json b/packages/mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@theme-ui/mdx",
-  "version": "0.16.2-scale-tuples.0",
+  "version": "0.16.2-develop.2",
   "source": "src/index.ts",
   "main": "dist/theme-ui-mdx.cjs.js",
   "module": "dist/theme-ui-mdx.esm.js",

diff --git a/packages/preset-base/package.json b/packages/preset-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@theme-ui/preset-base",
-  "version": "0.16.2-scale-tuples.0",
+  "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",

diff --git a/packages/preset-bootstrap/package.json b/packages/preset-bootstrap/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@theme-ui/preset-bootstrap",
-  "version": "0.16.2-scale-tuples.0",
+  "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",

diff --git a/packages/preset-bulma/package.json b/packages/preset-bulma/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@theme-ui/preset-bulma",
-  "version": "0.16.2-scale-tuples.0",
+  "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",

diff --git a/packages/preset-dark/package.json b/packages/preset-dark/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@theme-ui/preset-dark",
-  "version": "0.16.2-scale-tuples.0",
+  "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",

diff --git a/packages/preset-deep/package.json b/packages/preset-deep/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@theme-ui/preset-deep",
-  "version": "0.16.2-scale-tuples.0",
+  "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",

diff --git a/packages/preset-funk/package.json b/packages/preset-funk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@theme-ui/preset-funk",
-  "version": "0.16.2-scale-tuples.0",
+  "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",

diff --git a/packages/preset-future/package.json b/packages/preset-future/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@theme-ui/preset-future",
-  "version": "0.16.2-scale-tuples.0",
+  "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",

diff --git a/packages/preset-polaris/package.json b/packages/preset-polaris/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@theme-ui/preset-polaris",
-  "version": "0.16.2-scale-tuples.0",
+  "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",

diff --git a/packages/preset-roboto/package.json b/packages/preset-roboto/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@theme-ui/preset-roboto",
-  "version": "0.16.2-scale-tuples.0",
+  "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",

diff --git a/packages/preset-sketchy/package.json b/packages/preset-sketchy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@theme-ui/preset-sketchy",
-  "version": "0.16.2-scale-tuples.0",
+  "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",

diff --git a/packages/preset-swiss/package.json b/packages/preset-swiss/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@theme-ui/preset-swiss",
-  "version": "0.16.2-scale-tuples.0",
+  "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",

diff --git a/packages/preset-system/package.json b/packages/preset-system/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@theme-ui/preset-system",
-  "version": "0.16.2-scale-tuples.0",
+  "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",

diff --git a/packages/preset-tailwind/package.json b/packages/preset-tailwind/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@theme-ui/preset-tailwind",
-  "version": "0.16.2-scale-tuples.0",
+  "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",

diff --git a/packages/preset-tosh/package.json b/packages/preset-tosh/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@theme-ui/preset-tosh",
-  "version": "0.16.2-scale-tuples.0",
+  "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",

diff --git a/packages/presets/package.json b/packages/presets/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@theme-ui/presets",
-  "version": "0.16.2-scale-tuples.0",
+  "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",

diff --git a/packages/prism/package.json b/packages/prism/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@theme-ui/prism",
-  "version": "0.16.2-scale-tuples.0",
+  "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",

diff --git a/packages/style-guide/package.json b/packages/style-guide/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@theme-ui/style-guide",
-  "version": "0.16.2-scale-tuples.0",
+  "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",

diff --git a/packages/tachyons/package.json b/packages/tachyons/package.json
@@ -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-scale-tuples.0",
+  "version": "0.16.2-develop.2",
   "private": true,
   "main": "dist/theme-ui-tachyons.cjs.js",
   "module": "dist/theme-ui-tachyons.esm.js",

diff --git a/packages/tailwind/package.json b/packages/tailwind/package.json
@@ -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-scale-tuples.0",
+  "version": "0.16.2-develop.2",
   "main": "dist/theme-ui-tailwind.cjs.js",
   "module": "dist/theme-ui-tailwind.esm.js",
   "source": "src/index.ts",

diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@theme-ui/test-utils",
-  "version": "0.16.2-scale-tuples.0",
+  "version": "0.16.2-develop.2",
   "private": true,
   "license": "MIT",
   "repository": "system-ui/theme-ui",

diff --git a/packages/theme-provider/package.json b/packages/theme-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@theme-ui/theme-provider",
-  "version": "0.16.2-scale-tuples.0",
+  "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",

diff --git a/packages/theme-ui/package.json b/packages/theme-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "theme-ui",
-  "version": "0.16.2-scale-tuples.0",
+  "version": "0.16.2-develop.2",
   "description": "The Design Graph Framework",
   "source": "src/index.ts",
   "main": "dist/theme-ui.cjs.js",

diff --git a/packages/typography/package.json b/packages/typography/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@theme-ui/typography",
-  "version": "0.16.2-scale-tuples.0",
+  "version": "0.16.2-develop.2",
   "main": "dist/theme-ui-typography.cjs.js",
   "module": "dist/theme-ui-typography.esm.js",
   "source": "src/index.ts",