Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 3 additions & 30 deletions packages/react-router-dev/vite/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import {
init as initEsModuleLexer,
parse as esModuleLexer,
} from "es-module-lexer";
import { escapePath as escapePathAsGlob } from "tinyglobby";
import pick from "lodash/pick";
import jsesc from "jsesc";
import colors from "picocolors";
Expand Down Expand Up @@ -82,7 +81,8 @@ import {
} from "../config/config";
import { getOptimizeDepsEntries } from "./optimize-deps-entries";
import { decorateComponentExportsWithProps } from "./with-props";
import validatePluginOrder from "./plugins/validate-plugin-order";
import { validatePluginOrder } from "./plugins/validate-plugin-order";
import { warnOnClientSourceMaps } from "./plugins/warn-on-client-source-maps";

export type LoadCssContents = (
viteDevServer: Vite.ViteDevServer,
Expand Down Expand Up @@ -1488,34 +1488,6 @@ export const reactRouterVitePlugin: ReactRouterVitePlugin = () => {
cssModulesManifest[id] = code;
}
},
buildStart() {
invariant(viteConfig);

if (
viteCommand === "build" &&
viteConfig.mode === "production" &&
!viteConfig.build.ssr &&
viteConfig.build.sourcemap
) {
viteConfig.logger.warn(
colors.yellow(
"\n" +
colors.bold(" ⚠️ Source maps are enabled in production\n") +
[
"This makes your server code publicly",
"visible in the browser. This is highly",
"discouraged! If you insist, ensure that",
"you are using environment variables for",
"secrets and not hard-coding them in",
"your source code.",
]
.map((line) => " " + line)
.join("\n") +
"\n",
),
);
}
},
async configureServer(viteDevServer) {
setDevServerHooks({
// Give the request handler access to the critical CSS in dev to avoid a
Expand Down Expand Up @@ -2377,6 +2349,7 @@ export const reactRouterVitePlugin: ReactRouterVitePlugin = () => {
},
},
validatePluginOrder(),
warnOnClientSourceMaps(),
];
};

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type * as Vite from "vite";

export default function validatePluginOrder(): Vite.Plugin {
export function validatePluginOrder(): Vite.Plugin {
return {
name: "react-router:validate-plugin-order",
configResolved(viteConfig) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
import type * as Vite from "vite";
import colors from "picocolors";
import invariant from "../../invariant";

export function warnOnClientSourceMaps(): Vite.Plugin {
let viteConfig: Vite.ResolvedConfig;
let viteCommand: Vite.ConfigEnv["command"];
let logged = false;

return {
name: "react-router:warn-on-client-source-maps",
config(_, configEnv) {
viteCommand = configEnv.command;
},
configResolved(config) {
viteConfig = config;
},
buildStart() {
invariant(viteConfig);

if (
!logged &&
viteCommand === "build" &&
viteConfig.mode === "production" &&
!viteConfig.build.ssr &&
(viteConfig.build.sourcemap ||
viteConfig.environments?.client?.build.sourcemap)
) {
viteConfig.logger.warn(
colors.yellow(
"\n" +
colors.bold(" ⚠️ Source maps are enabled in production\n") +
[
"This makes your server code publicly",
"visible in the browser. This is highly",
"discouraged! If you insist, ensure that",
"you are using environment variables for",
"secrets and not hard-coding them in",
"your source code.",
]
.map((line) => " " + line)
.join("\n") +
"\n",
),
);
logged = true;
}
},
};
}
4 changes: 3 additions & 1 deletion packages/react-router-dev/vite/rsc/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ import {
isVirtualClientRouteModuleId,
CLIENT_NON_COMPONENT_EXPORTS,
} from "./virtual-route-modules";
import validatePluginOrder from "../plugins/validate-plugin-order";
import { validatePluginOrder } from "../plugins/validate-plugin-order";
import { warnOnClientSourceMaps } from "../plugins/warn-on-client-source-maps";

export function reactRouterRSCVitePlugin(): Vite.PluginOption[] {
let configLoader: ConfigLoader;
Expand Down Expand Up @@ -480,6 +481,7 @@ export function reactRouterRSCVitePlugin(): Vite.PluginOption[] {
},
},
validatePluginOrder(),
warnOnClientSourceMaps(),
];
}

Expand Down
Loading