diff --git a/packages/sui-react-router/src/.npmignore b/packages/sui-react-router/.npmignore similarity index 57% rename from packages/sui-react-router/src/.npmignore rename to packages/sui-react-router/.npmignore index 83b694704..9d9d65391 100644 --- a/packages/sui-react-router/src/.npmignore +++ b/packages/sui-react-router/.npmignore @@ -1 +1,3 @@ +src +test CHANGELOG.md \ No newline at end of file diff --git a/packages/sui-react-router/package.json b/packages/sui-react-router/package.json index 5087c3b96..84ac7f32b 100644 --- a/packages/sui-react-router/package.json +++ b/packages/sui-react-router/package.json @@ -2,6 +2,7 @@ "name": "@s-ui/react-router", "version": "1.14.0", "description": "", + "type": "module", "main": "lib/index.js", "scripts": { "lib": "babel --presets sui ./src --out-dir ./lib", @@ -16,8 +17,6 @@ "prop-types": "15", "react": "16 || 17" }, - "keywords": [], - "author": "", "license": "ISC", "dependencies": { "classnames": "2.2.5", diff --git a/packages/sui-react-router/src/browserHistory.js b/packages/sui-react-router/src/browserHistory.js index ab145e8dc..753cde616 100644 --- a/packages/sui-react-router/src/browserHistory.js +++ b/packages/sui-react-router/src/browserHistory.js @@ -3,10 +3,12 @@ // from: https://github.com/ReactTraining/react-router/blob/v3/modules/useRouterHistory.js import canUseDOM from './internal/canUseDOM.js' -import createBrowserHistory from 'history/lib/createBrowserHistory' -import useBasename from 'history/lib/useBasename' -import useQueries from 'history/lib/useQueries' -import createMemoryHistory from './createMemoryHistory.js' +import { + createHistory as createBrowserHistory, + createMemoryHistory, + useBasename, + useQueries +} from 'history' /** If we're on the server, we must be sure importing this file doesn't break anything */ const browserHistory = canUseDOM diff --git a/packages/sui-react-router/src/createMemoryHistory.js b/packages/sui-react-router/src/createMemoryHistory.js index c0e3bd750..5aa8903f2 100644 --- a/packages/sui-react-router/src/createMemoryHistory.js +++ b/packages/sui-react-router/src/createMemoryHistory.js @@ -3,9 +3,11 @@ // from: https://github.com/ReactTraining/react-router/blob/v3/modules/createMemoryHistory.js -import useQueries from 'history/lib/useQueries' -import useBasename from 'history/lib/useBasename' -import baseCreateMemoryHistory from 'history/lib/createMemoryHistory' +import { + createMemoryHistory as baseCreateMemoryHistory, + useBasename, + useQueries +} from 'history' export default function createMemoryHistory(options) { // signatures and type checking differ between `useQueries` and diff --git a/packages/sui-react-router/src/match.js b/packages/sui-react-router/src/match.js index 4a83e83eb..46518fa4d 100644 --- a/packages/sui-react-router/src/match.js +++ b/packages/sui-react-router/src/match.js @@ -1,7 +1,7 @@ // @ts-check // from: https://github.com/ReactTraining/react-router/blob/v3/modules/match.js -import {REPLACE} from 'history/lib/Actions' +import {REPLACE} from 'history/lib/Actions.js' import {fromReactTreeToJSON} from './internal/ReactUtils.js' import {createTransitionManager} from './internal/createTransitionManager.js' import {