@next/eslint-plugin-next 15.0.0-rc.0 → 15.0.0

package/dist/rules/no-html-link-for-pages.js

@@ -12,6 +12,9 @@ function _array_like_to_array(arr, len) {
 function _array_with_holes(arr) {
     if (Array.isArray(arr)) return arr;
 }
+function _array_without_holes(arr) {
+    if (Array.isArray(arr)) return _array_like_to_array(arr);
+}
 function _getRequireWildcardCache(nodeInterop) {
     if (typeof WeakMap !== "function") return null;
     var cacheBabelInterop = new WeakMap();
@@ -53,6 +56,9 @@ function _interop_require_wildcard(obj, nodeInterop) {
     }
     return newObj;
 }
+function _iterable_to_array(iter) {
+    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
+}
 function _iterable_to_array_limit(arr, i) {
     var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
     if (_i == null) return;
@@ -80,9 +86,15 @@ function _iterable_to_array_limit(arr, i) {
 function _non_iterable_rest() {
     throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
+function _non_iterable_spread() {
+    throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
 function _sliced_to_array(arr, i) {
     return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
 }
+function _to_consumable_array(arr) {
+    return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
+}
 function _unsupported_iterable_to_array(o, minLen) {
     if (!o) return;
     if (typeof o === "string") return _array_like_to_array(o, minLen);
@@ -162,6 +174,8 @@ module.exports = (0, _definerule.defineRule)({
             return {};
         }
         var pageUrls = (0, _url.getUrlFromPagesDirectories)('/', foundPagesDirs);
+        var appDirUrls = (0, _url.getUrlFromAppDirectory)('/', foundAppDirs);
+        var allUrls = _to_consumable_array(pageUrls).concat(_to_consumable_array(appDirUrls));
         return {
             JSXOpeningElement: function JSXOpeningElement(node) {
                 if (node.name.name !== 'a') {
@@ -193,8 +207,8 @@ module.exports = (0, _definerule.defineRule)({
                 if (/^(https?:\/\/|\/\/)/.test(hrefPath)) {
                     return;
                 }
-                pageUrls.forEach(function(pageUrl) {
-                    if (pageUrl.test((0, _url.normalizeURL)(hrefPath))) {
+                allUrls.forEach(function(foundUrl) {
+                    if (foundUrl.test((0, _url.normalizeURL)(hrefPath))) {
                         context.report({
                             node: node,
                             message: "Do not use an `<a>` element to navigate to `".concat(hrefPath, "`. Use `<Link />` from `next/link` instead. See: ").concat(url)

package/dist/utils/get-root-dirs.js

@@ -8,13 +8,13 @@ Object.defineProperty(exports, "getRootDirs", {
         return getRootDirs;
     }
 });
-var _glob = require("glob");
+var _fastglob = require("fast-glob");
 /**
  * Process a Next.js root directory glob.
  */ var processRootDir = function(rootDir) {
-    // Ensures we only match folders.
-    if (!rootDir.endsWith('/')) rootDir += '/';
-    return (0, _glob.globSync)(rootDir);
+    return (0, _fastglob.globSync)(rootDir.replace(/\\/g, '/'), {
+        onlyDirectories: true
+    });
 };
 var getRootDirs = function(context) {
     var rootDirs = [

package/dist/utils/url.js

@@ -12,9 +12,15 @@ _export(exports, {
     execOnce: function() {
         return execOnce;
     },
+    getUrlFromAppDirectory: function() {
+        return getUrlFromAppDirectory;
+    },
     getUrlFromPagesDirectories: function() {
         return getUrlFromPagesDirectories;
     },
+    normalizeAppPath: function() {
+        return normalizeAppPath;
+    },
     normalizeURL: function() {
         return normalizeURL;
     }
@@ -117,6 +123,34 @@ var fsReadDirSyncCache = {};
     });
     return res;
 }
+/**
+ * Recursively parse app directory for URLs.
+ */ function parseUrlForAppDir(urlprefix, directory) {
+    var _fsReadDirSyncCache, _directory;
+    var _;
+    (_ = (_fsReadDirSyncCache = fsReadDirSyncCache)[_directory = directory]) !== null && _ !== void 0 ? _ : _fsReadDirSyncCache[_directory] = _fs.readdirSync(directory, {
+        withFileTypes: true
+    });
+    var res = [];
+    fsReadDirSyncCache[directory].forEach(function(dirent) {
+        // TODO: this should account for all page extensions
+        // not just js(x) and ts(x)
+        if (/(\.(j|t)sx?)$/.test(dirent.name)) {
+            if (/^page(\.(j|t)sx?)$/.test(dirent.name)) {
+                res.push("".concat(urlprefix).concat(dirent.name.replace(/^page(\.(j|t)sx?)$/, '')));
+            } else if (!/^layout(\.(j|t)sx?)$/.test(dirent.name)) {
+                res.push("".concat(urlprefix).concat(dirent.name.replace(/(\.(j|t)sx?)$/, '')));
+            }
+        } else {
+            var dirPath = _path.join(directory, dirent.name);
+            if (dirent.isDirectory(dirPath) && !dirent.isSymbolicLink()) {
+                var _res;
+                (_res = res).push.apply(_res, _to_consumable_array(parseUrlForPages(urlprefix + dirent.name + '/', dirPath)));
+            }
+        }
+    });
+    return res;
+}
 function normalizeURL(url) {
     if (!url) {
         return;
@@ -131,6 +165,27 @@ function normalizeURL(url) {
     url = url.endsWith('/') ? url : url + '/';
     return url;
 }
+function normalizeAppPath(route) {
+    return ensureLeadingSlash(route.split('/').reduce(function(pathname, segment, index, segments) {
+        // Empty segments are ignored.
+        if (!segment) {
+            return pathname;
+        }
+        // Groups are ignored.
+        if (isGroupSegment(segment)) {
+            return pathname;
+        }
+        // Parallel segments are ignored.
+        if (segment[0] === '@') {
+            return pathname;
+        }
+        // The last segment (if it's a leaf) should be ignored.
+        if ((segment === 'page' || segment === 'route') && index === segments.length - 1) {
+            return pathname;
+        }
+        return "".concat(pathname, "/").concat(segment);
+    }, ''));
+}
 function getUrlFromPagesDirectories(urlPrefix, directories) {
     return Array.from(// De-duplicate similar pages across multiple directories.
     new Set(directories.flatMap(function(directory) {
@@ -143,6 +198,18 @@ function getUrlFromPagesDirectories(urlPrefix, directories) {
         return new RegExp(urlReg);
     });
 }
+function getUrlFromAppDirectory(urlPrefix, directories) {
+    return Array.from(// De-duplicate similar pages across multiple directories.
+    new Set(directories.map(function(directory) {
+        return parseUrlForAppDir(urlPrefix, directory);
+    }).flat().map(// Since the URLs are normalized we add `^` and `$` to the RegExp to make sure they match exactly.
+    function(url) {
+        return "^".concat(normalizeAppPath(url), "$");
+    }))).map(function(urlReg) {
+        urlReg = urlReg.replace(/\[.*\]/g, '((?!.+?\\..+?).*?)');
+        return new RegExp(urlReg);
+    });
+}
 function execOnce(fn) {
     var used = false;
     var result;
@@ -157,3 +224,9 @@ function execOnce(fn) {
         return result;
     };
 }
+function ensureLeadingSlash(route) {
+    return route.startsWith('/') ? route : "/".concat(route);
+}
+function isGroupSegment(segment) {
+    return segment[0] === '(' && segment.endsWith(')');
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/eslint-plugin-next",
-  "version": "15.0.0-rc.0",
+  "version": "15.0.0",
   "description": "ESLint plugin for Next.js.",
   "main": "dist/index.js",
   "license": "MIT",
@@ -12,7 +12,7 @@
     "dist"
   ],
   "dependencies": {
-    "glob": "10.3.10"
+    "fast-glob": "3.3.1"
   },
   "devDependencies": {
     "eslint": "8.56.0"