@dword-design/base-config-nuxt 5.0.0 → 5.0.2

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,14 +43,14 @@ export default {
     main: 'dist/index.js'
   },
   prepare: async () => {
-    const configPath = `./${P.relative(process.cwd(), _require.resolve('./config.js')).split(P.sep).join('/')}`;
-    const parentConfigPath = `./${P.relative(process.cwd(), _require.resolve('./nuxt.config.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>
@@ -69,15 +72,14 @@ 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 deepmerge from '${packageName`deepmerge`}'
         import config from '${configPath}'
+        import parentConfig from '${parentConfigPath}'
 
-        export default {
-          extends: '${parentConfigPath}',
-          ...config,
-        }
+        export default deepmerge(parentConfig, config)\n
       `
     });
   },

package/dist/nuxt-wrapper.js

@@ -1,10 +1,13 @@
 #!/usr/bin/env node
 import dotenv from '@dword-design/dotenv-json-extended';
 import { execa } from 'execa';
+const args = process.argv.slice(2);
 dotenv.config();
-execa('nuxt', process.argv.slice(2), {
-  env: {
-    NODE_ENV: ''
-  },
+execa('nuxt', args, {
+  ...(args[0] === 'dev' ? {
+    env: {
+      NODE_ENV: 'development'
+    }
+  } : {}),
   stdio: 'inherit'
 });

package/dist/nuxt.config.js

@@ -6,7 +6,7 @@ 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 i18nModule from "./modules/i18n.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;
@@ -27,7 +27,7 @@ export default {
       }] : [])]
     }
   },
-  modules: [(otpoins, nuxt) => {
+  modules: [(options, nuxt) => {
     if (!config.userScalable) {
       const viewportMeta = nuxt.options.app.head.meta.find(meta => meta.name === 'viewport');
       viewportMeta.content += ', user-scalable=0';

package/package.json

@@ -1,12 +1,16 @@
 {
   "name": "@dword-design/base-config-nuxt",
-  "version": "5.0.0",
+  "version": "5.0.2",
   "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"
@@ -35,6 +39,7 @@
     "@rollup/plugin-babel": "^6.0.3",
     "@vitejs/plugin-vue": "^4.2.3",
     "@vue/compiler-sfc": "^3.3.4",
+    "deepmerge": "^4.3.1",
     "depcheck-package-name": "^3.0.0",
     "depcheck-parser-vue": "^4.0.7",
     "execa": "^7.1.1",