Skip to content
This repository was archived by the owner on Aug 12, 2021. It is now read-only.

Commit d16d84a

Browse files
wangshijunwangshijun
authored
feat: ignore dapp blocklet when do blocklet use (#382)
* chore: bump forge sdk * chore: only consume starter blocklets from forge-cli * chore: bump version
1 parent a308b0c commit d16d84a

6 files changed

Lines changed: 104 additions & 98 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ yarn-error.log
1414
*.dump
1515
.package-lock.json
1616
src/cli/misc/create/
17+
.vscode

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 1.2.2 (April 22, 2020)
2+
3+
- chore: only consume starter blocklets from forge-cli
4+
- chore: bump forge sdk
5+
16
## 1.2.1 (March 26, 2020)
27

38
- use npm package's shasum to check

‎package.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@arcblock/forge-cli",
3-
"version": "1.2.1",
3+
"version": "1.2.2",
44
"description": "a general set of CLI for arcblock Forge framework",
55
"license": "Apache-2.0",
66
"main": "src/index.js",
@@ -61,18 +61,18 @@
6161
},
6262
"homepage": "https://github.com/arcblock/forge-cli#readme",
6363
"dependencies": {
64-
"@arcblock/did": "^1.0.39",
65-
"@arcblock/did-util": "^1.2.0",
64+
"@arcblock/did": "^1.2.7",
65+
"@arcblock/did-util": "^1.2.7",
6666
"@arcblock/forge-config": "^1.0.9",
67-
"@arcblock/forge-message": "^1.2.0",
67+
"@arcblock/forge-message": "^1.2.7",
6868
"@arcblock/forge-proto": "^1.2.0",
69-
"@arcblock/forge-util": "^1.0.33",
70-
"@arcblock/forge-wallet": "^1.0.39",
71-
"@arcblock/forge-web": "^1.2.0",
72-
"@arcblock/graphql-client": "^1.2.0",
73-
"@arcblock/grpc-client": "^1.2.0",
74-
"@arcblock/mcrypto": "^1.0.39",
75-
"@arcblock/tx-util": "^1.2.0",
69+
"@arcblock/forge-util": "^1.2.7",
70+
"@arcblock/forge-wallet": "^1.2.7",
71+
"@arcblock/forge-web": "^1.2.10",
72+
"@arcblock/graphql-client": "^1.2.10",
73+
"@arcblock/grpc-client": "^1.2.7",
74+
"@arcblock/mcrypto": "^1.2.7",
75+
"@arcblock/tx-util": "^1.2.10",
7676
"@hutson/set-npm-auth-token-for-ci": "^4.0.3",
7777
"@iarna/toml": "^2.2.3",
7878
"app-module-path": "^2.2.0",

‎src/cli/blocklet/lib/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const getBlocklets = async registry => {
1717
throw new Error('load blocklets configs failed');
1818
}
1919
spinner.succeed('Fetching blocklets information succeed');
20-
return data;
20+
return data.filter(x => ['starter'].includes(x.group));
2121
} catch (error) {
2222
spinner.fail('Fetching blocklets information failed');
2323
print();

‎version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.2.1
1+
1.2.2

‎yarn.lock‎

Lines changed: 85 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -2,40 +2,40 @@
22
# yarn lockfile v1
33

44

5-
"@arcblock/client-extension@^1.2.0":
6-
version "1.2.0"
7-
resolved "https://registry.yarnpkg.com/@arcblock/client-extension/-/client-extension-1.2.0.tgz#18371e9db14747d83c0a7d05176eb2030ce38cae"
8-
integrity sha512-PtFQ7qrKqq/pOwFYNxG+HYjJJ5VaTOcyoTsCkfPNBsXcIOFbezs/KxeZ5gQR6X4I/A1fovuLL5jLfquFgpleSA==
5+
"@arcblock/client-extension@^1.2.7":
6+
version "1.2.7"
7+
resolved "https://registry.npm.taobao.org/@arcblock/client-extension/download/@arcblock/client-extension-1.2.7.tgz#d4b3407498181e8ae125bee6c7f5a1ced565c919"
8+
integrity sha1-1LNAdJgYHorhJb7mx/WhztVlyRk=
99
dependencies:
10-
"@arcblock/did" "^1.0.39"
11-
"@arcblock/did-util" "^1.2.0"
12-
"@arcblock/forge-message" "^1.2.0"
10+
"@arcblock/did" "^1.2.7"
11+
"@arcblock/did-util" "^1.2.7"
12+
"@arcblock/forge-message" "^1.2.7"
1313
"@arcblock/forge-proto" "^1.2.0"
14-
"@arcblock/forge-util" "^1.0.33"
15-
"@arcblock/forge-wallet" "^1.0.39"
16-
"@arcblock/mcrypto" "^1.0.39"
14+
"@arcblock/forge-util" "^1.2.7"
15+
"@arcblock/forge-wallet" "^1.2.7"
16+
"@arcblock/mcrypto" "^1.2.7"
1717
debug "^4.1.1"
1818
lodash "^4.17.14"
1919

20-
"@arcblock/did-util@^1.2.0":
21-
version "1.2.0"
22-
resolved "https://registry.yarnpkg.com/@arcblock/did-util/-/did-util-1.2.0.tgz#4c00d426475e00b54829f7e52b4a0f3c81e76439"
23-
integrity sha512-WGdkG1uhT5LTiEutXo5X/KP3hWLqxGeW0iDhrz3L0kIpBSqwQEkm0WAV/CJOuOxaJ5KLqtVlBg6Yx8xB3+601w==
20+
"@arcblock/did-util@^1.2.7":
21+
version "1.2.7"
22+
resolved "https://registry.npm.taobao.org/@arcblock/did-util/download/@arcblock/did-util-1.2.7.tgz#faa16adb18daebac66790e4ac8e8a966b006c580"
23+
integrity sha1-+qFq2xja66xmeQ5KyOipZrAGxYA=
2424
dependencies:
25-
"@arcblock/did" "^1.0.39"
26-
"@arcblock/forge-message" "^1.2.0"
25+
"@arcblock/did" "^1.2.7"
26+
"@arcblock/forge-message" "^1.2.7"
2727
"@arcblock/forge-proto" "^1.2.0"
28-
"@arcblock/forge-util" "^1.0.33"
29-
"@arcblock/forge-wallet" "^1.0.39"
30-
"@arcblock/mcrypto" "^1.0.39"
28+
"@arcblock/forge-util" "^1.2.7"
29+
"@arcblock/forge-wallet" "^1.2.7"
30+
"@arcblock/mcrypto" "^1.2.7"
3131

32-
"@arcblock/did@^1.0.39":
33-
version "1.0.39"
34-
resolved "https://registry.yarnpkg.com/@arcblock/did/-/did-1.0.39.tgz#b9162061ee96014cc0a3deb0c2cf43ee6a8fee7f"
35-
integrity sha512-NpIubPiTm38+8j0NWqPNvLBunevbTqXxiGNBQWQk/OiL3UV1QuKbYOkvGCgJV2aQmoIe4SUECJkWuC89nBl6/g==
32+
"@arcblock/did@^1.2.7":
33+
version "1.2.7"
34+
resolved "https://registry.npm.taobao.org/@arcblock/did/download/@arcblock/did-1.2.7.tgz#9cf74379b547bdd88a6cd3733efa0c6547a8e667"
35+
integrity sha1-nPdDebVHvdiKbNNzPvoMZUeo5mc=
3636
dependencies:
37-
"@arcblock/forge-util" "^1.0.33"
38-
"@arcblock/mcrypto" "^1.0.39"
37+
"@arcblock/forge-util" "^1.2.7"
38+
"@arcblock/mcrypto" "^1.2.7"
3939
bn.js "^5.0.0"
4040
debug "^4.1.1"
4141
lodash "^4.17.14"
@@ -48,13 +48,13 @@
4848
"@iarna/toml" "^2.2.1"
4949
camelize "^1.0.0"
5050

51-
"@arcblock/forge-message@^1.2.0":
52-
version "1.2.0"
53-
resolved "https://registry.yarnpkg.com/@arcblock/forge-message/-/forge-message-1.2.0.tgz#2b02f53b1dd483d75b983cecdde75f08f6c35bf4"
54-
integrity sha512-18HvaDIv2D0/KsPFKf8mLaEa0MiDc0DvWrzU1Tu9jyo6zk3VBOZ6kJtwwguQF/oFfMXofr9qF9hCDKBJpXIvvg==
51+
"@arcblock/forge-message@^1.2.7":
52+
version "1.2.7"
53+
resolved "https://registry.npm.taobao.org/@arcblock/forge-message/download/@arcblock/forge-message-1.2.7.tgz#de098c12472669ec8a38b4bf33f676f8a8e57804"
54+
integrity sha1-3gmMEkcmaeyKOLS/M/Z2+KjleAQ=
5555
dependencies:
5656
"@arcblock/forge-proto" "^1.2.0"
57-
"@arcblock/forge-util" "^1.0.33"
57+
"@arcblock/forge-util" "^1.2.7"
5858
debug "^4.1.1"
5959
google-protobuf "^3.9.0"
6060
lodash "^4.17.15"
@@ -67,24 +67,24 @@
6767
debug "^4.1.1"
6868
lodash "^4.17.15"
6969

70-
"@arcblock/forge-sdk@^1.2.0":
71-
version "1.2.0"
72-
resolved "https://registry.yarnpkg.com/@arcblock/forge-sdk/-/forge-sdk-1.2.0.tgz#dae735eac884154d846157c1ba1b993a088fa800"
73-
integrity sha512-5xItTJG17HOmRsX2PlefC9h753Ar3X5WGQL5dzOCXokaCuS5v7Ivg2mQNEISp+ZiH4CU87wdWUp+Y6zNbpj9fQ==
74-
dependencies:
75-
"@arcblock/did-util" "^1.2.0"
76-
"@arcblock/forge-message" "^1.2.0"
77-
"@arcblock/forge-util" "^1.0.33"
78-
"@arcblock/forge-wallet" "^1.0.39"
79-
"@arcblock/graphql-client" "^1.2.0"
80-
"@arcblock/grpc-client" "^1.2.0"
70+
"@arcblock/forge-sdk@^1.2.10":
71+
version "1.2.10"
72+
resolved "https://registry.npm.taobao.org/@arcblock/forge-sdk/download/@arcblock/forge-sdk-1.2.10.tgz#52021c7503fc9a48c75a977fa8a18c0a596f05c5"
73+
integrity sha1-UgIcdQP8mkjHWpd/qKGMCllvBcU=
74+
dependencies:
75+
"@arcblock/did-util" "^1.2.7"
76+
"@arcblock/forge-message" "^1.2.7"
77+
"@arcblock/forge-util" "^1.2.7"
78+
"@arcblock/forge-wallet" "^1.2.7"
79+
"@arcblock/graphql-client" "^1.2.10"
80+
"@arcblock/grpc-client" "^1.2.7"
8181
debug "^4.1.1"
8282
react-app-polyfill "^1.0.1"
8383

84-
"@arcblock/forge-util@^1.0.33":
85-
version "1.0.33"
86-
resolved "https://registry.yarnpkg.com/@arcblock/forge-util/-/forge-util-1.0.33.tgz#363cc9dfe2990cb6f633a977f9f74bb0220d55ac"
87-
integrity sha512-YH8r8r33c8rRaL2/qxU8rIdDZQW+jpxpXkVXqnK/PCfBPLAL/NjKs/7xVbfvsE7UBUREDKZhxL9RMmDH2NrAsw==
84+
"@arcblock/forge-util@^1.2.7":
85+
version "1.2.7"
86+
resolved "https://registry.npm.taobao.org/@arcblock/forge-util/download/@arcblock/forge-util-1.2.7.tgz#0e260436b57772a3056e2ae19cb8a6ee5b5efba6"
87+
integrity sha1-DiYENrV3cqMFbirhnLim7lte+6Y=
8888
dependencies:
8989
base64-url "^2.3.2"
9090
bn.js "4.11.6"
@@ -93,27 +93,27 @@
9393
number-to-bn "^1.7.0"
9494
utf8 "^3.0.0"
9595

96-
"@arcblock/forge-wallet@^1.0.39":
97-
version "1.0.39"
98-
resolved "https://registry.yarnpkg.com/@arcblock/forge-wallet/-/forge-wallet-1.0.39.tgz#1a0eb73dbb40a63f86d37192322f0396dcbef940"
99-
integrity sha512-8NzmOax7gDyVaykHsAiDWBURbOaAecv10769TVgYJ79Sa37luxVgb4jyllvVZ1M0g0T9IC1DDhsMFwVpNnVCXA==
96+
"@arcblock/forge-wallet@^1.2.7":
97+
version "1.2.7"
98+
resolved "https://registry.npm.taobao.org/@arcblock/forge-wallet/download/@arcblock/forge-wallet-1.2.7.tgz#170055e68ead9c645f7c4d3f09c9e17aa21bbcb0"
99+
integrity sha1-FwBV5o6tnGRffE0/CcnheqIbvLA=
100100
dependencies:
101-
"@arcblock/did" "^1.0.39"
102-
"@arcblock/mcrypto" "^1.0.39"
101+
"@arcblock/did" "^1.2.7"
102+
"@arcblock/mcrypto" "^1.2.7"
103103
lodash.upperfirst "^4.3.1"
104104

105-
"@arcblock/forge-web@^1.2.0":
106-
version "1.2.0"
107-
resolved "https://registry.yarnpkg.com/@arcblock/forge-web/-/forge-web-1.2.0.tgz#961271a6a51cce4a91acd6e49da659760cd1e15c"
108-
integrity sha512-aflZ654sdEMD/HRM9AruujgIKKQA/iHM3L8IMy57uUWdbVP00ric8LsdwUqe7Cro/Z6itKdcgt9y2/x2W0TyKg==
105+
"@arcblock/forge-web@^1.2.10":
106+
version "1.2.10"
107+
resolved "https://registry.npm.taobao.org/@arcblock/forge-web/download/@arcblock/forge-web-1.2.10.tgz#a3a9956f820399ba31dd5b00518e8d3c50ffd5c3"
108+
integrity sha1-o6mVb4IDmbox3VsAUY6NPFD/1cM=
109109

110-
"@arcblock/graphql-client@^1.2.0":
111-
version "1.2.0"
112-
resolved "https://registry.yarnpkg.com/@arcblock/graphql-client/-/graphql-client-1.2.0.tgz#1101aaa059f4e366c28c6126f9b50a17aa26adcb"
113-
integrity sha512-iXiBBTmebKbIWLiesfpFdUjyssXZUUU/T+1/r5u4jA+4IKCFraexXF3zENeVk1seiAW3zTNjKyF0ZKZlBfQo8Q==
110+
"@arcblock/graphql-client@^1.2.10":
111+
version "1.2.10"
112+
resolved "https://registry.npm.taobao.org/@arcblock/graphql-client/download/@arcblock/graphql-client-1.2.10.tgz#e60611971038dbc3ddbe3dbcd9c02401c8d082fd"
113+
integrity sha1-5gYRlxA428Pdvj282cAkAcjQgv0=
114114
dependencies:
115-
"@arcblock/client-extension" "^1.2.0"
116-
"@arcblock/sdk-util" "^0.25.0"
115+
"@arcblock/client-extension" "^1.2.7"
116+
"@arcblock/sdk-util" "^0.28.2"
117117
blueimp-md5 "^2.10.0"
118118
debug "^4.1.1"
119119
jsonpack "^1.1.5"
@@ -122,24 +122,24 @@
122122
react-app-polyfill "^1.0.1"
123123
wolfy87-eventemitter "^5.2.5"
124124

125-
"@arcblock/grpc-client@^1.2.0":
126-
version "1.2.0"
127-
resolved "https://registry.yarnpkg.com/@arcblock/grpc-client/-/grpc-client-1.2.0.tgz#a8ef79b26837c816a2f266bb5a2619afc5903bf0"
128-
integrity sha512-tgjRaLHaPZ9F7jZYrh8ouLxDJfWjo6STkdL8gNB9XG3Y2hpQF3gf0QDvXtmYdg2dg6qcxbi5RDHhxWajgb/RVw==
125+
"@arcblock/grpc-client@^1.2.7":
126+
version "1.2.7"
127+
resolved "https://registry.npm.taobao.org/@arcblock/grpc-client/download/@arcblock/grpc-client-1.2.7.tgz#d9e97f5d90a83a513d1d22aeba9f16397b0257df"
128+
integrity sha1-2el/XZCoOlE9HSKuup8WOXsCV98=
129129
dependencies:
130-
"@arcblock/client-extension" "^1.2.0"
131-
"@arcblock/forge-message" "^1.2.0"
130+
"@arcblock/client-extension" "^1.2.7"
131+
"@arcblock/forge-message" "^1.2.7"
132132
"@arcblock/forge-proto" "^1.2.0"
133133
debug "^4.1.1"
134134
grpc "^1.24.0"
135135
lodash "^4.17.15"
136136

137-
"@arcblock/mcrypto@^1.0.39":
138-
version "1.0.39"
139-
resolved "https://registry.yarnpkg.com/@arcblock/mcrypto/-/mcrypto-1.0.39.tgz#fe4b17f15bee46def9ccbcb804d06e8a188667aa"
140-
integrity sha512-FMxjkHFZ+jcC+W9VB5YKiSVw1pQL29QTgzcX+n9gr1iDDQAcZ5mF3MUFm5Fi9pvZ97Kt7vxpe6BdKIb3Tj9sRA==
137+
"@arcblock/mcrypto@^1.2.7":
138+
version "1.2.7"
139+
resolved "https://registry.npm.taobao.org/@arcblock/mcrypto/download/@arcblock/mcrypto-1.2.7.tgz#90030e522de63ef4c466351420e9defddab6d94c"
140+
integrity sha1-kAMOUi3mPvTEZjUUIOne/dq22Uw=
141141
dependencies:
142-
"@arcblock/forge-util" "^1.0.33"
142+
"@arcblock/forge-util" "^1.2.7"
143143
bn.js "4.11.8"
144144
crypto-js "^3.1.9-1"
145145
elliptic "^6.4.1"
@@ -149,23 +149,23 @@
149149
randombytes "^2.0.6"
150150
tweetnacl "^1.0.1"
151151

152-
"@arcblock/sdk-util@^0.25.0":
153-
version "0.25.0"
154-
resolved "https://registry.yarnpkg.com/@arcblock/sdk-util/-/sdk-util-0.25.0.tgz#2967dc0798dde110f31491fe567e9eef68ee41bc"
155-
integrity sha512-nV5ZDU53H2fgCStgieNYXT7NlmrhqnmI34VOCyH4qsUHDkDxwmBuB5YgHoZsmjc0oKU2zhMNPQ94N9U02jLfVA==
152+
"@arcblock/sdk-util@^0.28.2":
153+
version "0.28.2"
154+
resolved "https://registry.npm.taobao.org/@arcblock/sdk-util/download/@arcblock/sdk-util-0.28.2.tgz#d18a69b61acdb6a35676fcd11397fb2ef5043248"
155+
integrity sha1-0YppthrNtqNWdvzRE5f7LvUEMkg=
156156
dependencies:
157157
axios "^0.19.0"
158158
debug "^4.1.1"
159-
graphql "^14.1.1"
159+
graphql "14.6.0"
160160
lodash.get "^4.4.2"
161161
lodash.set "^4.3.2"
162162

163-
"@arcblock/tx-util@^1.2.0":
164-
version "1.2.0"
165-
resolved "https://registry.yarnpkg.com/@arcblock/tx-util/-/tx-util-1.2.0.tgz#ca075023ff734ad33318dae2b9b6a3a66cf331fc"
166-
integrity sha512-a/LOcXT9ay5RpaHi9s6OFrwguaYCOnyqo6Rslq8o5nOLFwA/rwUNs498w6yh7kM0ZJVM2eyzGCa7wYkaxk0C6A==
163+
"@arcblock/tx-util@^1.2.10":
164+
version "1.2.10"
165+
resolved "https://registry.npm.taobao.org/@arcblock/tx-util/download/@arcblock/tx-util-1.2.10.tgz#7f4aba089cae121d426fd44f3ad08f9b3fe23127"
166+
integrity sha1-f0q6CJyuEh1Cb9RPOtCPmz/iMSc=
167167
dependencies:
168-
"@arcblock/forge-sdk" "^1.2.0"
168+
"@arcblock/forge-sdk" "^1.2.10"
169169
debug "^4.1.1"
170170

171171
"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.8.3":
@@ -2953,10 +2953,10 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6
29532953
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
29542954
integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
29552955

2956-
graphql@^14.1.1:
2956+
graphql@14.6.0:
29572957
version "14.6.0"
2958-
resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.6.0.tgz#57822297111e874ea12f5cd4419616930cd83e49"
2959-
integrity sha512-VKzfvHEKybTKjQVpTFrA5yUq2S9ihcZvfJAtsDBBCuV6wauPu1xl/f9ehgVf0FcEJJs4vz6ysb/ZMkGigQZseg==
2958+
resolved "https://registry.npm.taobao.org/graphql/download/graphql-14.6.0.tgz?cache=0&sync_timestamp=1585840662829&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fgraphql%2Fdownload%2Fgraphql-14.6.0.tgz#57822297111e874ea12f5cd4419616930cd83e49"
2959+
integrity sha1-V4IilxEeh06hL1zUQZYWkwzYPkk=
29602960
dependencies:
29612961
iterall "^1.2.2"
29622962

0 commit comments

Comments
 (0)