WIP

hasparus · hasparus · commit e59f29002b62 · 2023-06-14T16:27:10.000+02:00
diff --git a/package.json b/package.json
@@ -50,15 +50,15 @@
       "ignoreMissing": [
         "babel-eslint",
         "graphql",
-        "cypress",
-        "@typescript-eslint/parser",
-        "@typescript-eslint/eslint-plugin"
+        "cypress"
       ],
       "allowedVersions": {
         "react": "18",
         "eslint": "8",
         "gatsby": "^4 || ^5",
-        "@types/jest": "29"
+        "@types/jest": "29",
+        "@typescript-eslint/parser": "*",
+        "@typescript-eslint/eslint-plugin": "*"
       }
     }
   },
diff --git a/packages/components/package.json b/packages/components/package.json
@@ -16,6 +16,7 @@
   },
   "peerDependencies": {
     "@emotion/react": "^11.11.1",
+    "@theme-ui/theme-provider": "workspace:^",
     "react": ">=18"
   },
   "devDependencies": {
diff --git a/packages/components/test/Box.spec.tsx b/packages/components/test/Box.spec.tsx
@@ -2,10 +2,9 @@
  * @jest-environment jsdom
  */
 
-import React from 'react'
 import { renderJSON, render, waitFor } from '@theme-ui/test-utils'
 
-import { ThemeUIProvider } from 'theme-ui'
+import { ThemeUIProvider } from '@theme-ui/theme-provider'
 
 import { Box } from '..'
 
diff --git a/packages/components/test/Button.spec.tsx b/packages/components/test/Button.spec.tsx
@@ -2,9 +2,8 @@
  * @jest-environment jsdom
  */
 
-import React from 'react'
 import { renderJSON } from '@theme-ui/test-utils'
-import { ThemeUIProvider } from 'theme-ui'
+import { ThemeUIProvider } from '@theme-ui/theme-provider'
 
 import { Button } from '..'
 
diff --git a/packages/components/test/Flex.spec.tsx b/packages/components/test/Flex.spec.tsx
@@ -2,9 +2,9 @@
  * @jest-environment jsdom
  */
 
-import React from 'react'
 import { render } from '@theme-ui/test-utils'
-import { Flex, ThemeUIProvider } from 'theme-ui'
+import { ThemeUIProvider } from '@theme-ui/theme-provider'
+import { Flex } from '../src/Flex'
 
 test('accepts ref', async () => {
   let ref: HTMLElement | null = null
diff --git a/packages/components/test/Grid.spec.tsx b/packages/components/test/Grid.spec.tsx
@@ -2,9 +2,8 @@
  * @jest-environment jsdom
  */
 
-import React from 'react'
 import { renderJSON } from '@theme-ui/test-utils'
-import { ThemeUIProvider } from 'theme-ui'
+import { ThemeUIProvider } from '@theme-ui/theme-provider'
 
 import { Grid } from '..'
 
diff --git a/packages/components/test/SVG.spec.tsx b/packages/components/test/SVG.spec.tsx
@@ -4,7 +4,7 @@
 
 import React from 'react'
 import { render } from '@theme-ui/test-utils'
-import { ThemeUIProvider } from 'theme-ui'
+import { ThemeUIProvider } from '@theme-ui/theme-provider'
 import { SVG } from '../src/SVG'
 
 test('accepts ref', async () => {
diff --git a/packages/components/test/Switch.spec.tsx b/packages/components/test/Switch.spec.tsx
@@ -4,7 +4,7 @@
 
 import { ThemeProvider } from '@theme-ui/core'
 import { AssertTrue, IsExact, render } from '@theme-ui/test-utils'
-import React, { forwardRef } from 'react'
+import { forwardRef } from 'react'
 
 import { Switch, SwitchProps } from '../src'
 
diff --git a/packages/components/test/index.tsx b/packages/components/test/index.tsx
@@ -4,7 +4,7 @@
 
 import React from 'react'
 import { renderJSON } from '@theme-ui/test-utils'
-import { ThemeUIProvider } from 'theme-ui'
+import { ThemeUIProvider } from '@theme-ui/theme-provider'
 import {
   Card,
   Flex,
diff --git a/packages/components/test/types.tsx b/packages/components/test/types.tsx
@@ -1,5 +1,5 @@
 /** @jsxRuntime automatic */
-/** @jsxImportSource theme-ui */
+/** @jsxImportSource @theme-ui/core */
 import { AssertTrue, IsExact } from '@theme-ui/test-utils'
 
 import {
diff --git a/packages/css/package.json b/packages/css/package.json
@@ -4,6 +4,26 @@
   "source": "src/index.ts",
   "main": "dist/theme-ui-css.cjs.js",
   "module": "dist/theme-ui-css.esm.js",
+  "browser": {
+    "./dist/theme-ui-css.esm.js": "./dist/theme-ui-css.browser.esm.js"
+  },
+  "exports": {
+    ".": {
+      "module": {
+        "browser": "./dist/theme-ui-css.browser.esm.js",
+        "default": "./dist/theme-ui-css.esm.js"
+      },
+      "default": "./dist/theme-ui-css.cjs.js"
+    },
+    "./utils": {
+      "module": {
+        "browser": "./utils/dist/theme-ui-css-utils.browser.esm.js",
+        "default": "./utils/dist/theme-ui-css-utils.esm.js"
+      },
+      "default": "./utils/dist/theme-ui-css-utils.cjs.js"
+    },
+    "./package.json": "./package.json"
+  },
   "sideEffects": false,
   "scripts": {},
   "author": "Brent Jackson",
@@ -27,7 +47,12 @@
     "entrypoints": [
       "index.ts",
       "utils.ts"
-    ]
+    ],
+    "exports": {
+      "envConditions": [
+        "browser"
+      ]
+    }
   },
   "gitHead": "621199460fa3bdb0100748441e62517b7529b8c8"
 }
diff --git a/packages/css/utils/package.json b/packages/css/utils/package.json
@@ -1,4 +1,7 @@
 {
   "main": "dist/theme-ui-css-utils.cjs.js",
-  "module": "dist/theme-ui-css-utils.esm.js"
+  "module": "dist/theme-ui-css-utils.esm.js",
+  "browser": {
+    "./dist/theme-ui-css-utils.esm.js": "./dist/theme-ui-css-utils.browser.esm.js"
+  }
 }
diff --git a/packages/docs/src/components/__snapshots__/sidenav.spec.tsx.snap b/packages/docs/src/components/__snapshots__/sidenav.spec.tsx.snap
diff --git a/packages/gatsby-plugin-theme-ui/package.json b/packages/gatsby-plugin-theme-ui/package.json
diff --git a/packages/gatsby-plugin-theme-ui/test/__mocks__/gatsby.js b/packages/gatsby-plugin-theme-ui/test/__mocks__/gatsby.js
diff --git a/packages/gatsby-plugin-theme-ui/test/provider.mjs b/packages/gatsby-plugin-theme-ui/test/provider.mjs
diff --git a/packages/mdx/src/wrapComponentsWithThemeStyles.tsx b/packages/mdx/src/wrapComponentsWithThemeStyles.tsx
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
