Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: look for @remix-run/serve in devDependencies #6228

Merged
merged 1 commit into from
Apr 28, 2023
Merged

fix: look for @remix-run/serve in devDependencies #6228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions .changeset/afraid-mice-remain.md
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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