@rushstack/package-extractor 0.10.4 → 0.10.5

package/CHANGELOG.json

@@ -1,6 +1,33 @@
 {
   "name": "@rushstack/package-extractor",
   "entries": [
+    {
+      "version": "0.10.5",
+      "tag": "@rushstack/package-extractor_v0.10.5",
+      "date": "Sat, 14 Dec 2024 01:11:07 GMT",
+      "comments": {
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@rushstack/node-core-library\" to `5.10.1`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/terminal\" to `0.14.4`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/ts-command-line\" to `4.23.2`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft-webpack5-plugin\" to `0.11.9`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/heft\" to `0.68.11`"
+          },
+          {
+            "comment": "Updating dependency \"@rushstack/webpack-preserve-dynamic-require-plugin\" to `0.11.78`"
+          }
+        ]
+      }
+    },
     {
       "version": "0.10.4",
       "tag": "@rushstack/package-extractor_v0.10.4",

package/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Change Log - @rushstack/package-extractor
 
-This log was last generated on Mon, 09 Dec 2024 20:31:43 GMT and should not be manually modified.
+This log was last generated on Sat, 14 Dec 2024 01:11:07 GMT and should not be manually modified.
+
+## 0.10.5
+Sat, 14 Dec 2024 01:11:07 GMT
+
+_Version update only_
 
 ## 0.10.4
 Mon, 09 Dec 2024 20:31:43 GMT

package/dist/scripts/create-links.js

@@ -63771,16 +63771,21 @@ const nodePath = __importStar(__webpack_require__(/*! path */ 16928));
  * @public
  */
 class RealNodeModulePathResolver {
-    constructor(options = {
-        fs: nodeFs,
-        path: nodePath
-    }) {
+    constructor(options = {}) {
+        const { fs: { lstatSync = nodeFs.lstatSync, readlinkSync = nodeFs.readlinkSync } = nodeFs, path: { isAbsolute = nodePath.isAbsolute, join = nodePath.join, resolve = nodePath.resolve, sep = nodePath.sep } = nodePath } = options;
         const cache = (this._cache = new Map());
-        const { path, fs } = options;
-        const { sep: pathSeparator } = path;
-        this._fs = fs;
-        const nodeModulesToken = `${pathSeparator}node_modules${pathSeparator}`;
-        const tryReadLink = this._tryReadLink.bind(this);
+        this._fs = {
+            lstatSync,
+            readlinkSync
+        };
+        this._path = {
+            isAbsolute,
+            join,
+            resolve,
+            sep
+        };
+        const nodeModulesToken = `${sep}node_modules${sep}`;
+        const self = this;
         function realNodeModulePathInternal(input) {
             // Find the last node_modules path segment
             const nodeModulesIndex = input.lastIndexOf(nodeModulesToken);
@@ -63790,7 +63795,7 @@ class RealNodeModulePathResolver {
             }
             // First assume that the next path segment after node_modules is a symlink
             let linkStart = nodeModulesIndex + nodeModulesToken.length - 1;
-            let linkEnd = input.indexOf(pathSeparator, linkStart + 1);
+            let linkEnd = input.indexOf(sep, linkStart + 1);
             // If the path segment starts with a '@', then it is a scoped package
             const isScoped = input.charAt(linkStart + 1) === '@';
             if (isScoped) {
@@ -63798,10 +63803,12 @@ class RealNodeModulePathResolver {
                 if (linkEnd < 0) {
                     // Symlink missing, so see if anything before the last node_modules needs resolving,
                     // and preserve the rest of the path
-                    return `${realNodeModulePathInternal(input.slice(0, nodeModulesIndex))}${input.slice(nodeModulesIndex)}`;
+                    return join(realNodeModulePathInternal(input.slice(0, nodeModulesIndex)), input.slice(nodeModulesIndex + 1), 
+                    // Joining to `.` will clean up any extraneous trailing slashes
+                    '.');
                 }
                 linkStart = linkEnd;
-                linkEnd = input.indexOf(pathSeparator, linkStart + 1);
+                linkEnd = input.indexOf(sep, linkStart + 1);
             }
             // No trailing separator, so the link is the last path segment
             if (linkEnd < 0) {
@@ -63809,13 +63816,14 @@ class RealNodeModulePathResolver {
             }
             const linkCandidate = input.slice(0, linkEnd);
             // Check if the link is a symlink
-            const linkTarget = tryReadLink(linkCandidate);
-            if (linkTarget && path.isAbsolute(linkTarget)) {
+            const linkTarget = self._tryReadLink(linkCandidate);
+            if (linkTarget && isAbsolute(linkTarget)) {
                 // Absolute path, combine the link target with any remaining path segments
                 // Cache the resolution to avoid the readlink call in subsequent calls
                 cache.set(linkCandidate, linkTarget);
                 cache.set(linkTarget, linkTarget);
-                return `${linkTarget}${input.slice(linkEnd)}`;
+                // Joining to `.` will clean up any extraneous trailing slashes
+                return join(linkTarget, input.slice(linkEnd + 1), '.');
             }
             // Relative path or does not exist
             // Either way, the path before the last node_modules could itself be in a node_modules folder
@@ -63823,18 +63831,20 @@ class RealNodeModulePathResolver {
             const realpathBeforeNodeModules = realNodeModulePathInternal(input.slice(0, nodeModulesIndex));
             if (linkTarget) {
                 // Relative path in symbolic link. Should be resolved relative to real path of base path.
-                const resolvedTarget = path.resolve(`${realpathBeforeNodeModules}${input.slice(nodeModulesIndex, linkStart)}`, linkTarget);
+                const resolvedTarget = resolve(realpathBeforeNodeModules, input.slice(nodeModulesIndex + 1, linkStart), linkTarget);
                 // Cache the result of the combined resolution to avoid the readlink call in subsequent calls
                 cache.set(linkCandidate, resolvedTarget);
                 cache.set(resolvedTarget, resolvedTarget);
-                return `${resolvedTarget}${input.slice(linkEnd)}`;
+                // Joining to `.` will clean up any extraneous trailing slashes
+                return join(resolvedTarget, input.slice(linkEnd + 1), '.');
             }
             // No symlink, so just return the real path before the last node_modules combined with the
             // subsequent path segments
-            return `${realpathBeforeNodeModules}${input.slice(nodeModulesIndex)}`;
+            // Joining to `.` will clean up any extraneous trailing slashes
+            return join(realpathBeforeNodeModules, input.slice(nodeModulesIndex + 1), '.');
         }
         this.realNodeModulePath = (input) => {
-            return realNodeModulePathInternal(path.normalize(input));
+            return realNodeModulePathInternal(resolve(input));
         };
     }
     /**
@@ -63859,7 +63869,9 @@ class RealNodeModulePathResolver {
         // of an lstat call.
         const stat = this._fs.lstatSync(link);
         if (stat.isSymbolicLink()) {
-            return this._fs.readlinkSync(link, 'utf8');
+            // path.join(x, '.') will trim trailing slashes, if applicable
+            const result = this._path.join(this._fs.readlinkSync(link, 'utf8'), '.');
+            return result;
         }
     }
 }