Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
w-okada committed Apr 30, 2022
1 parent 02ee4f6 commit fba01d6
Show file tree
Hide file tree
Showing 9 changed files with 1,246 additions and 1,141 deletions.
428 changes: 265 additions & 163 deletions 012_barcode-scanner-worker-js/package-lock.json

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions 012_barcode-scanner-worker-js/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dannadori/barcode-scanner-worker-js",
"version": "1.0.14",
"version": "1.0.15",
"description": "",
"main": "dist/barcode-scanner-worker.js",
"scripts": {
Expand All @@ -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",
Expand All @@ -39,6 +39,6 @@
"@types/emscripten": "^1.39.6",
"@types/offscreencanvas": "^2019.6.4",
"buffer": "^6.0.3",
"@dannadori/000_WorkerBase": "file:../000_WorkerBase"
"@dannadori/worker-base": "^1.0.1"
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BrowserTypes } from "@dannadori/000_WorkerBase";
import { BrowserTypes } from "@dannadori/worker-base";
import { BarcodeInfo, BarcodeScannerConfig, BarcodeScannerOperationParams, ScanModes, TFLite, WorkerCommand, WorkerResponse } from "./const";

const ctx: Worker = self as any; // eslint-disable-line no-restricted-globals
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import tfliteModel from "../resources/tflite_models/barcode172_light.tflite.bin"
import barcodeWasm from "../resources/wasm/tflite.wasm";
// @ts-ignore
import barcodeWasmSimd from "../resources/wasm/tflite-simd.wasm";
import { BrowserTypes, getBrowserType, LocalWorker, WorkerManagerBase } from "@dannadori/000_WorkerBase";
import { BrowserTypes, getBrowserType, LocalWorker, WorkerManagerBase } from "@dannadori/worker-base";

export const generateBarcodeScannerDefaultConfig = (): BarcodeScannerConfig => {
const defaultConf: BarcodeScannerConfig = {
Expand Down
2 changes: 1 addition & 1 deletion 012_barcode-scanner-worker-js/src/const.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BrowserTypes } from "@dannadori/000_WorkerBase";
import { BrowserTypes } from "@dannadori/worker-base";

export const WorkerCommand = {
INITIALIZE: "initialize",
Expand Down
1,913 changes: 958 additions & 955 deletions 012demo_barcode-scanner-worker-js-demo/package-lock.json

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions 012demo_barcode-scanner-worker-js-demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -56,9 +56,9 @@
"webpack-dev-server": "^4.8.1"
},
"dependencies": {
"@dannadori/barcode-scanner-worker-js": "^1.0.14",
"demo-base": "file:../000_DemoBase",
"react": "^18.0.0",
"react-dom": "^18.0.0"
"@dannadori/barcode-scanner-worker-js": "^1.0.15",
"@dannadori/demo-base": "^1.0.1",
"react": "^18.1.0",
"react-dom": "^18.1.0"
}
}
2 changes: 1 addition & 1 deletion 012demo_barcode-scanner-worker-js-demo/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { BarcodeScannerWorkerManager, ScanModes, ScanScales } from "@dannadori/b
import { useAppState } from "./provider/AppStateProvider";
import { DataTypesOfDataURL, getDataTypeOfDataURL } from "./utils/urlReader";
import { BarcodeScannerDrawer } from "./BarcodeScannerDrawer";
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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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 { BarcodeScannerConfig, BarcodeScannerOperationParams, generateBarcodeScannerDefaultConfig, generateDefaultBarcodeScannerParams } from "@dannadori/barcode-scanner-worker-js";

Expand Down

0 comments on commit fba01d6

Please sign in to comment.