@dword-design/base-config-nuxt 6.1.2 → 6.1.4

package/LICENSE.md

@@ -14,8 +14,17 @@ MIT License
 
 Copyright (c) <year> <copyright holders>
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and 
+associated documentation files (the "Software"), to deal in the Software without restriction, including 
+without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
+copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the 
+following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial 
+portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT 
+LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO 
+EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE 
+USE OR OTHER DEALINGS IN THE SOFTWARE.

package/dist/analyze.js

@@ -1,2 +1,2 @@
 import { execaCommand } from 'execa';
-export default (() => execaCommand('nuxt build --analyze'));
+export default () => execaCommand('nuxt build --analyze');

package/dist/config.js

@@ -1,15 +1,11 @@
-import jitiBabelTransform from '@dword-design/jiti-babel-transform';
-import jiti from 'jiti';
+import pathLib from 'path';
+import { pathToFileURL } from 'url';
 let config;
 try {
-  const jitiInstance = jiti(process.cwd(), {
-    esmResolve: true,
-    interopDefault: true,
-    transform: jitiBabelTransform
-  });
-  config = jitiInstance('./config.js');
+  const modulePath = pathLib.join(process.cwd(), 'config.js');
+  config = (await import(pathToFileURL(modulePath).href)).default;
 } catch (error) {
-  if (error.message.startsWith("Cannot find module './config.js'\n")) {
+  if (error.code === 'ERR_MODULE_NOT_FOUND') {
     config = {};
   } else {
     throw error;

package/dist/depcheck-special.js

@@ -1,12 +1,12 @@
 import { filter, first, map } from '@dword-design/functions';
 import jitiBabelTransform from '@dword-design/jiti-babel-transform';
-import jiti from 'jiti';
+import { createJiti } from 'jiti';
 import P from 'path';
 import requirePackageName from 'require-package-name';
-export default (path => {
+export default path => {
   if (P.basename(path) === 'config.js') {
     var _ref, _ref2, _modules;
-    const jitiInstance = jiti(process.cwd(), {
+    const jitiInstance = createJiti(process.cwd(), {
       esmResolve: true,
       interopDefault: true,
       transform: jitiBabelTransform
@@ -19,4 +19,4 @@ export default (path => {
     })(_modules)), filter(name => typeof name === 'string')(_ref2)), map(name => requirePackageName(name))(_ref);
   }
   return [];
-});
+};

package/dist/dev.js

@@ -2,7 +2,7 @@ import { execa } from 'execa';
 import { createRequire } from 'module';
 const _require = createRequire(import.meta.url);
 const nuxtWrapper = _require.resolve('./nuxt-wrapper.js');
-export default ((options = {}) => {
+export default (options = {}) => {
   options = {
     log: process.env.NODE_ENV !== 'test',
     ...options
@@ -10,4 +10,4 @@ export default ((options = {}) => {
   return execa(nuxtWrapper, ['dev'], {
     [options.log ? 'stdio' : 'stderr']: 'inherit'
   });
-});
+};

package/dist/get-eslint-config.js

@@ -1,5 +1,5 @@
 import packageName from 'depcheck-package-name';
-export default (config => ({
+export default config => ({
   extends: packageName`@dword-design/eslint-config`,
   globals: {
     $fetch: 'readonly'
@@ -11,9 +11,16 @@ export default (config => ({
     }
   }],
   rules: {
+    'import/extensions': ['error', 'always', {
+      ignorePackages: true,
+      pathGroupOverrides: [{
+        action: 'ignore',
+        pattern: '#*/**'
+      }]
+    }],
     'import/no-unresolved': ['error', {
       ignore: ['#imports', '#components', ...config.importAliases]
     }],
     'import/no-webpack-loader-syntax': 'off'
   }
-}));
+});

package/dist/index.js

@@ -16,7 +16,7 @@ import start from "./start.js";
 const __dirname = P.dirname(fileURLToPath(import.meta.url));
 const _require = createRequire(import.meta.url);
 const isInNodeModules = __dirname.split(P.sep).includes('node_modules');
-export default ((config = {}) => {
+export default (config = {}) => {
   config.importAliases = config.importAliases || [];
   return {
     allowedMatches: ['.stylelintrc.json', 'server/api/**/*.js', 'server/plugins/**/*.js', 'server/routes/**/*.js', 'server/middleware/**/*.js', 'app.vue', 'assets', 'components', 'composables', 'content', 'i18n', 'layouts', 'middleware', 'model', 'modules', 'config.js', 'pages', 'plugins', 'public', 'store', 'types'],
@@ -49,14 +49,15 @@ export default ((config = {}) => {
           extends: packageName`@dword-design/stylelint-config`
         }, undefined, 2)}\n`,
         'nuxt.config.js': javascript`
-          import deepmerge from '${packageName`deepmerge`}'
-          import config from '${configPath}'
-          import parentConfig from '${parentConfigPath}'
+          import config from '${configPath}';
 
-          export default deepmerge(parentConfig, config)\n
+          export default {
+            extends: ['${parentConfigPath}'],
+            ...config,
+          };\n
         `
       });
     },
     useJobMatrix: true
   };
-});
+};

package/dist/lint.js

@@ -1,5 +1,5 @@
 import { execaCommand } from 'execa';
-export default (async (options = {}) => {
+export default async (options = {}) => {
   options = {
     log: process.env.NODE_ENV !== 'test',
     ...options
@@ -10,4 +10,4 @@ export default (async (options = {}) => {
   await execaCommand('stylelint --fix --allow-empty-input --ignore-path .gitignore **/*.{css,scss,vue}', ...(options.log ? [{
     stdio: 'inherit'
   }] : []));
-});
+};

package/dist/manually-installed-modules/i18n/index.js

@@ -0,0 +1,48 @@
+import { addPlugin, createResolver, defineNuxtModule, installModule } from '@nuxt/kit';
+import packageName from 'depcheck-package-name';
+import { globby } from 'globby';
+import P from 'path';
+const resolver = createResolver(import.meta.url);
+export default defineNuxtModule({
+  setup: async (options, nuxt) => {
+    const locales = (await globby('*.json', {
+      cwd: P.join(nuxt.options.srcDir, 'i18n')
+    })).map(filename => P.basename(filename, '.json'));
+    const defaultLocale = locales.includes('en') ? 'en' : locales[0];
+    if (locales.length === 0) {
+      return;
+    }
+
+    /**
+     * @nuxtjs/i18n won't be able to merge the locales because it will not be in the layer configs
+     * since we install it via @nuxtjs/i18n (see applyLayerOptions calling getLayerI18n).
+     * So we add the locales via the hook.
+     */
+    nuxt.hook('i18n:registerModule', register => register({
+      langDir: P.join(nuxt.options.srcDir, 'i18n'),
+      // Set to '.' when passed directly as inline module options
+      locales: locales.map(locale => ({
+        code: locale,
+        file: `${locale}.json`,
+        language: locale
+      }))
+    }));
+    await installModule(packageName`@nuxtjs/i18n`, {
+      defaultLocale,
+      detectBrowserLanguage: locales.length === 1 ? false : {
+        fallbackLocale: defaultLocale,
+        redirectOn: 'no prefix',
+        useCookie: false
+      },
+      lazy: true,
+      strategy: `${locales.length === 1 ? 'no_' : ''}prefix`,
+      ...(process.env.BASE_URL && {
+        baseUrl: process.env.BASE_URL
+      })
+    });
+    addPlugin(resolver.resolve('./plugin.js'), {
+      append: true
+    });
+    await installModule(resolver.resolve('../locale-link/index.js'));
+  }
+});

package/dist/manually-installed-modules/locale-link/component.vue

@@ -0,0 +1,12 @@
+<template>
+  <nuxt-link v-bind="$attrs" :to="localePath(to)">
+    <slot />
+  </nuxt-link>
+</template>
+
+<script setup>
+import { useLocalePath } from '#imports';
+
+defineProps({ to: { required: true } });
+const localePath = useLocalePath();
+</script>

package/dist/manually-installed-modules/locale-link/index.js

@@ -0,0 +1,8 @@
+import { addComponent, createResolver, defineNuxtModule } from '@nuxt/kit';
+const resolver = createResolver(import.meta.url);
+export default defineNuxtModule({
+  setup: () => addComponent({
+    filePath: resolver.resolve('./component.vue'),
+    name: 'NuxtLocaleLink'
+  })
+});

package/dist/nuxt.config.js

@@ -1,5 +1,6 @@
 import packageName from 'depcheck-package-name';
 import { createRequire } from 'module';
+import viteSvgLoader from 'vite-svg-loader';
 import config from "./config.js";
 const resolver = createRequire(import.meta.url);
 const isBasicAuthEnabled = process.env.BASIC_AUTH_USER && process.env.BASIC_AUTH_PASSWORD;
@@ -23,6 +24,12 @@ export default {
   devtools: {
     enabled: true
   },
+  i18n: {
+    bundle: {
+      optimizeTranslationDirective: false
+    }
+  },
+  // @nuxtjs/i18n only checks global options, not inline options, so it needs to be declared here.
   modules: [(options, nuxt) => {
     if (!config.userScalable) {
       const viewportMeta = nuxt.options.app.head.meta.find(meta => meta.name === 'viewport');
@@ -40,7 +47,7 @@ export default {
     failOnWarning: true,
     fix: true,
     lintOnStart: false
-  }], resolver.resolve('./modules/i18n/index.js'), resolver.resolve('./modules/locale-link/index.js'), resolver.resolve('./modules/svg.js')],
+  }], resolver.resolve('./manually-installed-modules/i18n/index.js')],
   plugins: [resolver.resolve('./plugins/title.js')],
   router: {
     options: {
@@ -50,6 +57,9 @@ export default {
   runtimeConfig: {
     public: {
       name: config.name,
+      site: {
+        url: 'https://example.com'
+      },
       title: config.title
     },
     ...(isBasicAuthEnabled && {
@@ -58,7 +68,10 @@ export default {
           [process.env.BASIC_AUTH_USER]: process.env.BASIC_AUTH_PASSWORD
         }
       }
-    })
+    }),
+    site: {
+      url: 'https://example.com'
+    }
   },
   vite: {
     css: {
@@ -66,6 +79,7 @@ export default {
         localsConvention: 'camelCaseOnly'
       }
     },
+    plugins: [viteSvgLoader()],
     vue: {
       template: {
         transformAssetUrls: false

package/dist/prepublish-only.js

@@ -4,7 +4,7 @@ import { createRequire } from 'module';
 import lint from "./lint.js";
 const _require = createRequire(import.meta.url);
 const nuxtWrapper = _require.resolve('./nuxt-wrapper.js');
-export default (async (options = {}) => {
+export default async (options = {}) => {
   options = {
     log: process.env.NODE_ENV !== 'test',
     ...options
@@ -29,4 +29,4 @@ export default (async (options = {}) => {
     }] : []));
   }
   return nuxt;
-});
+};

package/dist/start.js

@@ -2,7 +2,7 @@ import { execa } from 'execa';
 import { createRequire } from 'module';
 const _require = createRequire(import.meta.url);
 const nuxtWrapper = _require.resolve('./nuxt-wrapper.js');
-export default ((options = {}) => {
+export default (options = {}) => {
   options = {
     log: process.env.NODE_ENV !== 'test',
     ...options
@@ -10,4 +10,4 @@ export default ((options = {}) => {
   return execa(nuxtWrapper, ['start'], ...(options.log ? [{
     stdio: 'inherit'
   }] : []));
-});
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dword-design/base-config-nuxt",
-  "version": "6.1.2",
+  "version": "6.1.4",
   "repository": "dword-design/base-config-nuxt",
   "funding": "https://github.com/sponsors/dword-design",
   "license": "MIT",
@@ -28,47 +28,46 @@
   "dependencies": {
     "@dword-design/depcheck-parser-sass": "^4.0.4",
     "@dword-design/dotenv-json-extended": "^2.0.25",
-    "@dword-design/functions": "^6.0.1",
+    "@dword-design/functions": "^6.0.2",
     "@dword-design/jiti-babel-transform": "^2.0.0",
-    "@dword-design/stylelint-config": "^4.0.0",
-    "@nuxt/kit": "^3.12.4",
+    "@dword-design/stylelint-config": "^4.0.1",
+    "@nuxt/kit": "^3.16.2",
     "@nuxtjs/eslint-module": "^4.1.0",
-    "@nuxtjs/i18n": "npm:@dword-design/nuxt-i18n@^0.0.5",
-    "@nuxtjs/stylelint-module": "^5.2.0",
-    "deepmerge": "^4.3.1",
+    "@nuxtjs/i18n": "^9.5.3",
+    "@nuxtjs/stylelint-module": "^5.2.1",
     "depcheck-package-name": "^3.0.1",
     "depcheck-parser-vue": "^5.0.0",
-    "execa": "^9.3.1",
-    "fs-extra": "^11.2.0",
-    "globby": "^14.0.2",
-    "jiti": "^1.21.6",
-    "nuxt": "^3.12.4",
-    "nuxt-babel-runtime": "^5.0.6",
+    "execa": "^9.5.2",
+    "fs-extra": "^11.3.0",
+    "globby": "^14.1.0",
+    "jiti": "^2.4.2",
+    "nuxt": "^3.16.2",
+    "nuxt-babel-runtime": "^5.0.10",
     "nuxt-basic-authentication-module": "^0.2.1",
     "output-files": "^2.0.32",
     "require-package-name": "^2.0.1",
-    "stylelint": "^16.8.2",
+    "stylelint": "^16.18.0",
     "vite-svg-loader": "^5.1.0"
   },
   "devDependencies": {
-    "@dword-design/base": "^11.2.3",
-    "@dword-design/puppeteer": "^7.0.2",
+    "@dword-design/base": "^11.2.10",
     "@dword-design/tester": "^2.0.19",
-    "@dword-design/tester-plugin-puppeteer": "^3.0.3",
     "@dword-design/tester-plugin-tmp-dir": "^2.1.26",
-    "@funken-studio/sitemap-nuxt-3": "^4.0.4",
-    "axios": "^1.7.4",
+    "@nuxtjs/sitemap": "^7.2.10",
+    "axios": "^1.8.4",
     "depcheck": "^1.4.7",
     "expect": "^29.7.0",
     "nuxt-dev-ready": "^3.0.0",
+    "playwright": "^1.51.1",
+    "playwright-chromium": "^1.51.1",
     "port-ready": "^0.1.0",
     "tree-kill-promise": "^3.0.14",
-    "xml-formatter": "^3.6.3"
+    "xml-formatter": "^3.6.5"
   },
   "peerDependencies": {
     "h3": "*"
   },
-  "packageManager": "pnpm@9.7.1+sha512.faf344af2d6ca65c4c5c8c2224ea77a81a5e8859cbc4e06b1511ddce2f0151512431dd19e6aff31f2c6a8f5f2aced9bd2273e1fed7dd4de1868984059d2c4247",
+  "packageManager": "pnpm@10.8.0+sha512.0e82714d1b5b43c74610193cb20734897c1d00de89d0e18420aebc5977fa13d780a9cb05734624e81ebd81cc876cd464794850641c48b9544326b5622ca29971",
   "engines": {
     "node": ">=18"
   },

package/dist/modules/i18n/index.js

@@ -1,36 +0,0 @@
-import { addPlugin, createResolver, installModule } from '@nuxt/kit';
-import packageName from 'depcheck-package-name';
-import { globby } from 'globby';
-import P from 'path';
-const resolver = createResolver(import.meta.url);
-export default (async (options, nuxt) => {
-  const locales = (await globby('*.json', {
-    cwd: P.join(nuxt.options.srcDir, 'i18n')
-  })).map(filename => P.basename(filename, '.json'));
-  const defaultLocale = locales.includes('en') ? 'en' : locales[0];
-  if (locales.length === 0) {
-    return;
-  }
-  await installModule(packageName`@nuxtjs/i18n`, {
-    defaultLocale,
-    detectBrowserLanguage: locales.length === 1 ? false : {
-      fallbackLocale: defaultLocale,
-      redirectOn: 'no prefix',
-      useCookie: false
-    },
-    langDir: 'i18n',
-    lazy: true,
-    locales: locales.map(locale => ({
-      code: locale,
-      file: `${locale}.json`,
-      iso: locale
-    })),
-    strategy: `${locales.length === 1 ? 'no_' : ''}prefix`,
-    ...(process.env.BASE_URL && {
-      baseUrl: process.env.BASE_URL
-    })
-  });
-  addPlugin(resolver.resolve('./plugin.js'), {
-    append: true
-  });
-});

package/dist/modules/locale-link/component.vue

@@ -1,9 +0,0 @@
-<template>
-  <nuxt-link v-bind="$attrs" :to="localePath(to)">
-    <slot />
-  </nuxt-link>
-</template>
-
-<script>
-export default { props: { to: { required: true } } };
-</script>

package/dist/modules/locale-link/index.js

@@ -1,16 +0,0 @@
-import { addPlugin, addTemplate, createResolver } from '@nuxt/kit';
-import P from 'path';
-const resolver = createResolver(import.meta.url);
-export default (() => {
-  addTemplate({
-    filename: P.join('nuxt-locale-link', 'component.vue'),
-    src: resolver.resolve('./component.vue'),
-    write: true
-  });
-  addPlugin({
-    filename: P.join('nuxt-locale-link', 'plugin.js'),
-    src: resolver.resolve('./plugin')
-  }, {
-    append: true
-  });
-});

package/dist/modules/svg.js

@@ -1,5 +0,0 @@
-import svgLoader from 'vite-svg-loader';
-export default ((moduleOptions, nuxt) => {
-  nuxt.options.vite.plugins = nuxt.options.vite.plugins || [];
-  nuxt.options.vite.plugins.push(svgLoader());
-});