@dword-design/base-config-nuxt 6.2.5 → 6.2.6

package/dist/build.js

@@ -1,28 +1,42 @@
-import { createRequire } from 'node:module';
-import { execa } from 'execa';
+import pathLib from 'node:path';
+import dotenv from '@dword-design/dotenv-json-extended';
+import { execaCommand } from 'execa';
 import fs from 'fs-extra';
-const resolver = createRequire(import.meta.url);
-const nuxtWrapper = resolver.resolve('./nuxt-wrapper.js');
-export default async (options = {}) => {
+export default async function (options) {
   options = {
+    env: {},
     log: process.env.NODE_ENV !== 'test',
+    stderr: 'inherit',
     ...options
   };
-  const nuxt = await execa(nuxtWrapper, ['build'], {
-    ...(options.log ? {
-      stdio: 'inherit'
-    } : {}),
+  const nuxt = await execaCommand('nuxt build', {
+    ...(options.log && {
+      stdout: 'inherit'
+    }),
+    stderr: options.stderr,
     ...(process.env.NODE_ENV === 'test' ? {
       env: {
         NUXT_TELEMETRY_DISABLED: 1
       }
-    } : {})
+    } : {}),
+    cwd: this.cwd,
+    env: {
+      ...dotenv.parse({
+        cwd: this.cwd
+      }),
+      ...options.env
+    }
   });
-  if (await fs.exists('model')) {
-    await fs.remove('dist');
-    await execa('babel', ['--out-dir', 'dist', '--copy-files', '--no-copy-ignored', '--ignore', '**/*.spec.js', 'model'], ...(options.log ? [{
-      stdio: 'inherit'
-    }] : []));
+  if (await fs.exists(pathLib.join(this.cwd, 'model'))) {
+    await fs.remove(pathLib.join(this.cwd, 'dist'));
+    await execaCommand('babel --out-dir dist --copy-files --no-copy-ignored --ignore **/*.spec.js model', {
+      ...(options.log && {
+        stdout: 'inherit'
+      }),
+      cwd: this.cwd,
+      env: options.env,
+      stderr: options.stderr
+    });
   }
   return nuxt;
-};
+}

package/dist/dev.js

@@ -1,13 +1,24 @@
-import { createRequire } from 'node:module';
-import { execa } from 'execa';
-const resolver = createRequire(import.meta.url);
-const nuxtWrapper = resolver.resolve('./nuxt-wrapper.js');
-export default (options = {}) => {
+import dotenv from '@dword-design/dotenv-json-extended';
+import { execaCommand } from 'execa';
+export default function (options) {
   options = {
+    env: {},
     log: process.env.NODE_ENV !== 'test',
+    stderr: 'inherit',
     ...options
   };
-  return execa(nuxtWrapper, ['dev'], {
-    [options.log ? 'stdio' : 'stderr']: 'inherit'
+  return execaCommand('nuxt dev', {
+    ...(options.log && {
+      stdout: 'inherit'
+    }),
+    cwd: this.cwd,
+    env: {
+      ...dotenv.parse({
+        cwd: this.cwd
+      }),
+      ...options.env
+    },
+    reject: process.env.NODE_ENV !== 'test',
+    stderr: options.stderr
   });
-};
+}

package/dist/{depcheck-special.js → get-depcheck-special.js}

@@ -1,12 +1,15 @@
-import P from 'node:path';
+import pathLib from 'node:path';
 import { filter, first, map } from '@dword-design/functions';
 import jitiBabelTransform from '@dword-design/jiti-babel-transform';
 import { createJiti } from 'jiti';
 import requirePackageName from 'require-package-name';
-export default path => {
-  if (P.basename(path) === 'config.js') {
+export default ({
+  cwd = '.'
+}) => path => {
+  if (pathLib.basename(path) === 'config.js') {
     var _ref, _ref2, _modules;
-    const jitiInstance = createJiti(process.cwd(), {
+    // TODO: Check full path including cwd so that we check config.js at project root
+    const jitiInstance = createJiti(pathLib.resolve(cwd), {
       esmResolve: true,
       interopDefault: true,
       transform: jitiBabelTransform

package/dist/index.js

@@ -8,55 +8,59 @@ import depcheckParserVue from 'depcheck-parser-vue';
 import outputFiles from 'output-files';
 import analyze from "./analyze.js";
 import build from "./build.js";
-import depcheckSpecial from "./depcheck-special.js";
 import dev from "./dev.js";
 import eslintConfig from "./eslint-config.js";
+import getDepcheckSpecial from "./get-depcheck-special.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 resolver = 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', '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
+export default function () {
+  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
     },
-    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(), resolver.resolve('./config.js')).split(P.sep).join('/')}`;
-    const parentConfigPath = isInNodeModules ? '@dword-design/base-config-nuxt/nuxt.config' : `./${P.relative(process.cwd(), resolver.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}';
+    depcheckConfig: {
+      parsers: {
+        '**/*.scss': depcheckParserSass,
+        '**/*.vue': depcheckParserVue
+      },
+      specials: [getDepcheckSpecial({
+        cwd: this.cwd
+      })]
+    },
+    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(this.cwd, resolver.resolve('./config.js')).split(P.sep).join('/')}`;
+      const parentConfigPath = isInNodeModules ? '@dword-design/base-config-nuxt/nuxt.config' : `./${P.relative(this.cwd, resolver.resolve('./nuxt.config.js')).split(P.sep).join('/')}`;
+      await outputFiles(this.cwd, {
+        '.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,16 +1,36 @@
-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 = {}) => {
+import dotenv from '@dword-design/dotenv-json-extended';
+import { execaCommand } from 'execa';
+export default async function (options) {
   options = {
+    env: {},
     log: process.env.NODE_ENV !== 'test',
+    stderr: 'inherit',
     ...options
   };
-  await execa(nuxtWrapper, ['prepare'], ...(options.log ? [{
-    stdio: 'inherit'
-  }] : []));
-  await execaCommand('stylelint --fix --allow-empty-input --ignore-path .gitignore **/*.{css,scss,vue}', ...(options.log ? [{
-    stdio: 'inherit'
-  }] : []));
-};
+  await execaCommand('nuxi prepare', {
+    ...(options.log && {
+      stdout: 'inherit'
+    }),
+    cwd: this.cwd,
+    env: {
+      ...dotenv.parse({
+        cwd: this.cwd
+      }),
+      ...options.env
+    },
+    stderr: options.stderr
+  });
+  await execaCommand('stylelint --fix --allow-empty-input --ignore-path .gitignore **/*.{css,scss,vue}', {
+    ...(options.log && {
+      stdout: 'inherit'
+    }),
+    cwd: this.cwd,
+    env: {
+      ...dotenv.parse({
+        cwd: this.cwd
+      }),
+      ...options.env
+    },
+    stderr: options.stderr
+  });
+}

package/dist/start.js

@@ -1,13 +1,24 @@
-import { createRequire } from 'node:module';
-import { execa } from 'execa';
-const resolver = createRequire(import.meta.url);
-const nuxtWrapper = resolver.resolve('./nuxt-wrapper.js');
-export default (options = {}) => {
+import dotenv from '@dword-design/dotenv-json-extended';
+import { execaCommand } from 'execa';
+export default function (options) {
   options = {
+    env: {},
     log: process.env.NODE_ENV !== 'test',
+    stderr: 'inherit',
     ...options
   };
-  return execa(nuxtWrapper, ['start'], ...(options.log ? [{
-    stdio: 'inherit'
-  }] : []));
-};
+  return execaCommand('nuxt start', {
+    ...(options.log && {
+      stdout: 'inherit'
+    }),
+    cwd: this.cwd,
+    env: {
+      ...dotenv.parse({
+        cwd: this.cwd
+      }),
+      ...options.env
+    },
+    reject: process.env.NODE_ENV !== 'test',
+    stderr: options.stderr
+  });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dword-design/base-config-nuxt",
-  "version": "6.2.5",
+  "version": "6.2.6",
   "repository": "dword-design/base-config-nuxt",
   "funding": "https://github.com/sponsors/dword-design",
   "license": "MIT",
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "@dword-design/depcheck-parser-sass": "^4.0.4",
-    "@dword-design/dotenv-json-extended": "^2.0.25",
+    "@dword-design/dotenv-json-extended": "^3.0.1",
     "@dword-design/functions": "^6.0.2",
     "@dword-design/jiti-babel-transform": "^2.0.0",
     "@dword-design/stylelint-config": "^4.0.2",
@@ -50,15 +50,14 @@
     "vite-svg-loader": "^5.1.0"
   },
   "devDependencies": {
-    "@dword-design/base": "^12.0.14",
-    "@dword-design/tester": "^2.0.19",
-    "@dword-design/tester-plugin-tmp-dir": "^2.1.26",
+    "@dword-design/base": "^12.0.18",
     "@nuxtjs/sitemap": "^7.3.0",
+    "@playwright/test": "^1.52.0",
     "axios": "^1.9.0",
     "depcheck": "^1.4.7",
     "expect": "^29.7.0",
+    "get-port": "^7.1.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",

package/dist/nuxt-wrapper.js

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