Skip to content

Commit

Permalink
chore: merge conflicts
Browse files Browse the repository at this point in the history
Signed-off-by: Alessandro De Blasis <alex@deblasis.net>
  • Loading branch information
deblasis committed Jan 15, 2025
1 parent 2e45280 commit 4a7ab57
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 36 deletions.
8 changes: 1 addition & 7 deletions src/content/learn/add-react-to-an-existing-project.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,9 @@ Supponiamo tu abbia una web app esistente a `example.com` costruita con un'altra

Ecco come ti consigliamo di impostarla:

<<<<<<< HEAD
1. **Crea la parte React della tua app** utilizzando uno dei [framework basati su React](/learn/start-a-new-react-project).
2. **Specifica `/some-app` come *percorso di base*** nella configurazione del tuo framework (ecco come: [Next.js](https://nextjs.org/docs/api-reference/next.config.js/basepath), [Gatsby](https://www.gatsbyjs.com/docs/how-to/previews-deploys-hosting/path-prefix/)).
2. **Specifica `/some-app` come *percorso di base*** nella configurazione del tuo framework (ecco come: [Next.js](https://nextjs.org/docs/app/api-reference/config/next-config-js/basePath), [Gatsby](https://www.gatsbyjs.com/docs/how-to/previews-deploys-hosting/path-prefix/)).
3. **Configura il tuo server o un proxy** in modo che tutte le richieste in `/some-app/` siano gestite dalla tua app React.
=======
1. **Build the React part of your app** using one of the [React-based frameworks](/learn/start-a-new-react-project).
2. **Specify `/some-app` as the *base path*** in your framework's configuration (here's how: [Next.js](https://nextjs.org/docs/app/api-reference/config/next-config-js/basePath), [Gatsby](https://www.gatsbyjs.com/docs/how-to/previews-deploys-hosting/path-prefix/)).
3. **Configure your server or a proxy** so that all requests under `/some-app/` are handled by your React app.
>>>>>>> 9000e6e003854846c4ce5027703b5ce6f81aad80

Ciò garantisce che la parte React della tua app possa [trarre vantaggio dalle best practices](/learn/start-a-new-react-project#can-i-use-react-without-a-framework) integrate in tali framework.

Expand Down
4 changes: 0 additions & 4 deletions src/content/learn/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,7 @@ title: Avvio Rapido

<Intro>

<<<<<<< HEAD
Benvenuto nella documentazione di React! Questa pagina ti darà un'introduzione all'80% dei concetti React che userai quotidianamente.
=======
Welcome to the React documentation! This page will give you an introduction to 80% of the React concepts that you will use on a daily basis.
>>>>>>> 9000e6e003854846c4ce5027703b5ce6f81aad80

</Intro>

Expand Down
28 changes: 3 additions & 25 deletions src/content/learn/react-developer-tools.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,31 +53,9 @@ Adesso, aggiorna il tuo sito web nel browser per visualizzarlo nei developer too
![React Developer Tools standalone](/images/docs/react-devtools-standalone.png)

## Mobile (React Native) {/*mobile-react-native*/}
<<<<<<< HEAD
React Developer Tools si può anche usare per ispezionare app costruite con [React Native](https://reactnative.dev/).

Il modo più facile per usare React Developer Tools è installarlo globalmente:
```bash
# Yarn
yarn global add react-devtools
=======

To inspect apps built with [React Native](https://reactnative.dev/), you can use [React Native DevTools](https://reactnative.dev/docs/react-native-devtools), the built-in debugger that deeply integrates React Developer Tools. All features work identically to the browser extension, including native element highlighting and selection.
>>>>>>> 9000e6e003854846c4ce5027703b5ce6f81aad80

[Learn more about debugging in React Native.](https://reactnative.dev/docs/debugging)

<<<<<<< HEAD
Successivamente, apri i developer tools dal terminale.
```bash
react-devtools
```

Dovrebbe connettersi ad una qualsiasi app React Native locale in esecuzione.
Per ispezionare le app create con [React Native](https://reactnative.dev/), puoi utilizzare [React Native DevTools](https://reactnative.dev/docs/react-native-devtools), il debugger integrato che si integra profondamente con React Developer Tools. Tutte le funzionalità funzionano identicamente all'estensione del browser, inclusa l'evidenziazione e la selezione degli elementi nativi.

> Prova a ricaricare l'app se developer tools non si connette dopo alcuni secondi.
[Scopri di più sul debug in React Native.](https://reactnative.dev/docs/debugging)

[Ulteriori informazioni sul debugging di React Native.](https://reactnative.dev/docs/debugging)
=======
> For versions of React Native earlier than 0.76, please use the standalone build of React DevTools by following the [Safari and other browsers](#safari-and-other-browsers) guide above.
>>>>>>> 9000e6e003854846c4ce5027703b5ce6f81aad80
> Per le versioni di React Native precedenti alla 0.76, utilizza la build standalone di React DevTools seguendo la guida [Safari e altri browser](#safari-and-other-browsers) sopra.

0 comments on commit 4a7ab57

Please sign in to comment.