Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion nuxt/module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
addTemplate,
createResolver,
defineNuxtModule,
hasNuxtModule,
resolvePath
} from '@nuxt/kit';

Expand Down Expand Up @@ -53,7 +54,10 @@ export default defineNuxtModule<NuxtModuleOptions>({
write: true
});

addPlugin(resolver.resolve('./runtime/plugin'));
const hasI18n = hasNuxtModule('@nuxtjs/i18n');
const awaitsI18n = pluginOptions.syncI18n && hasI18n;

addPlugin(resolver.resolve(awaitsI18n ? './runtime/plugin-i18n' : './runtime/plugin'));

addComponent({ name: 'Form', export: 'Form', filePath: '@overgaming/valiform' });
addComponent({ name: 'Field', export: 'Field', filePath: '@overgaming/valiform' });
Expand Down
9 changes: 9 additions & 0 deletions nuxt/runtime/plugin-i18n.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { defineNuxtPlugin } from '#app';
import { setupFormsPlugin } from './setup';

export default defineNuxtPlugin({
name: 'valiform',
enforce: 'post',
dependsOn: ['i18n:plugin'],
setup: setupFormsPlugin
});
30 changes: 3 additions & 27 deletions nuxt/runtime/plugin.ts
Original file line number Diff line number Diff line change
@@ -1,32 +1,8 @@
import { defineNuxtPlugin } from '#app';
import { isRef } from 'vue';
import { FormsPlugin, registerRules } from '@overgaming/valiform';
// @ts-ignore virtual module resolved by Nuxt at build time
import { pluginOptions, valiformConfig } from '#build/valiform/options.mjs';
import { setupFormsPlugin } from './setup';

export default defineNuxtPlugin({
name: 'valiform',
enforce: 'post',
setup(nuxtApp) {
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const { syncI18n, ...formsOpts } = pluginOptions;
const opts = { ...formsOpts };

if (valiformConfig?.locales) {
opts.locales = valiformConfig.locales;
}

if (syncI18n) {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const i18n = (nuxtApp as any).$i18n;
if (i18n && i18n.locale) {
opts.locale = isRef(i18n.locale) ? i18n.locale : i18n.locale.value || i18n.locale;
}
}

nuxtApp.vueApp.use(FormsPlugin, opts);

if (valiformConfig?.rules) {
registerRules(valiformConfig.rules);
}
}
setup: setupFormsPlugin
});
27 changes: 27 additions & 0 deletions nuxt/runtime/setup.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import { FormsPlugin, registerRules } from '@overgaming/valiform';
// @ts-ignore virtual module resolved by Nuxt at build time
import { pluginOptions, valiformConfig } from '#build/valiform/options.mjs';

export function setupFormsPlugin(nuxtApp: any) {
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const { syncI18n, ...formsOpts } = pluginOptions;
const opts = { ...formsOpts };

if (valiformConfig?.locales) {
opts.locales = valiformConfig.locales;
}

if (syncI18n) {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const i18n = (nuxtApp as any).$i18n;
if (i18n && i18n.locale) {
opts.locale = i18n.locale;
}
}

nuxtApp.vueApp.use(FormsPlugin, opts);

if (valiformConfig?.rules) {
registerRules(valiformConfig.rules);
}
}
4 changes: 3 additions & 1 deletion vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ export default defineConfig({
nuxt: resolve(__dirname, 'nuxt/module.ts'),
// Runtime plugin compiled separately so Nuxt can inject it into the user's app.
// #app and #build/* are Nuxt virtual modules resolved at the user's build time.
'runtime/plugin': resolve(__dirname, 'nuxt/runtime/plugin.ts')
'runtime/plugin': resolve(__dirname, 'nuxt/runtime/plugin.ts'),
'runtime/plugin-i18n': resolve(__dirname, 'nuxt/runtime/plugin-i18n.ts'),
'runtime/setup': resolve(__dirname, 'nuxt/runtime/setup.ts')
},
formats: ['es', 'cjs']
},
Expand Down