Skip to content

Commit

Permalink
fix: look for @remix-run/serve in devDependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
jacob-ebey committed Apr 28, 2023
1 parent 39f6405 commit 7b433f1
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 5 deletions.
5 changes: 5 additions & 0 deletions .changeset/afraid-mice-remain.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@remix-run/dev": patch
---

look for @remix-run/serve in devDependencies when running remix dev
2 changes: 1 addition & 1 deletion packages/remix-dev/cli/commands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,7 @@ let resolveDevServe = async (
)}`;

let usingRemixAppServer =
getAppDependencies(config)["@remix-run/serve"] !== undefined;
getAppDependencies(config, true)["@remix-run/serve"] !== undefined;
if (!usingRemixAppServer) {
console.error(
[
Expand Down
21 changes: 17 additions & 4 deletions packages/remix-dev/dependencies.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,27 @@ import type { RemixConfig } from "./config";

type PackageDependencies = { [packageName: string]: string };

function getPackageDependencies(packageJsonFile: string): PackageDependencies {
function getPackageDependencies(
packageJsonFile: string,
includeDev?: boolean
): PackageDependencies {
let pkg = JSON.parse(fs.readFileSync(packageJsonFile, "utf8"));
return pkg?.dependencies || {};
let deps = pkg?.dependencies || {};

if (includeDev) {
Object.assign(deps, pkg?.devDependencies || {});
}

return deps;
}

export function getAppDependencies(config: RemixConfig): PackageDependencies {
export function getAppDependencies(
config: RemixConfig,
includeDev?: boolean
): PackageDependencies {
return getPackageDependencies(
path.resolve(config.rootDirectory, "package.json")
path.resolve(config.rootDirectory, "package.json"),
includeDev
);
}

Expand Down

0 comments on commit 7b433f1

Please sign in to comment.