Skip to content

Commit

Permalink
Merge branch 'develop' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
hasparus committed Dec 27, 2021
2 parents 42233cc + f87d93c commit 8cb18ce
Show file tree
Hide file tree
Showing 37 changed files with 1,007 additions and 718 deletions.
15 changes: 15 additions & 0 deletions .eslintrc.js
Expand Up @@ -20,8 +20,23 @@ module.exports = {
],
'@typescript-eslint/no-redeclare': 'off',

// Ensure peerDependencies and dependencies are properly configured
'import/no-extraneous-dependencies': 'error',

// TypeScript checks this
'no-undef': 'off',
'no-lone-blocks': 'off',
},
overrides: [
{
files: [
'packages/**/test/**/*.{ts,tsx,js,jsx}',
'packages/e2e/**/*.{ts,tsx}',
],
rules: {
'import/no-extraneous-dependencies': 'off',
'react/jsx-pascal-case': 'off',
},
},
],
}
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Expand Up @@ -25,6 +25,9 @@ jobs:
install-command:
yarn --ignore-optional --pure-lockfile --non-interactive

- name: Run linter
run: yarn lint --quiet

- name: Run tests and collect coverage
run: yarn test --coverage

Expand Down
70 changes: 70 additions & 0 deletions .github/workflows/codeql-analysis.yml
@@ -0,0 +1,70 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"

on:
push:
branches: [ develop ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ develop ]
schedule:
- cron: '38 11 * * 3'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ 'javascript' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://git.io/codeql-language-support

steps:
- name: Checkout repository
uses: actions/checkout@v2

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
10 changes: 5 additions & 5 deletions examples/codesandbox-starter/package.json
@@ -1,20 +1,20 @@
{
"name": "theme-ui-starter",
"private": "true",
"version": "0.4.0-rc.0",
"private": true,
"version": "0.1.0",
"description": "A sandbox configured with Theme UI, including the `base` theme.",
"main": "index.html",
"scripts": {
"start": "parcel index.html --open",
"build": "parcel build index.html"
},
"dependencies": {
"@emotion/react": "^11.1.1",
"@emotion/react": "^11",
"@mdx-js/react": "^1.6.22",
"@theme-ui/presets": "^0.4.0-rc.0",
"@theme-ui/presets": "latest",
"react": "^16.14.0",
"react-dom": "^16.14.0",
"theme-ui": "^0.4.0-rc.0"
"theme-ui": "latest"
},
"devDependencies": {
"@babel/core": "^7.7.4",
Expand Down
3 changes: 2 additions & 1 deletion examples/create-react-app/package.json
Expand Up @@ -5,7 +5,8 @@
"dependencies": {
"mdx.macro": "^0.2.8",
"react": "^16.14.0",
"react-dom": "^16.14.0"
"react-dom": "^16.14.0",
"theme-ui": "latest"
},
"scripts": {
"start": "react-scripts start",
Expand Down
2 changes: 1 addition & 1 deletion examples/custom-pragma/package.json
Expand Up @@ -17,6 +17,6 @@
"gatsby-plugin-mdx": "^1.6.0",
"react": "^16.14.0",
"react-dom": "^16.14.0",
"theme-ui": "^0.4.0-rc.0"
"theme-ui": "latest"
}
}
2 changes: 1 addition & 1 deletion examples/dark-mode/package.json
Expand Up @@ -17,6 +17,6 @@
"gatsby-plugin-mdx": "^1.6.0",
"react": "^16.14.0",
"react-dom": "^16.14.0",
"theme-ui": "^0.4.0-rc.0"
"theme-ui": "latest"
}
}
4 changes: 2 additions & 2 deletions examples/gatsby-plugin/package.json
Expand Up @@ -15,10 +15,10 @@
"@mdx-js/react": "^1.6.22",
"gatsby": "^2.6.3",
"gatsby-plugin-mdx": "^1.6.0",
"gatsby-plugin-theme-ui": "^0.4.0-rc.0",
"gatsby-plugin-theme-ui": "latest",
"react": "^16.14.0",
"react-dom": "^16.14.0",
"theme-ui": "^0.4.0-rc.0"
"theme-ui": "latest"
},
"devDependencies": {
"@testing-library/react": "^9.1.3",
Expand Down
2 changes: 1 addition & 1 deletion examples/gatsby/package.json
Expand Up @@ -17,7 +17,7 @@
"gatsby-plugin-mdx": "^1.6.0",
"react": "^16.14.0",
"react-dom": "^16.14.0",
"theme-ui": "^0.4.0-rc.0"
"theme-ui": "latest"
},
"devDependencies": {
"@types/react": "^16.9.55",
Expand Down
4 changes: 2 additions & 2 deletions examples/next/package.json
Expand Up @@ -12,9 +12,9 @@
"typecheck": "tsc --noEmit"
},
"dependencies": {
"@mdx-js/loader": "^1.6.16",
"@mdx-js/loader": "^1.6.22",
"@next/mdx": "^11.1.2",
"next": "^11.1.2",
"next": "^11.1.3",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"theme-ui": "latest"
Expand Down
97 changes: 45 additions & 52 deletions examples/next/yarn.lock
Expand Up @@ -267,20 +267,13 @@
dependencies:
regenerator-runtime "^0.13.4"

"@babel/runtime@^7.13.10":
"@babel/runtime@^7.13.10", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.7":
version "7.15.4"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.4.tgz#fd17d16bfdf878e6dd02d19753a39fa8a8d9c84a"
integrity sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==
dependencies:
regenerator-runtime "^0.13.4"

"@babel/runtime@^7.7.2", "@babel/runtime@^7.8.7":
version "7.12.5"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e"
integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==
dependencies:
regenerator-runtime "^0.13.4"

"@babel/template@^7.10.4":
version "7.10.4"
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278"
Expand Down Expand Up @@ -554,25 +547,25 @@
resolved "https://registry.yarnpkg.com/@napi-rs/triples/-/triples-1.0.3.tgz#76d6d0c3f4d16013c61e45dfca5ff1e6c31ae53c"
integrity sha512-jDJTpta+P4p1NZTFVLHJ/TLFVYVcOqv6l8xwOeBKNPMgY/zDYH/YH7SJbvrr/h1RcS9GzbPcLKGzpuK9cV56UA==

"@next/env@11.1.2":
version "11.1.2"
resolved "https://registry.yarnpkg.com/@next/env/-/env-11.1.2.tgz#27996efbbc54c5f949f5e8c0a156e3aa48369b99"
integrity sha512-+fteyVdQ7C/OoulfcF6vd1Yk0FEli4453gr8kSFbU8sKseNSizYq6df5MKz/AjwLptsxrUeIkgBdAzbziyJ3mA==
"@next/env@11.1.3":
version "11.1.3"
resolved "https://registry.yarnpkg.com/@next/env/-/env-11.1.3.tgz#dc698e00259242012955e43a40788fcf21ba9e37"
integrity sha512-5+vaeooJuWmICSlmVaAC8KG3O8hwKasACVfkHj58xQuCB5SW0TKW3hWxgxkBuefMBn1nM0yEVPKokXCsYjBtng==

"@next/mdx@^11.1.2":
version "11.1.2"
resolved "https://registry.yarnpkg.com/@next/mdx/-/mdx-11.1.2.tgz#cf4fbbc453d827008e82daa97591755e1321c29f"
integrity sha512-uRodX0OGSWMGTzun1QGfpXisKjz4ptWoizYqhXWZubLFJsRG/GKbB9n9hh3l48KlzKMO2S1REAOKJd+x9h/nWw==

"@next/polyfill-module@11.1.2":
version "11.1.2"
resolved "https://registry.yarnpkg.com/@next/polyfill-module/-/polyfill-module-11.1.2.tgz#1fe92c364fdc81add775a16c678f5057c6aace98"
integrity sha512-xZmixqADM3xxtqBV0TpAwSFzWJP0MOQzRfzItHXf1LdQHWb0yofHHC+7eOrPFic8+ZGz5y7BdPkkgR1S25OymA==
"@next/polyfill-module@11.1.3":
version "11.1.3"
resolved "https://registry.yarnpkg.com/@next/polyfill-module/-/polyfill-module-11.1.3.tgz#95163973fe19f1827da32703d1fcb8198fb2c79a"
integrity sha512-7yr9cr4a0SrBoVE8psxXWK1wTFc8UzsY8Wc2cWGL7qA0hgtqACHaXC47M1ByJB410hFZenGrpE+KFaT1unQMyw==

"@next/react-dev-overlay@11.1.2":
version "11.1.2"
resolved "https://registry.yarnpkg.com/@next/react-dev-overlay/-/react-dev-overlay-11.1.2.tgz#73795dc5454b7af168bac93df7099965ebb603be"
integrity sha512-rDF/mGY2NC69mMg2vDqzVpCOlWqnwPUXB2zkARhvknUHyS6QJphPYv9ozoPJuoT/QBs49JJd9KWaAzVBvq920A==
"@next/react-dev-overlay@11.1.3":
version "11.1.3"
resolved "https://registry.yarnpkg.com/@next/react-dev-overlay/-/react-dev-overlay-11.1.3.tgz#5d08336931e48ebdb07d82b566223d0ee5941d2a"
integrity sha512-zIwtMliSUR+IKl917ToFNB+0fD7bI5kYMdjHU/UEKpfIXAZPnXRHHISCvPDsczlr+bRsbjlUFW1CsNiuFedeuQ==
dependencies:
"@babel/code-frame" "7.12.11"
anser "1.4.9"
Expand All @@ -586,30 +579,30 @@
stacktrace-parser "0.1.10"
strip-ansi "6.0.0"

"@next/react-refresh-utils@11.1.2":
version "11.1.2"
resolved "https://registry.yarnpkg.com/@next/react-refresh-utils/-/react-refresh-utils-11.1.2.tgz#44ea40d8e773e4b77bad85e24f6ac041d5e4b4a5"
integrity sha512-hsoJmPfhVqjZ8w4IFzoo8SyECVnN+8WMnImTbTKrRUHOVJcYMmKLL7xf7T0ft00tWwAl/3f3Q3poWIN2Ueql/Q==
"@next/react-refresh-utils@11.1.3":
version "11.1.3"
resolved "https://registry.yarnpkg.com/@next/react-refresh-utils/-/react-refresh-utils-11.1.3.tgz#fc2c1a4f2403db1a0179d31caa0a4cc811b8ab58"
integrity sha512-144kD8q2nChw67V3AJJlPQ6NUJVFczyn10bhTynn9o2rY5DEnkzuBipcyMuQl2DqfxMkV7sn+yOCOYbrLCk9zg==

"@next/swc-darwin-arm64@11.1.2":
version "11.1.2"
resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-11.1.2.tgz#93226c38db488c4b62b30a53b530e87c969b8251"
integrity sha512-hZuwOlGOwBZADA8EyDYyjx3+4JGIGjSHDHWrmpI7g5rFmQNltjlbaefAbiU5Kk7j3BUSDwt30quJRFv3nyJQ0w==
"@next/swc-darwin-arm64@11.1.3":
version "11.1.3"
resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-11.1.3.tgz#062eb7871048fdb313304e42ace5f91402dbc39f"
integrity sha512-TwP4krjhs+uU9pesDYCShEXZrLSbJr78p12e7XnLBBaNf20SgWLlVmQUT9gX9KbWan5V0sUbJfmcS8MRNHgYuA==

"@next/swc-darwin-x64@11.1.2":
version "11.1.2"
resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-11.1.2.tgz#792003989f560c00677b5daeff360b35b510db83"
integrity sha512-PGOp0E1GisU+EJJlsmJVGE+aPYD0Uh7zqgsrpD3F/Y3766Ptfbe1lEPPWnRDl+OzSSrSrX1lkyM/Jlmh5OwNvA==
"@next/swc-darwin-x64@11.1.3":
version "11.1.3"
resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-11.1.3.tgz#8bd515768d02e4c1e0cd80d33f3f29456ee890ee"
integrity sha512-ZSWmkg/PxccHFNUSeBdrfaH8KwSkoeUtewXKvuYYt7Ph0yRsbqSyNIvhUezDua96lApiXXq6EL2d1THfeWomvw==

"@next/swc-linux-x64-gnu@11.1.2":
version "11.1.2"
resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-11.1.2.tgz#8216b2ae1f21f0112958735c39dd861088108f37"
integrity sha512-YcDHTJjn/8RqvyJVB6pvEKXihDcdrOwga3GfMv/QtVeLphTouY4BIcEUfrG5+26Nf37MP1ywN3RRl1TxpurAsQ==
"@next/swc-linux-x64-gnu@11.1.3":
version "11.1.3"
resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-11.1.3.tgz#40030577e6ee272afb0080b45468bea73208f46d"
integrity sha512-PrTBN0iZudAuj4jSbtXcdBdmfpaDCPIneG4Oms4zcs93KwMgLhivYW082Mvlgx9QVEiRm7+RkFpIVtG/i7JitA==

"@next/swc-win32-x64-msvc@11.1.2":
version "11.1.2"
resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-11.1.2.tgz#e15824405df137129918205e43cb5e9339589745"
integrity sha512-e/pIKVdB+tGQYa1cW3sAeHm8gzEri/HYLZHT4WZojrUxgWXqx8pk7S7Xs47uBcFTqBDRvK3EcQpPLf3XdVsDdg==
"@next/swc-win32-x64-msvc@11.1.3":
version "11.1.3"
resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-11.1.3.tgz#2951cbc127f6ea57032a241fb94439cddb5d2482"
integrity sha512-mRwbscVjRoHk+tDY7XbkT5d9FCwujFIQJpGp0XNb1i5OHCSDO8WW/C9cLEWS4LxKRbIZlTLYg1MTXqLQkvva8w==

"@node-rs/helper@1.2.1":
version "1.2.1"
Expand Down Expand Up @@ -2166,17 +2159,17 @@ native-url@0.3.4:
dependencies:
querystring "^0.2.0"

next@^11.1.2:
version "11.1.2"
resolved "https://registry.yarnpkg.com/next/-/next-11.1.2.tgz#527475787a9a362f1bc916962b0c0655cc05bc91"
integrity sha512-azEYL0L+wFjv8lstLru3bgvrzPvK0P7/bz6B/4EJ9sYkXeW8r5Bjh78D/Ol7VOg0EIPz0CXoe72hzAlSAXo9hw==
next@^11.1.3:
version "11.1.3"
resolved "https://registry.yarnpkg.com/next/-/next-11.1.3.tgz#0226b283cb9890e446aea759db8a867de2b279ef"
integrity sha512-ud/gKmnKQ8wtHC+pd1ZiqPRa7DdgulPkAk94MbpsspfNliwZkYs9SIYWhlLSyg+c661LzdUI2nZshvrtggSYWA==
dependencies:
"@babel/runtime" "7.15.3"
"@hapi/accept" "5.0.2"
"@next/env" "11.1.2"
"@next/polyfill-module" "11.1.2"
"@next/react-dev-overlay" "11.1.2"
"@next/react-refresh-utils" "11.1.2"
"@next/env" "11.1.3"
"@next/polyfill-module" "11.1.3"
"@next/react-dev-overlay" "11.1.3"
"@next/react-refresh-utils" "11.1.3"
"@node-rs/helper" "1.2.1"
assert "2.0.0"
ast-types "0.13.2"
Expand Down Expand Up @@ -2222,10 +2215,10 @@ next@^11.1.2:
vm-browserify "1.1.2"
watchpack "2.1.1"
optionalDependencies:
"@next/swc-darwin-arm64" "11.1.2"
"@next/swc-darwin-x64" "11.1.2"
"@next/swc-linux-x64-gnu" "11.1.2"
"@next/swc-win32-x64-msvc" "11.1.2"
"@next/swc-darwin-arm64" "11.1.3"
"@next/swc-darwin-x64" "11.1.3"
"@next/swc-linux-x64-gnu" "11.1.3"
"@next/swc-win32-x64-msvc" "11.1.3"

node-fetch@2.6.1:
version "2.6.1"
Expand Down
4 changes: 2 additions & 2 deletions examples/prism/package.json
@@ -1,7 +1,7 @@
{
"private": true,
"name": "prism-theme-ui-example",
"version": "0.4.0-rc.0",
"version": "1.0.0",
"main": "index.js",
"author": "Brent Jackson <jxnblk@gmail.com>",
"license": "MIT",
Expand All @@ -19,6 +19,6 @@
"prismjs": "^1.16.0",
"react": "^16.14.0",
"react-dom": "^16.14.0",
"theme-ui": "^0.4.0-rc.0"
"theme-ui": "latest"
}
}
2 changes: 1 addition & 1 deletion examples/typography/package.json
Expand Up @@ -19,7 +19,7 @@
"lodash.merge": "^4.6.1",
"react": "^16.14.0",
"react-dom": "^16.14.0",
"theme-ui": "^0.4.0-rc.0",
"theme-ui": "latest",
"theme-ui-typography": "^0.1.7",
"typography-theme-fairy-gates": "^0.16.19"
}
Expand Down
8 changes: 6 additions & 2 deletions package.json
Expand Up @@ -7,6 +7,7 @@
"dev:docs": "yarn workspace docs start",
"clean": "lerna run clean && rimraf packages/*/{dist,rts2_cache*}",
"format": "prettier --write \"**/*.{ts,js,json}\" \"**/*.md\" \"**/*.mdx\"",
"lint": "eslint --ext .ts,.tsx,.js \"packages/**/*.{ts,tsx,js}\"",
"test": "jest",
"typecheck": "tsc --noEmit",
"typecheck:tests": "tsc --noEmit -P ./tsconfig.test.json",
Expand Down Expand Up @@ -63,15 +64,18 @@
"jest-canvas-mock": "^2.3.1",
"jest-mock-console": "^1.0.1",
"lerna": "^4.0.0",
"lint-staged": "11.2.0",
"lint-staged": "12.1.2",
"postinstall-postinstall": "^2.1.0",
"prettier": "^2.2.1",
"react-test-renderer": "^17.0.2",
"rimraf": "^3.0.2",
"ts-jest": "^27.0.7",
"ts-toolbelt": "^9.6.0",
"typecov": "^0.2.3",
"typescript": "^4.5.2"
"typescript": "^4",
"@mdx-js/react": "^1 || ^2",
"@types/mdx-js__react": "^1 || ^2",
"@emotion/react": "^11"
},
"husky": {
"hooks": {
Expand Down

0 comments on commit 8cb18ce

Please sign in to comment.