Skip to content

Commit 4ff2eb1

Browse files
authored
Merge pull request #900 from dcastil/convert-editor-to-typescript
Convert editor to TypeScript
2 parents 2e58e0f + 2a85a09 commit 4ff2eb1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1017
-865
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ dist
66
coverage
77
.DS_Store
88
.rts2_cache*
9-
.idea
9+
.idea
10+
.vscode

packages/components/index.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ export type FieldProps<T extends React.ElementType> = FieldOwnProps &
208208
// `T` is far from unnecessary. We derive component props from it.
209209
// tslint:disable-next-line no-unnecessary-generics
210210
export function Field<
211-
T extends React.ElementType = React.ElementType<InputProps>
211+
T extends React.ElementType = React.ComponentType<InputProps>
212212
>(props: FieldProps<T>): JSX.Element
213213

214214
export interface ProgressProps

packages/editor/package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,17 @@
33
"version": "0.4.0-alpha.3",
44
"main": "dist/index.js",
55
"module": "dist/index.esm.js",
6+
"types": "dist/index.d.ts",
67
"author": "Brent Jackson",
78
"license": "MIT",
89
"scripts": {
9-
"prepare": "microbundle --no-compress",
10-
"watch": "microbundle watch --no-compress"
10+
"prepare": "microbundle --no-compress --tsconfig tsconfig.json",
11+
"watch": "microbundle watch --no-compress --tsconfig tsconfig.json"
1112
},
1213
"dependencies": {
1314
"@theme-ui/components": "^0.4.0-alpha.3",
1415
"@theme-ui/style-guide": "^0.4.0-alpha.3",
16+
"@types/react-color": "^2.17.3",
1517
"color": "^3.1.2",
1618
"react-color": "^2.18.0",
1719
"reakit": "^1.0.0-beta.14",

packages/editor/src/ColorPicker.js

Lines changed: 0 additions & 192 deletions
This file was deleted.

0 commit comments

Comments
 (0)