Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deps bumps for 0.16.0 #2432

Merged
merged 45 commits into from
Jun 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
35662bb
Bump dependencies
hasparus Jun 11, 2023
5b1c5c2
Update TypeScript to version 5
hasparus Jun 11, 2023
f5c0585
Update JSX namespace types for TypeScript 5 (ElementType)
hasparus Jun 11, 2023
08716b0
Use automatic runtime in Components tests
hasparus Jun 11, 2023
1535b68
Fix a cyclic dependency in test-utils
hasparus Jun 11, 2023
aef87ef
Make typecheck pass
hasparus Jun 11, 2023
2745d18
Fix more errors 🤷
hasparus Jun 11, 2023
7d5ba32
Remove occurences of /** @jsx jsx */
hasparus Jun 11, 2023
c659b69
Add importSource to babel.config.js
hasparus Jun 12, 2023
15ece9d
Make typecheck work
hasparus Jun 12, 2023
208c7ed
Fix css tests
hasparus Jun 12, 2023
115dbe5
Make tests work
hasparus Jun 12, 2023
b74305c
Use ThemeUIProvider from 'theme-ui'
hasparus Jun 12, 2023
866e265
Update lockfile
hasparus Jun 12, 2023
fc91d2d
Remove @jsx pragma comments
hasparus Jun 12, 2023
cb3f2a5
Add exports field to @theme-ui/core package.json
hasparus Jun 12, 2023
d5877de
Update versions and package.json fields
hasparus Jun 12, 2023
4bb9b02
Note that @theme-ui/sidenav was removed
hasparus Jun 12, 2023
4da08fc
Move Sidenav to the docs
hasparus Jun 12, 2023
2d1656b
Update docs dependencies
hasparus Jun 13, 2023
01b75f5
Remove Gatsby + Prism example
hasparus Jun 13, 2023
21e04b1
Set dev dependency on @mdx-js/react to v2 (fixes docs)
hasparus Jun 13, 2023
73b6b1b
Docs build but we still get sx={[Object object]}
hasparus Jun 13, 2023
157e687
Bump deps and fix JSX automatic runtime
hasparus Jun 14, 2023
c5221c3
Add @types/reach__router
hasparus Jun 14, 2023
e0f5e36
Turn sidebar object from MDX list to TypeScript object
hasparus Jun 14, 2023
dbc5da0
Move docsearch mounting into search-input.tsx
hasparus Jun 14, 2023
0fc88a0
Ensure there is only one version of @emotion/react installed
hasparus Jun 14, 2023
8490452
Run manypkg fix
hasparus Jun 14, 2023
8cdb197
Remove cyclic devDependencies
hasparus Jun 14, 2023
e59f290
WIP
hasparus Jun 14, 2023
8a73235
Fix README imports, stop crashin in ThemUIPrism
hasparus Jun 14, 2023
76fda9b
Normalize font size
hasparus Jun 14, 2023
a0a521b
Fix code block syntax colors broken by MDX 2 bump
hasparus Jun 15, 2023
78707d5
Remove non-working badges from readme
hasparus Jun 15, 2023
4d42022
Work around weird MDX paragraph insertion
hasparus Jun 15, 2023
292a83f
Move ColorModeSwitcher to a separate component
hasparus Jun 15, 2023
46e9e0a
Fix NavLinks
hasparus Jun 15, 2023
f36fb24
Provide providerImportSource to fix MDX tables
hasparus Jun 15, 2023
627457f
Write a rehype plugin to fix live code blocks
hasparus Jun 15, 2023
d9e9f2a
Remove console.log in mdx package
hasparus Jun 15, 2023
ec98518
Skip gatsby-pluigin-theme-u test, no idea why it is failing
hasparus Jun 15, 2023
3b7de6d
Fix type errors
hasparus Jun 15, 2023
5640a8f
Fix pagination in the docs
hasparus Jun 15, 2023
afb61cb
Fix versions
hasparus Jun 15, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .codesandbox/ci.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
"buildCommand": "build",
"packages": ["packages/theme-ui", "packages/core"],
"sandboxes": ["/examples/next", "/examples/gatsby-plugin"],
"node": "16"
"node": "18"
}
3 changes: 3 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@ dist
coverage
examples/next/.next
docs/src/pages/index.mdx

# Prettier doesn't know how to format MDX2 and makes silly mistakes.
*.mdx
8 changes: 7 additions & 1 deletion babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,13 @@ module.exports = {
targets: '> 0.25%, not dead, not ie 11',
},
],
'@babel/react',
[
'@babel/react',
{
runtime: 'automatic',
importSource: '@theme-ui/core',
},
],
'@babel/preset-typescript',
],
env: {
Expand Down
14 changes: 7 additions & 7 deletions examples/gatsby-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@
"build": "gatsby build"
},
"dependencies": {
"@emotion/react": "^11",
"gatsby": "^4.21.0",
"gatsby-plugin-mdx": "^3.7.1",
"@emotion/react": "^11.11.1",
"gatsby": "^5",
"gatsby-plugin-mdx": "^5",
"gatsby-plugin-theme-ui": "workspace:^",
"react": "^18.1.0",
"react-dom": "^18.1.0",
"react-dom": "^18",
"theme-ui": "workspace:^"
},
"devDependencies": {
"@types/react": "^18",
"typescript": "^4",
"babel-eslint": "^10"
"@types/react": "^18.2.12",
"babel-eslint": "^10",
"typescript": "^5"
}
}
4 changes: 2 additions & 2 deletions examples/gatsby-plugin/src/layout.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/** @jsx jsx */
import { jsx, Themed } from 'theme-ui'
/** @jsxImportSource theme-ui */
import { Themed } from 'theme-ui'

const Layout = (props) => (
<Themed.root>
Expand Down
23 changes: 11 additions & 12 deletions examples/gatsby/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,20 @@
"build": "gatsby build"
},
"dependencies": {
"@emotion/react": "^11",
"gatsby": "^4.21.0",
"gatsby-plugin-mdx": "^4.0.0",
"react": "^18.1.0",
"react-dom": "^18.1.0",
"@emotion/react": "^11.11.1",
"@mdx-js/react": "^2.3.0",
"@theme-ui/mdx": "workspace:^",
"theme-ui": "workspace:^",
"@mdx-js/react": "^2",
"gatsby-source-filesystem": "latest"
"gatsby": "^5",
"gatsby-plugin-mdx": "^5",
"gatsby-source-filesystem": "latest",
"react": "^18.1.0",
"react-dom": "^18",
"theme-ui": "workspace:^"
},
"devDependencies": {
"@types/react": "^18",
"typescript": "^4",
"@babel/core": "^7.15.8",
"@types/react": "^18.2.12",
"babel-eslint": "^10",
"graphql": "^15"
"graphql": "^15",
"typescript": "^5"
}
}
19 changes: 9 additions & 10 deletions examples/next/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,19 @@
"typecheck": "tsc --noEmit"
},
"dependencies": {
"@emotion/react": "^11",
"@mdx-js/loader": "^2.1.2",
"@mdx-js/react": "^2.1.2",
"@next/mdx": "^12.0.7",
"@emotion/react": "^11.11.1",
"@mdx-js/loader": "^2.3.0",
"@mdx-js/react": "^2.3.0",
"@next/mdx": "^13.4.5",
"@theme-ui/css": "workspace:^",
"next": "^12.1.0",
"react": "^18",
"next": "^13.4.5",
"react": "^18.1.0",
"react-dom": "^18",
"theme-ui": "workspace:^"
},
"devDependencies": {
"typescript": "^4",
"@babel/core": "^7",
"webpack": "^4",
"@types/react": "^18"
"@types/react": "^18.2.12",
"typescript": "^5",
"webpack": "^5.86.0"
}
}
6 changes: 0 additions & 6 deletions examples/prism/gatsby-browser.js

This file was deleted.

10 changes: 0 additions & 10 deletions examples/prism/gatsby-config.js

This file was deleted.

6 changes: 0 additions & 6 deletions examples/prism/gatsby-ssr.js

This file was deleted.

26 changes: 0 additions & 26 deletions examples/prism/package.json

This file was deleted.

9 changes: 0 additions & 9 deletions examples/prism/src/index.js

This file was deleted.

15 changes: 0 additions & 15 deletions examples/prism/src/layout.js

This file was deleted.

21 changes: 0 additions & 21 deletions examples/prism/src/pages/index.mdx

This file was deleted.

93 changes: 0 additions & 93 deletions examples/prism/src/theme.js

This file was deleted.

17 changes: 8 additions & 9 deletions examples/typography/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,24 @@
"build": "gatsby build"
},
"dependencies": {
"@mdx-js/react": "^2.0.0",
"gatsby": "^4.21.0",
"@mdx-js/react": "^2.3.0",
"gatsby": "^5",
"gatsby-plugin-google-fonts": "^1.0.0",
"gatsby-plugin-mdx": "^4.0.0",
"gatsby-source-filesystem": "^4",
"gatsby-plugin-mdx": "^5",
"gatsby-source-filesystem": "^5.10.0",
"lodash.merge": "^4.6.1",
"react": "^18.1.0",
"react-dom": "^18.1.0",
"react-dom": "^18",
"theme-ui": "workspace:^",
"theme-ui-typography": "^0.1.7",
"typography-theme-fairy-gates": "^0.16.19"
},
"devDependencies": {
"@babel/core": "^7.15.8",
"@types/lodash.merge": "^4.6.7",
"@types/react": "^17.0.39",
"@types/react": "^18.2.12",
"babel-eslint": "^10",
"eslint": "^8",
"eslint": "^8.42.0",
"graphql": "^15",
"typescript": "^4"
"typescript": "^5"
}
}
23 changes: 10 additions & 13 deletions jest.config.js → jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,26 +1,22 @@
// @ts-check

/** @typedef {import('ts-jest/dist/types')} */
/** @type {import('@jest/types').Config.InitialOptions} */
const config = {
preset: 'ts-jest/presets/js-with-ts',
import type { JestConfigWithTsJest } from 'ts-jest'

const config: JestConfigWithTsJest = {
preset: 'ts-jest',
transform: {
'^.+.tsx?$': [
'ts-jest',
{
isolatedModules: true,
tsconfig: {
tsconfig: './tsconfig.test.json',
useESM: true,
diagnostics: {
exclude: ['**'],
},
},
tsconfig: './tsconfig.test.json',
},
],
'^.+\\.m?jsx?$': '<rootDir>/jest-preprocess.js',
},
testMatch: ['**/packages/**/test/*.{js,ts,tsx,mjs}'],
testMatch: [
'**/packages/**/test/*.{js,ts,tsx,mjs}',
'**/packages/*/src/**/*.spec.{js,ts,tsx,mjs}',
],
testPathIgnorePatterns: [
'/node_modules/',
'/fixtures/',
Expand All @@ -29,6 +25,7 @@ const config = {
'tailwind.config.js',
'/dist/',
'/__test-utils__/',
'/node_modules/(?!(@babel/runtime|gatsby))',
],
coverageReporters: ['lcov', 'text', 'html'],
coverageProvider: 'v8',
Expand Down
Loading