@nuxt/kit-nightly 4.2.0-29331656.27fe4652 → 4.2.0-29331807.eca36cfe

package/dist/index.d.mts

@@ -236,7 +236,7 @@ declare function addComponentsDir(dir: ComponentsDir, opts?: {
 type AddComponentOptions = {
     name: string;
     filePath: string;
-} & Partial<Exclude<Component, 'shortPath' | 'async' | 'level' | 'import' | 'asyncImport'>>;
+} & Partial<Exclude<Component, 'async' | 'level' | 'import' | 'asyncImport'>>;
 /**
  * This utility takes a file path or npm package that is scanned for named exports, which are get added automatically
  */

package/dist/index.d.ts

@@ -236,7 +236,7 @@ declare function addComponentsDir(dir: ComponentsDir, opts?: {
 type AddComponentOptions = {
     name: string;
     filePath: string;
-} & Partial<Exclude<Component, 'shortPath' | 'async' | 'level' | 'import' | 'asyncImport'>>;
+} & Partial<Exclude<Component, 'async' | 'level' | 'import' | 'asyncImport'>>;
 /**
  * This utility takes a file path or npm package that is scanned for named exports, which are get added automatically
  */

package/dist/index.mjs

@@ -7,10 +7,10 @@ import { getContext, createContext } from 'unctx';
 import satisfies from 'semver/functions/satisfies.js';
 import { readPackageJSON, resolvePackageJSON } from 'pkg-types';
 import { existsSync, readFileSync, promises, lstatSync } from 'node:fs';
-import { pathToFileURL, fileURLToPath } from 'node:url';
+import { fileURLToPath, pathToFileURL } from 'node:url';
 import { resolve, relative, join, dirname, normalize, isAbsolute, basename, parse } from 'pathe';
 import { createJiti } from 'jiti';
-import { interopDefault, parseNodeModulePath, resolveModuleExportNames } from 'mlly';
+import { parseNodeModulePath, interopDefault, resolveModuleExportNames } from 'mlly';
 import { resolveModulePath, resolveModuleURL } from 'exsolve';
 import { isRelative, withTrailingSlash as withTrailingSlash$2 } from 'ufo';
 import { read, update } from 'rc9';
@@ -221,53 +221,27 @@ ${issues.toString()}`;
   return normalizedModule;
 }
 
-function directoryToURL(dir) {
-  return pathToFileURL(dir + "/");
-}
-function tryResolveModule(id, url = import.meta.url) {
-  return Promise.resolve(resolveModulePath(id, {
-    from: url,
-    suffixes: ["", "index"],
-    try: true
-  }));
-}
-function resolveModule(id, options) {
-  return resolveModulePath(id, {
-    // eslint-disable-next-line @typescript-eslint/no-deprecated
-    from: options?.url ?? options?.paths ?? [import.meta.url],
-    extensions: options?.extensions ?? [".js", ".mjs", ".cjs", ".ts", ".mts", ".cts"]
-  });
-}
-async function importModule(id, opts) {
-  const resolvedPath = resolveModule(id, opts);
-  return await import(pathToFileURL(resolvedPath).href).then((r) => opts?.interopDefault !== false ? interopDefault(r) : r);
-}
-function tryImportModule(id, opts) {
-  try {
-    return importModule(id, opts).catch(() => void 0);
-  } catch {
+const distURL = import.meta.url.replace(/\/dist\/.*$/, "/");
+function getUserCaller() {
+  if (!import.meta.dev) {
+    return null;
+  }
+  const { source, line, column } = captureStackTrace().find((entry) => !entry.source.startsWith(distURL)) ?? {};
+  if (!source) {
+    return null;
   }
+  return {
+    source: source.replace(/^file:\/\//, ""),
+    line,
+    column
+  };
 }
 const warnings = /* @__PURE__ */ new Set();
-function requireModule(id, opts) {
-  const { source, line, column } = captureStackTrace().find((entry) => entry.source !== import.meta.url) ?? {};
-  const explanation = source ? ` (used at \`${fileURLToPath(source)}:${line}:${column}\`)` : "";
-  const warning = `[@nuxt/kit] \`requireModule\` is deprecated${explanation}. Please use \`importModule\` instead.`;
+function warn(warning) {
   if (!warnings.has(warning)) {
     console.warn(warning);
     warnings.add(warning);
   }
-  const resolvedPath = resolveModule(id, opts);
-  const jiti = createJiti(import.meta.url, {
-    interopDefault: opts?.interopDefault !== false
-  });
-  return jiti(pathToFileURL(resolvedPath).href);
-}
-function tryRequireModule(id, opts) {
-  try {
-    return requireModule(id, opts);
-  } catch {
-  }
 }
 
 const layerMap = /* @__PURE__ */ new WeakMap();
@@ -541,6 +515,51 @@ async function resolveFiles(path, pattern, opts = {}) {
   return files.sort();
 }
 
+function directoryToURL(dir) {
+  return pathToFileURL(dir + "/");
+}
+function tryResolveModule(id, url = import.meta.url) {
+  return Promise.resolve(resolveModulePath(id, {
+    from: url,
+    suffixes: ["", "index"],
+    try: true
+  }));
+}
+function resolveModule(id, options) {
+  return resolveModulePath(id, {
+    // eslint-disable-next-line @typescript-eslint/no-deprecated
+    from: options?.url ?? options?.paths ?? [import.meta.url],
+    extensions: options?.extensions ?? [".js", ".mjs", ".cjs", ".ts", ".mts", ".cts"]
+  });
+}
+async function importModule(id, opts) {
+  const resolvedPath = resolveModule(id, opts);
+  return await import(pathToFileURL(resolvedPath).href).then((r) => opts?.interopDefault !== false ? interopDefault(r) : r);
+}
+function tryImportModule(id, opts) {
+  try {
+    return importModule(id, opts).catch(() => void 0);
+  } catch {
+  }
+}
+function requireModule(id, opts) {
+  const caller = getUserCaller();
+  const explanation = caller ? ` (used at \`${resolveAlias(caller.source)}:${caller.line}:${caller.column}\`)` : "";
+  const warning = `[@nuxt/kit] \`requireModule\` is deprecated${explanation}. Please use \`importModule\` instead.`;
+  warn(warning);
+  const resolvedPath = resolveModule(id, opts);
+  const jiti = createJiti(import.meta.url, {
+    interopDefault: opts?.interopDefault !== false
+  });
+  return jiti(pathToFileURL(resolvedPath).href);
+}
+function tryRequireModule(id, opts) {
+  try {
+    return requireModule(id, opts);
+  } catch {
+  }
+}
+
 const NODE_MODULES_RE = /[/\\]node_modules[/\\]/;
 async function installModules(modulesToInstall, resolvedModulePaths, nuxt = useNuxt()) {
   const localLayerModuleDirs = [];
@@ -1254,7 +1273,6 @@ function normalizeComponent(opts) {
     prefetch: false,
     preload: false,
     mode: "all",
-    shortPath: opts.filePath,
     priority: 0,
     meta: {},
     ...opts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/kit-nightly",
-  "version": "4.2.0-29331656.27fe4652",
+  "version": "4.2.0-29331807.eca36cfe",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -47,7 +47,7 @@
     "untyped": "^2.0.0"
   },
   "devDependencies": {
-    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.2.0-29331656.27fe4652",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.2.0-29331807.eca36cfe",
     "@rspack/core": "1.5.8",
     "@types/semver": "7.7.1",
     "hookable": "5.5.3",