-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(react): move BrowserRouter to main.tsx for routing
Close nrwl#1558
- Loading branch information
Showing
8 changed files
with
140 additions
and
54 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 11 additions & 0 deletions
11
packages/react/src/schematics/application/files/app/src/app/__fileName__.spec.tsx__tmpl__
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,29 @@ | ||
| import React from 'react'; | ||
| import { render, cleanup } from 'react-testing-library'; | ||
| <% if (routing) { %> | ||
| import { BrowserRouter } from 'react-router-dom'; | ||
| <% } %> | ||
|
|
||
| import App from './app'; | ||
|
|
||
| describe('App', () => { | ||
| afterEach(cleanup); | ||
|
|
||
| it('should render successfully', () => { | ||
| <% if (routing) { %> | ||
| const { baseElement } = render(<BrowserRouter><App /></BrowserRouter>); | ||
| <% } else { %> | ||
| const { baseElement } = render(<App />); | ||
| <% } %> | ||
| expect(baseElement).toBeTruthy(); | ||
| }); | ||
|
|
||
| it('should have a greeting as the title', () => { | ||
| <% if (routing) { %> | ||
| const { getByText } = render(<BrowserRouter><App /></BrowserRouter>); | ||
| <% } else { %> | ||
| const { getByText } = render(<App />); | ||
| <% } %> | ||
| expect(getByText('Welcome to <%= projectName %>!')).toBeTruthy(); | ||
| }); | ||
| }); |
7 changes: 7 additions & 0 deletions
7
packages/react/src/schematics/application/files/app/src/main.tsx__tmpl__
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,13 @@ | ||
| import React from 'react'; | ||
| import ReactDOM from 'react-dom'; | ||
| <% if (routing) { %> | ||
| import { BrowserRouter } from 'react-router-dom'; | ||
| <% } %> | ||
|
|
||
| import App from './app/app'; | ||
|
|
||
| <% if (routing) { %> | ||
| ReactDOM.render(<BrowserRouter><App /></BrowserRouter>, document.getElementById('root')); | ||
| <% } else { %> | ||
| ReactDOM.render(<App />, document.getElementById('root')); | ||
| <% } %> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters