update

w-okada · Apr 30, 2022 · 8cf0b7a · 8cf0b7a
1 parent b52466b
commit 8cf0b7a
Show file tree

Hide file tree

Showing 12 changed files with 1,496 additions and 1,333 deletions.
diff --git a/009_u2net-portrait-worker-js/package-lock.json b/009_u2net-portrait-worker-js/package-lock.json
diff --git a/009_u2net-portrait-worker-js/package.json b/009_u2net-portrait-worker-js/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dannadori/u2net-portrait-worker-js",
-    "version": "1.0.25",
+    "version": "1.0.26",
     "description": "",
     "main": "dist/u2net-portrait-worker.js",
     "scripts": {
@@ -39,6 +39,6 @@
         "@tensorflow/tfjs": "^3.16.0",
         "@tensorflow/tfjs-backend-wasm": "^3.16.0",
         "buffer": "^6.0.3",
-        "@dannadori/000_WorkerBase": "file:../000_WorkerBase"
+        "@dannadori/worker-base": "^1.0.1"
     }
 }
diff --git a/009_u2net-portrait-worker-js/src/const.ts b/009_u2net-portrait-worker-js/src/const.ts
@@ -1,4 +1,4 @@
-import { BrowserTypes } from "@dannadori/000_WorkerBase";
+import { BrowserTypes } from "@dannadori/worker-base";
 
 export const WorkerCommand = {
     INITIALIZE: "initialize",

diff --git a/009_u2net-portrait-worker-js/src/u2net-portrait-worker.ts b/009_u2net-portrait-worker-js/src/u2net-portrait-worker.ts
@@ -1,6 +1,6 @@
 import * as tf from "@tensorflow/tfjs";
 import { U2NetPortraitConfig, U2NetPortraitOperationParams, BackendTypes, U2NetPortraitFunctionTypes } from "./const";
-import { setWasmPath, setWasmPaths } from "@tensorflow/tfjs-backend-wasm";
+import { setWasmPaths } from "@tensorflow/tfjs-backend-wasm";
 export { U2NetPortraitConfig, U2NetPortraitOperationParams, BackendTypes };
 
 // @ts-ignore
@@ -41,7 +41,7 @@ import modelWeight_p4_320_uint8 from "../resources/used_model_2021_11_02/itr6400
 // import modelJson_p4_320_float32 from "../resources/used_model_2021_11_02/itr640000_acc0.085795_p4/320/web_model_float32/model.json";
 // // @ts-ignore
 // import modelWeight_p4_320_float32 from "../resources/used_model_2021_11_02/itr640000_acc0.085795_p4/320/web_model_float32/group1-shard1of1.bin";
-import { getBrowserType, LocalWorker, WorkerManagerBase } from "@dannadori/000_WorkerBase";
+import { getBrowserType, LocalWorker, WorkerManagerBase } from "@dannadori/worker-base";
 
 export const generateU2NetPortraitDefaultConfig = (): U2NetPortraitConfig => {
     const defaultConf: U2NetPortraitConfig = {

diff --git a/010_modnet-worker-js/package-lock.json b/010_modnet-worker-js/package-lock.json
diff --git a/010_modnet-worker-js/package.json b/010_modnet-worker-js/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dannadori/modnet-worker-js",
-    "version": "1.0.14",
+    "version": "1.0.15",
     "description": "",
     "main": "dist/modnet-worker.js",
     "scripts": {
@@ -27,9 +27,9 @@
     "devDependencies": {
         "npm-run-all": "^4.1.5",
         "rimraf": "^3.0.2",
-        "ts-loader": "^9.2.8",
+        "ts-loader": "^9.2.9",
         "tsconfig-paths": "^3.14.1",
-        "typescript": "^4.6.3",
+        "typescript": "^4.6.4",
         "webpack": "^5.72.0",
         "webpack-cli": "^4.9.2",
         "worker-loader": "^3.0.8"
@@ -38,6 +38,6 @@
         "@tensorflow/tfjs": "^3.16.0",
         "@tensorflow/tfjs-backend-wasm": "^3.16.0",
         "buffer": "^6.0.3",
-        "@dannadori/000_WorkerBase": "file:../000_WorkerBase"
+        "@dannadori/worker-base": "^1.0.1"
     }
 }
diff --git a/010_modnet-worker-js/src/const.ts b/010_modnet-worker-js/src/const.ts
@@ -1,4 +1,4 @@
-import { BrowserTypes } from "@dannadori/000_WorkerBase";
+import { BrowserTypes } from "@dannadori/worker-base";
 
 export const WorkerCommand = {
     INITIALIZE: "initialize",

diff --git a/010_modnet-worker-js/src/modnet-worker.ts b/010_modnet-worker-js/src/modnet-worker.ts
@@ -1,8 +1,8 @@
 
 import * as tf from "@tensorflow/tfjs";
-import { MODNetConfig, MODNetFunctionTypes, MODNetOperationParams, WorkerCommand, WorkerResponse, MODEL_INPUT_SIZES, BackendTypes } from "./const";
-import { setWasmPath, setWasmPaths } from "@tensorflow/tfjs-backend-wasm";
-import { getBrowserType, LocalWorker, WorkerManagerBase } from "@dannadori/000_WorkerBase";
+import { MODNetConfig, MODNetFunctionTypes, MODNetOperationParams, MODEL_INPUT_SIZES, BackendTypes } from "./const";
+import { setWasmPaths } from "@tensorflow/tfjs-backend-wasm";
+import { getBrowserType, LocalWorker, WorkerManagerBase } from "@dannadori/worker-base";
 export { MODNetConfig, MODNetOperationParams, MODEL_INPUT_SIZES, BackendTypes };
 
 

diff --git a/010demo_modnet-worker-js-demo/package-lock.json b/010demo_modnet-worker-js-demo/package-lock.json
diff --git a/010demo_modnet-worker-js-demo/package.json b/010demo_modnet-worker-js-demo/package.json
@@ -23,16 +23,16 @@
     "author": "",
     "license": "ISC",
     "devDependencies": {
-        "@babel/core": "^7.17.9",
-        "@babel/plugin-transform-runtime": "^7.17.0",
-        "@babel/preset-env": "^7.16.11",
+        "@babel/core": "^7.17.10",
+        "@babel/plugin-transform-runtime": "^7.17.10",
+        "@babel/preset-env": "^7.17.10",
         "@babel/preset-react": "^7.16.7",
         "@babel/preset-typescript": "^7.16.7",
         "@babel/runtime": "^7.17.9",
-        "@types/react": "^18.0.6",
-        "@types/react-dom": "^18.0.2",
-        "@typescript-eslint/eslint-plugin": "^5.20.0",
-        "@typescript-eslint/parser": "^5.20.0",
+        "@types/react": "^18.0.8",
+        "@types/react-dom": "^18.0.3",
+        "@typescript-eslint/eslint-plugin": "^5.21.0",
+        "@typescript-eslint/parser": "^5.21.0",
         "babel-loader": "^8.2.5",
         "eslint": "^8.14.0",
         "eslint-config-prettier": "^8.5.0",
@@ -43,11 +43,11 @@
         "npm-run-all": "^4.1.5",
         "prettier": "^2.6.2",
         "rimraf": "^3.0.2",
-        "ts-loader": "^9.2.8",
-        "typescript": "^4.6.3",
+        "ts-loader": "^9.2.9",
+        "typescript": "^4.6.4",
         "webpack": "^5.72.0",
         "webpack-cli": "^4.9.2",
-        "daisyui": "^2.14.2",
+        "daisyui": "^2.14.3",
         "style-loader": "^3.3.1",
         "postcss-loader": "^6.2.1",
         "css-loader": "^6.7.1",
@@ -56,9 +56,9 @@
         "webpack-dev-server": "^4.8.1"
     },
     "dependencies": {
-        "@dannadori/modnet-worker-js": "^1.0.14",
-        "demo-base": "file:../000_DemoBase",
-        "react": "^18.0.0",
-        "react-dom": "^18.0.0"
+        "@dannadori/modnet-worker-js": "^1.0.15",
+        "@dannadori/demo-base": "^1.0.1",
+        "react": "^18.1.0",
+        "react-dom": "^18.1.0"
     }
 }
diff --git a/010demo_modnet-worker-js-demo/src/App.tsx b/010demo_modnet-worker-js-demo/src/App.tsx
@@ -4,7 +4,7 @@ import { MODNetWorkerManager, BackendTypes } from "@dannadori/modnet-worker-js";
 import { useAppState } from "./provider/AppStateProvider";
 import { MODNetDrawer } from "./MODNetDrawer";
 import { DataTypesOfDataURL, getDataTypeOfDataURL } from "./utils/urlReader";
-import { CommonSelector, CommonSelectorProps, CommonSwitch, CommonSwitchProps, Credit, VideoInputSelector, VideoInputSelectorProps } from "demo-base";
+import { CommonSelector, CommonSelectorProps, CommonSwitch, CommonSwitchProps, Credit, VideoInputSelector, VideoInputSelectorProps } from "@dannadori/demo-base";
 
 let GlobalLoopID = 0;
 

diff --git a/010demo_modnet-worker-js-demo/src/provider/AppStateProvider.tsx b/010demo_modnet-worker-js-demo/src/provider/AppStateProvider.tsx
@@ -1,6 +1,6 @@
 import React, { useContext, useEffect, useState } from "react";
 import { ReactNode } from "react";
-import { useWindowStateChangeListener, WindowSize } from "demo-base";
+import { useWindowStateChangeListener, WindowSize } from "@dannadori/demo-base";
 import { loadURLAsDataURL } from "../utils/urlReader";
 import { generateDefaultMODNetParams, generateMODNetDefaultConfig, MODNetConfig, MODNetOperationParams } from "@dannadori/modnet-worker-js";