Skip to content

Commit 20f87a7

Browse files
dOrgJellidOrgJelli
committed
Merge branch 'origin-dev' into kris/uri-authority-inference
2 parents 56a07f2 + 69daf7e commit 20f87a7

181 files changed

Lines changed: 4255 additions & 2117 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/cd-javascript.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
echo $(npm whoami --registry https://registry.npmjs.org/)
4646
4747
- name: Install JS dependencies
48-
run: yarn install --nonInteractive --frozen-lockfile
48+
run: (yarn install --nonInteractive --frozen-lockfile || yarn install --nonInteractive --frozen-lockfile)
4949

5050
- name: Build JS packages
5151
run: yarn build

‎.github/workflows/ci-javascript.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
${{ runner.os }}-yarn-
3737
3838
- name: Install dependencies
39-
run: yarn install --nonInteractive --frozen-lockfile --prefer-offline
39+
run: (yarn install --nonInteractive --frozen-lockfile --prefer-offline || yarn install --nonInteractive --frozen-lockfile --prefer-offline)
4040

4141
- name: Lint
4242
run: yarn run lint:ci
@@ -72,7 +72,7 @@ jobs:
7272
${{ runner.os }}-yarn-
7373
7474
- name: Install dependencies
75-
run: yarn install --nonInteractive --frozen-lockfile --prefer-offline
75+
run: (yarn install --nonInteractive --frozen-lockfile --prefer-offline || yarn install --nonInteractive --frozen-lockfile --prefer-offline)
7676

7777
- name: Build
7878
run: yarn build
@@ -113,7 +113,7 @@ jobs:
113113
${{ runner.os }}-yarn-
114114
115115
- name: Install dependencies
116-
run: yarn install --nonInteractive --frozen-lockfile --prefer-offline
116+
run: (yarn install --nonInteractive --frozen-lockfile --prefer-offline || yarn install --nonInteractive --frozen-lockfile --prefer-offline)
117117

118118
- name: Build
119119
run: yarn build

‎.github/workflows/ci-wrap-test-harness.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
${{ runner.os }}-yarn-
7474
7575
- name: Install dependencies
76-
run: yarn install --nonInteractive --frozen-lockfile --prefer-offline
76+
run: (yarn install --nonInteractive --frozen-lockfile --prefer-offline || yarn install --nonInteractive --frozen-lockfile --prefer-offline)
7777
working-directory: ./toolchain
7878

7979
- name: Build toolchain

‎.github/workflows/release-pr.yaml‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -115,25 +115,13 @@ jobs:
115115
with:
116116
node-version: '${{env.NVMRC}}'
117117

118-
- name: Install Rust
119-
uses: actions-rs/toolchain@v1
120-
with:
121-
toolchain: nightly
122-
override: true
123-
124118
- name: Set Git Identity
125119
run: |
126120
git config --global user.name '${{env.BUILD_BOT}}'
127121
git config --global user.email '${{env.BUILD_BOT}}@users.noreply.github.com'
128122
env:
129123
GITHUB_TOKEN: ${{ secrets.POLYWRAP_BUILD_BOT_PAT }}
130124

131-
- name: Apply Rust Version & Commit
132-
working-directory: ./packages/wasm/rs
133-
run: |
134-
cargo install cargo-edit
135-
cargo set-version $(cat ../../../VERSION)
136-
137125
- name: Apply Node Version & Commit
138126
run: |
139127
yarn
@@ -143,7 +131,7 @@ jobs:
143131
144132
- name: Create Pull Request
145133
id: cpr
146-
uses: peter-evans/create-pull-request@v3
134+
uses: peter-evans/create-pull-request@v5
147135
with:
148136
token: ${{ secrets.POLYWRAP_BUILD_BOT_PAT }}
149137
push-to-fork: ${{env.RELEASE_FORKS}}/${{github.event.pull_request.base.repo.name}}
@@ -180,4 +168,4 @@ jobs:
180168
owner: context.repo.owner,
181169
repo: context.repo.repo,
182170
body: '**[Release PR Created](https://github.com/${{github.repository}}/pull/${{ steps.cpr.outputs.pull-request-number }}) (`${{env.RELEASE_VERSION}}`)**'
183-
})
171+
})

‎CHANGELOG.md‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,70 @@
1+
# Polywrap Origin (0.11.0)
2+
## Features
3+
**`@polywrap/client-config-builder-js`:**
4+
* [PR-45](https://github.com/polywrap/javascript-client/pull/45) **Modular Config Bundles**
5+
* The `DefaultBundle` has been broken apart into two separate bundles: `sys` and `web3`.
6+
* `addBundle(...)` has been added to the `ClientConfigBuilder` interface.
7+
* `addDefaults()` now calls `addBundle("sys")` and `addBundle("web3")` internally.
8+
9+
**`@polywrap/sys-config-bundle-js`:**
10+
* [PR-45](https://github.com/polywrap/javascript-client/pull/45) **Bundled System-Level Plugins & Resolvers**
11+
* The sys bundle includes: `logger`, `datetime`, `concurrent`, `http`, `httpResolver`
12+
* This package is compiled to run in both node.js and browsers.
13+
* In node.js, the bundle also includes: `fileSystem`, `fileSystemResolver`.
14+
15+
**`@polywrap/web3-config-bundle-js`:**
16+
* [PR-45](https://github.com/polywrap/javascript-client/pull/45) **Bundled Web3 Plugins & Resolvers**
17+
* The web3 bundle includes: `ethereumProviderV1`, `ethereumProviderV2`, `ipfsHttpClient`, `ipfsResolver`, `ensTextRecordResolver`, `ensResolver`, `ensIpfsContenthashResolver`.
18+
19+
**`@polywrap/config-bundle-types-js`:**
20+
* [PR-45](https://github.com/polywrap/javascript-client/pull/45) **Base Typings For Config Bundle Packages**
21+
* Valid config bundle packages are expected to export a `bundle` value, which is of type `Bundle`.
22+
23+
## Breaking Changes
24+
**`@polywrap/client-config-builder-js`:**
25+
* [PR-47](https://github.com/polywrap/javascript-client/pull/47) **Renaming For Improved Accuracy**
26+
* Renamed `ClientConfigBuilder` to `PolywrapClientConfigBuilder`
27+
* Renamed `IClientConfigBuilder` to `ClientConfigBuilder`
28+
* Renamed `addWrapper(s)` to `setWrapper(s)`
29+
* Renamed `addPackage(s)` to `setPackage(s)`
30+
* Renamed `addRedirect(s)` to `setRedirect(s)`
31+
32+
**`@polywrap/core-js`:**
33+
* [PR-32](https://github.com/polywrap/javascript-client/pull/32) **Rename `getEnvFromUriHistory` to `getEnvFromResolutionPath`**
34+
35+
## Bugs
36+
**`@polywrap/client-js`**
37+
* [PR-32](https://github.com/polywrap/javascript-client/pull/32) **Improved Browser Compatability**
38+
* Building the JS client into browser-based applications no longer requires custom polyfills to remove Node.JS dependencies.
39+
40+
**`@polywrap/client-cofig-builder-js`**
41+
* [PR-37](https://github.com/polywrap/javascript-client/pull/37) **Add `@polywrap/plugin-js` as a Dependency**
42+
* This resolves some package resolution warnings that are emitted from npm when installing the client-config-builder.
43+
44+
**`@polywrap/wasm-js`:**
45+
* [PR-30](https://github.com/polywrap/javascript-client/pull/30) **Properly Serialize Empty Wrap Environment**
46+
* The wrap environment was being improperly encoded as an empty object, which had a size > 0 bytes, causing deserialization to fail. This has been fixed and it is now an empty byte array with size of 0.
47+
48+
# Polywrap Origin (0.10.1)
49+
## Features
50+
**`@polywrap/wasm-js`:**
51+
* [PR-3](https://github.com/polywrap/javascript-client/pull/3) **WasmWrapper Subinvcations Now Retain The Resolution Context**
52+
* Added `resolutionContext` to the `WasmWrapper`'s state.
53+
* Pass the `resolutionContext` through to all subinvocations.
54+
55+
## Bugs
56+
**`@polywrap/client-config-builder-js`**
57+
* [PR-8](https://github.com/polywrap/javascript-client/pull/8) **`tryResolveUri` Now Returns Wrap Packages**
58+
* The default resolver should not automatically convert packages to wrappers. Based on this, the `PackageToWrapperResolver` has been removed from the default config bundle.
59+
60+
**`@polywrap/core-client-js`:**
61+
* [PR-3](https://github.com/polywrap/javascript-client/pull/3) **Properly Track Subinvocation Resolution Contexts**
62+
* Instead of passing the core resolution context to the resolution and invocation processes, seperate sub contexts are created for them. This means that subinvokes will now be tracked in the resolution context.
63+
64+
**`@polywrap/plugin-js`:**
65+
* [PR-3](https://github.com/polywrap/javascript-client/pull/3) **Properly Track Subinvocation Resolution Contexts**
66+
* The client instance provided to plugin methods has been wrapped, enabling the automatic tracking of all subinvocation resolution contexts.
67+
168
# Polywrap Origin (0.10.0)
269
## Features
370
**`@polywrap/client-js`:**

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.10.0
1+
0.10.1

‎integration-tests/package.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"name": "integration-tests-root",
3+
"license": "MIT",
4+
"private": true,
5+
"workspaces": {
6+
"packages": [
7+
"./**",
8+
"../packages/**"
9+
]
10+
},
11+
"scripts": {
12+
"build": "yarn build:react",
13+
"build:react": "cd react-app && yarn build"
14+
}
15+
}

‎integration-tests/react-app/package.json‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"name": "integration-test-react-app",
3+
"version": "0.1.0",
4+
"private": true,
5+
"dependencies": {
6+
"@polywrap/client-js": "~0.10.1",
7+
"@polywrap/sys-config-bundle-js": "~0.10.1",
8+
"@types/react": "^18.2.13",
9+
"@types/react-dom": "^18.2.6",
10+
"react": "^18.2.0",
11+
"react-dom": "^18.2.0",
12+
"react-scripts": "5.0.1",
13+
"typescript": "4.9.5"
14+
},
15+
"scripts": {
16+
"start": "react-scripts start",
17+
"build": "react-scripts build"
18+
},
19+
"browserslist": {
20+
"production": [
21+
">0.2%",
22+
"not dead",
23+
"not op_mini all"
24+
],
25+
"development": [
26+
"last 1 chrome version",
27+
"last 1 firefox version",
28+
"last 1 safari version"
29+
]
30+
}
31+
}

‎integration-tests/react-app/public/favicon.ico‎

3.78 KB
Binary file not shown.

‎integration-tests/react-app/public/index.html‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8" />
5+
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
6+
<meta name="viewport" content="width=device-width, initial-scale=1" />
7+
<meta name="theme-color" content="#000000" />
8+
<meta
9+
name="description"
10+
content="Web site created using create-react-app"
11+
/>
12+
<title>React App</title>
13+
</head>
14+
<body>
15+
<noscript>You need to enable JavaScript to run this app.</noscript>
16+
<div id="root"></div>
17+
<!--
18+
This HTML file is a template.
19+
If you open it directly in the browser, you will see an empty page.
20+
21+
You can add webfonts, meta tags, or analytics to this file.
22+
The build step will place the bundled scripts into the <body> tag.
23+
24+
To begin the development, run `npm start` or `yarn start`.
25+
To create a production bundle, use `npm run build` or `yarn build`.
26+
-->
27+
</body>
28+
</html>

0 commit comments

Comments
 (0)