Skip to content

Commit a65dc60

Browse files
authored
Merge pull request #972 from facebook/main
sync
2 parents aee8560 + 214e0be commit a65dc60

File tree

7 files changed

+1336
-1506
lines changed

7 files changed

+1336
-1506
lines changed

.github/workflows/pre-merge.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,15 @@ jobs:
2121
node-version: "20"
2222
cache: "yarn"
2323

24-
- name: Check dependencies
24+
- name: Check lock for duplications
2525
run: yarn dedupe --check
2626

2727
- name: Install dependencies
2828
run: yarn install --immutable
2929

30+
- name: Check dependencies alignment
31+
run: yarn check-dependencies
32+
3033
- name: Run Lint
3134
run: yarn ci:lint
3235
working-directory: website

package.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@
1717
"build": "yarn --cwd website build",
1818
"build:fast": "yarn --cwd website build:fast",
1919
"serve": "yarn --cwd website serve",
20-
"prepare": "husky"
20+
"prepare": "husky",
21+
"check-dependencies": "manypkg check"
2122
},
22-
"dependencies": {
23+
"devDependencies": {
24+
"@manypkg/cli": "^0.25.0",
2325
"eslint": "^8.57.1",
2426
"eslint-config-prettier": "^10.1.8",
2527
"eslint-plugin-mdx": "^3.6.2",
@@ -30,5 +32,8 @@
3032
"prettier": "^3.6.2",
3133
"pretty-quick": "^4.2.2"
3234
},
35+
"resolutions": {
36+
"@typescript-eslint/typescript-estree": "8.39.1"
37+
},
3338
"packageManager": "[email protected]"
3439
}

scripts/lint-examples/package.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@
88
"tsc-examples": "./bin/tsc-examples.js"
99
},
1010
"devDependencies": {
11-
"@babel/core": "^7.25.2",
12-
"@babel/preset-env": "^7.25.4",
13-
"@babel/runtime": "^7.26.10",
14-
"@react-native-community/slider": "^4.5.3",
15-
"@react-native/babel-preset": "^0.76.0-rc.2",
16-
"@react-native/eslint-config": "^0.76.0-rc.2",
17-
"@react-native/typescript-config": "^0.76.0-rc.2",
18-
"@types/react": "^18.2.79",
11+
"@babel/core": "^7.28.3",
12+
"@babel/preset-env": "^7.28.3",
13+
"@babel/runtime": "^7.28.3",
14+
"@react-native-community/slider": "^4.5.7",
15+
"@react-native/babel-preset": "^0.81.0",
16+
"@react-native/eslint-config": "^0.81.0",
17+
"@react-native/typescript-config": "^0.81.0",
18+
"@types/react": "^19.1.10",
1919
"eslint": "^8.57.1",
2020
"glob": "^11.0.0",
21-
"prettier": "^3.4.2",
22-
"react": "18.3.1",
23-
"react-native": "^0.76.0-rc.2",
24-
"react-native-safe-area-context": "^4.11.0",
25-
"typescript": "5.5.4"
21+
"prettier": "^3.6.2",
22+
"react": "^19.1.1",
23+
"react-native": "^0.81.0",
24+
"react-native-safe-area-context": "^5.6.0",
25+
"typescript": "^5.9.2"
2626
}
2727
}

website/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
"@docusaurus/plugin-pwa": "3.8.1",
5858
"@docusaurus/preset-classic": "3.8.1",
5959
"docusaurus-plugin-sass": "^0.2.6",
60-
"react": "^18.2.0",
61-
"react-dom": "^18.2.0",
60+
"react": "^19.1.1",
61+
"react-dom": "^19.1.1",
6262
"react-github-btn": "^1.4.0",
6363
"sass": "1.76.0"
6464
},
@@ -69,14 +69,14 @@
6969
"@react-native-website/lint-examples": "0.0.0",
7070
"@react-native-website/update-redirects": "0.0.0",
7171
"@types/google.analytics": "^0.0.46",
72-
"@types/react": "^18.2.79",
72+
"@types/react": "^19.1.10",
7373
"alex": "^11.0.1",
7474
"case-police": "^1.0.0",
7575
"eslint": "^8.57.1",
7676
"fs-extra": "^11.2.0",
7777
"glob": "^11.0.0",
78-
"prettier": "^3.5.3",
78+
"prettier": "^3.6.2",
7979
"remark-cli": "^12.0.1",
80-
"typescript": "^5.7.2"
80+
"typescript": "^5.9.2"
8181
}
8282
}

website/src/css/_shared.scss

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,42 +7,36 @@
77

88
%link-style {
99
display: initial;
10-
color: var(--ifm-font-color-base);
11-
background-color: rgba(187, 239, 253, 0.3);
1210
line-height: calc(var(--ifm-font-size-base) + 4px);
13-
border-bottom: 1px solid var(--ifm-hr-border-color);
11+
border-bottom: 1px solid transparent;
12+
transition: border-color 0.15s;
1413

1514
&:hover {
16-
background-color: rgba(187, 239, 253, 0.6);
15+
border-bottom-color: var(--ifm-color-primary-75);
1716
}
1817
}
1918

2019
%link-style-dark {
21-
background-color: rgba(97, 218, 251, 0.12);
22-
border-bottom-color: rgba(97, 218, 251, 0.3);
20+
color: var(--brand);
2321

2422
&:hover {
25-
background-color: rgba(97, 218, 251, 0.4);
26-
border-bottom-color: var(--brand);
23+
border-bottom-color: var(--ifm-color-primary-75);
2724
}
2825
}
2926

3027
%hash-link-style {
31-
background-color: transparent;
32-
border-bottom: 0;
33-
color: var(--subtle);
34-
35-
&:hover {
36-
background-color: transparent;
37-
color: var(--brand);
28+
&,
29+
&::before {
30+
color: var(--subtle);
31+
border-bottom: 0 !important;
3832
}
3933
}
4034

4135
%button-link-style {
4236
display: inline-block;
4337
padding: 8px 16px;
4438
border: 1px solid var(--ifm-color-emphasis-300);
45-
border-radius: var(--ifm-global-radius);
39+
border-radius: 32px;
4640
color: var(--ifm-color-content-secondary);
4741

4842
&:hover {

0 commit comments

Comments
 (0)