Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Changing 'react-router' imports to 'react-router-dom' in AdminUI #803

Merged
merged 3 commits into from
Mar 10, 2019
Merged

Changing 'react-router' imports to 'react-router-dom' in AdminUI #803

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
951005f
Changing 'react-router' imports to 'react-router-dom' in AdminUI
nathsimpson Mar 10, 2019
9eb30d5
Fixing broken import in blog demo project
nathsimpson Mar 10, 2019
d3f4639
Removed import from root (eeeeep!)
nathsimpson Mar 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions packages/admin-ui/client/components/Nav/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
/** @jsx jsx */

import { Component, memo } from 'react';
import { withRouter, Route } from 'react-router';
import { Link } from 'react-router-dom';
import { withRouter, Route, Link } from 'react-router-dom';
import PropToggle from 'react-prop-toggle';
import styled from '@emotion/styled';
import { jsx } from '@emotion/core';
Expand Down
2 changes: 1 addition & 1 deletion packages/admin-ui/client/components/PreventNavigation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useEffect, memo } from 'react';
import { Prompt } from 'react-router';
import { Prompt } from 'react-router-dom';

export default memo(function PreventNavigation() {
// to handle when the user closes the tab, does an actual browser navigation away or etc.
Expand Down
1 change: 0 additions & 1 deletion packages/admin-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@
"react-node-resolver": "^2.0.0",
"react-prop-toggle": "^1.0.2",
"react-pseudo-state": "^2.2.1",
"react-router": "4.4.0-beta.6",
"react-router-dom": "4.4.0-beta.6",
"react-select": "^2.1.2",
"react-toast-notifications": "^1.2.0",
Expand Down