Skip to content

Commit

Permalink
Merge branch 'develop' into remove-style-props
Browse files Browse the repository at this point in the history
  • Loading branch information
lachlanjc committed Nov 28, 2023
2 parents 3c4725a + 650c52b commit 38ec61d
Show file tree
Hide file tree
Showing 240 changed files with 13,792 additions and 15,694 deletions.
33 changes: 32 additions & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@
"code",
"doc",
"test",
"review"
"review",
"example"
]
},
{
Expand Down Expand Up @@ -1160,6 +1161,36 @@
"test",
"code"
]
},
{
"login": "wahidrahim",
"name": "Wahid Rahim",
"avatar_url": "https://avatars.githubusercontent.com/u/7417976?v=4",
"profile": "https://github.com/wahidrahim",
"contributions": [
"doc",
"example",
"code"
]
},
{
"login": "JustinotherGitter",
"name": "Justin Cooper",
"avatar_url": "https://avatars.githubusercontent.com/u/49234323?v=4",
"profile": "https://github.com/JustinotherGitter",
"contributions": [
"doc"
]
},
{
"login": "dev-cj",
"name": "CJ",
"avatar_url": "https://avatars.githubusercontent.com/u/47112778?v=4",
"profile": "https://devcj.in/",
"contributions": [
"doc",
"code"
]
}
]
}
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"
}
6 changes: 4 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ jobs:
) && (
needs.release_check.outputs.CAN_RELEASE == 'true'
)
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
steps:
- uses: actions/checkout@v3

Expand All @@ -84,6 +87,7 @@ jobs:
with:
node-version: 18.x
cache: 'pnpm'
registry-url: 'https://registry.npmjs.org'

- name: Install
run: pnpm install --no-optional --no-frozen-lockfile
Expand All @@ -101,8 +105,6 @@ jobs:
# continue-on-error: true
env:
GITHUB_TOKEN: ${{ secrets.AUTO_RELEASE_GH_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
run: pnpm release

- name: Check published prerelease
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- run: pnpm build:docs
- run: cd packages/e2e && pnpm cypress install

- uses: cypress-io/github-action@v4.2.0
- uses: cypress-io/github-action@v5.0.0
with:
record: true
parallel: true
Expand Down
11 changes: 7 additions & 4 deletions .pnpmfile.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ function afterAllResolved(lockfile, context) {
for (let x of PACKAGES_WITH_ENFORCED_SINGLE_VERSION) {
if (p.startsWith(`/${x}/`)) {
if (found[x]) {
found[x] += 1
found[x].push(p)
} else {
found[x] = 1
found[x] = [p]
}
}
}
Expand All @@ -24,9 +24,12 @@ function afterAllResolved(lockfile, context) {
let msg = ''

for (let p in found) {
const count = found[p]
const count = found[p].length
if (count > 1) {
msg += `${p} found ${count} times\n`
msg +=
`${p} found ${count} times\n` +
found[p].map((s) => `- ${s}`).join('\n') +
'\n\n'
}
}

Expand Down
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
193 changes: 193 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,196 @@
# v0.16.1 (Thu Sep 07 2023)

#### 🐛 Bug Fix

- fix: ThemeProvider warning message ([@hasparus](https://github.com/hasparus))

#### 👨‍💻 Minor changes

- Add missing migration notes on 0.16 to docs ([@hasparus](https://github.com/hasparus))

#### Authors: 1

- Piotr Monwid-Olechnowicz ([@hasparus](https://github.com/hasparus))

---

# v0.16.0 (Thu Jun 15 2023)

### Release Notes

#### Deps bumps for 0.16.0 ([#2432](https://github.com/system-ui/theme-ui/pull/2432))

`@theme-ui/sidenav` package was removed due to low usage and breaking changes in `@types/react`.

---

#### 🚀 Enhancement

- Deps bumps for 0.16.0 [#2432](https://github.com/system-ui/theme-ui/pull/2432) ([@hasparus](https://github.com/hasparus))
- Deprecate/rename ThemeProvider to ThemeUIProvider [#2360](https://github.com/system-ui/theme-ui/pull/2360) ([@lachlanjc](https://github.com/lachlanjc) [@hasparus](https://github.com/hasparus))

#### 👨‍💻 Minor changes

- Trigger release again ([@hasparus](https://github.com/hasparus))
- Trigger release ([@hasparus](https://github.com/hasparus))
- Update lockfile ([@hasparus](https://github.com/hasparus))
- Update Browserlist ([@hasparus](https://github.com/hasparus))
- Update pnpm-lock.yaml ([@hasparus](https://github.com/hasparus))

#### Authors: 2

- Lachlan Campbell ([@lachlanjc](https://github.com/lachlanjc))
- Piotr Monwid-Olechnowicz ([@hasparus](https://github.com/hasparus))

---

# v0.15.8 (Sat Apr 29 2023)

:tada: This release contains work from a new contributor! :tada:

Thank you, CJ ([@dev-cj](https://github.com/dev-cj)), for all your work!

#### 🐛 Bug Fix

- fix(theme-ui): add transitive peer dependency on `@emotion/react` [#2421](https://github.com/system-ui/theme-ui/pull/2421) ([@hasparus](https://github.com/hasparus))

#### 🏠 Internal

- components: Added indeterminate checkbox [#2419](https://github.com/system-ui/theme-ui/pull/2419) ([@dev-cj](https://github.com/dev-cj))
- docs: Fix typo in "switch" [#2420](https://github.com/system-ui/theme-ui/pull/2420) ([@dev-cj](https://github.com/dev-cj))

#### Authors: 2

- CJ ([@dev-cj](https://github.com/dev-cj))
- Piotr Monwid-Olechnowicz ([@hasparus](https://github.com/hasparus))

---

# v0.15.7 (Thu Mar 30 2023)



---

# v0.15.6 (Wed Mar 29 2023)

:tada: This release contains work from new contributors! :tada:

Thanks for all your work!

:heart: Ben ([@benchilds](https://github.com/benchilds))

:heart: Justin Cooper ([@JustinotherGitter](https://github.com/JustinotherGitter))

#### 🐛 Bug Fix

- Update variants.mdx [#2408](https://github.com/system-ui/theme-ui/pull/2408) ([@benchilds](https://github.com/benchilds))
- fix: Use `type` imports on src/index [#2392](https://github.com/system-ui/theme-ui/pull/2392) ([@lachlanjc](https://github.com/lachlanjc))

#### 🏠 Internal

- docs: Fix color modes code sample typo [#2399](https://github.com/system-ui/theme-ui/pull/2399) ([@JustinotherGitter](https://github.com/JustinotherGitter))

#### Authors: 3

- Ben ([@benchilds](https://github.com/benchilds))
- Justin Cooper ([@JustinotherGitter](https://github.com/JustinotherGitter))
- Lachlan Campbell ([@lachlanjc](https://github.com/lachlanjc))

---

# v0.15.5 (Tue Feb 07 2023)

:tada: This release contains work from new contributors! :tada:

Thanks for all your work!

:heart: Nischal Shakya ([@Nischal2015](https://github.com/Nischal2015))

:heart: Wahid Rahim ([@wahidrahim](https://github.com/wahidrahim))

#### 🐛 Bug Fix

- fix(custom-properties): use default key name if pluralize returns empty [#2389](https://github.com/system-ui/theme-ui/pull/2389) ([@wahidrahim](https://github.com/wahidrahim))
- Add theme-aware Global component [#2385](https://github.com/system-ui/theme-ui/pull/2385) ([@lachlanjc](https://github.com/lachlanjc) [@hasparus](https://github.com/hasparus))

#### 🏠 Internal

- components: Rewrite Spinner for better performance [#2384](https://github.com/system-ui/theme-ui/pull/2384) ([@lachlanjc](https://github.com/lachlanjc))
- docs: Add missing `useMDXComponents` import [#2370](https://github.com/system-ui/theme-ui/pull/2370) ([@Nischal2015](https://github.com/Nischal2015))
- docs: Reorganize Color Modes doc for clarity [#2365](https://github.com/system-ui/theme-ui/pull/2365) ([@lachlanjc](https://github.com/lachlanjc))

#### Authors: 5

- Lachlan Campbell ([@lachlanjc](https://github.com/lachlanjc))
- Lennart ([@LekoArts](https://github.com/LekoArts))
- Nischal Shakya ([@Nischal2015](https://github.com/Nischal2015))
- Piotr Monwid-Olechnowicz ([@hasparus](https://github.com/hasparus))
- Wahid Rahim ([@wahidrahim](https://github.com/wahidrahim))

---

# v0.15.4 (Thu Nov 10 2022)

#### 🐛 Bug Fix

- lock file [#2358](https://github.com/system-ui/theme-ui/pull/2358) ([@LekoArts](https://github.com/LekoArts))
- add peerDep change [#2359](https://github.com/system-ui/theme-ui/pull/2359) ([@LekoArts](https://github.com/LekoArts))
- Update preset-tailwind for Tailwind v3 (breaking) [#2357](https://github.com/system-ui/theme-ui/pull/2357) ([@lachlanjc](https://github.com/lachlanjc))

#### 🏠 Internal

- docs: Add destructuring example to useThemeUI API [#2359](https://github.com/system-ui/theme-ui/pull/2359) ([@lachlanjc](https://github.com/lachlanjc))

#### Authors: 2

- Lachlan Campbell ([@lachlanjc](https://github.com/lachlanjc))
- Lennart ([@LekoArts](https://github.com/LekoArts))

---

# v0.15.4 (Thu Nov 10 2022)

#### 🐛 Bug Fix

- lock file [#2358](https://github.com/system-ui/theme-ui/pull/2358) ([@LekoArts](https://github.com/LekoArts))
- add peerDep change [#2359](https://github.com/system-ui/theme-ui/pull/2359) ([@LekoArts](https://github.com/LekoArts))
- Update preset-tailwind for Tailwind v3 (breaking) [#2357](https://github.com/system-ui/theme-ui/pull/2357) ([@lachlanjc](https://github.com/lachlanjc))

#### 🏠 Internal

- docs: Add destructuring example to useThemeUI API [#2359](https://github.com/system-ui/theme-ui/pull/2359) ([@lachlanjc](https://github.com/lachlanjc))

#### Authors: 2

- Lachlan Campbell ([@lachlanjc](https://github.com/lachlanjc))
- Lennart ([@LekoArts](https://github.com/LekoArts))

---

# v0.15.1 (Tue Oct 04 2022)

#### 🐛 Bug Fix

- Add `@mdx-js/react` to peerDeps for `gatsby-plugin-theme-ui` [#2331](https://github.com/system-ui/theme-ui/pull/2331) ([@hasparus](https://github.com/hasparus))
- Fix MDXProvider example [#2329](https://github.com/system-ui/theme-ui/pull/2329) ([@shawnbot](https://github.com/shawnbot))
- fix(typography): drop broken dev dependencies ([@hasparus](https://github.com/hasparus))
- fix(match-media): add dev dependency on react-dom ([@hasparus](https://github.com/hasparus))
- fix(theme-ui): remove redundant dependency on @theme-ui/mdx from package.json ([@hasparus](https://github.com/hasparus))

#### 🏠 Internal

- docs: Mention that /core doesn't add global styles [#2333](https://github.com/system-ui/theme-ui/pull/2333) ([@lachlanjc](https://github.com/lachlanjc))
- docs: Group & update all MDX-related docs [#2339](https://github.com/system-ui/theme-ui/pull/2339) ([@lachlanjc](https://github.com/lachlanjc))

#### Authors: 3

- Lachlan Campbell ([@lachlanjc](https://github.com/lachlanjc))
- Piotr Monwid-Olechnowicz ([@hasparus](https://github.com/hasparus))
- Shawn Allen ([@shawnbot](https://github.com/shawnbot))

---

# v0.15.0 (Mon Sep 26 2022)

:tada: This release contains work from new contributors! :tada:
Expand Down
24 changes: 24 additions & 0 deletions MIGRATING.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,29 @@
# Migration Guides

## v0.16

**🔥 Breaking:** Theme UI now supports and **depends on** TypeScript newer than
5.1.2 (because of breaking changes to JSX types, see
https://github.com/system-ui/theme-ui/issues/2430#issuecomment-1586197881).

- Update `@types/react` to a version published after June 1, 2023.
- JSX Automatic Runtime is highly encouraged to minimize the friction and ensure
you don't get weird type errors.

**`@theme-ui/sidenav` package was removed due to low usage and breaking changes
in `@types/react`.**

- Deps bumps for 0.16.0, support only new React and TypeScript to avoid type
errors [#2432](https://github.com/system-ui/theme-ui/pull/2432)
([@hasparus](https://github.com/hasparus))

**`ThemeProvider` was renamed to `ThemeUIProvider`**

- Deprecate/rename ThemeProvider to ThemeUIProvider
[#2360](https://github.com/system-ui/theme-ui/pull/2360)
([@lachlanjc](https://github.com/lachlanjc)
[@hasparus](https://github.com/hasparus))

## v0.15

**MDX is now opt-in.**
Expand Down
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
Loading

0 comments on commit 38ec61d

Please sign in to comment.