Skip to content

Commit afa663a

Browse files
authored
Merge branch 'master' into concurrent-mode-patterns
2 parents 90453e9 + 702e095 commit afa663a

File tree

104 files changed

+247
-103
lines changed

Some content is hidden

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

104 files changed

+247
-103
lines changed

content/blog/2016-07-13-mixins-considered-harmful.md

+1-1

content/blog/2020-02-26-react-v16.13.0.md

+1-1

content/community/meetups.md

+1

content/community/team.md

+13-13

content/docs/release-channels.md

+2

content/images/team/rickhanlonii.jpg

278 KB

content/images/team/sethwebster.jpg

301 KB

flow-typed/gatsby.js

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/**
2+
* Copyright (c) Facebook, Inc. and its affiliates.
3+
*/
4+
15
declare module 'gatsby' {
26
declare module.exports: any;
37
}

flow-typed/glamor.js

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/**
2+
* Copyright (c) Facebook, Inc. and its affiliates.
3+
*/
4+
15
declare module 'glamor' {
26
declare module.exports: {
37
css: {

flow-typed/hex2rgba.js

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/**
2+
* Copyright (c) Facebook, Inc. and its affiliates.
3+
*/
4+
15
declare module 'hex2rgba' {
26
declare module.exports: (hex: string, alpha?: number) => string;
37
}

flow-typed/react-helmet.js

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/**
2+
* Copyright (c) Facebook, Inc. and its affiliates.
3+
*/
4+
15
declare module 'react-helmet' {
26
declare module.exports: any;
37
}

flow-typed/slugify.js

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/**
2+
* Copyright (c) Facebook, Inc. and its affiliates.
3+
*/
4+
15
declare module 'slugify' {
26
declare module.exports: any;
37
}

gatsby-browser.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2013-present, Facebook, Inc.
2+
* Copyright (c) Facebook, Inc. and its affiliates.
33
*
44
* @emails react-core
55
*/

gatsby-config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2013-present, Facebook, Inc.
2+
* Copyright (c) Facebook, Inc. and its affiliates.
33
*
44
* @emails react-core
55
*/

gatsby-node.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2013-present, Facebook, Inc.
2+
* Copyright (c) Facebook, Inc. and its affiliates.
33
*
44
* @emails react-core
55
*/

gatsby/createPages.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2013-present, Facebook, Inc.
2+
* Copyright (c) Facebook, Inc. and its affiliates.
33
*
44
* @emails react-core
55
*/

gatsby/onCreateNode.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2013-present, Facebook, Inc.
2+
* Copyright (c) Facebook, Inc. and its affiliates.
33
*
44
* @emails react-core
55
*/

gatsby/onCreatePage.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2013-present, Facebook, Inc.
2+
* Copyright (c) Facebook, Inc. and its affiliates.
33
*
44
* @emails react-core
55
*/

gatsby/onCreateWebpackConfig.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2013-present, Facebook, Inc.
2+
* Copyright (c) Facebook, Inc. and its affiliates.
33
*
44
* @emails react-core
55
*/

plugins/gatsby-remark-header-custom-ids/gatsby-client.js

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/**
2+
* Copyright (c) Facebook, Inc. and its affiliates.
3+
*/
4+
15
let offsetY = 0;
26

37
const getTargetOffset = hash => {

plugins/gatsby-remark-header-custom-ids/gatsby-ssr.js

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/**
2+
* Copyright (c) Facebook, Inc. and its affiliates.
3+
*/
4+
15
const React = require(`react`);
26

37
const pluginDefaults = {

plugins/gatsby-remark-header-custom-ids/index.js

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/**
2+
* Copyright (c) Facebook, Inc. and its affiliates.
3+
*/
4+
15
/*!
26
* Based on 'gatsby-remark-autolink-headers'
37
* Original Author: Kyle Mathews <[email protected]>

plugins/gatsby-remark-use-jsx/index.js

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/**
2+
* Copyright (c) Facebook, Inc. and its affiliates.
3+
*/
4+
15
const visit = require('unist-util-visit');
26

37
// Always treat JS blocks as JSX.

plugins/gatsby-source-react-error-codes/gatsby-node.js

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/**
2+
* Copyright (c) Facebook, Inc. and its affiliates.
3+
*/
4+
15
const request = require('request-promise');
26

37
const errorCodesUrl =

plugins/gatsby-transformer-authors-yaml/gatsby-node.js

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/**
2+
* Copyright (c) Facebook, Inc. and its affiliates.
3+
*/
4+
15
const readFileSync = require('fs').readFileSync;
26
const resolve = require('path').resolve;
37
const safeLoad = require('js-yaml').safeLoad;

plugins/gatsby-transformer-home-example-code/gatsby-node.js

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/**
2+
* Copyright (c) Facebook, Inc. and its affiliates.
3+
*/
4+
15
const crypto = require('crypto');
26
const path = require('path');
37

plugins/gatsby-transformer-versions-yaml/create-redirects.js

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/**
2+
* Copyright (c) Facebook, Inc. and its affiliates.
3+
*/
4+
15
const {appendFile, exists, readFile, writeFile} = require('fs-extra');
26

37
const HEADER_COMMENT = `## Created with gatsby-transformer-versions-yaml`;

plugins/gatsby-transformer-versions-yaml/gatsby-node.js

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/**
2+
* Copyright (c) Facebook, Inc. and its affiliates.
3+
*/
4+
15
const readFileSync = require('fs').readFileSync;
26
const resolve = require('path').resolve;
37
const safeLoad = require('js-yaml').safeLoad;

scripts/generateHeadingIDs.js

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/**
2+
* Copyright (c) Facebook, Inc. and its affiliates.
3+
*/
4+
15
const fs = require('fs');
26
const GithubSlugger = require('github-slugger');
37

src/components/ButtonLink/ButtonLink.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2013-present, Facebook, Inc.
2+
* Copyright (c) Facebook, Inc. and its affiliates.
33
*
44
* @emails react-core
55
*/

src/components/ButtonLink/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2013-present, Facebook, Inc.
2+
* Copyright (c) Facebook, Inc. and its affiliates.
33
*
44
* @emails react-core
55
*/

src/components/CodeEditor/CodeEditor.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2013-present, Facebook, Inc.
2+
* Copyright (c) Facebook, Inc. and its affiliates.
33
*
44
* @emails react-core
55
*/

src/components/CodeEditor/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2013-present, Facebook, Inc.
2+
* Copyright (c) Facebook, Inc. and its affiliates.
33
*
44
* @emails react-core
55
*/

src/components/CodeExample/CodeExample.js

+15-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,23 @@
1+
/**
2+
* Copyright (c) Facebook, Inc. and its affiliates.
3+
*
4+
* @flow
5+
*/
6+
17
import React, {Component} from 'react';
2-
import PropTypes from 'prop-types';
38

49
import {colors, media} from 'theme';
510
import CodeEditor from '../CodeEditor/CodeEditor';
611

7-
class CodeExample extends Component {
12+
type Props = {|
13+
children: React$Node,
14+
code: boolean,
15+
containerNodeID: string,
16+
id: string,
17+
loaded: boolean,
18+
|};
19+
20+
class CodeExample extends Component<Props> {
821
render() {
922
const {children, code, id, containerNodeID, loaded} = this.props;
1023
return (
@@ -68,10 +81,4 @@ class CodeExample extends Component {
6881
}
6982
}
7083

71-
CodeExample.propTypes = {
72-
children: PropTypes.node,
73-
code: PropTypes.string.isRequired,
74-
loaded: PropTypes.bool.isRequired,
75-
};
76-
7784
export default CodeExample;

src/components/CodeExample/index.js

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
/**
2+
* Copyright (c) Facebook, Inc. and its affiliates.
3+
*
4+
* @flow
5+
*/
6+
17
import CodeExample from './CodeExample';
28

39
export default CodeExample;

src/components/Container/Container.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2013-present, Facebook, Inc.
2+
* Copyright (c) Facebook, Inc. and its affiliates.
33
*
44
* @emails react-core
55
* @flow

src/components/Container/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2013-present, Facebook, Inc.
2+
* Copyright (c) Facebook, Inc. and its affiliates.
33
*
44
* @emails react-core
55
*/

src/components/ErrorDecoder/ErrorDecoder.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2013-present, Facebook, Inc.
2+
* Copyright (c) Facebook, Inc. and its affiliates.
33
*
44
* @emails react-core
55
* @flow

src/components/ErrorDecoder/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2013-present, Facebook, Inc.
2+
* Copyright (c) Facebook, Inc. and its affiliates.
33
*
44
* @emails react-core
55
*/

src/components/Flex/Flex.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2013-present, Facebook, Inc.
2+
* Copyright (c) Facebook, Inc. and its affiliates.
33
*
44
* @emails react-core
55
* @flow

src/components/Flex/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2013-present, Facebook, Inc.
2+
* Copyright (c) Facebook, Inc. and its affiliates.
33
*
44
* @emails react-core
55
*/

src/components/Header/Header.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2013-present, Facebook, Inc.
2+
* Copyright (c) Facebook, Inc. and its affiliates.
33
*
44
* @emails react-core
55
* @flow

src/components/Header/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2013-present, Facebook, Inc.
2+
* Copyright (c) Facebook, Inc. and its affiliates.
33
*
44
* @emails react-core
55
*/

0 commit comments

Comments
 (0)