[FE] Use pnpm diffs instead of file-based diffs (MystenLabs#4401)

klren0312 · Aug 31, 2022 · 804c433 · 804c433
1 parent 002a105
commit 804c433
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 29 deletions.
diff --git a/.github/actions/diffs/action.yml b/.github/actions/diffs/action.yml
@@ -7,15 +7,6 @@ outputs:
   isRust:
     description: True when changes happened to the rust code
     value: "${{ steps.diff.outputs.isRust }}"
-  isExplorerClient:
-    description: True when there are changes to files related to explorer client
-    value: "${{ steps.diff.outputs.isExplorerClient }}"
-  isTypescriptSDK:
-    description: True when there are changes to files related to TypeScript SDK
-    value: "${{ steps.diff.outputs.isTypescriptSDK }}"
-  isWalletExt:
-    description: True when there are changes to files related to Wallet Extension
-    value: "${{ steps.diff.outputs.isWalletExt }}"
 runs:
   using: composite
   steps:
@@ -30,17 +21,7 @@ runs:
           - '.github/workflows/bench.yml'
           - '.github/workflows/codecov.yml'
           - '.github/workflows/rust.yml'
-        isExplorerClient:
-          - 'explorer/client/**'
-          - '.github/workflows/explorer-client-prs.yml'
-        isTypescriptSDK:
-          - 'sdk/typescript/**'
-          - 'crates/sui-open-rpc/samples/**'
-          - '.github/workflows/ts-sdk.yml'
         isDoc:
           - 'doc/**'
           - '*.md'
           - '.github/workflows/docs.yml'
-        isWalletExt:
-          - 'wallet/**'
-          - '.github/workflows/wallet-ext-prs.yml'
diff --git a/.github/actions/pnpm-diffs/action.yml b/.github/actions/pnpm-diffs/action.yml
@@ -7,6 +7,9 @@ outputs:
   isTypeScriptSDK:
     description: True when there are changes to files related to TypeScript SDK
     value: "${{ steps.changes.outputs.sdk }}"
+  isWalletExt:
+    description: True when there are changes to files related to Wallet Extension
+    value: "${{ steps.changes.outputs.wallet }}"
   isWalletAdapter:
     description: True when there are changes to files related to wallet adapter
     value: "${{ steps.changes.outputs.walletAdapter }}"
@@ -30,4 +33,5 @@ runs:
       run: |
         echo "::set-output name=explorer::$(jq 'any(.[]; .name == "sui-explorer")' changes.json)"
         echo "::set-output name=sdk::$(jq 'any(.[]; .name == "@mysten/sui.js")' changes.json)"
+        echo "::set-output name=wallet::$(jq 'any(.[]; .name == "sui-wallet")' changes.json)"
         echo "::set-output name=walletAdapter::$(jq 'any(.[]; .name | startswith("@mysten/wallet-adapter"))' changes.json)"
diff --git a/.github/workflows/ts-sdk.yml b/.github/workflows/ts-sdk.yml
@@ -8,7 +8,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Detect Changes
-        uses: "./.github/actions/diffs"
+        uses: "./.github/actions/pnpm-diffs"
         id: diff
   client_checks:
     name: Test & Build

diff --git a/.github/workflows/wallet-ext-prs.yml b/.github/workflows/wallet-ext-prs.yml
@@ -8,7 +8,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Detect Changes
-        uses: "./.github/actions/diffs"
+        uses: "./.github/actions/pnpm-diffs"
         id: diff
   run_checks:
     name: Lint, Test & Build

diff --git a/crates/sui-open-rpc/package.json b/crates/sui-open-rpc/package.json
@@ -0,0 +1,4 @@
+{
+	"name": "@mysten/sui-open-rpc",
+	"private": true
+}
diff --git a/crates/sui-open-rpc/samples/objects.json b/crates/sui-open-rpc/samples/objects.json
@@ -86,6 +86,7 @@
           "id": {
             "id": "0x1f45933e11d09fa15e65ba6735ce4205c3deec24"
           },
+
           "sword": {
             "type": "0xeaa96afeecd3cf700ca68d6cad4af93f05b59bcd::hero::Sword",
             "fields": {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
@@ -1,5 +1,6 @@
 packages:
-  - 'wallet-adapter/**'
-  - 'sdk/**'
-  - 'explorer/**'
-  - 'wallet/**'
+  - "wallet-adapter/**"
+  - "sdk/**"
+  - "explorer/**"
+  - "wallet/**"
+  - "crates/sui-open-rpc"
diff --git a/sdk/typescript/package.json b/sdk/typescript/package.json
@@ -59,6 +59,7 @@
     }
   ],
   "devDependencies": {
+    "@mysten/sui-open-rpc": "workspace:*",
     "@size-limit/preset-small-lib": "^7.0.8",
     "@types/bn.js": "^5.1.0",
     "@types/lossless-json": "^1.0.1",

diff --git a/sdk/typescript/test/tsconfig.json b/sdk/typescript/test/tsconfig.json
@@ -1,4 +1,7 @@
 {
   "extends": "../tsconfig.json",
-  "include": ["./"]
+  "include": ["./"],
+  "compilerOptions": {
+    "resolveJsonModule": true
+  }
 }
diff --git a/sdk/typescript/test/types/framework.test.ts b/sdk/typescript/test/types/framework.test.ts
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { describe, it, expect } from 'vitest';
-import mockObjectData from '../../../../crates/sui-open-rpc/samples/objects.json';
+import mockObjectData from '@mysten/sui-open-rpc/samples/objects.json';
 import { Coin, GetObjectDataResponse } from '../../src';
 
 import BN from 'bn.js';

diff --git a/sdk/typescript/test/types/objects.test.ts b/sdk/typescript/test/types/objects.test.ts
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { describe, it, expect } from 'vitest';
-import mockObjectData from '../../../../crates/sui-open-rpc/samples/objects.json';
+import mockObjectData from '@mysten/sui-open-rpc/samples/objects.json';
 
 import { isGetObjectDataResponse } from '../../src/index.guard';
 

diff --git a/sdk/typescript/test/types/transactions.test.ts b/sdk/typescript/test/types/transactions.test.ts
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { describe, it, expect } from 'vitest';
-import mockTransactionData from '../../../../crates/sui-open-rpc/samples/transactions.json';
+import mockTransactionData from '@mysten/sui-open-rpc/samples/transactions.json';
 
 import { isSuiTransactionResponse } from '../../src/index.guard';