Merge branch 'develop' into stable

.all-contributorsrc

@@ -1044,6 +1044,17 @@
         "code",
         "bug"
       ]
+    },
+    {
+      "login": "carolinmaisenbacher",
+      "name": "Carolin Maisenbacher",
+      "avatar_url": "https://avatars.githubusercontent.com/u/32734844?v=4",
+      "profile": "https://github.com/carolinmaisenbacher",
+      "contributions": [
+        "code",
+        "doc",
+        "test"
+      ]
     }
   ]
 }

.github/workflows/ci.yml

@@ -34,16 +34,12 @@ jobs:
     if: >
       !contains(github.event.head_commit.message, 'ci skip') &&
       !contains(github.event.head_commit.message, 'skip ci') &&
-      !contains(github.event.head_commit.message, 'chore') && (
+      !startsWith(github.event.head_commit.message, 'chore') &&
+      !startsWith(github.event.pull_request.title, 'chore') && (
         github.event_name == 'push' ||
         github.event.pull_request.head.repo.full_name == github.repository
       )
     steps:
-      - name: Dump GitHub event
-        env:
-          GITHUB_EVENT: ${{ toJSON(github.event) }}
-        run: echo "$GITHUB_EVENT"
-
       - uses: actions/checkout@v2
 
       - name: Prepare repository

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## UNRELEASED
+
+- Set `gatsby` peerDependency more explicit to `^2.0.0 || ^3.0.0`. [#1640](https://github.com/system-ui/theme-ui/pull/1640) ([@LekoArts](https://github.com/LekoArts))
+- Have `breakpoints` accept custom media queries [#1653](https://github.com/system-ui/theme-ui/pull/1653) [@carolinmaisenbacher](https://github.com/carolinmaisenbacher)
+
 ## v0.6.2 (Mon Apr 05 2021)
 
 ### 🐛 Bug Fix

auto.config.ts

@@ -0,0 +1,40 @@
+import { AutoRc } from '@auto-it/core'
+
+import { INpmConfig } from '@auto-it/npm'
+import { IAllContributorsPluginOptions } from '@auto-it/all-contributors'
+
+const npmOptions: INpmConfig = {
+  exact: true,
+}
+
+const allContributorsOptions: IAllContributorsPluginOptions = {
+  exclude: ['dependabot', 'dependabot-preview'],
+  types: {
+    infra: ['./github/**/*'],
+    example: ['examples/**/*'],
+    doc: ['**/*.mdx', '**/*.md', 'packages/docs/**/*'],
+    test: ['**/*.test.*', '**/*.spec.*'],
+    code: [
+      'packages/**/*.js',
+      'packages/**/*.ts',
+      'packages/**/*.jsx',
+      'packages/**/*.tsx',
+      '**/package.json',
+      '**/tsconfig.json',
+    ],
+  },
+}
+
+export default function config(): AutoRc {
+  return {
+    baseBranch: 'stable',
+    prereleaseBranches: ['develop'],
+    plugins: [
+      ['npm', npmOptions],
+      'conventional-commits',
+      'first-time-contributor',
+      'released',
+      ['all-contributors', allContributorsOptions],
+    ],
+  }
+}

deprecated/chrome/package.json

@@ -2,7 +2,7 @@
   "private": true,
   "name": "@theme-ui/chrome",
   "version": "0.5.0-alpha.0",
-  "main": "index.js",
+  "main": "dist/chrome.cjs.js",
   "author": "Brent Jackson",
   "license": "MIT",
   "scripts": {
@@ -18,7 +18,6 @@
     "@babel/core": "^7.4.5",
     "@babel/preset-env": "^7.4.5",
     "@babel/preset-react": "^7.0.0",
-    "@emotion/react": "^11.1.1",
     "@theme-ui/editor": "^0.5.0-alpha.0",
     "babel-loader": "^8.0.6",
     "copy-to-clipboard": "^3.2.0",
@@ -29,10 +28,9 @@
     "stringify-object": "^3.3.0",
     "theme-ui": "^0.5.0-alpha.0",
     "webpack": "^4.33.0",
-    "webpack-cli": "^3.3.4"
+    "webpack-cli": "^3.3.4",
+    "@emotion/react": "^11.1.1"
   },
-  "devDependencies": {
-    "@theme-ui/css": "^0.5.0-alpha.0"
-  },
-  "gitHead": "bfd026cae085f377ca537de897dc43233d50f5d5"
+  "gitHead": "bfd026cae085f377ca537de897dc43233d50f5d5",
+  "module": "dist/chrome.esm.js"
 }

deprecated/gatsby-theme-ui-blog/package.json

@@ -7,7 +7,7 @@
     "avatar": "npx capture-website-cli \"https://contrast.now.sh/fff/33e?text=UI&size=48&fontSize=1.5&radius=32&baseline=1\" content/assets/avatar.png --width=48 --height=48 --overwrite"
   },
   "peerDependencies": {
-    "gatsby": ">=2",
+    "gatsby": "^2.0.0 || ^3.0.0",
     "react": "^16.14.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0"
   },

examples/gatsby-plugin/package.json

@@ -25,6 +25,6 @@
     "husky": ">=4.0.7",
     "jest": "^24.8.0",
     "lint-staged": "10",
-    "react-test-renderer": "^16.8.6"
+    "react-test-renderer": "^17.0.1"
   }
 }

jest.config.js

@@ -38,6 +38,8 @@ const config = {
       statements: 90,
     },
   },
+  modulePathIgnorePatterns: ['packages/.*/dist'],
+  // projects: ['<rootDir>/packages/*'],
   snapshotSerializers: ['@emotion/jest/serializer'],
   setupFiles: ['jest-canvas-mock'],
   transform: {

package.json

@@ -1,22 +1,20 @@
 {
   "private": true,
   "scripts": {
-    "prepare": "lerna run prepare",
-    "start": "yarn workspace docs start",
-    "build": "yarn workspace docs build",
-    "serve": "yarn workspace docs serve --port 8000",
+    "build": "preconstruct build",
+    "build:docs": "yarn build && yarn workspace docs build",
     "clean": "lerna run clean && rimraf packages/*/{dist,rts2_cache*}",
-    "format": "prettier --write \"**/*.js{,on}\" \"**/*.md\"  \"**/*.mdx\"",
+    "format": "prettier --write \"**/*.{ts,js,json}\" \"**/*.md\"  \"**/*.mdx\"",
     "test": "jest",
-    "typecheck": "lerna run typecheck",
+    "typecheck": "tsc --noEmit",
     "typecheck:tests": "tsc --noEmit -P ./tsconfig.test.json",
     "logo": "yarn workspace docs logo",
-    "dev:chrome": "yarn workspace @theme-ui/chrome dev",
-    "dev:editor": "yarn workspace @theme-ui/editor dev",
-    "auto:shipit-and-log": "auto shipit -v 2>&1 | tee ./.publish-log.txt",
-    "release": "yarn clean && yarn prepare && auto shipit -v",
+    "postinstall": "preconstruct dev && patch-package",
+    "version:bump": "lerna version",
+    "version:bump-next": "lerna version prerelease --preid alpha --exact",
+    "release": "yarn clean && yarn build && auto shipit -v",
     "release-manual": "yarn prerelease-manual && lerna publish from-package --dist-tag next --pre-dist-tag next",
-    "prerelease-manual": "yarn clean && yarn prepare && yarn typecheck && yarn test --coverage",
+    "prerelease-manual": "yarn clean && yarn build && yarn typecheck && yarn test --coverage",
     "bump-version": "lerna version",
     "bump-version-next": "lerna version prerelease --preid alpha --exact --force-publish",
     "all-contributors:check": "./scripts/all-contributors-check.js",
@@ -26,43 +24,53 @@
     "packages/*"
   ],
   "devDependencies": {
-    "@auto-it/all-contributors": "^10.16.8",
-    "@auto-it/conventional-commits": "^10.16.8",
-    "@auto-it/first-time-contributor": "^10.16.8",
-    "@auto-it/released": "^10.16.8",
-    "@babel/cli": "^7.10.1",
-    "@babel/core": "^7.10.2",
-    "@babel/helper-validator-identifier": "^7.10.1",
-    "@babel/plugin-transform-runtime": "^7.10.1",
-    "@babel/preset-env": "^7.10.2",
-    "@babel/preset-react": "^7.10.1",
-    "@babel/preset-typescript": "^7.10.1",
-    "@babel/runtime": "^7.10.2",
-    "@emotion/jest": "^11.1.0",
-    "@testing-library/react": "^11.0.1",
-    "@types/jest": "^26.0.10",
-    "@types/react-dom": "^17.0.0",
-    "@types/react-test-renderer": "^17.0.0",
-    "auto": "^10.16.8",
-    "babel-jest": "^26.0.1",
+    "@auto-it/all-contributors": "^10.25.0",
+    "@auto-it/conventional-commits": "^10.25.0",
+    "@auto-it/first-time-contributor": "^10.25.0",
+    "@auto-it/released": "^10.25.0",
+    "@babel/cli": "^7.13.14",
+    "@babel/core": "^7.13.15",
+    "@babel/helper-validator-identifier": "^7.12.11",
+    "@babel/plugin-transform-runtime": "^7.13.15",
+    "@babel/preset-env": "^7.13.15",
+    "@babel/preset-react": "^7.13.13",
+    "@babel/preset-typescript": "^7.13.0",
+    "@babel/runtime": "^7.13.10",
+    "@emotion/jest": "^11.3.0",
+    "@preconstruct/cli": "^2",
+    "@testing-library/react": "^11.2.6",
+    "@types/jest": "^26.0.22",
+    "@types/node": "^14.14.41",
+    "@types/react-dom": "^17.0.3",
+    "@types/react-test-renderer": "^17.0.1",
+    "auto": "^10.25.0",
+    "babel-jest": "^26.6.3",
     "babel-preset-gatsby": "^0.12.1",
     "egzek": "^1.2.0",
-    "husky": ">=4.0.7",
-    "jest": "^26.0.1",
-    "jest-canvas-mock": "^2.2.0",
+    "husky": ">=6.0.0",
+    "jest": "^26.6.3",
+    "jest-canvas-mock": "^2.3.1",
     "jest-mock-console": "^1.0.1",
-    "lerna": "^3.14.1",
-    "lint-staged": "10",
-    "microbundle": "^0.13.0",
-    "prettier": "^2.2.0",
-    "react-test-renderer": "^17.0.1",
+    "lerna": "^4.0.0",
+    "lint-staged": "10.5.4",
+    "patch-package": "^6.4.7",
+    "postinstall-postinstall": "^2.1.0",
+    "prettier": "^2.2.1",
+    "react-test-renderer": "^17.0.2",
     "rimraf": "^3.0.2",
-    "ts-jest": "^26.4.4",
+    "ts-jest": "^26.5.5",
     "typescript": "^4"
   },
   "husky": {
     "hooks": {
       "pre-commit": "lint-staged"
     }
-  }
+  },
+  "preconstruct": {
+    "packages": [
+      "packages/*",
+      "!packages/docs"
+    ]
+  },
+  "name": "@theme-ui/monorepo"
 }

packages/color-modes/package.json

@@ -1,16 +1,12 @@
 {
   "name": "@theme-ui/color-modes",
   "version": "0.6.2",
-  "main": "dist/index.js",
-  "module": "dist/index.esm.js",
-  "types": "dist/index.d.ts",
+  "main": "dist/theme-ui-color-modes.cjs.js",
+  "module": "dist/theme-ui-color-modes.esm.js",
+  "types": "dist/theme-ui-color-modes.cjs.d.ts",
   "source": "src/index.tsx",
   "sideEffects": false,
-  "scripts": {
-    "prepare": "microbundle --no-compress",
-    "watch": "microbundle watch --no-compress",
-    "typecheck": "tsc --noEmit"
-  },
+  "scripts": {},
   "repository": "system-ui/theme-ui",
   "author": "Brent Jackson",
   "license": "MIT",

packages/color-modes/test/index.tsx

@@ -241,7 +241,7 @@ test('does not initialize mode based on localStorage if useLocalStorage is set t
 })
 
 test('retains initial context', () => {
-  let context: ThemeUIContextValue
+  let context: ThemeUIContextValue | undefined = undefined;
   const Consumer = () => {
     context = useThemeUI()
     return null

packages/color/package.json

@@ -2,13 +2,10 @@
   "name": "@theme-ui/color",
   "version": "0.6.2",
   "source": "src/index.ts",
-  "main": "dist/index.js",
-  "module": "dist/index.esm.js",
-  "types": "dist/index.d.ts",
-  "scripts": {
-    "prepare": "microbundle --no-compress",
-    "watch": "microbundle watch --no-compress"
-  },
+  "main": "dist/theme-ui-color.cjs.js",
+  "module": "dist/theme-ui-color.esm.js",
+  "types": "dist/theme-ui-color.cjs.d.ts",
+  "scripts": {},
   "dependencies": {
     "@theme-ui/css": "^0.6.2",
     "polished": "^4.0.5"