Skip to content

Commit

Permalink
Merge branch 'develop' into mdx-bump-dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
hasparus authored Dec 21, 2020
2 parents a0d040f + 316ff5e commit 065c0de
Show file tree
Hide file tree
Showing 42 changed files with 177 additions and 190 deletions.
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.6.0-alpha.3",
"version": "0.6.0-alpha.4",
"npmClient": "yarn",
"useWorkspaces": true,
"packages": ["packages/*"]
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
"start": "yarn workspace docs start",
"build": "yarn workspace docs build",
"serve": "yarn workspace docs serve --port 8000",
"clean": "lerna run clean",
"clean": "lerna run clean && rimraf packages/*/{dist,rts2_cache*}",
"format": "prettier --write \"**/*.js{,on}\" \"**/*.md\" \"**/*.mdx\"",
"test": "jest",
"typecheck": "lerna run typecheck",
"logo": "yarn workspace docs logo",
"dev:chrome": "yarn workspace @theme-ui/chrome dev",
"dev:editor": "yarn workspace @theme-ui/editor dev",
"release": "lerna publish from-package --dist-tag next --pre-dist-tag next",
"prerelease": "yarn prepare && yarn typecheck && yarn test --coverage",
"prerelease": "yarn clean && yarn prepare && yarn typecheck && yarn test --coverage",
"bump-version": "lerna version",
"bump-version-next": "lerna version prerelease --preid alpha"
},
Expand Down Expand Up @@ -44,6 +44,7 @@
"microbundle": "^0.12.2",
"prettier": "^2.2.0",
"react-test-renderer": "^16.8.6",
"rimraf": "^3.0.2",
"ts-jest": "^26.4.4",
"typescript": "^4"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/color-modes/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/color-modes",
"version": "0.6.0-alpha.3",
"version": "0.6.0-alpha.4",
"main": "dist/index.js",
"module": "dist/index.esm.js",
"types": "dist/index.d.ts",
Expand All @@ -19,8 +19,8 @@
},
"dependencies": {
"@emotion/react": "^11.1.1",
"@theme-ui/core": "0.6.0-alpha.1",
"@theme-ui/css": "0.6.0-alpha.1",
"@theme-ui/core": "0.6.0-alpha.4",
"@theme-ui/css": "0.6.0-alpha.4",
"deepmerge": "^4.2.2"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/color/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/color",
"version": "0.6.0-alpha.1",
"version": "0.6.0-alpha.4",
"source": "src/index.ts",
"main": "dist/index.js",
"module": "dist/index.esm.js",
Expand All @@ -10,7 +10,7 @@
"watch": "microbundle watch --no-compress"
},
"dependencies": {
"@theme-ui/css": "0.6.0-alpha.1",
"@theme-ui/css": "0.6.0-alpha.4",
"polished": "^4.0.5"
},
"publishConfig": {
Expand Down
4 changes: 2 additions & 2 deletions packages/components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/components",
"version": "0.6.0-alpha.3",
"version": "0.6.0-alpha.4",
"main": "dist/index.js",
"module": "dist/index.esm.js",
"types": "index.d.ts",
Expand All @@ -16,7 +16,7 @@
"@styled-system/color": "^5.1.2",
"@styled-system/should-forward-prop": "^5.1.2",
"@styled-system/space": "^5.1.2",
"@theme-ui/css": "0.6.0-alpha.1",
"@theme-ui/css": "0.6.0-alpha.4",
"@types/styled-system": "^5.1.10"
},
"peerDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/core",
"version": "0.6.0-alpha.1",
"version": "0.6.0-alpha.4",
"source": "src/index.ts",
"main": "dist/index.js",
"module": "dist/index.esm.js",
Expand All @@ -22,15 +22,15 @@
},
"dependencies": {
"@emotion/react": "^11.1.1",
"@theme-ui/css": "0.6.0-alpha.1",
"@theme-ui/parse-props": "0.6.0-alpha.1",
"@theme-ui/css": "0.6.0-alpha.4",
"@theme-ui/parse-props": "0.6.0-alpha.4",
"deepmerge": "^4.2.2"
},
"peerDependencies": {
"react": "^16.14.0 || ^17.0.0"
},
"devDependencies": {
"@types/react": "^16.14.1",
"@types/react": "^17.0.0",
"react": "^16.14.0"
}
}
2 changes: 1 addition & 1 deletion packages/css/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/css",
"version": "0.6.0-alpha.1",
"version": "0.6.0-alpha.4",
"source": "src/index.ts",
"main": "dist/index.js",
"module": "dist/index.esm.js",
Expand Down
4 changes: 2 additions & 2 deletions packages/custom-properties/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@theme-ui/custom-properties",
"description": "Generate CSS custom properties for use with Theme UI",
"version": "0.6.0-alpha.1",
"version": "0.6.0-alpha.4",
"source": "src/index.ts",
"main": "dist/index.js",
"module": "dist/index.esm.js",
Expand All @@ -20,7 +20,7 @@
"pluralize": "^8.0.0"
},
"devDependencies": {
"@theme-ui/css": "0.6.0-alpha.1",
"@theme-ui/css": "0.6.0-alpha.4",
"@types/pluralize": "^0.0.29"
},
"gitHead": "87e9ebb0cc66d8a5e1fcde7bb60f2077266aa437"
Expand Down
30 changes: 15 additions & 15 deletions packages/docs/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "docs",
"version": "0.6.0-alpha.3",
"version": "0.6.0-alpha.4",
"main": "index.js",
"author": "Brent Jackson <[email protected]>",
"license": "MIT",
Expand All @@ -20,25 +20,25 @@
"@emotion/styled": "^11.0.0",
"@mdx-js/mdx": "^1.6.22",
"@mdx-js/react": "^1.6.22",
"@theme-ui/color": "0.6.0-alpha.1",
"@theme-ui/components": "^0.6.0-alpha.3",
"@theme-ui/css": "0.6.0-alpha.1",
"@theme-ui/editor": "^0.6.0-alpha.3",
"@theme-ui/match-media": "0.6.0-alpha.1",
"@theme-ui/presets": "0.6.0-alpha.1",
"@theme-ui/prism": "^0.6.0-alpha.3",
"@theme-ui/sidenav": "^0.6.0-alpha.3",
"@theme-ui/style-guide": "^0.6.0-alpha.3",
"@theme-ui/typography": "0.6.0-alpha.1",
"@theme-ui/color": "0.6.0-alpha.4",
"@theme-ui/components": "0.6.0-alpha.4",
"@theme-ui/css": "0.6.0-alpha.4",
"@theme-ui/editor": "0.6.0-alpha.4",
"@theme-ui/match-media": "0.6.0-alpha.4",
"@theme-ui/presets": "0.6.0-alpha.4",
"@theme-ui/prism": "0.6.0-alpha.4",
"@theme-ui/sidenav": "0.6.0-alpha.4",
"@theme-ui/style-guide": "0.6.0-alpha.4",
"@theme-ui/typography": "0.6.0-alpha.4",
"copy-to-clipboard": "^3.2.0",
"gatsby": "^2.26.1",
"gatsby-plugin-catch-links": "^2.4.0",
"gatsby-plugin-compile-es6-packages": "^2.1.0",
"gatsby-plugin-mdx": "^1.6.0",
"gatsby-plugin-react-helmet": "^3.4.0",
"gatsby-plugin-theme-ui": "^0.6.0-alpha.3",
"gatsby-theme-code-recipes": "0.5.0-alpha.1",
"gatsby-theme-style-guide": "^0.6.0-alpha.3",
"gatsby-plugin-theme-ui": "0.6.0-alpha.4",
"gatsby-theme-code-recipes": "0.6.0-alpha.4",
"gatsby-theme-style-guide": "0.6.0-alpha.4",
"lodash.merge": "^4.6.1",
"lodash.omit": "^4.5.0",
"prismjs": "^1.16.0",
Expand All @@ -48,7 +48,7 @@
"react-live": "^2.1.2",
"remark-slug": "^6.0.0",
"stringify-object": "^3.3.0",
"theme-ui": "^0.6.0-alpha.3",
"theme-ui": "0.6.0-alpha.4",
"typography-theme-alton": "^0.16.19",
"typography-theme-anonymous": "^0.15.10",
"typography-theme-bootstrap": "^0.16.19",
Expand Down
10 changes: 5 additions & 5 deletions packages/editor/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/editor",
"version": "0.6.0-alpha.3",
"version": "0.6.0-alpha.4",
"main": "dist/index.js",
"module": "dist/index.esm.js",
"types": "dist/index.d.ts",
Expand All @@ -12,9 +12,9 @@
"typecheck": "tsc --noEmit"
},
"dependencies": {
"@theme-ui/components": "^0.6.0-alpha.3",
"@theme-ui/css": "0.6.0-alpha.1",
"@theme-ui/style-guide": "^0.6.0-alpha.3",
"@theme-ui/components": "0.6.0-alpha.4",
"@theme-ui/css": "0.6.0-alpha.4",
"@theme-ui/style-guide": "0.6.0-alpha.4",
"@types/react-color": "^2.17.3",
"color": "^3.1.2",
"react-color": "^2.18.0",
Expand All @@ -29,7 +29,7 @@
},
"devDependencies": {
"react": "^16.14.0",
"theme-ui": "^0.6.0-alpha.3"
"theme-ui": "0.6.0-alpha.4"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion packages/gatsby-plugin-theme-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gatsby-plugin-theme-ui",
"version": "0.6.0-alpha.3",
"version": "0.6.0-alpha.4",
"main": "index.js",
"author": "Brent Jackson",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/gatsby-theme-code-recipes/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gatsby-theme-code-recipes",
"version": "0.5.0-alpha.1",
"version": "0.6.0-alpha.4",
"main": "index.js",
"license": "MIT",
"peerDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions packages/gatsby-theme-style-guide/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gatsby-theme-style-guide",
"version": "0.6.0-alpha.3",
"version": "0.6.0-alpha.4",
"main": "index.js",
"license": "MIT",
"peerDependencies": {
Expand All @@ -14,8 +14,8 @@
"react-dom": "^16.14.0"
},
"dependencies": {
"@theme-ui/style-guide": "^0.6.0-alpha.3",
"theme-ui": "^0.6.0-alpha.3"
"@theme-ui/style-guide": "0.6.0-alpha.4",
"theme-ui": "0.6.0-alpha.4"
},
"gitHead": "87e9ebb0cc66d8a5e1fcde7bb60f2077266aa437"
}
2 changes: 1 addition & 1 deletion packages/gatsby-theme-ui-layout/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gatsby-theme-ui-layout",
"version": "0.5.0-alpha.1",
"version": "0.6.0-alpha.4",
"main": "index.js",
"repository": "system-ui/theme-ui",
"peerDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions packages/match-media/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/match-media",
"version": "0.6.0-alpha.1",
"version": "0.6.0-alpha.4",
"description": "React hooks for theme-ui breakpoints",
"source": "src/index.ts",
"main": "dist/index.js",
Expand All @@ -18,8 +18,8 @@
"access": "public"
},
"devDependencies": {
"@theme-ui/core": "0.6.0-alpha.1",
"@theme-ui/css": "0.6.0-alpha.1",
"@theme-ui/core": "0.6.0-alpha.4",
"@theme-ui/css": "0.6.0-alpha.4",
"react": "^16.14.0"
},
"peerDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions packages/mdx/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/mdx",
"version": "0.6.0-alpha.1",
"version": "0.6.0-alpha.4",
"source": "src/index.ts",
"main": "dist/index.js",
"module": "dist/index.esm.js",
Expand All @@ -15,8 +15,8 @@
"@emotion/react": "^11.1.1",
"@emotion/styled": "^11.0.0",
"@mdx-js/react": "^1.6.22",
"@theme-ui/core": "0.6.0-alpha.1",
"@theme-ui/css": "0.6.0-alpha.1"
"@theme-ui/core": "0.6.0-alpha.4",
"@theme-ui/css": "0.6.0-alpha.4"
},
"devDependencies": {
"react": "^16.14.0"
Expand Down
6 changes: 3 additions & 3 deletions packages/parse-props/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/parse-props",
"version": "0.6.0-alpha.1",
"version": "0.6.0-alpha.4",
"source": "src/index.ts",
"main": "dist/index.js",
"module": "dist/index.esm.js",
Expand All @@ -18,13 +18,13 @@
},
"dependencies": {
"@emotion/react": "^11.1.1",
"@theme-ui/css": "0.6.0-alpha.1"
"@theme-ui/css": "0.6.0-alpha.4"
},
"peerDependencies": {
"react": "^16.14.0 || ^17.0.0"
},
"devDependencies": {
"@types/react": "^16.14.1",
"@types/react": "^17.0.0",
"react": "^16.14.0"
}
}
2 changes: 1 addition & 1 deletion packages/preset-base/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/preset-base",
"version": "0.5.0-alpha.1",
"version": "0.6.0-alpha.4",
"main": "dist/index.js",
"module": "dist/index.esm.js",
"author": "Brent Jackson",
Expand Down
2 changes: 1 addition & 1 deletion packages/preset-bootstrap/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/preset-bootstrap",
"version": "0.5.0-alpha.1",
"version": "0.6.0-alpha.4",
"main": "dist/index.js",
"module": "dist/index.esm.js",
"types": "dist/index.d.ts",
Expand Down
4 changes: 2 additions & 2 deletions packages/preset-bulma/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/preset-bulma",
"version": "0.5.0-alpha.1",
"version": "0.6.0-alpha.4",
"main": "dist/index.js",
"module": "dist/index.esm.js",
"types": "dist/index.d.ts",
Expand All @@ -13,7 +13,7 @@
"typecheck": "tsc --noEmit"
},
"dependencies": {
"@theme-ui/preset-base": "0.5.0-alpha.1"
"@theme-ui/preset-base": "0.6.0-alpha.4"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion packages/preset-dark/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/preset-dark",
"version": "0.5.0-alpha.1",
"version": "0.6.0-alpha.4",
"main": "dist/index.js",
"module": "dist/index.esm.js",
"types": "dist/index.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/preset-deep/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/preset-deep",
"version": "0.5.0-alpha.1",
"version": "0.6.0-alpha.4",
"main": "dist/index.js",
"module": "dist/index.esm.js",
"types": "dist/index.d.ts",
Expand Down
4 changes: 2 additions & 2 deletions packages/preset-funk/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/preset-funk",
"version": "0.5.0-alpha.1",
"version": "0.6.0-alpha.4",
"main": "dist/index.js",
"module": "dist/index.esm.js",
"types": "dist/index.d.ts",
Expand All @@ -13,7 +13,7 @@
"typecheck": "tsc --noEmit"
},
"dependencies": {
"@theme-ui/preset-base": "0.5.0-alpha.1"
"@theme-ui/preset-base": "0.6.0-alpha.4"
},
"publishConfig": {
"access": "public"
Expand Down
Loading

0 comments on commit 065c0de

Please sign in to comment.