Skip to content

Commit 1e607dc

Browse files
hasparushasparus
committed
wip: use PNPM because we need workspace: protocol for tests
1 parent 0deef03 commit 1e607dc

File tree

30 files changed

+21160
-63
lines changed

30 files changed

+21160
-63
lines changed

‎examples/gatsby-plugin/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
"@emotion/react": "^11.8.1",
1616
"gatsby": "^4.21.0",
1717
"gatsby-plugin-mdx": "^3.7.1",
18-
"gatsby-plugin-theme-ui": "latest",
18+
"gatsby-plugin-theme-ui": "workspace:^",
1919
"react": "^18.1.0",
2020
"react-dom": "^18.1.0",
21-
"theme-ui": "latest"
21+
"theme-ui": "workspace:^"
2222
}
2323
}

‎examples/gatsby/package.json

+5-3
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,15 @@
1717
"gatsby-plugin-mdx": "^4.0.0",
1818
"react": "^18.1.0",
1919
"react-dom": "^18.1.0",
20-
"@theme-ui/mdx": "^0.15.0-rc.1",
21-
"theme-ui": "^0.15.0-rc.1",
20+
"@theme-ui/mdx": "workspace:^",
21+
"theme-ui": "workspace:^",
2222
"@mdx-js/react": "^2",
2323
"gatsby-source-filesystem": "latest"
2424
},
2525
"devDependencies": {
2626
"@types/react": "^17.0.39",
27-
"typescript": "^4.5.5"
27+
"typescript": "^4.5.5",
28+
"@babel/core": "^7.15.8",
29+
"babel-eslint": "^10"
2830
}
2931
}

‎examples/next/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"next": "^12.1.0",
2020
"react": "^18",
2121
"react-dom": "^18",
22-
"theme-ui": "latest"
22+
"theme-ui": "workspace:^"
2323
},
2424
"devDependencies": {
2525
"@types/react": "^17.0.38",

‎examples/prism/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
"prismjs": "^1.16.0",
1818
"react": "^18.1.0",
1919
"react-dom": "^18.1.0",
20-
"theme-ui": "latest"
20+
"theme-ui": "workspace:^"
2121
}
2222
}

‎examples/typography/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"lodash.merge": "^4.6.1",
1818
"react": "^18.1.0",
1919
"react-dom": "^18.1.0",
20-
"theme-ui": "latest",
20+
"theme-ui": "workspace:^",
2121
"theme-ui-typography": "^0.1.7",
2222
"typography-theme-fairy-gates": "^0.16.19"
2323
}

‎package.json

-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@
2121
"all-contributors:check": "./scripts/all-contributors-check.js",
2222
"all-contributors:add": "npx all-contributors add"
2323
},
24-
"workspaces": [
25-
"packages/*",
26-
"examples/*"
27-
],
2824
"nohoist": [
2925
"**/@mdx-js/react",
3026
"**/@mdx-js/mdx"

‎packages/color-modes/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
"access": "public"
1515
},
1616
"dependencies": {
17-
"@theme-ui/core": "0.15.0-rc.1",
18-
"@theme-ui/css": "0.15.0-rc.1",
17+
"@theme-ui/core": "workspace:^",
18+
"@theme-ui/css": "workspace:^",
1919
"deepmerge": "^4.2.2"
2020
},
2121
"peerDependencies": {

‎packages/color/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"types": "dist/theme-ui-color.cjs.d.ts",
88
"scripts": {},
99
"dependencies": {
10-
"@theme-ui/css": "0.15.0-rc.1",
10+
"@theme-ui/css": "workspace:^",
1111
"polished": "^4.0.5"
1212
},
1313
"publishConfig": {

‎packages/components/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"@styled-system/color": "^5.1.2",
1111
"@styled-system/should-forward-prop": "^5.1.2",
1212
"@styled-system/space": "^5.1.2",
13-
"@theme-ui/css": "0.15.0-rc.1",
13+
"@theme-ui/css": "workspace:^",
1414
"@types/styled-system": "^5.1.13"
1515
},
1616
"peerDependencies": {

‎packages/core/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"access": "public"
1515
},
1616
"dependencies": {
17-
"@theme-ui/css": "0.15.0-rc.1",
17+
"@theme-ui/css": "workspace:^",
1818
"deepmerge": "^4.2.2"
1919
},
2020
"peerDependencies": {

‎packages/core/src/jsx-dev-runtime.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22
import { jsxDEV as emotionJsxDEV } from '@emotion/react/jsx-dev-runtime'
33
import { ThemeUIJSX } from './jsx-namespace'
44
import { parseProps } from './parseProps'
5+
import type { ElementType } from 'react'
56

67
export { Fragment } from 'react'
78
export type { ThemeUIJSX as JSX } from './jsx-namespace'
89

910
export const jsxDEV = <P>(
10-
type: React.ElementType<P>,
11+
type: ElementType<P>,
1112
props: P,
1213
key: string | undefined,
1314
isStaticChildren: boolean,

‎packages/core/src/jsx-runtime.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,19 @@ import {
66
} from '@emotion/react/jsx-runtime'
77
import { ThemeUIJSX } from './jsx-namespace'
88
import { parseProps } from './parseProps'
9+
import type { ElementType } from 'react'
910

1011
export { Fragment } from 'react'
1112
export type { ThemeUIJSX as JSX } from './jsx-namespace'
1213

1314
export const jsx = <P>(
14-
type: React.ElementType<P>,
15+
type: ElementType<P>,
1516
props: P,
1617
key?: string
1718
): ThemeUIJSX.Element => emotionJsx(type, parseProps(props), key)
1819

1920
export const jsxs = <P>(
20-
type: React.ElementType<P>,
21+
type: ElementType<P>,
2122
props: P,
2223
key?: string
2324
): ThemeUIJSX.Element => emotionJsxs(type, parseProps(props), key)

‎packages/docs/package.json

+13-13
Original file line numberDiff line numberDiff line change
@@ -21,25 +21,25 @@
2121
"@emotion/react": "^11.9.0",
2222
"@mdx-js/mdx": "^1",
2323
"@mdx-js/react": "^1",
24-
"@theme-ui/color": "0.15.0-rc.1",
25-
"@theme-ui/components": "0.15.0-rc.1",
26-
"@theme-ui/css": "0.15.0-rc.1",
27-
"@theme-ui/match-media": "0.15.0-rc.1",
28-
"@theme-ui/mdx": "0.14.5",
29-
"@theme-ui/presets": "0.15.0-rc.1",
30-
"@theme-ui/prism": "0.15.0-rc.1",
31-
"@theme-ui/sidenav": "0.15.0-rc.1",
32-
"@theme-ui/style-guide": "0.15.0-rc.1",
33-
"@theme-ui/typography": "0.15.0-rc.1",
24+
"@theme-ui/color": "workspace:^",
25+
"@theme-ui/components": "workspace:^",
26+
"@theme-ui/css": "workspace:^",
27+
"@theme-ui/match-media": "workspace:^",
28+
"@theme-ui/mdx": "workspace:^",
29+
"@theme-ui/presets": "workspace:^",
30+
"@theme-ui/prism": "workspace:^",
31+
"@theme-ui/sidenav": "workspace:^",
32+
"@theme-ui/style-guide": "workspace:^",
33+
"@theme-ui/typography": "workspace:^",
3434
"copy-to-clipboard": "^3.2.0",
3535
"eslint-config-react-app": "^6.0.0",
3636
"gatsby": "^4.21.0",
3737
"gatsby-plugin-catch-links": "^4.2.0",
3838
"gatsby-plugin-compile-es6-packages": "^2.1.1",
3939
"gatsby-plugin-mdx": "3.2.0",
4040
"gatsby-plugin-react-helmet": "^5.2.0",
41-
"gatsby-plugin-theme-ui": "0.15.0-rc.1",
42-
"gatsby-theme-style-guide": "0.15.0-rc.1",
41+
"gatsby-plugin-theme-ui": "workspace:^",
42+
"gatsby-theme-style-guide": "workspace:^",
4343
"lodash.merge": "^4.6.1",
4444
"lodash.omit": "^4.5.0",
4545
"prismjs": "^1.16.0",
@@ -49,7 +49,7 @@
4949
"react-live": "^2.1.2",
5050
"remark-slug": "^6",
5151
"stringify-object": "^3",
52-
"theme-ui": "0.15.0-rc.1",
52+
"theme-ui": "workspace:^",
5353
"typography-theme-alton": "^0.16.19",
5454
"typography-theme-anonymous": "^0.15.10",
5555
"typography-theme-bootstrap": "^0.16.19",

‎packages/gatsby-plugin-theme-ui/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
"peerDependencies": {
88
"@emotion/react": "^11",
99
"@mdx-js/react": "^1 || ^2",
10-
"@theme-ui/mdx": ">=0.14.0",
11-
"@theme-ui/css": ">=0.14.0",
10+
"@theme-ui/mdx": "workspace:^",
11+
"@theme-ui/css": "workspace:^",
1212
"gatsby": "^4",
1313
"react": ">=18",
14-
"theme-ui": ">=0.14.0"
14+
"theme-ui": "workspace:^"
1515
},
1616
"keywords": [
1717
"gatsby",

‎packages/gatsby-theme-style-guide/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
"react-dom": "^18"
1616
},
1717
"dependencies": {
18-
"@theme-ui/mdx": "0.15.0-rc.1",
19-
"@theme-ui/style-guide": "0.15.0-rc.1",
20-
"theme-ui": "0.15.0-rc.1"
18+
"@theme-ui/mdx": "workspace:^",
19+
"@theme-ui/style-guide": "workspace:^",
20+
"theme-ui": "workspace:^"
2121
},
2222
"gitHead": "621199460fa3bdb0100748441e62517b7529b8c8"
2323
}

‎packages/match-media/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
"access": "public"
1414
},
1515
"devDependencies": {
16-
"@theme-ui/core": "0.15.0-rc.1",
17-
"@theme-ui/css": "0.15.0-rc.1",
16+
"@theme-ui/core": "workspace:^",
17+
"@theme-ui/css": "workspace:^",
1818
"react": "^18.1.0"
1919
},
2020
"peerDependencies": {
21-
"@theme-ui/core": ">=0.14.4",
22-
"@theme-ui/css": ">=0.14.4",
21+
"@theme-ui/core": "workspace:^",
22+
"@theme-ui/css": "workspace:^",
2323
"react": ">=18"
2424
},
2525
"gitHead": "621199460fa3bdb0100748441e62517b7529b8c8"

‎packages/mdx/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
"sideEffects": false,
88
"scripts": {},
99
"dependencies": {
10-
"@theme-ui/core": "0.15.0-rc.1",
11-
"@theme-ui/css": "0.15.0-rc.1"
10+
"@theme-ui/core": "workspace:^",
11+
"@theme-ui/css": "workspace:^"
1212
},
1313
"devDependencies": {
14-
"@mdx-js/mdx-v2@npm:@mdx-js/mdx": "^2.1.2",
15-
"@mdx-js/react-v2@npm:@mdx-js/react": "^2.1.2",
14+
"@mdx-js/mdx-v2": "npm:@mdx-js/mdx@^2.1.2",
15+
"@mdx-js/react-v2": "npm:@mdx-js/react@^2.1.2",
1616
"@types/mdx": "^2.0.2",
1717
"react": "^18.1.0",
1818
"remark-gfm": "^3.0.1"

‎packages/preset-base/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"scripts": {},
1010
"source": "src/index.ts",
1111
"peerDependencies": {
12-
"@theme-ui/css": ">=0.14.0"
12+
"@theme-ui/css": "workspace:^"
1313
},
1414
"publishConfig": {
1515
"access": "public"

‎packages/preset-bootstrap/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"access": "public"
1414
},
1515
"peerDependencies": {
16-
"@theme-ui/css": ">=0.14.0"
16+
"@theme-ui/css": "workspace:^"
1717
},
1818
"gitHead": "621199460fa3bdb0100748441e62517b7529b8c8"
1919
}

‎packages/preset-bulma/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
"repository": "system-ui/theme-ui",
1010
"scripts": {},
1111
"dependencies": {
12-
"@theme-ui/preset-base": "0.15.0-rc.1"
12+
"@theme-ui/preset-base": "workspace:^"
1313
},
1414
"peerDependencies": {
15-
"@theme-ui/css": ">=0.14.0"
15+
"@theme-ui/css": "workspace:^"
1616
},
1717
"publishConfig": {
1818
"access": "public"

‎packages/preset-dark/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"access": "public"
1414
},
1515
"peerDependencies": {
16-
"@theme-ui/css": ">=0.14.0"
16+
"@theme-ui/css": "workspace:^"
1717
},
1818
"gitHead": "621199460fa3bdb0100748441e62517b7529b8c8"
1919
}

‎packages/preset-deep/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"access": "public"
1313
},
1414
"peerDependencies": {
15-
"@theme-ui/css": ">=0.14.0"
15+
"@theme-ui/css": "workspace:^"
1616
},
1717
"gitHead": "621199460fa3bdb0100748441e62517b7529b8c8"
1818
}

‎packages/preset-funk/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
"repository": "system-ui/theme-ui",
1010
"scripts": {},
1111
"dependencies": {
12-
"@theme-ui/preset-base": "0.15.0-rc.1"
12+
"@theme-ui/preset-base": "workspace:^"
1313
},
1414
"peerDependencies": {
15-
"@theme-ui/css": ">=0.14.0"
15+
"@theme-ui/css": "workspace:^"
1616
},
1717
"publishConfig": {
1818
"access": "public"

‎packages/preset-future/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
"repository": "system-ui/theme-ui",
1010
"scripts": {},
1111
"dependencies": {
12-
"@theme-ui/preset-base": "0.15.0-rc.1"
12+
"@theme-ui/preset-base": "workspace:^"
1313
},
1414
"peerDependencies": {
15-
"@theme-ui/css": ">=0.12.0"
15+
"@theme-ui/css": "workspace:^"
1616
},
1717
"publishConfig": {
1818
"access": "public"

‎packages/preset-polaris/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
"repository": "system-ui/theme-ui",
1010
"scripts": {},
1111
"dependencies": {
12-
"@theme-ui/preset-base": "0.15.0-rc.1"
12+
"@theme-ui/preset-base": "workspace:^"
1313
},
1414
"peerDependencies": {
15-
"@theme-ui/css": ">=0.14.0"
15+
"@theme-ui/css": "workspace:^"
1616
},
1717
"publishConfig": {
1818
"access": "public"

‎packages/preset-roboto/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
"repository": "system-ui/theme-ui",
1111
"scripts": {},
1212
"dependencies": {
13-
"@theme-ui/preset-base": "0.15.0-rc.1"
13+
"@theme-ui/preset-base": "workspace:^"
1414
},
1515
"peerDependencies": {
16-
"@theme-ui/css": ">=0.14.0"
16+
"@theme-ui/css": "workspace:^"
1717
},
1818
"publishConfig": {
1919
"access": "public"

‎packages/preset-sketchy/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"access": "public"
1414
},
1515
"dependencies": {
16-
"@theme-ui/css": "0.15.0-rc.1"
16+
"@theme-ui/css": "workspace:^"
1717
},
1818
"gitHead": "621199460fa3bdb0100748441e62517b7529b8c8"
1919
}

‎packages/theme-ui/package.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020
"@theme-ui/theme-provider": "0.15.0-rc.1"
2121
},
2222
"peerDependencies": {
23-
"react": ">=18",
23+
"react": ">=18"
24+
},
25+
"devDependencies": {
2426
"react-dom": ">=18"
2527
},
2628
"keywords": [

0 commit comments

Comments
 (0)