From fd37bdaecf181c3db136e83bc73afa2d2765a3b7 Mon Sep 17 00:00:00 2001 From: Jarred de Beer Date: Fri, 23 Apr 2021 17:34:23 +0200 Subject: [PATCH] removing resolveTargetbrowserMapped wrapper method, seems it's no longer needed --- .../src/package/resolvePackageTarget.js | 20 +------------------ .../fixtures/node_modules/nanoid/index.cjs | 1 - .../fixtures/node_modules/nanoid/index.js | 1 - .../fixtures/node_modules/nanoid/package.json | 13 ------------ 4 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 packages/node-resolve/test/fixtures/node_modules/nanoid/index.cjs delete mode 100644 packages/node-resolve/test/fixtures/node_modules/nanoid/index.js delete mode 100644 packages/node-resolve/test/fixtures/node_modules/nanoid/package.json diff --git a/packages/node-resolve/src/package/resolvePackageTarget.js b/packages/node-resolve/src/package/resolvePackageTarget.js index fbc98769d..4deee1a8f 100644 --- a/packages/node-resolve/src/package/resolvePackageTarget.js +++ b/packages/node-resolve/src/package/resolvePackageTarget.js @@ -10,24 +10,6 @@ function includesInvalidSegments(pathSegments, moduleDirs) { .some((t) => ['.', '..', ...moduleDirs].includes(t)); } -async function resolvePackageTargetBrowserMapped(context, { target, subpath, pattern, internal }) { - const resolvedTarget = await resolvePackageTarget(context, { - target, - subpath, - pattern, - internal - }); - if ( - resolvedTarget && - resolvedTarget.startsWith('./') && - context.packageBrowserField && - context.packageBrowserField[resolvedTarget] - ) { - return context.packageBrowserField[resolvedTarget]; - } - return resolvedTarget; -} - async function resolvePackageTarget(context, { target, subpath, pattern, internal }) { if (typeof target === 'string') { if (!pattern && subpath.length > 0 && !target.endsWith('/')) { @@ -129,4 +111,4 @@ async function resolvePackageTarget(context, { target, subpath, pattern, interna throw new InvalidPackageTargetError(context, `Invalid exports field.`); } -export default resolvePackageTargetBrowserMapped; +export default resolvePackageTarget; diff --git a/packages/node-resolve/test/fixtures/node_modules/nanoid/index.cjs b/packages/node-resolve/test/fixtures/node_modules/nanoid/index.cjs deleted file mode 100644 index 68356d181..000000000 --- a/packages/node-resolve/test/fixtures/node_modules/nanoid/index.cjs +++ /dev/null @@ -1 +0,0 @@ -module.exports = 'node'; \ No newline at end of file diff --git a/packages/node-resolve/test/fixtures/node_modules/nanoid/index.js b/packages/node-resolve/test/fixtures/node_modules/nanoid/index.js deleted file mode 100644 index e36fe2f1b..000000000 --- a/packages/node-resolve/test/fixtures/node_modules/nanoid/index.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = 'browser'; \ No newline at end of file diff --git a/packages/node-resolve/test/fixtures/node_modules/nanoid/package.json b/packages/node-resolve/test/fixtures/node_modules/nanoid/package.json deleted file mode 100644 index aa400dbb1..000000000 --- a/packages/node-resolve/test/fixtures/node_modules/nanoid/package.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "main": "index.cjs", - "module": "index.js", - "browser": { - "./index.cjs": "./index.js" - }, - "exports": { - ".": { - "import": "./index.js", - "require": "./index.cjs" - } - } -} \ No newline at end of file