Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug-report-documentation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ body:
- type: markdown
attributes:
value: |
This repo contains the source for the [React Native for Windows + macOS website](https://aka.ms/reactnative), as well as various [code samples](https://github.com/microsoft/react-native-windows-samples/tree/main/samples) for those platforms. Issues on this repo should be constrained to problems/suggestions for the website and the samples. If you have an issue with the platforms themselves, you can file your issues here:
This repo contains the source for the [React Native for Windows website](https://aka.ms/reactnative), as well as various [code samples](https://github.com/microsoft/react-native-windows-samples/tree/main/samples) for those platforms. Issues on this repo should be constrained to problems/suggestions for the website and the samples. If you have an issue with the platforms themselves, you can file your issues here:
- [React Native for Windows](https://github.com/microsoft/react-native-windows/issues/new/choose)
- [React Native for macOS](https://github.com/microsoft/react-native-macos/issues/new/choose)

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug-report-sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ body:
- type: markdown
attributes:
value: |
This repo contains the source for the [React Native for Windows + macOS website](https://aka.ms/reactnative), as well as various [code samples](https://github.com/microsoft/react-native-windows-samples/tree/main/samples) for those platforms. Issues on this repo should be constrained to problems/suggestions for the website and the samples. If you have an issue with the platforms themselves, you can file your issues here:
This repo contains the source for the [React Native for Windows website](https://aka.ms/reactnative), as well as various [code samples](https://github.com/microsoft/react-native-windows-samples/tree/main/samples) for those platforms. Issues on this repo should be constrained to problems/suggestions for the website and the samples. If you have an issue with the platforms themselves, you can file your issues here:
- [React Native for Windows](https://github.com/microsoft/react-native-windows/issues/new/choose)
- [React Native for macOS](https://github.com/microsoft/react-native-macos/issues/new/choose)

Expand Down
22 changes: 1 addition & 21 deletions docs/hermes.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
id: hermes
title: Hermes on Windows + macOS
title: Hermes on Windows
---

![Architecture](https://img.shields.io/badge/architecture-new_&_old-green)
Expand Down Expand Up @@ -45,26 +45,6 @@ To revert back to using Chakra, set the `UseHermes` property to `false` in the `

- Hermes dll is not signed by Microsoft.

## Hermes on macOS

Hermes is available on React Native for macOS, provided you are using version 0.62 or higher.
To learn how to upgrade to the latest version, check out the **Upgrading** section of the [macOS Getting Started guide](rnm-getting-started.md).

After you have upgraded to the latest version of React Native for macOS, install and add the following:

1. Install the npm package `yarn add 'hermes-engine-darwin@^0.4.3'`
2. Add (or uncomment) the following pod dependencies to your macOS target in your `Podfile`:<br>

```
pod 'React-Core/Hermes', :path => '../node_modules/react-native-macos/'
pod 'hermes', :path => '../node_modules/hermes-engine-darwin'
pod 'libevent', :podspec => '../node_modules/react-native-macos/third-party-podspecs/libevent.podspec'
```

3. Run `pod install`

> Be sure to set your target's deployment target to at least 10.14 before running `pod install`

## Hermes Inspector

*React Native for Windows* with *Hermes engine* supports direct JavaScript runtime inspection using tools such as Chrome or [Edge `devtools`](https://docs.microsoft.com/microsoft-edge/devtools-guide-chromium/), [`VSCode` debugger](https://code.visualstudio.com/Docs/editor/debugging), [Flipper](https://fbflipper.com/) etc. by implementing an in-process Chrome Debug Protocol server.
Expand Down
28 changes: 0 additions & 28 deletions docs/rnm-dependencies.md

This file was deleted.

50 changes: 0 additions & 50 deletions docs/rnm-getting-started.md

This file was deleted.

5 changes: 1 addition & 4 deletions website/core/Footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,10 @@ class Footer extends React.Component {
</a>
</div>
<div>
<h5>React Native for Windows + macOS Docs</h5>
<h5>React Native for Windows Docs</h5>
<div style={{color: 'white', fontWeight: 500, fontSize: 16}}>
<a href={this.props.config.baseUrl + "docs/getting-started"}>Get Started with Windows</a>
</div>
<div style={{color: 'white', fontWeight: 500, fontSize: 16}}>
<a href={this.props.config.baseUrl + "docs/rnm-getting-started"}> Get Started with macOS</a>
</div>
<a href={this.props.config.baseUrl + "docs/parity-status"}>
React Native Windows Components and APIs
</a>
Expand Down
67 changes: 30 additions & 37 deletions website/pages/en/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,22 @@ const textContent = {
windowsintro: `
Take your apps across PC, Xbox, Surface Tablets, and dual-screens with our robust Windows extension to React Native.
`,
macintro: `
Extend your desktop experience to more than just Windows!<br>
Try out our fully supported macOS extension to React Native.
`,
intro: `
## Bring your <u>[React Native]</u> apps to some of the most powerful devices out there

[React Native]: https://reactnative.dev/
`,
about: `
**React Native for Windows + macOS brings React Native support for the
[Windows SDK] as well as the [macOS 10.14 SDK]**. With this, you can use JavaScript to build native
**React Native for Windows brings React Native support for the
[Windows SDK]**. With this, you can use JavaScript to build native
Windows apps for [all devices supported by Windows 10 and higher] including PCs,
tablets, 2-in-1s, Xbox, Mixed reality devices, etc., as well as the macOS desktop and laptop ecosystems.
tablets, 2-in-1s, Xbox, Mixed reality devices, etc.

Some build-time tools will send telemetry to Microsoft by default. No telemetry is collected or transmitted in the final app. You can prevent the telemetry from being sent by using the --no-telemetry command line option. See the --help command or README file for more details.

[React Native]: https://reactnative.dev/
[React]: https://reactjs.org/
[Windows SDK]: https://developer.microsoft.com/windows/downloads/windows-sdk/
[macOS 10.14 SDK]: https://developer.apple.com/documentation/macos-release-notes/macos-mojave-10_14-release-notes
[all devices supported by Windows 10 and higher]: https://docs.microsoft.com/windows/apps/get-started/?tabs=rnw
`,
resources: `
Expand Down Expand Up @@ -93,6 +88,16 @@ class Index extends React.Component {
</a>
);

const LinkButton = ({ link, text, secondary = false }) => (
<a
className={`ActionButton ${secondary ? 'secondary' : 'primary'}`}
href={link}
target="_self"
>
<b style={{ fontSize: secondary ? 20 : 24 }}>{text}</b>
</a>
);

const VideoCardItem = ({
videolength,
videotitle,
Expand Down Expand Up @@ -233,7 +238,7 @@ class Index extends React.Component {
columnTwo={
<React.Fragment>
<h1 className="title">React Native for</h1>
<p className="tagline">Windows + macOS</p>
<p className="tagline">Windows</p>
</React.Fragment>
}
/>
Expand All @@ -243,7 +248,7 @@ class Index extends React.Component {
const About = () => (
<Section background="light">
<div className="content">
<Heading text="About React Native for Windows + macOS" />
<Heading text="About React Native for Windows" />
<MarkdownBlock>{textContent.about}</MarkdownBlock>
</div>
</Section>
Expand Down Expand Up @@ -290,33 +295,21 @@ class Index extends React.Component {
</Section>
);

const MacIntro = () => (
<Section background="light">
<div className="content">
<div className="row">
<div className="column">
<Heading text="Build for macOS" />
<GitHubButtonmacOS />
<div style={{ marginBottom: 35 }}>
<MarkdownBlock>{textContent.macintro}</MarkdownBlock>
</div>
<GetStartedButton
pageName="rnm-getting-started"
platformName="macOS"
/>
</div>
<div className="column">
<img
className="HomePageImage"
style={{ maxWidth: "200%", marginTop: -70, marginBottom: -70 }}
src="./img/homepage/native_and_js_mac_cropped.png"
alt="rnw_cropped"
/>
</div>
</div>
</div>
</Section>
const MacLink = () => {
return (
<div style={{
display: 'flex',
justifyContent: 'center',
margin: '3rem 0'
}}>
<LinkButton
link="https://microsoft.github.io/react-native-macos"
text="Interested in macOS?"
secondary={true}
/>
</div>
);
}

const Resources = () => (
<Section background="tint">
Expand Down Expand Up @@ -377,9 +370,9 @@ class Index extends React.Component {
<HeaderHero />
<Intro />
<WindowsIntro />
<MacIntro />
{/*<Tutorials/>*/}
<About />
<MacLink />
</div>
);
}
Expand Down
4 changes: 0 additions & 4 deletions website/sidebars.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@
"hermes",
"NuGet"
],
"The Basics (MacOS)": [
"rnm-getting-started",
"rnm-dependencies"
],
"Troubleshooting": [
"debugging-javascript",
"metro-config-out-tree-platforms"
Expand Down
8 changes: 6 additions & 2 deletions website/siteConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ const defaultVersionShown = "0.79";
const repoUrl = "https://github.com/microsoft/react-native-windows";

const siteConfig = {
title: "React Native for Windows + macOS",
tagline: "Build native Windows & macOS apps with Javascript and React",
title: "React Native for Windows",
tagline: "Build native Windows apps with Javascript and React",
url: "https://microsoft.github.io",
baseUrl: "/react-native-windows/",
repoUrl,
Expand Down Expand Up @@ -98,6 +98,10 @@ const siteConfig = {
customFields: require("./showcaseApps.json"),

deletedDocs: {
"0.80": [
"rnm-dependencies",
"rnm-getting-started"
],
"0.75": [
"nuget-update",
],
Expand Down