From: Pooya Parsa Date: Fri, 8 Jul 2022 12:15:45 +0000 (+0200) Subject: refactor: use resolver X-Git-Tag: @pinia/nuxt@0.3.0~20 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbde0aeeaf6ecde6a0a7622d61420efb164fcfd8;p=thirdparty%2Fvuejs%2Fpinia.git refactor: use resolver --- diff --git a/packages/nuxt/src/module.ts b/packages/nuxt/src/module.ts index b9abe390..0727f604 100644 --- a/packages/nuxt/src/module.ts +++ b/packages/nuxt/src/module.ts @@ -1,6 +1,4 @@ -import { resolve } from 'path' -import { fileURLToPath } from 'url' -import { defineNuxtModule, addPlugin, isNuxt2, addAutoImport } from '@nuxt/kit' +import { defineNuxtModule, addPlugin, isNuxt2, addAutoImport, createResolver } from '@nuxt/kit' export interface ModuleOptions { /** @@ -25,7 +23,7 @@ export default defineNuxtModule({ disableVuex: true, }, setup(options, nuxt) { - const runtimeDir = fileURLToPath(new URL('./runtime', import.meta.url)) + const resolver = createResolver(import.meta.url) // Disable default Vuex store (Nuxt v2.10+ only) if (nuxt.options.features && options.disableVuex && isNuxt2()) { @@ -33,20 +31,20 @@ export default defineNuxtModule({ } // Transpile runtime - nuxt.options.build.transpile.push(runtimeDir) + nuxt.options.build.transpile.push(resolver.resolve('./runtime')) // Make sure we use the mjs build for pinia nuxt.options.alias.pinia = 'pinia/dist/pinia.mjs' // Add runtime plugin if (isNuxt2()) { - addPlugin(resolve(runtimeDir, './plugin.vue2')) + addPlugin(resolver.resolve('./runtime/plugin.vue2')) } else { - addPlugin(resolve(runtimeDir, './plugin')) + addPlugin(resolver.resolve('./runtime/plugin.vue3')) } // Add auto imports - const composables = resolve(runtimeDir, './composables') + const composables = resolver.resolve('./runtime/composables') addAutoImport([ { from: composables, name: 'usePinia' }, { from: composables, name: 'definePiniaStore' } diff --git a/packages/nuxt/src/runtime/plugin.ts b/packages/nuxt/src/runtime/plugin.vue3.ts similarity index 100% rename from packages/nuxt/src/runtime/plugin.ts rename to packages/nuxt/src/runtime/plugin.vue3.ts