@dword-design/base-config-nuxt 4.0.15 → 5.0.1

package/dist/config.js

@@ -0,0 +1,24 @@
+import dotenv from '@dword-design/dotenv-json-extended';
+import jitiBabelTransform from '@dword-design/jiti-babel-transform';
+import jiti from 'jiti';
+dotenv.config();
+let config;
+try {
+  const jitiInstance = jiti(process.cwd(), {
+    esmResolve: true,
+    interopDefault: true,
+    transform: jitiBabelTransform
+  });
+  config = jitiInstance('./config.js');
+} catch (error) {
+  if (error.message.startsWith("Cannot find module './config.js'\n")) {
+    config = {};
+  } else {
+    throw error;
+  }
+}
+export default {
+  name: 'Vue app',
+  userScalable: true,
+  ...config
+};

package/dist/index.js

@@ -7,6 +7,7 @@ import { globby } from 'globby';
 import { createRequire } from 'module';
 import outputFiles from 'output-files';
 import P from 'path';
+import { fileURLToPath } from 'url';
 import analyze from "./analyze.js";
 import depcheckSpecial from "./depcheck-special.js";
 import dev from "./dev.js";
@@ -14,7 +15,9 @@ 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 {
   allowedMatches: ['.stylelintrc.json', 'server/api/**/*.js', 'server/middleware/**/*.js', 'assets', 'components', 'content', 'i18n', 'layouts', 'middleware', 'model', 'modules', 'config.js', 'pages', 'plugins', 'public', 'store', 'types'],
   commands: {
@@ -40,13 +43,14 @@ export default {
     main: 'dist/index.js'
   },
   prepare: async () => {
-    const projectModulePath = `./${P.relative(process.cwd(), _require.resolve('./modules/project/index.js')).split(P.sep).join('/')}`;
+    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({
+      '.stylelintrc.json': `${JSON.stringify({
         extends: packageName`@dword-design/stylelint-config`
-      }, undefined, 2),
+      }, undefined, 2)}\n`,
       'app.vue': endent`
         <template>
           <NuxtLayout>
@@ -68,77 +72,15 @@ export default {
                     meta: i18nHead.value.meta,
                   `] : []), "titleTemplate: title => title ? `${title} | ${runtimeConfig.public.name}` : `${runtimeConfig.public.name}${runtimeConfig.public.title ? `: ${runtimeConfig.public.title}` : ''}`"].join('\n')}
         })
-        </script>
+        </script>\n
       `,
       'nuxt.config.js': javascript`
-        import projectModule from '${projectModulePath}'
-        import jiti from 'jiti'
-        import dotenv from '@dword-design/dotenv-json-extended'
-        import jitiBabelTransform from '@dword-design/jiti-babel-transform'
-        import { transform } from '@babel/core'
-        import { babel as rollupPluginBabel } from '${packageName`@rollup/plugin-babel`}'
-        import { parse } from 'vue/compiler-sfc'
-        import vueSfcDescriptorToString from '${packageName`vue-sfc-descriptor-to-string`}'
-        import { parseVueRequest } from '@vitejs/plugin-vue'
-        import P from 'path'
-
-        dotenv.config()
-
-        let options
-        try {
-          const jitiInstance = jiti(process.cwd(), {
-            esmResolve: true,
-            interopDefault: true,
-            transform: jitiBabelTransform,
-          })
-          options = jitiInstance('./config.js')
-        } catch (error) {
-          if (error.message.startsWith("Cannot find module './config.js'\\n")) {
-            options = {}
-          } else {
-            throw error
-          }
-        }
+        import config from '${configPath}'
 
         export default {
-          nitro: {
-            rollupConfig: {
-              plugins: [rollupPluginBabel({ babelHelpers: 'bundled' })],
-            },
-          },
-          modules: [
-            [projectModule, options],
-          ],
-          vite: {
-            plugins: [
-              {
-                enforce: 'pre',
-                transform: async (code, id) => {
-                  const query = parseVueRequest(id)
-                  if (query.filename.endsWith('.vue') && !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) {
-                        sfc.descriptor[section].content = await transform(sfc.descriptor[section].content, {
-                          plugins: [['@babel/plugin-proposal-pipeline-operator', { proposal: 'fsharp' }]]
-                        }).code
-                      }
-                    }
-                    return vueSfcDescriptorToString(sfc.descriptor)
-                  }
-                  return code
-                },
-              }
-            ],
-            vue: {
-              template: {
-                transformAssetUrls: {
-                  includeAbsolute: false,
-                },
-              },
-            },
-          },
-        }
+          extends: '${parentConfigPath}',
+          ...config,
+        }\n
       `
     });
   },

package/dist/nuxt.config.js

@@ -0,0 +1,105 @@
+import { transform } from '@babel/core';
+import { babel as rollupPluginBabel } from '@rollup/plugin-babel';
+import { parseVueRequest } from '@vitejs/plugin-vue';
+import { parse } from '@vue/compiler-sfc';
+import packageName from 'depcheck-package-name';
+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/index.js";
+import localeLinkModule from "./modules/locale-link/index.js";
+import svgModule from "./modules/svg.js";
+const isBasicAuthEnabled = process.env.BASIC_AUTH_USER && process.env.BASIC_AUTH_PASSWORD;
+export default {
+  app: {
+    head: {
+      meta: [{
+        content: config.name,
+        hid: 'description',
+        name: 'description'
+      }, ...(config.webApp ? [{
+        content: 'yes',
+        name: 'apple-mobile-web-app-capable'
+      }] : []), ...(config.ogImage ? [{
+        content: config.ogImage,
+        hid: 'og:image',
+        name: 'og:image'
+      }] : [])]
+    }
+  },
+  modules: [(otpoins, nuxt) => {
+    if (!config.userScalable) {
+      const viewportMeta = nuxt.options.app.head.meta.find(meta => meta.name === 'viewport');
+      viewportMeta.content += ', user-scalable=0';
+    }
+  }, [packageName`nuxt-basic-authentication-module`, {
+    enabled: !!isBasicAuthEnabled
+  }], [packageName`@nuxtjs/eslint-module`, {
+    cache: false,
+    failOnWarning: true,
+    fix: true,
+    lintOnStart: false
+  }], [packageName`@nuxtjs/stylelint-module`, {
+    allowEmptyInput: true,
+    failOnWarning: true,
+    fix: true,
+    lintOnStart: false
+  }], i18nModule,
+  // expressModule,
+  svgModule, localeLinkModule],
+  nitro: {
+    rollupConfig: {
+      plugins: [rollupPluginBabel({
+        babelHelpers: 'bundled'
+      })]
+    }
+  },
+  router: {
+    options: {
+      linkActiveClass: 'active'
+    }
+  },
+  runtimeConfig: {
+    public: {
+      name: config.name,
+      title: config.title
+    },
+    ...(isBasicAuthEnabled && {
+      basicAuth: {
+        pairs: {
+          [process.env.BASIC_AUTH_USER]: process.env.BASIC_AUTH_PASSWORD
+        }
+      }
+    })
+  },
+  vite: {
+    plugins: [{
+      enforce: 'pre',
+      transform: async (code, id) => {
+        const query = parseVueRequest(id);
+        if (query.filename.endsWith('.vue') && !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) {
+              sfc.descriptor[section].content = await transform(sfc.descriptor[section].content, {
+                plugins: [['@babel/plugin-proposal-pipeline-operator', {
+                  proposal: 'fsharp'
+                }]]
+              }).code;
+            }
+          }
+          return vueSfcDescriptorToString(sfc.descriptor);
+        }
+        return code;
+      }
+    }],
+    vue: {
+      template: {
+        transformAssetUrls: {
+          includeAbsolute: false
+        }
+      }
+    }
+  },
+  watch: ['config.js']
+};

package/package.json

@@ -1,12 +1,16 @@
 {
   "name": "@dword-design/base-config-nuxt",
-  "version": "4.0.15",
+  "version": "5.0.1",
   "repository": "dword-design/base-config-nuxt",
   "funding": "https://github.com/sponsors/dword-design",
   "license": "MIT",
   "author": "Sebastian Landwehr <info@sebastianlandwehr.com>",
   "type": "module",
-  "exports": "./dist/index.js",
+  "exports": {
+    ".": "./dist/index.js",
+    "./config": "./dist/config.js",
+    "./nuxt.config": "./dist/nuxt.config.js"
+  },
   "main": "dist/index.js",
   "files": [
     "dist"
@@ -21,10 +25,8 @@
     "prepublishOnly": "base prepublishOnly",
     "test": "base test"
   },
-  "resolutions": {
-    "stylelint/cosmiconfig": "8.1.3"
-  },
   "dependencies": {
+    "@babel/core": "^7.22.5",
     "@dword-design/depcheck-parser-sass": "^4.0.0",
     "@dword-design/dotenv-json-extended": "^2.0.0",
     "@dword-design/functions": "^4.0.0",
@@ -35,6 +37,8 @@
     "@nuxtjs/i18n": "npm:@dword-design/nuxt-i18n",
     "@nuxtjs/stylelint-module": "^5.0.1",
     "@rollup/plugin-babel": "^6.0.3",
+    "@vitejs/plugin-vue": "^4.2.3",
+    "@vue/compiler-sfc": "^3.3.4",
     "depcheck-package-name": "^3.0.0",
     "depcheck-parser-vue": "^4.0.7",
     "execa": "^7.1.1",

package/dist/modules/project/index.js

@@ -1,103 +0,0 @@
-import omit from "@dword-design/functions/dist/omit.js";
-import { addPlugin, addTemplate, installModule } from '@nuxt/kit';
-import packageName from 'depcheck-package-name';
-import { createRequire } from 'module';
-import P from 'path';
-
-// import expressModule from './modules/express/index.js'
-import i18nModule from "./modules/i18n/index.js";
-import localeLinkModule from "./modules/locale-link/index.js";
-import svgModule from "./modules/svg.js";
-const _require = createRequire(import.meta.url);
-export default (async (options, nuxt) => {
-  const defaultConfig = {
-    bodyAttrs: {},
-    css: [],
-    head: {},
-    headAttrs: {},
-    htmlAttrs: {},
-    modules: [],
-    name: 'Vue app',
-    plugins: [],
-    router: {},
-    userScalable: true
-  };
-  const projectConfig = {
-    ...defaultConfig,
-    ...options,
-    css: [...defaultConfig.css, ...(options.css || [])]
-  };
-  nuxt.options.watch.push('config.js');
-  nuxt.options.runtimeConfig.public.name = projectConfig.name;
-  nuxt.options.runtimeConfig.public.title = projectConfig.title;
-  if (process.env.BASIC_AUTH_USER && process.env.BASIC_AUTH_PASSWORD) {
-    nuxt.options.runtimeConfig.basicAuth = {
-      pairs: {
-        [process.env.BASIC_AUTH_USER]: process.env.BASIC_AUTH_PASSWORD
-      }
-    };
-  }
-  nuxt.options.app.head.link.push(...(projectConfig.head.link || []));
-  nuxt.options.app.head.meta.push({
-    content: projectConfig.name,
-    hid: 'description',
-    name: 'description'
-  });
-  if (!projectConfig.userScalable) {
-    const viewportMeta = nuxt.options.app.head.meta.find(meta => meta.name === 'viewport');
-    viewportMeta.content += ', user-scalable=0';
-  }
-  if (projectConfig.ogImage) {
-    nuxt.options.app.head.meta.push({
-      content: projectConfig.ogImage,
-      hid: 'og:image',
-      name: 'og:image'
-    });
-  }
-  if (projectConfig.webApp) {
-    nuxt.options.app.head.meta.push({
-      content: 'yes',
-      name: 'apple-mobile-web-app-capable'
-    });
-  }
-  nuxt.options.app.head.htmlAttrs = projectConfig.htmlAttrs;
-  nuxt.options.app.head.bodyAttrs = projectConfig.bodyAttrs;
-  nuxt.options.css.push(...projectConfig.css);
-  Object.assign(nuxt.options.router.options, {
-    linkActiveClass: 'active',
-    ...projectConfig.router
-  });
-  Object.assign(nuxt.options, omit(Object.keys({
-    ...defaultConfig,
-    ...nuxt.options
-  }))(projectConfig));
-  const modules = [[packageName`nuxt-basic-authentication-module`, {
-    enabled: nuxt.options.runtimeConfig.basicAuth !== undefined
-  }], [packageName`@nuxtjs/eslint-module`, {
-    cache: false,
-    failOnWarning: true,
-    fix: true,
-    lintOnStart: false
-  }], [packageName`@nuxtjs/stylelint-module`, {
-    allowEmptyInput: true,
-    failOnWarning: true,
-    fix: true,
-    lintOnStart: false
-  }], i18nModule,
-  // expressModule,
-  svgModule, localeLinkModule, ...(projectConfig.modules || [])];
-  for (let module of modules) {
-    module = [].concat(module);
-    await installModule(module[0], module[1]);
-  }
-  addTemplate({
-    fileName: P.join('project', 'project-config.js'),
-    options: projectConfig,
-    src: _require.resolve('./project-config.js.template')
-  });
-  for (const plugin of projectConfig.plugins) {
-    addPlugin(plugin, {
-      append: true
-    });
-  }
-});

package/dist/modules/project/project-config.js.template

@@ -1 +0,0 @@
-export default <%= JSON.stringify(options) %>