feat: use rollup-plugin-node-resolve

Author: egoist

package.json

@@ -46,6 +46,7 @@
     "rollup-plugin-commonjs": "^9.2.0",
     "rollup-plugin-hashbang": "^2.2.2",
     "rollup-plugin-json": "^3.1.0",
+    "rollup-plugin-node-resolve": "^4.0.1",
     "rollup-plugin-postcss": "^2.0.3",
     "rollup-plugin-replace": "^2.1.0",
     "rollup-plugin-terser": "^4.0.2"

src/index.ts

@@ -19,8 +19,8 @@ import merge from 'lodash/merge'
 import waterfall from 'p-waterfall'
 import spinner from './spinner'
 import logger from './logger'
-import nodeResolvePlugin from './plugins/node-resolve'
 import progressPlugin from './plugins/progress'
+import nodeResolvePlugin from './plugins/node-resolve'
 import configLoader from './config-loader'
 import isExternal from './utils/is-external'
 import getBanner from './utils/get-banner'
@@ -207,8 +207,8 @@ export class Bundler {
 
     plugins.push(
       nodeResolvePlugin({
-        bundleNodeModules,
         rootDir: this.rootDir,
+        bundleNodeModules,
         externals: config.externals
       })
     )

src/plugins/node-resolve.ts

@@ -1,85 +1,65 @@
-import path from 'path'
-import slash from 'slash'
 import builtinModules from 'builtin-modules'
-import resolve from '../resolve'
 import { NormalizedConfig } from '../index'
 import isExternal from '../utils/is-external'
 import logger from '../logger'
 
 interface Options {
-  bundleNodeModules?: boolean | string[]
   rootDir: string
+  bundleNodeModules?: boolean | string[]
   externals: NormalizedConfig['externals']
 }
 
 export default (options: Options) => {
-  return {
-    name: 'bili-node-resolve',
-
-    resolveId: async (importee: string, importer?: string) => {
-      if (/\0/.test(importee)) {
-        return null
-      }
-      const isValidPath = !/[<>:"|?*]/.test(importee)
-      if (!isValidPath) {
-        return null
-      }
-
-      // Exclude built-in modules
-      if (builtinModules.includes(importee)) {
-        return false
-      }
+  const plugin = require('rollup-plugin-node-resolve')({
+    extensions: ['.js', '.json', '.jsx', '.ts', '.tsx'],
+    preferBuiltins: true,
+    jsnext: true,
+    module: true
+  })
 
-      importee = slash(importee)
-      if (importer) {
-        importer = slash(importer)
-      }
+  return {
+    ...plugin,
 
-      let id: string
+    name: 'bili-custom-resolve',
 
-      try {
-        id = await resolve(importee, {
-          cwd: importer ? path.dirname(importer) : options.rootDir
-        })
-      } catch (err) {
-        if (!importer) {
-          // An entry file should not be marked as external if it doesn't exist
-          return null
-        }
-        return false
-      }
+    async resolveId(importee: string, importer?: string) {
+      const id = await plugin.resolveId(
+        importee,
+        importer || `${options.rootDir}/__no_importer__.js`
+      )
 
-      // If we don't intend to bundle node_modules
-      // Mark it as external
-      if (/node_modules/.test(id)) {
-        if (!options.bundleNodeModules) {
+      if (typeof id === 'string') {
+        // Exclude built-in modules
+        if (builtinModules.includes(id)) {
           return false
         }
-        if (Array.isArray(options.bundleNodeModules)) {
-          const shouldBundle = options.bundleNodeModules.some(name =>
-            id.includes(`/node_modules/${name}/`)
-          )
-          if (!shouldBundle) {
+
+        // If we don't intend to bundle node_modules
+        // Mark it as external
+        if (/node_modules/.test(id)) {
+          if (!options.bundleNodeModules) {
             return false
           }
+          if (Array.isArray(options.bundleNodeModules)) {
+            const shouldBundle = options.bundleNodeModules.some(name =>
+              id.includes(`/node_modules/${name}/`)
+            )
+            if (!shouldBundle) {
+              return false
+            }
+          }
         }
-      }
 
-      if (isExternal(options.externals, id, importer)) {
-        return false
-      }
+        if (isExternal(options.externals, id, importer)) {
+          return false
+        }
 
-      if (/node_modules/.test(id) && !/^\.?\//.test(importee)) {
-        logger.debug(`Bundled ${importee} because ${importer} imported it.`)
+        if (/node_modules/.test(id) && !/^\.?\//.test(importee)) {
+          logger.debug(`Bundled ${importee} because ${importer} imported it.`)
+        }
       }
 
       return id
-    },
-
-    transform(code: string, id: string) {
-      // if (id.endsWith('.js')) {
-      //   return `// module: ${id}\n${code}`
-      // }
     }
   }
 }

yarn.lock

@@ -4257,6 +4257,11 @@ is-installed-globally@^0.1.0:
     global-dirs "^0.1.0"
     is-path-inside "^1.0.0"
 
+is-module@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
+  integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=
+
 is-npm@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4"
@@ -7814,6 +7819,15 @@ rollup-plugin-json@^3.1.0:
   dependencies:
     rollup-pluginutils "^2.3.1"
 
+rollup-plugin-node-resolve@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-4.0.1.tgz#f95765d174e5daeef9ea6268566141f53aa9d422"
+  integrity sha512-fSS7YDuCe0gYqKsr5OvxMloeZYUSgN43Ypi1WeRZzQcWtHgFayV5tUSPYpxuaioIIWaBXl6NrVk0T2/sKwueLg==
+  dependencies:
+    builtin-modules "^3.0.0"
+    is-module "^1.0.0"
+    resolve "^1.10.0"
+
 rollup-plugin-postcss@^2.0.3:
   version "2.0.3"
   resolved "https://registry.npmjs.org/rollup-plugin-postcss/-/rollup-plugin-postcss-2.0.3.tgz#1fd5b7e1fc7545cb0084d9c99d11b259e41a05e6"