From 74d047e8c3c1b18039995a4792b630a7a7a6fa7a Mon Sep 17 00:00:00 2001 From: Tobias Hale Date: Tue, 20 Aug 2019 13:06:24 +0100 Subject: [PATCH 01/11] Include step to checkout v3 branch before building the devtools extension (#2269) --- content/blog/2019-08-15-new-react-devtools.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/content/blog/2019-08-15-new-react-devtools.md b/content/blog/2019-08-15-new-react-devtools.md index 1841a51de..8e52dfae3 100644 --- a/content/blog/2019-08-15-new-react-devtools.md +++ b/content/blog/2019-08-15-new-react-devtools.md @@ -60,6 +60,9 @@ git clone https://github.com/facebook/react-devtools cd react-devtools +# Checkout the previous release branch +git checkout v3 + # Install dependencies and build the unpacked extension yarn install yarn build:extension From aa85f15463eab7347e304a6f51ce0d0383b4c64d Mon Sep 17 00:00:00 2001 From: "Justin E. Samuels" Date: Tue, 20 Aug 2019 13:31:46 -0400 Subject: [PATCH 02/11] Updated Render-Atlanta's Social Media (#2272) Updated the social media accounts for Render-Atlanta 2020 --- content/community/conferences.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/community/conferences.md b/content/community/conferences.md index 5c5ca4156..656f1da43 100644 --- a/content/community/conferences.md +++ b/content/community/conferences.md @@ -80,7 +80,7 @@ February 27 & 28, 2020 in Sydney, Australia ### Render-Atlanta 2020 {#render-atlanta-2020} May 4-6, 2020. Atlanta, GA, USA. -[Website](https://renderatl.com) +[Website](https://renderatl.com) - [Twitter](https://twitter.com/renderATL) - [Instagram](https://www.instagram.com/renderatl/) - [Facebook](https://www.facebook.com/renderatl/) ### React Next 2020 {#react-next-2020} June 15, 2020. Tel Aviv, Israel. From 4a7cc4a7f1b6867b34763d673f2d1e5a67671b79 Mon Sep 17 00:00:00 2001 From: Alan Zhang Date: Wed, 21 Aug 2019 12:05:43 +0800 Subject: [PATCH 03/11] fix links (#2257) --- content/docs/testing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/docs/testing.md b/content/docs/testing.md index cf2de4c44..5bccd1fc4 100644 --- a/content/docs/testing.md +++ b/content/docs/testing.md @@ -28,7 +28,7 @@ Different answers may work for different teams and products. ### Recommended Tools {#tools} -**[Jest](https://facebook.github.io/jest/)** is a JavaScript test runner that lets you access the DOM via [`jsdom`](#mocking-a-rendering-surface). While jsdom is only an approximation of how the browser works, it is often good enough for testing React components. Jest provides a great iteration speed combined with powerful features like mocking [modules](#mocking-modules) and [timers](#mocking-timers) so you can have more control over how the code executes. +**[Jest](https://facebook.github.io/jest/)** is a JavaScript test runner that lets you access the DOM via [`jsdom`](/docs/testing-environments.html#mocking-a-rendering-surface). While jsdom is only an approximation of how the browser works, it is often good enough for testing React components. Jest provides a great iteration speed combined with powerful features like mocking [modules](/docs/testing-environments.html#mocking-modules) and [timers](/docs/testing-environments.html#mocking-timers) so you can have more control over how the code executes. **[React Testing Library](https://testing-library.com/react)** is a set of helpers that let you test React components without relying on their implementation details. This approach makes refactoring a breeze and also nudges you towards best practices for accessibility. Although it doesn't provide a way to "shallowly" render a component without its children, a test runner like Jest lets you do this by [mocking](/docs/testing-recipes.html#mocking-modules). From 40596f8b76820e26a04d9d37efc209fc546aedf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juho=20Veps=C3=A4l=C3=A4inen?= Date: Wed, 21 Aug 2019 22:15:58 +0200 Subject: [PATCH 04/11] docs: Add React Finland 2020 (#2275) --- content/community/conferences.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/content/community/conferences.md b/content/community/conferences.md index 656f1da43..068dae73d 100644 --- a/content/community/conferences.md +++ b/content/community/conferences.md @@ -82,6 +82,11 @@ May 4-6, 2020. Atlanta, GA, USA. [Website](https://renderatl.com) - [Twitter](https://twitter.com/renderATL) - [Instagram](https://www.instagram.com/renderatl/) - [Facebook](https://www.facebook.com/renderatl/) +### React Finland 2020 {#react-finland-2020} +May 26-29 in Helsinki, Finland + +[Website](https://react-finland.fi/) - [Twitter](https://twitter.com/ReactFinland) + ### React Next 2020 {#react-next-2020} June 15, 2020. Tel Aviv, Israel. From 359c0d284307144143887bd2b300b6c768b4c63c Mon Sep 17 00:00:00 2001 From: imed jaberi <43971542+3imed-jaberi@users.noreply.github.com> Date: Sat, 24 Aug 2019 07:48:11 +0100 Subject: [PATCH 05/11] add the missing lang .. (#2284) --- content/languages.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/content/languages.yml b/content/languages.yml index cd9d70744..16e6652f4 100644 --- a/content/languages.yml +++ b/content/languages.yml @@ -59,6 +59,10 @@ translated_name: हिन्दी code: hi status: 0 +- name: Hungarian + translated_name: magyar + code: hu + status: 0 - name: Armenian translated_name: Հայերեն code: hy From 23b43b928683cecd3460a8952c898f9561887a92 Mon Sep 17 00:00:00 2001 From: imed jaberi <43971542+3imed-jaberi@users.noreply.github.com> Date: Sat, 24 Aug 2019 07:48:29 +0100 Subject: [PATCH 06/11] fix vietnamese trans. status .. (#2283) --- content/languages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/languages.yml b/content/languages.yml index 16e6652f4..51fb6f8af 100644 --- a/content/languages.yml +++ b/content/languages.yml @@ -178,7 +178,7 @@ - name: Vietnamese translated_name: Tiếng Việt code: vi - status: 0 + status: 1 - name: Simplified Chinese translated_name: 简体中文 code: zh-hans From e64cee27b1f0afdff1d11efe29ad8f35deaed9f6 Mon Sep 17 00:00:00 2001 From: Alex Krolick Date: Sun, 25 Aug 2019 14:22:33 -0700 Subject: [PATCH 07/11] add glitch react course (#2288) --- content/community/courses.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/content/community/courses.md b/content/community/courses.md index 0de2c69d5..47e33eccf 100644 --- a/content/community/courses.md +++ b/content/community/courses.md @@ -8,6 +8,8 @@ permalink: community/courses.html ## Free Courses {#free-courses} +- [Glitch: React Starter Kit](https://glitch.com/culture/react-starter-kit/) - A free, 5-part video course with interactive code examples that will help you learn React. + - [Codecademy: React 101](https://www.codecademy.com/learn/react-101) - Codecademy's introductory course for React. - [Egghead.io: Start Learning React](https://egghead.io/courses/start-learning-react) - This series will explore the basic fundamentals of React to get you started. From c7f56456ec2914cb49bf08a855f6fdb16ade8586 Mon Sep 17 00:00:00 2001 From: Parnab Sanyal Date: Mon, 26 Aug 2019 02:53:00 +0530 Subject: [PATCH 08/11] Added Formik in the list of libraries, which use render props (#2287) --- content/docs/render-props.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/docs/render-props.md b/content/docs/render-props.md index e1482f491..f680cb724 100644 --- a/content/docs/render-props.md +++ b/content/docs/render-props.md @@ -14,7 +14,7 @@ A component with a render prop takes a function that returns a React element and )}/> ``` -Libraries that use render props include [React Router](https://reacttraining.com/react-router/web/api/Route/render-func) and [Downshift](https://github.com/paypal/downshift). +Libraries that use render props include [React Router](https://reacttraining.com/react-router/web/api/Route/render-func), [Downshift](https://github.com/paypal/downshift) and [Formik](https://github.com/jaredpalmer/formik). In this document, we’ll discuss why render props are useful, and how to write your own. From ac9f9f1a4a696879e49ab9efc181618c9dd4df12 Mon Sep 17 00:00:00 2001 From: Shubham Tiwari Date: Mon, 26 Aug 2019 02:54:29 +0530 Subject: [PATCH 09/11] fixing broken link (#2281) --- content/docs/codebase-overview.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/docs/codebase-overview.md b/content/docs/codebase-overview.md index f55c4afbc..bf6700954 100644 --- a/content/docs/codebase-overview.md +++ b/content/docs/codebase-overview.md @@ -217,7 +217,7 @@ Its source code is located in [`packages/react-reconciler`](https://github.com/f ### Event System {#event-system} -React implements a synthetic event system which is agnostic of the renderers and works both with React DOM and React Native. Its source code is located in [`packages/events`](https://github.com/facebook/react/tree/master/packages/events). +React implements a synthetic event system which is agnostic of the renderers and works both with React DOM and React Native. Its source code is located in [`packages/events`](https://github.com/facebook/react/tree/master/packages/react-events). There is a [video with a deep code dive into it](https://www.youtube.com/watch?v=dRo_egw7tBc) (66 mins). From 519a3aec91a426b0c8c9ae59e292d064df48c66a Mon Sep 17 00:00:00 2001 From: Sergei Cherniaev Date: Mon, 26 Aug 2019 12:38:59 +0300 Subject: [PATCH 10/11] missed link in fast navigation added (#2289) --- content/docs/testing-recipes.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/content/docs/testing-recipes.md b/content/docs/testing-recipes.md index 609d3d74a..dd7efa5b4 100644 --- a/content/docs/testing-recipes.md +++ b/content/docs/testing-recipes.md @@ -14,8 +14,9 @@ Common testing patterns for React components. On this page, we will primarily use function components. However, these testing strategies don't depend on implementation details, and work just as well for class components too. -- [Setup/Teardown ](#setup--teardown) +- [Setup/Teardown](#setup--teardown) - [`act()`](#act) +- [Rendering](#rendering) - [Data Fetching](#data-fetching) - [Mocking Modules](#mocking-modules) - [Events](#events) From 2fb6890613f395c45e5f8ff6fb479a7283a324bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rainer=20Mart=C3=ADnez=20Fraga?= Date: Tue, 27 Aug 2019 21:32:19 -0400 Subject: [PATCH 11/11] Resolve merge conflicts --- content/community/courses.md | 8 ++------ content/docs/codebase-overview.md | 6 +----- content/docs/render-props.md | 6 +----- content/docs/testing.md | 8 ++------ content/languages.yml | 15 +++------------ 5 files changed, 9 insertions(+), 34 deletions(-) diff --git a/content/community/courses.md b/content/community/courses.md index 0a122039f..3fdfe368d 100644 --- a/content/community/courses.md +++ b/content/community/courses.md @@ -8,13 +8,9 @@ permalink: community/courses.html ## Cursos gratuitos {#free-courses} -<<<<<<< HEAD -- [Codecademy: React 101](https://www.codecademy.com/learn/react-101) - El curso introductorio a React de Codeacademy. -======= -- [Glitch: React Starter Kit](https://glitch.com/culture/react-starter-kit/) - A free, 5-part video course with interactive code examples that will help you learn React. +- [Glitch: React Starter Kit](https://glitch.com/culture/react-starter-kit/) - Un curso en video gratuito en 5 partes con ejemplos de código interactivos que te ayudarán a aprender React. -- [Codecademy: React 101](https://www.codecademy.com/learn/react-101) - Codecademy's introductory course for React. ->>>>>>> 519a3aec91a426b0c8c9ae59e292d064df48c66a +- [Codecademy: React 101](https://www.codecademy.com/learn/react-101) - El curso introductorio a React de Codeacademy. - [Egghead.io: Start Learning React](https://egghead.io/courses/start-learning-react) - Esta serie explora los fundamentos básicos de React para que empieces. diff --git a/content/docs/codebase-overview.md b/content/docs/codebase-overview.md index c477484f3..11b45bc83 100644 --- a/content/docs/codebase-overview.md +++ b/content/docs/codebase-overview.md @@ -217,11 +217,7 @@ Su código fuente está ubicado en [`packages/react-reconciler`](https://github. ### Sistema de Eventos {#event-system} -<<<<<<< HEAD -React implementa un sistema de eventos sintético que es agnóstico de los renderizadores y funciona con React DOM y React Native. Su código fuente está localizado en [`packages/events`](https://github.com/facebook/react/tree/master/packages/events). -======= -React implements a synthetic event system which is agnostic of the renderers and works both with React DOM and React Native. Its source code is located in [`packages/events`](https://github.com/facebook/react/tree/master/packages/react-events). ->>>>>>> 519a3aec91a426b0c8c9ae59e292d064df48c66a +React implementa un sistema de eventos sintético que es agnóstico de los renderizadores y funciona con React DOM y React Native. Su código fuente está localizado en [`packages/events`](https://github.com/facebook/react/tree/master/packages/react-events). Aquí hay un [video con una muestra en profundidad del código](https://www.youtube.com/watch?v=dRo_egw7tBc) (66 mins). diff --git a/content/docs/render-props.md b/content/docs/render-props.md index e1aec4608..43bd49fe5 100644 --- a/content/docs/render-props.md +++ b/content/docs/render-props.md @@ -14,11 +14,7 @@ Un componente con una `render prop` toma una función que devuelve un elemento d )}/> ``` -<<<<<<< HEAD -Algunas bibliotecas que utilizan `render props` son [React Router](https://reacttraining.com/react-router/web/api/Route/render-func) y [Downshift](https://github.com/paypal/downshift). -======= -Libraries that use render props include [React Router](https://reacttraining.com/react-router/web/api/Route/render-func), [Downshift](https://github.com/paypal/downshift) and [Formik](https://github.com/jaredpalmer/formik). ->>>>>>> 519a3aec91a426b0c8c9ae59e292d064df48c66a +Algunas bibliotecas que utilizan `render props` son [React Router](https://reacttraining.com/react-router/web/api/Route/render-func), [Downshift](https://github.com/paypal/downshift) y [Formik](https://github.com/jaredpalmer/formik). En este documento, discutiremos por qué las `render props` son útiles y cómo escribir las tuyas. diff --git a/content/docs/testing.md b/content/docs/testing.md index 11ad15044..25d2ffed2 100644 --- a/content/docs/testing.md +++ b/content/docs/testing.md @@ -1,6 +1,6 @@ --- id: testing -title: Visión general de Pruebas +title: Visión general de pruebas permalink: docs/testing.html redirect_from: - "community/testing.html" @@ -28,11 +28,7 @@ Diferentes respuestas pueden funcionar para diferentes equipos y diferentes prod ### Herramientas recomendadas {#tools} -<<<<<<< HEAD -**[Jest](https://facebook.github.io/jest/)** Es una biblioteca de JavaScript para ejecución de pruebas que permite acceder al DOM mediante [`jsdom`](/docs/testing-environments.html#mocking-a-rendering-surface). Aunque JSDOM solo se aproxima a como realmente los navegadores web trabajan, usualmente es suficiente para probar los componentes React. Jest brinda una gran velocidad de iteración combinada con potentes funcionalidades como simular [módulos](/docs/testing-environments.html#mocking-modules) y [temporizadores](/docs/testing-environments.html#mocking-timers) esto permite tener mayor control sobre como se ejecuta el código. -======= -**[Jest](https://facebook.github.io/jest/)** is a JavaScript test runner that lets you access the DOM via [`jsdom`](/docs/testing-environments.html#mocking-a-rendering-surface). While jsdom is only an approximation of how the browser works, it is often good enough for testing React components. Jest provides a great iteration speed combined with powerful features like mocking [modules](/docs/testing-environments.html#mocking-modules) and [timers](/docs/testing-environments.html#mocking-timers) so you can have more control over how the code executes. ->>>>>>> 519a3aec91a426b0c8c9ae59e292d064df48c66a +**[Jest](https://facebook.github.io/jest/)** Es una biblioteca de JavaScript para ejecución de pruebas que permite acceder al DOM mediante [`jsdom`](/docs/testing-environments.html#mocking-a-rendering-surface). Aunque jsdom solo se aproxima a como realmente los navegadores web trabajan, usualmente es suficiente para probar componentes de React. Jest brinda una gran velocidad de iteración combinada con potentes funcionalidades como simular [módulos](/docs/testing-environments.html#mocking-modules) y [temporizadores](/docs/testing-environments.html#mocking-timers), esto permite tener mayor control sobre como se ejecuta el código. **[Biblioteca de Pruebas para React](https://testing-library.com/react)** es una biblioteca de utilidades que te ayudan a probar componentes React sin depender de los detalles de su implementación. Este enfoque simplifica la refactorización y también lo empuja hacia las mejores prácticas de accesibilidad, aunque no proporciona una forma de renderizar "superficialmente" un componente sin sus hijos, Jest te permite hacerlo gracias a su funcionalidad para [simular](/docs/testing-recipes.html#mocking-modules). diff --git a/content/languages.yml b/content/languages.yml index bd24d37fb..f93d43da2 100644 --- a/content/languages.yml +++ b/content/languages.yml @@ -59,15 +59,11 @@ translated_name: हिन्दी code: hi status: 0 -<<<<<<< HEAD -- name: Armenio -======= -- name: Hungarian +- name: Húngaro translated_name: magyar code: hu status: 0 -- name: Armenian ->>>>>>> 519a3aec91a426b0c8c9ae59e292d064df48c66a +- name: Armenio translated_name: Հայերեն code: hy status: 0 @@ -182,13 +178,8 @@ - name: Vietnamita translated_name: Tiếng Việt code: vi -<<<<<<< HEAD - status: 0 -- name: Chino simplificado -======= status: 1 -- name: Simplified Chinese ->>>>>>> 519a3aec91a426b0c8c9ae59e292d064df48c66a +- name: Chino simplificado translated_name: 简体中文 code: zh-hans status: 2