Skip to content

Commit 9ab6364

Browse files
authored
Fix prerelease issues (#28)
1 parent e7c1d6f commit 9ab6364

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/configs/pnpm.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import type { TypedFlatConfigItem } from '../types'
2-
2+
import { hasFile } from '../utils'
33
import { jsoncParser, pnpmPlugin, yamlParser } from '../vendors'
44

5+
const hasWorkspace = hasFile('pnpm-workspace.yaml') || hasFile('pnpm-workspace.yml')
6+
57
export function pnpm (): TypedFlatConfigItem[] {
68
return [
79
{
@@ -11,7 +13,7 @@ export function pnpm (): TypedFlatConfigItem[] {
1113
name: 'vuetify/pnpm/package-json',
1214
plugins: { pnpm: pnpmPlugin },
1315
rules: {
14-
'pnpm/json-prefer-workspace-settings': 'error',
16+
'pnpm/json-prefer-workspace-settings': hasWorkspace ? 'error' : 'off',
1517
'pnpm/json-valid-catalog': 'error',
1618
},
1719
},

src/utils/autoimports.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export function loadAutoImports (options: Options['autoimports'] = true): TypedF
2424
if (!autoImportModuleURL) {
2525
return {}
2626
}
27-
return compat.extends(autoImportModuleURL) as TypedFlatConfigItem
27+
return compat.extends(autoImportModuleURL)[0] ?? {}
2828
} catch {
2929
return {}
3030
}

0 commit comments

Comments
 (0)