Skip to content

Commit

Permalink
fix(deps): Use published threads package (#369)
Browse files Browse the repository at this point in the history
Use published threads package
  • Loading branch information
Akim authored Oct 25, 2023
1 parent f9abc64 commit a605d75
Show file tree
Hide file tree
Showing 12 changed files with 39 additions and 36 deletions.
2 changes: 1 addition & 1 deletion packages/core/js-client-isomorphic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@fluencelabs/avm": "0.52.0",
"@fluencelabs/marine-js": "0.7.2",
"@fluencelabs/marine-worker": "workspace:*",
"threads": "fluencelabs/threads.js#b00a5342380b0278d3ae56dcfb170effb3cad7cd"
"@fluencelabs/threads": "^2.0.0"
},
"keywords": [],
"author": "Fluence Labs",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/js-client-isomorphic/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

import { Worker } from "threads/master";
import { Worker } from "@fluencelabs/threads/master";

export type VersionedPackage = { name: string; version: string };
export type GetWorker = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

import { BlobWorker } from "threads/master";
import { BlobWorker } from "@fluencelabs/threads/master";

import { fetchResource } from "../fetchers/browser.js";
import type { GetWorker, VersionedPackage } from "../types.js";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { createRequire } from "module";
import { dirname, relative } from "path";
import { fileURLToPath } from "url";

import { Worker } from "threads/master";
import { Worker } from "@fluencelabs/threads/master";

import type { GetWorker, VersionedPackage } from "../types.js";

Expand Down
2 changes: 1 addition & 1 deletion packages/core/js-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"libp2p": "0.46.6",
"multiformats": "11.0.1",
"rxjs": "7.5.5",
"threads": "fluencelabs/threads.js#b00a5342380b0278d3ae56dcfb170effb3cad7cd",
"@fluencelabs/threads": "^2.0.0",
"ts-pattern": "3.3.3",
"uint8arrays": "4.0.3",
"uuid": "8.3.2",
Expand Down
5 changes: 4 additions & 1 deletion packages/core/js-client/src/marine/deps-loader/node.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ import fs from "fs";
import { createRequire } from "module";
import path from "path";

import { Worker, type Worker as WorkerImplementation } from "threads/master";
import {
Worker,
type Worker as WorkerImplementation,
} from "@fluencelabs/threads/master";

import { LazyLoader } from "../interfaces.js";

Expand Down
2 changes: 1 addition & 1 deletion packages/core/js-client/src/marine/interfaces.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {
RunParameters,
} from "@fluencelabs/avm";
import { JSONObject, JSONValue, JSONArray } from "@fluencelabs/interfaces";
import type { Worker as WorkerImplementation } from "threads/master";
import type { Worker as WorkerImplementation } from "@fluencelabs/threads/master";

import { IStartable, CallParameters } from "../util/commonTypes.js";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@
* limitations under the License.
*/

import { Worker, type Worker as WorkerImplementation } from "threads/master";
import {
Worker,
type Worker as WorkerImplementation,
} from "@fluencelabs/threads/master";

import { LazyLoader } from "../interfaces.js";

Expand Down
2 changes: 1 addition & 1 deletion packages/core/js-client/src/marine/worker/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import type {
} from "@fluencelabs/marine-js/dist/types";
import { LogFunction, logLevelToEnv } from "@fluencelabs/marine-js/dist/types";
import type { MarineBackgroundInterface } from "@fluencelabs/marine-worker";
import { ModuleThread, Thread, spawn } from "threads/master";
import { ModuleThread, Thread, spawn } from "@fluencelabs/threads/master";

import { MarineLogger, marineLogger } from "../../util/logger.js";
import { IMarineHost, IWasmLoader, IWorkerLoader } from "../interfaces.js";
Expand Down
2 changes: 1 addition & 1 deletion packages/core/marine-worker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@
"dependencies": {
"@fluencelabs/marine-js": "0.7.2",
"observable-fns": "0.6.1",
"threads": "fluencelabs/threads.js#b00a5342380b0278d3ae56dcfb170effb3cad7cd"
"@fluencelabs/threads": "^2.0.0"
}
}
2 changes: 1 addition & 1 deletion packages/core/marine-worker/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import type {
LogMessage,
} from "@fluencelabs/marine-js/dist/types";
import { JSONValue } from "@fluencelabs/marine-js/dist/types";
import { expose } from "@fluencelabs/threads/worker";
import { Observable, Subject } from "observable-fns";
import { expose } from "threads/worker";

const createSimpleModuleDescriptor = (
name: string,
Expand Down
47 changes: 22 additions & 25 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit a605d75

Please sign in to comment.