@dword-design/base-config-nuxt 5.0.5 → 5.0.7

package/dist/{eslint.config.js → get-eslint-config.js}

@@ -1,13 +1,19 @@
 import packageName from 'depcheck-package-name';
-export default {
+export default (config => ({
   extends: packageName`@dword-design/eslint-config`,
   globals: {
     $fetch: 'readonly'
   },
+  overrides: [{
+    files: 'pages/**/*.vue',
+    globals: {
+      definePageMeta: 'readonly'
+    }
+  }],
   rules: {
     'import/no-unresolved': ['error', {
-      ignore: ['#imports']
+      ignore: ['#imports', '#components', ...config.importAliases]
     }],
     'import/no-webpack-loader-syntax': 'off'
   }
-};
+}));

package/dist/index.js

@@ -11,78 +11,81 @@ import { fileURLToPath } from 'url';
 import analyze from "./analyze.js";
 import depcheckSpecial from "./depcheck-special.js";
 import dev from "./dev.js";
-import eslintConfig from "./eslint.config.js";
+import getEslintConfig from "./get-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 {
-  allowedMatches: ['.stylelintrc.json', 'server/api/**/*.js', 'server/plugins/**/*.js', 'server/routes/**/*.js', 'server/middleware/**/*.js', 'assets', 'components', 'composables', 'content', 'i18n', 'layouts', 'middleware', 'model', 'modules', 'config.js', 'pages', 'plugins', 'public', 'store', 'types'],
-  commands: {
-    analyze,
-    dev,
-    prepublishOnly,
-    start
-  },
-  depcheckConfig: {
-    parsers: {
-      '**/*.scss': depcheckParserSass,
-      '**/*.vue': depcheckParserVue
+export default ((config = {}) => {
+  config.importAliases = config.importAliases || [];
+  return {
+    allowedMatches: ['.stylelintrc.json', 'server/api/**/*.js', 'server/plugins/**/*.js', 'server/routes/**/*.js', 'server/middleware/**/*.js', 'assets', 'components', 'composables', 'content', 'i18n', 'layouts', 'middleware', 'model', 'modules', 'config.js', 'pages', 'plugins', 'public', 'store', 'types'],
+    commands: {
+      analyze,
+      dev,
+      prepublishOnly,
+      start
     },
-    specials: [depcheckSpecial]
-  },
-  editorIgnore: ['.eslintcache', '.stylelintcache', '.stylelintrc.json', '.nuxt', '.output', 'app.vue', 'dist', 'nuxt.config.js'],
-  eslintConfig,
-  gitignore: ['/.eslintcache', '/.nuxt', '/.output', '/.stylelintcache', '/app.vue', '/dist', '/nuxt.config.js'],
-  lint,
-  nodeVersion: 18,
-  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('/')}`;
-    const translations = await globby('i18n/*.json');
-    const hasI18n = translations.length > 0;
-    await outputFiles({
-      '.stylelintrc.json': `${JSON.stringify({
-        extends: packageName`@dword-design/stylelint-config`
-      }, undefined, 2)}\n`,
-      'app.vue': endent`
-        <template>
-          <NuxtLayout>
-            <NuxtPage />
-          </NuxtLayout>
-        </template>
+    depcheckConfig: {
+      parsers: {
+        '**/*.scss': depcheckParserSass,
+        '**/*.vue': depcheckParserVue
+      },
+      specials: [depcheckSpecial]
+    },
+    editorIgnore: ['.eslintcache', '.stylelintcache', '.stylelintrc.json', '.nuxt', '.output', 'app.vue', 'dist', 'nuxt.config.js'],
+    eslintConfig: getEslintConfig(config),
+    gitignore: ['/.eslintcache', '/.nuxt', '/.output', '/.stylelintcache', '/app.vue', '/dist', '/nuxt.config.js'],
+    lint,
+    nodeVersion: 18,
+    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('/')}`;
+      const translations = await globby('i18n/*.json');
+      const hasI18n = translations.length > 0;
+      await outputFiles({
+        '.stylelintrc.json': `${JSON.stringify({
+          extends: packageName`@dword-design/stylelint-config`
+        }, undefined, 2)}\n`,
+        'app.vue': endent`
+          <template>
+            <NuxtLayout>
+              <NuxtPage />
+            </NuxtLayout>
+          </template>
 
-        <script setup>
-        import { ${['useHead', ...(hasI18n ? ['useLocaleHead'] : []), 'useRuntimeConfig'].join(', ')} } from '#imports'
+          <script setup>
+          import { ${['useHead', ...(hasI18n ? ['useLocaleHead'] : []), 'useRuntimeConfig'].join(', ')} } from '#imports'
 
-        ${[hasI18n ? ['const i18nHead = useLocaleHead({ addSeoAttributes: true })'] : [], 'const runtimeConfig = useRuntimeConfig()'].join('\n')}
+          ${[hasI18n ? ['const i18nHead = useLocaleHead({ addSeoAttributes: true })'] : [], 'const runtimeConfig = useRuntimeConfig()'].join('\n')}
 
-        useHead({
-          ${[...(hasI18n ? [endent`
-                    htmlAttrs: {
-                      lang: i18nHead.value.htmlAttrs.lang,
-                    },
-                    link: i18nHead.value.link,
-                    meta: i18nHead.value.meta,
-                  `] : []), "titleTemplate: title => title ? `${title} | ${runtimeConfig.public.name}` : `${runtimeConfig.public.name}${runtimeConfig.public.title ? `: ${runtimeConfig.public.title}` : ''}`"].join('\n')}
-        })
-        </script>\n
-      `,
-      'nuxt.config.js': javascript`
-        import deepmerge from '${packageName`deepmerge`}'
-        import config from '${configPath}'
-        import parentConfig from '${parentConfigPath}'
+          useHead({
+            ${[...(hasI18n ? [endent`
+                      htmlAttrs: {
+                        lang: i18nHead.value.htmlAttrs.lang,
+                      },
+                      link: i18nHead.value.link,
+                      meta: i18nHead.value.meta,
+                    `] : []), "titleTemplate: title => title ? `${title} | ${runtimeConfig.public.name}` : `${runtimeConfig.public.name}${runtimeConfig.public.title ? `: ${runtimeConfig.public.title}` : ''}`"].join('\n')}
+          })
+          </script>\n
+        `,
+        'nuxt.config.js': javascript`
+          import deepmerge from '${packageName`deepmerge`}'
+          import config from '${configPath}'
+          import parentConfig from '${parentConfigPath}'
 
-        export default deepmerge(parentConfig, config)\n
-      `
-    });
-  },
-  supportedNodeVersions: [16, 18],
-  useJobMatrix: true
-};
+          export default deepmerge(parentConfig, config)\n
+        `
+      });
+    },
+    supportedNodeVersions: [16, 18],
+    useJobMatrix: true
+  };
+});

package/dist/nuxt.config.js

@@ -6,7 +6,6 @@ import packageName from 'depcheck-package-name';
 import vitePluginBabel from 'vite-plugin-babel';
 import vueSfcDescriptorToString from 'vue-sfc-descriptor-to-string';
 import config from "./config.js";
-// import expressModule from './modules/express/index.js'
 import i18nModule from "./modules/i18n.js";
 import localeLinkModule from "./modules/locale-link/index.js";
 import svgModule from "./modules/svg.js";
@@ -78,7 +77,7 @@ export default {
       enforce: 'pre',
       transform: async (code, id) => {
         const query = parseVueRequest(id);
-        if (query.filename.endsWith('.vue') && !query.filename.split('/').includes('node_modules')) {
+        if (query.filename.endsWith('.vue') && query.query.type !== 'style' && !query.filename.split('/').includes('node_modules')) {
           const sfc = parse(code);
           for (const section of ['scriptSetup', 'script']) {
             if (sfc.descriptor[section] && sfc.descriptor[section].lang === undefined) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dword-design/base-config-nuxt",
-  "version": "5.0.5",
+  "version": "5.0.7",
   "repository": "dword-design/base-config-nuxt",
   "funding": "https://github.com/sponsors/dword-design",
   "license": "MIT",
@@ -43,13 +43,10 @@
     "depcheck-package-name": "^3.0.0",
     "depcheck-parser-vue": "^4.0.7",
     "execa": "^7.1.1",
-    "express": "^4.17.1",
-    "express-mount-files": "npm:@dword-design/express-mount-files",
     "fs-extra": "^11.1.0",
     "globby": "^13.1.3",
     "jiti": "^1.18.2",
     "nuxt": "^3.2.3",
-    "nuxt-alias-path": "^1.0.0",
     "nuxt-basic-authentication-module": "^0.2.1",
     "output-files": "^2.0.0",
     "require-package-name": "^2.0.1",

package/dist/modules/express/handler.js

@@ -1,29 +0,0 @@
-import jitiBabelTransform from '@dword-design/jiti-babel-transform';
-import express from 'express';
-import mountFiles from 'express-mount-files';
-import { fromNodeMiddleware } from 'h3';
-import jiti from 'jiti';
-import P from 'path';
-import options from '#express/options.js';
-const jitiOptions = {
-  esmResolve: true,
-  interopDefault: true,
-  transform: jitiBabelTransform
-};
-const jitiInstance = jiti(options.srcDir, jitiOptions);
-let app = express().use(express.json()).use(express.urlencoded({
-  extended: false
-}));
-try {
-  const setupExpress = jitiInstance('./setup-express');
-  app = setupExpress(app);
-} catch (error) {
-  if (!error.message.startsWith("Cannot find module './setup-express'")) {
-    throw error;
-  }
-}
-app.use('/api', mountFiles(P.resolve(options.srcDir, 'api'), {
-  jitiOptions,
-  paramChar: '_'
-}));
-export default fromNodeMiddleware(app);

package/dist/modules/express/index.js

@@ -1,18 +0,0 @@
-import { addServerHandler, addTemplate, createResolver } from '@nuxt/kit';
-import nuxtAliasPath from 'nuxt-alias-path';
-import P from 'path';
-const resolver = createResolver(import.meta.url);
-const moduleName = 'express';
-export default ((options, nuxt) => {
-  addTemplate({
-    filename: P.join(moduleName, 'options.js'),
-    getContents: () => `export default ${JSON.stringify({
-      srcDir: nuxt.options.srcDir
-    }, undefined, 2)}`,
-    write: true
-  });
-  nuxt.options.alias[`#${moduleName}`] = nuxtAliasPath(moduleName, nuxt);
-  addServerHandler({
-    handler: resolver.resolve('./handler')
-  });
-});