Merge remote-tracking branch 'origin/stable' into develop

Author: hasparus

.all-contributorsrc

@@ -1080,6 +1080,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "jordie23",
+      "name": "Jordie Bodlay",
+      "avatar_url": "https://avatars.githubusercontent.com/u/712360?v=4",
+      "profile": "https://www.jordie.net/",
+      "contributions": [
+        "doc"
+      ]
     }
   ]
 }

CHANGELOG.md

@@ -1,38 +1,181 @@
+# v0.11.1 (Wed Aug 25 2021)
+
+
+
+---
+
+# v0.11.0 (Wed Aug 25 2021)
+
+:tada: This release contains work from new contributors! :tada:
+
+Thanks for all your work!
+
+:heart: Torne Wuff ([@tornewuff](https://github.com/tornewuff))
+
+:heart: Jordie Bodlay ([@jordie23](https://github.com/jordie23))
+
+### Release Notes
+
+#### Fixed a long-standing bug with color modes in nested providers ([#1456](https://github.com/system-ui/theme-ui/issues/1456))
+
+#### Added @theme-ui/css/utils with TypeScript CIF functions and fix preset types ([#1862](https://github.com/system-ui/theme-ui/pull/1862))
+
+- Added TypeScript
+  [Constrained identity functions](https://kentcdodds.com/blog/how-to-write-a-constrained-identity-function-in-typescript)
+  `makeTheme`, `makeStyles` and `makeColorsScale` which can be imported from
+  _@theme-ui/css/utils_.
+- Used aformentioned functions to properly define types of presets. Exported
+  themes are now assignable to _Theme_ but their types narrowly describe their
+  exact values.
+
+---
+
+---
+
+#### 🚀 Enhancement
+
+- `@theme-ui/color`, `@theme-ui/css`, `@theme-ui/preset-base`,
+  `@theme-ui/preset-bootstrap`, `@theme-ui/preset-bulma`,
+  `@theme-ui/preset-dark`, `@theme-ui/preset-deep`, `@theme-ui/preset-funk`,
+  `@theme-ui/preset-future`, `@theme-ui/preset-polaris`,
+  `@theme-ui/preset-roboto`, `@theme-ui/preset-sketchy`,
+  `@theme-ui/preset-swiss`, `@theme-ui/preset-system`,
+  `@theme-ui/preset-tailwind`, `@theme-ui/preset-tosh`, `@theme-ui/presets`
+  - Add @theme-ui/css/utils with TypeScript CIF functions and fix preset types
+    [#1862](https://github.com/system-ui/theme-ui/pull/1862)
+    ([@tornewuff](https://github.com/tornewuff)
+    [@hasparus](https://github.com/hasparus))
+- `@theme-ui/color-modes`, `@theme-ui/core`, `@theme-ui/editor`,
+  `@theme-ui/theme-provider`, `theme-ui`
+  - fix(color-modes): combine colors in nested providers
+    [#1838](https://github.com/system-ui/theme-ui/pull/1838)
+    ([@hasparus](https://github.com/hasparus))
+
+#### 🐛 Bug Fix
+
+- Update global-styles.mdx
+  [#1858](https://github.com/system-ui/theme-ui/pull/1858)
+  ([@jordie23](https://github.com/jordie23))
+- `@theme-ui/core`, `@theme-ui/css`
+  - add types for css prop back
+    [#1866](https://github.com/system-ui/theme-ui/pull/1866)
+    ([@hasparus](https://github.com/hasparus))
+- `@theme-ui/color-modes`, `@theme-ui/components`, `@theme-ui/core`,
+  `@theme-ui/editor`, `gatsby-theme-style-guide`, `gatsby-theme-ui-layout`,
+  `@theme-ui/match-media`, `@theme-ui/mdx`, `@theme-ui/parse-props`,
+  `@theme-ui/sidenav`, `@theme-ui/style-guide`, `@theme-ui/theme-provider`,
+  `theme-ui`
+  - 0.10 chores [#1842](https://github.com/system-ui/theme-ui/pull/1842)
+    ([@hasparus](https://github.com/hasparus))
+
+#### 👨‍💻 Minor changes
+
+- Remove dependabot from the changelog
+  ([@hasparus](https://github.com/hasparus))
+
+#### 🏠 Internal
+
+- docs: add `@theme-ui/css` to sidebar and packages page
+  [#1877](https://github.com/system-ui/theme-ui/pull/1877)
+  ([@hasparus](https://github.com/hasparus))
+- docs: change intro code snippets to TypeScript
+  [#1877](https://github.com/system-ui/theme-ui/pull/1877)
+  ([@hasparus](https://github.com/hasparus))
+- `@theme-ui/css`
+  - refactor(css): remove unused imports
+    [#1877](https://github.com/system-ui/theme-ui/pull/1877)
+    ([@hasparus](https://github.com/hasparus))
+- `@theme-ui/core`, `@theme-ui/css`
+  - docs(css): add usage examples for core packages
+    [#1877](https://github.com/system-ui/theme-ui/pull/1877)
+    ([@hasparus](https://github.com/hasparus))
+- `theme-ui`
+  - Setup Cypress [#1845](https://github.com/system-ui/theme-ui/pull/1845)
+    ([@hasparus](https://github.com/hasparus))
+
+#### 📝 Documentation
+
+- Add redirects back to docs.
+  [#1841](https://github.com/system-ui/theme-ui/pull/1841)
+  ([@hasparus](https://github.com/hasparus))
+
+#### 🔩 Dependency Updates
+
+- `@theme-ui/prism`
+  - Update snapshots [#1768](https://github.com/system-ui/theme-ui/pull/1768)
+    ([@lachlanjc](https://github.com/lachlanjc))
+
+#### Authors: 4
+
+- Jordie Bodlay ([@jordie23](https://github.com/jordie23))
+- Lachlan Campbell ([@lachlanjc](https://github.com/lachlanjc))
+- Piotr Monwid-Olechnowicz ([@hasparus](https://github.com/hasparus))
+- Torne Wuff ([@tornewuff](https://github.com/tornewuff))
+
+---
+
 # v0.10.0 (Sat Jun 19 2021)
 
 :tada: This release contains work from a new contributor! :tada:
 
-Thank you, Vlad Shcherbin ([@vladshcherbin](https://github.com/vladshcherbin)), for all your work!
+Thank you, Vlad Shcherbin ([@vladshcherbin](https://github.com/vladshcherbin)),
+for all your work!
 
 ### Release Notes
 
 #### Allow easy styling autofilled of Inputs ([#1811](https://github.com/system-ui/theme-ui/pull/1811))
 
-Background color of autofilled inputs will now default to `theme.colors.background`. It can be changed by setting `autofillBackgroundColor` prop.
+Background color of autofilled inputs will now default to
+`theme.colors.background`. It can be changed by setting
+`autofillBackgroundColor` prop.
 
 ---
 
 #### 🚀 Enhancement
 
-
 #### 🐛 Bug Fix
 
-- Fix typo [#1835](https://github.com/system-ui/theme-ui/pull/1835) ([@vladshcherbin](https://github.com/vladshcherbin))
-- `@theme-ui/color-modes`, `@theme-ui/components`, `@theme-ui/editor`, `theme-ui`
-  - Allow easy styling autofilled of Inputs [#1811](https://github.com/system-ui/theme-ui/pull/1811) ([@hasparus](https://github.com/hasparus))
+- Fix typo [#1835](https://github.com/system-ui/theme-ui/pull/1835)
+  ([@vladshcherbin](https://github.com/vladshcherbin))
+- `@theme-ui/color-modes`, `@theme-ui/components`, `@theme-ui/editor`,
+  `theme-ui`
+  - Allow easy styling autofilled of Inputs
+    [#1811](https://github.com/system-ui/theme-ui/pull/1811)
+    ([@hasparus](https://github.com/hasparus))
 - `@theme-ui/color`, `@theme-ui/css`
-  - fix(css): add JSDoc comment to sx.label [#1813](https://github.com/system-ui/theme-ui/pull/1813) ([@hasparus](https://github.com/hasparus))
-- `@theme-ui/color`, `@theme-ui/components`, `@theme-ui/css`, `@theme-ui/custom-properties`, `@theme-ui/editor`, `gatsby-theme-style-guide`, `@theme-ui/preset-bootstrap`, `@theme-ui/preset-bulma`, `@theme-ui/preset-dark`, `@theme-ui/preset-deep`, `@theme-ui/preset-funk`, `@theme-ui/preset-future`, `@theme-ui/preset-polaris`, `@theme-ui/preset-roboto`, `@theme-ui/preset-sketchy`, `@theme-ui/preset-swiss`, `@theme-ui/preset-system`, `@theme-ui/preset-tailwind`, `@theme-ui/style-guide`
-  - Add missing meta repository to published packages [#1807](https://github.com/system-ui/theme-ui/pull/1807) ([@aaronadamsCA](https://github.com/aaronadamsCA))
-  - Add missing repository metadata to published packages [#1779](https://github.com/system-ui/theme-ui/pull/1779) ([@aaronadamsCA](https://github.com/aaronadamsCA))
+  - fix(css): add JSDoc comment to sx.label
+    [#1813](https://github.com/system-ui/theme-ui/pull/1813)
+    ([@hasparus](https://github.com/hasparus))
+- `@theme-ui/color`, `@theme-ui/components`, `@theme-ui/css`,
+  `@theme-ui/custom-properties`, `@theme-ui/editor`, `gatsby-theme-style-guide`,
+  `@theme-ui/preset-bootstrap`, `@theme-ui/preset-bulma`,
+  `@theme-ui/preset-dark`, `@theme-ui/preset-deep`, `@theme-ui/preset-funk`,
+  `@theme-ui/preset-future`, `@theme-ui/preset-polaris`,
+  `@theme-ui/preset-roboto`, `@theme-ui/preset-sketchy`,
+  `@theme-ui/preset-swiss`, `@theme-ui/preset-system`,
+  `@theme-ui/preset-tailwind`, `@theme-ui/style-guide`
+  - Add missing meta repository to published packages
+    [#1807](https://github.com/system-ui/theme-ui/pull/1807)
+    ([@aaronadamsCA](https://github.com/aaronadamsCA))
+  - Add missing repository metadata to published packages
+    [#1779](https://github.com/system-ui/theme-ui/pull/1779)
+    ([@aaronadamsCA](https://github.com/aaronadamsCA))
 
 #### 🏠 Internal
 
-- Docs: update JSX pragma guide with automatic runtime section [#1718](https://github.com/system-ui/theme-ui/pull/1718) ([@flo-sch](https://github.com/flo-sch) [@hasparus](https://github.com/hasparus))
-- docs: fix DocSearch not loading in SSR ([@hasparus](https://github.com/hasparus))
-- Docs: Move homepage to root path [#1783](https://github.com/system-ui/theme-ui/pull/1783) ([@lachlanjc](https://github.com/lachlanjc))
+- Docs: update JSX pragma guide with automatic runtime section
+  [#1718](https://github.com/system-ui/theme-ui/pull/1718)
+  ([@flo-sch](https://github.com/flo-sch)
+  [@hasparus](https://github.com/hasparus))
+- docs: fix DocSearch not loading in SSR
+  ([@hasparus](https://github.com/hasparus))
+- Docs: Move homepage to root path
+  [#1783](https://github.com/system-ui/theme-ui/pull/1783)
+  ([@lachlanjc](https://github.com/lachlanjc))
 - `@theme-ui/components`
-  - docs(components): fix Paragraph default variant [#1795](https://github.com/system-ui/theme-ui/pull/1795) ([@bernharduw](https://github.com/bernharduw))
+  - docs(components): fix Paragraph default variant
+    [#1795](https://github.com/system-ui/theme-ui/pull/1795)
+    ([@bernharduw](https://github.com/bernharduw))
 
 #### Authors: 6
 
@@ -50,7 +193,9 @@ Background color of autofilled inputs will now default to `theme.colors.backgrou
 #### 🐛 Bug Fix
 
 - `@theme-ui/components`
-  - fix: Allow overriding Paragraph margins via theme [#1775](https://github.com/system-ui/theme-ui/pull/1775) ([@bernharduw](https://github.com/bernharduw))
+  - fix: Allow overriding Paragraph margins via theme
+    [#1775](https://github.com/system-ui/theme-ui/pull/1775)
+    ([@bernharduw](https://github.com/bernharduw))
 
 #### Authors: 1
 
@@ -79,17 +224,23 @@ node_modules (e.g. with
 
 #### 🚀 Enhancement
 
-- `@theme-ui/preset-base`, `@theme-ui/preset-bootstrap`, `@theme-ui/sidenav`, `@theme-ui/typography`
-  - modernize Babel config [#1721](https://github.com/system-ui/theme-ui/pull/1721) ([@hasparus](https://github.com/hasparus))
+- `@theme-ui/preset-base`, `@theme-ui/preset-bootstrap`, `@theme-ui/sidenav`,
+  `@theme-ui/typography`
+  - modernize Babel config
+    [#1721](https://github.com/system-ui/theme-ui/pull/1721)
+    ([@hasparus](https://github.com/hasparus))
 
 #### 🐛 Bug Fix
 
 - `@theme-ui/components`
-  - fix(components): set Select's bgColor to "background" - fixes dark mode ([@hasparus](https://github.com/hasparus))
+  - fix(components): set Select's bgColor to "background" - fixes dark mode
+    ([@hasparus](https://github.com/hasparus))
 
 #### 📝 Documentation
 
-- style DocSearch [#1714](https://github.com/system-ui/theme-ui/pull/1714) ([@atanasster](https://github.com/atanasster) [@hasparus](https://github.com/hasparus))
+- style DocSearch [#1714](https://github.com/system-ui/theme-ui/pull/1714)
+  ([@atanasster](https://github.com/atanasster)
+  [@hasparus](https://github.com/hasparus))
 
 #### Authors: 2
 

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.10.0",
+  "version": "0.11.1",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "packages": [

packages/color-modes/CHANGELOG.md

@@ -1,3 +1,22 @@
+# v0.11.0 (Wed Aug 25 2021)
+
+#### 🚀 Enhancement
+
+- fix(color-modes): combine colors in nested providers [#1838](https://github.com/system-ui/theme-ui/pull/1838) ([@hasparus](https://github.com/hasparus))
+
+#### 🐛 Bug Fix
+
+- fix(color-modes): respect html.theme-ui-{mode} class in nested providers to reduce FOUC ([@hasparus](https://github.com/hasparus))
+- 0.10 chores [#1842](https://github.com/system-ui/theme-ui/pull/1842) ([@hasparus](https://github.com/hasparus))
+- fix(color-modes): properly combine colors from nested providers ([@hasparus](https://github.com/hasparus))
+- fix(color-modes): nest styles using css not style ([@hasparus](https://github.com/hasparus))
+
+#### Authors: 1
+
+- Piotr Monwid-Olechnowicz ([@hasparus](https://github.com/hasparus))
+
+---
+
 # v0.10.0 (Sat Jun 19 2021)
 
 :tada: This release contains work from a new contributor! :tada:

packages/color-modes/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theme-ui/color-modes",
-  "version": "0.10.0",
+  "version": "0.11.1",
   "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",
@@ -15,8 +15,8 @@
   },
   "dependencies": {
     "@emotion/react": "^11.1.1",
-    "@theme-ui/core": "0.10.0",
-    "@theme-ui/css": "0.10.0",
+    "@theme-ui/core": "0.11.1",
+    "@theme-ui/css": "0.11.1",
     "deepmerge": "^4.2.2"
   },
   "peerDependencies": {

packages/color/CHANGELOG.md

@@ -1,3 +1,28 @@
+# v0.11.0 (Wed Aug 25 2021)
+
+### Release Notes
+
+#### Add @theme-ui/css/utils with TypeScript CIF functions and fix preset types ([#1862](https://github.com/system-ui/theme-ui/pull/1862))
+
+- Added TypeScript [Constrained identity functions](https://kentcdodds.com/blog/how-to-write-a-constrained-identity-function-in-typescript) `makeTheme`, `makeStyles` and `makeColorsScale` which can be imported from _@theme-ui/css/utils_.
+- Used aformentioned functions to properly define types of presets. Exported themes are now assignable to _Theme_ but their types narrowly describe their exact values.
+
+---
+
+---
+
+#### 🚀 Enhancement
+
+- Add @theme-ui/css/utils with TypeScript CIF functions and fix preset types [#1862](https://github.com/system-ui/theme-ui/pull/1862) ([@tornewuff](https://github.com/tornewuff) [@hasparus](https://github.com/hasparus))
+- feat(css): add makeTheme constrained identity function ([@hasparus](https://github.com/hasparus))
+
+#### Authors: 2
+
+- Piotr Monwid-Olechnowicz ([@hasparus](https://github.com/hasparus))
+- Torne Wuff ([@tornewuff](https://github.com/tornewuff))
+
+---
+
 # v0.10.0 (Sat Jun 19 2021)
 
 :tada: This release contains work from a new contributor! :tada:

packages/color/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@theme-ui/color",
-  "version": "0.10.0",
+  "version": "0.11.1",
   "source": "src/index.ts",
   "main": "dist/theme-ui-color.cjs.js",
   "module": "dist/theme-ui-color.esm.js",
   "types": "dist/theme-ui-color.cjs.d.ts",
   "scripts": {},
   "dependencies": {
-    "@theme-ui/css": "0.10.0",
+    "@theme-ui/css": "0.11.1",
     "polished": "^4.0.5"
   },
   "publishConfig": {

packages/components/CHANGELOG.md

@@ -1,3 +1,15 @@
+# v0.11.0 (Wed Aug 25 2021)
+
+#### 🐛 Bug Fix
+
+- 0.10 chores [#1842](https://github.com/system-ui/theme-ui/pull/1842) ([@hasparus](https://github.com/hasparus))
+
+#### Authors: 1
+
+- Piotr Monwid-Olechnowicz ([@hasparus](https://github.com/hasparus))
+
+---
+
 # v0.10.0 (Sat Jun 19 2021)
 
 :tada: This release contains work from a new contributor! :tada:

packages/components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theme-ui/components",
-  "version": "0.10.0",
+  "version": "0.11.1",
   "main": "dist/theme-ui-components.cjs.js",
   "module": "dist/theme-ui-components.esm.js",
   "types": "index.d.ts",
@@ -12,7 +12,7 @@
     "@styled-system/color": "^5.1.2",
     "@styled-system/should-forward-prop": "^5.1.2",
     "@styled-system/space": "^5.1.2",
-    "@theme-ui/css": "0.10.0",
+    "@theme-ui/css": "0.11.1",
     "@types/styled-system": "^5.1.10"
   },
   "peerDependencies": {