From 951005f3769db8d86ac83c244e8040c727f4c579 Mon Sep 17 00:00:00 2001 From: Nathan Simpson Date: Sun, 10 Mar 2019 22:18:03 +1100 Subject: [PATCH 1/3] Changing 'react-router' imports to 'react-router-dom' in AdminUI --- packages/admin-ui/client/components/Nav/index.js | 3 +-- packages/admin-ui/client/components/PreventNavigation.js | 2 +- packages/admin-ui/package.json | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/admin-ui/client/components/Nav/index.js b/packages/admin-ui/client/components/Nav/index.js index 74a87467b1b..1d2d04c45b0 100644 --- a/packages/admin-ui/client/components/Nav/index.js +++ b/packages/admin-ui/client/components/Nav/index.js @@ -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'; diff --git a/packages/admin-ui/client/components/PreventNavigation.js b/packages/admin-ui/client/components/PreventNavigation.js index f7b83c807bd..46422198c7b 100644 --- a/packages/admin-ui/client/components/PreventNavigation.js +++ b/packages/admin-ui/client/components/PreventNavigation.js @@ -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. diff --git a/packages/admin-ui/package.json b/packages/admin-ui/package.json index d31b6d50418..541290bf1e7 100644 --- a/packages/admin-ui/package.json +++ b/packages/admin-ui/package.json @@ -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", From 9eb30d536ba31960f1a4dc7a890359fbe67d1349 Mon Sep 17 00:00:00 2001 From: Nathan Simpson Date: Sun, 10 Mar 2019 22:23:04 +1100 Subject: [PATCH 2/3] Fixing broken import in blog demo project --- demo-projects/blog/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo-projects/blog/index.js b/demo-projects/blog/index.js index 517d29c55db..e75d1a1a6e9 100644 --- a/demo-projects/blog/index.js +++ b/demo-projects/blog/index.js @@ -11,7 +11,7 @@ const { CalendarDay, DateTime, } = require('@keystone-alpha/fields'); -const { LocalFileAdapter } = require('@voukeystone-alphassoir/file-adapters'); +const { LocalFileAdapter } = require('@keystone-alpha/file-adapters'); const PasswordAuthStrategy = require('@keystone-alpha/keystone/auth/Password'); const { MongooseAdapter } = require('@keystone-alpha/adapter-mongoose'); From d3f4639513c9e66b62812a19968598f6f1899485 Mon Sep 17 00:00:00 2001 From: Nathan Simpson Date: Sun, 10 Mar 2019 22:40:37 +1100 Subject: [PATCH 3/3] Removed import from root (eeeeep!) --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index d632881a141..e61cbcfa45e 100644 --- a/package.json +++ b/package.json @@ -155,7 +155,6 @@ "react-prop-toggle": "^1.0.2", "react-pseudo-state": "^2.2.1", "react-radios": "^1.1.0", - "react-router": "4.4.0-beta.6", "react-router-dom": "4.4.0-beta.6", "react-scrolllock": "^3.0.1", "react-select": "^2.1.2",