Skip to content

fix: make Release.devDependencies optional in upgrade command #3700

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

Merged
fredericoo merged 1 commit into from
Apr 10, 2026
+12 −10
Merged

fix: make Release.devDependencies optional in upgrade command #3700

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
14 changes: 8 additions & 6 deletions packages/cli/src/commands/hydrogen/upgrade.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,6 @@ describe('upgrade', async () => {
expect(latestRelease).toHaveProperty('hash');
expect(latestRelease).toHaveProperty('commit');
expect(latestRelease).toHaveProperty('dependencies');
expect(latestRelease).toHaveProperty('devDependencies');
expect(latestRelease).toHaveProperty('features');
expect(latestRelease).toHaveProperty('fixes');

Expand All @@ -389,7 +388,9 @@ describe('upgrade', async () => {

// Verify dependencies are objects
expect(typeof latestRelease.dependencies).toBe('object');
expect(typeof latestRelease.devDependencies).toBe('object');
if (latestRelease.devDependencies !== undefined) {
expect(typeof latestRelease.devDependencies).toBe('object');
}

// Verify features and fixes are arrays
expect(Array.isArray(latestRelease.features)).toBe(true);
Expand Down Expand Up @@ -423,11 +424,12 @@ describe('upgrade', async () => {

expect(sampleRelease.version).toBeDefined();
expect(sampleRelease.dependencies).toBeDefined();
expect(sampleRelease.devDependencies).toBeDefined();

// Test that the structure matches what upgrade functions expect
expect(typeof sampleRelease.dependencies).toBe('object');
expect(typeof sampleRelease.devDependencies).toBe('object');
if (sampleRelease.devDependencies !== undefined) {
expect(typeof sampleRelease.devDependencies).toBe('object');
}
expect(Array.isArray(sampleRelease.features)).toBe(true);
expect(Array.isArray(sampleRelease.fixes)).toBe(true);
});
Expand Down Expand Up @@ -2200,7 +2202,7 @@ describe('--version=next functionality', () => {
});

expect(result.dependencies['@shopify/hydrogen']).toBe('next');
expect(result.devDependencies['@shopify/mini-oxygen']).toBe('next');
expect(result.devDependencies?.['@shopify/mini-oxygen']).toBe('next');
expect(result.dependencies['react-router']).toBe('7.9.2');
expect(result.title).toContain('(next versions)');
});
Expand Down Expand Up @@ -2242,7 +2244,7 @@ describe('--version=next functionality', () => {
});

expect(result.dependencies['@shopify/hydrogen']).toBe('next');
expect(result.devDependencies['@shopify/mini-oxygen']).toBe('next');
expect(result.devDependencies?.['@shopify/mini-oxygen']).toBe('next');
expect(result.dependencies['react-router']).toBe('7.9.2'); // Non-Shopify packages unchanged
});

Expand Down
8 changes: 4 additions & 4 deletions packages/cli/src/commands/hydrogen/upgrade.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export type Release = {
commit: `https://${string}`;
date: string;
dependencies: Record<string, string>;
devDependencies: Record<string, string>;
devDependencies?: Record<string, string>;
dependenciesMeta?: Record<string, {required: boolean}>;
removeDependencies?: string[];
removeDevDependencies?: string[];
Expand Down Expand Up @@ -299,7 +299,7 @@ export async function isRunningFromHydrogenMonorepo(): Promise<boolean> {
function createNextRelease(latestRelease: Release): Release {
// Use latest release as base and override specific @shopify packages to "next"
const dependencies = {...latestRelease.dependencies};
const devDependencies = {...latestRelease.devDependencies};
const devDependencies = {...(latestRelease.devDependencies ?? {})};

// Override @shopify/hydrogen and @shopify/mini-oxygen to "next" if they exist
if (dependencies['@shopify/hydrogen']) {
Expand Down Expand Up @@ -446,7 +446,7 @@ function hasOutdatedDependencies({
}) {
return Object.entries({
...release.dependencies,
...release.devDependencies,
...(release.devDependencies ?? {}),
}).some(([name, version]) => {
// Skip checking the bundled CLI for now because it's always outdated.
// (we release a new version of the CLI after every Hydrogen release)
Expand Down Expand Up @@ -883,7 +883,7 @@ export function buildUpgradeCommandArgs({
};
const effectiveDevDependencies = {
...(cumulativeDevDependencies ?? {}),
...selectedRelease.devDependencies,
...(selectedRelease.devDependencies ?? {}),
};

// upgrade dependencies
Expand Down
Loading