Skip to content

Commit 9749868

Browse files
update tpyse and config
1 parent 116dba1 commit 9749868

File tree

6 files changed

+145
-126
lines changed

6 files changed

+145
-126
lines changed

.npmignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
.idea
2+
.github
3+
node_modules
4+
src

package.json

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"name": "react-image-annotate",
33
"version": "2.0.0",
44
"type": "module",
5-
"main": "dist/main.js",
6-
"types": "dist/main.d.ts",
5+
"main": "dist/react-image-annotate.js",
6+
"types": "dist/lib.d.ts",
77
"files": [
88
"dist"
99
],
@@ -23,8 +23,8 @@
2323
"material-survey": "^2.1.0",
2424
"moment": "^2.30.0",
2525
"monaco-editor": "^0.47.0",
26-
"react": "^18.0.0",
27-
"react-dom": "^18.0.2",
26+
"react": "18.2.0",
27+
"react-dom": "18.2.0",
2828
"react-full-screen": "^1.1.1",
2929
"react-hotkeys": "^2.0.0",
3030
"react-markdown": "^9.0.0",
@@ -63,10 +63,9 @@
6363
"vite-tsconfig-paths": "^4.3.2"
6464
},
6565
"peerDependencies": {
66-
"react": "^18.0.0",
67-
"react-dom": "^18.0.0"
66+
"react": "18.2.0",
67+
"react-dom": "18.2.0"
6868
},
69-
"homepage": "/react-image-annotate",
7069
"repository": {
7170
"type": "git",
7271
"url": "https://github.com/UniversalDataTool/react-image-annotate.git"

src/Annotator/index.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// @flow
22

3-
import type { Action, Image, MainLayoutState } from "../MainLayout/types";
3+
import { Action, Image, MainLayoutState, ToolEnum } from "../MainLayout/types";
44
import { ComponentType, FunctionComponent, useEffect, useReducer } from "react";
55
import Immutable, { ImmutableObject } from "seamless-immutable";
66

@@ -23,7 +23,7 @@ export type AnnotatorProps = {
2323
regionClsList?: Array<string | { id: string; label: string }>;
2424
imageTagList?: Array<string>;
2525
imageClsList?: Array<string>;
26-
enabledTools?: Array<string>;
26+
enabledTools?: Array<ToolEnum>;
2727
selectedTool?: String;
2828
showTags?: boolean;
2929
selectedImage?: string | number;
@@ -191,7 +191,7 @@ export const Annotator = ({
191191
}, [selectedImage, state.annotationType, state.images]);
192192

193193
if (!images && !videoSrc)
194-
return 'Missing required prop "images" or "videoSrc"';
194+
return <div>Missing required prop "images" or "videoSrc"</div>;
195195

196196
return (
197197
<SettingsProvider>

src/MainLayout/types.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ export type ToolEnum =
2121
| "create-pixel"
2222
| "create-expanding-line"
2323
| "create-keypoints"
24-
// TODO: check, added new types
2524
| "modify-allowed-area"
2625
| "create-line"
2726
| "show-tags"
@@ -105,7 +104,7 @@ export type MainLayoutStateBase = {
105104
regionTagList?: Array<string>;
106105
imageClsList?: Array<string>;
107106
imageTagList?: Array<string>;
108-
enabledTools: Array<string>;
107+
enabledTools: Array<ToolEnum>;
109108
history: Array<{ time: Date; state: MainLayoutState; name: string }>;
110109
keypointDefinitions: KeypointsDefinition;
111110
allowComments?: boolean;

vite.config.ts

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,24 @@ export default defineConfig(({ mode }) => {
4747
},
4848
},
4949
},
50+
resolve: {
51+
alias: {
52+
react: resolve("./node_modules/react"),
53+
"react-dom": resolve("./node_modules/react-dom"),
54+
},
55+
},
5056
build: {
5157
lib: {
5258
entry: resolve(__dirname, "src/lib.tsx"),
5359
formats: ["es"],
5460
},
55-
rollupOptions: {
56-
external: ["react", "react-dom"],
61+
external: ["react", "react-dom", "styled-components"],
62+
output: {
63+
globals: {
64+
react: "React",
65+
"react-dom": "ReactDOM",
66+
"styled-components": "styled",
67+
},
5768
},
5869
},
5970
};

0 commit comments

Comments
 (0)