Skip to content

Commit 1b66ad6

Browse files
committed
fix: run utooweb ci on macos
1 parent ca04c30 commit 1b66ad6

File tree

5 files changed

+61
-154
lines changed

5 files changed

+61
-154
lines changed

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/utoo-wasm/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ mod project;
2727
pub(crate) mod tokio_runtime;
2828
pub use project::Project;
2929

30-
// #[global_allocator]
31-
// static ALLOC: turbo_tasks_malloc::TurboMalloc = turbo_tasks_malloc::TurboMalloc;
32-
//
30+
#[global_allocator]
31+
static ALLOC: turbo_tasks_malloc::TurboMalloc = turbo_tasks_malloc::TurboMalloc;
32+
3333
#[wasm_bindgen(start)]
3434
fn init_pack() {
3535
panic::set_hook(Box::new(console_error_panic_hook::hook));

next.js

Submodule next.js updated 1 file

packages/utoo-web/src/utoo/index.d.ts

Lines changed: 54 additions & 147 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,12 @@
22
/* eslint-disable */
33
export function init_pack(): void;
44
export function init_log_filter(filter: string): void;
5-
export function recvWorkerRequest(pool_id: string): Promise<number>;
6-
export function sendTaskMessage(
7-
task_id: number,
8-
message: string,
9-
): Promise<void>;
105
export function recvPoolRequest(): Promise<PoolOptions>;
11-
export function recvMessageInWorker(worker_id: number): Promise<string>;
12-
export function notifyWorkerAck(
13-
task_id: number,
14-
worker_id: number,
15-
): Promise<void>;
6+
export function sendTaskMessage(task_id: number, message: string): Promise<void>;
167
export function recvWorkerTermination(): Promise<WorkerTermination>;
8+
export function notifyWorkerAck(task_id: number, worker_id: number): Promise<void>;
9+
export function recvMessageInWorker(worker_id: number): Promise<string>;
10+
export function recvWorkerRequest(pool_id: string): Promise<number>;
1711
/**
1812
* Entry point for web workers
1913
*/
@@ -26,13 +20,13 @@ export class CreateSyncAccessHandleOptions {
2620
}
2721
export class DirEntry {
2822
private constructor();
29-
/**
30-
** Return copy of self without private attributes.
31-
*/
23+
/**
24+
** Return copy of self without private attributes.
25+
*/
3226
toJSON(): Object;
33-
/**
34-
* Return stringified version of self.
35-
*/
27+
/**
28+
* Return stringified version of self.
29+
*/
3630
toString(): string;
3731
free(): void;
3832
[Symbol.dispose](): void;
@@ -41,13 +35,13 @@ export class DirEntry {
4135
}
4236
export class Metadata {
4337
private constructor();
44-
/**
45-
** Return copy of self without private attributes.
46-
*/
38+
/**
39+
** Return copy of self without private attributes.
40+
*/
4741
toJSON(): Object;
48-
/**
49-
* Return stringified version of self.
50-
*/
42+
/**
43+
* Return stringified version of self.
44+
*/
5145
toString(): string;
5246
free(): void;
5347
[Symbol.dispose](): void;
@@ -77,10 +71,7 @@ export class Project {
7771
read(path: string): Promise<Uint8Array>;
7872
build(): Promise<any>;
7973
write(path: string, content: Uint8Array): Promise<void>;
80-
install(
81-
package_lock: string,
82-
max_concurrent_downloads?: number | null,
83-
): Promise<void>;
74+
install(package_lock: string, max_concurrent_downloads?: number | null): Promise<void>;
8475
/**
8576
* Calculate MD5 hash of byte content
8677
*/
@@ -98,12 +89,7 @@ export class WorkerTermination {
9889
workerId: number;
9990
}
10091

101-
export type InitInput =
102-
| RequestInfo
103-
| URL
104-
| Response
105-
| BufferSource
106-
| WebAssembly.Module;
92+
export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembly.Module;
10793

10894
export interface InitOutput {
10995
readonly __wbg_direntry_free: (a: number, b: number) => void;
@@ -114,13 +100,7 @@ export interface InitOutput {
114100
readonly __wbg_set_direntry_name: (a: number, b: number, c: number) => void;
115101
readonly __wbg_set_direntry_type: (a: number, b: number) => void;
116102
readonly project_build: (a: number) => any;
117-
readonly project_copyFile: (
118-
a: number,
119-
b: number,
120-
c: number,
121-
d: number,
122-
e: number,
123-
) => any;
103+
readonly project_copyFile: (a: number, b: number, c: number, d: number, e: number) => any;
124104
readonly project_createDir: (a: number, b: number, c: number) => any;
125105
readonly project_createDirAll: (a: number, b: number, c: number) => any;
126106
readonly project_cwd: (a: number) => [number, number];
@@ -131,52 +111,21 @@ export interface InitOutput {
131111
readonly project_read: (a: number, b: number, c: number) => any;
132112
readonly project_readDir: (a: number, b: number, c: number) => any;
133113
readonly project_readToString: (a: number, b: number, c: number) => any;
134-
readonly project_removeDir: (
135-
a: number,
136-
b: number,
137-
c: number,
138-
d: number,
139-
) => any;
114+
readonly project_removeDir: (a: number, b: number, c: number, d: number) => any;
140115
readonly project_removeFile: (a: number, b: number, c: number) => any;
141-
readonly project_sigMd5: (
142-
a: number,
143-
b: number,
144-
c: number,
145-
) => [number, number];
146-
readonly project_write: (
147-
a: number,
148-
b: number,
149-
c: number,
150-
d: number,
151-
e: number,
152-
) => any;
153-
readonly project_writeString: (
154-
a: number,
155-
b: number,
156-
c: number,
157-
d: number,
158-
e: number,
159-
) => any;
116+
readonly project_sigMd5: (a: number, b: number, c: number) => [number, number];
117+
readonly project_write: (a: number, b: number, c: number, d: number, e: number) => any;
118+
readonly project_writeString: (a: number, b: number, c: number, d: number, e: number) => any;
160119
readonly init_log_filter: (a: number, b: number) => void;
161120
readonly init_pack: () => void;
162121
readonly __wbg_get_pooloptions_filename: (a: number) => [number, number];
163122
readonly __wbg_get_pooloptions_maxConcurrency: (a: number) => number;
164-
readonly __wbg_get_workertermination_filename: (
165-
a: number,
166-
) => [number, number];
123+
readonly __wbg_get_workertermination_filename: (a: number) => [number, number];
167124
readonly __wbg_get_workertermination_workerId: (a: number) => number;
168125
readonly __wbg_pooloptions_free: (a: number, b: number) => void;
169-
readonly __wbg_set_pooloptions_filename: (
170-
a: number,
171-
b: number,
172-
c: number,
173-
) => void;
126+
readonly __wbg_set_pooloptions_filename: (a: number, b: number, c: number) => void;
174127
readonly __wbg_set_pooloptions_maxConcurrency: (a: number, b: number) => void;
175-
readonly __wbg_set_workertermination_filename: (
176-
a: number,
177-
b: number,
178-
c: number,
179-
) => void;
128+
readonly __wbg_set_workertermination_filename: (a: number, b: number, c: number) => void;
180129
readonly __wbg_set_workertermination_workerId: (a: number, b: number) => void;
181130
readonly __wbg_workertermination_free: (a: number, b: number) => void;
182131
readonly notifyWorkerAck: (a: number, b: number) => any;
@@ -185,90 +134,48 @@ export interface InitOutput {
185134
readonly recvWorkerRequest: (a: number, b: number) => any;
186135
readonly recvWorkerTermination: () => any;
187136
readonly sendTaskMessage: (a: number, b: number, c: number) => any;
188-
readonly __wbg_createsyncaccesshandleoptions_free: (
189-
a: number,
190-
b: number,
191-
) => void;
137+
readonly __wbg_createsyncaccesshandleoptions_free: (a: number, b: number) => void;
192138
readonly wasm_thread_entry_point: (a: number) => void;
193139
readonly memory: WebAssembly.Memory;
194140
readonly __wbindgen_malloc: (a: number, b: number) => number;
195-
readonly __wbindgen_realloc: (
196-
a: number,
197-
b: number,
198-
c: number,
199-
d: number,
200-
) => number;
141+
readonly __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;
201142
readonly __wbindgen_exn_store: (a: number) => void;
202143
readonly __externref_table_alloc: () => number;
203144
readonly __wbindgen_export_5: WebAssembly.Table;
204145
readonly __wbindgen_free: (a: number, b: number, c: number) => void;
205146
readonly __wbindgen_export_7: WebAssembly.Table;
206147
readonly __externref_drop_slice: (a: number, b: number) => void;
207148
readonly __externref_table_dealloc: (a: number) => void;
208-
readonly closure117340_externref_shim: (a: number, b: number, c: any) => void;
209-
readonly closure114717_externref_shim: (a: number, b: number, c: any) => void;
210-
readonly closure373_externref_shim: (a: number, b: number, c: any) => void;
211-
readonly wasm_bindgen__convert__closures_____invoke__heac94dfe74335608: (
212-
a: number,
213-
b: number,
214-
) => void;
215-
readonly closure114714_externref_shim: (a: number, b: number, c: any) => void;
216-
readonly wasm_bindgen__convert__closures_____invoke__h2ce973260553dde0: (
217-
a: number,
218-
b: number,
219-
) => void;
220-
readonly closure117392_externref_shim: (
221-
a: number,
222-
b: number,
223-
c: any,
224-
d: any,
225-
) => void;
226-
readonly __wbindgen_thread_destroy: (
227-
a?: number,
228-
b?: number,
229-
c?: number,
230-
) => void;
149+
readonly closure117557_externref_shim: (a: number, b: number, c: any) => void;
150+
readonly wasm_bindgen__convert__closures_____invoke__heac94dfe74335608: (a: number, b: number) => void;
151+
readonly closure276_externref_shim: (a: number, b: number, c: any) => void;
152+
readonly closure114927_externref_shim: (a: number, b: number, c: any) => void;
153+
readonly closure114930_externref_shim: (a: number, b: number, c: any) => void;
154+
readonly wasm_bindgen__convert__closures_____invoke__h2ce973260553dde0: (a: number, b: number) => void;
155+
readonly closure117609_externref_shim: (a: number, b: number, c: any, d: any) => void;
156+
readonly __wbindgen_thread_destroy: (a?: number, b?: number, c?: number) => void;
231157
readonly __wbindgen_start: (a: number) => void;
232158
}
233159

234160
export type SyncInitInput = BufferSource | WebAssembly.Module;
235161
/**
236-
* Instantiates the given `module`, which can either be bytes or
237-
* a precompiled `WebAssembly.Module`.
238-
*
239-
* @param {{ module: SyncInitInput, memory?: WebAssembly.Memory, thread_stack_size?: number }} module - Passing `SyncInitInput` directly is deprecated.
240-
* @param {WebAssembly.Memory} memory - Deprecated.
241-
*
242-
* @returns {InitOutput}
243-
*/
244-
export function initSync(
245-
module:
246-
| {
247-
module: SyncInitInput;
248-
memory?: WebAssembly.Memory;
249-
thread_stack_size?: number;
250-
}
251-
| SyncInitInput,
252-
memory?: WebAssembly.Memory,
253-
): InitOutput;
162+
* Instantiates the given `module`, which can either be bytes or
163+
* a precompiled `WebAssembly.Module`.
164+
*
165+
* @param {{ module: SyncInitInput, memory?: WebAssembly.Memory, thread_stack_size?: number }} module - Passing `SyncInitInput` directly is deprecated.
166+
* @param {WebAssembly.Memory} memory - Deprecated.
167+
*
168+
* @returns {InitOutput}
169+
*/
170+
export function initSync(module: { module: SyncInitInput, memory?: WebAssembly.Memory, thread_stack_size?: number } | SyncInitInput, memory?: WebAssembly.Memory): InitOutput;
254171

255172
/**
256-
* If `module_or_path` is {RequestInfo} or {URL}, makes a request and
257-
* for everything else, calls `WebAssembly.instantiate` directly.
258-
*
259-
* @param {{ module_or_path: InitInput | Promise<InitInput>, memory?: WebAssembly.Memory, thread_stack_size?: number }} module_or_path - Passing `InitInput` directly is deprecated.
260-
* @param {WebAssembly.Memory} memory - Deprecated.
261-
*
262-
* @returns {Promise<InitOutput>}
263-
*/
264-
export default function __wbg_init(
265-
module_or_path?:
266-
| {
267-
module_or_path: InitInput | Promise<InitInput>;
268-
memory?: WebAssembly.Memory;
269-
thread_stack_size?: number;
270-
}
271-
| InitInput
272-
| Promise<InitInput>,
273-
memory?: WebAssembly.Memory,
274-
): Promise<InitOutput>;
173+
* If `module_or_path` is {RequestInfo} or {URL}, makes a request and
174+
* for everything else, calls `WebAssembly.instantiate` directly.
175+
*
176+
* @param {{ module_or_path: InitInput | Promise<InitInput>, memory?: WebAssembly.Memory, thread_stack_size?: number }} module_or_path - Passing `InitInput` directly is deprecated.
177+
* @param {WebAssembly.Memory} memory - Deprecated.
178+
*
179+
* @returns {Promise<InitOutput>}
180+
*/
181+
export default function __wbg_init (module_or_path?: { module_or_path: InitInput | Promise<InitInput>, memory?: WebAssembly.Memory, thread_stack_size?: number } | InitInput | Promise<InitInput>, memory?: WebAssembly.Memory): Promise<InitOutput>;

packages/utoo-web/src/webpackLoaders/workerContent.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)