Skip to content

Commit 66c2d73

Browse files
Merge branch 'main' into user/FixDocsNativeModules
2 parents e4c9e93 + 3f87945 commit 66c2d73

18 files changed

Lines changed: 12925 additions & 10155 deletions

File tree

.github/workflows/template-buildwebsite.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,28 @@ jobs:
4141
run: ${{github.workspace}}/.github/scripts/CheckUnbrokenExclusions.ps1
4242

4343
- name: Check for Broken Links (Docs)
44+
id: broken-links-docs
45+
timeout-minutes: 15
46+
continue-on-error: true
4447
run: npx unbroken --parse-ids
4548
working-directory: ./docs
4649

50+
- name: Warn if Broken Links (Docs) timed out
51+
if: steps.broken-links-docs.outcome == 'failure' || steps.broken-links-docs.outcome == 'cancelled'
52+
run: echo "::warning::Check for Broken Links (Docs) timed out or failed. Please manually run the job in your machine."
53+
4754
- name: Check for Broken Links (Website)
55+
id: broken-links-website
4856
if: success() || failure()
57+
timeout-minutes: 15
58+
continue-on-error: true
4959
run: npx unbroken --parse-ids
5060
working-directory: ./website
5161

62+
- name: Warn if Broken Links (Website) timed out
63+
if: steps.broken-links-website.outcome == 'failure' || steps.broken-links-website.outcome == 'cancelled'
64+
run: echo "::warning::Check for Broken Links (Website) timed out or failed. Please manually run the job in your machine."
65+
5266
- name: Yarn Install (Website)
5367
if: success() || failure()
5468
run: yarn install --frozen-lockfile
Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
21
name: RNW Website Publish
32

43
on:
4+
workflow_dispatch:
55
push:
66
branches:
77
- main
@@ -14,31 +14,21 @@ jobs:
1414
publish_website:
1515
name: Website Publish
1616
runs-on: ubuntu-latest
17-
1817
steps:
1918
- name: Git Setup
2019
run: |
2120
git config --global user.email "53619745+rnbot@users.noreply.github.com"
2221
git config --global user.name "React-Native-Windows Bot"
23-
echo "machine github.com login x-access-token password ${RNBOT_GH_TOKEN}" > ~/.netrc
24-
env:
25-
RNBOT_GH_TOKEN: ${{ secrets.RNBOT_GH_TOKEN }}
26-
27-
- name: Checkout Repo
28-
uses: actions/checkout@v4
29-
with:
30-
fetch-depth: 0 # required for gh-pages push
31-
22+
echo "machine github.com login 53619745+rnbot password ${{ secrets.RNBOT_GH_TOKEN }}" > ~/.netrc
23+
- name: Git Checkout
24+
uses: actions/checkout@v2
3225
- name: Yarn Install (Website)
3326
run: yarn install --frozen-lockfile
3427
working-directory: ./website
35-
3628
- name: Publish to GitHub Pages
3729
env:
38-
GIT_USER: x-access-token
39-
GIT_PASS: ${{ secrets.RNBOT_GH_TOKEN }}
30+
GIT_USER: 53619745+rnbot
4031
run: yarn run publish-gh-pages
4132
working-directory: ./website
42-
43-
- name: Cleanup Netrc
33+
- name: Git Cleanup
4434
run: rm ~/.netrc

docs/rnw-dependencies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Alternatively, you can setup your environment manually:
5353
Options to install [Node.js](https://nodejs.org) separately:
5454
- Using [WinGet](https://aka.ms/winget) (_React Native recommended_). To use WinGet, from an elevated Command Prompt, run:
5555
```bat
56-
winget install OpenJS.NodeJS.LTS --version 22.14.0
56+
winget install OpenJS.NodeJS.22 --version 22.22.0
5757
```
5858
- Using [another package manager](https://nodejs.org/en/download/package-manager/) such as [Scoop](https://scoop.sh/) or [Node Version Switcher (nvs)](https://github.com/jasongin/nvs)
5959
- Directly from [Node.js](https://nodejs.org/en/download)

docs/windowsbrush-and-theme.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ class MyAppClass extends Component {
5555
};
5656

5757
componentDidMount() {
58-
Appearance.addChangeListener(this.onAppThemeChanged);
58+
this._subscription = Appearance.addChangeListener(this.onAppThemeChanged);
5959
};
6060

6161
componentWillUnmount() {
62-
Appearance.addChangeListener(this.onAppThemeChanged);
62+
this._subscription?.remove();
6363
};
6464

6565
onAppThemeChanged = (theme) => {

samples-old/AppServiceDemo/yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5159,9 +5159,9 @@ lodash.throttle@^4.1.1:
51595159
integrity sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==
51605160

51615161
lodash@^4.17.10, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.7.0:
5162-
version "4.17.21"
5163-
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
5164-
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
5162+
version "4.17.23"
5163+
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.23.tgz#f113b0378386103be4f6893388c73d0bde7f2c5a"
5164+
integrity sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==
51655165

51665166
log-symbols@^2.2.0:
51675167
version "2.2.0"

samples-old/CalculatorCoreAppNuGet/yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5400,9 +5400,9 @@ lodash.throttle@^4.1.1:
54005400
integrity sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==
54015401

54025402
lodash@^4.17.15, lodash@^4.17.21:
5403-
version "4.17.21"
5404-
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
5405-
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
5403+
version "4.17.23"
5404+
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.23.tgz#f113b0378386103be4f6893388c73d0bde7f2c5a"
5405+
integrity sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==
54065406

54075407
log-symbols@^2.2.0:
54085408
version "2.2.0"

samples-old/NativeModuleSample/cppwinrt/yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5012,9 +5012,9 @@ lodash.throttle@^4.1.1:
50125012
integrity sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=
50135013

50145014
lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21:
5015-
version "4.17.21"
5016-
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
5017-
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
5015+
version "4.17.23"
5016+
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.23.tgz#f113b0378386103be4f6893388c73d0bde7f2c5a"
5017+
integrity sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==
50185018

50195019
log-symbols@^2.2.0:
50205020
version "2.2.0"

samples-old/TodosFeed/TodosFeed/yarn.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1481,9 +1481,9 @@ acorn@^7.1.0:
14811481
integrity sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==
14821482

14831483
ajv@^6.10.0, ajv@^6.10.2, ajv@^6.5.5:
1484-
version "6.12.6"
1485-
resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
1486-
integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
1484+
version "6.14.0"
1485+
resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.14.0.tgz#fd067713e228210636ebb08c60bd3765d6dbe73a"
1486+
integrity sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==
14871487
dependencies:
14881488
fast-deep-equal "^3.1.1"
14891489
fast-json-stable-stringify "^2.0.0"
@@ -4793,9 +4793,9 @@ lodash.unescape@4.0.1:
47934793
integrity sha1-vyJJiGzlFM2hEvrpIYzcBlIR/Jw=
47944794

47954795
lodash@^4.17.10, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.3.0:
4796-
version "4.17.21"
4797-
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
4798-
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
4796+
version "4.17.23"
4797+
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.23.tgz#f113b0378386103be4f6893388c73d0bde7f2c5a"
4798+
integrity sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==
47994799

48004800
log-symbols@^2.2.0:
48014801
version "2.2.0"

0 commit comments

Comments
 (0)