Skip to content

Commit d48a2da

Browse files
dOrgJellidOrgJelli
committed
Merge branch 'origin-dev' into kris/add-github-resolver
2 parents a73316e + 64c658e commit d48a2da

35 files changed

Lines changed: 630 additions & 591 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# Polywrap Origin (0.12.0-pre.1)
2+
## Breaking changes
3+
* [PR-56](https://github.com/polywrap/javascript-client/pull/56) **Wrapscan resolver**
4+
* Added the [Wrapscan URI resolver](https://github.com/polywrap/uri-resolver-extensions/tree/master/implementations/wrapscan) as one of the default URI resolvers
5+
* You can now use `wrapscan/author/wrap@version` URIs to resolve Wraps published to Wrapscan
6+
17
# Polywrap Origin (0.11.0)
28
## Features
39
**`@polywrap/core-js`:**

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.11.0
1+
0.12.0-pre.1

‎packages/asyncify/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@polywrap/asyncify-js",
33
"description": "Async Wasm Imports Support Using Asyncify",
4-
"version": "0.11.0",
4+
"version": "0.12.0-pre.1",
55
"license": "MIT",
66
"repository": {
77
"type": "git",

‎packages/client/package.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@polywrap/client-js",
33
"description": "Polywrap JavaScript Client",
4-
"version": "0.11.0",
4+
"version": "0.12.0-pre.1",
55
"license": "MIT",
66
"repository": {
77
"type": "git",
@@ -23,21 +23,21 @@
2323
"build:readme": "yarn doc-snippets combine"
2424
},
2525
"dependencies": {
26-
"@polywrap/client-config-builder-js": "0.11.0",
27-
"@polywrap/core-client-js": "0.11.0",
28-
"@polywrap/core-js": "0.11.0",
29-
"@polywrap/msgpack-js": "0.11.0",
30-
"@polywrap/plugin-js": "0.11.0",
31-
"@polywrap/result": "0.11.0",
32-
"@polywrap/tracing-js": "0.11.0",
33-
"@polywrap/uri-resolver-extensions-js": "0.11.0",
34-
"@polywrap/uri-resolvers-js": "0.11.0",
35-
"@polywrap/wrap-manifest-types-js": "0.11.0"
26+
"@polywrap/client-config-builder-js": "0.12.0-pre.1",
27+
"@polywrap/core-client-js": "0.12.0-pre.1",
28+
"@polywrap/core-js": "0.12.0-pre.1",
29+
"@polywrap/msgpack-js": "0.12.0-pre.1",
30+
"@polywrap/plugin-js": "0.12.0-pre.1",
31+
"@polywrap/result": "0.12.0-pre.1",
32+
"@polywrap/tracing-js": "0.12.0-pre.1",
33+
"@polywrap/uri-resolver-extensions-js": "0.12.0-pre.1",
34+
"@polywrap/uri-resolvers-js": "0.12.0-pre.1",
35+
"@polywrap/wrap-manifest-types-js": "0.12.0-pre.1"
3636
},
3737
"devDependencies": {
3838
"@polywrap/cli-js": "~0.10.0",
39-
"@polywrap/sys-config-bundle-js": "0.11.0",
40-
"@polywrap/test-cases": "0.11.0",
39+
"@polywrap/sys-config-bundle-js": "0.12.0-pre.1",
40+
"@polywrap/test-cases": "0.12.0-pre.1",
4141
"@types/jest": "29.5.0",
4242
"@types/prettier": "2.6.0",
4343
"@types/uuid": "8.3.0",

‎packages/config-builder/package.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@polywrap/client-config-builder-js",
33
"description": "Polywrap JavaScript Client configuration",
4-
"version": "0.11.0",
4+
"version": "0.12.0-pre.1",
55
"license": "MIT",
66
"repository": {
77
"type": "git",
@@ -22,14 +22,14 @@
2222
"build:readme": "yarn doc-snippets combine"
2323
},
2424
"dependencies": {
25-
"@polywrap/config-bundle-types-js": "0.11.0",
26-
"@polywrap/core-js": "0.11.0",
27-
"@polywrap/plugin-js": "0.11.0",
28-
"@polywrap/sys-config-bundle-js": "0.11.0",
29-
"@polywrap/uri-resolver-extensions-js": "0.11.0",
30-
"@polywrap/uri-resolvers-js": "0.11.0",
31-
"@polywrap/wasm-js": "0.11.0",
32-
"@polywrap/web3-config-bundle-js": "0.11.0"
25+
"@polywrap/config-bundle-types-js": "0.12.0-pre.1",
26+
"@polywrap/core-js": "0.12.0-pre.1",
27+
"@polywrap/plugin-js": "0.12.0-pre.1",
28+
"@polywrap/sys-config-bundle-js": "0.12.0-pre.1",
29+
"@polywrap/uri-resolver-extensions-js": "0.12.0-pre.1",
30+
"@polywrap/uri-resolvers-js": "0.12.0-pre.1",
31+
"@polywrap/wasm-js": "0.12.0-pre.1",
32+
"@polywrap/web3-config-bundle-js": "0.12.0-pre.1"
3333
},
3434
"devDependencies": {
3535
"@types/jest": "29.5.0",

‎packages/config-bundle/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@polywrap/config-bundle-types-js",
3-
"version": "0.11.0",
3+
"version": "0.12.0-pre.1",
44
"license": "MIT",
55
"repository": {
66
"type": "git",
@@ -15,7 +15,7 @@
1515
"lint": "eslint --color -c ../../.eslintrc.js src/"
1616
},
1717
"dependencies": {
18-
"@polywrap/core-js": "0.11.0"
18+
"@polywrap/core-js": "0.12.0-pre.1"
1919
},
2020
"devDependencies": {
2121
"rimraf": "3.0.2",

‎packages/config-bundles/sys/README.md‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@ import { dateTimePlugin } from "@polywrap/datetime-plugin-js";
1010
import { concurrentPromisePlugin } from "@polywrap/concurrent-plugin-js";
1111
import { httpPlugin } from "@polywrap/http-plugin-js";
1212
import * as httpResolver from "./embeds/http-resolver/wrap";
13+
import * as ipfsHttpClient from "./embeds/ipfs-http-client/wrap";
14+
import * as ipfsResolver from "./embeds/async-ipfs-resolver/wrap";
15+
16+
export const ipfsProviders: string[] = [
17+
"https://ipfs.wrappers.io",
18+
"https://ipfs.io",
19+
];
1320

1421
export const bundle: Bundle = {
1522
logger: {
@@ -45,6 +52,34 @@ export const bundle: Bundle = {
4552
],
4653
redirectFrom: ["ens/wraps.eth:http-uri-resolver-ext@1.0.1"],
4754
},
55+
wrapscanResolver: {
56+
uri: "https://wraps.wrapscan.io/r/polywrap/wrapscan-uri-resolver@1.0",
57+
implements: [
58+
"wrapscan/polywrap/wrapscan-uri-resolver@1.0",
59+
ExtendableUriResolver.defaultExtInterfaceUris[2].uri,
60+
],
61+
redirectFrom: ["wrapscan/polywrap/wrapscan-uri-resolver@1.0"],
62+
},
63+
ipfsHttpClient: {
64+
uri: "embed/ipfs-http-client@1.0.0",
65+
package: ipfsHttpClient.wasmPackage,
66+
implements: ["ens/wraps.eth:ipfs-http-client@1.0.0"],
67+
redirectFrom: ["ens/wraps.eth:ipfs-http-client@1.0.0"],
68+
},
69+
ipfsResolver: {
70+
uri: "embed/async-ipfs-uri-resolver-ext@1.0.1",
71+
package: ipfsResolver.wasmPackage,
72+
implements: [
73+
"ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.1",
74+
ExtendableUriResolver.defaultExtInterfaceUris[0].uri,
75+
],
76+
redirectFrom: ["ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.1"],
77+
env: {
78+
provider: ipfsProviders[0],
79+
fallbackProviders: ipfsProviders.slice(1),
80+
retries: { tryResolveUri: 2, getFile: 2 },
81+
},
82+
},
4883
};
4984
```
5085

‎packages/config-bundles/sys/package.json‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@polywrap/sys-config-bundle-js",
3-
"version": "0.11.0",
3+
"version": "0.12.0-pre.1",
44
"license": "MIT",
55
"repository": {
66
"type": "git",
@@ -14,21 +14,23 @@
1414
"scripts": {
1515
"build": "rimraf ./build && tsc",
1616
"build:docs": "yarn doc-snippets combine",
17+
"embed:wraps": "ts-node ./scripts/embed-wraps.ts",
1718
"lint": "eslint --color -c ../../../.eslintrc.js src/"
1819
},
1920
"dependencies": {
2021
"@polywrap/concurrent-plugin-js": "~0.10.0",
21-
"@polywrap/config-bundle-types-js": "0.11.0",
22+
"@polywrap/config-bundle-types-js": "0.12.0-pre.1",
2223
"@polywrap/datetime-plugin-js": "~0.10.0",
2324
"@polywrap/file-system-plugin-js": "~0.10.0",
2425
"@polywrap/http-plugin-js": "~0.10.0",
2526
"@polywrap/logger-plugin-js": "~0.10.0",
26-
"@polywrap/uri-resolver-extensions-js": "0.11.0",
27+
"@polywrap/uri-resolver-extensions-js": "0.12.0-pre.1",
2728
"base64-to-uint8array": "1.0.0"
2829
},
2930
"devDependencies": {
3031
"doc-snippets": "~1.0.0",
3132
"rimraf": "3.0.2",
33+
"ts-node": "10.9.1",
3234
"typescript": "4.9.5"
3335
},
3436
"publishConfig": {

packages/config-bundles/web3/scripts/embed-wraps.ts renamed to packages/config-bundles/sys/scripts/embed-wraps.ts

File renamed without changes.

‎packages/config-bundles/sys/src/common.ts‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@ import { dateTimePlugin } from "@polywrap/datetime-plugin-js";
99
import { concurrentPromisePlugin } from "@polywrap/concurrent-plugin-js";
1010
import { httpPlugin } from "@polywrap/http-plugin-js";
1111
import * as httpResolver from "./embeds/http-resolver/wrap";
12+
import * as ipfsHttpClient from "./embeds/ipfs-http-client/wrap";
13+
import * as ipfsResolver from "./embeds/async-ipfs-resolver/wrap";
14+
15+
export const ipfsProviders: string[] = [
16+
"https://ipfs.wrappers.io",
17+
"https://ipfs.io",
18+
];
1219

1320
export const bundle: Bundle = {
1421
logger: {
@@ -48,5 +55,33 @@ export const bundle: Bundle = {
4855
],
4956
redirectFrom: ["ens/wraps.eth:http-uri-resolver-ext@1.0.1"],
5057
},
58+
wrapscanResolver: {
59+
uri: "https://wraps.wrapscan.io/r/polywrap/wrapscan-uri-resolver@1.0",
60+
implements: [
61+
"wrapscan/polywrap/wrapscan-uri-resolver@1.0",
62+
ExtendableUriResolver.defaultExtInterfaceUris[2].uri,
63+
],
64+
redirectFrom: ["wrapscan/polywrap/wrapscan-uri-resolver@1.0"],
65+
},
66+
ipfsHttpClient: {
67+
uri: "embed/ipfs-http-client@1.0.0",
68+
package: ipfsHttpClient.wasmPackage,
69+
implements: ["ens/wraps.eth:ipfs-http-client@1.0.0"],
70+
redirectFrom: ["ens/wraps.eth:ipfs-http-client@1.0.0"],
71+
},
72+
ipfsResolver: {
73+
uri: "embed/async-ipfs-uri-resolver-ext@1.0.1",
74+
package: ipfsResolver.wasmPackage,
75+
implements: [
76+
"ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.1",
77+
ExtendableUriResolver.defaultExtInterfaceUris[0].uri,
78+
],
79+
redirectFrom: ["ens/wraps.eth:async-ipfs-uri-resolver-ext@1.0.1"],
80+
env: {
81+
provider: ipfsProviders[0],
82+
fallbackProviders: ipfsProviders.slice(1),
83+
retries: { tryResolveUri: 2, getFile: 2 },
84+
},
85+
},
5186
};
5287
// $end

0 commit comments

Comments
 (0)