Skip to content

Commit

Permalink
refactor(dev): revert serving assets from dev server
Browse files Browse the repository at this point in the history
When sending HMR updates, the assumption was that serving assets from
dev server would allow those updates to be sent immediately, without
waiting for the app server to restart. But this isn't the case (e.g. if
you navigate to another page that has a loader and the app server is
rebooting, that loader fetch will fail).
  • Loading branch information
pcattori committed May 4, 2023
1 parent 6563a94 commit 9133202
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 60 deletions.
7 changes: 0 additions & 7 deletions .changeset/ninety-flies-allow.md

This file was deleted.

8 changes: 0 additions & 8 deletions packages/remix-dev/cli/commands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,6 @@ export async function dev(
httpHost?: string;
httpPort?: number;
restart?: boolean;
publicDirectory?: string;
websocketPort?: number;
} = {}
) {
Expand Down Expand Up @@ -516,7 +515,6 @@ let resolveDevBuild = async (

type DevServeFlags = DevBuildFlags & {
command: string;
publicDirectory: string;
restart: boolean;
};
let resolveDevServe = async (
Expand Down Expand Up @@ -555,11 +553,6 @@ let resolveDevServe = async (
}
}

let publicDirectory =
flags.publicDirectory ??
(dev === true ? undefined : dev.publicDirectory) ??
"public";

let restart =
flags.restart ?? (dev === true ? undefined : dev.restart) ?? true;

Expand All @@ -568,7 +561,6 @@ let resolveDevServe = async (
httpScheme,
httpHost,
httpPort,
publicDirectory,
websocketPort,
restart,
};
Expand Down
6 changes: 0 additions & 6 deletions packages/remix-dev/cli/run.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ ${colors.logoBlue("R")} ${colors.logoGreen("E")} ${colors.logoYellow(
--http-host HTTP(S) host for the dev server. Default: localhost
--http-port HTTP(S) port for the dev server. Default: any open port
--no-restart Do not restart the app server when rebuilds occur.
--public-directory Path to public assets directory relative to Remix project root. Default: public
--websocket-port Websocket port for the dev server. Default: any open port
\`init\` Options:
--no-delete Skip deleting the \`remix.init\` script
Expand Down Expand Up @@ -189,7 +188,6 @@ export async function run(argv: string[] = process.argv.slice(2)) {
"--http-host": String,
"--http-port": Number,
"--no-restart": Boolean,
"--public-directory": String,
"--websocket-port": Number,
},
{
Expand Down Expand Up @@ -227,10 +225,6 @@ export async function run(argv: string[] = process.argv.slice(2)) {
flags.httpPort = flags["http-port"];
delete flags["http-port"];
}
if (flags["public-directory"]) {
flags.publicDirectory = flags["public-directory"];
delete flags["public-directory"];
}
if (flags["websocket-port"]) {
flags.websocketPort = flags["websocket-port"];
delete flags["websocket-port"];
Expand Down
6 changes: 1 addition & 5 deletions packages/remix-dev/compiler/js/compiler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -202,11 +202,7 @@ const createEsbuildConfig = (
platform: "browser",
format: "esm",
external: getExternals(ctx.config),
loader: {
...loaders,
// in development, use dataurls for svgs so that `<use href={mysvg} />` works across different origins
".svg": ctx.options.mode === "development" ? "dataurl" : loaders[".svg"],
},
loader: loaders,
bundle: true,
logLevel: "silent",
splitting: true,
Expand Down
36 changes: 2 additions & 34 deletions packages/remix-dev/devServer_unstable/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import express from "express";
import * as Channel from "../channel";
import { type Manifest } from "../manifest";
import * as Compiler from "../compiler";
import { readConfig, type RemixConfig } from "../config";
import { type RemixConfig } from "../config";
import { loadEnv } from "./env";
import * as Socket from "./socket";
import * as HMR from "./hmr";
Expand All @@ -23,19 +23,6 @@ type Origin = {

let stringifyOrigin = (o: Origin) => `${o.scheme}://${o.host}:${o.port}`;

let patchPublicPath = (
config: RemixConfig,
devHttpOrigin: Origin
): RemixConfig => {
// set public path to point to dev server
// so that browser asks the dev server for assets
return {
...config,
// dev server has its own origin, to `/build/` path will not cause conflicts with app server routes
publicPath: stringifyOrigin(devHttpOrigin) + "/build/",
};
};

let detectBin = async (): Promise<string> => {
let pkgManager = detectPackageManager() ?? "npm";
if (pkgManager === "npm") {
Expand All @@ -54,7 +41,6 @@ export let serve = async (
httpScheme: string;
httpHost: string;
httpPort: number;
publicDirectory: string;
websocketPort: number;
restart: boolean;
}
Expand Down Expand Up @@ -119,7 +105,7 @@ export let serve = async (

let dispose = await Compiler.watch(
{
config: patchPublicPath(initialConfig, httpOrigin),
config: initialConfig,
options: {
mode: "development",
sourcemap: true,
Expand All @@ -129,10 +115,6 @@ export let serve = async (
},
},
{
reloadConfig: async (root) => {
let config = await readConfig(root);
return patchPublicPath(config, httpOrigin);
},
onBuildStart: (ctx) => {
state.appReady?.err();
clean(ctx.config);
Expand Down Expand Up @@ -191,20 +173,6 @@ export let serve = async (
);

let httpServer = express()
// statically serve built assets
.use((_, res, next) => {
res.header("Access-Control-Allow-Origin", "*");
next();
})
.use(
"/build",
express.static(initialConfig.assetsBuildDirectory, {
immutable: true,
maxAge: "1y",
})
)
.use(express.static(options.publicDirectory, { maxAge: "1h" }))

// handle `broadcastDevReady` messages
.use(express.json())
.post("/ping", (req, res) => {
Expand Down

0 comments on commit 9133202

Please sign in to comment.