@seanhogg/builderforce-webcontainers-core 2026.10.8 → 2026.10.9
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/build.d.ts +6 -0
- package/dist/build.d.ts.map +1 -1
- package/dist/build.js +9 -1
- package/dist/build.js.map +1 -1
- package/dist/buildHost.d.ts +3 -0
- package/dist/buildHost.d.ts.map +1 -1
- package/dist/buildHost.js +25 -12
- package/dist/buildHost.js.map +1 -1
- package/dist/compileComponent.d.ts.map +1 -1
- package/dist/compileComponent.js +4 -1
- package/dist/compileComponent.js.map +1 -1
- package/dist/compileScript.d.ts +12 -4
- package/dist/compileScript.d.ts.map +1 -1
- package/dist/compileScript.js +26 -13
- package/dist/compileScript.js.map +1 -1
- package/dist/components.d.ts +5 -0
- package/dist/components.d.ts.map +1 -1
- package/dist/components.js.map +1 -1
- package/dist/detectProject.d.ts +2 -0
- package/dist/detectProject.d.ts.map +1 -1
- package/dist/detectProject.js +13 -7
- package/dist/detectProject.js.map +1 -1
- package/dist/devServer.d.ts +38 -4
- package/dist/devServer.d.ts.map +1 -1
- package/dist/devServer.js +140 -24
- package/dist/devServer.js.map +1 -1
- package/dist/devStyles.d.ts +27 -0
- package/dist/devStyles.d.ts.map +1 -0
- package/dist/devStyles.js +52 -0
- package/dist/devStyles.js.map +1 -0
- package/dist/hot/client.d.ts +33 -0
- package/dist/hot/client.d.ts.map +1 -0
- package/dist/hot/client.js +46 -0
- package/dist/hot/client.js.map +1 -0
- package/dist/hot/moduleGraph.d.ts +39 -0
- package/dist/hot/moduleGraph.d.ts.map +1 -0
- package/dist/hot/moduleGraph.js +69 -0
- package/dist/hot/moduleGraph.js.map +1 -0
- package/dist/hot/planUpdate.d.ts +33 -0
- package/dist/hot/planUpdate.d.ts.map +1 -0
- package/dist/hot/planUpdate.js +43 -0
- package/dist/hot/planUpdate.js.map +1 -0
- package/dist/hot/reactRefresh.d.ts +45 -0
- package/dist/hot/reactRefresh.d.ts.map +1 -0
- package/dist/hot/reactRefresh.js +86 -0
- package/dist/hot/reactRefresh.js.map +1 -0
- package/dist/html.d.ts +2 -8
- package/dist/html.d.ts.map +1 -1
- package/dist/html.js +11 -17
- package/dist/html.js.map +1 -1
- package/dist/index.d.ts +19 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +11 -1
- package/dist/index.js.map +1 -1
- package/dist/installer/tree.d.ts.map +1 -1
- package/dist/installer/tree.js +22 -4
- package/dist/installer/tree.js.map +1 -1
- package/dist/installer/wasmBuilds.d.ts +27 -0
- package/dist/installer/wasmBuilds.d.ts.map +1 -0
- package/dist/installer/wasmBuilds.js +32 -0
- package/dist/installer/wasmBuilds.js.map +1 -0
- package/dist/node/builtins.d.ts +6 -1
- package/dist/node/builtins.d.ts.map +1 -1
- package/dist/node/builtins.js +15 -10
- package/dist/node/builtins.js.map +1 -1
- package/dist/node/childProcess.d.ts +3 -3
- package/dist/node/childProcess.d.ts.map +1 -1
- package/dist/node/childProcess.js +68 -16
- package/dist/node/childProcess.js.map +1 -1
- package/dist/node/crypto.d.ts.map +1 -1
- package/dist/node/crypto.js +5 -4
- package/dist/node/crypto.js.map +1 -1
- package/dist/node/esm.d.ts +7 -0
- package/dist/node/esm.d.ts.map +1 -1
- package/dist/node/esm.js +28 -2
- package/dist/node/esm.js.map +1 -1
- package/dist/node/fs/index.d.ts +3 -0
- package/dist/node/fs/index.d.ts.map +1 -1
- package/dist/node/fs/index.js +22 -106
- package/dist/node/fs/index.js.map +1 -1
- package/dist/node/fs/stdinFd.d.ts +10 -0
- package/dist/node/fs/stdinFd.d.ts.map +1 -0
- package/dist/node/fs/stdinFd.js +40 -0
- package/dist/node/fs/stdinFd.js.map +1 -0
- package/dist/node/fs/streams.d.ts +24 -0
- package/dist/node/fs/streams.d.ts.map +1 -0
- package/dist/node/fs/streams.js +144 -0
- package/dist/node/fs/streams.js.map +1 -0
- package/dist/node/fs/sync.d.ts +2 -0
- package/dist/node/fs/sync.d.ts.map +1 -1
- package/dist/node/fs/sync.js +17 -0
- package/dist/node/fs/sync.js.map +1 -1
- package/dist/node/globalObject.d.ts +25 -0
- package/dist/node/globalObject.d.ts.map +1 -0
- package/dist/node/globalObject.js +83 -0
- package/dist/node/globalObject.js.map +1 -0
- package/dist/node/http/index.d.ts.map +1 -1
- package/dist/node/http/index.js +4 -3
- package/dist/node/http/index.js.map +1 -1
- package/dist/node/http/server.d.ts.map +1 -1
- package/dist/node/http/server.js +8 -5
- package/dist/node/http/server.js.map +1 -1
- package/dist/node/http/serverResponse.d.ts +3 -0
- package/dist/node/http/serverResponse.d.ts.map +1 -1
- package/dist/node/http/serverResponse.js +7 -0
- package/dist/node/http/serverResponse.js.map +1 -1
- package/dist/node/ipc.d.ts +26 -0
- package/dist/node/ipc.d.ts.map +1 -0
- package/dist/node/ipc.js +76 -0
- package/dist/node/ipc.js.map +1 -0
- package/dist/node/loader.d.ts +2 -0
- package/dist/node/loader.d.ts.map +1 -1
- package/dist/node/loader.js +79 -14
- package/dist/node/loader.js.map +1 -1
- package/dist/node/misc.d.ts.map +1 -1
- package/dist/node/misc.js +20 -5
- package/dist/node/misc.js.map +1 -1
- package/dist/node/process.d.ts +2 -5
- package/dist/node/process.d.ts.map +1 -1
- package/dist/node/process.js +16 -11
- package/dist/node/process.js.map +1 -1
- package/dist/node/processExit.d.ts +13 -0
- package/dist/node/processExit.d.ts.map +1 -0
- package/dist/node/processExit.js +25 -0
- package/dist/node/processExit.js.map +1 -0
- package/dist/node/program.d.ts.map +1 -1
- package/dist/node/program.js +6 -5
- package/dist/node/program.js.map +1 -1
- package/dist/node/runtime.d.ts +6 -1
- package/dist/node/runtime.d.ts.map +1 -1
- package/dist/node/runtime.js +23 -15
- package/dist/node/runtime.js.map +1 -1
- package/dist/node/stream/readable.d.ts +2 -1
- package/dist/node/stream/readable.d.ts.map +1 -1
- package/dist/node/stream/readable.js +2 -1
- package/dist/node/stream/readable.js.map +1 -1
- package/dist/node/urlqs.d.ts +1 -1
- package/dist/node/urlqs.d.ts.map +1 -1
- package/dist/node/urlqs.js +11 -2
- package/dist/node/urlqs.js.map +1 -1
- package/dist/node/workerThreads.d.ts +31 -0
- package/dist/node/workerThreads.d.ts.map +1 -0
- package/dist/node/workerThreads.js +165 -0
- package/dist/node/workerThreads.js.map +1 -0
- package/dist/node/zlib.d.ts.map +1 -1
- package/dist/node/zlib.js +23 -2
- package/dist/node/zlib.js.map +1 -1
- package/dist/shell/context.d.ts.map +1 -1
- package/dist/shell/context.js +2 -2
- package/dist/shell/context.js.map +1 -1
- package/dist/shell/devHandoff.d.ts +10 -4
- package/dist/shell/devHandoff.d.ts.map +1 -1
- package/dist/shell/devHandoff.js +7 -5
- package/dist/shell/devHandoff.js.map +1 -1
- package/dist/shell/exec.d.ts.map +1 -1
- package/dist/shell/exec.js +6 -5
- package/dist/shell/exec.js.map +1 -1
- package/dist/shell/npm.js +2 -2
- package/dist/shell/npm.js.map +1 -1
- package/dist/shell/program.js +5 -5
- package/dist/shell/program.js.map +1 -1
- package/dist/styleModules.d.ts +2 -5
- package/dist/styleModules.d.ts.map +1 -1
- package/dist/styleModules.js +23 -14
- package/dist/styleModules.js.map +1 -1
- package/dist/styles/compile.d.ts +18 -0
- package/dist/styles/compile.d.ts.map +1 -0
- package/dist/styles/compile.js +34 -0
- package/dist/styles/compile.js.map +1 -0
- package/dist/styles/compilers.d.ts +75 -0
- package/dist/styles/compilers.d.ts.map +1 -0
- package/dist/styles/compilers.js +77 -0
- package/dist/styles/compilers.js.map +1 -0
- package/dist/styles/cssModules.d.ts +40 -0
- package/dist/styles/cssModules.d.ts.map +1 -0
- package/dist/styles/cssModules.js +239 -0
- package/dist/styles/cssModules.js.map +1 -0
- package/dist/styles/imports.d.ts +37 -0
- package/dist/styles/imports.d.ts.map +1 -0
- package/dist/styles/imports.js +88 -0
- package/dist/styles/imports.js.map +1 -0
- package/dist/styles/languages.d.ts +13 -0
- package/dist/styles/languages.d.ts.map +1 -0
- package/dist/styles/languages.js +20 -0
- package/dist/styles/languages.js.map +1 -0
- package/dist/styles/packageStyles.d.ts +19 -0
- package/dist/styles/packageStyles.d.ts.map +1 -0
- package/dist/styles/packageStyles.js +32 -0
- package/dist/styles/packageStyles.js.map +1 -0
- package/dist/svelteCompiler.d.ts.map +1 -1
- package/dist/svelteCompiler.js +19 -2
- package/dist/svelteCompiler.js.map +1 -1
- package/dist/system/commands.d.ts +2 -0
- package/dist/system/commands.d.ts.map +1 -1
- package/dist/system/commands.js +18 -0
- package/dist/system/commands.js.map +1 -1
- package/dist/system/index.d.ts +3 -1
- package/dist/system/index.d.ts.map +1 -1
- package/dist/system/index.js +1 -0
- package/dist/system/index.js.map +1 -1
- package/dist/system/ipc.d.ts +33 -0
- package/dist/system/ipc.d.ts.map +1 -0
- package/dist/system/ipc.js +65 -0
- package/dist/system/ipc.js.map +1 -0
- package/dist/system/kernel.d.ts.map +1 -1
- package/dist/system/kernel.js +6 -3
- package/dist/system/kernel.js.map +1 -1
- package/dist/system/process.d.ts +3 -0
- package/dist/system/process.d.ts.map +1 -1
- package/dist/system/process.js +50 -26
- package/dist/system/process.js.map +1 -1
- package/dist/system/terminal.d.ts +10 -4
- package/dist/system/terminal.d.ts.map +1 -1
- package/dist/system/terminal.js +21 -13
- package/dist/system/terminal.js.map +1 -1
- package/dist/system/types.d.ts +29 -7
- package/dist/system/types.d.ts.map +1 -1
- package/dist/vueCompiler.d.ts.map +1 -1
- package/dist/vueCompiler.js +11 -8
- package/dist/vueCompiler.js.map +1 -1
- package/package.json +4 -1
- package/src/build.ts +13 -1
- package/src/buildHost.ts +23 -10
- package/src/compileComponent.ts +4 -1
- package/src/compileScript.ts +30 -11
- package/src/components.ts +5 -0
- package/src/detectProject.ts +13 -6
- package/src/devServer.ts +148 -23
- package/src/devStyles.ts +70 -0
- package/src/hot/client.ts +70 -0
- package/src/hot/moduleGraph.ts +90 -0
- package/src/hot/planUpdate.ts +66 -0
- package/src/hot/reactRefresh.ts +93 -0
- package/src/html.ts +13 -19
- package/src/index.ts +19 -1
- package/src/installer/tree.ts +22 -4
- package/src/installer/wasmBuilds.ts +45 -0
- package/src/node/builtins.ts +21 -12
- package/src/node/childProcess.ts +73 -20
- package/src/node/crypto.ts +5 -4
- package/src/node/esm.ts +26 -2
- package/src/node/fs/index.ts +26 -103
- package/src/node/fs/stdinFd.ts +44 -0
- package/src/node/fs/streams.ts +177 -0
- package/src/node/fs/sync.ts +15 -0
- package/src/node/globalObject.ts +82 -0
- package/src/node/http/index.ts +4 -3
- package/src/node/http/server.ts +8 -5
- package/src/node/http/serverResponse.ts +7 -0
- package/src/node/ipc.ts +91 -0
- package/src/node/loader.ts +78 -14
- package/src/node/misc.ts +19 -5
- package/src/node/process.ts +15 -8
- package/src/node/processExit.ts +21 -0
- package/src/node/program.ts +12 -9
- package/src/node/runtime.ts +27 -15
- package/src/node/stream/readable.ts +2 -1
- package/src/node/urlqs.ts +10 -2
- package/src/node/workerThreads.ts +198 -0
- package/src/node/zlib.ts +24 -2
- package/src/shell/context.ts +2 -2
- package/src/shell/devHandoff.ts +16 -9
- package/src/shell/exec.ts +6 -5
- package/src/shell/npm.ts +2 -2
- package/src/shell/program.ts +5 -5
- package/src/styleModules.ts +30 -14
- package/src/styles/compile.ts +43 -0
- package/src/styles/compilers.ts +143 -0
- package/src/styles/cssModules.ts +254 -0
- package/src/styles/imports.ts +125 -0
- package/src/styles/languages.ts +29 -0
- package/src/styles/packageStyles.ts +35 -0
- package/src/svelteCompiler.ts +20 -3
- package/src/system/commands.ts +17 -0
- package/src/system/index.ts +4 -0
- package/src/system/ipc.ts +89 -0
- package/src/system/kernel.ts +6 -3
- package/src/system/process.ts +57 -30
- package/src/system/terminal.ts +34 -12
- package/src/system/types.ts +31 -7
- package/src/vueCompiler.ts +11 -8
|
@@ -0,0 +1,93 @@
|
|
|
1
|
+
import { init, parse } from 'es-module-lexer';
|
|
2
|
+
import { contentHash } from '../hash.js';
|
|
3
|
+
import type { ProjectConfig } from '../projectConfig.js';
|
|
4
|
+
import type { ModuleFacts } from './moduleGraph.js';
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* React Fast Refresh without Babel. The official runtime (`react-refresh/runtime`)
|
|
8
|
+
* does the hard part — swapping a component's implementation while React keeps
|
|
9
|
+
* its state — and only needs two things from the compiler:
|
|
10
|
+
*
|
|
11
|
+
* • each component REGISTERED under a stable id when its module runs, which
|
|
12
|
+
* the dev server appends to compiled modules (`refreshFooter`);
|
|
13
|
+
* • to know when a component's hooks changed, because state cannot carry
|
|
14
|
+
* across a different hook sequence. Babel's plugin signs each component; here
|
|
15
|
+
* the module's hook calls are signed as a whole (`hookSignature`), and a
|
|
16
|
+
* change makes the update a full reload rather than a refresh.
|
|
17
|
+
*
|
|
18
|
+
* A module is a refresh BOUNDARY when every export is a registered component:
|
|
19
|
+
* re-running it is all an update needs. Edits to anything else propagate to the
|
|
20
|
+
* modules importing it until they reach boundaries, or the entry (a reload).
|
|
21
|
+
*/
|
|
22
|
+
export const REFRESH_GLOBAL = '__bfwc_refresh';
|
|
23
|
+
|
|
24
|
+
/** React with a DOM renderer and the automatic or classic React JSX runtime. */
|
|
25
|
+
export function usesReactRefresh(config: ProjectConfig): boolean {
|
|
26
|
+
return 'react-dom' in config.dependencies && config.jsx.importSource === 'react';
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
/**
|
|
30
|
+
* Inline module script, placed before the app's: installs the runtime into React's
|
|
31
|
+
* DevTools hook, which react-dom reads once, when it first loads — so it must
|
|
32
|
+
* run first. Module scripts run in document order, which guarantees that.
|
|
33
|
+
*/
|
|
34
|
+
export function refreshPreambleScript(runtimeUrl: string): string {
|
|
35
|
+
return [
|
|
36
|
+
`<script type="module">`,
|
|
37
|
+
`import * as runtime from ${JSON.stringify(runtimeUrl)};`,
|
|
38
|
+
`const refresh = runtime.default || runtime;`,
|
|
39
|
+
`refresh.injectIntoGlobalHook(window);`,
|
|
40
|
+
`window.$RefreshReg$ = () => {};`,
|
|
41
|
+
`window.$RefreshSig$ = () => (type) => type;`,
|
|
42
|
+
`window.${REFRESH_GLOBAL} = refresh;`,
|
|
43
|
+
`</script>`,
|
|
44
|
+
].join('\n');
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
/**
|
|
48
|
+
* Top-level bindings in compiled code that look like components: PascalCase
|
|
49
|
+
* function and class declarations, and PascalCase consts bound to a function,
|
|
50
|
+
* arrow, `memo(…)` or `forwardRef(…)`. Compiled output puts top-level statements
|
|
51
|
+
* at column 0, which keeps this to line-anchored patterns.
|
|
52
|
+
*/
|
|
53
|
+
export function componentNames(code: string): string[] {
|
|
54
|
+
const names = new Set<string>();
|
|
55
|
+
const declaration = /^(?:export\s+(?:default\s+)?)?(?:async\s+)?(?:function\*?|class)\s+([A-Z][\w$]*)/gm;
|
|
56
|
+
const binding = /^(?:export\s+)?(?:const|let|var)\s+([A-Z][\w$]*)\s*(?::[^=]+)?=\s*(?:async\s+)?(?:function\b|\(|[\w$]+\s*=>|(?:[\w$]+\.)?(?:memo|forwardRef)\s*\()/gm;
|
|
57
|
+
for (const match of code.matchAll(declaration)) names.add(match[1]!);
|
|
58
|
+
for (const match of code.matchAll(binding)) names.add(match[1]!);
|
|
59
|
+
return [...names];
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
/** Appended to a module: register each component under `<path> <name>`. */
|
|
63
|
+
export function refreshFooter(path: string, names: readonly string[]): string {
|
|
64
|
+
if (!names.length) return '';
|
|
65
|
+
const lines = names.map((name) => ` refresh.register(${name}, ${JSON.stringify(`${path} ${name}`)});`);
|
|
66
|
+
return `\n{ const refresh = window.${REFRESH_GLOBAL};\nif (refresh) {\n${lines.join('\n')}\n} }\n`;
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
/** The module's hook calls in order, hashed. */
|
|
70
|
+
export function hookSignature(source: string): string {
|
|
71
|
+
return contentHash((source.match(/\buse[A-Z][\w$]*\s*\(/g) ?? []).map((call) => call.replace(/\s*\($/, '')).join(','));
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
/**
|
|
75
|
+
* What the dev server learns about a compiled module: whether it is a refresh
|
|
76
|
+
* boundary (it exports something, and every export is one of `components`),
|
|
77
|
+
* and its hook signature (from `source`, the code as written).
|
|
78
|
+
*/
|
|
79
|
+
export async function refreshFacts(code: string, source: string, components: readonly string[]): Promise<ModuleFacts> {
|
|
80
|
+
await init;
|
|
81
|
+
const [, exports] = parse(code);
|
|
82
|
+
const known = new Set(components);
|
|
83
|
+
// The lexer names the local behind most exports; spell out the default forms it may not.
|
|
84
|
+
const defaultExpression =
|
|
85
|
+
/^export\s+default\s+(?:async\s+)?(?:function\*?|class)\s+([A-Z][\w$]*)/m.exec(code)?.[1] ?? /^export\s+default\s+([A-Z][\w$]*)\s*;?\s*$/m.exec(code)?.[1];
|
|
86
|
+
const refreshBoundary =
|
|
87
|
+
exports.length > 0 &&
|
|
88
|
+
exports.every((entry) => {
|
|
89
|
+
const local = entry.ln ?? (entry.n === 'default' ? defaultExpression : entry.n);
|
|
90
|
+
return local !== undefined && known.has(local);
|
|
91
|
+
});
|
|
92
|
+
return { refreshBoundary, hooks: hookSignature(source) };
|
|
93
|
+
}
|
package/src/html.ts
CHANGED
|
@@ -7,11 +7,14 @@
|
|
|
7
7
|
* • the error bridge is prepended, so runtime errors and console output reach the host;
|
|
8
8
|
* • the WebSocket bridge follows, so `new WebSocket('ws://localhost:3000')` reaches a virtual server;
|
|
9
9
|
* • the host's preview scripts run next, before the app;
|
|
10
|
-
* • the
|
|
10
|
+
* • the hot-update listener is prepended, so an edit swaps styles, re-renders
|
|
11
|
+
* components or reloads — and, for React, the Fast Refresh runtime before the app;
|
|
11
12
|
* • the attribution badge is appended unless the host turned it off.
|
|
12
13
|
*/
|
|
13
14
|
import { injectAttribution } from './attribution.js';
|
|
14
15
|
import { previewSocketScript } from './previewBridge.js';
|
|
16
|
+
import { hotUpdateScript } from './hot/client.js';
|
|
17
|
+
import { refreshPreambleScript } from './hot/reactRefresh.js';
|
|
15
18
|
|
|
16
19
|
export const ERROR_MESSAGE_TYPE = 'bfwc:error';
|
|
17
20
|
export const CONSOLE_MESSAGE_TYPE = 'bfwc:console';
|
|
@@ -52,23 +55,6 @@ export function errorBridgeScript(): string {
|
|
|
52
55
|
})();</script>`;
|
|
53
56
|
}
|
|
54
57
|
|
|
55
|
-
/**
|
|
56
|
-
* The channel a preview listens on for "files changed, reload". Keyed by the
|
|
57
|
-
* preview base, so two runtimes on one origin never reload each other's frames.
|
|
58
|
-
* A BroadcastChannel rather than `postMessage` because the host does not hold a
|
|
59
|
-
* reference to the frame — any number of frames (or tabs) may show one preview.
|
|
60
|
-
*/
|
|
61
|
-
export function reloadChannelName(base: string): string {
|
|
62
|
-
return `bfwc:reload:${base}`;
|
|
63
|
-
}
|
|
64
|
-
|
|
65
|
-
export function liveReloadScript(base: string): string {
|
|
66
|
-
return `<script>(function(){
|
|
67
|
-
if (typeof BroadcastChannel === 'undefined') return;
|
|
68
|
-
new BroadcastChannel(${JSON.stringify(reloadChannelName(base))}).onmessage = function () { location.reload(); };
|
|
69
|
-
})();</script>`;
|
|
70
|
-
}
|
|
71
|
-
|
|
72
58
|
const ABSOLUTE_ATTR = /(\s(?:src|href)\s*=\s*)(["'])\/(?!\/)([^"']*)\2/gi;
|
|
73
59
|
const MODULE_SCRIPT = /<script\b[^>]*type\s*=\s*["']module["'][^>]*>/i;
|
|
74
60
|
|
|
@@ -81,6 +67,8 @@ export interface HtmlOptions {
|
|
|
81
67
|
attribution?: boolean;
|
|
82
68
|
/** Host scripts (JavaScript source) run in every preview page before the app. */
|
|
83
69
|
scripts?: readonly string[];
|
|
70
|
+
/** URL of `react-refresh/runtime`; installed before the app so components re-render in place on edits. */
|
|
71
|
+
refreshRuntime?: string;
|
|
84
72
|
}
|
|
85
73
|
|
|
86
74
|
/** A host script as a tag. `</script>` inside the body would end the tag early, so it is escaped. */
|
|
@@ -99,7 +87,13 @@ export function transformHtml(html: string, options: HtmlOptions): string {
|
|
|
99
87
|
}
|
|
100
88
|
if (options.attribution !== false) out = injectAttribution(out);
|
|
101
89
|
|
|
102
|
-
const bridge = [
|
|
90
|
+
const bridge = [
|
|
91
|
+
errorBridgeScript(),
|
|
92
|
+
previewSocketScript(),
|
|
93
|
+
hotUpdateScript(base),
|
|
94
|
+
...(options.scripts ?? []).map(scriptTag),
|
|
95
|
+
...(options.refreshRuntime ? [refreshPreambleScript(options.refreshRuntime)] : []),
|
|
96
|
+
].join('\n');
|
|
103
97
|
if (/<head[^>]*>/i.test(out)) return out.replace(/<head[^>]*>/i, (head) => `${head}\n${bridge}`);
|
|
104
98
|
return bridge + out;
|
|
105
99
|
}
|
package/src/index.ts
CHANGED
|
@@ -44,7 +44,25 @@ export { rewriteImports } from './rewriteImports.js';
|
|
|
44
44
|
export { resolveLocal, resolveAlias, isBareSpecifier, splitPackageSpecifier, resolvePackage, RESOLVE_EXTENSIONS } from './resolve.js';
|
|
45
45
|
export { compileScript, compileModule, isScriptPath, mapSpecifier, moduleUrl, buildDefine } from './compileScript.js';
|
|
46
46
|
export { compileComponent } from './compileComponent.js';
|
|
47
|
-
export { transformHtml, scriptTag, errorBridgeScript,
|
|
47
|
+
export { transformHtml, scriptTag, errorBridgeScript, ERROR_MESSAGE_TYPE, CONSOLE_MESSAGE_TYPE, CONSOLE_MESSAGE_LIMIT } from './html.js';
|
|
48
|
+
export { hotUpdateScript, updateChannelName } from './hot/client.js';
|
|
49
|
+
export type { PreviewUpdate, HotUpdate, HotStyle } from './hot/client.js';
|
|
50
|
+
export { ModuleGraph } from './hot/moduleGraph.js';
|
|
51
|
+
export type { ModuleFacts } from './hot/moduleGraph.js';
|
|
52
|
+
export { planUpdate } from './hot/planUpdate.js';
|
|
53
|
+
export type { UpdatePlan, PlanInput } from './hot/planUpdate.js';
|
|
54
|
+
export { usesReactRefresh, refreshPreambleScript, componentNames, refreshFooter, hookSignature, refreshFacts, REFRESH_GLOBAL } from './hot/reactRefresh.js';
|
|
55
|
+
export { styleLanguageOf, isStylesheet, isCssModule, styleLanguageOfLang } from './styles/languages.js';
|
|
56
|
+
export type { StyleLanguage } from './styles/languages.js';
|
|
57
|
+
export { createSassCompiler, createLessCompiler, staticStyleCompilers, noStyleCompilers, sassCandidates, lessCandidates } from './styles/compilers.js';
|
|
58
|
+
export type { StyleCompiler, StyleCompilers, StyleCompileRequest, CompiledStyle, PreprocessedLanguage, SassLike, LessLike } from './styles/compilers.js';
|
|
59
|
+
export { createStyleImportHost, jsDelivrFileUrl } from './styles/imports.js';
|
|
60
|
+
export type { StyleImportHost, StyleImportHostOptions, StyleSource } from './styles/imports.js';
|
|
61
|
+
export { compileStylesheet, preprocessStyleBlock } from './styles/compile.js';
|
|
62
|
+
export type { StylesheetContext } from './styles/compile.js';
|
|
63
|
+
export { scopeCssModule, cssModuleToModule } from './styles/cssModules.js';
|
|
64
|
+
export type { ScopedCssModule, ComposedClass } from './styles/cssModules.js';
|
|
65
|
+
export { PACKAGE_STYLE_DIR, packageStylePath, packageStyleSpecifier, linkStylesheetModule } from './styles/packageStyles.js';
|
|
48
66
|
export { previewSocketScript, previewCookieScript, bridgeInsertionPoint, SOCKET_MESSAGE_TYPE, COOKIE_MESSAGE_TYPE, SOCKET_CONNECT_TIMEOUT_MS } from './previewBridge.js';
|
|
49
67
|
export { mimeFor } from './mime.js';
|
|
50
68
|
export { attributionScript, injectAttribution, ATTRIBUTION_URL, ATTRIBUTION_LABEL } from './attribution.js';
|
package/src/installer/tree.ts
CHANGED
|
@@ -13,6 +13,7 @@
|
|
|
13
13
|
import type { PackageManifest } from './registry.js';
|
|
14
14
|
import { parseDependency, type PackageJson, type ParsedSpec } from './spec.js';
|
|
15
15
|
import { satisfies, validRange } from './semver.js';
|
|
16
|
+
import { napiWasmSibling, wasmBuildOf } from './wasmBuilds.js';
|
|
16
17
|
|
|
17
18
|
export type EdgeType = 'prod' | 'dev' | 'optional' | 'peer';
|
|
18
19
|
|
|
@@ -31,6 +32,8 @@ interface Dependency {
|
|
|
31
32
|
name: string;
|
|
32
33
|
range: string;
|
|
33
34
|
type: EdgeType;
|
|
35
|
+
/** Added by this installer (a napi-rs wasm binding), not declared: missing is silent. */
|
|
36
|
+
implied?: boolean;
|
|
34
37
|
}
|
|
35
38
|
|
|
36
39
|
interface Edge extends Dependency {
|
|
@@ -90,12 +93,14 @@ function bundledNames(m: { bundleDependencies?: string[] | boolean; bundledDepen
|
|
|
90
93
|
|
|
91
94
|
function dependenciesOf(m: PackageJson | PackageManifest, isRoot: boolean, production: boolean): Dependency[] {
|
|
92
95
|
const out = new Map<string, Dependency>();
|
|
93
|
-
const add = (record: Record<string, string> | undefined, type: EdgeType) => {
|
|
94
|
-
for (const [name, range] of Object.entries(record ?? {})) if (!out.has(name) || type === 'optional') out.set(name, { name, range, type });
|
|
96
|
+
const add = (record: Record<string, string> | undefined, type: EdgeType, implied?: boolean) => {
|
|
97
|
+
for (const [name, range] of Object.entries(record ?? {})) if (!out.has(name) || type === 'optional') out.set(name, { name, range, type, implied });
|
|
95
98
|
};
|
|
96
99
|
if (isRoot && !production) add((m as PackageJson).devDependencies, 'dev');
|
|
97
100
|
add(m.dependencies, 'prod');
|
|
98
101
|
add(m.optionalDependencies, 'optional');
|
|
102
|
+
const sibling = napiWasmSibling(m.optionalDependencies);
|
|
103
|
+
if (sibling) add({ [sibling[0]]: sibling[1] }, 'optional', true);
|
|
99
104
|
if (!isRoot) {
|
|
100
105
|
const meta = (m as PackageManifest).peerDependenciesMeta ?? {};
|
|
101
106
|
for (const [name, range] of Object.entries(m.peerDependencies ?? {})) {
|
|
@@ -106,6 +111,19 @@ function dependenciesOf(m: PackageJson | PackageManifest, isRoot: boolean, produ
|
|
|
106
111
|
return [...out.values()].filter((d) => !bundled.has(d.name)).sort((a, b) => (a.name < b.name ? -1 : 1));
|
|
107
112
|
}
|
|
108
113
|
|
|
114
|
+
/** A native-binary package's wasm twin when one fits the range (`wasmBuilds.ts`), else the package itself. */
|
|
115
|
+
async function pickPreferringWasm(options: ResolveTreeOptions, spec: ParsedSpec): Promise<PackageManifest> {
|
|
116
|
+
const twin = wasmBuildOf(spec);
|
|
117
|
+
if (twin) {
|
|
118
|
+
try {
|
|
119
|
+
return await options.pick(twin);
|
|
120
|
+
} catch {
|
|
121
|
+
// no twin release for this range: the original package, as written
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
return options.pick(spec);
|
|
125
|
+
}
|
|
126
|
+
|
|
109
127
|
/** Does `version` satisfy the edge's range? A dist-tag never "matches" without a pick. */
|
|
110
128
|
function matches(version: string, range: string): boolean {
|
|
111
129
|
const r = range || '*';
|
|
@@ -180,10 +198,10 @@ export async function resolveTree(options: ResolveTreeOptions): Promise<Map<stri
|
|
|
180
198
|
|
|
181
199
|
let manifest: PackageManifest;
|
|
182
200
|
try {
|
|
183
|
-
manifest = await options
|
|
201
|
+
manifest = await pickPreferringWasm(options, spec);
|
|
184
202
|
} catch (error) {
|
|
185
203
|
if (dep.type !== 'optional') throw error;
|
|
186
|
-
options.warn(`skipped optional ${dep.name}: ${(error as Error).message}`);
|
|
204
|
+
if (!dep.implied) options.warn(`skipped optional ${dep.name}: ${(error as Error).message}`);
|
|
187
205
|
continue;
|
|
188
206
|
}
|
|
189
207
|
if (!fitsPlatform(manifest)) {
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Native binaries → the same projects' own WebAssembly builds, in two shapes:
|
|
3
|
+
*
|
|
4
|
+
* - A twin package (`WASM_BUILDS`), installed under the original name: code that
|
|
5
|
+
* requires `esbuild` gets `esbuild-wasm` at the same version, with the same
|
|
6
|
+
* JavaScript API. Vite, Nuxt, SvelteKit, tsx and tsup all reach for these.
|
|
7
|
+
* Data, not branches: another tool with an official wasm twin is one more row.
|
|
8
|
+
* - A napi-rs `-wasm32-wasi` binding (`napiWasmSibling`), added beside the
|
|
9
|
+
* per-platform ones the package lists.
|
|
10
|
+
*/
|
|
11
|
+
import type { ParsedSpec } from './spec.js';
|
|
12
|
+
|
|
13
|
+
const WASM_BUILDS: Readonly<Record<string, string>> = {
|
|
14
|
+
esbuild: 'esbuild-wasm',
|
|
15
|
+
rollup: '@rollup/wasm-node',
|
|
16
|
+
};
|
|
17
|
+
|
|
18
|
+
/** A napi-rs per-platform binding name: `@oxc-parser/binding-linux-x64-gnu`, `lightningcss-darwin-arm64`. */
|
|
19
|
+
const NAPI_PLATFORM = /-(?:darwin|linux|win32|android|freebsd|openharmony|sunos|aix)-[a-z0-9_-]+$/;
|
|
20
|
+
|
|
21
|
+
/**
|
|
22
|
+
* napi-rs packages list a binding per platform as optional dependencies, none of
|
|
23
|
+
* which fits here; most also publish a `-wasm32-wasi` sibling they look for next
|
|
24
|
+
* but do not list (oxc-parser, rolldown, @tailwindcss/oxide). This names that
|
|
25
|
+
* sibling, at the bindings' range, so it installs as one more optional dependency
|
|
26
|
+
* (absent from the registry → skipped like any optional miss).
|
|
27
|
+
*/
|
|
28
|
+
export function napiWasmSibling(optional: Readonly<Record<string, string>> | undefined): [name: string, range: string] | undefined {
|
|
29
|
+
const bindings = Object.entries(optional ?? {}).filter(([name]) => NAPI_PLATFORM.test(name));
|
|
30
|
+
if (bindings.length < 2) return undefined;
|
|
31
|
+
const [first, range] = bindings[0]!;
|
|
32
|
+
const sibling = first.replace(NAPI_PLATFORM, '-wasm32-wasi');
|
|
33
|
+
return optional![sibling] || bindings.some(([name]) => name.replace(NAPI_PLATFORM, '') !== first.replace(NAPI_PLATFORM, '')) ? undefined : [sibling, range];
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
/**
|
|
37
|
+
* The wasm twin of `spec`, when it has one and was asked for by its own name
|
|
38
|
+
* (an explicit `npm:` alias is left alone). The caller falls back to `spec` when
|
|
39
|
+
* the twin has no matching version: Rollup 3 is plain JavaScript and has no
|
|
40
|
+
* `@rollup/wasm-node` release, and needs no substitute.
|
|
41
|
+
*/
|
|
42
|
+
export function wasmBuildOf(spec: ParsedSpec): ParsedSpec | undefined {
|
|
43
|
+
const twin = spec.registryName === spec.name ? WASM_BUILDS[spec.name] : undefined;
|
|
44
|
+
return twin ? { ...spec, registryName: twin } : undefined;
|
|
45
|
+
}
|
package/src/node/builtins.ts
CHANGED
|
@@ -4,7 +4,8 @@
|
|
|
4
4
|
* `path` and `process` close over that process's cwd, IO and event loop.
|
|
5
5
|
*/
|
|
6
6
|
import type { VirtualFileSystem } from '../vfs.js';
|
|
7
|
-
import type { ProgramIO, System } from '../system/types.js';
|
|
7
|
+
import type { ProgramIO, StdioChunk, System, ThreadInfo } from '../system/types.js';
|
|
8
|
+
import type { IpcEndpoint } from '../system/ipc.js';
|
|
8
9
|
import type { EventLoop } from './loop.js';
|
|
9
10
|
import type { NodeProcess } from './process.js';
|
|
10
11
|
import { createEventsModule } from './events.js';
|
|
@@ -13,6 +14,7 @@ import { createPathModule } from './path.js';
|
|
|
13
14
|
import { createUtilModule, types as utilTypes } from './util.js';
|
|
14
15
|
import { createStreamModule } from './stream/index.js';
|
|
15
16
|
import { createFsModule } from './fs/index.js';
|
|
17
|
+
import { createStdinRead } from './fs/stdinFd.js';
|
|
16
18
|
import { constants as fsConstants } from './fs/stats.js';
|
|
17
19
|
import { createCryptoModule } from './crypto.js';
|
|
18
20
|
import { createQuerystringModule, createUrlModule } from './urlqs.js';
|
|
@@ -20,6 +22,7 @@ import { createAssertModule } from './assert.js';
|
|
|
20
22
|
import { createZlibModule } from './zlib.js';
|
|
21
23
|
import { createHttpModule, createNetModule, createFetch } from './http/index.js';
|
|
22
24
|
import { createChildProcessModule } from './childProcess.js';
|
|
25
|
+
import { createWorkerThreadsModule } from './workerThreads.js';
|
|
23
26
|
import { createReadlineModule } from './readline.js';
|
|
24
27
|
import { createAsyncHooksModule, createDiagnosticsChannelModule, createOsModule, createStringDecoderModule, createStubModules, createTimersModule, createTtyModule, createVmModule } from './misc.js';
|
|
25
28
|
|
|
@@ -31,6 +34,10 @@ export interface BuiltinDeps {
|
|
|
31
34
|
system: System;
|
|
32
35
|
io: ProgramIO;
|
|
33
36
|
console: Console;
|
|
37
|
+
/** Set when this process is a worker thread (`worker_threads.isMainThread` false). */
|
|
38
|
+
thread?: ThreadInfo;
|
|
39
|
+
/** The process's channel to its parent: a worker thread's `parentPort`. */
|
|
40
|
+
ipc?: IpcEndpoint;
|
|
34
41
|
}
|
|
35
42
|
|
|
36
43
|
type Factory = (get: (name: string) => any) => unknown;
|
|
@@ -40,28 +47,30 @@ export function createBuiltins(deps: BuiltinDeps) {
|
|
|
40
47
|
const env = () => proc.env as Record<string, string | undefined>;
|
|
41
48
|
const stubs = createStubModules();
|
|
42
49
|
const clientDeps = { system, loop };
|
|
50
|
+
/** What starting other processes needs: child_process and worker_threads alike. */
|
|
51
|
+
const spawnDeps = {
|
|
52
|
+
system,
|
|
53
|
+
loop,
|
|
54
|
+
cwd: () => proc.cwd() as string,
|
|
55
|
+
env,
|
|
56
|
+
stdout: (c: StdioChunk) => void proc.stdout.write(c),
|
|
57
|
+
stderr: (c: StdioChunk) => void proc.stderr.write(c),
|
|
58
|
+
};
|
|
43
59
|
|
|
44
60
|
const factories: Record<string, Factory> = {
|
|
45
61
|
assert: () => createAssertModule(false),
|
|
46
62
|
'assert/strict': () => createAssertModule(true),
|
|
47
63
|
async_hooks: () => createAsyncHooksModule(),
|
|
48
64
|
buffer: () => createBufferModule(),
|
|
49
|
-
child_process: () =>
|
|
50
|
-
|
|
51
|
-
system,
|
|
52
|
-
loop,
|
|
53
|
-
cwd: () => proc.cwd(),
|
|
54
|
-
env,
|
|
55
|
-
stdout: (c) => proc.stdout.write(c),
|
|
56
|
-
stderr: (c) => proc.stderr.write(c),
|
|
57
|
-
}),
|
|
65
|
+
child_process: () => createChildProcessModule(spawnDeps),
|
|
66
|
+
worker_threads: () => createWorkerThreadsModule({ ...spawnDeps, thread: deps.thread, ipc: deps.ipc }),
|
|
58
67
|
console: () => Object.assign(Object.create(deps.console), { Console: function Console() { return deps.console; } }),
|
|
59
68
|
constants: (get) => ({ ...fsConstants, ...(get('os').constants.signals as object) }),
|
|
60
69
|
crypto: () => createCryptoModule(),
|
|
61
70
|
diagnostics_channel: () => createDiagnosticsChannelModule(),
|
|
62
71
|
'dns/promises': (get) => get('dns').promises,
|
|
63
72
|
events: () => createEventsModule(),
|
|
64
|
-
fs: () => createFsModule({ vfs: deps.fs, cwd: () => proc.cwd(), stdout: deps.io.stdout, stderr: deps.io.stderr, hold: () => loop.hold() }),
|
|
73
|
+
fs: () => createFsModule({ vfs: deps.fs, cwd: () => proc.cwd(), stdout: deps.io.stdout, stderr: deps.io.stderr, hold: () => loop.hold(), readStdin: createStdinRead(deps.io, () => loop.hold()) }),
|
|
65
74
|
'fs/promises': (get) => get('fs').promises,
|
|
66
75
|
http: () => createHttpModule(clientDeps, 'http:'),
|
|
67
76
|
https: () => createHttpModule(clientDeps, 'https:'),
|
|
@@ -94,7 +103,7 @@ export function createBuiltins(deps: BuiltinDeps) {
|
|
|
94
103
|
timers: () => createTimersModule(loop),
|
|
95
104
|
'timers/promises': (get) => get('timers').promises,
|
|
96
105
|
tty: () => createTtyModule(!!deps.io.terminal),
|
|
97
|
-
url: (get) => createUrlModule(get('querystring')),
|
|
106
|
+
url: (get) => createUrlModule(get('querystring'), (path) => get('path').resolve(path)),
|
|
98
107
|
util: () => createUtilModule(env, (message) => proc.stderr.write(message + '\n')),
|
|
99
108
|
'util/types': () => utilTypes,
|
|
100
109
|
vm: () => createVmModule(),
|
package/src/node/childProcess.ts
CHANGED
|
@@ -9,7 +9,10 @@ import { EventEmitterBase } from './events.js';
|
|
|
9
9
|
import { Readable } from './stream/readable.js';
|
|
10
10
|
import { Writable } from './stream/writable.js';
|
|
11
11
|
import type { EventLoop } from './loop.js';
|
|
12
|
-
import type { ChildHandle, System } from '../system/types.js';
|
|
12
|
+
import type { ChildHandle, StdioChunk, System } from '../system/types.js';
|
|
13
|
+
import { Buffer } from './buffer.js';
|
|
14
|
+
import type { IpcEndpoint } from '../system/ipc.js';
|
|
15
|
+
import { queueCallback } from './processExit.js';
|
|
13
16
|
|
|
14
17
|
interface SpawnOptions {
|
|
15
18
|
cwd?: string;
|
|
@@ -19,6 +22,12 @@ interface SpawnOptions {
|
|
|
19
22
|
signal?: AbortSignal;
|
|
20
23
|
encoding?: string;
|
|
21
24
|
maxBuffer?: number;
|
|
25
|
+
/** `fork`: open a message channel (`child.send` ↔ `process.send`). */
|
|
26
|
+
ipc?: boolean;
|
|
27
|
+
/** `fork`: pipe the child's stdout/stderr to `child.stdout`/`stderr` instead of the parent's. */
|
|
28
|
+
silent?: boolean;
|
|
29
|
+
/** Keep running after this process exits (otherwise it is killed with it). */
|
|
30
|
+
detached?: boolean;
|
|
22
31
|
}
|
|
23
32
|
|
|
24
33
|
export interface ChildProcessDeps {
|
|
@@ -27,8 +36,8 @@ export interface ChildProcessDeps {
|
|
|
27
36
|
cwd(): string;
|
|
28
37
|
env(): Record<string, string | undefined>;
|
|
29
38
|
/** Parent's stdio for `stdio: 'inherit'`. */
|
|
30
|
-
stdout(chunk:
|
|
31
|
-
stderr(chunk:
|
|
39
|
+
stdout(chunk: StdioChunk): void;
|
|
40
|
+
stderr(chunk: StdioChunk): void;
|
|
32
41
|
}
|
|
33
42
|
|
|
34
43
|
const quote = (arg: string) => (/^[\w@%+=:,./-]+$/.test(arg) ? arg : `'${arg.replace(/'/g, `'\\''`)}'`);
|
|
@@ -46,6 +55,11 @@ class ChildProcess extends EventEmitterBase {
|
|
|
46
55
|
stderr: Readable;
|
|
47
56
|
stdio: [Writable, Readable, Readable];
|
|
48
57
|
private handle?: ChildHandle;
|
|
58
|
+
private ipc?: IpcEndpoint;
|
|
59
|
+
/** Lets go of the parent's event loop; undefined once released (exit, or `unref()`). */
|
|
60
|
+
private release?: () => void;
|
|
61
|
+
private exited = false;
|
|
62
|
+
private readonly hold: () => () => void;
|
|
49
63
|
|
|
50
64
|
constructor(deps: ChildProcessDeps, command: string, args: string[], options: SpawnOptions) {
|
|
51
65
|
super();
|
|
@@ -55,7 +69,7 @@ class ChildProcess extends EventEmitterBase {
|
|
|
55
69
|
this.stderr = new Readable({ read() {} });
|
|
56
70
|
this.stdin = new Writable({
|
|
57
71
|
write: (chunk: Uint8Array | string, _enc: string, cb: () => void) => {
|
|
58
|
-
this.handle?.write(typeof chunk === 'string' ? chunk : new
|
|
72
|
+
this.handle?.write(typeof chunk === 'string' ? chunk : new Uint8Array(chunk)); // bytes stay bytes
|
|
59
73
|
cb();
|
|
60
74
|
},
|
|
61
75
|
final: (cb: () => void) => {
|
|
@@ -64,30 +78,45 @@ class ChildProcess extends EventEmitterBase {
|
|
|
64
78
|
},
|
|
65
79
|
});
|
|
66
80
|
this.stdio = [this.stdin, this.stdout, this.stderr];
|
|
67
|
-
|
|
81
|
+
// Per stream, as Node reads it: `'inherit'`, or `['pipe', 'pipe', 'inherit']` (esbuild's service: its stderr is the parent's).
|
|
82
|
+
const inherits = (fd: 1 | 2) => options.stdio === 'inherit' || (Array.isArray(options.stdio) && options.stdio[fd] === 'inherit');
|
|
83
|
+
const [inheritOut, inheritErr] = [inherits(1), inherits(2)];
|
|
68
84
|
|
|
69
85
|
const env: Record<string, string> = {};
|
|
70
86
|
for (const [k, v] of Object.entries(options.env ?? deps.env())) if (v !== undefined) env[k] = String(v);
|
|
71
87
|
const [file, argv] = options.shell ? ['bfsh', ['-c', [command, ...args].join(' ')]] : [command, args];
|
|
72
|
-
|
|
88
|
+
this.hold = () => deps.loop.hold();
|
|
89
|
+
this.release = this.hold();
|
|
73
90
|
try {
|
|
74
|
-
this.handle = deps.system.spawn(file, argv, { cwd: options.cwd ?? deps.cwd(), env });
|
|
91
|
+
this.handle = deps.system.spawn(file, argv, { cwd: options.cwd ?? deps.cwd(), env, ipc: options.ipc, detached: options.detached });
|
|
75
92
|
} catch (error) {
|
|
76
|
-
|
|
93
|
+
this.unref();
|
|
77
94
|
const code = (error as { code?: string }).code ?? 'ENOENT';
|
|
78
95
|
const failure = Object.assign(new Error(`spawn ${command} ${code}`), { code, errno: -2, syscall: `spawn ${command}`, path: command, spawnargs: args });
|
|
79
|
-
|
|
96
|
+
queueCallback(() => {
|
|
80
97
|
this.emit('error', failure);
|
|
81
98
|
this.emit('close', -2, null);
|
|
82
99
|
});
|
|
83
100
|
return;
|
|
84
101
|
}
|
|
85
102
|
this.pid = this.handle.pid;
|
|
86
|
-
|
|
87
|
-
|
|
103
|
+
const ipc = this.handle.ipc;
|
|
104
|
+
if (ipc) {
|
|
105
|
+
this.ipc = ipc;
|
|
106
|
+
this.connected = true;
|
|
107
|
+
ipc.onMessage((message) => deps.loop._run(() => this.emit('message', message, undefined)));
|
|
108
|
+
ipc.onDisconnect(() => {
|
|
109
|
+
this.connected = false;
|
|
110
|
+
deps.loop._run(() => this.emit('disconnect'));
|
|
111
|
+
});
|
|
112
|
+
}
|
|
113
|
+
// Piped output arrives as Buffers, as in Node.
|
|
114
|
+
this.handle.onStdout((chunk) => (inheritOut ? deps.stdout(chunk) : this.stdout.push(Buffer.from(chunk))));
|
|
115
|
+
this.handle.onStderr((chunk) => (inheritErr ? deps.stderr(chunk) : this.stderr.push(Buffer.from(chunk))));
|
|
88
116
|
options.signal?.addEventListener('abort', () => this.kill());
|
|
89
|
-
|
|
117
|
+
queueCallback(() => this.emit('spawn'));
|
|
90
118
|
void this.handle.exit.then((code) => {
|
|
119
|
+
this.exited = true;
|
|
91
120
|
this.exitCode = this.killed ? null : code;
|
|
92
121
|
this.stdout.push(null);
|
|
93
122
|
this.stderr.push(null);
|
|
@@ -95,7 +124,7 @@ class ChildProcess extends EventEmitterBase {
|
|
|
95
124
|
this.emit('exit', this.exitCode, this.signalCode);
|
|
96
125
|
this.emit('close', this.exitCode, this.signalCode);
|
|
97
126
|
});
|
|
98
|
-
|
|
127
|
+
this.unref();
|
|
99
128
|
});
|
|
100
129
|
}
|
|
101
130
|
|
|
@@ -107,12 +136,33 @@ class ChildProcess extends EventEmitterBase {
|
|
|
107
136
|
return true;
|
|
108
137
|
}
|
|
109
138
|
|
|
110
|
-
send(): boolean {
|
|
111
|
-
|
|
139
|
+
send(message: unknown, ...rest: unknown[]): boolean {
|
|
140
|
+
const callback = rest.find((arg): arg is (error: Error | null) => void => typeof arg === 'function');
|
|
141
|
+
const fail = (error: Error) => {
|
|
142
|
+
if (callback) queueCallback(() => callback(error));
|
|
143
|
+
else queueCallback(() => this.emit('error', error));
|
|
144
|
+
return false;
|
|
145
|
+
};
|
|
146
|
+
if (!this.ipc) return fail(Object.assign(new Error('Channel closed'), { code: 'ERR_IPC_CHANNEL_CLOSED' }));
|
|
147
|
+
try {
|
|
148
|
+
this.ipc.send(message);
|
|
149
|
+
} catch (error) {
|
|
150
|
+
return fail(error as Error);
|
|
151
|
+
}
|
|
152
|
+
if (callback) queueCallback(() => callback(null));
|
|
153
|
+
return true;
|
|
154
|
+
}
|
|
155
|
+
disconnect(): void {
|
|
156
|
+
this.ipc?.disconnect();
|
|
157
|
+
}
|
|
158
|
+
/** A running child keeps the parent alive until `unref()` (then `ref()` to hold it again). */
|
|
159
|
+
ref(): void {
|
|
160
|
+
if (!this.release && this.handle && !this.exited) this.release = this.hold();
|
|
161
|
+
}
|
|
162
|
+
unref(): void {
|
|
163
|
+
this.release?.();
|
|
164
|
+
this.release = undefined;
|
|
112
165
|
}
|
|
113
|
-
disconnect(): void {}
|
|
114
|
-
ref(): void {}
|
|
115
|
-
unref(): void {}
|
|
116
166
|
}
|
|
117
167
|
|
|
118
168
|
type ExecCallback = (error: (Error & { code?: number | string }) | null, stdout: string, stderr: string) => void;
|
|
@@ -152,9 +202,12 @@ export function createChildProcessModule(deps: ChildProcessDeps): Record<string,
|
|
|
152
202
|
if (typeof options === 'function') [callback, options] = [options, {}];
|
|
153
203
|
return collect(new ChildProcess(deps, file, args, options ?? {}), [file, ...args].map(quote).join(' '), callback);
|
|
154
204
|
},
|
|
155
|
-
fork(modulePath: string, args?: string[] | SpawnOptions, options?: SpawnOptions) {
|
|
205
|
+
fork(modulePath: string, args?: string[] | SpawnOptions, options?: SpawnOptions & { execArgv?: string[] }) {
|
|
156
206
|
if (!Array.isArray(args)) [options, args] = [args, []];
|
|
157
|
-
|
|
207
|
+
const opts = options ?? {};
|
|
208
|
+
// A forked child shares the parent's stdout/stderr unless `silent`, as in Node.
|
|
209
|
+
const stdio = opts.stdio ?? (opts.silent ? 'pipe' : 'inherit');
|
|
210
|
+
return new ChildProcess(deps, 'node', [...(opts.execArgv ?? []), modulePath, ...args.map(String)], { ...opts, stdio, ipc: true });
|
|
158
211
|
},
|
|
159
212
|
execSync: noSync('execSync'),
|
|
160
213
|
execFileSync: noSync('execFileSync'),
|
package/src/node/crypto.ts
CHANGED
|
@@ -7,6 +7,7 @@
|
|
|
7
7
|
import { Buffer } from './buffer.js';
|
|
8
8
|
import { hashAlgorithm, HASHES } from './hashes.js';
|
|
9
9
|
import { Transform } from './stream/index.js';
|
|
10
|
+
import { queueCallback } from './processExit.js';
|
|
10
11
|
|
|
11
12
|
type Input = string | ArrayBufferView;
|
|
12
13
|
|
|
@@ -123,7 +124,7 @@ const unsupported = (name: string) => () => {
|
|
|
123
124
|
export function createCryptoModule(): Record<string, unknown> {
|
|
124
125
|
const randomBytes = (size: number, callback?: (error: Error | null, buf: Buffer) => void) => {
|
|
125
126
|
const buf = randomFill(Buffer.alloc(size));
|
|
126
|
-
if (callback)
|
|
127
|
+
if (callback) queueCallback(() => callback(null, buf));
|
|
127
128
|
return buf;
|
|
128
129
|
};
|
|
129
130
|
return {
|
|
@@ -142,13 +143,13 @@ export function createCryptoModule(): Record<string, unknown> {
|
|
|
142
143
|
randomFill: (view: ArrayBufferView, ...rest: unknown[]) => {
|
|
143
144
|
const callback = rest.pop() as (e: Error | null, v: ArrayBufferView) => void;
|
|
144
145
|
randomFill(view);
|
|
145
|
-
|
|
146
|
+
queueCallback(() => callback(null, view));
|
|
146
147
|
},
|
|
147
148
|
randomUUID: () => globalThis.crypto.randomUUID(),
|
|
148
149
|
randomInt(min: number, max?: number | ((e: Error | null, n: number) => void), callback?: (e: Error | null, n: number) => void) {
|
|
149
150
|
if (typeof max !== 'number') [callback, max, min] = [max as typeof callback, min, 0];
|
|
150
151
|
const value = min + Math.floor((globalThis.crypto.getRandomValues(new Uint32Array(1))[0]! / 2 ** 32) * (max - min));
|
|
151
|
-
if (callback)
|
|
152
|
+
if (callback) queueCallback(() => callback!(null, value));
|
|
152
153
|
return value;
|
|
153
154
|
},
|
|
154
155
|
getRandomValues: <T extends ArrayBufferView>(view: T) => randomFill(view),
|
|
@@ -162,7 +163,7 @@ export function createCryptoModule(): Record<string, unknown> {
|
|
|
162
163
|
},
|
|
163
164
|
pbkdf2Sync,
|
|
164
165
|
pbkdf2(password: Input, salt: Input, iterations: number, keylen: number, digest: string, callback: (e: Error | null, key?: Buffer) => void) {
|
|
165
|
-
|
|
166
|
+
queueCallback(() => {
|
|
166
167
|
try {
|
|
167
168
|
callback(null, pbkdf2Sync(password, salt, iterations, keylen, digest));
|
|
168
169
|
} catch (error) {
|
package/src/node/esm.ts
CHANGED
|
@@ -98,6 +98,30 @@ function exportKeywordBefore(source: string, pos: number): number {
|
|
|
98
98
|
return -1;
|
|
99
99
|
}
|
|
100
100
|
|
|
101
|
+
/**
|
|
102
|
+
* `import(x)` inside a CommonJS module. Left alone it would be the HOST's native
|
|
103
|
+
* `import()`, resolving against the runtime's own files instead of the project's
|
|
104
|
+
* (Next.js's CLI loads its commands this way); pointed at `__bfwc_dynamic` it goes
|
|
105
|
+
* through this runtime's loader like everything else.
|
|
106
|
+
*/
|
|
107
|
+
export function rewriteDynamicImports(source: string): string {
|
|
108
|
+
if (!/\bimport\s*\(/.test(source)) return source;
|
|
109
|
+
let imports: ReturnType<typeof parse>[0];
|
|
110
|
+
try {
|
|
111
|
+
[imports] = parse(source);
|
|
112
|
+
} catch {
|
|
113
|
+
return source; // not lexable as a module; leave it to fail (or not) as written
|
|
114
|
+
}
|
|
115
|
+
let out = '';
|
|
116
|
+
let cursor = 0;
|
|
117
|
+
for (const imp of imports) {
|
|
118
|
+
if (imp.t !== 2) continue;
|
|
119
|
+
out += source.slice(cursor, imp.ss) + '__bfwc_dynamic';
|
|
120
|
+
cursor = imp.d;
|
|
121
|
+
}
|
|
122
|
+
return cursor ? out + source.slice(cursor) : source;
|
|
123
|
+
}
|
|
124
|
+
|
|
101
125
|
export function esmToCjs(source: string): string {
|
|
102
126
|
const [imports, exports] = parse(source);
|
|
103
127
|
const edits: Edit[] = [];
|
|
@@ -125,7 +149,7 @@ export function esmToCjs(source: string): string {
|
|
|
125
149
|
reexportStarts.add(imp.ss);
|
|
126
150
|
const nsMatch = /^export\s*\*\s*as\s+("[^"]*"|'[^']*'|[^\s]+)/.exec(statement);
|
|
127
151
|
if (nsMatch) getters.set(nsMatch[1]!.replace(/^["']|["']$/g, ''), ns);
|
|
128
|
-
else if (/^export\s*\*/.test(statement)) edits.push({ start: imp.ss, end: imp.se, text: `${load} __bfwc_star(
|
|
152
|
+
else if (/^export\s*\*/.test(statement)) edits.push({ start: imp.ss, end: imp.se, text: `${load} __bfwc_star(__bfwc_exports, ${ns});` });
|
|
129
153
|
else for (const [imported, exported] of parseList(/\{([^}]*)\}/.exec(statement)?.[1] ?? '')) getters.set(exported, access(ns, imported));
|
|
130
154
|
if (!edits.some((e) => e.start === imp.ss)) edits.push({ start: imp.ss, end: imp.se, text: load });
|
|
131
155
|
continue;
|
|
@@ -192,5 +216,5 @@ export function esmToCjs(source: string): string {
|
|
|
192
216
|
for (const edit of edits) code = code.slice(0, edit.start) + edit.text + code.slice(edit.end);
|
|
193
217
|
const getterList = [...getters].map(([name, expr]) => `${JSON.stringify(name)}: () => ${expr}`).join(', ');
|
|
194
218
|
// One line, so stack-trace line numbers stay aligned with the source.
|
|
195
|
-
return `"use strict";__bfwc_esm(
|
|
219
|
+
return `"use strict";__bfwc_esm(__bfwc_exports, { ${getterList} });${code}`;
|
|
196
220
|
}
|