one 1.1.479 → 1.1.481
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/cjs/Root.cjs +1 -1
- package/dist/cjs/Root.js +1 -1
- package/dist/cjs/Root.js.map +1 -1
- package/dist/cjs/Root.native.js +1 -1
- package/dist/cjs/Root.native.js.map +2 -2
- package/dist/cjs/cli/build.cjs +28 -8
- package/dist/cjs/cli/build.js +29 -10
- package/dist/cjs/cli/build.js.map +1 -1
- package/dist/cjs/cli/build.native.js +60 -24
- package/dist/cjs/cli/build.native.js.map +2 -2
- package/dist/cjs/createApp.cjs +3 -1
- package/dist/cjs/createApp.js +3 -1
- package/dist/cjs/createApp.js.map +1 -1
- package/dist/cjs/createApp.native.js +1 -0
- package/dist/cjs/createApp.native.js.map +2 -2
- package/dist/cjs/createHandleRequest.cjs +6 -2
- package/dist/cjs/createHandleRequest.js +2 -2
- package/dist/cjs/createHandleRequest.js.map +1 -1
- package/dist/cjs/createHandleRequest.native.js +4 -2
- package/dist/cjs/createHandleRequest.native.js.map +2 -2
- package/dist/cjs/router/useViteRoutes.cjs +6 -6
- package/dist/cjs/router/useViteRoutes.js +6 -6
- package/dist/cjs/router/useViteRoutes.js.map +1 -1
- package/dist/cjs/router/useViteRoutes.native.js +6 -6
- package/dist/cjs/router/useViteRoutes.native.js.map +2 -2
- package/dist/cjs/server/getServerManifest.cjs +20 -8
- package/dist/cjs/server/getServerManifest.js +15 -14
- package/dist/cjs/server/getServerManifest.js.map +1 -1
- package/dist/cjs/server/getServerManifest.native.js +19 -4
- package/dist/cjs/server/getServerManifest.native.js.map +2 -2
- package/dist/cjs/server/oneServe.cjs +14 -2
- package/dist/cjs/server/oneServe.js +15 -2
- package/dist/cjs/server/oneServe.js.map +1 -1
- package/dist/cjs/server/oneServe.native.js +24 -12
- package/dist/cjs/server/oneServe.native.js.map +2 -2
- package/dist/cjs/typed-routes/generateRouteTypes.cjs +3 -3
- package/dist/cjs/typed-routes/generateRouteTypes.js +2 -2
- package/dist/cjs/typed-routes/generateRouteTypes.js.map +1 -1
- package/dist/cjs/typed-routes/generateRouteTypes.native.js +3 -3
- package/dist/cjs/typed-routes/generateRouteTypes.native.js.map +2 -2
- package/dist/cjs/utils/getRouterRootFromOneOptions.cjs +28 -0
- package/dist/cjs/utils/getRouterRootFromOneOptions.js +23 -0
- package/dist/cjs/utils/getRouterRootFromOneOptions.js.map +6 -0
- package/dist/cjs/utils/getRouterRootFromOneOptions.native.js +29 -0
- package/dist/cjs/utils/getRouterRootFromOneOptions.native.js.map +6 -0
- package/dist/cjs/vercel/build/buildVercelOutputDirectory.cjs +1 -1
- package/dist/cjs/vercel/build/buildVercelOutputDirectory.js +5 -0
- package/dist/cjs/vercel/build/buildVercelOutputDirectory.js.map +1 -1
- package/dist/cjs/vercel/build/buildVercelOutputDirectory.native.js +1 -1
- package/dist/cjs/vercel/build/buildVercelOutputDirectory.native.js.map +2 -2
- package/dist/cjs/vercel/build/generate/createSsrServerlessFunction.cjs +11 -3
- package/dist/cjs/vercel/build/generate/createSsrServerlessFunction.js +11 -3
- package/dist/cjs/vercel/build/generate/createSsrServerlessFunction.js.map +1 -1
- package/dist/cjs/vercel/build/generate/createSsrServerlessFunction.native.js +11 -3
- package/dist/cjs/vercel/build/generate/createSsrServerlessFunction.native.js.map +1 -1
- package/dist/cjs/vite/getManifest.cjs +4 -2
- package/dist/cjs/vite/getManifest.js +2 -2
- package/dist/cjs/vite/getManifest.js.map +1 -1
- package/dist/cjs/vite/getManifest.native.js +2 -2
- package/dist/cjs/vite/getManifest.native.js.map +2 -2
- package/dist/cjs/vite/one.cjs +5 -3
- package/dist/cjs/vite/one.js +3 -3
- package/dist/cjs/vite/one.js.map +1 -1
- package/dist/cjs/vite/one.native.js +3 -3
- package/dist/cjs/vite/one.native.js.map +2 -2
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.cjs +10 -6
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.js +8 -7
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.js.map +1 -1
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.native.js +9 -6
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.native.js.map +2 -2
- package/dist/cjs/vite/plugins/generateFileSystemRouteTypesPlugin.cjs +6 -4
- package/dist/cjs/vite/plugins/generateFileSystemRouteTypesPlugin.js +4 -4
- package/dist/cjs/vite/plugins/generateFileSystemRouteTypesPlugin.js.map +1 -1
- package/dist/cjs/vite/plugins/generateFileSystemRouteTypesPlugin.native.js +4 -4
- package/dist/cjs/vite/plugins/generateFileSystemRouteTypesPlugin.native.js.map +2 -2
- package/dist/cjs/vite/plugins/virtualEntryPlugin.cjs +4 -2
- package/dist/cjs/vite/plugins/virtualEntryPlugin.js +4 -2
- package/dist/cjs/vite/plugins/virtualEntryPlugin.js.map +1 -1
- package/dist/cjs/vite/plugins/virtualEntryPlugin.native.js +4 -2
- package/dist/cjs/vite/plugins/virtualEntryPlugin.native.js.map +1 -1
- package/dist/cjs/vite/types.native.js.map +1 -1
- package/dist/esm/Root.js +1 -1
- package/dist/esm/Root.js.map +1 -1
- package/dist/esm/Root.mjs +1 -1
- package/dist/esm/Root.mjs.map +1 -1
- package/dist/esm/Root.native.js +1 -1
- package/dist/esm/Root.native.js.map +1 -1
- package/dist/esm/cli/build.js +29 -9
- package/dist/esm/cli/build.js.map +1 -1
- package/dist/esm/cli/build.mjs +28 -8
- package/dist/esm/cli/build.mjs.map +1 -1
- package/dist/esm/cli/build.native.js +60 -24
- package/dist/esm/cli/build.native.js.map +1 -1
- package/dist/esm/createApp.js +3 -1
- package/dist/esm/createApp.js.map +1 -1
- package/dist/esm/createApp.mjs +3 -1
- package/dist/esm/createApp.mjs.map +1 -1
- package/dist/esm/createApp.native.js +1 -0
- package/dist/esm/createApp.native.js.map +1 -1
- package/dist/esm/createHandleRequest.js +2 -2
- package/dist/esm/createHandleRequest.js.map +1 -1
- package/dist/esm/createHandleRequest.mjs +6 -2
- package/dist/esm/createHandleRequest.mjs.map +1 -1
- package/dist/esm/createHandleRequest.native.js +7 -2
- package/dist/esm/createHandleRequest.native.js.map +1 -1
- package/dist/esm/router/useViteRoutes.js +6 -6
- package/dist/esm/router/useViteRoutes.js.map +1 -1
- package/dist/esm/router/useViteRoutes.mjs +6 -6
- package/dist/esm/router/useViteRoutes.mjs.map +1 -1
- package/dist/esm/router/useViteRoutes.native.js +6 -6
- package/dist/esm/router/useViteRoutes.native.js.map +1 -1
- package/dist/esm/server/getServerManifest.js +15 -14
- package/dist/esm/server/getServerManifest.js.map +1 -1
- package/dist/esm/server/getServerManifest.mjs +20 -8
- package/dist/esm/server/getServerManifest.mjs.map +1 -1
- package/dist/esm/server/getServerManifest.native.js +21 -4
- package/dist/esm/server/getServerManifest.native.js.map +1 -1
- package/dist/esm/server/oneServe.js +16 -3
- package/dist/esm/server/oneServe.js.map +1 -1
- package/dist/esm/server/oneServe.mjs +15 -3
- package/dist/esm/server/oneServe.mjs.map +1 -1
- package/dist/esm/server/oneServe.native.js +25 -13
- package/dist/esm/server/oneServe.native.js.map +1 -1
- package/dist/esm/typed-routes/generateRouteTypes.js +2 -2
- package/dist/esm/typed-routes/generateRouteTypes.js.map +1 -1
- package/dist/esm/typed-routes/generateRouteTypes.mjs +3 -3
- package/dist/esm/typed-routes/generateRouteTypes.mjs.map +1 -1
- package/dist/esm/typed-routes/generateRouteTypes.native.js +3 -3
- package/dist/esm/typed-routes/generateRouteTypes.native.js.map +1 -1
- package/dist/esm/utils/getRouterRootFromOneOptions.js +7 -0
- package/dist/esm/utils/getRouterRootFromOneOptions.js.map +6 -0
- package/dist/esm/utils/getRouterRootFromOneOptions.mjs +5 -0
- package/dist/esm/utils/getRouterRootFromOneOptions.mjs.map +1 -0
- package/dist/esm/utils/getRouterRootFromOneOptions.native.js +6 -0
- package/dist/esm/utils/getRouterRootFromOneOptions.native.js.map +1 -0
- package/dist/esm/vercel/build/buildVercelOutputDirectory.js +5 -0
- package/dist/esm/vercel/build/buildVercelOutputDirectory.js.map +1 -1
- package/dist/esm/vercel/build/buildVercelOutputDirectory.mjs +1 -1
- package/dist/esm/vercel/build/buildVercelOutputDirectory.mjs.map +1 -1
- package/dist/esm/vercel/build/buildVercelOutputDirectory.native.js +1 -1
- package/dist/esm/vercel/build/buildVercelOutputDirectory.native.js.map +1 -1
- package/dist/esm/vercel/build/generate/createSsrServerlessFunction.js +11 -3
- package/dist/esm/vercel/build/generate/createSsrServerlessFunction.js.map +1 -1
- package/dist/esm/vercel/build/generate/createSsrServerlessFunction.mjs +11 -3
- package/dist/esm/vercel/build/generate/createSsrServerlessFunction.mjs.map +1 -1
- package/dist/esm/vercel/build/generate/createSsrServerlessFunction.native.js +11 -3
- package/dist/esm/vercel/build/generate/createSsrServerlessFunction.native.js.map +1 -1
- package/dist/esm/vite/getManifest.js +2 -2
- package/dist/esm/vite/getManifest.js.map +1 -1
- package/dist/esm/vite/getManifest.mjs +4 -2
- package/dist/esm/vite/getManifest.mjs.map +1 -1
- package/dist/esm/vite/getManifest.native.js +5 -2
- package/dist/esm/vite/getManifest.native.js.map +1 -1
- package/dist/esm/vite/one.js +3 -2
- package/dist/esm/vite/one.js.map +1 -1
- package/dist/esm/vite/one.mjs +5 -3
- package/dist/esm/vite/one.mjs.map +1 -1
- package/dist/esm/vite/one.native.js +5 -3
- package/dist/esm/vite/one.native.js.map +1 -1
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.js +8 -6
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.js.map +1 -1
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.mjs +9 -5
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.mjs.map +1 -1
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.native.js +9 -5
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.native.js.map +1 -1
- package/dist/esm/vite/plugins/generateFileSystemRouteTypesPlugin.js +4 -3
- package/dist/esm/vite/plugins/generateFileSystemRouteTypesPlugin.js.map +1 -1
- package/dist/esm/vite/plugins/generateFileSystemRouteTypesPlugin.mjs +5 -3
- package/dist/esm/vite/plugins/generateFileSystemRouteTypesPlugin.mjs.map +1 -1
- package/dist/esm/vite/plugins/generateFileSystemRouteTypesPlugin.native.js +5 -3
- package/dist/esm/vite/plugins/generateFileSystemRouteTypesPlugin.native.js.map +1 -1
- package/dist/esm/vite/plugins/virtualEntryPlugin.js +4 -2
- package/dist/esm/vite/plugins/virtualEntryPlugin.js.map +1 -1
- package/dist/esm/vite/plugins/virtualEntryPlugin.mjs +4 -2
- package/dist/esm/vite/plugins/virtualEntryPlugin.mjs.map +1 -1
- package/dist/esm/vite/plugins/virtualEntryPlugin.native.js +4 -2
- package/dist/esm/vite/plugins/virtualEntryPlugin.native.js.map +1 -1
- package/package.json +10 -10
- package/src/Root.tsx +2 -1
- package/src/cli/build.ts +35 -10
- package/src/createApp.native.tsx +8 -6
- package/src/createApp.tsx +5 -1
- package/src/createHandleRequest.ts +2 -2
- package/src/router/useViteRoutes.tsx +6 -4
- package/src/server/getServerManifest.ts +12 -4
- package/src/server/oneServe.ts +30 -1
- package/src/typed-routes/generateRouteTypes.ts +3 -3
- package/src/utils/getRouterRootFromOneOptions.ts +5 -0
- package/src/vercel/build/buildVercelOutputDirectory.ts +9 -0
- package/src/vercel/build/generate/createSsrServerlessFunction.ts +11 -3
- package/src/vite/getManifest.ts +2 -2
- package/src/vite/one.ts +4 -1
- package/src/vite/plugins/fileSystemRouterPlugin.tsx +8 -6
- package/src/vite/plugins/generateFileSystemRouteTypesPlugin.tsx +6 -3
- package/src/vite/plugins/virtualEntryPlugin.ts +4 -2
- package/src/vite/types.ts +7 -0
- package/types/Root.d.ts +1 -0
- package/types/Root.d.ts.map +1 -1
- package/types/cli/build.d.ts.map +1 -1
- package/types/createApp.d.ts +1 -0
- package/types/createApp.d.ts.map +1 -1
- package/types/createApp.native.d.ts +1 -5
- package/types/createApp.native.d.ts.map +1 -1
- package/types/createHandleRequest.d.ts +3 -1
- package/types/createHandleRequest.d.ts.map +1 -1
- package/types/router/useViteRoutes.d.ts +3 -3
- package/types/router/useViteRoutes.d.ts.map +1 -1
- package/types/server/getServerManifest.d.ts.map +1 -1
- package/types/server/oneServe.d.ts.map +1 -1
- package/types/typed-routes/generateRouteTypes.d.ts +1 -1
- package/types/typed-routes/generateRouteTypes.d.ts.map +1 -1
- package/types/utils/getRouterRootFromOneOptions.d.ts +3 -0
- package/types/utils/getRouterRootFromOneOptions.d.ts.map +1 -0
- package/types/vercel/build/buildVercelOutputDirectory.d.ts.map +1 -1
- package/types/vercel/build/generate/createSsrServerlessFunction.d.ts.map +1 -1
- package/types/vite/getManifest.d.ts +3 -1
- package/types/vite/getManifest.d.ts.map +1 -1
- package/types/vite/one.d.ts.map +1 -1
- package/types/vite/plugins/fileSystemRouterPlugin.d.ts.map +1 -1
- package/types/vite/plugins/generateFileSystemRouteTypesPlugin.d.ts.map +1 -1
- package/types/vite/plugins/virtualEntryPlugin.d.ts.map +1 -1
- package/types/vite/types.d.ts +7 -0
- package/types/vite/types.d.ts.map +1 -1
- package/vendor/react-dom/package.json +1 -1
@@ -17,18 +17,18 @@ __export(generateFileSystemRouteTypesPlugin_exports, {
|
|
17
17
|
generateFileSystemRouteTypesPlugin: () => generateFileSystemRouteTypesPlugin
|
18
18
|
});
|
19
19
|
module.exports = __toCommonJS(generateFileSystemRouteTypesPlugin_exports);
|
20
|
-
var import_node_path = require("node:path"), import_perfect_debounce = require("perfect-debounce"), import_generateRouteTypes = require("../../typed-routes/generateRouteTypes");
|
20
|
+
var import_node_path = require("node:path"), import_perfect_debounce = require("perfect-debounce"), import_generateRouteTypes = require("../../typed-routes/generateRouteTypes"), import_getRouterRootFromOneOptions = require("../../utils/getRouterRootFromOneOptions");
|
21
21
|
function generateFileSystemRouteTypesPlugin(options) {
|
22
22
|
return {
|
23
23
|
name: "one-generate-fs-route-types",
|
24
24
|
enforce: "post",
|
25
25
|
apply: "serve",
|
26
26
|
configureServer(server) {
|
27
|
-
const appDir = (0, import_node_path.join)(process.cwd(),
|
28
|
-
(type === "add" || type === "delete") && path.startsWith(appDir) && (0, import_generateRouteTypes.generateRouteTypes)(outFile);
|
27
|
+
const appDir = (0, import_node_path.join)(process.cwd(), (0, import_getRouterRootFromOneOptions.getRouterRootFromOneOptions)(options)), outFile = (0, import_node_path.join)(process.cwd(), "routes.d.ts"), routerRoot = (0, import_getRouterRootFromOneOptions.getRouterRootFromOneOptions)(options), fileWatcherChangeListener = (0, import_perfect_debounce.debounce)(async (type, path) => {
|
28
|
+
(type === "add" || type === "delete") && path.startsWith(appDir) && (0, import_generateRouteTypes.generateRouteTypes)(outFile, routerRoot);
|
29
29
|
}, 100);
|
30
30
|
return server.watcher.addListener("all", fileWatcherChangeListener), () => {
|
31
|
-
(0, import_generateRouteTypes.generateRouteTypes)(outFile);
|
31
|
+
(0, import_generateRouteTypes.generateRouteTypes)(outFile, routerRoot);
|
32
32
|
};
|
33
33
|
}
|
34
34
|
};
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"version": 3,
|
3
3
|
"sources": ["../../../../src/vite/plugins/generateFileSystemRouteTypesPlugin.tsx"],
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAqB,sBACrB,0BAAyB,6BAGzB,4BAAmC;
|
4
|
+
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAqB,sBACrB,0BAAyB,6BAGzB,4BAAmC,kDACnC,qCAA4C;AAErC,SAAS,mCAAmC,SAAoC;AACrF,SAAO;AAAA,IACL,MAAM;AAAA,IACN,SAAS;AAAA,IACT,OAAO;AAAA,IAEP,gBAAgB,QAAQ;AACtB,YAAM,aAAS,uBAAK,QAAQ,IAAI,OAAG,gEAA4B,OAAO,CAAC,GACjE,cAAU,uBAAK,QAAQ,IAAI,GAAG,aAAa,GAE3C,iBAAa,gEAA4B,OAAO,GAGhD,gCAA4B,kCAAS,OAAO,MAAc,SAAiB;AAC/E,SAAI,SAAS,SAAS,SAAS,aACzB,KAAK,WAAW,MAAM,SAExB,8CAAmB,SAAS,UAAU;AAAA,MAG5C,GAAG,GAAG;AAEN,oBAAO,QAAQ,YAAY,OAAO,yBAAyB,GAEpD,MAAM;AAGX,0DAAmB,SAAS,UAAU;AAAA,MACxC;AAAA,IACF;AAAA,EACF;AACF;",
|
5
5
|
"names": []
|
6
6
|
}
|
@@ -18,18 +18,18 @@ __export(generateFileSystemRouteTypesPlugin_exports, {
|
|
18
18
|
generateFileSystemRouteTypesPlugin: () => generateFileSystemRouteTypesPlugin
|
19
19
|
});
|
20
20
|
module.exports = __toCommonJS(generateFileSystemRouteTypesPlugin_exports);
|
21
|
-
var import_node_path = require("node:path"), import_perfect_debounce = require("perfect-debounce"), import_generateRouteTypes = require("../../typed-routes/generateRouteTypes");
|
21
|
+
var import_node_path = require("node:path"), import_perfect_debounce = require("perfect-debounce"), import_generateRouteTypes = require("../../typed-routes/generateRouteTypes"), import_getRouterRootFromOneOptions = require("../../utils/getRouterRootFromOneOptions");
|
22
22
|
function generateFileSystemRouteTypesPlugin(options) {
|
23
23
|
return {
|
24
24
|
name: "one-generate-fs-route-types",
|
25
25
|
enforce: "post",
|
26
26
|
apply: "serve",
|
27
27
|
configureServer(server) {
|
28
|
-
var appDir = (0, import_node_path.join)(process.cwd(),
|
29
|
-
(type === "add" || type === "delete") && path.startsWith(appDir) && (0, import_generateRouteTypes.generateRouteTypes)(outFile);
|
28
|
+
var appDir = (0, import_node_path.join)(process.cwd(), (0, import_getRouterRootFromOneOptions.getRouterRootFromOneOptions)(options)), outFile = (0, import_node_path.join)(process.cwd(), "routes.d.ts"), routerRoot = (0, import_getRouterRootFromOneOptions.getRouterRootFromOneOptions)(options), fileWatcherChangeListener = (0, import_perfect_debounce.debounce)(async function(type, path) {
|
29
|
+
(type === "add" || type === "delete") && path.startsWith(appDir) && (0, import_generateRouteTypes.generateRouteTypes)(outFile, routerRoot);
|
30
30
|
}, 100);
|
31
31
|
return server.watcher.addListener("all", fileWatcherChangeListener), function() {
|
32
|
-
(0, import_generateRouteTypes.generateRouteTypes)(outFile);
|
32
|
+
(0, import_generateRouteTypes.generateRouteTypes)(outFile, routerRoot);
|
33
33
|
};
|
34
34
|
}
|
35
35
|
};
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"version": 3,
|
3
3
|
"sources": ["../../../../src/vite/plugins/Users/n8/one/packages/one/src/vite/plugins/generateFileSystemRouteTypesPlugin.tsx"],
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;AAAA;;;;;uBAAqB,sBACrB,0BAAyB,6BAGzB,4BAAmC;
|
5
|
-
"names": ["generateFileSystemRouteTypesPlugin", "options", "name", "enforce", "apply", "configureServer", "server", "appDir", "join", "process", "cwd", "outFile", "fileWatcherChangeListener", "debounce", "type", "path", "startsWith", "generateRouteTypes", "watcher", "addListener"]
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;AAAA;;;;;uBAAqB,sBACrB,0BAAyB,6BAGzB,4BAAmC,kDACnC,qCAA4C;AAErC,SAASA,mCAAmCC,SAA0B;AAC3E,SAAO;IACLC,MAAM;IACNC,SAAS;IACTC,OAAO;IAEPC,gBAAgBC,QAAM;AACpB,UAAMC,aAASC,uBAAKC,QAAQC,IAAG,OAAIC,gEAA4BV,OAAAA,CAAAA,GACzDW,cAAUJ,uBAAKC,QAAQC,IAAG,GAAI,aAAA,GAE9BG,iBAAaF,gEAA4BV,OAAAA,GAGzCa,gCAA4BC,kCAAS,eAAOC,MAAcC,MAAAA;AAC9D,SAAID,SAAS,SAASA,SAAS,aACzBC,KAAKC,WAAWX,MAAAA,SAElBY,8CAAmBP,SAASC,UAAAA;MAGlC,GAAG,GAAA;AAEHP,oBAAOc,QAAQC,YAAY,OAAOP,yBAAAA,GAE3B,WAAA;AAGLK,0DAAmBP,SAASC,UAAAA;MAC9B;IACF;EACF;AACF;",
|
5
|
+
"names": ["generateFileSystemRouteTypesPlugin", "options", "name", "enforce", "apply", "configureServer", "server", "appDir", "join", "process", "cwd", "getRouterRootFromOneOptions", "outFile", "routerRoot", "fileWatcherChangeListener", "debounce", "type", "path", "startsWith", "generateRouteTypes", "watcher", "addListener"]
|
6
6
|
}
|
@@ -49,7 +49,8 @@ import { createApp } from 'one'
|
|
49
49
|
// globbing ${appDirGlob}
|
50
50
|
export default createApp({
|
51
51
|
routes: import.meta.glob('${appDirGlob}', { exhaustive: true }),
|
52
|
-
|
52
|
+
routerRoot: ${JSON.stringify(options.root)},
|
53
|
+
flags: ${JSON.stringify(options.flags)},
|
53
54
|
})
|
54
55
|
`;
|
55
56
|
if (id === import_virtualEntryConstants.resolvedVirtualEntryIdNative) return `
|
@@ -60,7 +61,8 @@ import { createApp } from 'one'
|
|
60
61
|
// globbing ${appDirGlob}
|
61
62
|
export default createApp({
|
62
63
|
routes: import.meta.glob(['${appDirGlob}', '!${appDirApiGlob}'], { exhaustive: true }),
|
63
|
-
|
64
|
+
routerRoot: ${JSON.stringify(options.root)},
|
65
|
+
flags: ${JSON.stringify(options.flags)},
|
64
66
|
})
|
65
67
|
`;
|
66
68
|
}
|
@@ -44,7 +44,8 @@ import { createApp } from 'one'
|
|
44
44
|
// globbing ${appDirGlob}
|
45
45
|
export default createApp({
|
46
46
|
routes: import.meta.glob('${appDirGlob}', { exhaustive: true }),
|
47
|
-
|
47
|
+
routerRoot: ${JSON.stringify(options.root)},
|
48
|
+
flags: ${JSON.stringify(options.flags)},
|
48
49
|
})
|
49
50
|
`;
|
50
51
|
if (id === import_virtualEntryConstants.resolvedVirtualEntryIdNative)
|
@@ -56,7 +57,8 @@ import { createApp } from 'one'
|
|
56
57
|
// globbing ${appDirGlob}
|
57
58
|
export default createApp({
|
58
59
|
routes: import.meta.glob(['${appDirGlob}', '!${appDirApiGlob}'], { exhaustive: true }),
|
59
|
-
|
60
|
+
routerRoot: ${JSON.stringify(options.root)},
|
61
|
+
flags: ${JSON.stringify(options.flags)},
|
60
62
|
})
|
61
63
|
`;
|
62
64
|
}
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"version": 3,
|
3
3
|
"sources": ["../../../../src/vite/plugins/virtualEntryPlugin.ts"],
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,kBAAoC,iBAEpC,+BAKO;AAEP,MAAM,qBAAqB;AAAA;AAAA;AAAA;AAAA;AAMpB,SAAS,mBAAmB,SAAqD;AACtF,QAAM,aAAa,IAAI,QAAQ,IAAI,aAC7B,gBAAgB,IAAI,QAAQ,IAAI;AAEtC,SAAO;AAAA,IACL,MAAM;AAAA,IACN,SAAS;AAAA,IAET,UAAU,IAAI;AACZ,UAAI,OAAO;AACT,eAAO;AAET,UAAI,OAAO;AACT,eAAO;AAAA,IAEX;AAAA,IAEA,KAAK,IAAI;AACP,UAAI,OAAO;AAIT,eAAO;AAAA,MAHa,iCAAoB,KAAK,WAAW,IACpD,KACA,kBAEC;AAAA;AAAA;AAAA;AAAA,cAIC,UAAU;AAAA;AAAA,8BAEM,UAAU;AAAA,
|
4
|
+
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,kBAAoC,iBAEpC,+BAKO;AAEP,MAAM,qBAAqB;AAAA;AAAA;AAAA;AAAA;AAMpB,SAAS,mBAAmB,SAAqD;AACtF,QAAM,aAAa,IAAI,QAAQ,IAAI,aAC7B,gBAAgB,IAAI,QAAQ,IAAI;AAEtC,SAAO;AAAA,IACL,MAAM;AAAA,IACN,SAAS;AAAA,IAET,UAAU,IAAI;AACZ,UAAI,OAAO;AACT,eAAO;AAET,UAAI,OAAO;AACT,eAAO;AAAA,IAEX;AAAA,IAEA,KAAK,IAAI;AACP,UAAI,OAAO;AAIT,eAAO;AAAA,MAHa,iCAAoB,KAAK,WAAW,IACpD,KACA,kBAEC;AAAA;AAAA;AAAA;AAAA,cAIC,UAAU;AAAA;AAAA,8BAEM,UAAU;AAAA,gBACxB,KAAK,UAAU,QAAQ,IAAI,CAAC;AAAA,WACjC,KAAK,UAAU,QAAQ,KAAK,CAAC;AAAA;AAAA;AAKlC,UAAI,OAAO;AAIT,eAAO;AAAA,MAHa,iCAAoB,KAAK,WAAW,IACpD,KACA,kBAEC;AAAA;AAAA;AAAA;AAAA,cAIC,UAAU;AAAA;AAAA,+BAEO,UAAU,QAAQ,aAAa;AAAA,gBAC9C,KAAK,UAAU,QAAQ,IAAI,CAAC;AAAA,WACjC,KAAK,UAAU,QAAQ,KAAK,CAAC;AAAA;AAAA;AAAA,IAIpC;AAAA,EACF;AACF;",
|
5
5
|
"names": []
|
6
6
|
}
|
@@ -48,7 +48,8 @@ import { createApp } from 'one'
|
|
48
48
|
// globbing ${appDirGlob}
|
49
49
|
export default createApp({
|
50
50
|
routes: import.meta.glob('${appDirGlob}', { exhaustive: true }),
|
51
|
-
|
51
|
+
routerRoot: ${JSON.stringify(options.root)},
|
52
|
+
flags: ${JSON.stringify(options.flags)},
|
52
53
|
})
|
53
54
|
`;
|
54
55
|
}
|
@@ -65,7 +66,8 @@ import { createApp } from 'one'
|
|
65
66
|
// globbing ${appDirGlob}
|
66
67
|
export default createApp({
|
67
68
|
routes: import.meta.glob(['${appDirGlob}', '!${appDirApiGlob}'], { exhaustive: true }),
|
68
|
-
|
69
|
+
routerRoot: ${JSON.stringify(options.root)},
|
70
|
+
flags: ${JSON.stringify(options.flags)},
|
69
71
|
})
|
70
72
|
`;
|
71
73
|
}
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"version": 3,
|
3
3
|
"sources": ["../../../../src/vite/plugins/Users/n8/one/packages/one/src/vite/plugins/virtualEntryPlugin.ts"],
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;AACA;;;;;kBAAoC,iBAEpC,+BAKO,oCAEDA,qBAAqB;;;;;AAMpB,SAASC,mBAAmBC,SAA2C;AAC5E,MAAMC,aAAa,IAAID,QAAQE,IAAI,aAC7BC,gBAAgB,IAAIH,QAAQE,IAAI;AAEtC,SAAO;IACLE,MAAM;IACNC,SAAS;IAETC,UAAUC,IAAE;AACV,UAAIA,OAAOC;AACT,eAAOC;AAET,UAAIF,OAAOG;AACT,eAAOC;IAEX;IAEAC,KAAKL,IAAE;AACL,UAAIA,OAAOE,qDAAwB;AACjC,YAAMI,kBAAcC,iCAAoB,KAAKC,WAAW,IACpD;;UACAjB;;AACJ,eAAO;EACbe,WAAAA;;;;cAIYZ,UAAAA;;8BAEgBA,UAAAA;
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;AACA;;;;;kBAAoC,iBAEpC,+BAKO,oCAEDA,qBAAqB;;;;;AAMpB,SAASC,mBAAmBC,SAA2C;AAC5E,MAAMC,aAAa,IAAID,QAAQE,IAAI,aAC7BC,gBAAgB,IAAIH,QAAQE,IAAI;AAEtC,SAAO;IACLE,MAAM;IACNC,SAAS;IAETC,UAAUC,IAAE;AACV,UAAIA,OAAOC;AACT,eAAOC;AAET,UAAIF,OAAOG;AACT,eAAOC;IAEX;IAEAC,KAAKL,IAAE;AACL,UAAIA,OAAOE,qDAAwB;AACjC,YAAMI,kBAAcC,iCAAoB,KAAKC,WAAW,IACpD;;UACAjB;;AACJ,eAAO;EACbe,WAAAA;;;;cAIYZ,UAAAA;;8BAEgBA,UAAAA;gBACde,KAAKC,UAAUjB,QAAQE,IAAI,CAAA;WAChCc,KAAKC,UAAUjB,QAAQkB,KAAK,CAAA;;;MAGjC;AAEA,UAAIX,OAAOI,2DAA8B;AACvC,YAAME,mBAAcC,iCAAoB,KAAKC,WAAW,IACpD;;UACAjB;;AACJ,eAAO;EACbe,YAAAA;;;;cAIYZ,UAAAA;;+BAEiBA,UAAAA,QAAkBE,aAAAA;gBACjCa,KAAKC,UAAUjB,QAAQE,IAAI,CAAA;WAChCc,KAAKC,UAAUjB,QAAQkB,KAAK,CAAA;;;MAGjC;IACF;EACF;AACF;",
|
5
5
|
"names": ["USE_ONE_SETUP_FILE", "createVirtualEntry", "options", "appDirGlob", "root", "appDirApiGlob", "name", "enforce", "resolveId", "id", "virtualEntryId", "resolvedVirtualEntryId", "virtualEntryIdNative", "resolvedVirtualEntryIdNative", "load", "prependCode", "isNativeEnvironment", "environment", "JSON", "stringify", "flags"]
|
6
6
|
}
|
package/dist/esm/Root.js
CHANGED
@@ -26,7 +26,7 @@ import { Fragment, jsx, jsxs } from "react/jsx-runtime";
|
|
26
26
|
const ServerAsyncLocalIDContext = createContext(null);
|
27
27
|
globalThis.__vxrnGetContextFromReactContext = () => useContext(ServerAsyncLocalIDContext);
|
28
28
|
function Root(props) {
|
29
|
-
const { path, routes, routeOptions, isClient, navigationContainerProps, onRenderId } = props, context = useViteRoutes(routes, routeOptions, globalThis.__vxrnVersion), location = typeof window < "u" && window.location ? new URL(path || window.location.href || "/", window.location.href) : new URL(path || "/", getURL()), store = useInitializeOneRouter(context, location), [colorScheme] = useColorScheme(), Component = store.rootComponent;
|
29
|
+
const { path, routes, routeOptions, isClient, navigationContainerProps, onRenderId } = props, context = useViteRoutes(routes, props.routerRoot, routeOptions, globalThis.__vxrnVersion), location = typeof window < "u" && window.location ? new URL(path || window.location.href || "/", window.location.href) : new URL(path || "/", getURL()), store = useInitializeOneRouter(context, location), [colorScheme] = useColorScheme(), Component = store.rootComponent;
|
30
30
|
if (!Component)
|
31
31
|
throw new Error("No root component found");
|
32
32
|
const id = useId();
|
package/dist/esm/Root.js.map
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"version": 3,
|
3
3
|
"sources": ["../../src/Root.tsx"],
|
4
|
-
"mappings": "AAAA;AAAA,EACE;AAAA,EACA;AAAA,OAGK;AACP,SAAS,sBAAsB;AAC/B;AAAA,EACE;AAAA,EACA;AAAA,EAEA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OAGK;AACP,SAAS,0BAA0B;AACnC,SAAS,uBAAuB,mCAAmC;AACnE,SAAS,cAAc;AACvB,SAAS,6BAA6B;AACtC,SAAS,8BAA8B;AACvC,SAAS,qBAAqB;AAC9B,SAAS,oBAAoB;AAE7B,SAAS,sBAAsB;AAC/B,SAAS,oBAAoB;AAC7B,SAAS,yBAAyB;AAClC,SAAS,sBAAsB;
|
4
|
+
"mappings": "AAAA;AAAA,EACE;AAAA,EACA;AAAA,OAGK;AACP,SAAS,sBAAsB;AAC/B;AAAA,EACE;AAAA,EACA;AAAA,EAEA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OAGK;AACP,SAAS,0BAA0B;AACnC,SAAS,uBAAuB,mCAAmC;AACnE,SAAS,cAAc;AACvB,SAAS,6BAA6B;AACtC,SAAS,8BAA8B;AACvC,SAAS,qBAAqB;AAC9B,SAAS,oBAAoB;AAE7B,SAAS,sBAAsB;AAC/B,SAAS,oBAAoB;AAC7B,SAAS,yBAAyB;AAClC,SAAS,sBAAsB;AAuFnB,mBAEE,KAFF;AAtDZ,MAAM,4BAA4B,cAAwC,IAAI;AAE9E,WAAW,mCAAsC,MAC/C,WAAW,yBAAyB;AAE/B,SAAS,KAAK,OAAkB;AACrC,QAAM,EAAE,MAAM,QAAQ,cAAc,UAAU,0BAA0B,WAAW,IACjF,OAEI,UAAU,cAAc,QAAQ,MAAM,YAAY,cAAc,WAAW,aAAgB,GAC3F,WACJ,OAAO,SAAW,OAAe,OAAO,WACpC,IAAI,IAAI,QAAQ,OAAO,SAAS,QAAQ,KAAK,OAAO,SAAS,IAAI,IACjE,IAAI,IAAI,QAAQ,KAAK,OAAO,CAAC,GAE7B,QAAQ,uBAAuB,SAAS,QAAQ,GAChD,CAAC,WAAW,IAAI,eAAe,GAI/B,YAAY,MAAM;AAExB,MAAI,CAAC;AACH,UAAM,IAAI,MAAM,yBAAyB;AAG3C,QAAM,KAAK,MAAM;AAEjB,eAAa,EAAE;AAEf,QAAM,QAAQ,WAAW,8BAAiC,SAAS,KAAK;AAExE,MAAI,WACF,oBAAC,0BAA0B,UAA1B,EAAmC,OAClC,+BAAC,eAAe,UAAf,EAAwB,OAAO,IAE9B;AAAA;AAAA,MAAC;AAAA;AAAA,QACC,KAAK,MAAM;AAAA,QACX,cAAc,MAAM;AAAA,QACpB,SAAS,MAAM;AAAA,QACf;AAAA,QACA,OAAO,gBAAgB,SAAS,YAAY;AAAA,QAC5C,eAAe;AAAA,UACb,SAAS;AAAA,QACX;AAAA,QACC,GAAG;AAAA,QAEJ,8BAAC,sBAAsB,UAAtB,EAA+B,OAAO,UAOrC,2CAEE;AAAA,8BAAC,kBAAe;AAAA,UAEhB,oBAAC,qBACC,8BAAC,aAAU,GACb;AAAA,WAGF,GAGF;AAAA;AAAA,IACF;AAAA,IACA,oBAAC,kBAAiB,eAAgB;AAAA,KACpC,GACF;AAaF,MAVI,MAAM,UACR,WACE,oBAAC,aAAa,UAAb,EAAsB,OAAO,MAAM,OAAQ,oBAAS,IAIpD,QAAQ,IAAI,4BACf,WAAW,oBAAC,cAAY,oBAAS,IAG/B,UAAU;AAEZ,QAAI,WAAW,kBAAkB,GAAG,SAAS,OAAO;AAElD,YAAM,CAAC,MAAM,OAAO,IAAI,SAAS,EAAK;AAGtC,6BAAgB,MAAM;AACpB,gBAAQ,EAAI;AAAA,MACd,GAAG,CAAC,CAAC,GAEE,OAAO,WAAW;AAAA,IAC3B;AAEA,WAAO;AAAA,EACT;AAEA,SAAO;AACT;AAqCA,IAAI;AAEA,QAAQ,IAAI,aAAa,eAC3B,oBAAoB,CAAC,WAA6B;AAChD,QAAM,UAA2C,OAAO;AAExD,MAAI,UAAU,eAAe,OAAO,IAAI,IACtC,UAAU,iBAAiB,KAAK,UAAU,OAAO,OAAO,CAAC,KAAK,EAChE;AAEA,UAAQ,OAAO,MAAM;AAAA,IACnB,KAAK;AAAA,IACL,KAAK;AAAA,IACL,KAAK;AAAA,IACL,KAAK;AACH,MAAI,SAAS,OACX,WAAW;AAAA;AAAA,6BAAkC,QAAQ,IAAI,OAEzD,WAAW;AAAA;AAAA;AAGb;AAAA,IACF,KAAK;AAAA,IACL,KAAK;AAAA,IACL,KAAK;AACH,iBAAW;AAAA;AAAA;AACX;AAAA,IACF,KAAK;AAAA,IACL,KAAK;AAAA,IACL,KAAK;AACH,iBAAW;AAAA;AAAA;AACX;AAAA,EACJ;AAIA,MAFA,WAAW;AAAA;AAAA,uEAEP,QAAQ,IAAI,aAAa;AAC3B,UAAM,IAAI,MAAM,OAAO;AAEzB,UAAQ,MAAM,OAAO;AACvB,IAEA,oBAAoB,MAAM;AAAC;",
|
5
5
|
"names": []
|
6
6
|
}
|
package/dist/esm/Root.mjs
CHANGED
@@ -24,7 +24,7 @@ function Root(props) {
|
|
24
24
|
navigationContainerProps,
|
25
25
|
onRenderId
|
26
26
|
} = props,
|
27
|
-
context = useViteRoutes(routes, routeOptions, globalThis.__vxrnVersion),
|
27
|
+
context = useViteRoutes(routes, props.routerRoot, routeOptions, globalThis.__vxrnVersion),
|
28
28
|
location = typeof window < "u" && window.location ? new URL(path || window.location.href || "/", window.location.href) : new URL(path || "/", getURL()),
|
29
29
|
store = useInitializeOneRouter(context, location),
|
30
30
|
[colorScheme] = useColorScheme(),
|
package/dist/esm/Root.mjs.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["DarkTheme","DefaultTheme","useColorScheme","createContext","StrictMode","useContext","useId","useLayoutEffect","useState","SERVER_CONTEXT_KEY","NavigationContainer","UpstreamNavigationContainer","getURL","ServerLocationContext","useInitializeOneRouter","useViteRoutes","FlagsContext","ServerRenderID","PreloadLinks","RootErrorBoundary","ScrollBehavior","Fragment","jsx","jsxs","ServerAsyncLocalIDContext","globalThis","__vxrnGetContextFromReactContext","Root","props","path","routes","routeOptions","isClient","navigationContainerProps","onRenderId","context","__vxrnVersion","location","window","URL","href","store","colorScheme","Component","rootComponent","Error","id","value","__vxrnrequestAsyncLocalStore","getStore","contents","Provider","children","ref","navigationRef","initialState","linking","onUnhandledAction","theme","documentTitle","enabled","flags","process","env","ONE_DISABLE_STRICT_MODE","mode","show","setShow","NODE_ENV","action","payload","message","type","JSON","stringify","name","console","error"],"sources":["../../src/Root.tsx"],"sourcesContent":[null],"mappings":"AAAA,SACEA,SAAA,EACAC,YAAA,QAGK;AACP,SAASC,cAAA,QAAsB;AAC/B,SACEC,aAAA,EACAC,UAAA,EAEAC,UAAA,EACAC,KAAA,EACAC,eAAA,EACAC,QAAA,QAGK;AACP,SAASC,kBAAA,QAA0B;AACnC,SAASC,mBAAA,IAAuBC,2BAAA,QAAmC;AACnE,SAASC,MAAA,QAAc;AACvB,SAASC,qBAAA,QAA6B;AACtC,SAASC,sBAAA,QAA8B;AACvC,SAASC,aAAA,QAAqB;AAC9B,SAASC,YAAA,QAAoB;AAE7B,SAASC,cAAA,QAAsB;AAC/B,SAASC,YAAA,QAAoB;AAC7B,SAASC,iBAAA,QAAyB;AAClC,SAASC,cAAA,QAAsB;
|
1
|
+
{"version":3,"names":["DarkTheme","DefaultTheme","useColorScheme","createContext","StrictMode","useContext","useId","useLayoutEffect","useState","SERVER_CONTEXT_KEY","NavigationContainer","UpstreamNavigationContainer","getURL","ServerLocationContext","useInitializeOneRouter","useViteRoutes","FlagsContext","ServerRenderID","PreloadLinks","RootErrorBoundary","ScrollBehavior","Fragment","jsx","jsxs","ServerAsyncLocalIDContext","globalThis","__vxrnGetContextFromReactContext","Root","props","path","routes","routeOptions","isClient","navigationContainerProps","onRenderId","context","routerRoot","__vxrnVersion","location","window","URL","href","store","colorScheme","Component","rootComponent","Error","id","value","__vxrnrequestAsyncLocalStore","getStore","contents","Provider","children","ref","navigationRef","initialState","linking","onUnhandledAction","theme","documentTitle","enabled","flags","process","env","ONE_DISABLE_STRICT_MODE","mode","show","setShow","NODE_ENV","action","payload","message","type","JSON","stringify","name","console","error"],"sources":["../../src/Root.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/dist/esm/Root.native.js
CHANGED
@@ -27,7 +27,7 @@ function Root(props) {
|
|
27
27
|
navigationContainerProps,
|
28
28
|
onRenderId
|
29
29
|
} = props,
|
30
|
-
context = useViteRoutes(routes, routeOptions, globalThis.__vxrnVersion),
|
30
|
+
context = useViteRoutes(routes, props.routerRoot, routeOptions, globalThis.__vxrnVersion),
|
31
31
|
location = typeof window < "u" && window.location ? new URL(path || window.location.href || "/", window.location.href) : new URL(path || "/", getURL()),
|
32
32
|
store = useInitializeOneRouter(context, location),
|
33
33
|
[colorScheme] = useColorScheme(),
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["jsx","_jsx","jsxs","_jsxs","Fragment","_Fragment","DarkTheme","DefaultTheme","useColorScheme","createContext","StrictMode","useContext","useId","useLayoutEffect","useState","SERVER_CONTEXT_KEY","NavigationContainer","UpstreamNavigationContainer","getURL","ServerLocationContext","useInitializeOneRouter","useViteRoutes","FlagsContext","ServerRenderID","PreloadLinks","RootErrorBoundary","ScrollBehavior","ServerAsyncLocalIDContext","globalThis","__vxrnGetContextFromReactContext","Root","props","_globalThis___vxrnrequestAsyncLocalStore","path","routes","routeOptions","isClient","navigationContainerProps","onRenderId","context","__vxrnVersion","location","window","URL","href","store","colorScheme","Component","rootComponent","Error","id","value","__vxrnrequestAsyncLocalStore","getStore","contents","Provider","children","ref","navigationRef","initialState","linking","onUnhandledAction","theme","documentTitle","enabled","flags","process","env","ONE_DISABLE_STRICT_MODE","_globalThis_SERVER_CONTEXT_KEY","mode","show","setShow","NODE_ENV","action","payload","message","type","JSON","stringify","name"],"sources":["../../src/Root.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAAAA,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA,EAAAC,QAAA,IAAAC,SAAA;AAAA,SACEC,SAAA,EAAAC,YAAA;AAAA,SACAC,cAAA;AAAA,SAGKC,aAAA,EAAAC,UAAA,EAAAC,UAAA,EAAAC,KAAA,EAAAC,eAAA,EAAAC,QAAA;AACP,SAASC,kBAAA,QAAsB;AAC/B,SAAAC,mBAAA,IAAAC,2BAAA;AAAA,SACEC,MAAA;AAAA,SACAC,qBAAA;AAAA,SAEAC,sBAAA;AAAA,SACAC,aAAA;AAAA,SACAC,YAAA;AAAA,SACAC,cAAA;AAAA,SAGKC,YAAA;AACP,SAASC,iBAAA,6CAA0B;AACnC,SAASC,cAAA,0CAAuB;AAChC,IAAAC,yBAAuB,kBAAAlB,aAAA;AACvBmB,UAAS,CAAAC,gCAA6B;EACtC,OAASlB,UAAA,CAAAgB,yBAA8B;AACvC;AACA,SAASG,KAAAC,KAAA;EAET,IAAAC,wCAA+B;IAAA;MAAAC,IAAA;MAAAC,MAAA;MAAAC,YAAA;MAAAC,QAAA;MAAAC,wBAAA;MAAAC;IAAA,IAAAP,KAAA;IAAAQ,OAAA,GAAAlB,aAAA,CAAAa,MAAA,
|
1
|
+
{"version":3,"names":["jsx","_jsx","jsxs","_jsxs","Fragment","_Fragment","DarkTheme","DefaultTheme","useColorScheme","createContext","StrictMode","useContext","useId","useLayoutEffect","useState","SERVER_CONTEXT_KEY","NavigationContainer","UpstreamNavigationContainer","getURL","ServerLocationContext","useInitializeOneRouter","useViteRoutes","FlagsContext","ServerRenderID","PreloadLinks","RootErrorBoundary","ScrollBehavior","ServerAsyncLocalIDContext","globalThis","__vxrnGetContextFromReactContext","Root","props","_globalThis___vxrnrequestAsyncLocalStore","path","routes","routeOptions","isClient","navigationContainerProps","onRenderId","context","routerRoot","__vxrnVersion","location","window","URL","href","store","colorScheme","Component","rootComponent","Error","id","value","__vxrnrequestAsyncLocalStore","getStore","contents","Provider","children","ref","navigationRef","initialState","linking","onUnhandledAction","theme","documentTitle","enabled","flags","process","env","ONE_DISABLE_STRICT_MODE","_globalThis_SERVER_CONTEXT_KEY","mode","show","setShow","NODE_ENV","action","payload","message","type","JSON","stringify","name"],"sources":["../../src/Root.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/dist/esm/cli/build.js
CHANGED
@@ -17,6 +17,7 @@ import { getManifest } from "../vite/getManifest";
|
|
17
17
|
import { loadUserOneOptions } from "../vite/loadConfig";
|
18
18
|
import { runWithAsyncLocalContext } from "../vite/one-server-only";
|
19
19
|
import { buildVercelOutputDirectory } from "../vercel/build/buildVercelOutputDirectory";
|
20
|
+
import { getRouterRootFromOneOptions } from "../utils/getRouterRootFromOneOptions";
|
20
21
|
import { buildPage } from "./buildPage";
|
21
22
|
import { checkNodeVersion } from "./checkNodeVersion";
|
22
23
|
import { labelProcess } from "./label-process";
|
@@ -30,7 +31,7 @@ async function build(args) {
|
|
30
31
|
process.env.ONE_SERVER_URL || console.warn(
|
31
32
|
"\u26A0\uFE0F No ONE_SERVER_URL environment set, set it in your .env to your target deploy URL"
|
32
33
|
);
|
33
|
-
const { oneOptions } = await loadUserOneOptions("build"), manifest = getManifest(), serverOutputFormat = oneOptions.build?.server === !1 ? "esm" : oneOptions.build?.server?.outputFormat ?? "esm", vxrnOutput = await vxrnBuild(
|
34
|
+
const { oneOptions } = await loadUserOneOptions("build"), routerRoot = getRouterRootFromOneOptions(oneOptions), routerRootRegexp = new RegExp(`^${routerRoot}`), manifest = getManifest({ routerRoot }), serverOutputFormat = oneOptions.build?.server === !1 ? "esm" : oneOptions.build?.server?.outputFormat ?? "esm", vxrnOutput = await vxrnBuild(
|
34
35
|
{
|
35
36
|
server: oneOptions.server,
|
36
37
|
build: {
|
@@ -56,7 +57,7 @@ async function build(args) {
|
|
56
57
|
Object.entries(serverEnv).map(([key, value]) => [`process.env.${key}`, JSON.stringify(value)])
|
57
58
|
);
|
58
59
|
async function buildCustomRoutes(subFolder, routes) {
|
59
|
-
const input = routes.reduce((entries, { page, file }) => (entries[page.slice(1) + ".js"] = join(
|
60
|
+
const input = routes.reduce((entries, { page, file }) => (entries[page.slice(1) + ".js"] = join(routerRoot, file), entries), {}), outputFormat = oneOptions?.build?.api?.outputFormat ?? serverOutputFormat, treeshake = oneOptions?.build?.api?.treeshake, mergedConfig = mergeConfig(apiBuildConfig, {
|
60
61
|
appType: "custom",
|
61
62
|
configFile: !1,
|
62
63
|
// plugins: [
|
@@ -135,7 +136,7 @@ async function build(args) {
|
|
135
136
|
`);
|
136
137
|
const middlewareBuildInfo = await buildCustomRoutes("middlewares", manifest.middlewareRoutes);
|
137
138
|
for (const middleware of manifest.middlewareRoutes) {
|
138
|
-
const absoluteRoot = resolve(process.cwd(), options.root), fullPath = join(absoluteRoot,
|
139
|
+
const absoluteRoot = resolve(process.cwd(), options.root), fullPath = join(absoluteRoot, routerRoot, middleware.file), chunk = middlewareBuildInfo.output.filter((x) => x.type === "chunk").find((x) => x.facadeModuleId === fullPath);
|
139
140
|
if (!chunk) throw new Error("internal err finding middleware");
|
140
141
|
builtMiddlewares[middleware.file] = join("dist", "middlewares", chunk.fileName);
|
141
142
|
}
|
@@ -168,15 +169,15 @@ async function build(args) {
|
|
168
169
|
continue;
|
169
170
|
}
|
170
171
|
const id = output.facadeModuleId || "", file = Path.basename(id);
|
171
|
-
if (!id || file[0] === "_" || file.includes("entry-server") || id.includes("+api") || !id.includes(
|
172
|
+
if (!id || file[0] === "_" || file.includes("entry-server") || id.includes("+api") || !id.includes(`/${routerRoot}/`))
|
172
173
|
continue;
|
173
|
-
const relativeId = relative(process.cwd(), id).replace(
|
174
|
+
const relativeId = relative(process.cwd(), id).replace(`${routerRoot}/`, "/"), onlyBuild = vxrnOutput.buildArgs?.only;
|
174
175
|
if (onlyBuild && !MicroMatch.contains(relativeId, onlyBuild))
|
175
176
|
continue;
|
176
177
|
const clientManifestKey = Object.keys(vxrnOutput.clientManifest).find((key) => id.endsWith(key)) || "";
|
177
178
|
if (!clientManifestKey)
|
178
179
|
continue;
|
179
|
-
const clientManifestEntry = vxrnOutput.clientManifest[clientManifestKey], foundRoute = manifest.pageRoutes.find((route) => route.file && clientManifestKey.replace(
|
180
|
+
const clientManifestEntry = vxrnOutput.clientManifest[clientManifestKey], foundRoute = manifest.pageRoutes.find((route) => route.file && clientManifestKey.replace(routerRootRegexp, "") === route.file.slice(1));
|
180
181
|
if (!foundRoute)
|
181
182
|
continue;
|
182
183
|
foundRoute.loaderServerPath = output.fileName, clientManifestEntry || console.warn(
|
@@ -187,7 +188,7 @@ async function build(args) {
|
|
187
188
|
)}`
|
188
189
|
);
|
189
190
|
const entryImports = collectImports(clientManifestEntry || {}), layoutEntries = foundRoute.layouts?.flatMap((layout) => {
|
190
|
-
const clientKey =
|
191
|
+
const clientKey = `${routerRoot}${layout.contextKey.slice(1)}`;
|
191
192
|
return vxrnOutput.clientManifest[clientKey];
|
192
193
|
}) ?? [], layoutImports = layoutEntries.flatMap((entry) => [entry.file, ...collectImports(entry)]), preloadSetupFilePreloads = (() => {
|
193
194
|
if (oneOptions.setupFile) {
|
@@ -257,7 +258,7 @@ async function build(args) {
|
|
257
258
|
}
|
258
259
|
}
|
259
260
|
await moveAllFiles(staticDir, clientDir), await FSExtra.rm(staticDir, { force: !0, recursive: !0 });
|
260
|
-
const routeMap = {}, routeToBuildInfo = {}, preloads = {}, loaders = {};
|
261
|
+
const routeMap = {}, routeToBuildInfo = {}, pathToRoute = {}, preloads = {}, loaders = {};
|
261
262
|
for (const route of builtRoutes) {
|
262
263
|
route.cleanPath.includes("*") || (routeMap[route.cleanPath] = route.htmlPath);
|
263
264
|
const {
|
@@ -265,7 +266,10 @@ async function build(args) {
|
|
265
266
|
loaderData: _loaderData,
|
266
267
|
...rest
|
267
268
|
} = route;
|
268
|
-
routeToBuildInfo[route.routeFile] = rest
|
269
|
+
routeToBuildInfo[route.routeFile] = rest;
|
270
|
+
for (let p of getCleanPaths([route.path, route.cleanPath]))
|
271
|
+
pathToRoute[p] = route.routeFile;
|
272
|
+
preloads[route.preloadPath] = !0, loaders[route.loaderPath] = !0;
|
269
273
|
}
|
270
274
|
function createBuildManifestRoute(route) {
|
271
275
|
const { layouts, ...built } = route, buildInfo = builtRoutes.find((x) => x.routeFile === route.file);
|
@@ -277,6 +281,7 @@ async function build(args) {
|
|
277
281
|
const buildInfoForWriting = {
|
278
282
|
oneOptions,
|
279
283
|
routeToBuildInfo,
|
284
|
+
pathToRoute,
|
280
285
|
manifest: {
|
281
286
|
pageRoutes: manifest.pageRoutes.map(createBuildManifestRoute),
|
282
287
|
apiRoutes: manifest.apiRoutes.map(createBuildManifestRoute)
|
@@ -311,6 +316,21 @@ async function build(args) {
|
|
311
316
|
|
312
317
|
`);
|
313
318
|
}
|
319
|
+
const TRAILING_INDEX_REGEX = /\/index(\.(web))?/;
|
320
|
+
function getCleanPaths(possiblePaths) {
|
321
|
+
return Array.from(
|
322
|
+
new Set(
|
323
|
+
Array.from(new Set(possiblePaths)).flatMap((p) => {
|
324
|
+
const paths = [p];
|
325
|
+
if (p.match(TRAILING_INDEX_REGEX)) {
|
326
|
+
const pathWithTrailingIndexRemoved = p.replace(TRAILING_INDEX_REGEX, "");
|
327
|
+
paths.push(pathWithTrailingIndexRemoved), paths.push(pathWithTrailingIndexRemoved + "/");
|
328
|
+
}
|
329
|
+
return paths;
|
330
|
+
})
|
331
|
+
)
|
332
|
+
);
|
333
|
+
}
|
314
334
|
async function moveAllFiles(src, dest) {
|
315
335
|
try {
|
316
336
|
await FSExtra.copy(src, dest, { overwrite: !0, errorOnExist: !1 });
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"version": 3,
|
3
3
|
"sources": ["../../../src/cli/build.ts"],
|
4
|
-
"mappings": "AAAA,OAAO,aAAa;AACpB,OAAO,gBAAgB;AACvB,SAAS,qBAAqB;AAC9B,OAAO,QAAQ,MAAM,UAAU,eAAe;AAE9C,SAAS,aAAa,SAAS,iBAAoC;AACnE;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,SAAS;AAAA,OAEJ;AAEP,YAAY,eAAe;AAC3B,SAAS,wBAAwB;AACjC,SAAS,kBAAkB;AAC3B,SAAS,mBAAmB;AAC5B,SAAS,0BAA0B;AACnC,SAAS,gCAAgC;AAEzC,SAAS,kCAAkC;
|
4
|
+
"mappings": "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",
|
5
5
|
"names": ["file", "preloads"]
|
6
6
|
}
|
package/dist/esm/cli/build.mjs
CHANGED
@@ -11,6 +11,7 @@ import { getManifest } from "../vite/getManifest.mjs";
|
|
11
11
|
import { loadUserOneOptions } from "../vite/loadConfig.mjs";
|
12
12
|
import { runWithAsyncLocalContext } from "../vite/one-server-only.mjs";
|
13
13
|
import { buildVercelOutputDirectory } from "../vercel/build/buildVercelOutputDirectory.mjs";
|
14
|
+
import { getRouterRootFromOneOptions } from "../utils/getRouterRootFromOneOptions.mjs";
|
14
15
|
import { buildPage } from "./buildPage.mjs";
|
15
16
|
import { checkNodeVersion } from "./checkNodeVersion.mjs";
|
16
17
|
import { labelProcess } from "./label-process.mjs";
|
@@ -30,7 +31,11 @@ async function build(args) {
|
|
30
31
|
const {
|
31
32
|
oneOptions
|
32
33
|
} = await loadUserOneOptions("build"),
|
33
|
-
|
34
|
+
routerRoot = getRouterRootFromOneOptions(oneOptions),
|
35
|
+
routerRootRegexp = new RegExp(`^${routerRoot}`),
|
36
|
+
manifest = getManifest({
|
37
|
+
routerRoot
|
38
|
+
}),
|
34
39
|
serverOutputFormat = oneOptions.build?.server === !1 ? "esm" : oneOptions.build?.server?.outputFormat ?? "esm",
|
35
40
|
vxrnOutput = await vxrnBuild({
|
36
41
|
server: oneOptions.server,
|
@@ -58,7 +63,7 @@ async function build(args) {
|
|
58
63
|
const input = routes.reduce((entries, {
|
59
64
|
page,
|
60
65
|
file
|
61
|
-
}) => (entries[page.slice(1) + ".js"] = join(
|
66
|
+
}) => (entries[page.slice(1) + ".js"] = join(routerRoot, file), entries), {}),
|
62
67
|
outputFormat = oneOptions?.build?.api?.outputFormat ?? serverOutputFormat,
|
63
68
|
treeshake = oneOptions?.build?.api?.treeshake,
|
64
69
|
mergedConfig = mergeConfig(apiBuildConfig, {
|
@@ -144,7 +149,7 @@ async function build(args) {
|
|
144
149
|
const middlewareBuildInfo = await buildCustomRoutes("middlewares", manifest.middlewareRoutes);
|
145
150
|
for (const middleware of manifest.middlewareRoutes) {
|
146
151
|
const absoluteRoot = resolve(process.cwd(), options.root),
|
147
|
-
fullPath = join(absoluteRoot,
|
152
|
+
fullPath = join(absoluteRoot, routerRoot, middleware.file),
|
148
153
|
chunk = middlewareBuildInfo.output.filter(x => x.type === "chunk").find(x => x.facadeModuleId === fullPath);
|
149
154
|
if (!chunk) throw new Error("internal err finding middleware");
|
150
155
|
builtMiddlewares[middleware.file] = join("dist", "middlewares", chunk.fileName);
|
@@ -180,19 +185,19 @@ async function build(args) {
|
|
180
185
|
}
|
181
186
|
const id = output.facadeModuleId || "",
|
182
187
|
file = Path.basename(id);
|
183
|
-
if (!id || file[0] === "_" || file.includes("entry-server") || id.includes("+api") || !id.includes(
|
184
|
-
const relativeId = relative(process.cwd(), id).replace(
|
188
|
+
if (!id || file[0] === "_" || file.includes("entry-server") || id.includes("+api") || !id.includes(`/${routerRoot}/`)) continue;
|
189
|
+
const relativeId = relative(process.cwd(), id).replace(`${routerRoot}/`, "/"),
|
185
190
|
onlyBuild = vxrnOutput.buildArgs?.only;
|
186
191
|
if (onlyBuild && !MicroMatch.contains(relativeId, onlyBuild)) continue;
|
187
192
|
const clientManifestKey = Object.keys(vxrnOutput.clientManifest).find(key => id.endsWith(key)) || "";
|
188
193
|
if (!clientManifestKey) continue;
|
189
194
|
const clientManifestEntry = vxrnOutput.clientManifest[clientManifestKey],
|
190
|
-
foundRoute = manifest.pageRoutes.find(route => route.file && clientManifestKey.replace(
|
195
|
+
foundRoute = manifest.pageRoutes.find(route => route.file && clientManifestKey.replace(routerRootRegexp, "") === route.file.slice(1));
|
191
196
|
if (!foundRoute) continue;
|
192
197
|
foundRoute.loaderServerPath = output.fileName, clientManifestEntry || console.warn(`No client manifest entry found: ${clientManifestKey} in manifest ${JSON.stringify(vxrnOutput.clientManifest, null, 2)}`);
|
193
198
|
const entryImports = collectImports(clientManifestEntry || {}),
|
194
199
|
layoutEntries = foundRoute.layouts?.flatMap(layout => {
|
195
|
-
const clientKey =
|
200
|
+
const clientKey = `${routerRoot}${layout.contextKey.slice(1)}`;
|
196
201
|
return vxrnOutput.clientManifest[clientKey];
|
197
202
|
}) ?? [],
|
198
203
|
layoutImports = layoutEntries.flatMap(entry => [entry.file, ...collectImports(entry)]),
|
@@ -257,6 +262,7 @@ async function build(args) {
|
|
257
262
|
});
|
258
263
|
const routeMap = {},
|
259
264
|
routeToBuildInfo = {},
|
265
|
+
pathToRoute = {},
|
260
266
|
preloads = {},
|
261
267
|
loaders = {};
|
262
268
|
for (const route of builtRoutes) {
|
@@ -266,7 +272,9 @@ async function build(args) {
|
|
266
272
|
loaderData: _loaderData,
|
267
273
|
...rest
|
268
274
|
} = route;
|
269
|
-
routeToBuildInfo[route.routeFile] = rest
|
275
|
+
routeToBuildInfo[route.routeFile] = rest;
|
276
|
+
for (let p of getCleanPaths([route.path, route.cleanPath])) pathToRoute[p] = route.routeFile;
|
277
|
+
preloads[route.preloadPath] = !0, loaders[route.loaderPath] = !0;
|
270
278
|
}
|
271
279
|
function createBuildManifestRoute(route) {
|
272
280
|
const {
|
@@ -280,6 +288,7 @@ async function build(args) {
|
|
280
288
|
const buildInfoForWriting = {
|
281
289
|
oneOptions,
|
282
290
|
routeToBuildInfo,
|
291
|
+
pathToRoute,
|
283
292
|
manifest: {
|
284
293
|
pageRoutes: manifest.pageRoutes.map(createBuildManifestRoute),
|
285
294
|
apiRoutes: manifest.apiRoutes.map(createBuildManifestRoute)
|
@@ -317,6 +326,17 @@ async function build(args) {
|
|
317
326
|
|
318
327
|
`);
|
319
328
|
}
|
329
|
+
const TRAILING_INDEX_REGEX = /\/index(\.(web))?/;
|
330
|
+
function getCleanPaths(possiblePaths) {
|
331
|
+
return Array.from(new Set(Array.from(new Set(possiblePaths)).flatMap(p => {
|
332
|
+
const paths = [p];
|
333
|
+
if (p.match(TRAILING_INDEX_REGEX)) {
|
334
|
+
const pathWithTrailingIndexRemoved = p.replace(TRAILING_INDEX_REGEX, "");
|
335
|
+
paths.push(pathWithTrailingIndexRemoved), paths.push(pathWithTrailingIndexRemoved + "/");
|
336
|
+
}
|
337
|
+
return paths;
|
338
|
+
})));
|
339
|
+
}
|
320
340
|
async function moveAllFiles(src, dest) {
|
321
341
|
try {
|
322
342
|
await FSExtra.copy(src, dest, {
|