chore: build steps 50%

.eslintrc.json

@@ -19,23 +19,23 @@
   "settings": {
     "import/resolver": {
       "node": true,
-      "typescript": true,
-      "alias": {
-        "map": [
-          [
-            "rust-src",
-            "/rust-src/pkg"
-          ]
-        ],
-        "extensions": [
-          ".js",
-          ".jsx",
-          ".ts",
-          ".tsx",
-          ".json",
-          ".wasm"
-        ]
-      }
+      "typescript": true
+      // "alias": {
+      //   "map": [
+      //     [
+      //       "rust-src",
+      //       "/rust-src/pkg"
+      //     ]
+      //   ],
+      //   "extensions": [
+      //     ".js",
+      //     ".jsx",
+      //     ".ts",
+      //     ".tsx",
+      //     ".json",
+      //     ".wasm"
+      //   ]
+      // }
     }
   }
 }

.gitlab-ci.yml

 stages:
   - install
-  - check
-  - lint
-  - test
+  - rs_check_lint
   - wasm
+  - ts_check_lint
+  - test
   - build
   - deploy
 
@@ -22,31 +22,15 @@ npm_ci:
   dependencies:
     - npm_ci
 
-ts_check:
-  dependencies:
-    - npm_ci
-  stage: check
-  tags:
-    - linux
-  script:
-    - npx tsc
-
 rs_check:
-  stage: check
+  stage: rs_check_lint
   image: rust:latest
   tags:
     - linux
   script: cd rust-src && cargo check
 
-ts_lint:
-  extends: .build_base
-  stage: lint
-  tags:
-    - linux
-  script: npm run lint
-
 rs_lint:
-  stage: lint
+  stage: rs_check_lint
   image: rust:latest
   tags:
     - linux
@@ -70,6 +54,25 @@ wasm_build:
       - rust-src/pkg
       - node_modules
 
+ts_check:
+  dependencies:
+    - npm_ci
+    - wasm_build
+  stage: ts_check_lint
+  tags:
+    - linux
+  script:
+    - npx tsc
+
+ts_lint:
+  dependencies:
+    - wasm_build
+  extends: .build_base
+  stage: ts_check_lint
+  tags:
+    - linux
+  script: npm run lint
+
 npm_build:
   dependencies:
     - wasm_build
@@ -90,7 +93,7 @@ deploy:
     - linux
   only:
     - main
-  dependencies: 
+  dependencies:
     - npm_build
   script:
     - mv neos-assets dist/

rust-src/Cargo.toml

@@ -23,3 +23,10 @@ wasm-bindgen-test = "0.3.13"
 
 [profile.release]
 opt-level = "s"
+
+[source.crates-io]
+registry = "https://github.com/rust-lang/crates.io-index"
+replace-with = 'ustc'
+
+[source.ustc]
+registry = "git://mirrors.ustc.edu.cn/crates.io-index"

src/env.d.ts

@@ -14,25 +14,25 @@ interface ImportMeta {
 /**
  * 手动声明WASM模块rust-src
  */
-declare module "rust-src" {
-  export default function rustInit(url?: URL): Promise<void>;
-  export class BufferWriter {
-    constructor();
-    public writeInt8(value: number): void;
-    public writeUint8(value: number): void;
-    public writeInt16(value: number): void;
-    public writeUint16(value: number): void;
-    public writeInt32(value: number): void;
-    public writeUint32(value: number): void;
-    public toArray(): Uint8Array;
-  }
-  export class BufferReader {
-    constructor(buffer: Uint8Array);
-    public readInt8(): number;
-    public readUint8(): number;
-    public readInt16(): number;
-    public readUint16(): number;
-    public readInt32(): number;
-    public readUint32(): number;
-  }
-}
+// declare module "rust-src" {
+//   export default function rustInit(url?: URL): Promise<void>;
+//   export class BufferWriter {
+//     constructor();
+//     public writeInt8(value: number): void;
+//     public writeUint8(value: number): void;
+//     public writeInt16(value: number): void;
+//     public writeUint16(value: number): void;
+//     public writeInt32(value: number): void;
+//     public writeUint32(value: number): void;
+//     public toArray(): Uint8Array;
+//   }
+//   export class BufferReader {
+//     constructor(buffer: Uint8Array);
+//     public readInt8(): number;
+//     public readUint8(): number;
+//     public readInt16(): number;
+//     public readUint16(): number;
+//     public readInt32(): number;
+//     public readUint32(): number;
+//   }
+// }

tsconfig.json

@@ -26,9 +26,13 @@
       "@/*": [
         "./src/*"
       ],
+      "rust-src": [
+        "./rust-src/pkg"
+      ]
     }
   },
   "include": [
     "src",
+    "rust-src/pkg"
   ]
 }

vite.config.ts

@@ -13,7 +13,7 @@ export default defineConfig({
   plugins: [
     react(),
     svgr(),
-    wasmPack("./rust-src"),
+    // wasmPack("./rust-src"),
     ydkLoader(),
     tsconfigPaths(),
   ],