@livestore/utils-dev 0.0.0-snapshot-dffcd59e9628b35efd943619b722cf924c4ed98f → 0.0.0-snapshot-159a545f297da342bdde93009cc708050363c115
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/.tsbuildinfo.json +1 -1
- package/dist/node/WranglerDevServer/WranglerDevServer.d.ts +0 -2
- package/dist/node/WranglerDevServer/WranglerDevServer.d.ts.map +1 -1
- package/dist/node/WranglerDevServer/WranglerDevServer.js +2 -13
- package/dist/node/WranglerDevServer/WranglerDevServer.js.map +1 -1
- package/package.json +2 -2
- package/src/node/WranglerDevServer/WranglerDevServer.ts +10 -24
|
@@ -26,8 +26,6 @@ export interface StartWranglerDevServerArgs {
|
|
|
26
26
|
wranglerConfigPath?: string;
|
|
27
27
|
cwd: string;
|
|
28
28
|
port?: number;
|
|
29
|
-
/** Inspector/debugger port for workerd. If not specified, uses a random free port */
|
|
30
|
-
inspectorPort?: number;
|
|
31
29
|
/** @default false */
|
|
32
30
|
showLogs?: boolean;
|
|
33
31
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WranglerDevServer.d.ts","sourceRoot":"","sources":["../../../src/node/WranglerDevServer/WranglerDevServer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAW,MAAM,EAA4B,MAAM,EAAU,MAAM,yBAAyB,CAAA;;;;;;;;AAInG;;GAEG;AACH,qBAAa,sBAAuB,SAAQ,2BAI1C;CAAG;AAEL;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;CAC3B;AAED;;GAEG;AACH,MAAM,WAAW,0BAA0B;IACzC,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,
|
|
1
|
+
{"version":3,"file":"WranglerDevServer.d.ts","sourceRoot":"","sources":["../../../src/node/WranglerDevServer/WranglerDevServer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAW,MAAM,EAA4B,MAAM,EAAU,MAAM,yBAAyB,CAAA;;;;;;;;AAInG;;GAEG;AACH,qBAAa,sBAAuB,SAAQ,2BAI1C;CAAG;AAEL;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;CAC3B;AAED;;GAEG;AACH,MAAM,WAAW,0BAA0B;IACzC,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,qBAAqB;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB;;4BAYgB,0BAA0B;;;;;;AAV3C;;;;;;;;GAQG;AACH,qBAAa,wBAAyB,SAAQ,6BAsI5C;CAAG"}
|
|
@@ -30,22 +30,11 @@ export class WranglerDevServerService extends Effect.Service()('WranglerDevServe
|
|
|
30
30
|
// Allocate port
|
|
31
31
|
const port = args.port ??
|
|
32
32
|
(yield* getFreePort.pipe(Effect.mapError((cause) => new WranglerDevServerError({ cause, message: 'Failed to get free port', port: -1 }))));
|
|
33
|
-
|
|
34
|
-
const inspectorPort = args.inspectorPort ??
|
|
35
|
-
(yield* getFreePort.pipe(Effect.mapError((cause) => new WranglerDevServerError({ cause, message: 'Failed to get free inspector port', port: -1 }))));
|
|
36
|
-
yield* Effect.annotateCurrentSpan({ port, inspectorPort });
|
|
33
|
+
yield* Effect.annotateCurrentSpan({ port });
|
|
37
34
|
// Resolve config path
|
|
38
35
|
const configPath = path.resolve(args.wranglerConfigPath ?? path.join(args.cwd, 'wrangler.toml'));
|
|
39
36
|
// Start wrangler process using Effect Command
|
|
40
|
-
|
|
41
|
-
const commandArgs = ['bunx', 'wrangler', 'dev', '--port', port.toString()];
|
|
42
|
-
// Only add inspector port if not in CI to avoid conflicts
|
|
43
|
-
// Use global process from Node.js
|
|
44
|
-
if (!global.process.env.CI) {
|
|
45
|
-
commandArgs.push('--inspector-port', inspectorPort.toString());
|
|
46
|
-
}
|
|
47
|
-
commandArgs.push('--config', configPath);
|
|
48
|
-
const process = yield* Command.make(...commandArgs).pipe(Command.workingDirectory(args.cwd), Command.stdout('pipe'), Command.stderr('pipe'), Command.start, Effect.catchAllCause((error) => new WranglerDevServerError({
|
|
37
|
+
const process = yield* Command.make('bunx', 'wrangler', 'dev', '--port', port.toString(), '--config', configPath).pipe(Command.workingDirectory(args.cwd), Command.stdout('pipe'), Command.stderr('pipe'), Command.start, Effect.catchAllCause((error) => new WranglerDevServerError({
|
|
49
38
|
cause: error,
|
|
50
39
|
message: `Failed to start wrangler process in directory: ${args.cwd}`,
|
|
51
40
|
port,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WranglerDevServer.js","sourceRoot":"","sources":["../../../src/node/WranglerDevServer/WranglerDevServer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,WAAW,CAAA;AAEjC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAsB,MAAM,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AACnG,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACnD,OAAO,EAAE,wBAAwB,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAErF;;GAEG;AACH,MAAM,OAAO,sBAAuB,SAAQ,MAAM,CAAC,WAAW,EAA0B,CAAC,wBAAwB,EAAE;IACjH,KAAK,EAAE,MAAM,CAAC,OAAO;IACrB,OAAO,EAAE,MAAM,CAAC,MAAM;IACtB,IAAI,EAAE,MAAM,CAAC,MAAM;CACpB,CAAC;CAAG;
|
|
1
|
+
{"version":3,"file":"WranglerDevServer.js","sourceRoot":"","sources":["../../../src/node/WranglerDevServer/WranglerDevServer.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@livestore/utils-dev",
|
|
3
|
-
"version": "0.0.0-snapshot-
|
|
3
|
+
"version": "0.0.0-snapshot-159a545f297da342bdde93009cc708050363c115",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"sideEffects": [
|
|
6
6
|
"./src/node-vitest/global.ts"
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
"@opentelemetry/sdk-metrics": "2.0.1",
|
|
19
19
|
"@opentelemetry/sdk-trace-base": "2.0.1",
|
|
20
20
|
"@opentelemetry/sdk-trace-node": "2.0.1",
|
|
21
|
-
"@livestore/utils": "0.0.0-snapshot-
|
|
21
|
+
"@livestore/utils": "0.0.0-snapshot-159a545f297da342bdde93009cc708050363c115"
|
|
22
22
|
},
|
|
23
23
|
"devDependencies": {},
|
|
24
24
|
"files": [
|
|
@@ -29,8 +29,6 @@ export interface StartWranglerDevServerArgs {
|
|
|
29
29
|
wranglerConfigPath?: string
|
|
30
30
|
cwd: string
|
|
31
31
|
port?: number
|
|
32
|
-
/** Inspector/debugger port for workerd. If not specified, uses a random free port */
|
|
33
|
-
inspectorPort?: number
|
|
34
32
|
/** @default false */
|
|
35
33
|
showLogs?: boolean
|
|
36
34
|
}
|
|
@@ -68,33 +66,21 @@ export class WranglerDevServerService extends Effect.Service<WranglerDevServerSe
|
|
|
68
66
|
),
|
|
69
67
|
))
|
|
70
68
|
|
|
71
|
-
|
|
72
|
-
const inspectorPort =
|
|
73
|
-
args.inspectorPort ??
|
|
74
|
-
(yield* getFreePort.pipe(
|
|
75
|
-
Effect.mapError(
|
|
76
|
-
(cause) => new WranglerDevServerError({ cause, message: 'Failed to get free inspector port', port: -1 }),
|
|
77
|
-
),
|
|
78
|
-
))
|
|
79
|
-
|
|
80
|
-
yield* Effect.annotateCurrentSpan({ port, inspectorPort })
|
|
69
|
+
yield* Effect.annotateCurrentSpan({ port })
|
|
81
70
|
|
|
82
71
|
// Resolve config path
|
|
83
72
|
const configPath = path.resolve(args.wranglerConfigPath ?? path.join(args.cwd, 'wrangler.toml'))
|
|
84
73
|
|
|
85
74
|
// Start wrangler process using Effect Command
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
commandArgs.push('--config', configPath)
|
|
96
|
-
|
|
97
|
-
const process = yield* Command.make(...commandArgs as [string, ...string[]]).pipe(
|
|
75
|
+
const process = yield* Command.make(
|
|
76
|
+
'bunx',
|
|
77
|
+
'wrangler',
|
|
78
|
+
'dev',
|
|
79
|
+
'--port',
|
|
80
|
+
port.toString(),
|
|
81
|
+
'--config',
|
|
82
|
+
configPath,
|
|
83
|
+
).pipe(
|
|
98
84
|
Command.workingDirectory(args.cwd),
|
|
99
85
|
Command.stdout('pipe'),
|
|
100
86
|
Command.stderr('pipe'),
|