Skip to content

Commit 1fa84a4

Browse files
authored
fix: resolve config directory relative to flat output file structure (#12187)
* fix: resolve config directory relative to flat output file structure build output is bundled now so things are collapsed to the root of the dist directory. We now need to resolve the config dir relative to the root, not the input file structure. * fix: resolve internal files relative to the package.json * externalize all non-relative imports
1 parent 2d5924f commit 1fa84a4

File tree

6 files changed

+24
-10
lines changed

6 files changed

+24
-10
lines changed

.changeset/serious-beds-approve.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@react-router/dev": patch
3+
---
4+
5+
resolve config directory relative to flat output file structure

packages/react-router-dev/cli/commands.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,12 @@ export async function generateEntry(
117117
return;
118118
}
119119

120-
let defaultsDirectory = path.resolve(__dirname, "..", "config", "defaults");
120+
let defaultsDirectory = path.resolve(
121+
path.dirname(require.resolve("@react-router/dev/package.json")),
122+
"dist",
123+
"config",
124+
"defaults"
125+
);
121126
let defaultEntryClient = path.resolve(defaultsDirectory, "entry.client.tsx");
122127

123128
let defaultEntryServer = path.resolve(

packages/react-router-dev/tsup.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const entry = [
1515
"typescript/plugin.ts",
1616
];
1717

18-
const external = ["./static/refresh-utils.cjs"];
18+
const external = ["./static/refresh-utils.cjs", /^(?!\.)/];
1919

2020
export default defineConfig([
2121
{

packages/react-router-dev/vite/config.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,12 @@ export async function resolveEntryFiles({
529529
}) {
530530
let { appDirectory } = reactRouterConfig;
531531

532-
let defaultsDirectory = path.resolve(__dirname, "..", "config", "defaults");
532+
let defaultsDirectory = path.resolve(
533+
path.dirname(require.resolve("@react-router/dev/package.json")),
534+
"dist",
535+
"config",
536+
"defaults"
537+
);
533538

534539
let userEntryClientFile = findEntry(appDirectory, "entry.client");
535540
let userEntryServerFile = findEntry(appDirectory, "entry.server");

packages/react-router-dev/vite/plugin.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,12 @@ export let getServerBuildDirectory = (ctx: ReactRouterPluginContext) =>
373373
let getClientBuildDirectory = (reactRouterConfig: ResolvedReactRouterConfig) =>
374374
path.join(reactRouterConfig.buildDirectory, "client");
375375

376-
let defaultEntriesDir = path.resolve(__dirname, "..", "config", "defaults");
376+
let defaultEntriesDir = path.resolve(
377+
path.dirname(require.resolve("@react-router/dev/package.json")),
378+
"dist",
379+
"config",
380+
"defaults"
381+
);
377382
let defaultEntries = fse
378383
.readdirSync(defaultEntriesDir)
379384
.map((filename) => path.join(defaultEntriesDir, filename));

packages/react-router/tsup.config.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ export default defineConfig([
1414
format: ["cjs"],
1515
outDir: "dist",
1616
dts: true,
17-
external: [
18-
/*.*/
19-
],
2017
banner: {
2118
js: createBanner(pkg.name, pkg.version),
2219
},
@@ -31,9 +28,6 @@ export default defineConfig([
3128
format: ["esm"],
3229
outDir: "dist",
3330
dts: true,
34-
external: [
35-
/*.*/
36-
],
3731
banner: {
3832
js: createBanner(pkg.name, pkg.version),
3933
},

0 commit comments

Comments
 (0)