@maravilla-labs/adapter-react-router 0.2.5 → 0.2.7
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/vite-plugin.d.ts.map +1 -1
- package/dist/vite-plugin.js +25 -2
- package/dist/vite-plugin.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vite-plugin.d.ts","sourceRoot":"","sources":["../src/vite-plugin.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AACnC,OAAO,EAUL,KAAK,cAAc,EACpB,MAAM,8BAA8B,CAAC;AAGtC,MAAM,WAAW,yBAA0B,SAAQ,cAAc;IAC/D,yEAAyE;IACzE,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,yEAAyE;IACzE,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,yDAAyD;IACzD,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,GAAE,yBAA8B,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"vite-plugin.d.ts","sourceRoot":"","sources":["../src/vite-plugin.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AACnC,OAAO,EAUL,KAAK,cAAc,EACpB,MAAM,8BAA8B,CAAC;AAGtC,MAAM,WAAW,yBAA0B,SAAQ,cAAc;IAC/D,yEAAyE;IACzE,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,yEAAyE;IACzE,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,yDAAyD;IACzD,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,GAAE,yBAA8B,GAAG,MAAM,CAgKpF"}
|
package/dist/vite-plugin.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { writeFileSync, mkdirSync, cpSync, existsSync, rmSync } from 'node:fs';
|
|
2
|
-
import { resolve, join } from 'node:path';
|
|
2
|
+
import { resolve, join, sep } from 'node:path';
|
|
3
3
|
import { bundleServerEntry, analyzeBundle, generateManifest, writeManifest, collectAssets, buildAndIntegrateFunctions, buildAndIntegrateEvents, buildAndIntegrateWorkflows, loadMaravillaConfig, } from '@maravilla-labs/adapter-core';
|
|
4
4
|
import { WORKER_TEMPLATE } from './worker-template.js';
|
|
5
5
|
/**
|
|
@@ -7,7 +7,17 @@ import { WORKER_TEMPLATE } from './worker-template.js';
|
|
|
7
7
|
* a Maravilla Runtime bundle in `.maravilla/`.
|
|
8
8
|
*/
|
|
9
9
|
export function maravillaReactRouter(options = {}) {
|
|
10
|
-
|
|
10
|
+
// React Router v7 runs its own Vite SSR build BEFORE this adapter hooks in
|
|
11
|
+
// (`closeBundle`, `enforce: 'post'`). Two physical build outputs live on
|
|
12
|
+
// disk: React Router's intermediate (server/, client/) and this adapter's
|
|
13
|
+
// final artifact. Staging React Router's output under node_modules keeps
|
|
14
|
+
// the final artifact free to own `build/` — matching the SvelteKit-style
|
|
15
|
+
// convention `maravilla deploy build`. Users MUST set
|
|
16
|
+
// buildDirectory: 'node_modules/.maravilla-rr-staging'
|
|
17
|
+
// in their `react-router.config.ts` for these defaults to align. If they
|
|
18
|
+
// leave React Router at its own default (`build`), the collision guard in
|
|
19
|
+
// `closeBundle` below fails fast with a helpful message.
|
|
20
|
+
const { out = 'build', serverBuildPath = 'node_modules/.maravilla-rr-staging/server', clientBuildPath = 'node_modules/.maravilla-rr-staging/client', serverBuildFile = 'index.js', envPrefix = 'PUBLIC_', polyfill = true, include = [], exclude = [], external = [], precompress = false, } = options;
|
|
11
21
|
let root;
|
|
12
22
|
return {
|
|
13
23
|
name: '@maravilla-labs/adapter-react-router',
|
|
@@ -28,6 +38,19 @@ export function maravillaReactRouter(options = {}) {
|
|
|
28
38
|
}
|
|
29
39
|
const outDir = resolve(root, out);
|
|
30
40
|
const tmpDir = resolve(root, 'node_modules/.maravilla-tmp');
|
|
41
|
+
// Collision guard: if the user configured React Router's build output
|
|
42
|
+
// to live inside the adapter's output directory, the `rmSync(outDir)`
|
|
43
|
+
// below would wipe the adapter's own input before it could read it.
|
|
44
|
+
// Fail fast with a clear message instead of silently deleting.
|
|
45
|
+
const serverResolved = resolve(root, serverBuildPath);
|
|
46
|
+
const clientResolved = resolve(root, clientBuildPath);
|
|
47
|
+
if (serverResolved.startsWith(outDir + sep) ||
|
|
48
|
+
clientResolved.startsWith(outDir + sep)) {
|
|
49
|
+
throw new Error(`[maravilla] React Router's build output (${serverBuildPath} / ${clientBuildPath}) ` +
|
|
50
|
+
`lives inside the adapter output directory (${out}). The adapter would wipe its own input. ` +
|
|
51
|
+
`Set \`react-router.config.ts\` 'buildDirectory' to 'node_modules/.maravilla-rr-staging' ` +
|
|
52
|
+
`(or leave serverBuildPath / clientBuildPath at their new defaults, which match).`);
|
|
53
|
+
}
|
|
31
54
|
// Clean output
|
|
32
55
|
if (existsSync(outDir))
|
|
33
56
|
rmSync(outDir, { recursive: true });
|
package/dist/vite-plugin.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vite-plugin.js","sourceRoot":"","sources":["../src/vite-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAC/E,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"vite-plugin.js","sourceRoot":"","sources":["../src/vite-plugin.ts"],"names":[],"mappings":"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"}
|