Skip to content

Commit bd33294

Browse files
committed
fix: no longer includes tag in sanity devDependency range
1 parent d66dd6c commit bd33294

File tree

3 files changed

+24
-13
lines changed

3 files changed

+24
-13
lines changed

src/actions/init.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
import path from 'path'
22
import {inject} from './inject'
33
import {ensureDir, writeFile} from '../util/files'
4-
import {resolveLatestVersions} from '../npm/resolveLatestVersions'
54
import sharedFlags from '../sharedFlags'
65
import {TypedFlags} from 'meow'
76
import {getPackage} from '../npm/package'
87
import {defaultSourceJs, defaultSourceTs} from '../configs/default-source'
9-
import {incompatiblePluginPackage} from '../constants'
10-
import {forcedPackageVersions} from '../configs/forced-package-versions'
118

129
export const initFlags = {
1310
...sharedFlags,
Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
1+
const sanityVersion = '3.0.0-rc.0'
2+
13
export const forcedPackageVersions = {
24
react: '^18',
35
'@types/react': '^18',
46
'react-dom': '^18',
57
'@types/react-dom': '^18',
6-
sanity: 'dev-preview || 3.0.0-rc.0',
8+
sanity: `dev-preview || ${sanityVersion}`,
79
'@sanity/ui': '1.0.0-beta.32',
8-
} as const
10+
}
11+
12+
export const forcedDevPackageVersions = {
13+
...forcedPackageVersions,
14+
// tagged release does not play nice with npm ci
15+
sanity: sanityVersion,
16+
}

src/npm/package.ts

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {cliName, incompatiblePluginPackage} from '../constants'
1313
import {InjectOptions, PackageData} from '../actions/inject'
1414
import {expectedScripts} from '../actions/verify/validations'
1515
import {PackageJson} from '../actions/verify/types'
16-
import {forcedPackageVersions} from '../configs/forced-package-versions'
16+
import {forcedDevPackageVersions, forcedPackageVersions} from '../configs/forced-package-versions'
1717

1818
const defaultDependencies = [incompatiblePluginPackage]
1919

@@ -234,11 +234,14 @@ export async function writePackageJson(data: PackageData, options: InjectOptions
234234
...(addDeps || {}),
235235
...(await resolveLatestVersions(defaultDependencies)),
236236
})
237-
const devDependencies = forceDependencyVersions({
238-
...(addDevDeps || {}),
239-
...(prev.devDependencies || {}),
240-
...(await resolveLatestVersions([...newDevDependencies, ...defaultDevDependencies])),
241-
})
237+
const devDependencies = forceDependencyVersions(
238+
{
239+
...(addDevDeps || {}),
240+
...(prev.devDependencies || {}),
241+
...(await resolveLatestVersions([...newDevDependencies, ...defaultDevDependencies])),
242+
},
243+
forcedDevPackageVersions
244+
)
242245
const peerDependencies = forceDependencyVersions({
243246
...(prev.peerDependencies || {}),
244247
...(addPeers || {}),
@@ -384,10 +387,13 @@ export function sortKeys<T extends Record<string, unknown>>(unordered: T): T {
384387
}, {} as T)
385388
}
386389

387-
function forceDependencyVersions(deps: Record<string, string>): Record<string, string> {
390+
function forceDependencyVersions(
391+
deps: Record<string, string>,
392+
versions = forcedPackageVersions
393+
): Record<string, string> {
388394
const entries = Object.entries(deps).map((entry) => {
389395
const [pkg] = entry
390-
const forceVersion = forcedPackageVersions[pkg as keyof typeof forcedPackageVersions]
396+
const forceVersion = versions[pkg as keyof typeof versions]
391397
if (forceVersion) {
392398
return [pkg, forceVersion]
393399
}

0 commit comments

Comments
 (0)