Merge branch 'master' into impr-docs

near · Dec 26, 2024 · e1c6c57 · e1c6c57
2 parents 99c7e13 + ae0d1c4
commit e1c6c57
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -123,7 +123,7 @@ jobs:
       env:
         RUSTDOCFLAGS: -D warnings
       run: |
-        cargo doc -p near-sdk --features unstable,legacy,unit-testing,__macro-docs,near-primitives,near-vm-runner
-        cargo doc -p near-sdk-macros
-        cargo doc -p near-contract-standards --no-deps
+        cargo doc -p near-sdk --features unstable,legacy,unit-testing,__macro-docs,__abi-generate,near-primitives,near-vm-runner
+        cargo doc -p near-sdk-macros --features __abi-generate
+        cargo doc -p near-contract-standards --no-deps --features abi
         cargo doc -p near-sys
diff --git a/near-contract-standards/Cargo.toml b/near-contract-standards/Cargo.toml
@@ -24,4 +24,7 @@ near-sdk = { path = "../near-sdk", default-features = false, features = [
 
 [features]
 default = []
-abi = ["near-sdk/abi"]
+abi = ["near-sdk/__abi-generate"]
+
+[package.metadata.docs.rs]
+features = ["abi"]
diff --git a/near-sdk-macros/Cargo.toml b/near-sdk-macros/Cargo.toml
@@ -34,3 +34,6 @@ prettyplease = { version = "0.2.15" }
 abi = []
 __abi-embed = ["abi"]
 __abi-generate = ["abi"]
+
+[package.metadata.docs.rs]
+features = ["__abi-generate"]
diff --git a/near-sdk/Cargo.toml b/near-sdk/Cargo.toml
@@ -98,4 +98,4 @@ __abi-generate = ["abi", "near-sdk-macros/__abi-generate"]
 __macro-docs = []
 
 [package.metadata.docs.rs]
-features = ["unstable", "legacy", "unit-testing", "__macro-docs", "near-primitives", "near-vm-runner"]
+features = ["unstable", "legacy", "unit-testing", "__macro-docs", "__abi-generate", "near-primitives", "near-vm-runner"]