@dword-design/base-config-nuxt 6.2.1 → 6.2.3

package/dist/build.js

@@ -1,6 +1,6 @@
+import { createRequire } from 'node:module';
 import { execa } from 'execa';
 import fs from 'fs-extra';
-import { createRequire } from 'module';
 const _require = createRequire(import.meta.url);
 const nuxtWrapper = _require.resolve('./nuxt-wrapper.js');
 export default async (options = {}) => {

package/dist/config.js

@@ -1,16 +1,17 @@
-import pathLib from 'path';
-import { pathToFileURL } from 'url';
-let config;
+import pathLib from 'node:path';
+import { pathToFileURL } from 'node:url';
 const moduleUrl = pathToFileURL(pathLib.join(process.cwd(), 'config.js')).href;
-try {
-  config = (await import(moduleUrl)).default;
-} catch (error) {
+const {
+  default: config
+} = await import(moduleUrl).catch(error => {
   if (error.code === 'ERR_MODULE_NOT_FOUND' && error.url === moduleUrl) {
-    config = {};
+    return {
+      default: {}
+    };
   } else {
     throw error;
   }
-}
+});
 export default {
   name: 'Vue app',
   userScalable: true,

package/dist/depcheck-special.js

@@ -1,7 +1,7 @@
+import P from 'node:path';
 import { filter, first, map } from '@dword-design/functions';
 import jitiBabelTransform from '@dword-design/jiti-babel-transform';
 import { createJiti } from 'jiti';
-import P from 'path';
 import requirePackageName from 'require-package-name';
 export default path => {
   if (P.basename(path) === 'config.js') {
@@ -14,8 +14,8 @@ export default path => {
     const config = jitiInstance('./config.js');
     const modules = [...(config.modules || []), ...(config.buildModules || [])];
     return _ref = (_ref2 = (_modules = modules, map(mod => {
-      var _concat;
-      return _concat = [].concat(mod), first(_concat);
+      var _flat;
+      return _flat = [mod].flat(), first(_flat);
     })(_modules)), filter(name => typeof name === 'string')(_ref2)), map(name => requirePackageName(name))(_ref);
   }
   return [];

package/dist/dev.js

@@ -1,5 +1,5 @@
+import { createRequire } from 'node:module';
 import { execa } from 'execa';
-import { createRequire } from 'module';
 const _require = createRequire(import.meta.url);
 const nuxtWrapper = _require.resolve('./nuxt-wrapper.js');
 export default (options = {}) => {

package/dist/eslint-config.js

@@ -0,0 +1,16 @@
+import { endent } from '@dword-design/functions';
+export default endent`
+  import config from '@dword-design/eslint-config';
+
+  import withNuxt from './.nuxt/eslint.config.mjs';
+
+  export default withNuxt(
+    config,
+    {
+      files: ['eslint.config.js'],
+      rules: {
+        'import/no-extraneous-dependencies': 'off',
+      },
+    },
+  );
+`;

package/dist/index.js

@@ -1,65 +1,62 @@
+import { createRequire } from 'node:module';
+import P from 'node:path';
+import { fileURLToPath } from 'node:url';
 import depcheckParserSass from '@dword-design/depcheck-parser-sass';
 import { endent as javascript } from '@dword-design/functions';
 import packageName from 'depcheck-package-name';
 import depcheckParserVue from 'depcheck-parser-vue';
-import { createRequire } from 'module';
 import outputFiles from 'output-files';
-import P from 'path';
-import { fileURLToPath } from 'url';
 import analyze from "./analyze.js";
 import build from "./build.js";
 import depcheckSpecial from "./depcheck-special.js";
 import dev from "./dev.js";
-import getEslintConfig from "./get-eslint-config.js";
+import eslintConfig from "./eslint-config.js";
 import lint from "./lint.js";
 import prepublishOnly from "./prepublish-only.js";
 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 = {}) => {
-  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'],
-    commands: {
-      analyze,
-      build,
-      dev,
-      prepublishOnly,
-      start
+export default {
+  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'],
+  commands: {
+    analyze,
+    build,
+    dev,
+    prepublishOnly,
+    start
+  },
+  depcheckConfig: {
+    parsers: {
+      '**/*.scss': depcheckParserSass,
+      '**/*.vue': depcheckParserVue
     },
-    depcheckConfig: {
-      parsers: {
-        '**/*.scss': depcheckParserSass,
-        '**/*.vue': depcheckParserVue
-      },
-      specials: [depcheckSpecial]
-    },
-    editorIgnore: ['.eslintcache', '.stylelintcache', '.stylelintrc.json', '.nuxt', '.output', 'dist', 'nuxt.config.js'],
-    eslintConfig: getEslintConfig(config),
-    gitignore: ['/.eslintcache', '/.nuxt', '/.output', '/.stylelintcache', '/dist', '/nuxt.config.js'],
-    lint,
-    npmPublish: true,
-    packageConfig: {
-      main: 'dist/index.js'
-    },
-    prepare: async () => {
-      const configPath = isInNodeModules ? '@dword-design/base-config-nuxt/config' : `./${P.relative(process.cwd(), _require.resolve('./config.js')).split(P.sep).join('/')}`;
-      const parentConfigPath = isInNodeModules ? '@dword-design/base-config-nuxt/nuxt.config' : `./${P.relative(process.cwd(), _require.resolve('./nuxt.config.js')).split(P.sep).join('/')}`;
-      await outputFiles({
-        '.stylelintrc.json': `${JSON.stringify({
-          extends: packageName`@dword-design/stylelint-config`
-        }, undefined, 2)}\n`,
-        'nuxt.config.js': javascript`
-          import config from '${configPath}';
+    specials: [depcheckSpecial]
+  },
+  editorIgnore: ['.stylelintcache', '.stylelintrc.json', '.nuxt', '.output', 'dist', 'nuxt.config.js'],
+  eslintConfig,
+  gitignore: ['/.nuxt', '/.output', '/.stylelintcache', '/dist', '/nuxt.config.js'],
+  lint,
+  npmPublish: true,
+  packageConfig: {
+    main: 'dist/index.js'
+  },
+  prepare: async () => {
+    const configPath = isInNodeModules ? '@dword-design/base-config-nuxt/config' : `./${P.relative(process.cwd(), _require.resolve('./config.js')).split(P.sep).join('/')}`;
+    const parentConfigPath = isInNodeModules ? '@dword-design/base-config-nuxt/nuxt.config' : `./${P.relative(process.cwd(), _require.resolve('./nuxt.config.js')).split(P.sep).join('/')}`;
+    await outputFiles({
+      '.stylelintrc.json': `${JSON.stringify({
+        extends: packageName`@dword-design/stylelint-config`
+      }, undefined, 2)}\n`,
+      'nuxt.config.js': javascript`
+        import config from '${configPath}';
 
-          export default {
-            extends: ['${parentConfigPath}'],
-            ...config,
-          };\n
-        `
-      });
-    },
-    useJobMatrix: true
-  };
+        export default {
+          extends: ['${parentConfigPath}'],
+          ...config,
+        };\n
+      `
+    });
+  },
+  useJobMatrix: true
 };

package/dist/lint.js

@@ -1,10 +1,13 @@
-import { execaCommand } from 'execa';
+import { createRequire } from 'node:module';
+import { execa, execaCommand } from 'execa';
+const resolver = createRequire(import.meta.url);
+const nuxtWrapper = resolver.resolve('./nuxt-wrapper.js');
 export default async (options = {}) => {
   options = {
     log: process.env.NODE_ENV !== 'test',
     ...options
   };
-  await execaCommand('eslint --fix --ignore-path .gitignore --ext .js,.json,.vue .', ...(options.log ? [{
+  await execa(nuxtWrapper, ['prepare'], ...(options.log ? [{
     stdio: 'inherit'
   }] : []));
   await execaCommand('stylelint --fix --allow-empty-input --ignore-path .gitignore **/*.{css,scss,vue}', ...(options.log ? [{

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

@@ -1,13 +1,14 @@
+import P from 'node:path';
 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', {
+    const filenames = await globby('*.json', {
       cwd: P.join(nuxt.options.srcDir, 'i18n')
-    })).map(filename => P.basename(filename, '.json'));
+    });
+    const locales = filenames.map(filename => P.basename(filename, '.json'));
     const defaultLocale = locales.includes('en') ? 'en' : locales[0];
     if (locales.length === 0) {
       return;

package/dist/nuxt-wrapper.js

@@ -1,7 +1,10 @@
 #!/usr/bin/env node
 import dotenv from '@dword-design/dotenv-json-extended';
-import { execa } from 'execa';
+import { x } from 'tinyexec';
 dotenv.config();
-execa('nuxt-babel', process.argv.slice(2), {
-  stdio: 'inherit'
+x('nuxt', process.argv.slice(2), {
+  nodeOptions: {
+    stdio: 'inherit'
+  },
+  throwOnError: true
 });

package/dist/nuxt.config.js

@@ -1,5 +1,5 @@
+import { createRequire } from 'node:module';
 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);
@@ -24,6 +24,14 @@ export default {
   devtools: {
     enabled: true
   },
+  eslint: {
+    checker: {
+      fix: true
+    },
+    config: {
+      standalone: false
+    }
+  },
   i18n: {
     bundle: {
       optimizeTranslationDirective: false
@@ -37,12 +45,7 @@ export default {
     }
   }, [packageName`nuxt-basic-authentication-module`, {
     enabled: !!isBasicAuthEnabled
-  }], [packageName`@nuxtjs/eslint-module`, {
-    cache: false,
-    failOnWarning: true,
-    fix: true,
-    lintOnStart: false
-  }], [packageName`@nuxtjs/stylelint-module`, {
+  }], packageName`@nuxt/eslint`, [packageName`@nuxtjs/stylelint-module`, {
     allowEmptyInput: true,
     failOnWarning: true,
     fix: true,

package/dist/prepublish-only.js

@@ -1,10 +1,4 @@
-import build from "./build.js";
-import lint from "./lint.js";
-export default async (options = {}) => {
-  options = {
-    log: process.env.NODE_ENV !== 'test',
-    ...options
-  };
-  await lint(options);
-  return build(options);
-};
+export default async function (options) {
+  await this.lint(options);
+  return this.run('build', options);
+}

package/dist/start.js

@@ -1,7 +1,7 @@
+import { createRequire } from 'node:module';
 import { execa } from 'execa';
-import { createRequire } from 'module';
-const _require = createRequire(import.meta.url);
-const nuxtWrapper = _require.resolve('./nuxt-wrapper.js');
+const resolver = createRequire(import.meta.url);
+const nuxtWrapper = resolver.resolve('./nuxt-wrapper.js');
 export default (options = {}) => {
   options = {
     log: process.env.NODE_ENV !== 'test',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dword-design/base-config-nuxt",
-  "version": "6.2.1",
+  "version": "6.2.3",
   "repository": "dword-design/base-config-nuxt",
   "funding": "https://github.com/sponsors/dword-design",
   "license": "MIT",
@@ -31,38 +31,40 @@
     "@dword-design/functions": "^6.0.2",
     "@dword-design/jiti-babel-transform": "^2.0.0",
     "@dword-design/stylelint-config": "^4.0.2",
-    "@nuxt/kit": "^3.17.1",
-    "@nuxtjs/eslint-module": "^4.1.0",
+    "@nuxt/eslint": "^1.4.1",
+    "@nuxt/kit": "^3.17.4",
     "@nuxtjs/i18n": "^9.5.4",
     "@nuxtjs/stylelint-module": "^5.2.1",
     "depcheck-package-name": "^3.0.1",
     "depcheck-parser-vue": "^5.0.0",
-    "execa": "^9.5.2",
+    "execa": "^9.6.0",
     "fs-extra": "^11.3.0",
     "globby": "^14.1.0",
     "jiti": "^2.4.2",
-    "nuxt": "^3.17.1",
-    "nuxt-babel-runtime": "^5.0.12",
+    "nuxt": "^3.17.4",
     "nuxt-basic-authentication-module": "^0.2.1",
     "output-files": "^2.0.32",
     "require-package-name": "^2.0.1",
     "stylelint": "^16.19.1",
+    "tinyexec": "^1.0.1",
+    "vite-plugin-eslint2": "^5.0.3",
     "vite-svg-loader": "^5.1.0"
   },
   "devDependencies": {
-    "@dword-design/base": "^11.3.3",
+    "@dword-design/base": "^12.0.13",
     "@dword-design/tester": "^2.0.19",
     "@dword-design/tester-plugin-tmp-dir": "^2.1.26",
-    "@nuxtjs/sitemap": "^7.2.10",
+    "@nuxtjs/sitemap": "^7.3.0",
     "axios": "^1.9.0",
     "depcheck": "^1.4.7",
     "expect": "^29.7.0",
     "nuxt-dev-ready": "^3.0.0",
+    "p-wait-for": "^5.0.2",
     "playwright": "^1.52.0",
     "playwright-chromium": "^1.52.0",
     "port-ready": "^0.1.0",
     "tree-kill-promise": "^3.0.14",
-    "xml-formatter": "^3.6.5"
+    "xml-formatter": "^3.6.6"
   },
   "peerDependencies": {
     "h3": "*"

package/dist/get-eslint-config.js

@@ -1,26 +0,0 @@
-import packageName from 'depcheck-package-name';
-export default config => ({
-  extends: packageName`@dword-design/eslint-config`,
-  globals: {
-    $fetch: 'readonly'
-  },
-  overrides: [{
-    files: 'pages/**/*.vue',
-    globals: {
-      definePageMeta: 'readonly'
-    }
-  }],
-  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'
-  }
-});