Skip to content

Commit

Permalink
native ESM + update dependencies (#118)
Browse files Browse the repository at this point in the history
  • Loading branch information
onemen committed Jun 13, 2023
1 parent 3a52016 commit fba1995
Show file tree
Hide file tree
Showing 94 changed files with 11,119 additions and 3,633 deletions.
14 changes: 12 additions & 2 deletions .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,15 @@
"singleQuote": true,
"tabWidth": 2,
"trailingComma": "all",
"useTabs": true
}
"useTabs": true,
"overrides": [
{
"files": [
"**/*.json"
],
"options": {
"useTabs": false
}
}
]
}
2 changes: 1 addition & 1 deletion examples/resetting-via-key-prop/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import * as React from 'react'
import * as ReactDOM from 'react-dom/client'
import { Switch } from '~/shared/switch'
import { Switch } from '~/shared/switch.tsx'

function callAll<Args extends Array<unknown>>(
...fns: Array<((...args: Args) => unknown) | undefined>
Expand Down
2 changes: 1 addition & 1 deletion exercises/01.latest-ref/01.solution/increments.test.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { waitFor, within } from '@testing-library/dom'
import userEvent from '@testing-library/user-event'
import { userEvent } from '~/shared/user-event.cjs'
import { expect, testStep } from '@kentcdodds/workshop-app/test'
import '.'

Expand Down
2 changes: 1 addition & 1 deletion exercises/01.latest-ref/01.solution/step-change.test.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { waitFor, within, fireEvent } from '@testing-library/dom'
import userEvent from '@testing-library/user-event'
import { userEvent } from '~/shared/user-event.cjs'
import { expect, testStep } from '@kentcdodds/workshop-app/test'
import '.'

Expand Down
6 changes: 3 additions & 3 deletions exercises/02.composition/01.problem/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react'
import * as ReactDOM from 'react-dom/client'
import { allPokemon, PokemonDataView } from '~/shared/pokemon'
import type { PokemonData, User } from '~/shared/types'
import { allPokemon, PokemonDataView } from '~/shared/pokemon.tsx'
import type { PokemonData, User } from '~/shared/types.tsx'

function App() {
const [user] = React.useState<User>({ name: 'Kody', image: '/img/kody.png' })
Expand All @@ -22,7 +22,7 @@ function App() {
*/}
<Nav user={user} />
<div className="spacer" data-size="lg" />
{/*
{/*
🐨 make Main accept ReactElement props called "sidebar" and "content"
instead of the props it accepts right now.
*/}
Expand Down
4 changes: 2 additions & 2 deletions exercises/02.composition/01.solution/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react'
import * as ReactDOM from 'react-dom/client'
import { allPokemon, PokemonDataView } from '~/shared/pokemon'
import type { PokemonData, User } from '~/shared/types'
import { allPokemon, PokemonDataView } from '~/shared/pokemon.tsx'
import type { PokemonData, User } from '~/shared/types.tsx'

function App() {
const [user] = React.useState<User>({ name: 'Kody', image: '/img/kody.png' })
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { within } from '@testing-library/dom'
import userEvent from '@testing-library/user-event'
import { userEvent } from '~/shared/user-event.cjs'
import { expect, testStep } from '@kentcdodds/workshop-app/test'
import '.'

Expand Down
2 changes: 1 addition & 1 deletion exercises/03.compound-components/01.problem/app.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Toggle, ToggleOn, ToggleOff, ToggleButton } from './toggle'
import { Toggle, ToggleOn, ToggleOff, ToggleButton } from './toggle.tsx'

export function App() {
return (
Expand Down
2 changes: 1 addition & 1 deletion exercises/03.compound-components/01.problem/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as ReactDOM from 'react-dom/client'
import { App } from './app'
import { App } from './app.tsx'

const rootEl = document.createElement('div')
document.body.append(rootEl)
Expand Down
2 changes: 1 addition & 1 deletion exercises/03.compound-components/01.problem/toggle.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react'
import { Switch } from '~/shared/switch'
import { Switch } from '~/shared/switch.tsx'

// 🐨 create your ToggleContext context here
// 📜 https://reactjs.org/docs/context.html#reactcreatecontext
Expand Down
2 changes: 1 addition & 1 deletion exercises/03.compound-components/01.solution/app.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Toggle, ToggleOn, ToggleOff, ToggleButton } from './toggle'
import { Toggle, ToggleOn, ToggleOff, ToggleButton } from './toggle.tsx'

export function App() {
return (
Expand Down
2 changes: 1 addition & 1 deletion exercises/03.compound-components/01.solution/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as ReactDOM from 'react-dom/client'
import { App } from './app'
import { App } from './app.tsx'

const rootEl = document.createElement('div')
document.body.append(rootEl)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { verifySimpleToggleWithText } from '~/shared/toggle.test'
import { verifySimpleToggleWithText } from '~/shared/toggle.test.tsx'
import '.'

await verifySimpleToggleWithText()
2 changes: 1 addition & 1 deletion exercises/03.compound-components/01.solution/toggle.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react'
import { Switch } from '~/shared/switch'
import { Switch } from '~/shared/switch.tsx'

type ToggleValue = { on: boolean; toggle: () => void }
const ToggleContext = React.createContext<ToggleValue | undefined>(undefined)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Toggle, ToggleOn, ToggleOff, ToggleButton } from './toggle'
import { Toggle, ToggleOn, ToggleOff, ToggleButton } from './toggle.tsx'

export function App() {
return (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as ReactDOM from 'react-dom/client'
import { App } from './app'
import { App } from './app.tsx'

const rootEl = document.createElement('div')
document.body.append(rootEl)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react'
import { Switch } from '~/shared/switch'
import { Switch } from '~/shared/switch.tsx'

type ToggleValue = { on: boolean; toggle: () => void }
const ToggleContext = React.createContext<ToggleValue | undefined>(undefined)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Toggle, ToggleOn, ToggleOff, ToggleButton } from './toggle'
import { Toggle, ToggleOn, ToggleOff, ToggleButton } from './toggle.tsx'

export function App() {
return (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as ReactDOM from 'react-dom/client'
import { App } from './app'
import { App } from './app.tsx'

const rootEl = document.createElement('div')
document.body.append(rootEl)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { verifySimpleToggleWithText } from '~/shared/toggle.test'
import { verifySimpleToggleWithText } from '~/shared/toggle.test.tsx'
import '.'

await verifySimpleToggleWithText()
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react'
import { Switch } from '~/shared/switch'
import { Switch } from '~/shared/switch.tsx'

type ToggleValue = { on: boolean; toggle: () => void }
const ToggleContext = React.createContext<ToggleValue | undefined>(undefined)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { render } from '@testing-library/react'
import { expect, testStep } from '@kentcdodds/workshop-app/test'
import { ToggleButton, ToggleOff, ToggleOn } from './toggle'
import { ToggleButton, ToggleOff, ToggleOn } from './toggle.tsx'

const expectedErrorMessage =
'Cannot find ToggleContext. All Toggle components must be rendered within <Toggle />'
Expand Down
4 changes: 2 additions & 2 deletions exercises/03.compound-components/README.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ it's selected? We can easily add API surface area to support these use cases,
but that's just more for us to code and more for users to learn. That's where
compound components come in really handy!

import {Toggle} from '../07.control-props/02.solution.warnings/toggle'
import { Toggle } from '../07.control-props/02.solution.warnings/toggle'

For the rest of the exercises in this workshop, we'll be working with a Toggle
component. Specifically, this one:

<div style={{display: 'flex', justifyContent: 'center'}}>
<div style={{ display: 'flex', justifyContent: 'center' }}>
<Toggle />
</div>

Expand Down
4 changes: 2 additions & 2 deletions exercises/04.prop-getters/01.problem.collections/app.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Switch } from '~/shared/switch'
import { useToggle } from './toggle'
import { Switch } from '~/shared/switch.tsx'
import { useToggle } from './toggle.tsx'

export function App() {
const { on, togglerProps } = useToggle()
Expand Down
2 changes: 1 addition & 1 deletion exercises/04.prop-getters/01.problem.collections/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as ReactDOM from 'react-dom/client'
import { App } from './app'
import { App } from './app.tsx'

const rootEl = document.createElement('div')
document.body.append(rootEl)
Expand Down
4 changes: 2 additions & 2 deletions exercises/04.prop-getters/01.solution.collections/app.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Switch } from '~/shared/switch'
import { useToggle } from './toggle'
import { Switch } from '~/shared/switch.tsx'
import { useToggle } from './toggle.tsx'

export function App() {
const { on, togglerProps } = useToggle()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { screen } from '@testing-library/dom'
import { verifyIsToggle } from '~/shared/toggle.test'
import { verifyIsToggle } from '~/shared/toggle.test.tsx'
import '.'

await verifyIsToggle(await screen.findByLabelText('custom-button'))
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as ReactDOM from 'react-dom/client'
import { App } from './app'
import { App } from './app.tsx'

const rootEl = document.createElement('div')
document.body.append(rootEl)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { verifySimpleToggle } from '~/shared/toggle.test'
import { verifySimpleToggle } from '~/shared/toggle.test.tsx'
import '.'

await verifySimpleToggle()
4 changes: 2 additions & 2 deletions exercises/04.prop-getters/02.problem.getters/app.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Switch } from '~/shared/switch'
import { useToggle } from './toggle'
import { Switch } from '~/shared/switch.tsx'
import { useToggle } from './toggle.tsx'

export function App() {
// 💣 delete this:
Expand Down
2 changes: 1 addition & 1 deletion exercises/04.prop-getters/02.problem.getters/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as ReactDOM from 'react-dom/client'
import { App } from './app'
import { App } from './app.tsx'

const rootEl = document.createElement('div')
document.body.append(rootEl)
Expand Down
4 changes: 2 additions & 2 deletions exercises/04.prop-getters/02.solution.getters/app.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Switch } from '~/shared/switch'
import { useToggle } from './toggle'
import { Switch } from '~/shared/switch.tsx'
import { useToggle } from './toggle.tsx'

export function App() {
const { on, getTogglerProps } = useToggle()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { screen } from '@testing-library/dom'
import { verifyIsToggle } from '~/shared/toggle.test'
import { verifyIsToggle } from '~/shared/toggle.test.tsx'
import '.'

await verifyIsToggle(await screen.findByLabelText('custom-button'))
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { screen, waitFor } from '@testing-library/dom'
import { expect, testStep } from '@kentcdodds/workshop-app/test'
import userEvent from '@testing-library/user-event'
import { userEvent } from '~/shared/user-event.cjs'
import '.'

const customButton = await testStep('Custom button is rendred', () =>
Expand Down
2 changes: 1 addition & 1 deletion exercises/04.prop-getters/02.solution.getters/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as ReactDOM from 'react-dom/client'
import { App } from './app'
import { App } from './app.tsx'

const rootEl = document.createElement('div')
document.body.append(rootEl)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { verifySimpleToggle } from '~/shared/toggle.test'
import { verifySimpleToggle } from '~/shared/toggle.test.tsx'
import '.'

await verifySimpleToggle()
4 changes: 2 additions & 2 deletions exercises/05.state-initializer/01.problem/app.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Switch } from '~/shared/switch'
import { useToggle } from './toggle'
import { Switch } from '~/shared/switch.tsx'
import { useToggle } from './toggle.tsx'

export function App() {
// 🐨 pass an object with the initialOn property set to true
Expand Down
2 changes: 1 addition & 1 deletion exercises/05.state-initializer/01.problem/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as ReactDOM from 'react-dom/client'
import { App } from './app'
import { App } from './app.tsx'

const rootEl = document.createElement('div')
document.body.append(rootEl)
Expand Down
4 changes: 2 additions & 2 deletions exercises/05.state-initializer/01.solution/app.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Switch } from '~/shared/switch'
import { useToggle } from './toggle'
import { Switch } from '~/shared/switch.tsx'
import { useToggle } from './toggle.tsx'

export function App() {
const { on, getTogglerProps, getResetterProps } = useToggle({
Expand Down
2 changes: 1 addition & 1 deletion exercises/05.state-initializer/01.solution/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as ReactDOM from 'react-dom/client'
import { App } from './app'
import { App } from './app.tsx'

const rootEl = document.createElement('div')
document.body.append(rootEl)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { expect, testStep } from '@kentcdodds/workshop-app/test'
import { renderHook, act } from '@testing-library/react'
import { useToggle } from './toggle'
import { useToggle } from './toggle.tsx'

await testStep('useToggle still maintains the old API and works', () => {
const { result } = renderHook(() => useToggle())
Expand Down
2 changes: 1 addition & 1 deletion exercises/05.state-initializer/01.solution/toggle.test.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { verifySimpleToggleOnToStart } from '~/shared/toggle.test'
import { verifySimpleToggleOnToStart } from '~/shared/toggle.test.tsx'
import '.'

await verifySimpleToggleOnToStart()
4 changes: 2 additions & 2 deletions exercises/05.state-initializer/02.problem.initial/app.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Switch } from '~/shared/switch'
import { useToggle } from './toggle'
import { Switch } from '~/shared/switch.tsx'
import { useToggle } from './toggle.tsx'

export function App() {
const { on, getTogglerProps, getResetterProps } = useToggle({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as ReactDOM from 'react-dom/client'
import { App } from './app'
import { App } from './app.tsx'

const rootEl = document.createElement('div')
document.body.append(rootEl)
Expand Down
4 changes: 2 additions & 2 deletions exercises/05.state-initializer/02.solution.initial/app.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Switch } from '~/shared/switch'
import { useToggle } from './toggle'
import { Switch } from '~/shared/switch.tsx'
import { useToggle } from './toggle.tsx'

export function App() {
const { on, getTogglerProps, getResetterProps } = useToggle({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as ReactDOM from 'react-dom/client'
import { App } from './app'
import { App } from './app.tsx'

const rootEl = document.createElement('div')
document.body.append(rootEl)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { expect, testStep } from '@kentcdodds/workshop-app/test'
import { renderHook, act } from '@testing-library/react'
import { useToggle } from './toggle'
import { useToggle } from './toggle.tsx'

await testStep(
result =>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { expect, testStep } from '@kentcdodds/workshop-app/test'
import { renderHook, act } from '@testing-library/react'
import { useToggle } from './toggle'
import { useToggle } from './toggle.tsx'

await testStep('useToggle still maintains the old API and works', () => {
const { result } = renderHook(() => useToggle())
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { verifySimpleToggleOnToStart } from '~/shared/toggle.test'
import { verifySimpleToggleOnToStart } from '~/shared/toggle.test.tsx'
import '.'

await verifySimpleToggleOnToStart()
4 changes: 2 additions & 2 deletions exercises/06.state-reducer/01.problem/app.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react'
import { Switch } from '~/shared/switch'
import { useToggle } from './toggle'
import { Switch } from '~/shared/switch.tsx'
import { useToggle } from './toggle.tsx'

export function App() {
const [timesClicked, setTimesClicked] = React.useState(0)
Expand Down
2 changes: 1 addition & 1 deletion exercises/06.state-reducer/01.problem/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as ReactDOM from 'react-dom/client'
import { App } from './app'
import { App } from './app.tsx'

const rootEl = document.createElement('div')
document.body.append(rootEl)
Expand Down
Loading

0 comments on commit fba1995

Please sign in to comment.