diff --git a/.github/release-please/config.json b/.github/release-please/config.json index e784263a..c2a5ab5a 100644 --- a/.github/release-please/config.json +++ b/.github/release-please/config.json @@ -9,11 +9,8 @@ ], "packages": { "packages/client/api": {}, - "packages/client/js-client.node": {}, - "packages/client/js-client.web": {}, - "packages/client/js-client.web.standalone": {}, - "packages/client/tools": {}, + "packages/core/js-client": {}, "packages/core/interfaces": {}, - "packages/core/js-peer": {} + "packages/core/marine-worker": {} } } diff --git a/.github/release-please/manifest.json b/.github/release-please/manifest.json index c02b07de..f3478059 100644 --- a/.github/release-please/manifest.json +++ b/.github/release-please/manifest.json @@ -1,9 +1,6 @@ { "packages/client/api": "0.12.1", - "packages/client/js-client.node": "0.7.1", - "packages/client/js-client.web": "0.2.5", - "packages/client/js-client.web.standalone": "0.14.1", - "packages/client/tools": "0.2.1", - "packages/core/interfaces": "0.8.1", - "packages/core/js-peer": "0.9.1" + "packages/core/js-client": "0.0.10", + "packages/core/marine-worker": "0.2.10", + "packages/core/interfaces": "0.8.1" } diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index cc3e8fb0..37addaa7 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -51,4 +51,4 @@ jobs: uses: fluencelabs/flox/.github/workflows/tests.yml@main with: js-client-snapshots: "${{ needs.js-client.outputs.js-client-snapshots }}" - nox-image: "fluencelabs/nox:unstable_minimal" \ No newline at end of file + nox-image: "fluencelabs/nox:unstable_minimal" diff --git a/packages/@tests/aqua/package.json b/packages/@tests/aqua/package.json index d212af8f..18334f43 100644 --- a/packages/@tests/aqua/package.json +++ b/packages/@tests/aqua/package.json @@ -18,6 +18,7 @@ "license": "Apache-2.0", "dependencies": { "@fluencelabs/js-client.api": "workspace:^", + "@fluencelabs/js-client": "workspace:^", "base64-js": "1.5.1" }, "devDependencies": { diff --git a/packages/@tests/aqua/src/index.ts b/packages/@tests/aqua/src/index.ts index 92588e95..dbdc0482 100644 --- a/packages/@tests/aqua/src/index.ts +++ b/packages/@tests/aqua/src/index.ts @@ -1,6 +1,6 @@ import { fromByteArray } from 'base64-js'; -import { Fluence } from '@fluencelabs/js-client.api'; -import type { ClientConfig } from '@fluencelabs/js-client.api'; +import { Fluence } from '@fluencelabs/js-client'; +import type { ClientConfig } from '@fluencelabs/js-client'; import { registerHelloWorld, helloTest, marineTest, resourceTest } from './_aqua/smoke_test.js'; import { wasm } from './wasmb64.js'; diff --git a/packages/@tests/smoke/node/package.json b/packages/@tests/smoke/node/package.json index 88bf67a4..14b223b9 100644 --- a/packages/@tests/smoke/node/package.json +++ b/packages/@tests/smoke/node/package.json @@ -17,9 +17,7 @@ "author": "Fluence Labs", "license": "Apache-2.0", "dependencies": { - "@fluencelabs/js-client.api": "workspace:^", - "@fluencelabs/js-client.node": "workspace:^", - "@test/aqua_for_test": "workspace:^" - }, - "devDependencies": {} + "@fluencelabs/js-client": "workspace:*", + "@test/aqua_for_test": "workspace:../../aqua" + } } diff --git a/packages/@tests/smoke/node/src/index.ts b/packages/@tests/smoke/node/src/index.ts index 7cd822d8..3040537d 100644 --- a/packages/@tests/smoke/node/src/index.ts +++ b/packages/@tests/smoke/node/src/index.ts @@ -1,4 +1,4 @@ -import '@fluencelabs/js-client.node'; +import '@fluencelabs/js-client'; import { runTest } from '@test/aqua_for_test'; runTest().then(() => console.log('Smoke tests succeed!')); diff --git a/packages/@tests/smoke/web-cra-ts/public/index.html b/packages/@tests/smoke/web-cra-ts/public/index.html index 5e519444..d830de49 100644 --- a/packages/@tests/smoke/web-cra-ts/public/index.html +++ b/packages/@tests/smoke/web-cra-ts/public/index.html @@ -7,7 +7,8 @@ - + +