Merge branch 'main' into release-next

Author: brophdawg11

SECURITY.md

@@ -0,0 +1,21 @@
+# Security Policy
+
+## Supported Versions
+
+The following versions are currently being supported with security updates:
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 7.x     | :white_check_mark: |
+| 6.x     | :white_check_mark: |
+| < 6.0   | :x:                |
+
+## Reporting a Vulnerability
+
+We take security bugs in React Router seriously. We appreciate your efforts to responsibly disclose your findings, and will make every effort to acknowledge your contributions.
+
+To report a security issue, please use the GitHub Security Advisory [Report a Vulnerability](https://github.com/remix-run/react-router/security/advisories/new) feature.
+
+The React Router team will send a response indicating the next steps in handling your report. After the initial reply to your report, our team will keep you informed of the progress towards a fix and full announcement, and may ask for additional information or guidance.
+
+Report security bugs in third-party modules to the person or team maintaining the module. You can also report a vulnerability through the [npm contact form](https://www.npmjs.com/support) by selecting "I'm reporting a security vulnerability".

contributors.yml

@@ -69,6 +69,7 @@
 - ChristophP
 - christowiz
 - clavery
+- Cmoen11
 - codeape2
 - coryhouse
 - ctnelson1997

docs/upgrading/remix.md

@@ -198,7 +198,7 @@ export default defineConfig({
 -     ssr: true,
 -     future: {/* all the v3 flags */}
 -   }),
-+   remix(),
++   reactRouter(),
     tsconfigPaths(),
   ],
 });