diff options
author | Guy Bedford <guybedford@gmail.com> | 2018-03-16 13:17:42 +0200 |
---|---|---|
committer | guybedford <guybedford@gmail.com> | 2018-04-01 17:32:26 +0200 |
commit | 141be923f3249af870f274524dd0dacd3faf22c8 (patch) | |
tree | 7d4baf5438217c50588e270e5dfa0a57a9fc0b80 /lib | |
parent | 254058109f469f64b8ca23bb65a206abab380604 (diff) | |
download | android-node-v8-141be923f3249af870f274524dd0dacd3faf22c8.tar.gz android-node-v8-141be923f3249af870f274524dd0dacd3faf22c8.tar.bz2 android-node-v8-141be923f3249af870f274524dd0dacd3faf22c8.zip |
module: skip preserveSymlinks for main
PR-URL: https://github.com/nodejs/node/pull/19388
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/internal/modules/esm/default_resolve.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/internal/modules/esm/default_resolve.js b/lib/internal/modules/esm/default_resolve.js index 00461e7df1..60516535e9 100644 --- a/lib/internal/modules/esm/default_resolve.js +++ b/lib/internal/modules/esm/default_resolve.js @@ -69,7 +69,9 @@ function resolve(specifier, parentURL) { throw e; } - if (!preserveSymlinks) { + const isMain = parentURL === undefined; + + if (!preserveSymlinks || isMain) { const real = realpathSync(getPathFromURL(url), { [internalFS.realpathCacheKey]: realpathCache }); @@ -83,7 +85,6 @@ function resolve(specifier, parentURL) { let format = extensionFormatMap[ext]; if (!format) { - const isMain = parentURL === undefined; if (isMain) format = 'cjs'; else |