From a14c5b949c2296d358f8119fa21b788557e47b77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juho=20Veps=C3=A4l=C3=A4inen?= Date: Tue, 23 Apr 2019 12:07:30 +0300 Subject: [PATCH 01/14] docs: Add React Finland 2019 (#1934) --- content/community/conferences.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/content/community/conferences.md b/content/community/conferences.md index 356600394..e8e727ee7 100644 --- a/content/community/conferences.md +++ b/content/community/conferences.md @@ -12,6 +12,11 @@ Do you know of a local React.js conference? Add it here! (Please keep the list c ## Upcoming Conferences {#upcoming-conferences} +### React Finland 2019 {#react-finland-2019} +April 24-26 in Helsinki, Finland + +[Website](https://react-finland.fi/) - [Twitter](https://twitter.com/ReactFinland) + ### ReactJS Girls Conference May 3, 2019 in London, UK From f0d1a0112090e9febe31b39b4172c2b8c1c7be90 Mon Sep 17 00:00:00 2001 From: Stepan Date: Tue, 23 Apr 2019 20:48:21 +0300 Subject: [PATCH 02/14] =?UTF-8?q?links=20Get=20started=20and=20Take=20the?= =?UTF-8?q?=20Tutorial=20have=20been=20relocated=20in=20mobile=E2=80=A6=20?= =?UTF-8?q?(#1857)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/index.js | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/src/pages/index.js b/src/pages/index.js index 790efd439..976fddb07 100644 --- a/src/pages/index.js +++ b/src/pages/index.js @@ -62,7 +62,7 @@ class Home extends Component {
- + Get Started @@ -312,8 +321,6 @@ Home.propTypes = { const CtaItem = ({children, primary = false}) => (
( '&:first-child': { textAlign: 'right', - paddingRight: 15, + paddingRight: 7, + paddingLeft: 7, + [media.lessThan('small')]: { + marginBottom: 10, + }, }, '&:nth-child(2)': { + paddingRight: 7, + paddingLeft: 7, [media.greaterThan('small')]: { paddingLeft: 15, }, + [media.lessThan('small')]: { + marginBottom: 10, + }, }, }}> {children} From 59be66f3a8d469455bd70fa6818279745c4943a7 Mon Sep 17 00:00:00 2001 From: BrainBoxBrown Date: Wed, 24 Apr 2019 15:57:49 +1000 Subject: [PATCH 03/14] Changed unicode hyphen to normal hyphen (#1927) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When copy and pasting `npm install jest-cli —save-dev` you get this error `Invalid tag name "—save-dev": Tags may not have any characters that encodeURIComponent encodes` I replaced the unicode characters '—' with ascii hypens '-' --- content/blog/2014-09-24-testing-flux-applications.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/blog/2014-09-24-testing-flux-applications.md b/content/blog/2014-09-24-testing-flux-applications.md index 0986c7653..5721e3b42 100644 --- a/content/blog/2014-09-24-testing-flux-applications.md +++ b/content/blog/2014-09-24-testing-flux-applications.md @@ -17,7 +17,7 @@ The first steps toward working with Jest are as follows: 1. Get the module dependencies for the application installed by running `npm install`. 2. Create a directory `__tests__/` with a test file, in this case TodoStore-test.js -3. Run `npm install jest-cli —save-dev` +3. Run `npm install jest-cli --save-dev` 4. Add the following to your package.json ```javascript From 7be4caf21079345a2bf957c904f7493e782ff9bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Antonio=20Chio?= Date: Wed, 24 Apr 2019 02:02:43 -0400 Subject: [PATCH 04/14] Update ESLint Plugin installation command (#1758) --- content/docs/hooks-rules.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/docs/hooks-rules.md b/content/docs/hooks-rules.md index dbac9cffd..625d1e4d5 100644 --- a/content/docs/hooks-rules.md +++ b/content/docs/hooks-rules.md @@ -28,7 +28,7 @@ By following this rule, you ensure that all stateful logic in a component is cle We released an ESLint plugin called [`eslint-plugin-react-hooks`](https://www.npmjs.com/package/eslint-plugin-react-hooks) that enforces these two rules. You can add this plugin to your project if you'd like to try it: ```bash -npm install eslint-plugin-react-hooks +npm install eslint-plugin-react-hooks --save-dev ``` ```js From dd6317f3bd1ebbe54dbf92e4fbfd4b0c130ebc8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20De=20Boey?= Date: Wed, 24 Apr 2019 08:07:53 +0200 Subject: [PATCH 05/14] Update 2019-02-06-react-v16.8.0.md (#1634) You can just normal install `eslint-plugin-react-hooks` --- content/blog/2019-02-06-react-v16.8.0.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/blog/2019-02-06-react-v16.8.0.md b/content/blog/2019-02-06-react-v16.8.0.md index 3af12da7d..ef7641fb2 100644 --- a/content/blog/2019-02-06-react-v16.8.0.md +++ b/content/blog/2019-02-06-react-v16.8.0.md @@ -140,10 +140,10 @@ Assuming you already have ESLint installed, run: ```sh # npm -npm install eslint-plugin-react-hooks@next --save-dev +npm install eslint-plugin-react-hooks --save-dev # yarn -yarn add eslint-plugin-react-hooks@next --dev +yarn add eslint-plugin-react-hooks --dev ``` Then add it to your ESLint configuration: From dcfc0bbb105069817fa73462e80b20c357b8422b Mon Sep 17 00:00:00 2001 From: Quentin Bahers Date: Wed, 24 Apr 2019 08:12:33 +0200 Subject: [PATCH 06/14] Fix the "Releases" link in the "Getting Started" page (#1530) --- content/docs/getting-started.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/docs/getting-started.md b/content/docs/getting-started.md index 37972e83e..672a1812b 100644 --- a/content/docs/getting-started.md +++ b/content/docs/getting-started.md @@ -115,7 +115,7 @@ The [React blog](/blog/) is the official source for the updates from the React t You can also follow the [@reactjs account](https://twitter.com/reactjs) on Twitter, but you won't miss anything essential if you only read the blog. -Not every React release deserves its own blog post, but you can find a detailed changelog for every release [in the `CHANGELOG.md` file in the React repository](https://github.com/facebook/react/blob/master/CHANGELOG.md), as well as on the [Releases](https://github.com/facebook/react) page. +Not every React release deserves its own blog post, but you can find a detailed changelog for every release [in the `CHANGELOG.md` file in the React repository](https://github.com/facebook/react/blob/master/CHANGELOG.md), as well as on the [Releases](https://github.com/facebook/react/releases) page. ## Versioned Documentation {#versioned-documentation} From 621f4c87bdb422f6b58324e3aa355c70e671426a Mon Sep 17 00:00:00 2001 From: renato <32328921+prime-time@users.noreply.github.com> Date: Tue, 23 Apr 2019 23:14:39 -0700 Subject: [PATCH 07/14] lowercase link to React.createElement section (#1509) --- content/docs/reference-react.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/docs/reference-react.md b/content/docs/reference-react.md index d506a1ad3..0861b58d9 100644 --- a/content/docs/reference-react.md +++ b/content/docs/reference-react.md @@ -198,7 +198,7 @@ This API was introduced as a replacement of the deprecated `React.addons.cloneWi React.createFactory(type) ``` -Return a function that produces React elements of a given type. Like [`React.createElement()`](#createElement), the type argument can be either a tag name string (such as `'div'` or `'span'`), a [React component](/docs/components-and-props.html) type (a class or a function), or a [React fragment](#reactfragment) type. +Return a function that produces React elements of a given type. Like [`React.createElement()`](#createelement), the type argument can be either a tag name string (such as `'div'` or `'span'`), a [React component](/docs/components-and-props.html) type (a class or a function), or a [React fragment](#reactfragment) type. This helper is considered legacy, and we encourage you to either use JSX or use `React.createElement()` directly instead. From a2d69c68aed8360eeca2543338893a455eb98c68 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Date: Wed, 24 Apr 2019 11:49:42 +0530 Subject: [PATCH 08/14] Update create-a-new-react-app.md (#1400) Fixes typo flexiblity --- content/docs/create-a-new-react-app.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/docs/create-a-new-react-app.md b/content/docs/create-a-new-react-app.md index e1985e72f..8348e8ef8 100644 --- a/content/docs/create-a-new-react-app.md +++ b/content/docs/create-a-new-react-app.md @@ -69,7 +69,7 @@ Learn Gatsby from [its official guide](https://www.gatsbyjs.org/docs/) and a [ga ### More Flexible Toolchains {#more-flexible-toolchains} -The following toolchains offer more flexiblity and choice. We recommend them to more experienced users: +The following toolchains offer more flexibility and choice. We recommend them to more experienced users: - **[Neutrino](https://neutrinojs.org/)** combines the power of [webpack](https://webpack.js.org/) with the simplicity of presets, and includes a preset for [React apps](https://neutrinojs.org/packages/react/) and [React components](https://neutrinojs.org/packages/react-components/). From 8e0a8af0451fa67b1d508913cc4504e01ea9b777 Mon Sep 17 00:00:00 2001 From: Shreyans Jain Date: Wed, 24 Apr 2019 08:31:27 +0200 Subject: [PATCH 09/14] Update link for "import SVG as a component" (#1360) --- content/blog/2018-10-01-create-react-app-v2.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/blog/2018-10-01-create-react-app-v2.md b/content/blog/2018-10-01-create-react-app-v2.md index 31a7e16b9..c35e90106 100644 --- a/content/blog/2018-10-01-create-react-app-v2.md +++ b/content/blog/2018-10-01-create-react-app-v2.md @@ -25,7 +25,7 @@ Here's a short summary of what's new in this release: * 🃏 We updated to [Jest 23](https://jestjs.io/blog/2018/05/29/jest-23-blazing-fast-delightful-testing.html), which includes an [interactive mode](https://jestjs.io/blog/2018/05/29/jest-23-blazing-fast-delightful-testing#interactive-snapshot-mode) for reviewing snapshots. * 💄 We added [PostCSS](https://preset-env.cssdb.org/features#stage-3) so you can use new CSS features in old browsers. * 💎 You can use [Apollo](https://github.com/leoasis/graphql-tag.macro#usage), [Relay Modern](https://github.com/facebook/relay/pull/2171#issuecomment-411459604), [MDX](https://github.com/facebook/create-react-app/issues/5149#issuecomment-425396995), and other third-party [Babel Macros](https://babeljs.io/blog/2017/09/11/zero-config-with-babel-macros) transforms. -* 🌠 You can now [import an SVG as a React component](https://github.com/facebook/create-react-app/blob/master/packages/react-scripts/template/README.md#adding-svgs), and use it in JSX. +* 🌠 You can now [import an SVG as a React component](https://facebook.github.io/create-react-app/docs/adding-images-fonts-and-files#adding-svgs), and use it in JSX. * 🐈 You can try the experimental [Yarn Plug'n'Play mode](https://github.com/yarnpkg/rfcs/pull/101) that removes `node_modules`. * 🕸 You can now [plug your own proxy implementation](https://github.com/facebook/create-react-app/blob/master/packages/react-scripts/template/README.md#configuring-the-proxy-manually) in development to match your backend API. * 🚀 You can now use [packages written for latest Node versions](https://github.com/sindresorhus/ama/issues/446#issuecomment-281014491) without breaking the build. From f4a67ffdfb32ce150cf4e7fcd735467667db28ab Mon Sep 17 00:00:00 2001 From: Camilo Giraldo Date: Wed, 24 Apr 2019 01:39:54 -0500 Subject: [PATCH 10/14] Fix for 1874 broken link (#1902) --- content/docs/add-react-to-a-website.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/docs/add-react-to-a-website.md b/content/docs/add-react-to-a-website.md index a97b44d45..b103cfae4 100644 --- a/content/docs/add-react-to-a-website.md +++ b/content/docs/add-react-to-a-website.md @@ -149,7 +149,7 @@ return ( These two code snippets are equivalent. While **JSX is [completely optional](/docs/react-without-jsx.html)**, many people find it helpful for writing UI code -- both with React and with other libraries. -You can play with JSX using [this online converter](https://babeljs.io/repl#?babili=false&browsers=&build=&builtIns=false&spec=false&loose=false&code_lz=Q&debug=false&forceAllTransforms=false&shippedProposals=false&circleciRepo=&evaluate=false&fileSize=false&sourceType=module&lineWrap=true&presets=es2015%2Creact%2Cstage-2%2Cstage-3&prettier=true&targets=Node-6.12&version=6.26.0&envVersion=). +You can play with JSX using [this online converter](https://babeljs.io/en/repl#?babili=false&browsers=&build=&builtIns=false&spec=false&loose=false&code_lz=DwIwrgLhD2B2AEcDCAbAlgYwNYF4DeAFAJTw4B88EAFmgM4B0tAphAMoQCGETBe86WJgBMAXJQBOYJvAC-RGWQBQ8FfAAyaQYuAB6cFDhkgA&debug=false&forceAllTransforms=false&shippedProposals=false&circleciRepo=&evaluate=false&fileSize=false&timeTravel=false&sourceType=module&lineWrap=true&presets=es2015%2Creact%2Cstage-2&prettier=false&targets=&version=7.4.3). ### Quickly Try JSX {#quickly-try-jsx} From 29fbb990298f40dcd0566d70054f19937b097504 Mon Sep 17 00:00:00 2001 From: shu_numata Date: Wed, 24 Apr 2019 15:41:01 +0900 Subject: [PATCH 11/14] Fix typo reccommended -> recommended (#1879) --- content/community/articles.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/community/articles.md b/content/community/articles.md index 7ac99209e..53586fe30 100644 --- a/content/community/articles.md +++ b/content/community/articles.md @@ -10,7 +10,7 @@ permalink: community/articles.html - [9 things every React.js beginner should know](https://camjackson.net/post/9-things-every-reactjs-beginner-should-know) - Cam Jackson's guide for beginners. - [React "Aha" Moments](https://tylermcginnis.com/react-aha-moments/) - Tyler McGinnis' article on his collection of "Aha" moments with React. - [You're missing the point of React](https://medium.com/@dan_abramov/youre-missing-the-point-of-react-a20e34a51e1a) - Dan Abramov's article about the best parts of React. -- [Timeline for Learning React](https://daveceddia.com/timeline-for-learning-react/) - Dave Ceddia's reccommended timeline for learning React and the React ecosystem. +- [Timeline for Learning React](https://daveceddia.com/timeline-for-learning-react/) - Dave Ceddia's recommended timeline for learning React and the React ecosystem. - [Simple React Development in 2017](https://hackernoon.com/simple-react-development-in-2017-113bd563691f) - Joshua Comeau's guide to showcase how easy it can be to start modern React development. - [React FAQ](https://reactfaq.site/) - An external site with articles that try to answer frequently asked questions about React. - [Visual Guide to State in React](https://daveceddia.com/visual-guide-to-state-in-react/) - Dave Ceddia's visual guide to React state. From 6bc6e7b1411d4befc3ecfbe45b898ca474116020 Mon Sep 17 00:00:00 2001 From: ANOTHER GUY Date: Tue, 23 Apr 2019 23:43:11 -0700 Subject: [PATCH 12/14] Fix the link so that it navigates to anchor rather (#1816) * Fix the link so that it navigates to anchor rather * Update create-a-new-react-app.md --- content/docs/create-a-new-react-app.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/docs/create-a-new-react-app.md b/content/docs/create-a-new-react-app.md index 8348e8ef8..92799e808 100644 --- a/content/docs/create-a-new-react-app.md +++ b/content/docs/create-a-new-react-app.md @@ -53,7 +53,7 @@ npm start Create React App doesn't handle backend logic or databases; it just creates a frontend build pipeline, so you can use it with any backend you want. Under the hood, it uses [Babel](https://babeljs.io/) and [webpack](https://webpack.js.org/), but you don't need to know anything about them. -When you're ready to deploy to production, running `npm run build` will create an optimized build of your app in the `build` folder. You can learn more about Create React App [from its README](https://github.com/facebookincubator/create-react-app#create-react-app-) and the [User Guide](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#table-of-contents). +When you're ready to deploy to production, running `npm run build` will create an optimized build of your app in the `build` folder. You can learn more about Create React App [from its README](https://github.com/facebookincubator/create-react-app#create-react-app--) and the [User Guide](https://facebook.github.io/create-react-app/). ### Next.js {#nextjs} From 888851df60c0e480fd9cb8b97b8c00923ea01190 Mon Sep 17 00:00:00 2001 From: Wojciech Grzebieniowski Date: Wed, 24 Apr 2019 19:34:45 +0200 Subject: [PATCH 13/14] Resolve conflicts --- content/community/conferences.md | 4 ---- content/docs/add-react-to-a-website.md | 6 +----- content/docs/create-a-new-react-app.md | 6 +----- content/docs/getting-started.md | 6 +----- content/docs/reference-react.md | 6 +----- 5 files changed, 4 insertions(+), 24 deletions(-) diff --git a/content/community/conferences.md b/content/community/conferences.md index 9df2fcdb7..805a82b86 100644 --- a/content/community/conferences.md +++ b/content/community/conferences.md @@ -12,16 +12,12 @@ Do you know of a local React.js conference? Add it here! (Please keep the list c ## Upcoming Conferences {#upcoming-conferences} -<<<<<<< HEAD -### ReactJS Girls Conference {#reactjs-girls-conference} -======= ### React Finland 2019 {#react-finland-2019} April 24-26 in Helsinki, Finland [Website](https://react-finland.fi/) - [Twitter](https://twitter.com/ReactFinland) ### ReactJS Girls Conference ->>>>>>> 6bc6e7b1411d4befc3ecfbe45b898ca474116020 May 3, 2019 in London, UK [Website](https://reactjsgirls.com/) - [Twitter](https://twitter.com/reactjsgirls) diff --git a/content/docs/add-react-to-a-website.md b/content/docs/add-react-to-a-website.md index 1ae493c1d..ff511ba96 100644 --- a/content/docs/add-react-to-a-website.md +++ b/content/docs/add-react-to-a-website.md @@ -150,11 +150,7 @@ Lubię to! Te dwa fragmenty kodu działają w ten sam sposób. Mimo iż **składnia JSX jest [całkowicie opcjonalna](/docs/react-without-jsx.html)**, wiele osób uważa, że jest pomocna przy pisaniu kodu dla UI -- zarówno w Reakcie, jak i z innymi bibliotekami. -<<<<<<< HEAD -Możesz wypróbować składnię JSX korzystając z [tego konwertera online](http://babeljs.io/repl#?babili=false&browsers=&build=&builtIns=false&spec=false&loose=false&code_lz=Q&debug=false&forceAllTransforms=false&shippedProposals=false&circleciRepo=&evaluate=false&fileSize=false&sourceType=module&lineWrap=true&presets=es2015%2Creact%2Cstage-2%2Cstage-3&prettier=true&targets=Node-6.12&version=6.26.0&envVersion=). -======= -You can play with JSX using [this online converter](https://babeljs.io/en/repl#?babili=false&browsers=&build=&builtIns=false&spec=false&loose=false&code_lz=DwIwrgLhD2B2AEcDCAbAlgYwNYF4DeAFAJTw4B88EAFmgM4B0tAphAMoQCGETBe86WJgBMAXJQBOYJvAC-RGWQBQ8FfAAyaQYuAB6cFDhkgA&debug=false&forceAllTransforms=false&shippedProposals=false&circleciRepo=&evaluate=false&fileSize=false&timeTravel=false&sourceType=module&lineWrap=true&presets=es2015%2Creact%2Cstage-2&prettier=false&targets=&version=7.4.3). ->>>>>>> 6bc6e7b1411d4befc3ecfbe45b898ca474116020 +Możesz wypróbować składnię JSX korzystając z [tego konwertera online](https://babeljs.io/en/repl#?babili=false&browsers=&build=&builtIns=false&spec=false&loose=false&code_lz=DwIwrgLhD2B2AEcDCAbAlgYwNYF4DeAFAJTw4B88EAFmgM4B0tAphAMoQCGETBe86WJgBMAXJQBOYJvAC-RGWQBQ8FfAAyaQYuAB6cFDhkgA&debug=false&forceAllTransforms=false&shippedProposals=false&circleciRepo=&evaluate=false&fileSize=false&timeTravel=false&sourceType=module&lineWrap=true&presets=es2015%2Creact%2Cstage-2&prettier=false&targets=&version=7.4.3). ### Szybki test składni JSX {#quickly-try-jsx} diff --git a/content/docs/create-a-new-react-app.md b/content/docs/create-a-new-react-app.md index 3d1fd881d..ae331e31c 100644 --- a/content/docs/create-a-new-react-app.md +++ b/content/docs/create-a-new-react-app.md @@ -54,11 +54,7 @@ npm start Create React App nie obsługuje ani logiki backendu ani baz danych; tworzy jedynie frontendowy potok budowania (ang. *build pipeline*). Dzięki temu możesz go używać z dowolnie wybranym przez siebie backendem. Create React App zawiera narzędzia takie jak [Babel](http://babeljs.io/) i [webpack](https://webpack.js.org/), ale nie musisz nic o nich wiedzieć, aby z powodzeniem używać ich w swoich projektach. -<<<<<<< HEAD -Kiedy uznasz, że twoja aplikacja jest gotowa do wdrożenia do środowiska produkcyjnego, zastosuj komendę `npm run build`. Dzięki temu uzyskasz zoptymalizowaną wersję swojej aplikacji. Znajdziesz ją w folderze `build`. Więcej informacji na temat Create React App znajdziesz w [pliku README](https://github.com/facebookincubator/create-react-app#create-react-app-) oraz w tym [Przewodniku użytkownika](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#table-of-contents). -======= -When you're ready to deploy to production, running `npm run build` will create an optimized build of your app in the `build` folder. You can learn more about Create React App [from its README](https://github.com/facebookincubator/create-react-app#create-react-app--) and the [User Guide](https://facebook.github.io/create-react-app/). ->>>>>>> 6bc6e7b1411d4befc3ecfbe45b898ca474116020 +Kiedy uznasz, że twoja aplikacja jest gotowa do wdrożenia do środowiska produkcyjnego, zastosuj komendę `npm run build`. Dzięki temu uzyskasz zoptymalizowaną wersję swojej aplikacji. Znajdziesz ją w folderze `build`. Więcej informacji na temat Create React App znajdziesz w [pliku README](https://github.com/facebookincubator/create-react-app#create-react-app--) oraz w tym [Przewodniku użytkownika](https://facebook.github.io/create-react-app/). ### Next.js {#nextjs} diff --git a/content/docs/getting-started.md b/content/docs/getting-started.md index 7aad97fa5..e18e5cc42 100644 --- a/content/docs/getting-started.md +++ b/content/docs/getting-started.md @@ -115,11 +115,7 @@ Ta sekcja dokumentacji może okazać się przydatna, jeśli chcesz dowiedzieć s Możesz obserwować [konto @reactjs](https://twitter.com/reactjs) na Twitterze, jednak nie ominie cię nic ważnego, jeśli będziesz śledzić jedynie bloga. -<<<<<<< HEAD -Nie każde nowe wydanie Reacta wymaga osobnego posta na blogu, jednak informacje o każdym wydaniu zawsze trafiają do [pliku `CHANGELOG.md` w repozytorium Reacta](https://github.com/facebook/react/blob/master/CHANGELOG.md) -======= -Not every React release deserves its own blog post, but you can find a detailed changelog for every release [in the `CHANGELOG.md` file in the React repository](https://github.com/facebook/react/blob/master/CHANGELOG.md), as well as on the [Releases](https://github.com/facebook/react/releases) page. ->>>>>>> 6bc6e7b1411d4befc3ecfbe45b898ca474116020 +Nie każde nowe wydanie Reacta wymaga osobnego posta na blogu, jednak informacje o każdym wydaniu zawsze trafiają do [pliku `CHANGELOG.md` w repozytorium Reacta](https://github.com/facebook/react/blob/master/CHANGELOG.md), a także w zakładce [Wydania](https://github.com/facebook/react/releases). ## Dokumentacje wersji {#versioned-documentation} diff --git a/content/docs/reference-react.md b/content/docs/reference-react.md index a180421fe..69b70227f 100644 --- a/content/docs/reference-react.md +++ b/content/docs/reference-react.md @@ -198,11 +198,7 @@ Powyższy interfejs API zastąpił przestarzałą funkcję `React.addons.cloneWi React.createFactory(type) ``` -<<<<<<< HEAD -Zwraca funkcję, która tworzy reaktowy element danego typu. Tak jak [`React.createElement()`](#createElement), argument `type`, może być zarówno nazwą znacznika HTML (np. `'div'` lub `'span'`), [komponentem reactowym](/docs/components-and-props.html) (klasą lub funkcją) lub [fragmentem reactowym](#reactfragment). -======= -Return a function that produces React elements of a given type. Like [`React.createElement()`](#createelement), the type argument can be either a tag name string (such as `'div'` or `'span'`), a [React component](/docs/components-and-props.html) type (a class or a function), or a [React fragment](#reactfragment) type. ->>>>>>> 6bc6e7b1411d4befc3ecfbe45b898ca474116020 +Zwraca funkcję, która tworzy reaktowy element danego typu. Tak jak [`React.createElement()`](#createelement), argument `type`, może być zarówno nazwą znacznika HTML (np. `'div'` lub `'span'`), [komponentem reactowym](/docs/components-and-props.html) (klasą lub funkcją) lub [fragmentem reactowym](#reactfragment). Ta funkcja pomocnicza jest uznawana za przestarzałą i radzimy korzystać z JSX lub bezpośrednio z `React.createElement()`. From 6310190fe8ce4a4104b64c6d2e1b539965467291 Mon Sep 17 00:00:00 2001 From: Wojciech Grzebieniowski Date: Wed, 24 Apr 2019 19:39:40 +0200 Subject: [PATCH 14/14] Resolve remaining conflict --- content/docs/create-a-new-react-app.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/content/docs/create-a-new-react-app.md b/content/docs/create-a-new-react-app.md index ae331e31c..563402f9c 100644 --- a/content/docs/create-a-new-react-app.md +++ b/content/docs/create-a-new-react-app.md @@ -70,11 +70,7 @@ Zapoznaj się z Gatsbym poprzez [oficjalny przewodnik](https://www.gatsbyjs.org/ ### Bardziej elastyczne zestawy narzędziowe {#more-flexible-toolchains} -<<<<<<< HEAD Podane niżej zestawy narzędziowe są stosunkowo bardziej elastyczne i dają większą dowolność konfiguracji. Polecamy je bardziej doświadczonym użytkownikom. -======= -The following toolchains offer more flexibility and choice. We recommend them to more experienced users: ->>>>>>> 6bc6e7b1411d4befc3ecfbe45b898ca474116020 - **[Neutrino](https://neutrinojs.org/)** łączy w sobie siłę [webpacka](https://webpack.js.org/) z prostotą ustawień domyślnych. Zestaw ten zawiera ustawienia domyślne dla [aplikacji reactowych](https://neutrinojs.org/packages/react/) i [komponentów reactowych](https://neutrinojs.org/packages/react-components/).