Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix bug in docs site build #1338

Merged
merged 13 commits into from
Apr 12, 2021
Merged

Fix bug in docs site build #1338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
18aa0c9
Using yarn instead of npm
jonrohan Apr 12, 2021
c632586
Freezing versions
jonrohan Apr 12, 2021
d4d04ea
don't use gpr
jonrohan Apr 12, 2021
66ef659
Merge branch 'main' into upgrade_docs_site
jonrohan Apr 12, 2021
6974237
Rebuild lock file
jonrohan Apr 12, 2021
0df3396
Remove postcss-loader
jonrohan Apr 12, 2021
de62986
using primitives
jonrohan Apr 12, 2021
f263577
The magic formula
jonrohan Apr 12, 2021
8f2700d
Specific version
jonrohan Apr 12, 2021
9ff5d1f
gatsby-plugin-sass@3.2.0
jonrohan Apr 12, 2021
8a4bc02
on push
jonrohan Apr 12, 2021
9fffed1
Remove refs
jonrohan Apr 12, 2021
3ddfd6d
Remove alias column
jonrohan Apr 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/deploy_preview.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Deploy
on:
pull_request:
push:
branches-ignore:
- main
paths:
Expand Down
28 changes: 17 additions & 11 deletions docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,31 @@
"@primer/gatsby-theme-doctocat": "^1.6.0",
"@primer/octicons": "^11.0.0",
"@primer/octicons-react": "^11.0.0",
"@svgr/webpack": "^4.3.2",
"autoprefixer": "^9.6.1",
"babel-preset-gatsby": "^0.5.10",
"@primer/primitives": "4.2.0",
"@svgr/webpack": "5.5.0",
"autoprefixer": "10.2.5",
"babel-preset-gatsby": "^1.2.0",
"chroma-js": "^2.0.6",
"core-js": "^3.6.5",
"gatsby": "^2.24.62",
"gatsby": "2.32.12",
"gatsby-plugin-alias-imports": "^1.0.5",
"gatsby-plugin-sass": "^2.3.13",
"gatsby-plugin-svgr": "^2.0.2",
"postcss-loader": "^3.0.0",
"postcss-node-sass": "^2.1.8",
"postcss-scss": "^2.0.0",
"primer-colors": "^1.0.1",
"gatsby-plugin-sass": "3.2.0",
"gatsby-plugin-svgr": "2.1.0",
"path": "0.12.7",
"postcss": "8.2.10",
"postcss-import": "14.0.1",
"postcss-load-config": "3.0.1",
"postcss-loader": "4.2.0",
"postcss-node-sass": "3.1.0",
"postcss-scss": "3.0.5",
"postcss-simple-vars": "6.0.3",
"prop-types": "^15.7.2",
"raw-loader": "^3.1.0",
"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",
"styled-components": "^4.3.2",
"title-case": "^2.1.1"
},
Expand Down
14 changes: 8 additions & 6 deletions docs/postcss.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
// This config file is necessary to get postcss-loader to work in
// ./src/@primer/gatsby-theme-doctocat/components/live-preview-wrapper.js.
const path = require('path')

module.exports = {
parser: 'postcss-scss',
plugins: {
'postcss-node-sass': {
includePaths: ['node_modules'],
plugins: [
require('postcss-node-sass')({
includePaths: [path.join(__dirname, 'node_modules')],
outputStyle: 'compressed'
},
autoprefixer: {}
}
}),
require('autoprefixer')
]
}
14 changes: 0 additions & 14 deletions docs/src/variables.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ function VariablesDetails({variablesByFile, ...props}) {
<tr>
<th>Name</th>
<th>Value</th>
<th>Aliases</th>
</tr>
</thead>
<tbody>
Expand All @@ -139,9 +138,6 @@ function VariablesDetails({variablesByFile, ...props}) {
<Swatch value={computed} mr={2} />
<Mono nowrap>{computed}</Mono>
</td>
<td>
<RefList refs={refs} />
</td>
</tr>
))}
</tbody>
Expand Down Expand Up @@ -172,16 +168,6 @@ Swatch.defaultProps = {
size: '1em'
}

function RefList({refs}) {
const last = refs.length - 1
return refs.map((ref, i) => [
<Link href={`#${ref}`} key={ref}>
<Mono nowrap>{ref}</Mono>
</Link>,
i < last ? ', ' : ''
])
}

function DeprecationFlag({variable, ...rest}) {
const deprecations = useDeprecations()

Expand Down
Loading