Skip to content

Commit ff79d0d

Browse files
committed
chore: lint from root for frontend deps
1 parent bee61ff commit ff79d0d

File tree

14 files changed

+51
-115
lines changed

14 files changed

+51
-115
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
!/.gitignore
1313
!/.npmrc
1414
!/.nvmrc
15+
!/.prettierIgnore
1516
!/.release-please-manifest.json
1617
!/.reuse/
1718
!/*.md

.prettierIgnore

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
**/template-oss/*.json
2+
**/template-oss/*.yml
3+
content/
4+
content-debug/
5+
cli/
6+
.github/
7+
package-lock.json
8+
CODE_OF_CONDUCT.md
9+
CONTENT-MODEL.md
10+
SECURITY.md

cli/package.json

+3-12
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@
1313
"template-oss-apply": "template-oss-apply --force",
1414
"lintfix": "npm run lint -- --fix",
1515
"snap": "tap",
16-
"test": "tap",
17-
"posttest": "npm run lint"
16+
"test": "jest",
17+
"posttest": "npm run lint",
18+
"format": "prettier --write ."
1819
},
1920
"dependencies": {
2021
"@octokit/rest": "^20.0.2",
@@ -33,22 +34,12 @@
3334
"tap": "^16.3.9"
3435
},
3536
"author": "GitHub Inc.",
36-
"files": [
37-
"bin/",
38-
"lib/"
39-
],
4037
"engines": {
4138
"node": ">=18.0.0"
4239
},
4340
"templateOSS": {
4441
"//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
4542
"version": "4.19.0",
4643
"content": "./scripts/template-oss"
47-
},
48-
"tap": {
49-
"nyc-arg": [
50-
"--exclude",
51-
"tap-snapshots/**"
52-
]
5344
}
5445
}

package.json

+3-17
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@
1717
"template-oss-apply": "template-oss-apply --force",
1818
"lintfix": "npm run lint -- --fix",
1919
"snap": "tap",
20-
"test": "tap",
20+
"test": "jest",
2121
"posttest": "npm run lint",
2222
"test-all": "npm run test -ws -iwr --if-present",
23-
"lint-all": "npm run lint -ws -iwr --if-present"
23+
"lint-all": "npm run lint -ws -iwr --if-present",
24+
"format": "prettier --write ."
2425
},
2526
"workspaces": [
2627
"cli/",
@@ -45,10 +46,6 @@
4546
"tap": "^16.3.9"
4647
},
4748
"author": "GitHub Inc.",
48-
"files": [
49-
"bin/",
50-
"lib/"
51-
],
5249
"engines": {
5350
"node": ">=18.0.0"
5451
},
@@ -57,17 +54,6 @@
5754
"version": "4.19.0",
5855
"content": "./scripts/template-oss"
5956
},
60-
"tap": {
61-
"test-ignore": "^(cli|theme)/",
62-
"nyc-arg": [
63-
"--exclude",
64-
"cli/**",
65-
"--exclude",
66-
"theme/**",
67-
"--exclude",
68-
"tap-snapshots/**"
69-
]
70-
},
7157
"eslintIgnore": [
7258
".cache/",
7359
"public/"

scripts/template-oss/index.js

+11
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ module.exports = {
1111
},
1212
rootModule: {
1313
add: {
14+
'package.json': { file: 'pkg.json', overwrite: false },
1415
'.eslintrc.js': false,
1516
'CODE_OF_CONDUCT.md': false,
1617
'CONTRIBUTING.md': false,
@@ -21,12 +22,21 @@ module.exports = {
2122
'.github/settings.yml': false,
2223
},
2324
},
25+
workspaceModule: {
26+
add: {
27+
'package.json': { file: 'pkg.json', overwrite: false },
28+
'.eslintrc.js': false,
29+
},
30+
},
2431
ciVersions: 'latest',
2532
latestCiVersion: 18,
2633
macCI: false,
2734
windowsCI: false,
2835
lockfile: true,
2936
allowedPackages: ['eslint'],
37+
requiredPackages: {
38+
devDependencies: []
39+
},
3040
allowPaths: [
3141
'/.reuse/',
3242
'/src/',
@@ -38,5 +48,6 @@ module.exports = {
3848
'/CONTRIBUTING.md',
3949
'/CONTENT-MODEL.md',
4050
'/.nvmrc',
51+
'/.prettierIgnore',
4152
],
4253
}

theme/scripts/template-oss/pkg.json renamed to scripts/template-oss/pkg.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
"test": "jest",
44
"format": "prettier --write ."
55
},
6-
"files": {{{ del }}}
6+
"files": {{{ del }}},
7+
"tap": {{{ del }}}
78
}

theme/.eslintrc.js

-43
This file was deleted.

theme/.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
!/.eslintrc.js
99
!/.eslintrc.local.*
1010
!/.gitignore
11-
!/.prettierIgnore
1211
!/bin/
1312
!/CHANGELOG*
1413
!/docs/

theme/.prettierIgnore

-2
This file was deleted.

theme/package.json

+1-20
Original file line numberDiff line numberDiff line change
@@ -53,20 +53,7 @@
5353
"styled-components": "^5.3.11"
5454
},
5555
"devDependencies": {
56-
"@github/prettier-config": "^0.0.6",
57-
"@npmcli/template-oss": "4.19.0",
58-
"@testing-library/jest-dom": "^6.1.4",
59-
"@testing-library/react": "^9.5.0",
60-
"babel-jest": "^29.7.0",
61-
"eslint": "^8.51.0",
62-
"eslint-plugin-github": "^4.10.1",
63-
"eslint-plugin-jsx-a11y": "^6.7.1",
64-
"eslint-plugin-primer-react": "^4.0.3",
65-
"eslint-plugin-react": "^7.33.2",
66-
"eslint-plugin-react-hooks": "^4.6.0",
67-
"jest": "^29.7.0",
68-
"jest-environment-jsdom": "^29.7.0",
69-
"prettier": "^3.0.3"
56+
"@npmcli/template-oss": "4.19.0"
7057
},
7158
"author": "GitHub Inc.",
7259
"engines": {
@@ -76,11 +63,5 @@
7663
"//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
7764
"version": "4.19.0",
7865
"content": "./scripts/template-oss"
79-
},
80-
"tap": {
81-
"nyc-arg": [
82-
"--exclude",
83-
"tap-snapshots/**"
84-
]
8566
}
8667
}

theme/scripts/template-oss/_step-deps.yml

-2
This file was deleted.

theme/scripts/template-oss/index.js

-14
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,4 @@
11
module.exports = {
22
...require('../../../scripts/template-oss'),
3-
workspaceRepo: {
4-
add: {
5-
'.github/settings.yml': false,
6-
},
7-
},
8-
workspaceModule: {
9-
add: {
10-
'package.json': {file: 'pkg.json', overwrite: false},
11-
'.eslintrc.js': false,
12-
},
13-
},
143
allowPaths: ['/src', '/gatsby-*.js', '/jest*.js', '/index.js', '/.prettierIgnore'],
15-
requiredPackages: {
16-
devDependencies: [],
17-
},
184
}

theme/src/components/hero.js

+16-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,26 @@
11
import React from 'react'
2-
import {Box, Heading, Text} from '@primer/react'
2+
import {Box, Heading, Text, ThemeProvider} from '@primer/react'
33
import useSiteMetadata from '../hooks/use-site-metadata'
44
import Container from './container'
55

66
function Hero() {
77
const {title, description} = useSiteMetadata()
88

9+
return (
10+
<ThemeProvider colorMode="night" nightScheme="dark_dimmed">
11+
<Box sx={{bg: 'canvas.default', py: 6}}>
12+
<Container>
13+
<Heading as="h1" sx={{color: 'accent.fg', fontSize: 7, m: 0}}>
14+
{title}
15+
</Heading>
16+
<Text as="p" sx={{m: 0, color: 'fg.onEmphasis', fontSize: 4}}>
17+
{description}
18+
</Text>
19+
</Container>
20+
</Box>
21+
</ThemeProvider>
22+
)
23+
924
return (
1025
<Box bg="black" py={6}>
1126
<Container>

theme/src/root-element.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react'
22
import {MDXProvider} from '@mdx-js/react'
3-
import {Link, theme, SSRProvider, ThemeProvider} from '@primer/react'
3+
import {Link, SSRProvider, ThemeProvider, theme} from '@primer/react'
44
import Blockquote from './mdx/blockquote'
55
import Code from './mdx/code'
66
import DescriptionList from './mdx/description-list'
@@ -21,6 +21,8 @@ function UnderlinedLink(props) {
2121
return <Link {...props} underline={true} />
2222
}
2323

24+
console.log(theme)
25+
2426
const components = {
2527
a: UnderlinedLink,
2628
pre: props => props.children,
@@ -52,7 +54,7 @@ function RootElement({element}) {
5254
return (
5355
<SSRProvider>
5456
<MDXProvider components={components}>
55-
<ThemeProvider theme={theme}>{element}</ThemeProvider>
57+
<ThemeProvider>{element}</ThemeProvider>
5658
</MDXProvider>
5759
</SSRProvider>
5860
)

0 commit comments

Comments
 (0)