Simplify findUpSync

Author: Kocal

CHANGELOG.md

@@ -52,6 +52,8 @@ module.exports = {
 
 * #1297 Upgrade GitHub Actions in CI (@Kocal)
 
+* #1303 Replace `pkg-up` by an inlined solution (@Kocal)
+
 ## [v4.6.1](https://github.com/symfony/webpack-encore/releases/tag/v4.6.1)
 
 * #1256 Re-adding node 18 support (@weaverryan)

lib/utils/package-up.js

@@ -11,41 +11,43 @@
 
 const fs = require('fs');
 const path = require('path');
-const {fileURLToPath} = require('url');
+const { fileURLToPath } = require('url');
 
 /**
- * Inlined version of the package "package-up" (ESM only), which depends on "find-up-simple" (ESM only too).
+ * Inlined version of the package "package-up" (ESM only).
+ *
+ * @param {string} cwd The directory to start searching from.
+ * @returns {string|undefined} The path to the nearest package.json file or undefined if not found.
  */
 module.exports = function({ cwd }) {
-    return findUpSync('package.json', {cwd, type: 'file'});
-}
-
+    return findUpSync('package.json', { cwd, type: 'file' });
+};
 
 function toPath(urlOrPath) {
     return urlOrPath instanceof URL ? fileURLToPath(urlOrPath) : urlOrPath;
 }
 
 /**
- * Inlined version of the package "find-up-simple" (ESM only).
+ * Inlined and simplified version of the package "find-up-simple" (ESM only).
+ *
+ * @param {string} name The name of the file to find
+ * @param {Object} options
+ * @param {string} options.cwd The directory to start searching from.
+ * @returns {string|undefined} The path to the file found or undefined if not found.
  */
-function findUpSync(name, {
-    cwd = process.cwd(),
-    type = 'file',
-    stopAt,
-} = {}) {
-    let directory = path.resolve(toPath(cwd) ?? '');
-    const {root} = path.parse(directory);
-    stopAt = path.resolve(directory, toPath(stopAt) ?? root);
-
-    while (directory && directory !== stopAt && directory !== root) {
+function findUpSync(name, { cwd = process.cwd() } = {}) {
+    let directory = path.resolve(toPath(cwd) || '');
+    const { root } = path.parse(directory);
+
+    while (directory && directory !== root) {
         const filePath = path.isAbsolute(name) ? name : path.join(directory, name);
 
         try {
-            const stats = fs.statSync(filePath, {throwIfNoEntry: false});
-            if ((type === 'file' && stats?.isFile()) || (type === 'directory' && stats?.isDirectory())) {
+            const stats = fs.statSync(filePath, { throwIfNoEntry: false });
+            if (stats && stats.isFile()) {
                 return filePath;
             }
-        } catch {}
+        } catch (e) {}
 
         directory = path.dirname(directory);
     }

test/utils/package-up.js

@@ -9,7 +9,7 @@
 
 'use strict';
 
-const {resolve: resolvePath} = require('path');
+const { resolve: resolvePath } = require('path');
 const expect = require('chai').expect;
 const packageUp = require('../../lib/utils/package-up');
 
@@ -31,7 +31,7 @@ describe('package-up', () => {
             cwd: resolvePath(__dirname, '../../fixtures/copy'),
             expectedPath: resolvePath(__dirname, '../../package.json'),
         },
-    }
+    };
 
     Object.entries(test).forEach(([description, { cwd, expectedPath }]) => {
         it(description, () => {
@@ -42,4 +42,4 @@ describe('package-up', () => {
             expect(path).to.equal(expectedPath);
         });
     });
-})
+});