(css): Allow injecting UserTheme and typecheck colors against scale

.husky/.gitignore

@@ -0,0 +1 @@
+_

CHANGELOG.md

@@ -556,6 +556,10 @@ Theme UI is now written in TypeScript, and the emitted types differ from
     `ThemeUIStyleObject` instead.
 - Fix: Add `sx` props types to all props accepting `className`. PR #1308
 - Fix WithPoorAsProp to work with ComponentProps utility type. PR #1308
+- Don't pass `false`, `undefined` and `null` to Emotion. Allow them as style values in TypeScript. PR #1090
+- Allow to inject user's exact theme type. PR #1090
+  - Add `theme.options.strictMode` object with configuration for Theme UI strict mode.
+  - TODO short excerpt from the docs on how to use it
 
 ## v0.5.0-alpha.2 2020-11-30
 

examples/gatsby-plugin/package.json

@@ -22,7 +22,7 @@
   },
   "devDependencies": {
     "@testing-library/react": "^9.1.3",
-    "husky": ">=4.0.7",
+    "husky": ">=5.1.1",
     "jest": "^24.8.0",
     "lint-staged": "10",
     "react-test-renderer": "^17.0.1"

packages/color-modes/LICENSE.md

@@ -0,0 +1,9 @@
+# The MIT License (MIT)
+
+Copyright (c) 2019 Brent Jackson
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

packages/color-modes/package.json

@@ -25,5 +25,5 @@
   "devDependencies": {
     "react": "^17.0.1"
   },
-  "gitHead": "621199460fa3bdb0100748441e62517b7529b8c8"
+  "gitHead": "c5a716a2e214d8c3762f917a57418bb995fb4c9a"
 }

packages/color-modes/src/index.tsx

@@ -166,7 +166,7 @@ function copyRawColors(
     if (typeof value === 'string' && !value.startsWith('var(')) {
       outerThemeRawColors[key] = value
     }
-    if (typeof value === 'object') {
+    if (typeof value === 'object' && value) {
       outerThemeRawColors[key] = {
         ...(outerThemeRawColors[key] as object),
         ...copyRawColors(value, {}),

packages/color/LICENSE.md

@@ -0,0 +1,9 @@
+# The MIT License (MIT)
+
+Copyright (c) 2019 Brent Jackson
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

packages/color/package.json

@@ -14,5 +14,5 @@
     "access": "public"
   },
   "license": "MIT",
-  "gitHead": "621199460fa3bdb0100748441e62517b7529b8c8"
+  "gitHead": "c5a716a2e214d8c3762f917a57418bb995fb4c9a"
 }

packages/color/src/index.ts

@@ -1,16 +1,16 @@
 import * as P from 'polished'
-import { ColorModesScale, get, Theme } from '@theme-ui/css'
+import { ColorModesScale, get, Theme, ThemeUIEmpty } from '@theme-ui/css'
 
 type Color = ColorModesScale['primary']
 
 /**
  * Get color from theme.colors
  */
-export const getColor = (theme: Theme, color: Color) => {
+export const getColor = (theme: Theme, color: Color): string => {
   if (typeof color === 'object') {
     color = Array.isArray(color)
       ? color[0]
-      : (color as Exclude<typeof color, string & {}>).__default
+      : (color as Exclude<typeof color, string & {}>)?.__default
   }
 
   if (process.env.NODE_ENV !== 'production') {

packages/components/LICENSE.md

@@ -0,0 +1,9 @@
+# The MIT License (MIT)
+
+Copyright (c) 2019 Brent Jackson
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

packages/components/package.json

@@ -1,6 +1,8 @@
 {
   "name": "@theme-ui/components",
   "version": "0.8.4",
+  "author": "Brent Jackson <jxnblk@gmail.com>",
+  "license": "MIT",
   "main": "dist/theme-ui-components.cjs.js",
   "module": "dist/theme-ui-components.esm.js",
   "types": "index.d.ts",
@@ -21,8 +23,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "author": "Brent Jackson <jxnblk@gmail.com>",
-  "license": "MIT",
   "devDependencies": {
     "react": "^17.0.1"
   }

packages/core/LICENSE.md

@@ -0,0 +1,9 @@
+# The MIT License (MIT)
+
+Copyright (c) 2019 Brent Jackson
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

packages/core/src/index.ts

@@ -31,6 +31,8 @@ export type {
   ThemeUIExtendedCSSProperties,
   ThemeUIStyleObject,
   VariantProperty,
+  BaseTheme,
+  UserTheme,
 } from '@theme-ui/css'
 
 export * from './types'

packages/css/LICENSE.md

@@ -0,0 +1,9 @@
+# The MIT License (MIT)
+
+Copyright (c) 2019 Brent Jackson
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

packages/css/emotion-theme.d.ts

@@ -2,6 +2,8 @@ import '@emotion/react'
 
 import { Theme } from '@theme-ui/css'
 
+// TODO: This file is not include in user's project anyway.
+// Consider removing it and advising to inject their exact theme into Emotion.
 interface ThemeUITheme extends Theme {}
 
 declare module '@emotion/react' {

packages/css/package.json

@@ -13,7 +13,8 @@
   },
   "dependencies": {
     "@emotion/react": "^11.1.1",
-    "csstype": "^3.0.5"
+    "csstype": "^3.0.5",
+    "ts-toolbelt": "^8.0.7"
   },
-  "gitHead": "621199460fa3bdb0100748441e62517b7529b8c8"
+  "gitHead": "c5a716a2e214d8c3762f917a57418bb995fb4c9a"
 }