Merge pull request #15 from wangeguo/main

chore: update package name, switch to release to npmjs registry
movefuns · Feb 26, 2024 · 476e6b0 · 476e6b0
2 parents 381fc3a + b39f471
commit 476e6b0
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 26 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -1,4 +1,4 @@
-name: Release to ghcr.io
+name: Node.js Package
 
 on:
   push:
@@ -8,9 +8,6 @@ on:
 jobs:
   release:
     runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      packages: write
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -26,12 +23,9 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: "20"
-          registry-url: https://npm.pkg.github.com
+          registry-url: https://registry.npmjs.org/
           scope: "@${{ github.repository_owner }}"
 
-      - name: Setup registry
-        run: echo @${{ github.repository_owner }}:registry=https://npm.pkg.github.com >> .npmrc
-
       - name: Install dependencies
         run: yarn install
 
@@ -41,4 +35,4 @@ jobs:
       - name: Publish package
         run: yarn release
         env:
-          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_MOVEFUNS_TOKEN }}
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ Javascript version of the move language compiler and disassemble
 * Compiling move package into blob example
 ```ts
 import { WasmFs } from '@wasmer/wasmfs'
-import { Git, MovePackage } from '@aptos-labs/move-js'
+import { Git, MovePackage } from '@movefuns/move-js'
 
 const startWasiTask = async (app: HTMLDivElement) => {
   const wasmfs = new WasmFs()
@@ -56,7 +56,7 @@ startWasiTask(app)
 * Disassemble contract example
 ```ts
 import { WasmFs } from '@wasmer/wasmfs'
-import { Disassemble } from '@aptos-labs/move-js'
+import { Disassemble } from '@movefuns/move-js'
 
 const startDisassembleTask = async (app: HTMLDivElement) => {
   const wasmfs = new WasmFs()
@@ -81,7 +81,7 @@ startDisassembleTask(app)
 
 ## Supported Rust Versions
 
-`@aptos-labs/move-js` supports the version of Rust (toolchain and targets) specified
+`@movefuns/move-js` supports the version of Rust (toolchain and targets) specified
 in [`rust-toolchain.toml`](rust-toolchain.toml). At the time of writing, we are
 using version 1.77.0. However, this can change at any time if one of our
 dependencies changes MSRV or through a new patch version.
@@ -94,7 +94,7 @@ Note: You will need rust installed also for this. https://www.rust-lang.org/tool
 curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
 ```
 
-Then get `@aptos-labs/move-js` source:
+Then get `@movefuns/move-js` source:
 
 ```
 git clone https://github.com/movefuns/move-js

diff --git a/examples/disassemble/package.json b/examples/disassemble/package.json
@@ -17,6 +17,6 @@
     "@wasmer/wasi": "^0.12.0",
     "@wasmer/wasm-transformer": "^0.10.0",
     "@wasmer/wasmfs": "^0.12.0",
-    "@aptos-labs/move-js": "../../"
+    "@movefuns/move-js": "../../"
   }
 }
diff --git a/examples/disassemble/src/main.ts b/examples/disassemble/src/main.ts
@@ -1,7 +1,7 @@
 import './style.css'
 
 import { WasmFs } from '@wasmer/wasmfs'
-import { Disassemble } from '@aptos-labs/move-js'
+import { Disassemble } from '@movefuns/move-js'
 
 const startDisassembleTask = async (app: HTMLDivElement) => {
   const wasmfs = new WasmFs()

diff --git a/examples/disassemble/yarn.lock b/examples/disassemble/yarn.lock
@@ -2,7 +2,7 @@
 # yarn lockfile v1
 
 
-"@aptos-labs/move-js@../../":
+"@movefuns/move-js@../../":
   version "0.7.1"
   dependencies:
     "@iarna/toml" "^2.2.5"

diff --git a/examples/my-counter/package.json b/examples/my-counter/package.json
@@ -17,6 +17,6 @@
     "@wasmer/wasi": "^0.12.0",
     "@wasmer/wasm-transformer": "^0.10.0",
     "@wasmer/wasmfs": "^0.12.0",
-    "@aptos-labs/move-js": "../../"
+    "@movefuns/move-js": "../../"
   }
 }
diff --git a/examples/my-counter/src/main.ts b/examples/my-counter/src/main.ts
@@ -1,7 +1,7 @@
 import './style.css'
 
 import { WasmFs } from '@wasmer/wasmfs'
-import { Git, MovePackage } from '@aptos-labs/move-js'
+import { Git, MovePackage } from '@movefuns/move-js'
 
 const startWasiTask = async (app: HTMLDivElement) => {
   const wasmfs = new WasmFs()

diff --git a/examples/my-counter/yarn.lock b/examples/my-counter/yarn.lock
@@ -2,7 +2,7 @@
 # yarn lockfile v1
 
 
-"@aptos-labs/move-js@../../":
+"@movefuns/move-js@../../":
   version "0.7.1"
   dependencies:
     "@iarna/toml" "^2.2.5"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@movefuns/move-js",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "description": "Javascript version of the Move language compiler, supports compiling Move code into Move bytecode in the browser.",
   "keywords": [
     "move",
@@ -23,9 +23,6 @@
     "type": "git",
     "url": "https://github.com/movefuns/move-js"
   },
-  "publishConfig": {
-    "registry": "https://npm.pkg.github.com/"
-  },
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",
   "iife": "dist/index.iife.js",
@@ -44,7 +41,7 @@
     "clean": "rimraf dist && rimraf pkg/*.wasm",
     "release": "npm publish --access public --tag latest"
   },
-  "author": "aptos-labs",
+  "author": "movefuns",
   "license": "SEE LICENSE IN ./LICENSE",
   "peerDependencies": {
     "rollup": "2.x.x"

diff --git a/pkg/move_bg.wasm b/pkg/move_bg.wasm
diff --git a/src/targets/aptos/types/module.rs b/src/targets/aptos/types/module.rs
@@ -1,4 +1,4 @@
-use schemars::{self, JsonSchema};
+use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use std::fmt;
 

diff --git a/src/targets/aptos/types/script.rs b/src/targets/aptos/types/script.rs
@@ -1,7 +1,7 @@
 use crate::utils::serde_helper::vec_bytes;
 use move_core_types::identifier::{IdentStr, Identifier};
 use move_core_types::language_storage::{ModuleId, TypeTag};
-use schemars::{self, JsonSchema};
+use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
 /// Call a Move script function.