Improved sourcemap support (#170)

* Improved sourcemap support * sourcemap potential fix
forge42dev · Jan 9, 2025 · 7e141ea · 7e141ea
1 parent 36c5a1a
commit 7e141ea
Show file tree

Hide file tree

Showing 10 changed files with 225 additions and 142 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,12 @@
+{
+	"version": "0.2.0",
+	"configurations": [
+		{
+			"name": "Attach by Process ID",
+			"processId": "${command:PickProcess}",
+			"request": "attach",
+			"skipFiles": ["<node_internals>/**"],
+			"type": "node"
+		}
+	]
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/server/hof.test.ts b/src/server/hof.test.ts
@@ -50,7 +50,7 @@ describe("withLoaderWrapper", () => {
 		const wrappedEnd = performance.now()
 		const wrappedTime = wrappedEnd - wrappedStart
 		// Allow for some variance in execution time
-		expect(wrappedTime - originalTime).toBeLessThan(10)
+		expect(wrappedTime - originalTime).toBeLessThan(30)
 	})
 
 	it("should get the params and the request object passed down properly", async () => {
@@ -156,7 +156,7 @@ describe("withActionWrapper", () => {
 		const wrappedEnd = performance.now()
 		const wrappedTime = wrappedEnd - wrappedStart
 		// Allow for some variance in execution time
-		expect(wrappedTime - originalTime).toBeLessThan(10)
+		expect(wrappedTime - originalTime).toBeLessThan(30)
 	})
 
 	it("should get the params and the request object passed down properly", async () => {

diff --git a/src/vite/plugin.tsx b/src/vite/plugin.tsx
@@ -96,7 +96,7 @@ export const reactRouterDevTools: (args?: ReactRouterViteConfig) => Plugin[] = (
 				const pluginNames = plugins.map((p) => p.name)
 				const pluginImports = plugins.map((plugin) => `import { ${plugin.name} } from "${plugin.path}";`).join("\n")
 				const config = `{ "config": ${JSON.stringify(clientConfig)}, "plugins": "[${pluginNames.join(",")}]" }`
-				return injectRdtClient(code, config, pluginImports)
+				return injectRdtClient(code, config, pluginImports, id)
 			},
 		},
 		{
@@ -109,7 +109,7 @@ export const reactRouterDevTools: (args?: ReactRouterViteConfig) => Plugin[] = (
 				if (!routeId) {
 					return
 				}
-				const finalCode = injectContext(code, routeId)
+				const finalCode = injectContext(code, routeId, id)
 				return finalCode
 			},
 		},
@@ -123,7 +123,7 @@ export const reactRouterDevTools: (args?: ReactRouterViteConfig) => Plugin[] = (
 				if (!routeId) {
 					return
 				}
-				const finalCode = augmentDataFetchingFunctions(code, routeId)
+				const finalCode = augmentDataFetchingFunctions(code, routeId, id)
 				return finalCode
 			},
 		},