one 1.9.7 → 1.9.8
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/cli/build.cjs +25 -19
- package/dist/cjs/cli/build.js +36 -24
- package/dist/cjs/cli/build.js.map +2 -2
- package/dist/cjs/cli/build.native.js +153 -117
- package/dist/cjs/cli/build.native.js.map +1 -1
- package/dist/cjs/createApp.cjs +12 -1
- package/dist/cjs/createApp.js +11 -1
- package/dist/cjs/createApp.js.map +1 -1
- package/dist/cjs/createHandleRequest.cjs +1 -1
- package/dist/cjs/createHandleRequest.js +1 -1
- package/dist/cjs/createHandleRequest.js.map +1 -1
- package/dist/cjs/createHandleRequest.native.js +1 -1
- package/dist/cjs/createHandleRequest.native.js.map +1 -1
- package/dist/cjs/createHandleRequest.test.cjs +13 -7
- package/dist/cjs/createHandleRequest.test.js +6 -3
- package/dist/cjs/createHandleRequest.test.js.map +1 -1
- package/dist/cjs/createHandleRequest.test.native.js +13 -7
- package/dist/cjs/createHandleRequest.test.native.js.map +1 -1
- package/dist/cjs/notFoundState.cjs +103 -0
- package/dist/cjs/notFoundState.js +99 -0
- package/dist/cjs/notFoundState.js.map +6 -0
- package/dist/cjs/notFoundState.native.js +176 -0
- package/dist/cjs/notFoundState.native.js.map +1 -0
- package/dist/cjs/router/router.cjs +10 -3
- package/dist/cjs/router/router.js +9 -3
- package/dist/cjs/router/router.js.map +1 -1
- package/dist/cjs/router/router.native.js +10 -3
- package/dist/cjs/router/router.native.js.map +1 -1
- package/dist/cjs/server/oneServe.cjs +21 -16
- package/dist/cjs/server/oneServe.js +24 -15
- package/dist/cjs/server/oneServe.js.map +1 -1
- package/dist/cjs/server/oneServe.native.js +28 -26
- package/dist/cjs/server/oneServe.native.js.map +1 -1
- package/dist/cjs/useLoader.cjs +26 -9
- package/dist/cjs/useLoader.js +26 -11
- package/dist/cjs/useLoader.js.map +1 -1
- package/dist/cjs/useLoader.native.js +44 -17
- package/dist/cjs/useLoader.native.js.map +1 -1
- package/dist/cjs/utils/cleanUrl.cjs +2 -2
- package/dist/cjs/utils/cleanUrl.js +2 -2
- package/dist/cjs/utils/cleanUrl.js.map +1 -1
- package/dist/cjs/utils/cleanUrl.native.js +4 -2
- package/dist/cjs/utils/cleanUrl.native.js.map +1 -1
- package/dist/cjs/utils/cleanUrl.test.cjs +64 -0
- package/dist/cjs/utils/cleanUrl.test.js +72 -0
- package/dist/cjs/utils/cleanUrl.test.js.map +6 -0
- package/dist/cjs/utils/cleanUrl.test.native.js +67 -0
- package/dist/cjs/utils/cleanUrl.test.native.js.map +1 -0
- package/dist/cjs/utils/getPathnameFromFilePath.test.cjs +60 -0
- package/dist/cjs/utils/getPathnameFromFilePath.test.js +72 -0
- package/dist/cjs/utils/getPathnameFromFilePath.test.js.map +6 -0
- package/dist/cjs/utils/getPathnameFromFilePath.test.native.js +65 -0
- package/dist/cjs/utils/getPathnameFromFilePath.test.native.js.map +1 -0
- package/dist/cjs/views/Navigator.cjs +18 -3
- package/dist/cjs/views/Navigator.js +13 -4
- package/dist/cjs/views/Navigator.js.map +2 -2
- package/dist/cjs/views/Navigator.native.js +21 -6
- package/dist/cjs/views/Navigator.native.js.map +1 -1
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.cjs +23 -36
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.js +28 -34
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.js.map +1 -1
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.native.js +30 -40
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.native.js.map +1 -1
- package/dist/esm/cli/build.js +36 -24
- package/dist/esm/cli/build.js.map +2 -2
- package/dist/esm/cli/build.mjs +25 -19
- package/dist/esm/cli/build.mjs.map +1 -1
- package/dist/esm/cli/build.native.js +153 -117
- package/dist/esm/cli/build.native.js.map +1 -1
- package/dist/esm/createApp.js +11 -1
- package/dist/esm/createApp.js.map +1 -1
- package/dist/esm/createApp.mjs +12 -1
- package/dist/esm/createApp.mjs.map +1 -1
- package/dist/esm/createHandleRequest.js +1 -1
- package/dist/esm/createHandleRequest.js.map +1 -1
- package/dist/esm/createHandleRequest.mjs +1 -1
- package/dist/esm/createHandleRequest.mjs.map +1 -1
- package/dist/esm/createHandleRequest.native.js +1 -1
- package/dist/esm/createHandleRequest.native.js.map +1 -1
- package/dist/esm/createHandleRequest.test.js +6 -3
- package/dist/esm/createHandleRequest.test.js.map +1 -1
- package/dist/esm/createHandleRequest.test.mjs +13 -7
- package/dist/esm/createHandleRequest.test.mjs.map +1 -1
- package/dist/esm/createHandleRequest.test.native.js +13 -7
- package/dist/esm/createHandleRequest.test.native.js.map +1 -1
- package/dist/esm/notFoundState.js +75 -0
- package/dist/esm/notFoundState.js.map +6 -0
- package/dist/esm/notFoundState.mjs +64 -0
- package/dist/esm/notFoundState.mjs.map +1 -0
- package/dist/esm/notFoundState.native.js +134 -0
- package/dist/esm/notFoundState.native.js.map +1 -0
- package/dist/esm/router/router.js +13 -2
- package/dist/esm/router/router.js.map +1 -1
- package/dist/esm/router/router.mjs +9 -2
- package/dist/esm/router/router.mjs.map +1 -1
- package/dist/esm/router/router.native.js +9 -2
- package/dist/esm/router/router.native.js.map +1 -1
- package/dist/esm/server/oneServe.js +24 -15
- package/dist/esm/server/oneServe.js.map +1 -1
- package/dist/esm/server/oneServe.mjs +21 -16
- package/dist/esm/server/oneServe.mjs.map +1 -1
- package/dist/esm/server/oneServe.native.js +28 -26
- package/dist/esm/server/oneServe.native.js.map +1 -1
- package/dist/esm/useLoader.js +27 -11
- package/dist/esm/useLoader.js.map +1 -1
- package/dist/esm/useLoader.mjs +27 -10
- package/dist/esm/useLoader.mjs.map +1 -1
- package/dist/esm/useLoader.native.js +45 -18
- package/dist/esm/useLoader.native.js.map +1 -1
- package/dist/esm/utils/cleanUrl.js +2 -2
- package/dist/esm/utils/cleanUrl.js.map +1 -1
- package/dist/esm/utils/cleanUrl.mjs +2 -2
- package/dist/esm/utils/cleanUrl.mjs.map +1 -1
- package/dist/esm/utils/cleanUrl.native.js +4 -2
- package/dist/esm/utils/cleanUrl.native.js.map +1 -1
- package/dist/esm/utils/cleanUrl.test.js +73 -0
- package/dist/esm/utils/cleanUrl.test.js.map +6 -0
- package/dist/esm/utils/cleanUrl.test.mjs +65 -0
- package/dist/esm/utils/cleanUrl.test.mjs.map +1 -0
- package/dist/esm/utils/cleanUrl.test.native.js +65 -0
- package/dist/esm/utils/cleanUrl.test.native.js.map +1 -0
- package/dist/esm/utils/getPathnameFromFilePath.test.js +73 -0
- package/dist/esm/utils/getPathnameFromFilePath.test.js.map +6 -0
- package/dist/esm/utils/getPathnameFromFilePath.test.mjs +61 -0
- package/dist/esm/utils/getPathnameFromFilePath.test.mjs.map +1 -0
- package/dist/esm/utils/getPathnameFromFilePath.test.native.js +63 -0
- package/dist/esm/utils/getPathnameFromFilePath.test.native.js.map +1 -0
- package/dist/esm/views/Navigator.js +16 -1
- package/dist/esm/views/Navigator.js.map +1 -1
- package/dist/esm/views/Navigator.mjs +16 -1
- package/dist/esm/views/Navigator.mjs.map +1 -1
- package/dist/esm/views/Navigator.native.js +18 -3
- package/dist/esm/views/Navigator.native.js.map +1 -1
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.js +28 -34
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.js.map +1 -1
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.mjs +23 -36
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.mjs.map +1 -1
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.native.js +30 -40
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.native.js.map +1 -1
- package/package.json +9 -9
- package/src/cli/build.ts +43 -30
- package/src/createApp.tsx +22 -0
- package/src/createHandleRequest.test.ts +11 -3
- package/src/createHandleRequest.ts +3 -1
- package/src/notFoundState.ts +158 -0
- package/src/router/router.ts +15 -1
- package/src/server/oneServe.ts +37 -14
- package/src/useLoader.ts +25 -12
- package/src/utils/cleanUrl.test.ts +120 -0
- package/src/utils/cleanUrl.ts +12 -11
- package/src/utils/getPathnameFromFilePath.test.ts +118 -0
- package/src/views/Navigator.tsx +28 -0
- package/src/vite/plugins/fileSystemRouterPlugin.tsx +31 -45
- package/types/cli/build.d.ts.map +1 -1
- package/types/createApp.d.ts.map +1 -1
- package/types/createHandleRequest.d.ts.map +1 -1
- package/types/notFoundState.d.ts +13 -0
- package/types/notFoundState.d.ts.map +1 -0
- package/types/router/router.d.ts.map +1 -1
- package/types/server/oneServe.d.ts.map +1 -1
- package/types/useLoader.d.ts.map +1 -1
- package/types/utils/cleanUrl.d.ts.map +1 -1
- package/types/utils/cleanUrl.test.d.ts +2 -0
- package/types/utils/cleanUrl.test.d.ts.map +1 -0
- package/types/utils/getPathnameFromFilePath.test.d.ts +2 -0
- package/types/utils/getPathnameFromFilePath.test.d.ts.map +1 -0
- package/types/views/Navigator.d.ts +2 -2
- package/types/views/Navigator.d.ts.map +1 -1
- package/types/vite/plugins/fileSystemRouterPlugin.d.ts.map +1 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/useLoader.ts"],
|
|
4
|
-
"mappings": "AAAA,SAAS,aAAa,4BAA4B;AAClD,SAAS,gCAAgC;AACzC,SAAS,WAAW,mBAAmB;AACvC,SAAS,cAAc;AACvB,SAAS,qBAAqB,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["preloadedData", "pathname", "startTime", "loaderJSUrl", "moduleLoadStart", "module", "moduleLoadTime", "executionStart", "result", "executionTime", "totalTime", "promise", "loader", "data"]
|
|
6
6
|
}
|
package/dist/esm/useLoader.mjs
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { useCallback, useSyncExternalStore } from "react";
|
|
2
2
|
import { registerDevtoolsFunction } from "./devtools/registry.mjs";
|
|
3
3
|
import { useParams, usePathname } from "./hooks.mjs";
|
|
4
|
+
import { findNearestNotFoundRoute, setNotFoundState } from "./notFoundState.mjs";
|
|
4
5
|
import { router } from "./router/imperative-api.mjs";
|
|
5
|
-
import { preloadedLoaderData, preloadingLoader } from "./router/router.mjs";
|
|
6
|
+
import { preloadedLoaderData, preloadingLoader, routeNode } from "./router/router.mjs";
|
|
6
7
|
import { getLoaderPath } from "./utils/cleanUrl.mjs";
|
|
7
8
|
import { dynamicImport } from "./utils/dynamicImport.mjs";
|
|
8
9
|
import { weakKey } from "./utils/weakKey.mjs";
|
|
@@ -100,7 +101,13 @@ async function refetchLoader(pathname2) {
|
|
|
100
101
|
executionTime: executionTime2,
|
|
101
102
|
totalTime: totalTime2,
|
|
102
103
|
source: "refetch"
|
|
103
|
-
})
|
|
104
|
+
});
|
|
105
|
+
const notFoundRoute = findNearestNotFoundRoute(pathname2, routeNode);
|
|
106
|
+
setNotFoundState({
|
|
107
|
+
notFoundPath: result2.__oneNotFoundPath || "/+not-found",
|
|
108
|
+
notFoundRouteNode: notFoundRoute || void 0,
|
|
109
|
+
originalPath: pathname2
|
|
110
|
+
});
|
|
104
111
|
return;
|
|
105
112
|
}
|
|
106
113
|
updateState(pathname2, {
|
|
@@ -208,14 +215,24 @@ function useLoaderState(loader) {
|
|
|
208
215
|
}), router.replace(result.__oneRedirect);
|
|
209
216
|
return;
|
|
210
217
|
}
|
|
211
|
-
result?.__oneError === 404
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
218
|
+
if (result?.__oneError === 404) {
|
|
219
|
+
recordLoaderTiming?.({
|
|
220
|
+
path: currentPath,
|
|
221
|
+
startTime,
|
|
222
|
+
moduleLoadTime,
|
|
223
|
+
executionTime,
|
|
224
|
+
totalTime,
|
|
225
|
+
source: "initial"
|
|
226
|
+
});
|
|
227
|
+
const notFoundRoute = findNearestNotFoundRoute(currentPath, routeNode);
|
|
228
|
+
setNotFoundState({
|
|
229
|
+
notFoundPath: result.__oneNotFoundPath || "/+not-found",
|
|
230
|
+
notFoundRouteNode: notFoundRoute || void 0,
|
|
231
|
+
originalPath: currentPath
|
|
232
|
+
});
|
|
233
|
+
return;
|
|
234
|
+
}
|
|
235
|
+
updateState(currentPath, {
|
|
219
236
|
data: result,
|
|
220
237
|
hasLoadedOnce: !0,
|
|
221
238
|
promise: void 0
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useCallback","useSyncExternalStore","registerDevtoolsFunction","useParams","usePathname","router","preloadedLoaderData","preloadingLoader","getLoaderPath","dynamicImport","weakKey","useServerContext","loaderTimingHistory","MAX_TIMING_HISTORY","recordLoaderTiming","process","env","NODE_ENV","entry","unshift","length","pop","window","CustomEvent","dispatchEvent","detail","error","message","name","route","pathname","path","timestamp","Date","now","type","getLoaderTimingHistory","loaderState","subscribers","Set","updateState","updates","forEach","callback","subscribe","add","delete","getLoaderState","preloadedData2","data","promise","state","hasLoadedOnce","refetchLoader","pathname2","startTime2","performance","cacheBust","loaderJSUrl2","moduleLoadStart2","module2","catch","moduleLoadTime2","loader","executionStart2","result2","executionTime2","totalTime2","__oneRedirect","startTime","moduleLoadTime","executionTime","totalTime","source","replace","__oneError","__oneNotFoundPath","err","Error","String","__oneRefetchLoader","useLoaderState","loaderProps","loaderPropsFromServerContext","loaderData","loaderDataFromServerContext","params","currentPath","useAsyncFn","refetch","serverContextPath","preloadedData","loaderStateEntry","resolvedPreloadData","promise2","then","val","console","loadData","loaderJSUrl","moduleLoadStart","module","executionStart","result","Promise","useLoader","loader2","data2","results","Map","started","resetLoaderState","clear","props","key","JSON","stringify","get","set","next","final","current"],"sources":["../../src/useLoader.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["useCallback","useSyncExternalStore","registerDevtoolsFunction","useParams","usePathname","findNearestNotFoundRoute","setNotFoundState","router","preloadedLoaderData","preloadingLoader","routeNode","getLoaderPath","dynamicImport","weakKey","useServerContext","loaderTimingHistory","MAX_TIMING_HISTORY","recordLoaderTiming","process","env","NODE_ENV","entry","unshift","length","pop","window","CustomEvent","dispatchEvent","detail","error","message","name","route","pathname","path","timestamp","Date","now","type","getLoaderTimingHistory","loaderState","subscribers","Set","updateState","updates","forEach","callback","subscribe","add","delete","getLoaderState","preloadedData2","data","promise","state","hasLoadedOnce","refetchLoader","pathname2","startTime2","performance","cacheBust","loaderJSUrl2","moduleLoadStart2","module2","catch","moduleLoadTime2","loader","executionStart2","result2","executionTime2","totalTime2","__oneRedirect","startTime","moduleLoadTime","executionTime","totalTime","source","replace","__oneError","notFoundRoute","notFoundPath","__oneNotFoundPath","notFoundRouteNode","originalPath","err","Error","String","__oneRefetchLoader","useLoaderState","loaderProps","loaderPropsFromServerContext","loaderData","loaderDataFromServerContext","params","currentPath","useAsyncFn","refetch","serverContextPath","preloadedData","loaderStateEntry","resolvedPreloadData","promise2","then","val","console","loadData","loaderJSUrl","moduleLoadStart","module","executionStart","result","useLoader","loader2","data2","results","Map","started","resetLoaderState","clear","props","key","JSON","stringify","get","set","next","Promise","final","current"],"sources":["../../src/useLoader.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { useCallback, useSyncExternalStore } from "react";
|
|
2
2
|
import { registerDevtoolsFunction } from "./devtools/registry.native.js";
|
|
3
3
|
import { useParams, usePathname } from "./hooks.native.js";
|
|
4
|
+
import { findNearestNotFoundRoute, setNotFoundState } from "./notFoundState.native.js";
|
|
4
5
|
import { router } from "./router/imperative-api.native.js";
|
|
5
|
-
import { preloadedLoaderData, preloadingLoader } from "./router/router.native.js";
|
|
6
|
+
import { preloadedLoaderData, preloadingLoader, routeNode } from "./router/router.native.js";
|
|
6
7
|
import { getLoaderPath } from "./utils/cleanUrl.native.js";
|
|
7
8
|
import { dynamicImport } from "./utils/dynamicImport.native.js";
|
|
8
9
|
import { weakKey } from "./utils/weakKey.native.js";
|
|
@@ -108,7 +109,13 @@ async function refetchLoader(pathname2) {
|
|
|
108
109
|
executionTime: executionTime2,
|
|
109
110
|
totalTime: totalTime2,
|
|
110
111
|
source: "refetch"
|
|
111
|
-
})
|
|
112
|
+
});
|
|
113
|
+
var notFoundRoute2 = findNearestNotFoundRoute(pathname2, routeNode);
|
|
114
|
+
setNotFoundState({
|
|
115
|
+
notFoundPath: result2.__oneNotFoundPath || "/+not-found",
|
|
116
|
+
notFoundRouteNode: notFoundRoute2 || void 0,
|
|
117
|
+
originalPath: pathname2
|
|
118
|
+
});
|
|
112
119
|
return;
|
|
113
120
|
}
|
|
114
121
|
updateState(pathname2, {
|
|
@@ -225,14 +232,24 @@ function useLoaderState(loader) {
|
|
|
225
232
|
}), router.replace(data.__oneRedirect);
|
|
226
233
|
return;
|
|
227
234
|
}
|
|
228
|
-
data?.__oneError === 404
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
235
|
+
if (data?.__oneError === 404) {
|
|
236
|
+
recordLoaderTiming?.({
|
|
237
|
+
path: currentPath,
|
|
238
|
+
startTime,
|
|
239
|
+
moduleLoadTime,
|
|
240
|
+
executionTime,
|
|
241
|
+
totalTime,
|
|
242
|
+
source: "initial"
|
|
243
|
+
});
|
|
244
|
+
var notFoundRoute = findNearestNotFoundRoute(currentPath, routeNode);
|
|
245
|
+
setNotFoundState({
|
|
246
|
+
notFoundPath: data.__oneNotFoundPath || "/+not-found",
|
|
247
|
+
notFoundRouteNode: notFoundRoute || void 0,
|
|
248
|
+
originalPath: currentPath
|
|
249
|
+
});
|
|
250
|
+
return;
|
|
251
|
+
}
|
|
252
|
+
updateState(currentPath, {
|
|
236
253
|
data,
|
|
237
254
|
hasLoadedOnce: !0,
|
|
238
255
|
promise: void 0
|
|
@@ -292,14 +309,24 @@ function useLoaderState(loader) {
|
|
|
292
309
|
}), router.replace(result.__oneRedirect);
|
|
293
310
|
return;
|
|
294
311
|
}
|
|
295
|
-
result?.__oneError === 404
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
312
|
+
if (result?.__oneError === 404) {
|
|
313
|
+
recordLoaderTiming?.({
|
|
314
|
+
path: currentPath,
|
|
315
|
+
startTime,
|
|
316
|
+
moduleLoadTime,
|
|
317
|
+
executionTime,
|
|
318
|
+
totalTime,
|
|
319
|
+
source: "initial"
|
|
320
|
+
});
|
|
321
|
+
var notFoundRoute = findNearestNotFoundRoute(currentPath, routeNode);
|
|
322
|
+
setNotFoundState({
|
|
323
|
+
notFoundPath: result.__oneNotFoundPath || "/+not-found",
|
|
324
|
+
notFoundRouteNode: notFoundRoute || void 0,
|
|
325
|
+
originalPath: currentPath
|
|
326
|
+
});
|
|
327
|
+
return;
|
|
328
|
+
}
|
|
329
|
+
updateState(currentPath, {
|
|
303
330
|
data: result,
|
|
304
331
|
hasLoadedOnce: !0,
|
|
305
332
|
promise: void 0
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useCallback","useSyncExternalStore","registerDevtoolsFunction","useParams","usePathname","router","preloadedLoaderData","preloadingLoader","getLoaderPath","dynamicImport","weakKey","useServerContext","_instanceof","left","right","Symbol","hasInstance","loaderTimingHistory","MAX_TIMING_HISTORY","recordLoaderTiming","process","env","NODE_ENV","entry","unshift","length","pop","window","CustomEvent","dispatchEvent","detail","error","message","name","route","pathname","path","timestamp","Date","now","type","getLoaderTimingHistory","loaderState","subscribers","Set","updateState","updates","forEach","callback","subscribe","add","delete","getLoaderState","preloadedData2","data","promise","state","hasLoadedOnce","refetchLoader","module","pathname2","startTime2","performance","_dynamicImport2","cacheBust","loaderJSUrl2","moduleLoadStart2","module2","catch","moduleLoadTime2","loader","executionStart2","result2","executionTime2","totalTime2","__oneRedirect","startTime","moduleLoadTime","executionTime","totalTime","source","replace","__oneError","__oneNotFoundPath","err","totalTime1","Error","String","__oneRefetchLoader","useLoaderState","loaderProps","loaderPropsFromServerContext","loaderData","loaderDataFromServerContext","params","currentPath","serverData","useAsyncFn","refetch","serverContextPath","preloadedData","loaderStateEntry","resolvedPreloadData","preloadPromise","then","val","console","loadData","_dynamicImport","loaderJSUrl","nativeLoaderJSUrl","moduleLoadStart","loaderJsCodeResp","fetch","ok","status","loaderJsCode","text","result","eval","executionStart","
|
|
1
|
+
{"version":3,"names":["useCallback","useSyncExternalStore","registerDevtoolsFunction","useParams","usePathname","findNearestNotFoundRoute","setNotFoundState","router","preloadedLoaderData","preloadingLoader","routeNode","getLoaderPath","dynamicImport","weakKey","useServerContext","_instanceof","left","right","Symbol","hasInstance","loaderTimingHistory","MAX_TIMING_HISTORY","recordLoaderTiming","process","env","NODE_ENV","entry","unshift","length","pop","window","CustomEvent","dispatchEvent","detail","error","message","name","route","pathname","path","timestamp","Date","now","type","getLoaderTimingHistory","loaderState","subscribers","Set","updateState","updates","forEach","callback","subscribe","add","delete","getLoaderState","preloadedData2","data","promise","state","hasLoadedOnce","refetchLoader","module","pathname2","startTime2","performance","_dynamicImport2","cacheBust","loaderJSUrl2","moduleLoadStart2","module2","catch","moduleLoadTime2","loader","executionStart2","result2","executionTime2","totalTime2","__oneRedirect","startTime","moduleLoadTime","executionTime","totalTime","source","replace","__oneError","notFoundRoute2","notFoundPath","__oneNotFoundPath","notFoundRouteNode","originalPath","err","totalTime1","Error","String","__oneRefetchLoader","useLoaderState","loaderProps","loaderPropsFromServerContext","loaderData","loaderDataFromServerContext","params","currentPath","serverData","useAsyncFn","refetch","serverContextPath","preloadedData","loaderStateEntry","resolvedPreloadData","preloadPromise","then","val","console","loadData","_dynamicImport","loaderJSUrl","nativeLoaderJSUrl","moduleLoadStart","loaderJsCodeResp","fetch","ok","status","loaderJsCode","text","result","eval","executionStart","notFoundRoute","e"],"sources":["../../src/useLoader.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -8,7 +8,7 @@ import {
|
|
|
8
8
|
import { getURL } from "../getURL";
|
|
9
9
|
import { removeSearch } from "./removeSearch";
|
|
10
10
|
function cleanUrl(path) {
|
|
11
|
-
return removeSearch(path).replaceAll("
|
|
11
|
+
return removeSearch(path).replace(/\/$/, "").replaceAll("_", "__").replaceAll("/", "_");
|
|
12
12
|
}
|
|
13
13
|
const isClient = typeof window < "u", clientSideURL = isClient ? getURL() : "";
|
|
14
14
|
function getPreloadPath(currentPath) {
|
|
@@ -22,7 +22,7 @@ function getLoaderPath(currentPath, includeUrl = isNative, cacheBust) {
|
|
|
22
22
|
return `${baseURL}${devPath}/assets/${cleanedUrl}${cacheBustSegment}${LOADER_JS_POSTFIX}`;
|
|
23
23
|
}
|
|
24
24
|
function getPathFromLoaderPath(loaderPath) {
|
|
25
|
-
return loaderPath.replace(LOADER_JS_POSTFIX_REGEX, "").replace(/^(\/_one)?\/assets/, "").replace(/_refetch_\d+_/, "").
|
|
25
|
+
return loaderPath.replace(LOADER_JS_POSTFIX_REGEX, "").replace(/^(\/_one)?\/assets/, "").replace(/_refetch_\d+_/, "").replace(/__|_/g, (match) => match === "__" ? "_" : "/");
|
|
26
26
|
}
|
|
27
27
|
export {
|
|
28
28
|
getLoaderPath,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/utils/cleanUrl.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,cAAc;AACvB,SAAS,oBAAoB;AAE7B,SAAS,SAAS,MAAc;AAC9B,
|
|
4
|
+
"mappings": "AAAA;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,cAAc;AACvB,SAAS,oBAAoB;AAE7B,SAAS,SAAS,MAAc;AAC9B,SAAO,aAAa,IAAI,EACrB,QAAQ,OAAO,EAAE,EACjB,WAAW,KAAK,IAAI,EACpB,WAAW,KAAK,GAAG;AACxB;AAEA,MAAM,WAAW,OAAO,SAAW,KAC7B,gBAAgB,WAAW,OAAO,IAAI;AAErC,SAAS,eAAe,aAAqB;AAClD,SAAO,GAAG,aAAa,WAAW,SAAS,YAAY,MAAM,CAAC,CAAC,CAAC,GAAG,kBAAkB;AACvF;AAEO,SAAS,kBAAkB,aAAqB;AACrD,SAAO,GAAG,aAAa,WAAW,SAAS,YAAY,MAAM,CAAC,CAAC,CAAC,GAAG,sBAAsB;AAC3F;AAEO,SAAS,cACd,aACA,aAAa,UACb,WACA;AACA,QAAM,UAAU,aAAa,OAAO,IAAI,IAClC,UAAU,QAAQ,IAAI,aAAa,gBAAgB,UAAU,IAE7D,iBAAiB,IAAI,IAAI,aAAa,oBAAoB,GAE1D,aAAa,SAAS,eAAe,SAAS,MAAM,CAAC,CAAC,GACtD,mBAAmB,YAAY,YAAY,SAAS,MAAM;AAEhE,SAAO,GAAG,OAAO,GAAG,OAAO,WAAW,UAAU,GAAG,gBAAgB,GAAG,iBAAiB;AACzF;AAEO,SAAS,sBAAsB,YAAoB;AACxD,SACE,WACG,QAAQ,yBAAyB,EAAE,EACnC,QAAQ,sBAAsB,EAAE,EAChC,QAAQ,iBAAiB,EAAE,EAE3B,QAAQ,SAAS,CAAC,UAAW,UAAU,OAAO,MAAM,GAAI;AAE/D;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -2,7 +2,7 @@ import { CSS_PRELOAD_JS_POSTFIX, isNative, LOADER_JS_POSTFIX, LOADER_JS_POSTFIX_
|
|
|
2
2
|
import { getURL } from "../getURL.mjs";
|
|
3
3
|
import { removeSearch } from "./removeSearch.mjs";
|
|
4
4
|
function cleanUrl(path) {
|
|
5
|
-
return removeSearch(path).replaceAll("
|
|
5
|
+
return removeSearch(path).replace(/\/$/, "").replaceAll("_", "__").replaceAll("/", "_");
|
|
6
6
|
}
|
|
7
7
|
const isClient = typeof window < "u",
|
|
8
8
|
clientSideURL = isClient ? getURL() : "";
|
|
@@ -21,7 +21,7 @@ function getLoaderPath(currentPath, includeUrl = isNative, cacheBust) {
|
|
|
21
21
|
return `${baseURL}${devPath}/assets/${cleanedUrl}${cacheBustSegment}${LOADER_JS_POSTFIX}`;
|
|
22
22
|
}
|
|
23
23
|
function getPathFromLoaderPath(loaderPath) {
|
|
24
|
-
return loaderPath.replace(LOADER_JS_POSTFIX_REGEX, "").replace(/^(\/_one)?\/assets/, "").replace(/_refetch_\d+_/, "").
|
|
24
|
+
return loaderPath.replace(LOADER_JS_POSTFIX_REGEX, "").replace(/^(\/_one)?\/assets/, "").replace(/_refetch_\d+_/, "").replace(/__|_/g, match => match === "__" ? "_" : "/");
|
|
25
25
|
}
|
|
26
26
|
export { getLoaderPath, getPathFromLoaderPath, getPreloadCSSPath, getPreloadPath };
|
|
27
27
|
//# sourceMappingURL=cleanUrl.mjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["CSS_PRELOAD_JS_POSTFIX","isNative","LOADER_JS_POSTFIX","LOADER_JS_POSTFIX_REGEX","PRELOAD_JS_POSTFIX","getURL","removeSearch","cleanUrl","path","
|
|
1
|
+
{"version":3,"names":["CSS_PRELOAD_JS_POSTFIX","isNative","LOADER_JS_POSTFIX","LOADER_JS_POSTFIX_REGEX","PRELOAD_JS_POSTFIX","getURL","removeSearch","cleanUrl","path","replace","replaceAll","isClient","window","clientSideURL","getPreloadPath","currentPath","slice","getPreloadCSSPath","getLoaderPath","includeUrl","cacheBust","baseURL","devPath","process","env","NODE_ENV","currentPathUrl","URL","cleanedUrl","pathname","cacheBustSegment","getPathFromLoaderPath","loaderPath","match"],"sources":["../../../src/utils/cleanUrl.ts"],"sourcesContent":[null],"mappings":"AAAA,SACEA,sBAAA,EACAC,QAAA,EACAC,iBAAA,EACAC,uBAAA,EACAC,kBAAA,QACK;AACP,SAASC,MAAA,QAAc;AACvB,SAASC,YAAA,QAAoB;AAE7B,SAASC,SAASC,IAAA,EAAc;EAC9B,OAAOF,YAAA,CAAaE,IAAI,EACrBC,OAAA,CAAQ,OAAO,EAAE,EACjBC,UAAA,CAAW,KAAK,IAAI,EACpBA,UAAA,CAAW,KAAK,GAAG;AACxB;AAEA,MAAMC,QAAA,GAAW,OAAOC,MAAA,GAAW;EAC7BC,aAAA,GAAgBF,QAAA,GAAWN,MAAA,CAAO,IAAI;AAErC,SAASS,eAAeC,WAAA,EAAqB;EAClD,OAAO,GAAGF,aAAa,WAAWN,QAAA,CAASQ,WAAA,CAAYC,KAAA,CAAM,CAAC,CAAC,CAAC,GAAGZ,kBAAkB;AACvF;AAEO,SAASa,kBAAkBF,WAAA,EAAqB;EACrD,OAAO,GAAGF,aAAa,WAAWN,QAAA,CAASQ,WAAA,CAAYC,KAAA,CAAM,CAAC,CAAC,CAAC,GAAGhB,sBAAsB;AAC3F;AAEO,SAASkB,cACdH,WAAA,EACAI,UAAA,GAAalB,QAAA,EACbmB,SAAA,EACA;EACA,MAAMC,OAAA,GAAUF,UAAA,GAAad,MAAA,CAAO,IAAI;IAClCiB,OAAA,GAAUC,OAAA,CAAQC,GAAA,CAAIC,QAAA,KAAa,gBAAgB,UAAU;IAE7DC,cAAA,GAAiB,IAAIC,GAAA,CAAIZ,WAAA,EAAa,oBAAoB;IAE1Da,UAAA,GAAarB,QAAA,CAASmB,cAAA,CAAeG,QAAA,CAASb,KAAA,CAAM,CAAC,CAAC;IACtDc,gBAAA,GAAmBV,SAAA,GAAY,YAAYA,SAAS,MAAM;EAEhE,OAAO,GAAGC,OAAO,GAAGC,OAAO,WAAWM,UAAU,GAAGE,gBAAgB,GAAG5B,iBAAiB;AACzF;AAEO,SAAS6B,sBAAsBC,UAAA,EAAoB;EACxD,OACEA,UAAA,CACGvB,OAAA,CAAQN,uBAAA,EAAyB,EAAE,EACnCM,OAAA,CAAQ,sBAAsB,EAAE,EAChCA,OAAA,CAAQ,iBAAiB,EAAE,EAE3BA,OAAA,CAAQ,SAAUwB,KAAA,IAAWA,KAAA,KAAU,OAAO,MAAM,GAAI;AAE/D","ignoreList":[]}
|
|
@@ -2,7 +2,7 @@ import { CSS_PRELOAD_JS_POSTFIX, isNative, LOADER_JS_POSTFIX, LOADER_JS_POSTFIX_
|
|
|
2
2
|
import { getURL } from "../getURL.native.js";
|
|
3
3
|
import { removeSearch } from "./removeSearch.native.js";
|
|
4
4
|
function cleanUrl(path) {
|
|
5
|
-
return removeSearch(path).replaceAll("
|
|
5
|
+
return removeSearch(path).replace(/\/$/, "").replaceAll("_", "__").replaceAll("/", "_");
|
|
6
6
|
}
|
|
7
7
|
var isClient = typeof window < "u",
|
|
8
8
|
clientSideURL = isClient ? getURL() : "";
|
|
@@ -23,7 +23,9 @@ function getLoaderPath(currentPath) {
|
|
|
23
23
|
return `${baseURL}${devPath}/assets/${cleanedUrl}${cacheBustSegment}${LOADER_JS_POSTFIX}`;
|
|
24
24
|
}
|
|
25
25
|
function getPathFromLoaderPath(loaderPath) {
|
|
26
|
-
return loaderPath.replace(LOADER_JS_POSTFIX_REGEX, "").replace(/^(\/_one)?\/assets/, "").replace(/_refetch_\d+_/, "").
|
|
26
|
+
return loaderPath.replace(LOADER_JS_POSTFIX_REGEX, "").replace(/^(\/_one)?\/assets/, "").replace(/_refetch_\d+_/, "").replace(/__|_/g, function (match) {
|
|
27
|
+
return match === "__" ? "_" : "/";
|
|
28
|
+
});
|
|
27
29
|
}
|
|
28
30
|
export { getLoaderPath, getPathFromLoaderPath, getPreloadCSSPath, getPreloadPath };
|
|
29
31
|
//# sourceMappingURL=cleanUrl.native.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["CSS_PRELOAD_JS_POSTFIX","isNative","LOADER_JS_POSTFIX","LOADER_JS_POSTFIX_REGEX","PRELOAD_JS_POSTFIX","getURL","removeSearch","cleanUrl","path","
|
|
1
|
+
{"version":3,"names":["CSS_PRELOAD_JS_POSTFIX","isNative","LOADER_JS_POSTFIX","LOADER_JS_POSTFIX_REGEX","PRELOAD_JS_POSTFIX","getURL","removeSearch","cleanUrl","path","replace","replaceAll","isClient","window","clientSideURL","getPreloadPath","currentPath","slice","getPreloadCSSPath","getLoaderPath","includeUrl","arguments","length","cacheBust","baseURL","devPath","process","env","NODE_ENV","currentPathUrl","URL","cleanedUrl","pathname","cacheBustSegment","getPathFromLoaderPath","loaderPath","match"],"sources":["../../../src/utils/cleanUrl.ts"],"sourcesContent":[null],"mappings":"AAAA,SAAAA,sBAAA,EAAAC,QAAA,EAAAC,iBAAA,EAAAC,uBAAA,EAAAC,kBAAA;AAAA,SACEC,MAAA;AAAA,SACAC,YAAA;AAAA,SACAC,SAAAC,IAAA;EACA,OAAAF,YAAA,CAAAE,IAAA,EAAAC,OAAA,YAAAC,UAAA,YAAAA,UAAA;AAAA;AACA,IAAAC,QACK,UAAAC,MAAA;EAAAC,aAAA,GAAAF,QAAA,GAAAN,MAAA;AACP,SAASS,cAAcA,CAAAC,WAAA;EACvB,OAAS,GAAAF,aAAA,WAAoBN,QAAA,CAAAQ,WAAA,CAAAC,KAAA,OAAAZ,kBAAA;AAE7B;AACE,SAAOa,iBAAiBA,CAAAF,WACb;EAGb,UAAAF,aAAA,WAAAN,QAAA,CAAAQ,WAAA,CAAAC,KAAA,OAAAhB,sBAAA;AAEA;AAGO,SAASkB,cAAAH,WAAe;EAC7B,IAAAI,UAAU,GAAAC,SAAa,CAAAC,MAAA,GAAW,KAAAD,SAAS,QAAY,KAAQ,CAAC,GAAGA,SAAA,MAAAnB,QAAkB;IAAAqB,SAAA,GAAAF,SAAA,CAAAC,MAAA,OAAAD,SAAA;IAAAG,OAAA,GAAAJ,UAAA,GAAAd,MAAA;IAAAmB,OAAA,GAAAC,OAAA,CAAAC,GAAA,CAAAC,QAAA;IAAAC,cAAA,OAAAC,GAAA,CAAAd,WAAA;IAAAe,UAAA,GAAAvB,QAAA,CAAAqB,cAAA,CAAAG,QAAA,CAAAf,KAAA;IAAAgB,gBAAA,GAAAV,SAAA,eAAAA,SAAA;EACvF,UAAAC,OAAA,GAAAC,OAAA,WAAAM,UAAA,GAAAE,gBAAA,GAAA9B,iBAAA;AAEO;AACL,SAAO+B,qBAAgBA,CAAAC,UAAW;EACpC,OAAAA,UAAA,CAAAzB,OAAA,CAAAN,uBAAA,MAAAM,OAAA,2BAAAA,OAAA,sBAAAA,OAAA,oBAAA0B,KAAA;IAEO,OAASA,KAAA,SACd,YACA;EAGA;AAQA;AACF,SAEOjB,aAAS,EACde,qBAEK,EAMPhB,iBAAA,E","ignoreList":[]}
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
import { describe, expect, it } from "vitest";
|
|
2
|
+
import { getLoaderPath, getPathFromLoaderPath } from "./cleanUrl";
|
|
3
|
+
function roundtrip(path) {
|
|
4
|
+
const loaderPath = getLoaderPath(path, !1);
|
|
5
|
+
return getPathFromLoaderPath(loaderPath);
|
|
6
|
+
}
|
|
7
|
+
describe("cleanUrl roundtrip", () => {
|
|
8
|
+
it("simple path", () => {
|
|
9
|
+
expect(roundtrip("/docs/getting-started")).toBe("/docs/getting-started");
|
|
10
|
+
}), it("path with underscore prefix (/_/docs)", () => {
|
|
11
|
+
expect(roundtrip("/_/docs/getting-started")).toBe("/_/docs/getting-started");
|
|
12
|
+
}), it("path with underscore prefix (/_/terms)", () => {
|
|
13
|
+
expect(roundtrip("/_/terms")).toBe("/_/terms");
|
|
14
|
+
}), it("path with underscore in segment name", () => {
|
|
15
|
+
expect(roundtrip("/my_page/test")).toBe("/my_page/test");
|
|
16
|
+
}), it("deeply nested path", () => {
|
|
17
|
+
expect(roundtrip("/deep/nested/path/here")).toBe("/deep/nested/path/here");
|
|
18
|
+
}), it("root path", () => {
|
|
19
|
+
expect(roundtrip("/")).toBe("/");
|
|
20
|
+
}), it("single segment", () => {
|
|
21
|
+
expect(roundtrip("/about")).toBe("/about");
|
|
22
|
+
}), it("path with query string is stripped", () => {
|
|
23
|
+
const loaderPath = getLoaderPath("/docs/intro?foo=bar", !1);
|
|
24
|
+
expect(getPathFromLoaderPath(loaderPath)).toBe("/docs/intro");
|
|
25
|
+
}), it("path with hash is stripped", () => {
|
|
26
|
+
const loaderPath = getLoaderPath("/docs/intro#section", !1);
|
|
27
|
+
expect(getPathFromLoaderPath(loaderPath)).toBe("/docs/intro");
|
|
28
|
+
}), it("path with trailing slash", () => {
|
|
29
|
+
const loaderPath = getLoaderPath("/docs/intro/", !1);
|
|
30
|
+
expect(getPathFromLoaderPath(loaderPath)).toBe("/docs/intro");
|
|
31
|
+
});
|
|
32
|
+
});
|
|
33
|
+
describe("getLoaderPath format", () => {
|
|
34
|
+
it("includes /assets/ prefix", () => {
|
|
35
|
+
const result = getLoaderPath("/docs/intro", !1);
|
|
36
|
+
expect(result).toMatch(/^\/assets\//);
|
|
37
|
+
}), it("ends with loader postfix", () => {
|
|
38
|
+
const result = getLoaderPath("/docs/intro", !1);
|
|
39
|
+
expect(result).toMatch(/_\d+_vxrn_loader\.js$/);
|
|
40
|
+
}), it("includes /_one prefix in dev mode", () => {
|
|
41
|
+
const originalEnv = process.env.NODE_ENV;
|
|
42
|
+
process.env.NODE_ENV = "development";
|
|
43
|
+
try {
|
|
44
|
+
const result = getLoaderPath("/docs/intro", !1);
|
|
45
|
+
expect(result).toMatch(/^\/_one\/assets\//);
|
|
46
|
+
} finally {
|
|
47
|
+
process.env.NODE_ENV = originalEnv;
|
|
48
|
+
}
|
|
49
|
+
}), it("includes cache bust segment", () => {
|
|
50
|
+
const result = getLoaderPath("/docs/intro", !1, "12345");
|
|
51
|
+
expect(result).toContain("_refetch_12345_");
|
|
52
|
+
});
|
|
53
|
+
});
|
|
54
|
+
describe("getPathFromLoaderPath", () => {
|
|
55
|
+
it("strips /_one/assets prefix", () => {
|
|
56
|
+
expect(getPathFromLoaderPath("/_one/assets/docs_intro_999_vxrn_loader.js")).toBe(
|
|
57
|
+
"/docs/intro"
|
|
58
|
+
);
|
|
59
|
+
}), it("strips /assets prefix", () => {
|
|
60
|
+
expect(getPathFromLoaderPath("/assets/docs_intro_999_vxrn_loader.js")).toBe(
|
|
61
|
+
"/docs/intro"
|
|
62
|
+
);
|
|
63
|
+
}), it("strips refetch cache bust", () => {
|
|
64
|
+
expect(
|
|
65
|
+
getPathFromLoaderPath("/assets/docs_intro_refetch_12345__999_vxrn_loader.js")
|
|
66
|
+
).toBe("/docs/intro");
|
|
67
|
+
}), it("decodes escaped underscores back to literal underscores", () => {
|
|
68
|
+
expect(getPathFromLoaderPath("/assets/___docs_intro_999_vxrn_loader.js")).toBe(
|
|
69
|
+
"/_/docs/intro"
|
|
70
|
+
);
|
|
71
|
+
});
|
|
72
|
+
});
|
|
73
|
+
//# sourceMappingURL=cleanUrl.test.js.map
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"sources": ["../../../src/utils/cleanUrl.test.ts"],
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": []
|
|
6
|
+
}
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
import { describe, expect, it } from "vitest";
|
|
2
|
+
import { getLoaderPath, getPathFromLoaderPath } from "./cleanUrl.mjs";
|
|
3
|
+
function roundtrip(path) {
|
|
4
|
+
const loaderPath = getLoaderPath(path, !1);
|
|
5
|
+
return getPathFromLoaderPath(loaderPath);
|
|
6
|
+
}
|
|
7
|
+
describe("cleanUrl roundtrip", () => {
|
|
8
|
+
it("simple path", () => {
|
|
9
|
+
expect(roundtrip("/docs/getting-started")).toBe("/docs/getting-started");
|
|
10
|
+
}), it("path with underscore prefix (/_/docs)", () => {
|
|
11
|
+
expect(roundtrip("/_/docs/getting-started")).toBe("/_/docs/getting-started");
|
|
12
|
+
}), it("path with underscore prefix (/_/terms)", () => {
|
|
13
|
+
expect(roundtrip("/_/terms")).toBe("/_/terms");
|
|
14
|
+
}), it("path with underscore in segment name", () => {
|
|
15
|
+
expect(roundtrip("/my_page/test")).toBe("/my_page/test");
|
|
16
|
+
}), it("deeply nested path", () => {
|
|
17
|
+
expect(roundtrip("/deep/nested/path/here")).toBe("/deep/nested/path/here");
|
|
18
|
+
}), it("root path", () => {
|
|
19
|
+
expect(roundtrip("/")).toBe("/");
|
|
20
|
+
}), it("single segment", () => {
|
|
21
|
+
expect(roundtrip("/about")).toBe("/about");
|
|
22
|
+
}), it("path with query string is stripped", () => {
|
|
23
|
+
const loaderPath = getLoaderPath("/docs/intro?foo=bar", !1);
|
|
24
|
+
expect(getPathFromLoaderPath(loaderPath)).toBe("/docs/intro");
|
|
25
|
+
}), it("path with hash is stripped", () => {
|
|
26
|
+
const loaderPath = getLoaderPath("/docs/intro#section", !1);
|
|
27
|
+
expect(getPathFromLoaderPath(loaderPath)).toBe("/docs/intro");
|
|
28
|
+
}), it("path with trailing slash", () => {
|
|
29
|
+
const loaderPath = getLoaderPath("/docs/intro/", !1);
|
|
30
|
+
expect(getPathFromLoaderPath(loaderPath)).toBe("/docs/intro");
|
|
31
|
+
});
|
|
32
|
+
});
|
|
33
|
+
describe("getLoaderPath format", () => {
|
|
34
|
+
it("includes /assets/ prefix", () => {
|
|
35
|
+
const result = getLoaderPath("/docs/intro", !1);
|
|
36
|
+
expect(result).toMatch(/^\/assets\//);
|
|
37
|
+
}), it("ends with loader postfix", () => {
|
|
38
|
+
const result = getLoaderPath("/docs/intro", !1);
|
|
39
|
+
expect(result).toMatch(/_\d+_vxrn_loader\.js$/);
|
|
40
|
+
}), it("includes /_one prefix in dev mode", () => {
|
|
41
|
+
const originalEnv = process.env.NODE_ENV;
|
|
42
|
+
process.env.NODE_ENV = "development";
|
|
43
|
+
try {
|
|
44
|
+
const result = getLoaderPath("/docs/intro", !1);
|
|
45
|
+
expect(result).toMatch(/^\/_one\/assets\//);
|
|
46
|
+
} finally {
|
|
47
|
+
process.env.NODE_ENV = originalEnv;
|
|
48
|
+
}
|
|
49
|
+
}), it("includes cache bust segment", () => {
|
|
50
|
+
const result = getLoaderPath("/docs/intro", !1, "12345");
|
|
51
|
+
expect(result).toContain("_refetch_12345_");
|
|
52
|
+
});
|
|
53
|
+
});
|
|
54
|
+
describe("getPathFromLoaderPath", () => {
|
|
55
|
+
it("strips /_one/assets prefix", () => {
|
|
56
|
+
expect(getPathFromLoaderPath("/_one/assets/docs_intro_999_vxrn_loader.js")).toBe("/docs/intro");
|
|
57
|
+
}), it("strips /assets prefix", () => {
|
|
58
|
+
expect(getPathFromLoaderPath("/assets/docs_intro_999_vxrn_loader.js")).toBe("/docs/intro");
|
|
59
|
+
}), it("strips refetch cache bust", () => {
|
|
60
|
+
expect(getPathFromLoaderPath("/assets/docs_intro_refetch_12345__999_vxrn_loader.js")).toBe("/docs/intro");
|
|
61
|
+
}), it("decodes escaped underscores back to literal underscores", () => {
|
|
62
|
+
expect(getPathFromLoaderPath("/assets/___docs_intro_999_vxrn_loader.js")).toBe("/_/docs/intro");
|
|
63
|
+
});
|
|
64
|
+
});
|
|
65
|
+
//# sourceMappingURL=cleanUrl.test.mjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["describe","expect","it","getLoaderPath","getPathFromLoaderPath","roundtrip","path","loaderPath","toBe","result","toMatch","originalEnv","process","env","NODE_ENV","toContain"],"sources":["../../../src/utils/cleanUrl.test.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|