Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 1 deletion UNRELEASED-V4.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ Use [the changelog guidelines](https://git.io/polaris-changelog-guidelines) to f

### Dependency upgrades

- Update `react` to 16.8.6 and `enzyme` to 3.9.1 ([#1392](https://github.com/Shopify/polaris-react/pull/1392))
- Removed `@types/prop-types` and `prop-types` ([#1505](https://github.com/Shopify/polaris-react/pull/1505))
- Updated`react` to 16.8.6 and `enzyme` to 3.9.1 ([#1392](https://github.com/Shopify/polaris-react/pull/1392))

### Code quality

Expand Down
2 changes: 0 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -182,14 +182,12 @@
"@shopify/polaris-tokens": "^2.3.0",
"@shopify/react-compose": "^0.1.6",
"@shopify/react-utilities": "^2.0.3",
"@types/prop-types": "^15.5.5",
"@types/react": "^16.8.15",
"@types/react-dom": "^16.8.4",
"@types/react-transition-group": "^2.0.7",
"core-js": "^2.5.1",
"hoist-non-react-statics": "^2.5.0",
"lodash": "^4.17.4",
"prop-types": "^15.6.1",
"react-transition-group": "^2.4.0",
"tslib": "^1.9.3"
}
Expand Down
6 changes: 0 additions & 6 deletions src/components/Navigation/types.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import * as PropTypes from 'prop-types';
import {Props as IconProps} from '../Icon';

export interface ItemType {
Expand All @@ -12,8 +11,3 @@ export interface SectionType {
fill?: boolean;
items?: ItemType[];
}

export const contextTypes = {
location: PropTypes.string,
onNavigationDismiss: PropTypes.func,
};
8 changes: 1 addition & 7 deletions src/components/ThemeProvider/index.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
import ThemeProvider from './ThemeProvider';

export {
Theme,
ColorsToParse,
ThemeVariant,
ThemeColors,
THEME_CONTEXT_TYPES,
} from './types';
export {Theme, ColorsToParse, ThemeVariant, ThemeColors} from './types';
export {
default as ThemeProviderContext,
ThemeProviderContextType,
Expand Down
4 changes: 0 additions & 4 deletions src/components/ThemeProvider/types.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import * as PropTypes from 'prop-types';

export type ColorsToParse = ThemeColor;

export type ThemeLogo = {
Expand Down Expand Up @@ -35,5 +33,3 @@ export interface Theme {
}

export type ThemeVariant = 'light' | 'dark';

export const THEME_CONTEXT_TYPES = {polarisTheme: PropTypes.any};
2 changes: 1 addition & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1768,7 +1768,7 @@
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.17.tgz#d48cf10f0dc6dcf59f827f5a3fc7a4a6004318d3"
integrity sha512-3N3FRd/rA1v5glXjb90YdYUa+sOB7WrkU2rAhKZnF4TKD86Cym9swtulGuH0p9nxo7fP5woRNa8b0oFTpCO1bg==

"@types/prop-types@*", "@types/prop-types@^15.5.5":
"@types/prop-types@*":
version "15.5.5"
resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.5.5.tgz#17038dd322c2325f5da650a94d5f9974943625e3"
integrity sha512-mOrlCEdwX3seT3n0AXNt4KNPAZZxcsABUHwBgFXOt+nvFUXkxCAO6UBJHPrDxWEa2KDMil86355fjo8jbZ+K0Q==
Expand Down