[pull] main from remix-run:main

.github/workflows/deduplicate-lock-file.yml

@@ -23,7 +23,7 @@ jobs:
           token: ${{ secrets.FORMAT_PAT }}
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6.0.9
+        uses: pnpm/action-setup@v6.0.10
 
       - name: Setup node
         uses: actions/setup-node@v6

.github/workflows/docs.yml

@@ -31,7 +31,7 @@ jobs:
           ref: ${{ github.event.inputs.branch }}
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6.0.9
+        uses: pnpm/action-setup@v6.0.10
 
       - name: Setup node
         uses: actions/setup-node@v6

.github/workflows/format.yml

@@ -22,7 +22,7 @@ jobs:
           token: ${{ secrets.FORMAT_PAT }}
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6.0.9
+        uses: pnpm/action-setup@v6.0.10
 
       - name: Setup node
         uses: actions/setup-node@v6

.github/workflows/pr-actions.yml

@@ -28,7 +28,7 @@ jobs:
         uses: actions/checkout@v7
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6.0.9
+        uses: pnpm/action-setup@v6.0.10
 
       - name: Setup node
         uses: actions/setup-node@v6

.github/workflows/pr-checks.yml

@@ -62,7 +62,7 @@ jobs:
 
       - name: Setup pnpm
         if: steps.changed-files.outputs.mode == 'run'
-        uses: pnpm/action-setup@v6.0.9
+        uses: pnpm/action-setup@v6.0.10
 
       - name: Setup node
         if: steps.changed-files.outputs.mode == 'run'

.github/workflows/preview.yml

@@ -56,7 +56,7 @@ jobs:
           ref: ${{ inputs.baseBranch }}
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v6.0.9
+        uses: pnpm/action-setup@v6.0.10
 
       - name: Install Node.js
         uses: actions/setup-node@v6

.github/workflows/release-comments-manual.yml

@@ -25,7 +25,7 @@ jobs:
           fetch-depth: 0
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6.0.9
+        uses: pnpm/action-setup@v6.0.10
 
       - name: Setup node
         uses: actions/setup-node@v6

.github/workflows/release.yml

@@ -87,7 +87,7 @@ jobs:
           token: ${{ secrets.FORMAT_PAT }}
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v6.0.9
+        uses: pnpm/action-setup@v6.0.10
 
       - name: Install Node.js
         uses: actions/setup-node@v6
@@ -116,7 +116,7 @@ jobs:
         uses: actions/checkout@v7
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6.0.9
+        uses: pnpm/action-setup@v6.0.10
 
       - name: Setup node
         uses: actions/setup-node@v6
@@ -151,7 +151,7 @@ jobs:
           fetch-depth: 0
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6.0.9
+        uses: pnpm/action-setup@v6.0.10
 
       - name: Setup node
         uses: actions/setup-node@v6
@@ -184,7 +184,7 @@ jobs:
           fetch-depth: 0
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6.0.9
+        uses: pnpm/action-setup@v6.0.10
 
       - name: Setup node
         uses: actions/setup-node@v6

.github/workflows/test-integration-run.yml

@@ -30,7 +30,7 @@ jobs:
         uses: actions/checkout@v7
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6.0.9
+        uses: pnpm/action-setup@v6.0.10
 
       - name: Setup node ${{ inputs.node_version }}
         uses: actions/setup-node@v6

.github/workflows/test-integration.yml

@@ -63,9 +63,6 @@ jobs:
           if [ "${{ github.event_name }}" = "push" ]; then
             echo "Selected integration suite: full (push to main)"
             echo "type=full" >> "$GITHUB_OUTPUT"
-          elif [ "${{ github.event.pull_request.head.ref }}" = "v8" ]; then
-            echo "Selected integration suite: dev (v8 PR)"
-            echo "type=dev" >> "$GITHUB_OUTPUT"
           elif [ "${{ github.event.pull_request.draft }}" = "true" ]; then
             echo "Selected integration suite: base (draft PR)"
             echo "type=base" >> "$GITHUB_OUTPUT"

.github/workflows/test-unit.yml

@@ -37,7 +37,7 @@ jobs:
         uses: actions/checkout@v7
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6.0.9
+        uses: pnpm/action-setup@v6.0.10
 
       - name: Setup node
         uses: actions/setup-node@v6

contributors.yml

@@ -256,6 +256,7 @@
 - kklem0
 - kno-raziel
 - knownasilya
+- kobihikri
 - koojaa
 - KostiantynPopovych
 - KubasuIvanSakwa
@@ -446,6 +447,7 @@
 - sunnyraindy
 - sushichan044
 - swalker326
+- syedsohailhussain1
 - szhsin
 - tanayv
 - thecode00

packages/react-router/.changes/patch.submit-relative-option.md

@@ -0,0 +1 @@
+Properly respect the `relative` option in `useSubmit`/`fetcher.submit` when resolivng the `action` path

packages/react-router/__tests__/dom/data-browser-router-test.tsx

@@ -4132,6 +4132,100 @@ function testDomRouter(
       });
     });
 
+    describe('submit() with relative="path"', () => {
+      it("submits relative to the URL for navigations", async () => {
+        let router = createTestRouter(
+          [
+            {
+              path: "inbox",
+              action: () => "INDEX",
+              children: [
+                {
+                  path: "messages",
+                  action: () => "MESSAGES",
+                  Component() {
+                    let actionData = useActionData();
+                    return <p>{actionData}</p>;
+                  },
+                },
+                {
+                  path: "messages/:id",
+                  Component() {
+                    let submit = useSubmit();
+                    return (
+                      <button
+                        onClick={() =>
+                          submit(
+                            { a: "1" },
+                            { method: "post", action: "..", relative: "path" },
+                          )
+                        }
+                      >
+                        Submit
+                      </button>
+                    );
+                  },
+                },
+              ],
+            },
+          ],
+          { window: getWindow("/inbox/messages/1") },
+        );
+        render(<RouterProvider router={router} />);
+
+        fireEvent.click(screen.getByText("Submit"));
+        await waitFor(() => screen.getByText("MESSAGES"));
+        expect(router.state.location.pathname).toBe("/inbox/messages");
+      });
+
+      it("submits relative to the URL for fetchers", async () => {
+        let router = createTestRouter(
+          [
+            {
+              path: "inbox",
+              action: () => "INDEX",
+              children: [
+                {
+                  path: "messages",
+                  action: () => "MESSAGES",
+                },
+                {
+                  path: "messages/:id",
+                  Component() {
+                    let fetcher = useFetcher();
+                    return (
+                      <>
+                        <button
+                          onClick={() =>
+                            fetcher.submit(
+                              { a: "1" },
+                              {
+                                method: "post",
+                                action: "..",
+                                relative: "path",
+                              },
+                            )
+                          }
+                        >
+                          Submit
+                        </button>
+                        {fetcher.data ? <p>{fetcher.data}</p> : null}
+                      </>
+                    );
+                  },
+                },
+              ],
+            },
+          ],
+          { window: getWindow("/inbox/messages/1") },
+        );
+        render(<RouterProvider router={router} />);
+
+        fireEvent.click(screen.getByText("Submit"));
+        await waitFor(() => screen.getByText("MESSAGES"));
+      });
+    });
+
     describe("useSubmit/Form FormData", () => {
       it("gathers form data on <Form> submissions", async () => {
         let actionSpy = jest.fn();

packages/react-router/lib/dom/lib.tsx

@@ -2603,6 +2603,7 @@ export function useSubmit(): SubmitFunction {
         await routerFetch(key, currentRouteId, options.action || action, {
           defaultShouldRevalidate: options.defaultShouldRevalidate,
           preventScrollReset: options.preventScrollReset,
+          relative: options.relative,
           formData,
           body,
           formMethod: options.method || (method as HTMLFormMethod),
@@ -2613,6 +2614,7 @@ export function useSubmit(): SubmitFunction {
         await routerNavigate(options.action || action, {
           defaultShouldRevalidate: options.defaultShouldRevalidate,
           preventScrollReset: options.preventScrollReset,
+          relative: options.relative,
           formData,
           body,
           formMethod: options.method || (method as HTMLFormMethod),

packages/react-router/lib/router/router.ts

@@ -7680,11 +7680,11 @@ function persistAppliedTransitions(
 }
 
 function createDeferred<T = unknown>() {
-  let resolve: (val?: any) => Promise<void>;
-  let reject: (error?: Error) => Promise<void>;
+  let resolve!: (val?: T) => Promise<void>;
+  let reject!: (error?: Error) => Promise<void>;
   let promise = new Promise<T>((res, rej) => {
-    resolve = async (val: T) => {
-      res(val);
+    resolve = async (val?: T) => {
+      res(val as T);
       try {
         await promise;
       } catch {}
@@ -7698,9 +7698,7 @@ function createDeferred<T = unknown>() {
   });
   return {
     promise,
-    //@ts-ignore
     resolve,
-    //@ts-ignore
     reject,
   };
 }