Skip to content

Commit 512a8e7

Browse files
hasparushasparus
committed
Merge branch 'develop' into stable
2 parents 6f934a1 + 15b58de commit 512a8e7

File tree

200 files changed

+10383
-13222
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

200 files changed

+10383
-13222
lines changed

‎.codesandbox/ci.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
"buildCommand": "build",
44
"packages": ["packages/theme-ui", "packages/core"],
55
"sandboxes": ["/examples/next", "/examples/gatsby-plugin"],
6-
"node": "16"
6+
"node": "18"
77
}

‎.pnpmfile.cjs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ function afterAllResolved(lockfile, context) {
1313
for (let x of PACKAGES_WITH_ENFORCED_SINGLE_VERSION) {
1414
if (p.startsWith(`/${x}/`)) {
1515
if (found[x]) {
16-
found[x] += 1
16+
found[x].push(p)
1717
} else {
18-
found[x] = 1
18+
found[x] = [p]
1919
}
2020
}
2121
}
@@ -24,9 +24,12 @@ function afterAllResolved(lockfile, context) {
2424
let msg = ''
2525

2626
for (let p in found) {
27-
const count = found[p]
27+
const count = found[p].length
2828
if (count > 1) {
29-
msg += `${p} found ${count} times\n`
29+
msg +=
30+
`${p} found ${count} times\n` +
31+
found[p].map((s) => `- ${s}`).join('\n') +
32+
'\n\n'
3033
}
3134
}
3235

‎.prettierignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,6 @@ dist
88
coverage
99
examples/next/.next
1010
docs/src/pages/index.mdx
11+
12+
# Prettier doesn't know how to format MDX2 and makes silly mistakes.
13+
*.mdx

‎babel.config.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,13 @@ module.exports = {
99
targets: '> 0.25%, not dead, not ie 11',
1010
},
1111
],
12-
'@babel/react',
12+
[
13+
'@babel/react',
14+
{
15+
runtime: 'automatic',
16+
importSource: '@theme-ui/core',
17+
},
18+
],
1319
'@babel/preset-typescript',
1420
],
1521
env: {

‎examples/gatsby-plugin/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@
1212
"build": "gatsby build"
1313
},
1414
"dependencies": {
15-
"@emotion/react": "^11",
16-
"gatsby": "^4.21.0",
17-
"gatsby-plugin-mdx": "^3.7.1",
15+
"@emotion/react": "^11.11.1",
16+
"gatsby": "^5",
17+
"gatsby-plugin-mdx": "^5",
1818
"gatsby-plugin-theme-ui": "workspace:^",
1919
"react": "^18.1.0",
20-
"react-dom": "^18.1.0",
20+
"react-dom": "^18",
2121
"theme-ui": "workspace:^"
2222
},
2323
"devDependencies": {
24-
"@types/react": "^18",
25-
"typescript": "^4",
26-
"babel-eslint": "^10"
24+
"@types/react": "^18.2.12",
25+
"babel-eslint": "^10",
26+
"typescript": "^5"
2727
}
2828
}

‎examples/gatsby-plugin/src/layout.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
/** @jsx jsx */
2-
import { jsx, Themed } from 'theme-ui'
1+
/** @jsxImportSource theme-ui */
2+
import { Themed } from 'theme-ui'
33

44
const Layout = (props) => (
55
<Themed.root>

‎examples/gatsby/package.json

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,20 @@
1212
"build": "gatsby build"
1313
},
1414
"dependencies": {
15-
"@emotion/react": "^11",
16-
"gatsby": "^4.21.0",
17-
"gatsby-plugin-mdx": "^4.0.0",
18-
"react": "^18.1.0",
19-
"react-dom": "^18.1.0",
15+
"@emotion/react": "^11.11.1",
16+
"@mdx-js/react": "^2.3.0",
2017
"@theme-ui/mdx": "workspace:^",
21-
"theme-ui": "workspace:^",
22-
"@mdx-js/react": "^2",
23-
"gatsby-source-filesystem": "latest"
18+
"gatsby": "^5",
19+
"gatsby-plugin-mdx": "^5",
20+
"gatsby-source-filesystem": "latest",
21+
"react": "^18.1.0",
22+
"react-dom": "^18",
23+
"theme-ui": "workspace:^"
2424
},
2525
"devDependencies": {
26-
"@types/react": "^18",
27-
"typescript": "^4",
28-
"@babel/core": "^7.15.8",
26+
"@types/react": "^18.2.12",
2927
"babel-eslint": "^10",
30-
"graphql": "^15"
28+
"graphql": "^15",
29+
"typescript": "^5"
3130
}
3231
}

‎examples/gatsby/src/index.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ReactNode } from 'react'
2-
import { ThemeProvider } from 'theme-ui'
2+
import { ThemeUIProvider } from 'theme-ui'
33
import { Themed, useThemedStylesWithMdx } from '@theme-ui/mdx'
44
import { MDXProvider, useMDXComponents } from '@mdx-js/react'
55
import theme from './theme'
@@ -8,10 +8,10 @@ export const WrapRootElement = ({ element }: { element: ReactNode }) => {
88
const components = useThemedStylesWithMdx(useMDXComponents())
99

1010
return (
11-
<ThemeProvider theme={theme}>
11+
<ThemeUIProvider theme={theme}>
1212
<MDXProvider components={components}>
1313
<Themed.root>{element}</Themed.root>
1414
</MDXProvider>
15-
</ThemeProvider>
15+
</ThemeUIProvider>
1616
)
1717
}

‎examples/next/package.json

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,19 @@
1212
"typecheck": "tsc --noEmit"
1313
},
1414
"dependencies": {
15-
"@emotion/react": "^11",
16-
"@mdx-js/loader": "^2.1.2",
17-
"@mdx-js/react": "^2.1.2",
18-
"@next/mdx": "^12.0.7",
15+
"@emotion/react": "^11.11.1",
16+
"@mdx-js/loader": "^2.3.0",
17+
"@mdx-js/react": "^2.3.0",
18+
"@next/mdx": "^13.4.5",
1919
"@theme-ui/css": "workspace:^",
20-
"next": "^12.1.0",
21-
"react": "^18",
20+
"next": "^13.4.5",
21+
"react": "^18.1.0",
2222
"react-dom": "^18",
2323
"theme-ui": "workspace:^"
2424
},
2525
"devDependencies": {
26-
"typescript": "^4",
27-
"@babel/core": "^7",
28-
"webpack": "^4",
29-
"@types/react": "^18"
26+
"@types/react": "^18.2.12",
27+
"typescript": "^5",
28+
"webpack": "^5.86.0"
3029
}
3130
}

‎examples/next/pages/_app.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/** @jsxImportSource theme-ui */
2-
import { ThemeProvider } from 'theme-ui'
2+
import { ThemeUIProvider } from 'theme-ui'
33

44
import Header from '../components/Header'
55
import { theme } from '../lib/theme'
@@ -11,7 +11,7 @@ import type { AppProps } from 'next/app'
1111
*/
1212
export default function MyApp({ Component, pageProps }: AppProps) {
1313
return (
14-
<ThemeProvider theme={theme}>
14+
<ThemeUIProvider theme={theme}>
1515
<main
1616
sx={{
1717
border: '1px solid',
@@ -25,6 +25,6 @@ export default function MyApp({ Component, pageProps }: AppProps) {
2525
<Header />
2626
<Component {...pageProps} />
2727
</main>
28-
</ThemeProvider>
28+
</ThemeUIProvider>
2929
)
3030
}

0 commit comments

Comments
 (0)