Skip to content

Commit 27e6c28

Browse files
committed
Merge branch 'dev' into markdalgleish/handle-new-config-file
2 parents 7a6ffb8 + f3a07bb commit 27e6c28

File tree

385 files changed

+31591
-11926
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

385 files changed

+31591
-11926
lines changed

.changeset/honest-dots-deliver.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/silver-peas-shop.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@react-router/dev": minor
3+
---
4+
5+
Generate types for `virtual:react-router/server-build` module

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ packages/react-router-dom/server.d.ts
1010
packages/react-router-dom/server.js
1111
packages/react-router-dom/server.mjs
1212
tutorial/dist/
13+
public/

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ body:
2020
2121
If you'd rather open a GitHub issue, here are other ways to share a reproduction (ordered from most helpful to least):
2222
23-
- 🥇 Link to a [StackBlitz](https://remix.new) environment
23+
- 🥇 Link to a [StackBlitz](https://reactrouter.com/new) environment
2424
- 🥈 Link to a GitHub repository
2525
- 🥉 Description of project including template, config files, `package.json` scripts, etc.
2626

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
name: 🦋 Find Package
6767
needs: [release]
6868
runs-on: ubuntu-latest
69-
if: github.repository == 'remix-run/react-router' && needs.release.outputs.published == 'true'
69+
if: github.repository == 'remix-run/react-router' && github.ref_name != 'release-v6' && needs.release.outputs.published == 'true'
7070
outputs:
7171
package_version: ${{ steps.find_package_version.outputs.package_version }}
7272
steps:
@@ -92,6 +92,6 @@ jobs:
9292

9393
comment:
9494
name: 📝 Comment on related issues and pull requests
95-
if: github.repository == 'remix-run/react-router' && needs.find_package_version.outputs.package_version != ''
95+
if: github.repository == 'remix-run/react-router' && github.ref_name != 'release-v6' && needs.find_package_version.outputs.package_version != ''
9696
needs: [release, find_package_version]
9797
uses: ./.github/workflows/release-comments.yml

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ node_modules/
1111
/tutorial/dist
1212
/playground-local/
1313
/integration/playwright-report
14+
/integration/test-results
1415

1516
# v5 build files
1617
/packages/*/cjs/
@@ -28,6 +29,8 @@ node_modules/
2829
.wireit
2930
.eslintcache
3031
.tmp
32+
tsup.config.bundled_*.mjs
33+
build.utils.d.ts
3134
/.env
3235
/NOTES.md
3336

.vscode/settings.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"typescript.tsdk": "node_modules/typescript/lib",
3+
"typescript.enablePromptUseWorkspaceTsdk": true
4+
}

0 commit comments

Comments
 (0)