Skip to content

Commit 37d2089

Browse files
authored
Merge branch 'master' into dom-attributes-in-react-16-continuation
2 parents 0a6f6e2 + 6a67abe commit 37d2089

File tree

224 files changed

+12423
-7869
lines changed

Some content is hidden

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

224 files changed

+12423
-7869
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ version: 2
22
jobs:
33
build:
44
docker:
5-
- image: circleci/node:8
5+
- image: circleci/node:12
66
steps:
77
- checkout
88
- restore_cache:
99
keys:
10-
- dependencies-{{ checksum "yarn.lock" }}
10+
- dependencies-{{ checksum "yarn.lock" }}
1111
- run:
1212
name: Install
1313
command: yarn install --pure-lockfile

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
2-
31
<!--
42
53
Thank you for the PR! Contributors like you keep React awesome!

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
lts/carbon
1+
12.16.1

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ This repo contains the source code and documentation powering [reactjs.org](http
77
### Prerequisites
88

99
1. Git
10-
1. Node: any 8.x version starting with 8.4.0 or greater
10+
1. Node: any 12.x version starting with v12.0.0 or greater
1111
1. Yarn: See [Yarn website for installation instructions](https://yarnpkg.com/lang/en/docs/install/)
1212
1. A fork of the repo (for any contributions)
1313
1. A clone of the [reactjs.org repo](https://github.com/reactjs/reactjs.org) on your local machine
@@ -36,7 +36,7 @@ The documentation is divided into several sections with a different tone and pur
3636

3737
### Make the change
3838

39-
1. Follow the "Running locally" instructions
39+
1. Follow the ["Running locally"](#running-locally) instructions
4040
1. Save the files and check in the browser
4141
1. Changes to React components in `src` will hot-reload
4242
1. Changes to markdown files in `content` will hot-reload

content/authors.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,15 @@ keyanzhang:
4949
kmeht:
5050
name: Kunal Mehta
5151
url: https://github.com/kmeht
52+
laurentan:
53+
name: Lauren Tan
54+
url: https://twitter.com/sugarpirate_
5255
LoukaN:
5356
name: Lou Husson
5457
url: https://twitter.com/loukan42
58+
lunaruan:
59+
name: Luna Ruan
60+
url: https://twitter.com/lunaruan
5561
matthewjohnston4:
5662
name: Matthew Johnston
5763
url: https://github.com/matthewathome
@@ -61,6 +67,9 @@ nhunzaker:
6167
petehunt:
6268
name: Pete Hunt
6369
url: https://twitter.com/floydophone
70+
rachelnabors:
71+
name: Rachel Nabors
72+
url: https://twitter.com/rachelnabors
6473
schrockn:
6574
name: Nick Schrock
6675
url: https://twitter.com/schrockn
@@ -76,6 +85,9 @@ steveluscher:
7685
tesseralis:
7786
name: Nat Alison
7887
url: https://twitter.com/tesseralis
88+
threepointone:
89+
name: Sunil Pai
90+
url: https://twitter.com/threepointone
7991
timer:
8092
name: Joe Haddad
8193
url: https://twitter.com/timer150
@@ -90,4 +102,4 @@ zpao:
90102
url: https://twitter.com/zpao
91103
tomocchino:
92104
name: Tom Occhino
93-
url: https://twitter.com/tomocchino
105+
url: https://twitter.com/tomocchino

content/blog/2013-06-19-community-roundup-2.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Since the launch we have received a lot of feedback and are actively working on
99

1010
[Andrew Greig](http://www.andrewgreig.com/) made a blog post that gives a high level description of what React is.
1111

12-
> I have been using Facebooks recently released JavaScript framework called React.js for the last few days and have managed to obtain a rather high level understanding of how it works and formed a good perspective on how it fits in to the entire javascript framework ecosystem.
12+
> I have been using Facebook's recently released JavaScript framework called React.js for the last few days and have managed to obtain a rather high level understanding of how it works and formed a good perspective on how it fits in to the entire javascript framework ecosystem.
1313
>
1414
> Basically, React is not an MVC framework. It is not a replacement for Backbone or Knockout or Angular, instead it is designed to work with existing frameworks and help extend their functionality.
1515
>

content/blog/2013-10-16-react-v0.5.0.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ It's been awesome to see the things that people are building with React, and we
3434
* Added `React.version`.
3535
* Added `React.isValidClass` - Used to determine if a value is a valid component constructor.
3636
* Removed `React.autoBind` - This was deprecated in v0.4 and now properly removed.
37-
* Renamed `React.unmountAndReleaseReactRootNode` to `React.unmountComponentAtNode`.
37+
* Renamed `React.unmountAndReleaseReactRootNode` to `React.unmountComponentAtNode`.
3838
* Began laying down work for refined performance analysis.
3939
* Better support for server-side rendering - [react-page](https://github.com/facebook/react-page) has helped improve the stability for server-side rendering.
4040
* Made it possible to use React in environments enforcing a strict [Content Security Policy](https://developer.mozilla.org/en-US/docs/Security/CSP/Introducing_Content_Security_Policy). This also makes it possible to use React to build Chrome extensions.

content/blog/2015-03-26-introducing-react-native.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ For more details, see [Tom Occhino's post on the Facebook Engineering blog](http
1313
>
1414
> *It's worth noting that we're not chasing “write once, run anywhere.” Different platforms have different looks, feels, and capabilities, and as such, we should still be developing discrete apps for each platform, but the same set of engineers should be able to build applications for whatever platform they choose, without needing to learn a fundamentally different set of technologies for each. We call this approach “learn once, write anywhere.”*
1515
16-
To learn more, visit the [React Native website](https://facebook.github.io/react-native/).
16+
To learn more, visit the [React Native website](https://reactnative.dev/).

content/blog/2015-05-01-graphql-introduction.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: "GraphQL Introduction"
33
author: [schrockn]
44
---
55

6-
At the React.js conference in late January 2015, we revealed our next major technology in the React family: [Relay](http://facebook.github.io/react/blog/2015/02/20/introducing-relay-and-graphql.html).
6+
At the React.js conference in late January 2015, we revealed our next major technology in the React family: [Relay](/blog/2015/02/20/introducing-relay-and-graphql.html).
77

88
Relay is a new way of structuring client applications that co-locates data-fetching requirements and React components. Instead of placing data fetching logic in some other part of the client application – or embedding this logic in a custom endpoint on the server – we instead co-locate a *declarative* data-fetching specification alongside the React component. The language of this declarative specification is GraphQL.
99

content/blog/2015-09-02-new-react-developer-tools.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ It contains a handful of new features, including:
2020

2121
## Installation {#installation}
2222

23-
Download the new devtools from the [Chrome Web Store](https://chrome.google.com/webstore/detail/react-developer-tools/fmkadmapgofadopljbjfkapdkoienihi) and on [Firefox Add-ons](https://addons.mozilla.org/en-US/firefox/addon/react-devtools/) for Firefox. If you're developing using React, we highly recommend installing these devtools.
23+
Download the new devtools from the [Chrome Web Store](https://chrome.google.com/webstore/detail/react-developer-tools/fmkadmapgofadopljbjfkapdkoienihi), [Firefox Add-ons](https://addons.mozilla.org/en-US/firefox/addon/react-devtools/) for Firefox, and [Microsoft Edge Addons](https://microsoftedge.microsoft.com/addons/detail/gpphkfbcpidddadnkolkpfckpihlkkil) for Edge. If you're developing using React, we highly recommend installing these devtools.
2424

2525
If you already have the Chrome extension installed, it should autoupdate within the next week. You can also head to `chrome://extensions` and click "Update extensions now" if you'd like to get the new version today. If you installed the devtools beta, please remove it and switch back to the version from the store to make sure you always get the latest updates and bug fixes.
2626

27-
If you run into any issues, please post them on our [react-devtools GitHub repo](https://github.com/facebook/react-devtools).
27+
If you run into any issues, please post them on the [React GitHub repo](https://github.com/facebook/react).

0 commit comments

Comments
 (0)