Merge branch 'next'

Author: Septh

README.md

@@ -34,7 +34,7 @@ export default {
       // Make node builtins external. Optional. Default: true
       builtins?: boolean,
 
-      // Treat prefixed builtins as their unprefixed counterpart. Optional. Default: true
+      // Treat prefixed builtins as their unprefixed counterpart. Optional. Default: 'strip'
       prefixedBuiltins?: boolean | 'strip',
 
       // Make pkg.dependencies external. Optional. Default: false
@@ -78,8 +78,8 @@ If you're working with monorepos, the `packagePath` is made for you. It can take
 #### builtins?: boolean = true
 Set the `builtins` option to `false` if you'd like to use some shims for those. You'll most certainly need [an other plugin](https://github.com/rollup/plugins/tree/master/packages/node-resolve/#resolving-built-ins-like-fs) for this.
 
-#### prefixedBuiltins?: boolean | 'strip' = true
-How to handle the `node:` (or sometimes `nodejs:`) prefix some authors use in their code (i.e., `import path from 'node:path'`). If `true` (default), prefixed builtins are treated as their unprefixed equivalent. If `strip`, the prefix is removed from the name and other plugins will never know it was there.
+#### prefixedBuiltins?: boolean | 'strip' = 'strip'
+How to handle the `node:` (or sometimes `nodejs:`) prefix some authors use in their code (i.e., `import path from 'node:path'`). If `false`, the import is used as-is to determine if it is external, meaning that `'node:path'` and `'path'` are considered two distincts imports. If `true`, prefixed builtins are treated as their unprefixed equivalent. If `strip` (default), the prefix is also removed from the name and other plugins will never know it was there.
 
 #### deps?: boolean = false
 Set the `deps` option to `true` to externalize your normal dependencies, therefore preventing Rollup from bundling them with your code.

package.json

@@ -60,7 +60,11 @@
     "clean": "rimraf dist",
     "prepublishOnly": "npm run lint && npm run clean && npm run build"
   },
+  "dependencies": {
+    "find-up": "^6.2.0"
+  },
   "devDependencies": {
+    "@rollup/plugin-alias": "^3.1.8",
     "@rollup/plugin-commonjs": "^21.0.1",
     "@rollup/plugin-node-resolve": "^13.0.6",
     "@typescript-eslint/eslint-plugin": "^5.6.0",
@@ -69,15 +73,11 @@
     "ava-fast-check": "^4.0.2",
     "eslint": "^8.4.1",
     "fast-check": "^2.20.0",
-    "find-up": "^6.2.0",
     "rimraf": "^3.0.2",
     "rollup": "^2.61.1",
     "rollup-plugin-ts": "^2.0.4",
     "ts-node": "^10.4.0",
     "tslib": "^2.3.1",
     "typescript": "^4.5.3"
-  },
-  "dependencies": {
-    "@rollup/plugin-alias": "^3.1.8"
   }
 }

src/index.ts

@@ -40,7 +40,7 @@ export default function externals(options: ExternalsOptions = {}): Plugin {
     const config: Required<ExternalsOptions> = {
         packagePath: [],
         builtins: true,
-        prefixedBuiltins: true,
+        prefixedBuiltins: 'strip',
         deps: false,
         devDeps: true,
         peerDeps: true,
@@ -54,9 +54,9 @@ export default function externals(options: ExternalsOptions = {}): Plugin {
     const warnings: string[] = []
 
     // Map the include and exclude options to arrays of regexes
-    const [ include, exclude ] = [ 'include', 'exclude' ].map(optionName => []
+    const [ include, exclude ] = [ 'include', 'exclude' ].map(optionName => ([] as (string | RegExp)[])
         .concat((config as any)[optionName])
-        .map((entry: string | RegExp, index: number): RegExp => {
+        .map((entry, index) => {
             if (entry instanceof RegExp) {
                 return entry
             }
@@ -72,22 +72,22 @@ export default function externals(options: ExternalsOptions = {}): Plugin {
         })
     )
 
-    // Build a function to keep only non excluded dependencies
+    // Filter function to keep only non excluded dependencies
     const isNotExcluded = (id: string) => !exclude.some(rx => rx.test(id))
 
     // Array of the final regexes
     const externals: RegExp[] = []
-    const isExternal = (id: string) => externals.some(deps => deps.test(id))
+    const isExternal = (id: string) => externals.some(rx => rx.test(id))
 
     return {
         name: 'node-externals',
 
         async buildStart() {
 
             // 1) Filter NodeJS builtins, supporting potential import from a sub directory (e.g. 'fs/promises')
-            const node = (config.builtins ? builtinModules : []).filter(isNotExcluded)
-            if (node.length > 0) {
-                externals.push(new RegExp('^(?:' + node.join('|') + ')(?:/.+)?$'))
+            const builtins = (config.builtins ? builtinModules : []).filter(isNotExcluded)
+            if (builtins.length > 0) {
+                externals.push(new RegExp('^(?:' + builtins.join('|') + ')(?:/.+)?$'))
             }
 
             // 2) Find and filter dependencies, supporting potential import from a sub directory (e.g. 'lodash/map')
@@ -119,13 +119,13 @@ export default function externals(options: ExternalsOptions = {}): Plugin {
             }
         },
 
-        resolveId(importee, importer) {
+        resolveId(importee, importer, { isEntry }) {
             // Ignore entry chunks & don't mess with other plugins
-            if (!importer?.charCodeAt(0) || !importee.charCodeAt(0)) {
+            if (isEntry || !importee.charCodeAt(0) || !importer?.charCodeAt(0)) {
                 return null
             }
 
-            // Remove node:/nodejs: prefix so builtins resolve to their unprefixed equivalent
+            // Remove node: prefix so builtins resolve to their unprefixed equivalent
             let stripped = importee
             if (config.prefixedBuiltins) {
                 if (stripped.startsWith('node:')) {