brustjs 0.1.2-alpha → 0.1.4-alpha
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/package.json +7 -7
- package/runtime/cli/dev.ts +20 -2
- package/runtime/cli/native-routes-emit.ts +30 -1
- package/runtime/dev/coordinator.ts +7 -0
- package/runtime/dev/jinja-reload.ts +31 -0
- package/runtime/dev/ws-channel.ts +12 -13
- package/runtime/index.d.ts +12 -0
- package/runtime/index.js +53 -52
- package/runtime/index.ts +9 -5
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "brustjs",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.4-alpha",
|
|
4
4
|
"description": "Bun + Rust SSR framework — React on the server, Rust everywhere else (napi cdylib + per-worker SharedArrayBuffer).",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -40,12 +40,12 @@
|
|
|
40
40
|
"typescript": "^6.0.3"
|
|
41
41
|
},
|
|
42
42
|
"optionalDependencies": {
|
|
43
|
-
"brustjs-darwin-x64": "0.1.
|
|
44
|
-
"brustjs-darwin-arm64": "0.1.
|
|
45
|
-
"brustjs-linux-x64-gnu": "0.1.
|
|
46
|
-
"brustjs-linux-arm64-gnu": "0.1.
|
|
47
|
-
"brustjs-linux-x64-musl": "0.1.
|
|
48
|
-
"brustjs-linux-arm64-musl": "0.1.
|
|
43
|
+
"brustjs-darwin-x64": "0.1.4-alpha",
|
|
44
|
+
"brustjs-darwin-arm64": "0.1.4-alpha",
|
|
45
|
+
"brustjs-linux-x64-gnu": "0.1.4-alpha",
|
|
46
|
+
"brustjs-linux-arm64-gnu": "0.1.4-alpha",
|
|
47
|
+
"brustjs-linux-x64-musl": "0.1.4-alpha",
|
|
48
|
+
"brustjs-linux-arm64-musl": "0.1.4-alpha"
|
|
49
49
|
},
|
|
50
50
|
"peerDependencies": {
|
|
51
51
|
"react": "^19.2.6",
|
package/runtime/cli/dev.ts
CHANGED
|
@@ -79,11 +79,29 @@ export async function runDev(args: string[]): Promise<void> {
|
|
|
79
79
|
// reads from `cwd + '.brust/jinja'`. When user runs `bun run dev
|
|
80
80
|
// example/hello-world/index.ts` from repo root, cwd != entryDir; writing
|
|
81
81
|
// to entryDir would put templates somewhere the runtime never looks.
|
|
82
|
-
|
|
82
|
+
const jinjaDir = path.join(process.cwd(), '.brust/jinja')
|
|
83
|
+
const emitOpts = {
|
|
83
84
|
entryFile: existsSync(routesFile) ? routesFile : entry,
|
|
84
85
|
flatRoutes: loadedRoutes as { nativeTemplate?: string }[],
|
|
85
|
-
outDir:
|
|
86
|
+
outDir: jinjaDir,
|
|
86
87
|
repoRoot: REPO_ROOT,
|
|
88
|
+
}
|
|
89
|
+
await emitNativeTemplates(emitOpts)
|
|
90
|
+
|
|
91
|
+
// Native-route HMR: on a ts/html/islands hot reload the dev coordinator calls
|
|
92
|
+
// this to recompile the .jinja templates from the (edited) source and reload
|
|
93
|
+
// them into the minijinja env — so `native: true` routes pick up edits without
|
|
94
|
+
// a dev-server restart. The runtime (loaded by the entry import below) holds
|
|
95
|
+
// napiLoadJinjaTemplates via the napi loader at `../index.js`; the Rust env is
|
|
96
|
+
// a reloadable RwLock. Adding/removing routes still needs a restart (the route
|
|
97
|
+
// structure is captured here at startup).
|
|
98
|
+
const { registerJinjaReEmit } = await import('../dev/jinja-reload.ts')
|
|
99
|
+
registerJinjaReEmit(async () => {
|
|
100
|
+
await emitNativeTemplates(emitOpts)
|
|
101
|
+
const native = await import('../index.js')
|
|
102
|
+
;(native as { napiLoadJinjaTemplates: (dir: string) => unknown }).napiLoadJinjaTemplates(
|
|
103
|
+
jinjaDir,
|
|
104
|
+
)
|
|
87
105
|
})
|
|
88
106
|
|
|
89
107
|
// Hand off to the user's entry. It calls brust.run() which, with
|
|
@@ -1,7 +1,29 @@
|
|
|
1
1
|
import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
|
|
2
2
|
import { dirname, resolve } from 'node:path'
|
|
3
|
+
import { buildDevClientTag } from '../dev/client.ts'
|
|
3
4
|
import { ISLANDS_IMPORTMAP_AND_BOOTSTRAP } from '../islands/importmap.ts'
|
|
4
5
|
|
|
6
|
+
/** Dev-only: splice the /_brust/dev WS client `<script>` into a compiled native
|
|
7
|
+
* template so `native: true` (jinja) routes auto-reload like React-SSR routes.
|
|
8
|
+
*
|
|
9
|
+
* Native routes render Rust-side on the fast lane, bypassing the React renderer
|
|
10
|
+
* that injects the dev client (runtime/render/stream.ts) — so without this the
|
|
11
|
+
* browser on a native page never opens the dev WS and can never auto-reload.
|
|
12
|
+
*
|
|
13
|
+
* Inserted before the first `</head>` when the page has one (a `<BrustPage>`
|
|
14
|
+
* shell); otherwise appended (bare-fragment pages like a plain `<div>`). The
|
|
15
|
+
* browser executes the module script in either position. Gated on `BRUST_DEV`
|
|
16
|
+
* so `brust build` never bakes it into production templates. */
|
|
17
|
+
function injectDevClientIntoTemplate(template: string): string {
|
|
18
|
+
const tag = buildDevClientTag()
|
|
19
|
+
if (template.includes(tag)) return template // idempotent across re-emits
|
|
20
|
+
const headClose = template.indexOf('</head>')
|
|
21
|
+
if (headClose !== -1) {
|
|
22
|
+
return template.slice(0, headClose) + tag + template.slice(headClose)
|
|
23
|
+
}
|
|
24
|
+
return template + tag
|
|
25
|
+
}
|
|
26
|
+
|
|
5
27
|
/** Sub-project J — build pass that turns user's `pages/<Name>.tsx` files into
|
|
6
28
|
* `.brust/jinja/<Name>.jinja` templates. Invoked from `brust build` and
|
|
7
29
|
* `brust dev` after the user's routes are flattened.
|
|
@@ -85,7 +107,14 @@ export async function emitNativeTemplates(opts: NativeRouteEmitOpts): Promise<vo
|
|
|
85
107
|
} catch (e) {
|
|
86
108
|
throw new Error(`native route "${name}" failed to compile (${sourcePath}):\n${String(e)}`)
|
|
87
109
|
}
|
|
88
|
-
|
|
110
|
+
// Dev-only: native routes don't pass through the React renderer's dev-client
|
|
111
|
+
// injection, so splice the /_brust/dev WS script in here. reEmitJinja() runs
|
|
112
|
+
// this on every hot reload, so the script is always present in dev.
|
|
113
|
+
const template =
|
|
114
|
+
process.env.BRUST_DEV === '1'
|
|
115
|
+
? injectDevClientIntoTemplate(compiled.template)
|
|
116
|
+
: compiled.template
|
|
117
|
+
writeFileSync(outPath, template)
|
|
89
118
|
built.push(name)
|
|
90
119
|
|
|
91
120
|
// Islands post-processing. The compiler reports an island manifest ONLY
|
|
@@ -8,6 +8,9 @@ export interface CoordinatorDeps {
|
|
|
8
8
|
}
|
|
9
9
|
buildCss: () => Promise<void>
|
|
10
10
|
buildIslands: () => Promise<void>
|
|
11
|
+
/** Recompile native-route `.jinja` templates from source and reload them into
|
|
12
|
+
* the minijinja env, so `native: true` routes pick up .tsx edits on reload. */
|
|
13
|
+
reEmitJinja: () => Promise<void>
|
|
11
14
|
buildComponentCss?: () => Promise<void>
|
|
12
15
|
snapshotComponentCss?: () => Promise<import('../css/manifest.ts').ComponentCssManifest | null>
|
|
13
16
|
broadcast: (msg: DevMessage) => Promise<void> | void
|
|
@@ -33,12 +36,16 @@ export class Coordinator {
|
|
|
33
36
|
case 'html':
|
|
34
37
|
await this.deps.workers.terminateAll()
|
|
35
38
|
await this.deps.workers.spawnAll()
|
|
39
|
+
// Reload native-route templates (process-global minijinja env — does
|
|
40
|
+
// not depend on the workers) just before telling the browser to reload.
|
|
41
|
+
await this.deps.reEmitJinja()
|
|
36
42
|
await this.deps.broadcast({ type: 'reload' })
|
|
37
43
|
break
|
|
38
44
|
case 'islands':
|
|
39
45
|
await this.deps.buildIslands()
|
|
40
46
|
await this.deps.workers.terminateAll()
|
|
41
47
|
await this.deps.workers.spawnAll()
|
|
48
|
+
await this.deps.reEmitJinja()
|
|
42
49
|
await this.deps.broadcast({ type: 'reload' })
|
|
43
50
|
break
|
|
44
51
|
case 'css':
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
// Dev-only bridge for hot-reloading native-route `.jinja` templates.
|
|
2
|
+
//
|
|
3
|
+
// `brust dev` (cli/dev.ts) emits the native-route templates once at startup,
|
|
4
|
+
// then registers a callback here that re-emits them from the (now edited)
|
|
5
|
+
// source and reloads them into the minijinja env in the napi addon. The dev
|
|
6
|
+
// coordinator calls `reEmitJinja()` on every ts/html/islands hot reload so
|
|
7
|
+
// `native: true` routes pick up source edits instead of serving the stale
|
|
8
|
+
// template until the dev server is restarted. (The Rust side supports reload —
|
|
9
|
+
// see crates/brust/src/jinja.rs, RwLock not OnceLock.)
|
|
10
|
+
//
|
|
11
|
+
// A registry singleton (like worker-registry) rather than a direct import,
|
|
12
|
+
// because the producer (cli/dev.ts) and the consumer (the coordinator, wired in
|
|
13
|
+
// index.ts) live in different layers and only meet at runtime in `brust dev`.
|
|
14
|
+
|
|
15
|
+
let _reEmit: (() => Promise<void>) | null = null
|
|
16
|
+
|
|
17
|
+
/** Called once by `brust dev` after the initial native-template emit. */
|
|
18
|
+
export function registerJinjaReEmit(fn: () => Promise<void>): void {
|
|
19
|
+
_reEmit = fn
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
/** Called by the dev coordinator on a ts/html/islands hot reload. No-op when no
|
|
23
|
+
* callback is registered (e.g. unit tests, or an app with no native routes). */
|
|
24
|
+
export async function reEmitJinja(): Promise<void> {
|
|
25
|
+
if (_reEmit) await _reEmit()
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
/** Test helper. */
|
|
29
|
+
export function _resetForTests(): void {
|
|
30
|
+
_reEmit = null
|
|
31
|
+
}
|
|
@@ -81,19 +81,18 @@ export function installWorkerBroadcastListener(): void {
|
|
|
81
81
|
}
|
|
82
82
|
}
|
|
83
83
|
|
|
84
|
-
/** Main-side:
|
|
85
|
-
*
|
|
86
|
-
*
|
|
87
|
-
*
|
|
84
|
+
/** Main-side: push the message to every `/_brust/dev` client through the napi
|
|
85
|
+
* addon. The dev WS is a Rust-owned control channel (see the `/_brust/dev`
|
|
86
|
+
* branch in crates/brust/src/server.rs), so the frame is delivered straight
|
|
87
|
+
* through each connection's Rust-owned send_tx and SURVIVES a hot reload's
|
|
88
|
+
* worker restart.
|
|
89
|
+
*
|
|
90
|
+
* The previous implementation relayed main→worker→worker-local-clients, which
|
|
91
|
+
* lost the `reload` frame: the coordinator broadcasts it AFTER terminateAll(),
|
|
92
|
+
* by which point the connection's worker-side registration had died with the
|
|
93
|
+
* old worker. */
|
|
88
94
|
export async function broadcast(msg: DevMessage): Promise<void> {
|
|
89
95
|
const json = JSON.stringify(msg)
|
|
90
|
-
const
|
|
91
|
-
|
|
92
|
-
for (const w of workers) {
|
|
93
|
-
try {
|
|
94
|
-
w.postMessage({ type: 'dev-broadcast', json })
|
|
95
|
-
} catch {
|
|
96
|
-
/* worker already terminated; drop */
|
|
97
|
-
}
|
|
98
|
-
}
|
|
96
|
+
const native = await import('../index.js')
|
|
97
|
+
;(native as { napiDevBroadcast?: (json: string) => void }).napiDevBroadcast?.(json)
|
|
99
98
|
}
|
package/runtime/index.d.ts
CHANGED
|
@@ -29,6 +29,18 @@ export interface NapiCompiledJsx {
|
|
|
29
29
|
islandsJson: string
|
|
30
30
|
}
|
|
31
31
|
|
|
32
|
+
/**
|
|
33
|
+
* Dev-mode: broadcast one JSON control frame (building / reload / css-update /
|
|
34
|
+
* error / ok) to every connected `/_brust/dev` client. Called from the main
|
|
35
|
+
* thread by the dev coordinator. A no-op when no dev client is connected.
|
|
36
|
+
*
|
|
37
|
+
* Delivery goes straight through each connection's Rust-owned `send_tx`, so it
|
|
38
|
+
* survives a hot reload's worker restart — unlike the old worker-relay path,
|
|
39
|
+
* which lost the `reload` frame because the terminated worker took the client
|
|
40
|
+
* registration with it.
|
|
41
|
+
*/
|
|
42
|
+
export declare function napiDevBroadcast(json: string): void
|
|
43
|
+
|
|
32
44
|
/**
|
|
33
45
|
* Sub-project J — boot-time listing of registered minijinja templates.
|
|
34
46
|
* JS dispatcher uses this to validate every `native: true` route's
|
package/runtime/index.js
CHANGED
|
@@ -77,8 +77,8 @@ function requireNative() {
|
|
|
77
77
|
try {
|
|
78
78
|
const binding = require('brustjs-android-arm64')
|
|
79
79
|
const bindingPackageVersion = require('brustjs-android-arm64/package.json').version
|
|
80
|
-
if (bindingPackageVersion !== '0.1.
|
|
81
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
80
|
+
if (bindingPackageVersion !== '0.1.4-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
81
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.4-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
82
82
|
}
|
|
83
83
|
return binding
|
|
84
84
|
} catch (e) {
|
|
@@ -93,8 +93,8 @@ function requireNative() {
|
|
|
93
93
|
try {
|
|
94
94
|
const binding = require('brustjs-android-arm-eabi')
|
|
95
95
|
const bindingPackageVersion = require('brustjs-android-arm-eabi/package.json').version
|
|
96
|
-
if (bindingPackageVersion !== '0.1.
|
|
97
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
96
|
+
if (bindingPackageVersion !== '0.1.4-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
97
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.4-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
98
98
|
}
|
|
99
99
|
return binding
|
|
100
100
|
} catch (e) {
|
|
@@ -114,8 +114,8 @@ function requireNative() {
|
|
|
114
114
|
try {
|
|
115
115
|
const binding = require('brustjs-win32-x64-gnu')
|
|
116
116
|
const bindingPackageVersion = require('brustjs-win32-x64-gnu/package.json').version
|
|
117
|
-
if (bindingPackageVersion !== '0.1.
|
|
118
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
117
|
+
if (bindingPackageVersion !== '0.1.4-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
118
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.4-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
119
119
|
}
|
|
120
120
|
return binding
|
|
121
121
|
} catch (e) {
|
|
@@ -130,8 +130,8 @@ function requireNative() {
|
|
|
130
130
|
try {
|
|
131
131
|
const binding = require('brustjs-win32-x64-msvc')
|
|
132
132
|
const bindingPackageVersion = require('brustjs-win32-x64-msvc/package.json').version
|
|
133
|
-
if (bindingPackageVersion !== '0.1.
|
|
134
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
133
|
+
if (bindingPackageVersion !== '0.1.4-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
134
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.4-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
135
135
|
}
|
|
136
136
|
return binding
|
|
137
137
|
} catch (e) {
|
|
@@ -147,8 +147,8 @@ function requireNative() {
|
|
|
147
147
|
try {
|
|
148
148
|
const binding = require('brustjs-win32-ia32-msvc')
|
|
149
149
|
const bindingPackageVersion = require('brustjs-win32-ia32-msvc/package.json').version
|
|
150
|
-
if (bindingPackageVersion !== '0.1.
|
|
151
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
150
|
+
if (bindingPackageVersion !== '0.1.4-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
151
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.4-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
152
152
|
}
|
|
153
153
|
return binding
|
|
154
154
|
} catch (e) {
|
|
@@ -163,8 +163,8 @@ function requireNative() {
|
|
|
163
163
|
try {
|
|
164
164
|
const binding = require('brustjs-win32-arm64-msvc')
|
|
165
165
|
const bindingPackageVersion = require('brustjs-win32-arm64-msvc/package.json').version
|
|
166
|
-
if (bindingPackageVersion !== '0.1.
|
|
167
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
166
|
+
if (bindingPackageVersion !== '0.1.4-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
167
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.4-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
168
168
|
}
|
|
169
169
|
return binding
|
|
170
170
|
} catch (e) {
|
|
@@ -182,8 +182,8 @@ function requireNative() {
|
|
|
182
182
|
try {
|
|
183
183
|
const binding = require('brustjs-darwin-universal')
|
|
184
184
|
const bindingPackageVersion = require('brustjs-darwin-universal/package.json').version
|
|
185
|
-
if (bindingPackageVersion !== '0.1.
|
|
186
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
185
|
+
if (bindingPackageVersion !== '0.1.4-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
186
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.4-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
187
187
|
}
|
|
188
188
|
return binding
|
|
189
189
|
} catch (e) {
|
|
@@ -198,8 +198,8 @@ function requireNative() {
|
|
|
198
198
|
try {
|
|
199
199
|
const binding = require('brustjs-darwin-x64')
|
|
200
200
|
const bindingPackageVersion = require('brustjs-darwin-x64/package.json').version
|
|
201
|
-
if (bindingPackageVersion !== '0.1.
|
|
202
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
201
|
+
if (bindingPackageVersion !== '0.1.4-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
202
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.4-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
203
203
|
}
|
|
204
204
|
return binding
|
|
205
205
|
} catch (e) {
|
|
@@ -214,8 +214,8 @@ function requireNative() {
|
|
|
214
214
|
try {
|
|
215
215
|
const binding = require('brustjs-darwin-arm64')
|
|
216
216
|
const bindingPackageVersion = require('brustjs-darwin-arm64/package.json').version
|
|
217
|
-
if (bindingPackageVersion !== '0.1.
|
|
218
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
217
|
+
if (bindingPackageVersion !== '0.1.4-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
218
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.4-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
219
219
|
}
|
|
220
220
|
return binding
|
|
221
221
|
} catch (e) {
|
|
@@ -234,8 +234,8 @@ function requireNative() {
|
|
|
234
234
|
try {
|
|
235
235
|
const binding = require('brustjs-freebsd-x64')
|
|
236
236
|
const bindingPackageVersion = require('brustjs-freebsd-x64/package.json').version
|
|
237
|
-
if (bindingPackageVersion !== '0.1.
|
|
238
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
237
|
+
if (bindingPackageVersion !== '0.1.4-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
238
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.4-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
239
239
|
}
|
|
240
240
|
return binding
|
|
241
241
|
} catch (e) {
|
|
@@ -250,8 +250,8 @@ function requireNative() {
|
|
|
250
250
|
try {
|
|
251
251
|
const binding = require('brustjs-freebsd-arm64')
|
|
252
252
|
const bindingPackageVersion = require('brustjs-freebsd-arm64/package.json').version
|
|
253
|
-
if (bindingPackageVersion !== '0.1.
|
|
254
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
253
|
+
if (bindingPackageVersion !== '0.1.4-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
254
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.4-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
255
255
|
}
|
|
256
256
|
return binding
|
|
257
257
|
} catch (e) {
|
|
@@ -271,8 +271,8 @@ function requireNative() {
|
|
|
271
271
|
try {
|
|
272
272
|
const binding = require('brustjs-linux-x64-musl')
|
|
273
273
|
const bindingPackageVersion = require('brustjs-linux-x64-musl/package.json').version
|
|
274
|
-
if (bindingPackageVersion !== '0.1.
|
|
275
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
274
|
+
if (bindingPackageVersion !== '0.1.4-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
275
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.4-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
276
276
|
}
|
|
277
277
|
return binding
|
|
278
278
|
} catch (e) {
|
|
@@ -287,8 +287,8 @@ function requireNative() {
|
|
|
287
287
|
try {
|
|
288
288
|
const binding = require('brustjs-linux-x64-gnu')
|
|
289
289
|
const bindingPackageVersion = require('brustjs-linux-x64-gnu/package.json').version
|
|
290
|
-
if (bindingPackageVersion !== '0.1.
|
|
291
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
290
|
+
if (bindingPackageVersion !== '0.1.4-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
291
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.4-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
292
292
|
}
|
|
293
293
|
return binding
|
|
294
294
|
} catch (e) {
|
|
@@ -305,8 +305,8 @@ function requireNative() {
|
|
|
305
305
|
try {
|
|
306
306
|
const binding = require('brustjs-linux-arm64-musl')
|
|
307
307
|
const bindingPackageVersion = require('brustjs-linux-arm64-musl/package.json').version
|
|
308
|
-
if (bindingPackageVersion !== '0.1.
|
|
309
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
308
|
+
if (bindingPackageVersion !== '0.1.4-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
309
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.4-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
310
310
|
}
|
|
311
311
|
return binding
|
|
312
312
|
} catch (e) {
|
|
@@ -321,8 +321,8 @@ function requireNative() {
|
|
|
321
321
|
try {
|
|
322
322
|
const binding = require('brustjs-linux-arm64-gnu')
|
|
323
323
|
const bindingPackageVersion = require('brustjs-linux-arm64-gnu/package.json').version
|
|
324
|
-
if (bindingPackageVersion !== '0.1.
|
|
325
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
324
|
+
if (bindingPackageVersion !== '0.1.4-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
325
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.4-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
326
326
|
}
|
|
327
327
|
return binding
|
|
328
328
|
} catch (e) {
|
|
@@ -339,8 +339,8 @@ function requireNative() {
|
|
|
339
339
|
try {
|
|
340
340
|
const binding = require('brustjs-linux-arm-musleabihf')
|
|
341
341
|
const bindingPackageVersion = require('brustjs-linux-arm-musleabihf/package.json').version
|
|
342
|
-
if (bindingPackageVersion !== '0.1.
|
|
343
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
342
|
+
if (bindingPackageVersion !== '0.1.4-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
343
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.4-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
344
344
|
}
|
|
345
345
|
return binding
|
|
346
346
|
} catch (e) {
|
|
@@ -355,8 +355,8 @@ function requireNative() {
|
|
|
355
355
|
try {
|
|
356
356
|
const binding = require('brustjs-linux-arm-gnueabihf')
|
|
357
357
|
const bindingPackageVersion = require('brustjs-linux-arm-gnueabihf/package.json').version
|
|
358
|
-
if (bindingPackageVersion !== '0.1.
|
|
359
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
358
|
+
if (bindingPackageVersion !== '0.1.4-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
359
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.4-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
360
360
|
}
|
|
361
361
|
return binding
|
|
362
362
|
} catch (e) {
|
|
@@ -373,8 +373,8 @@ function requireNative() {
|
|
|
373
373
|
try {
|
|
374
374
|
const binding = require('brustjs-linux-loong64-musl')
|
|
375
375
|
const bindingPackageVersion = require('brustjs-linux-loong64-musl/package.json').version
|
|
376
|
-
if (bindingPackageVersion !== '0.1.
|
|
377
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
376
|
+
if (bindingPackageVersion !== '0.1.4-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
377
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.4-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
378
378
|
}
|
|
379
379
|
return binding
|
|
380
380
|
} catch (e) {
|
|
@@ -389,8 +389,8 @@ function requireNative() {
|
|
|
389
389
|
try {
|
|
390
390
|
const binding = require('brustjs-linux-loong64-gnu')
|
|
391
391
|
const bindingPackageVersion = require('brustjs-linux-loong64-gnu/package.json').version
|
|
392
|
-
if (bindingPackageVersion !== '0.1.
|
|
393
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
392
|
+
if (bindingPackageVersion !== '0.1.4-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
393
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.4-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
394
394
|
}
|
|
395
395
|
return binding
|
|
396
396
|
} catch (e) {
|
|
@@ -407,8 +407,8 @@ function requireNative() {
|
|
|
407
407
|
try {
|
|
408
408
|
const binding = require('brustjs-linux-riscv64-musl')
|
|
409
409
|
const bindingPackageVersion = require('brustjs-linux-riscv64-musl/package.json').version
|
|
410
|
-
if (bindingPackageVersion !== '0.1.
|
|
411
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
410
|
+
if (bindingPackageVersion !== '0.1.4-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
411
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.4-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
412
412
|
}
|
|
413
413
|
return binding
|
|
414
414
|
} catch (e) {
|
|
@@ -423,8 +423,8 @@ function requireNative() {
|
|
|
423
423
|
try {
|
|
424
424
|
const binding = require('brustjs-linux-riscv64-gnu')
|
|
425
425
|
const bindingPackageVersion = require('brustjs-linux-riscv64-gnu/package.json').version
|
|
426
|
-
if (bindingPackageVersion !== '0.1.
|
|
427
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
426
|
+
if (bindingPackageVersion !== '0.1.4-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
427
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.4-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
428
428
|
}
|
|
429
429
|
return binding
|
|
430
430
|
} catch (e) {
|
|
@@ -440,8 +440,8 @@ function requireNative() {
|
|
|
440
440
|
try {
|
|
441
441
|
const binding = require('brustjs-linux-ppc64-gnu')
|
|
442
442
|
const bindingPackageVersion = require('brustjs-linux-ppc64-gnu/package.json').version
|
|
443
|
-
if (bindingPackageVersion !== '0.1.
|
|
444
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
443
|
+
if (bindingPackageVersion !== '0.1.4-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
444
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.4-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
445
445
|
}
|
|
446
446
|
return binding
|
|
447
447
|
} catch (e) {
|
|
@@ -456,8 +456,8 @@ function requireNative() {
|
|
|
456
456
|
try {
|
|
457
457
|
const binding = require('brustjs-linux-s390x-gnu')
|
|
458
458
|
const bindingPackageVersion = require('brustjs-linux-s390x-gnu/package.json').version
|
|
459
|
-
if (bindingPackageVersion !== '0.1.
|
|
460
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
459
|
+
if (bindingPackageVersion !== '0.1.4-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
460
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.4-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
461
461
|
}
|
|
462
462
|
return binding
|
|
463
463
|
} catch (e) {
|
|
@@ -476,8 +476,8 @@ function requireNative() {
|
|
|
476
476
|
try {
|
|
477
477
|
const binding = require('brustjs-openharmony-arm64')
|
|
478
478
|
const bindingPackageVersion = require('brustjs-openharmony-arm64/package.json').version
|
|
479
|
-
if (bindingPackageVersion !== '0.1.
|
|
480
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
479
|
+
if (bindingPackageVersion !== '0.1.4-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
480
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.4-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
481
481
|
}
|
|
482
482
|
return binding
|
|
483
483
|
} catch (e) {
|
|
@@ -492,8 +492,8 @@ function requireNative() {
|
|
|
492
492
|
try {
|
|
493
493
|
const binding = require('brustjs-openharmony-x64')
|
|
494
494
|
const bindingPackageVersion = require('brustjs-openharmony-x64/package.json').version
|
|
495
|
-
if (bindingPackageVersion !== '0.1.
|
|
496
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
495
|
+
if (bindingPackageVersion !== '0.1.4-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
496
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.4-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
497
497
|
}
|
|
498
498
|
return binding
|
|
499
499
|
} catch (e) {
|
|
@@ -508,8 +508,8 @@ function requireNative() {
|
|
|
508
508
|
try {
|
|
509
509
|
const binding = require('brustjs-openharmony-arm')
|
|
510
510
|
const bindingPackageVersion = require('brustjs-openharmony-arm/package.json').version
|
|
511
|
-
if (bindingPackageVersion !== '0.1.
|
|
512
|
-
throw new Error(`Native binding package version mismatch, expected 0.1.
|
|
511
|
+
if (bindingPackageVersion !== '0.1.4-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
|
|
512
|
+
throw new Error(`Native binding package version mismatch, expected 0.1.4-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
|
|
513
513
|
}
|
|
514
514
|
return binding
|
|
515
515
|
} catch (e) {
|
|
@@ -582,6 +582,7 @@ module.exports.configureCache = nativeBinding.configureCache
|
|
|
582
582
|
module.exports.configureCssDir = nativeBinding.configureCssDir
|
|
583
583
|
module.exports.configureIslandsDir = nativeBinding.configureIslandsDir
|
|
584
584
|
module.exports.isWorker = nativeBinding.isWorker
|
|
585
|
+
module.exports.napiDevBroadcast = nativeBinding.napiDevBroadcast
|
|
585
586
|
module.exports.napiListNativeTemplates = nativeBinding.napiListNativeTemplates
|
|
586
587
|
module.exports.napiLoadJinjaTemplates = nativeBinding.napiLoadJinjaTemplates
|
|
587
588
|
module.exports.napiRegisterSsePaths = nativeBinding.napiRegisterSsePaths
|
package/runtime/index.ts
CHANGED
|
@@ -42,10 +42,12 @@ export function workerId(): number | null {
|
|
|
42
42
|
return (native as any).workerId()
|
|
43
43
|
}
|
|
44
44
|
|
|
45
|
-
// Sub-project J — boot-time jinja loader.
|
|
46
|
-
//
|
|
47
|
-
//
|
|
48
|
-
//
|
|
45
|
+
// Sub-project J — boot-time jinja loader. The flag guards repeated calls across
|
|
46
|
+
// the main and worker branches of `run()` (and any embedded entrypoint that
|
|
47
|
+
// calls `registerRoutes` directly) so the env loads once at startup. Dev hot
|
|
48
|
+
// reload does NOT go through here — it reloads via reEmitJinja, which calls
|
|
49
|
+
// napiLoadJinjaTemplates directly (the Rust env is a reloadable RwLock now, not
|
|
50
|
+
// a load-once OnceLock).
|
|
49
51
|
let _jinjaLoaded = false
|
|
50
52
|
function loadJinjaOnce(dir: string): void {
|
|
51
53
|
if (_jinjaLoaded) return
|
|
@@ -380,7 +382,7 @@ export const brust = {
|
|
|
380
382
|
|
|
381
383
|
// Sub-project J — load .brust/jinja/*.jinja into the minijinja env so
|
|
382
384
|
// the startup-validation warning in registerRoutes can compare against
|
|
383
|
-
// a populated registry.
|
|
385
|
+
// a populated registry. Loads once at startup; dev hot reload reloads it.
|
|
384
386
|
loadJinjaOnce(path.resolve(process.cwd(), '.brust/jinja'))
|
|
385
387
|
|
|
386
388
|
this.registerRoutes(routes)
|
|
@@ -412,6 +414,7 @@ export const brust = {
|
|
|
412
414
|
const { terminateAll: termWorkers, spawnAll: spawnWorkers } = await import(
|
|
413
415
|
'./dev/worker-registry.ts'
|
|
414
416
|
)
|
|
417
|
+
const { reEmitJinja } = await import('./dev/jinja-reload.ts')
|
|
415
418
|
const fsModule = await import('node:fs')
|
|
416
419
|
const pathModule = await import('node:path')
|
|
417
420
|
|
|
@@ -445,6 +448,7 @@ export const brust = {
|
|
|
445
448
|
await spawnWorkers()
|
|
446
449
|
},
|
|
447
450
|
},
|
|
451
|
+
reEmitJinja,
|
|
448
452
|
buildCss: async () => {
|
|
449
453
|
const appCss = pathModule.join(scanRoot, 'app.css')
|
|
450
454
|
if (fsModule.existsSync(appCss)) {
|