Skip to content

Commit c4383d4

Browse files
Merge branch 'main' into main
2 parents 2bb2823 + be4b5d9 commit c4383d4

65 files changed

Lines changed: 978 additions & 653 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
File renamed without changes.

.eslintrc.json

Lines changed: 0 additions & 27 deletions
This file was deleted.

.github/workflows/pre-merge.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
uses: actions/setup-node@v4
2020
with:
2121
node-version: "20"
22-
cache: "yarn"
22+
cache: yarn
2323

2424
- name: Check lock for duplications
2525
run: yarn dedupe --check
@@ -32,7 +32,6 @@ jobs:
3232

3333
- name: Run Lint
3434
run: yarn ci:lint
35-
working-directory: website
3635

3736
build:
3837
runs-on: ubuntu-latest
@@ -47,7 +46,7 @@ jobs:
4746
uses: actions/setup-node@v4
4847
with:
4948
node-version: "20"
50-
cache: "yarn"
49+
cache: yarn
5150

5251
- name: Install dependencies
5352
run: yarn install --immutable
@@ -56,4 +55,4 @@ jobs:
5655
run: yarn build
5756
working-directory: website
5857
env:
59-
NODE_OPTIONS: "--max_old_space_size=8192"
58+
NODE_OPTIONS: --max_old_space_size=8192

.gitignore

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,9 @@ node_modules
1919

2020
*.tsbuildinfo
2121

22-
scripts/lint-examples/out/
23-
24-
sync-api-docs/generatedComponentApiDocs.js
25-
sync-api-docs/extracted.json
22+
packages/lint-examples/out/
23+
packages/sync-api-docs/generatedComponentApiDocs.js
24+
packages/sync-api-docs/extracted.json
2625

2726
website/.docusaurus
2827
website/.cache-loader
@@ -36,7 +35,3 @@ website/build/
3635
!.yarn/releases
3736
!.yarn/sdks
3837
!.yarn/versions
39-
40-
41-
# Generated file(s) for llms
42-
llms.txt

.prettierrc.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"overrides": [
33
{
4-
"files": ["*.js", "*.jsx", "*.ts", "*.tsx"],
4+
"files": ["*.js", "*.mjs", "*.cjs", "*.jsx", "*.ts", "*.tsx"],
55
"options": {
66
"arrowParens": "avoid",
77
"bracketSpacing": false,
@@ -13,7 +13,7 @@
1313
}
1414
},
1515
{
16-
"files": "*.md",
16+
"files": ["*.md", "*.mdx"],
1717
"options": {
1818
"arrowParens": "avoid",
1919
"bracketSpacing": false,

docs/_getting-started-linux-android.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Setting up your development environment can be somewhat tedious if you're new to
1818

1919
<h4 id="android-studio">1. Install Android Studio</h4>
2020

21-
[Download and install Android Studio](https://developer.android.com/studio/index.html). While on Android Studio installation wizard, make sure the boxes next to all of the following items are checked:
21+
[Download and install Android Studio](https://developer.android.com/studio). While on Android Studio installation wizard, make sure the boxes next to all of the following items are checked:
2222

2323
- `Android SDK`
2424
- `Android SDK Platform`

docs/_getting-started-macos-android.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Setting up your development environment can be somewhat tedious if you're new to
5757

5858
<h4 id="android-studio">1. Install Android Studio</h4>
5959

60-
[Download and install Android Studio](https://developer.android.com/studio/index.html). While on Android Studio installation wizard, make sure the boxes next to all of the following items are checked:
60+
[Download and install Android Studio](https://developer.android.com/studio). While on Android Studio installation wizard, make sure the boxes next to all of the following items are checked:
6161

6262
- `Android SDK`
6363
- `Android SDK Platform`

docs/_getting-started-windows-android.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Setting up your development environment can be somewhat tedious if you're new to
3434

3535
<h4 id="android-studio">1. Install Android Studio</h4>
3636

37-
[Download and install Android Studio](https://developer.android.com/studio/index.html). While on Android Studio installation wizard, make sure the boxes next to all of the following items are checked:
37+
[Download and install Android Studio](https://developer.android.com/studio). While on Android Studio installation wizard, make sure the boxes next to all of the following items are checked:
3838

3939
- `Android SDK`
4040
- `Android SDK Platform`

docs/animated.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,7 @@ The following example contains a `View` which will fade in and fade out based on
1818
```SnackPlayer name=Animated%20Example
1919
import React, {useRef} from 'react';
2020
import {SafeAreaView, SafeAreaProvider} from 'react-native-safe-area-context';
21-
import {
22-
Animated,
23-
Text,
24-
View,
25-
StyleSheet,
26-
Button,
27-
} from 'react-native';
21+
import {Animated, Text, View, StyleSheet, Button} from 'react-native';
2822
2923
const App = () => {
3024
// fadeAnim will be used as the value for opacity. Initial Value: 0

docs/animations.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -622,9 +622,7 @@ export default function App() {
622622
623623
return (
624624
<View style={styles.container}>
625-
<View
626-
style={[styles.box, {width: state.w, height: state.h}]}
627-
/>
625+
<View style={[styles.box, {width: state.w, height: state.h}]} />
628626
<TouchableOpacity onPress={onPress}>
629627
<View style={styles.button}>
630628
<Text style={styles.buttonText}>Press me!</Text>

0 commit comments

Comments
 (0)