Skip to content

Commit 8a5b918

Browse files
committed
fix!: don't disable module if no projectId is specified
BREAKING CHANGE: If you were relying on the auto-disabling part of this module
1 parent bcb6163 commit 8a5b918

File tree

3 files changed

+13
-22
lines changed

3 files changed

+13
-22
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"nuxi": "0.10.1",
6868
"nuxt3": "^3.0.0-27420403.16e2a54",
6969
"release-it": "14.12.4",
70-
"vitest": "0.4.1"
70+
"vitest": "0.4.2"
7171
},
7272
"publishConfig": {
7373
"access": "public"

src/module.ts

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,6 @@ export type ModuleOptions = SanityModuleOptions
3636

3737
const logger = useLogger('@nuxtjs/sanity')
3838

39-
function validateConfig ({ projectId, dataset }: SanityModuleOptions) {
40-
if (!projectId) {
41-
logger.warn(
42-
`Make sure you specify a ${chalk.bold('projectId')} in your sanity config.`,
43-
)
44-
return false
45-
} else {
46-
logger.info(`Sanity project ${chalk.bold(projectId)} (${chalk.bold(dataset)}).`)
47-
return true
48-
}
49-
}
50-
5139
function getDefaultSanityConfig (jsonPath: string) {
5240
try {
5341
const { projectId, dataset } = fse.readJSONSync(jsonPath).api
@@ -74,15 +62,12 @@ export default defineNuxtModule<SanityModuleOptions>({
7462
withCredentials: false,
7563
additionalClients: {},
7664
...getDefaultSanityConfig(resolve(nuxt.options.rootDir, './sanity.json')),
77-
...nuxt.options.publicRuntimeConfig.sanity
7865
}),
7966
async setup (options, nuxt) {
8067
if (!('useCdn' in options)) {
8168
options.useCdn = process.env.NODE_ENV === 'production' && !options.token
8269
}
8370

84-
if (!validateConfig(options)) return
85-
8671
try {
8772
if (!options.minimal) {
8873
options.minimal = !requireModule('@sanity/client')
@@ -93,7 +78,7 @@ export default defineNuxtModule<SanityModuleOptions>({
9378
}
9479

9580
// Final resolved configuration
96-
nuxt.options.publicRuntimeConfig.sanity = defu(nuxt.options.publicRuntimeConfig.sanity, {
81+
nuxt.options.publicRuntimeConfig.sanity = options = defu(nuxt.options.publicRuntimeConfig.sanity, {
9782
useCdn: options.useCdn,
9883
projectId: options.projectId,
9984
dataset: options.dataset,
@@ -103,6 +88,12 @@ export default defineNuxtModule<SanityModuleOptions>({
10388
additionalClients: options.additionalClients,
10489
})
10590

91+
if (!options.projectId) {
92+
logger.warn(`No Sanity project found. Make sure you specify a ${chalk.bold('projectId')} in your Sanity config.`)
93+
} else {
94+
logger.info(`Running with Sanity project ${chalk.bold(options.projectId)} (${chalk.bold(options.dataset)}).`)
95+
}
96+
10697
const runtimeDir = fileURLToPath(new URL('./runtime', import.meta.url))
10798
nuxt.options.build.transpile.push(runtimeDir, '@nuxtjs/sanity')
10899

yarn.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -843,7 +843,7 @@ __metadata:
843843
nuxt3: ^3.0.0-27420403.16e2a54
844844
pathe: 0.2.0
845845
release-it: 14.12.4
846-
vitest: 0.4.1
846+
vitest: 0.4.2
847847
languageName: unknown
848848
linkType: soft
849849

@@ -11777,9 +11777,9 @@ __metadata:
1177711777
languageName: node
1177811778
linkType: hard
1177911779

11780-
"vitest@npm:0.4.1":
11781-
version: 0.4.1
11782-
resolution: "vitest@npm:0.4.1"
11780+
"vitest@npm:0.4.2":
11781+
version: 0.4.2
11782+
resolution: "vitest@npm:0.4.2"
1178311783
dependencies:
1178411784
"@types/chai": ^4.3.0
1178511785
"@types/chai-subset": ^1.3.3
@@ -11804,7 +11804,7 @@ __metadata:
1180411804
optional: true
1180511805
bin:
1180611806
vitest: vitest.mjs
11807-
checksum: f350464cd674612151ea6e63fd37401156ff9d3fafd3f663595beb1dbe19658fb1f7f345253250f3a9c5dff7febf8fc3284f94d46ed167f37141bd609d424e05
11807+
checksum: f369a46955fdeaf35665a94a5307c665407d503778c57ddd54cec43793ebfe419bf4e49b44e78773f7f0d3918d0b7ab4f2c3f96d88816291321ef2fe527f93d4
1180811808
languageName: node
1180911809
linkType: hard
1181011810

0 commit comments

Comments
 (0)