Merge branch 'fix/wasm_loader' into 'main'

fix

See merge request mycard/Neos!134

.gitlab-ci.yml

@@ -22,17 +22,14 @@ npm_ci:
   dependencies:
     - npm_ci
 
-# ts_check:
-#   dependencies:
-#     - npm_ci
-#   stage: check
-#   tags:
-#     - linux
-#   before_script:
-#     - curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
-#   script:
-#     - wasm-pack build ./rust-src --target web
-#     - npx tsc
+ts_check:
+  dependencies:
+    - npm_ci
+  stage: check
+  tags:
+    - linux
+  script:
+    - npx tsc
 
 rs_check:
   stage: check
@@ -83,7 +80,6 @@ npm_build:
   script:
     - mv neos.config.prod.json neos.config.json
     - npm run build:prod
-    - npx tsc
   artifacts:
     paths:
       - dist

src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/damage.ts

 import { ygopro } from "../../../idl/ocgcore";
-import init, { ocgDamageAdapter } from "rust-src";
+//@ts-ignore
+import { ocgDamageAdapter } from "rust-src";
 
 /*
  * Msg Damage
@@ -7,8 +8,8 @@ import init, { ocgDamageAdapter } from "rust-src";
  * @param player - 玩家编号
  * @param value - 减少的Hp数值
  * */
-export default async (data: Uint8Array) => {
-  const damage = await init().then(() => ocgDamageAdapter(data));
+export default (data: Uint8Array) => {
+  const damage = ocgDamageAdapter(data);
 
   return new ygopro.StocGameMessage.MsgUpdateHp(damage);
 };

src/ui/Duel/main.tsx

@@ -31,6 +31,8 @@ import {
   selectMeInitInfo,
   selectOpInitInfo,
 } from "../../reducers/duel/initInfoSlice";
+//@ts-ignore
+import rustInit from "rust-src";
 
 // Ref: https://github.com/brianzinn/react-babylonjs/issues/126
 const NeosDuel = () => {
@@ -39,6 +41,7 @@ const NeosDuel = () => {
   useEffect(() => {
     const init = async () => {
       await initStrings();
+      await rustInit();
     };
 
     if (initialRender.current) {