1
1
mirror of https://github.com/primer/css.git synced 2024-12-25 07:03:35 +03:00

Merge branch 'main' into primitives_version_loosen

This commit is contained in:
Jon Rohan 2021-05-26 17:01:10 -07:00 committed by GitHub
commit 0dadc689af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 50 deletions

View File

@ -10,7 +10,6 @@
},
"dependencies": {
"@babel/preset-react": "^7.10.4",
"@loadable/component": "^5.10.2",
"@primer/components": "^17.1.0",
"@primer/gatsby-theme-doctocat": "^1.6.0",
"@primer/octicons": "^11.0.0",
@ -36,7 +35,6 @@
"prop-types": "^15.7.2",
"raw-loader": "^4.0.2",
"react": "^16.13.1",
"react-bodymovin": "^2.0.0",
"react-dom": "^16.13.1",
"react-frame-component": "^4.1.1",
"sass-loader": "10.1.1",

View File

@ -1,12 +1,9 @@
import loadable from '@loadable/component'
import {Box, Heading, Text} from '@primer/components'
import {Container} from '@primer/gatsby-theme-doctocat'
import React from 'react'
import {version} from '../../../../../package.json'
import {ReactComponent as HeroIllustration} from '../../../hero-illustration.svg'
const HeroAnimation = loadable(() => import('../../../hero-animation'), {fallback: <HeroIllustration />})
function Hero() {
return (
<Box bg="black" py={6}>
@ -17,7 +14,7 @@ function Hero() {
<Text as="p" fontFamily="mono" mt={0} mb={2} color="blue.3" fontSize={2}>
v{version}
</Text>
<HeroAnimation />
<HeroIllustration />
</Container>
</Box>
)

View File

@ -1,16 +0,0 @@
import React from 'react'
import ReactBodymovin from 'react-bodymovin'
import heroAnimation from './hero-animation.json'
const bodymovinOptions = {
loop: true,
autoplay: true,
prerender: true,
animationData: heroAnimation
}
function HeroAnimation() {
return <ReactBodymovin options={bodymovinOptions} />
}
export default HeroAnimation

File diff suppressed because one or more lines are too long

View File

@ -1006,7 +1006,7 @@
dependencies:
regenerator-runtime "^0.13.4"
"@babel/runtime@^7.0.0", "@babel/runtime@^7.10.0", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.2.0", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.1", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.7.7", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
"@babel/runtime@^7.0.0", "@babel/runtime@^7.10.0", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.2.0", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.1", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
version "7.13.10"
resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.10.tgz"
integrity sha512-4QPkjJq6Ns3V/RgpEahRk+AGfL0eO6RHHtTWoNNr5mO49G6B5+X6d6THgWEAvTrznU5xYpbAlVKRYcsCgh/Akw==
@ -1468,15 +1468,6 @@
"@types/yargs" "^15.0.0"
chalk "^4.0.0"
"@loadable/component@^5.10.2":
version "5.14.1"
resolved "https://registry.npmjs.org/@loadable/component/-/component-5.14.1.tgz"
integrity sha512-UQBZfZrp1FLTf8RNhljXNHFNY4QhAA1L2+GOEeABBFre9TD0aFyQh3Sai5QxcOfy+FTbjIfti5iHaNRR7yUzEQ==
dependencies:
"@babel/runtime" "^7.7.7"
hoist-non-react-statics "^3.3.1"
react-is "^16.12.0"
"@mdx-js/mdx@^1.0.21":
version "1.6.22"
resolved "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-1.6.22.tgz"
@ -3611,11 +3602,6 @@ body-parser@1.19.0, body-parser@^1.19.0:
raw-body "2.4.0"
type-is "~1.6.17"
bodymovin@^4.13.0:
version "4.13.0"
resolved "https://registry.npmjs.org/bodymovin/-/bodymovin-4.13.0.tgz"
integrity sha1-Btl8ATDiM03MszvqY4E2+Ip0VAs=
bonjour@^3.5.0:
version "3.5.0"
resolved "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz"
@ -5491,9 +5477,9 @@ dns-equal@^1.0.0:
integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0=
dns-packet@^1.3.1:
version "1.3.1"
resolved "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz"
integrity sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==
version "1.3.4"
resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.4.tgz#e3455065824a2507ba886c55a89963bb107dec6f"
integrity sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==
dependencies:
ip "^1.1.0"
safe-buffer "^5.0.1"
@ -8061,7 +8047,7 @@ hmac-drbg@^1.0.1:
minimalistic-assert "^1.0.0"
minimalistic-crypto-utils "^1.0.1"
hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.1:
hoist-non-react-statics@^3.3.0:
version "3.3.2"
resolved "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz"
integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
@ -12764,13 +12750,6 @@ react-addons-text-content@^0.0.4:
resolved "https://registry.npmjs.org/react-addons-text-content/-/react-addons-text-content-0.0.4.tgz"
integrity sha1-0uJZ/clR0diQbAiQIAIQjc6HkuU=
react-bodymovin@^2.0.0:
version "2.0.0"
resolved "https://registry.npmjs.org/react-bodymovin/-/react-bodymovin-2.0.0.tgz"
integrity sha512-72MWWvPyF2Ah329+z0dVEvyNce+aiY2xOw7I9FzO8Xc15BWYvOQOnqzLTxSWjaZAdenk7e9vSanBCtB8Fqi7Cg==
dependencies:
bodymovin "^4.13.0"
react-clientside-effect@^1.2.2:
version "1.2.5"
resolved "https://registry.npmjs.org/react-clientside-effect/-/react-clientside-effect-1.2.5.tgz"
@ -13728,7 +13707,7 @@ rxjs@^6.6.0:
safe-buffer@*, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
version "5.2.1"
resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: