Skip to content

CLI: Fix handling of version ranges in dependency checks #13759

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
merged 1 commit into from
Jan 29, 2021
Merged

CLI: Fix handling of version ranges in dependency checks #13759

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
20 changes: 15 additions & 5 deletions lib/cli/src/project_types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
import { lt, gte } from '@storybook/semver';
import { validRange, minVersion } from '@storybook/semver';

function ltMajor(versionRange: string, major: number) {
// Uses validRange to avoid a throw from minVersion if an invalid range gets passed
return validRange(versionRange) && minVersion(versionRange).major < major;
}

function eqMajor(versionRange: string, major: number) {
// Uses validRange to avoid a throw from minVersion if an invalid range gets passed
return validRange(versionRange) && minVersion(versionRange).major === major;
}

// Should match @storybook/<framework>
export type SupportedFrameworks =
Expand Down Expand Up @@ -118,8 +128,8 @@ export const supportedTemplates: TemplateConfiguration[] = [
// The Vue template only works with Vue or Nuxt under v3
// In a future update, a new Vue3 template will be added
dependencies: {
vue: (version) => lt(version, '3.0.0'),
nuxt: (version) => lt(version, '3.0.0'),
vue: (versionRange) => ltMajor(versionRange, 3),
nuxt: (versionRange) => ltMajor(versionRange, 3),
},
matcherFunction: ({ dependencies }) => {
return dependencies.some(Boolean);
Expand Down Expand Up @@ -249,9 +259,9 @@ export const unsupportedTemplate: TemplateConfiguration = {
preset: ProjectType.UNSUPPORTED,
dependencies: {
// TODO(blaine): Remove when we support Vue 3
vue: (version) => version === 'next' || gte(version, '3.0.0'),
vue: (versionRange) => versionRange === 'next' || eqMajor(versionRange, 3),
// TODO(blaine): Remove when we support Vue 3
nuxt: (version) => gte(version, '3.0.0'),
nuxt: (versionRange) => eqMajor(versionRange, 3),
},
matcherFunction: ({ dependencies }) => {
return dependencies.some(Boolean);
Expand Down