@nuxt/kit 3.0.0-rc.6 → 3.0.0-rc.7

package/dist/index.d.ts

@@ -235,7 +235,9 @@ interface Resolver {
  * Create a relative resolver
  */
 declare function createResolver(base: string | URL): Resolver;
-declare function resolveFiles(path: string, pattern: string | string[]): Promise<string[]>;
+declare function resolveFiles(path: string, pattern: string | string[], opts?: {
+    followSymbolicLinks?: boolean;
+}): Promise<string[]>;
 
 interface LegacyServerMiddleware {
     route?: string;
@@ -300,6 +302,7 @@ declare function tryImportModule(id: string, opts?: RequireModuleOptions): Promi
 declare function tryRequireModule(id: string, opts?: RequireModuleOptions): any;
 
 declare function compileTemplate(template: NuxtTemplate, ctx: any): Promise<string>;
+/** @deprecated */
 declare const templateUtils: {
     serialize: (data: any) => string;
     importName: typeof genSafeVariableName;

package/dist/index.mjs

@@ -6,9 +6,9 @@ import { kebabCase, pascalCase } from 'scule';
 import satisfies from 'semver/functions/satisfies.js';
 import consola from 'consola';
 import { pathToFileURL, fileURLToPath } from 'node:url';
+import { globby } from 'globby';
 import { interopDefault } from 'mlly';
 import jiti from 'jiti';
-import { globby } from 'globby';
 import ignore from 'ignore';
 import defu from 'defu';
 import { applyDefaults } from 'untyped';
@@ -30,7 +30,11 @@ function chainFn(base, fn) {
     if (baseResult === void 0) {
       [baseResult] = args;
     }
-    const fnResult = fn.call(this, baseResult, ...Array.prototype.slice.call(args, 1));
+    const fnResult = fn.call(
+      this,
+      baseResult,
+      ...Array.prototype.slice.call(args, 1)
+    );
     if (fnResult === void 0) {
       return baseResult;
     }
@@ -40,14 +44,14 @@ function chainFn(base, fn) {
 
 const nuxtCtx = getContext("nuxt");
 function useNuxt() {
-  const instance = nuxtCtx.use();
+  const instance = nuxtCtx.tryUse();
   if (!instance) {
     throw new Error("Nuxt instance is unavailable!");
   }
   return instance;
 }
 function tryUseNuxt() {
-  return nuxtCtx.use();
+  return nuxtCtx.tryUse();
 }
 
 function addTemplate(_template) {
@@ -159,7 +163,9 @@ function addLayout(tmpl, name) {
   if (isNuxt2(nuxt)) {
     const layout = nuxt.options.layouts[layoutName];
     if (layout) {
-      return logger.warn(`Not overriding \`${layoutName}\` (provided by \`${layout}\`) with \`${src || filename}\`.`);
+      return logger.warn(
+        `Not overriding \`${layoutName}\` (provided by \`${layout}\`) with \`${src || filename}\`.`
+      );
     }
     nuxt.options.layouts[layoutName] = `./${filename}`;
     if (name === "error") {
@@ -170,7 +176,9 @@ function addLayout(tmpl, name) {
   nuxt.hook("app:templates", (app) => {
     if (layoutName in app.layouts) {
       const relativePath = relative(nuxt.options.srcDir, app.layouts[layoutName].file);
-      return logger.warn(`Not overriding \`${layoutName}\` (provided by \`~/${relativePath}\`) with \`${src || filename}\`.`);
+      return logger.warn(
+        `Not overriding \`${layoutName}\` (provided by \`~/${relativePath}\`) with \`${src || filename}\`.`
+      );
     }
     app.layouts[layoutName] = {
       file: join("#build", filename),
@@ -196,38 +204,7 @@ function addDevServerHandler(handler) {
   useNuxt().options.devServerHandlers.push(handler);
 }
 
-function normalizePlugin(plugin) {
-  if (typeof plugin === "string") {
-    plugin = { src: plugin };
-  } else {
-    plugin = { ...plugin };
-  }
-  if (!plugin.src) {
-    throw new Error("Invalid plugin. src option is required: " + JSON.stringify(plugin));
-  }
-  plugin.src = normalize(plugin.src);
-  if (plugin.ssr) {
-    plugin.mode = "server";
-  }
-  if (!plugin.mode) {
-    const [, mode = "all"] = plugin.src.match(/\.(server|client)(\.\w+)*$/) || [];
-    plugin.mode = mode;
-  }
-  return plugin;
-}
-function addPlugin(_plugin, opts = {}) {
-  const nuxt = useNuxt();
-  const plugin = normalizePlugin(_plugin);
-  nuxt.options.plugins = nuxt.options.plugins.filter((p) => normalizePlugin(p).src !== plugin.src);
-  nuxt.options.plugins[opts.append ? "push" : "unshift"](plugin);
-  return plugin;
-}
-function addPluginTemplate(plugin, opts = {}) {
-  const normalizedPlugin = typeof plugin === "string" ? { src: plugin } : { ...plugin, src: addTemplate(plugin).dst };
-  return addPlugin(normalizedPlugin, opts);
-}
-
-const _require = jiti(process.cwd(), { interopDefault: true });
+const _require = jiti(process.cwd(), { interopDefault: true, esmResolve: true });
 function isNodeModules(id) {
   return /[/\\]node_modules[/\\]/.test(id);
 }
@@ -274,7 +251,12 @@ function requireModulePkg(id, opts = {}) {
 }
 function resolveModule(id, opts = {}) {
   return normalize(_require.resolve(id, {
-    paths: [].concat(global.__NUXT_PREPATHS__, opts.paths, process.cwd(), global.__NUXT_PATHS__).filter(Boolean)
+    paths: [].concat(
+      global.__NUXT_PREPATHS__,
+      opts.paths,
+      process.cwd(),
+      global.__NUXT_PATHS__
+    ).filter(Boolean)
   }));
 }
 function tryResolveModule(path, opts = {}) {
@@ -338,7 +320,7 @@ function isIgnored(pathname) {
 async function resolvePath(path, opts = {}) {
   const _path = path;
   path = normalize(path);
-  if (isAbsolute(path) && existsSync(path)) {
+  if (isAbsolute(path) && existsSync(path) && !await isDirectory(path)) {
     return path;
   }
   const nuxt = useNuxt();
@@ -349,10 +331,10 @@ async function resolvePath(path, opts = {}) {
   if (!isAbsolute(path)) {
     path = resolve(cwd, path);
   }
-  let isDirectory = false;
+  let _isDir = false;
   if (existsSync(path)) {
-    isDirectory = (await promises.lstat(path)).isDirectory();
-    if (!isDirectory) {
+    _isDir = await isDirectory(path);
+    if (!_isDir) {
       return path;
     }
   }
@@ -362,7 +344,7 @@ async function resolvePath(path, opts = {}) {
       return pathWithExt;
     }
     const pathWithIndex = join(path, "index" + ext);
-    if (isDirectory && existsSync(pathWithIndex)) {
+    if (_isDir && existsSync(pathWithIndex)) {
       return pathWithIndex;
     }
   }
@@ -379,8 +361,8 @@ async function findPath(paths, opts, pathType = "file") {
   for (const path of paths) {
     const rPath = await resolvePath(path, opts);
     if (await existsSensitive(rPath)) {
-      const isDirectory = (await promises.lstat(rPath)).isDirectory();
-      if (!pathType || pathType === "file" && !isDirectory || pathType === "dir" && isDirectory) {
+      const _isDir = await isDirectory(rPath);
+      if (!pathType || pathType === "file" && !_isDir || pathType === "dir" && _isDir) {
         return rPath;
       }
     }
@@ -421,9 +403,43 @@ async function existsSensitive(path) {
   const dirFiles = await promises.readdir(dirname(path));
   return dirFiles.includes(basename(path));
 }
-async function resolveFiles(path, pattern) {
-  const files = await globby(pattern, { cwd: path, followSymbolicLinks: true });
-  return files.map((p) => resolve(path, p)).filter((p) => !isIgnored(p));
+async function isDirectory(path) {
+  return (await promises.lstat(path)).isDirectory();
+}
+async function resolveFiles(path, pattern, opts = {}) {
+  const files = await globby(pattern, { cwd: path, followSymbolicLinks: opts.followSymbolicLinks ?? true });
+  return files.map((p) => resolve(path, p)).filter((p) => !isIgnored(p)).sort();
+}
+
+function normalizePlugin(plugin) {
+  if (typeof plugin === "string") {
+    plugin = { src: plugin };
+  } else {
+    plugin = { ...plugin };
+  }
+  if (!plugin.src) {
+    throw new Error("Invalid plugin. src option is required: " + JSON.stringify(plugin));
+  }
+  plugin.src = normalize(resolveAlias(plugin.src));
+  if (plugin.ssr) {
+    plugin.mode = "server";
+  }
+  if (!plugin.mode) {
+    const [, mode = "all"] = plugin.src.match(/\.(server|client)(\.\w+)*$/) || [];
+    plugin.mode = mode;
+  }
+  return plugin;
+}
+function addPlugin(_plugin, opts = {}) {
+  const nuxt = useNuxt();
+  const plugin = normalizePlugin(_plugin);
+  nuxt.options.plugins = nuxt.options.plugins.filter((p) => normalizePlugin(p).src !== plugin.src);
+  nuxt.options.plugins[opts.append ? "push" : "unshift"](plugin);
+  return plugin;
+}
+function addPluginTemplate(plugin, opts = {}) {
+  const normalizedPlugin = typeof plugin === "string" ? { src: plugin } : { ...plugin, src: addTemplate(plugin).dst };
+  return addPlugin(normalizedPlugin, opts);
 }
 
 async function installModule(moduleToInstall, _inlineOptions, _nuxt) {
@@ -556,7 +572,8 @@ const importSources = (sources, { lazy = false } = {}) => {
     return genImport(src, genSafeVariableName(src));
   }).join("\n");
 };
-const templateUtils = { serialize, importName: genSafeVariableName, importSources };
+const importName = genSafeVariableName;
+const templateUtils = { serialize, importName, importSources };
 
 function defineNuxtModule(definition) {
   if (typeof definition === "function") {
@@ -617,7 +634,7 @@ function nuxt2Shims(nuxt) {
   }
   nuxt[NUXT2_SHIMS_KEY] = true;
   nuxt.hooks = nuxt;
-  if (!nuxtCtx.use()) {
+  if (!nuxtCtx.tryUse()) {
     nuxtCtx.set(nuxt);
     nuxt.hook("close", () => nuxtCtx.unset());
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/kit",
-  "version": "3.0.0-rc.6",
+  "version": "3.0.0-rc.7",
   "repository": "nuxt/framework",
   "license": "MIT",
   "type": "module",
@@ -13,8 +13,8 @@
     "prepack": "unbuild"
   },
   "dependencies": {
-    "@nuxt/schema": "^3.0.0-rc.6",
-    "c12": "^0.2.8",
+    "@nuxt/schema": "3.0.0-rc.7",
+    "c12": "^0.2.9",
     "consola": "^2.15.3",
     "defu": "^6.0.0",
     "globby": "^13.1.2",
@@ -23,14 +23,14 @@
     "jiti": "^1.14.0",
     "knitwork": "^0.1.2",
     "lodash.template": "^4.5.0",
-    "mlly": "^0.5.4",
-    "pathe": "^0.3.2",
+    "mlly": "^0.5.10",
+    "pathe": "^0.3.4",
     "pkg-types": "^0.3.3",
-    "scule": "^0.2.1",
+    "scule": "^0.3.2",
     "semver": "^7.3.7",
-    "unctx": "^1.1.4",
-    "unimport": "^0.4.5",
-    "untyped": "^0.4.4"
+    "unctx": "^2.0.1",
+    "unimport": "^0.6.7",
+    "untyped": "^0.4.5"
   },
   "devDependencies": {
     "@types/lodash.template": "^4",