trying to uploading for wasm file

jimengio · Apr 16, 2020 · f128d1a · f128d1a
1 parent 9c4ac86
commit f128d1a
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/example/pages/demo-zxing-wasm-scanner-popup.tsx b/example/pages/demo-zxing-wasm-scanner-popup.tsx
@@ -10,7 +10,7 @@ let DemoMixedScannerPopup: FC<{}> = React.memo((props) => {
 
   let popupScanner = usePopupZxingWasmScanner({
     errorLocale: "扫码错误: 无法获取相机图像 无法获取相机图像(可能是因为没有 HTTPS 权限)",
-    zxingWasmPath: "/wasm/zxing-go.wasm",
+    zxingWasmPath: "wasm/zxing-go.wasm",
     onCodeDetected: (code, codeType) => {
       console.log(code, codeType);
     },

diff --git a/example/pages/demo-zxing-wasm-scanner.tsx b/example/pages/demo-zxing-wasm-scanner.tsx
@@ -15,7 +15,7 @@ let DemoZxingWasmScanner: FC<{ className?: string }> = React.memo((props) => {
           onCodeDetected={(code) => {
             console.log("got code", JSON.stringify(code));
           }}
-          zxingWasmPath="/wasm/zxing-go.wasm"
+          zxingWasmPath="wasm/zxing-go.wasm"
         />
       </DocDemo>
     </div>

diff --git a/src/zbar-scanner.tsx b/src/zbar-scanner.tsx
@@ -70,7 +70,7 @@ let ZbarScanner: FC<{
   useEffect(() => {
     (async () => {
       // let scanner = await Scanner({
-      //   locateFile: (file) => "/wasm/zbar.wasm",
+      //   locateFile: (file) => "wasm/zbar.wasm",
       // });
       // refScanner.current = scanner;
     })();

diff --git a/src/zxing-wasm-scanner.tsx b/src/zxing-wasm-scanner.tsx
@@ -176,7 +176,7 @@ let ZxingWasmScanner: FC<{
     }
 
     let mod, inst;
-    WebAssembly.instantiateStreaming(fetch("/wasm/zxing-go.wasm"), go.importObject)
+    WebAssembly.instantiateStreaming(fetch(props.zxingWasmPath), go.importObject)
       .then((result) => {
         mod = result.module;
         inst = result.instance;

diff --git a/webpack/dev.js b/webpack/dev.js
@@ -54,7 +54,7 @@ module.exports = {
   },
   plugins: [
     new webpack.DefinePlugin({
-      GlobalZxingWasmPath: JSON.stringify("/wasm/zxing-go.wasm"),
+      GlobalZxingWasmPath: JSON.stringify("wasm/zxing-go.wasm"),
     }),
     new ForkTsCheckerWebpackPlugin({ checkSyntacticErrors: true, async: false }),
     new webpack.DllReferencePlugin({

diff --git a/webpack/release.js b/webpack/release.js
@@ -55,7 +55,7 @@ module.exports = {
   },
   plugins: [
     new webpack.DefinePlugin({
-      GlobalZxingWasmPath: JSON.stringify("/wasm/zxing-go.wasm"),
+      GlobalZxingWasmPath: JSON.stringify("wasm/zxing-go.wasm"),
     }),
     new ForkTsCheckerWebpackPlugin({ checkSyntacticErrors: true, async: false }),
     new MiniCssExtractPlugin({