Skip to content

Commit 3ffca04

Browse files
committed
Merge remote-tracking branch 'upstream/main' into production
2 parents 2e6ce7b + faff427 commit 3ffca04

11 files changed

Lines changed: 770 additions & 906 deletions

File tree

docs/stylesheet.md

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -252,70 +252,6 @@ export default App;
252252
253253
---
254254
255-
### `absoluteFillObject`
256-
257-
Sometimes you may want `absoluteFill` but with a couple tweaks - `absoluteFillObject` can be used to create a customized entry in a `StyleSheet`, e.g.:
258-
259-
```SnackPlayer name=absoluteFillObject
260-
import React from 'react';
261-
import {StyleSheet, Text, View} from 'react-native';
262-
import {SafeAreaView, SafeAreaProvider} from 'react-native-safe-area-context';
263-
264-
const App = () => (
265-
<SafeAreaProvider>
266-
<SafeAreaView style={styles.container}>
267-
<View style={styles.box1}>
268-
<Text style={styles.text}>1</Text>
269-
</View>
270-
<View style={styles.box2}>
271-
<Text style={styles.text}>2</Text>
272-
</View>
273-
<View style={styles.box3}>
274-
<Text style={styles.text}>3</Text>
275-
</View>
276-
</SafeAreaView>
277-
</SafeAreaProvider>
278-
);
279-
280-
const styles = StyleSheet.create({
281-
container: {
282-
flex: 1,
283-
},
284-
box1: {
285-
position: 'absolute',
286-
top: 40,
287-
left: 40,
288-
width: 100,
289-
height: 100,
290-
backgroundColor: 'red',
291-
},
292-
box2: {
293-
...StyleSheet.absoluteFillObject,
294-
top: 120,
295-
left: 50,
296-
width: 100,
297-
height: 100,
298-
backgroundColor: 'blue',
299-
},
300-
box3: {
301-
...StyleSheet.absoluteFillObject,
302-
top: 120,
303-
left: 120,
304-
width: 100,
305-
height: 100,
306-
backgroundColor: 'green',
307-
},
308-
text: {
309-
color: '#FFF',
310-
fontSize: 80,
311-
},
312-
});
313-
314-
export default App;
315-
```
316-
317-
---
318-
319255
### `hairlineWidth`
320256
321257
This is defined as the width of a thin line on the platform. It can be used as the thickness of a border or division between two elements. Example:

package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,25 +29,25 @@
2929
"dev:vercel": "vercel dev"
3030
},
3131
"devDependencies": {
32-
"@eslint/css": "^1.0.0",
33-
"@eslint/js": "^9.39.3",
32+
"@eslint/css": "^1.2.0",
33+
"@eslint/js": "^9.39.4",
3434
"@manypkg/cli": "^0.25.1",
35-
"@typescript-eslint/parser": "^8.57.1",
35+
"@typescript-eslint/parser": "^8.59.3",
3636
"alex": "^11.0.1",
37-
"case-police": "^2.2.0",
38-
"eslint": "^9.39.3",
37+
"case-police": "^2.2.1",
38+
"eslint": "^9.39.4",
3939
"eslint-config-prettier": "^10.1.8",
4040
"eslint-plugin-alex": "^1.0.0",
41-
"eslint-plugin-case-police": "2.2.0",
41+
"eslint-plugin-case-police": "2.2.1",
4242
"eslint-plugin-mdx": "^3.7.0",
4343
"eslint-plugin-prettier": "^5.5.5",
44-
"eslint-plugin-yml": "^3.3.1",
45-
"globals": "^17.4.0",
44+
"eslint-plugin-yml": "^3.3.2",
45+
"globals": "^17.6.0",
4646
"husky": "^9.1.7",
47-
"prettier": "^3.8.1",
47+
"prettier": "^3.8.3",
4848
"pretty-quick": "^4.2.2",
49-
"typescript": "^5.9.3",
50-
"typescript-eslint": "^8.57.1"
49+
"typescript": "^6.0.3",
50+
"typescript-eslint": "^8.59.3"
5151
},
5252
"resolutions": {
5353
"serialize-javascript": "^7.0.5",

packages/lint-examples/package.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,25 @@
1313
},
1414
"devDependencies": {
1515
"@babel/core": "^7.29.0",
16-
"@babel/preset-env": "^7.29.0",
17-
"@babel/runtime": "^7.28.6",
18-
"@eslint/compat": "^2.0.2",
19-
"@react-native-community/slider": "^5.1.2",
20-
"@react-native/babel-preset": "^0.84.0",
21-
"@react-native/eslint-config": "^0.84.0",
22-
"@react-native/eslint-plugin": "^0.84.0",
23-
"@react-native/typescript-config": "^0.84.0",
24-
"@types/node": "^24.10.15",
16+
"@babel/preset-env": "^7.29.5",
17+
"@babel/runtime": "^7.29.2",
18+
"@eslint/compat": "^2.1.0",
19+
"@react-native-community/slider": "^5.2.0",
20+
"@react-native/babel-preset": "^0.85.3",
21+
"@react-native/eslint-config": "^0.85.3",
22+
"@react-native/eslint-plugin": "^0.85.3",
23+
"@react-native/typescript-config": "^0.85.3",
24+
"@types/node": "^24.12.4",
2525
"@types/react": "^19.2.14",
26-
"eslint": "^9.39.3",
26+
"eslint": "^9.39.4",
2727
"eslint-plugin-eslint-comments": "^3.2.0",
28-
"eslint-plugin-jest": "^29.15.0",
28+
"eslint-plugin-jest": "^29.15.2",
2929
"eslint-plugin-react": "^7.37.5",
3030
"glob": "^13.0.6",
31-
"prettier": "^3.8.1",
32-
"react": "^19.2.4",
33-
"react-native": "^0.84.0",
31+
"prettier": "^3.8.3",
32+
"react": "^19.2.6",
33+
"react-native": "^0.85.3",
3434
"react-native-safe-area-context": "^5.7.0",
35-
"typescript": "^5.9.3"
35+
"typescript": "^6.0.3"
3636
}
3737
}

plugins/remark-codeblock-language-as-title/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
"lint": "tsc --noEmit && eslint ."
1818
},
1919
"dependencies": {
20-
"unist-util-visit": "^5.0.0"
20+
"unist-util-visit": "^5.1.0"
2121
},
2222
"devDependencies": {
2323
"@types/mdast": "^4.0.4",
2424
"remark": "^15.0.1",
25-
"typescript": "^5.9.3"
25+
"typescript": "^6.0.3"
2626
}
2727
}

plugins/remark-lint-no-dead-urls/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@
1515
],
1616
"scripts": {
1717
"lint": "tsc --noEmit && eslint .",
18-
"test": "yarn node --experimental-vm-modules $(yarn bin jest)"
18+
"test": "yarn ts-jest"
1919
},
2020
"dependencies": {
21-
"got": "^14.6.6",
21+
"got": "^15.0.5",
2222
"unified-lint-rule": "^3.0.1",
23-
"unist-util-visit": "^5.0.0",
23+
"unist-util-visit": "^5.1.0",
2424
"vfile": "^6.0.3"
2525
},
2626
"devDependencies": {
2727
"@types/jest": "^29.5.14",
2828
"@types/mdast": "^4.0.4",
29-
"dedent": "^1.7.1",
29+
"dedent": "^1.7.2",
3030
"jest": "^29.7.0",
3131
"remark": "^15.0.1",
32-
"ts-jest": "^29.4.6",
33-
"typescript": "^5.9.3"
32+
"ts-jest": "^29.4.9",
33+
"typescript": "^6.0.3"
3434
}
3535
}

plugins/remark-lint-no-dead-urls/src/__tests__/index.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ function processMarkdown(md: string, opts: Options = {}) {
2525
}
2626

2727
describe('remark-lint-no-dead-urls', () => {
28-
beforeEach(() => mockFetch.mockReset());
28+
beforeEach(() => {
29+
mockFetch.mockReset();
30+
});
2931

3032
test('works with no URLs', async () => {
3133
const lint = processMarkdown(dedent`

plugins/remark-snackplayer/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"test": "yarn tape tests/index.ts"
2121
},
2222
"dependencies": {
23-
"dedent": "^1.7.1",
23+
"dedent": "^1.7.2",
2424
"unist-util-visit-parents": "^3.1.1"
2525
},
2626
"devDependencies": {
@@ -29,6 +29,6 @@
2929
"remark": "^15.0.1",
3030
"remark-mdx": "^3.1.1",
3131
"tape": "^5.9.0",
32-
"typescript": "^5.9.3"
32+
"typescript": "^6.0.3"
3333
}
3434
}

website/package.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -50,31 +50,31 @@
5050
]
5151
},
5252
"dependencies": {
53-
"@docusaurus/core": "3.10.0",
54-
"@docusaurus/faster": "3.10.0",
55-
"@docusaurus/plugin-google-gtag": "3.10.0",
56-
"@docusaurus/plugin-pwa": "3.10.0",
57-
"@docusaurus/preset-classic": "3.10.0",
58-
"@docusaurus/theme-mermaid": "3.10.0",
53+
"@docusaurus/core": "3.10.1",
54+
"@docusaurus/faster": "3.10.1",
55+
"@docusaurus/plugin-google-gtag": "3.10.1",
56+
"@docusaurus/plugin-pwa": "3.10.1",
57+
"@docusaurus/preset-classic": "3.10.1",
58+
"@docusaurus/theme-mermaid": "3.10.1",
5959
"docusaurus-plugin-sass": "^0.2.6",
60-
"react": "^19.2.4",
61-
"react-dom": "^19.2.4",
60+
"react": "^19.2.6",
61+
"react-dom": "^19.2.6",
6262
"react-github-btn": "^1.4.0"
6363
},
6464
"devDependencies": {
65-
"@docusaurus/module-type-aliases": "3.10.0",
66-
"@docusaurus/tsconfig": "3.10.0",
67-
"@docusaurus/types": "3.10.0",
68-
"@prettier/plugin-oxc": "^0.1.3",
65+
"@docusaurus/module-type-aliases": "3.10.1",
66+
"@docusaurus/tsconfig": "3.10.1",
67+
"@docusaurus/types": "3.10.1",
68+
"@prettier/plugin-oxc": "^0.1.4",
6969
"@react-native-website/lint-examples": "*",
7070
"@signalwire/docusaurus-plugin-llms-txt": "^1.2.2",
7171
"@types/google.analytics": "^0.0.46",
7272
"@types/react": "^19.2.14",
73-
"eslint": "^9.39.3",
73+
"eslint": "^9.39.4",
7474
"glob": "^13.0.6",
75-
"prettier": "^3.8.1",
75+
"prettier": "^3.8.3",
7676
"remark-cli": "^12.0.1",
77-
"sass": "1.98.0",
78-
"typescript": "^5.9.3"
77+
"sass": "1.99.0",
78+
"typescript": "^6.0.3"
7979
}
8080
}

website/versioned_docs/version-0.85/stylesheet.md

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -252,70 +252,6 @@ export default App;
252252
253253
---
254254
255-
### `absoluteFillObject`
256-
257-
Sometimes you may want `absoluteFill` but with a couple tweaks - `absoluteFillObject` can be used to create a customized entry in a `StyleSheet`, e.g.:
258-
259-
```SnackPlayer name=absoluteFillObject
260-
import React from 'react';
261-
import {StyleSheet, Text, View} from 'react-native';
262-
import {SafeAreaView, SafeAreaProvider} from 'react-native-safe-area-context';
263-
264-
const App = () => (
265-
<SafeAreaProvider>
266-
<SafeAreaView style={styles.container}>
267-
<View style={styles.box1}>
268-
<Text style={styles.text}>1</Text>
269-
</View>
270-
<View style={styles.box2}>
271-
<Text style={styles.text}>2</Text>
272-
</View>
273-
<View style={styles.box3}>
274-
<Text style={styles.text}>3</Text>
275-
</View>
276-
</SafeAreaView>
277-
</SafeAreaProvider>
278-
);
279-
280-
const styles = StyleSheet.create({
281-
container: {
282-
flex: 1,
283-
},
284-
box1: {
285-
position: 'absolute',
286-
top: 40,
287-
left: 40,
288-
width: 100,
289-
height: 100,
290-
backgroundColor: 'red',
291-
},
292-
box2: {
293-
...StyleSheet.absoluteFillObject,
294-
top: 120,
295-
left: 50,
296-
width: 100,
297-
height: 100,
298-
backgroundColor: 'blue',
299-
},
300-
box3: {
301-
...StyleSheet.absoluteFillObject,
302-
top: 120,
303-
left: 120,
304-
width: 100,
305-
height: 100,
306-
backgroundColor: 'green',
307-
},
308-
text: {
309-
color: '#FFF',
310-
fontSize: 80,
311-
},
312-
});
313-
314-
export default App;
315-
```
316-
317-
---
318-
319255
### `hairlineWidth`
320256
321257
This is defined as the width of a thin line on the platform. It can be used as the thickness of a border or division between two elements. Example:

0 commit comments

Comments
 (0)