import-in-the-middle 1.9.0 → 1.9.1

package/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "1.9.0"
+  ".": "1.9.1"
 }

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [1.9.1](https://github.com/nodejs/import-in-the-middle/compare/import-in-the-middle-v1.9.0...import-in-the-middle-v1.9.1) (2024-07-15)
+
+
+### Bug Fixes
+
+* Don't wrap native modules ([#142](https://github.com/nodejs/import-in-the-middle/issues/142)) ([f3278a3](https://github.com/nodejs/import-in-the-middle/commit/f3278a3c76af78fe369b599d5b2bf1d87edf0a7a))
+* Use correct `format` when resolving exports from sub-modules ([#140](https://github.com/nodejs/import-in-the-middle/issues/140)) ([1db08ef](https://github.com/nodejs/import-in-the-middle/commit/1db08ef5f51346c20b4b3c313bf993e9cf1ca7d5))
+
 ## [1.9.0](https://github.com/nodejs/import-in-the-middle/compare/import-in-the-middle-v1.8.1...import-in-the-middle-v1.9.0) (2024-07-08)
 
 

package/hook.js

@@ -206,24 +206,19 @@ async function processModule ({ srcUrl, context, parentGetSource, parentResolve,
     if (isStarExportLine(n) === true) {
       const [, modFile] = n.split('* from ')
 
-      let modUrl
+      async function processSubModule (url, ctx) {
+        const setters = await processModule({ srcUrl: url, context: ctx, parentGetSource, parentResolve, excludeDefault: true })
+        for (const [name, setter] of setters.entries()) {
+          addSetter(name, setter, true)
+        }
+      }
+
       if (isBareSpecifier(modFile)) {
         // Bare specifiers need to be resolved relative to the parent module.
         const result = await parentResolve(modFile, { parentURL: srcUrl })
-        modUrl = result.url
+        await processSubModule(result.url, { ...context, format: result.format })
       } else {
-        modUrl = new URL(modFile, srcUrl).href
-      }
-
-      const setters = await processModule({
-        srcUrl: modUrl,
-        context,
-        parentGetSource,
-        parentResolve,
-        excludeDefault: true
-      })
-      for (const [name, setter] of setters.entries()) {
-        addSetter(name, setter, true)
+        await processSubModule(new URL(modFile, srcUrl).href, context)
       }
     } else {
       addSetter(n, `
@@ -297,6 +292,11 @@ function createHook (meta) {
       return result
     }
 
+    // We don't want to attempt to wrap native modules
+    if (result.url.endsWith('.node')) {
+      return result
+    }
+
     // Node.js v21 renames importAssertions to importAttributes
     if (
       (context.importAssertions && context.importAssertions.type === 'json') ||

package/lib/get-exports.js

@@ -48,6 +48,11 @@ async function getCjsExports (url, context, parentLoad, source) {
         }
         // Resolve the re-exported module relative to the current module.
         const newUrl = pathToFileURL(require.resolve(re, { paths: [dirname(fileURLToPath(url))] })).href
+
+        if (newUrl.endsWith('.node')) {
+          return
+        }
+
         for (const each of await getExports(newUrl, context, parentLoad)) {
           full.add(each)
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "import-in-the-middle",
-  "version": "1.9.0",
+  "version": "1.9.1",
   "description": "Intercept imports in Node.js",
   "main": "index.js",
   "scripts": {
@@ -37,6 +37,7 @@
     "@babel/core": "^7.23.7",
     "@babel/eslint-parser": "^7.23.3",
     "@babel/plugin-syntax-import-assertions": "^7.23.3",
+    "@node-rs/crc32": "^1.10.3",
     "@react-email/components": "^0.0.19",
     "@types/node": "^18.0.6",
     "c8": "^7.8.0",
@@ -51,7 +52,8 @@
     "imhotap": "^2.1.0",
     "openai": "^4.47.2",
     "ts-node": "^10.9.1",
-    "typescript": "^4.7.4"
+    "typescript": "^4.7.4",
+    "vue": "^3.4.31"
   },
   "dependencies": {
     "acorn": "^8.8.2",

package/test/fixtures/native-modules/darwin-arm64.js

@@ -0,0 +1 @@
+module.exports = require('@node-rs/crc32-darwin-arm64')

package/test/fixtures/native-modules/darwin-x64.js

@@ -0,0 +1 @@
+module.exports = require('@node-rs/crc32-darwin-x64')

package/test/fixtures/native-modules/linux-arm64.js

@@ -0,0 +1 @@
+module.exports = require('@node-rs/crc32-linux-arm64-gnu')

package/test/fixtures/native-modules/linux-x64.js

@@ -0,0 +1 @@
+module.exports = require('@node-rs/crc32-linux-x64-gnu')

package/test/fixtures/native-modules/win32-arm64.js

@@ -0,0 +1 @@
+module.exports = require('@node-rs/crc32-win32-arm64-msvc')

package/test/fixtures/native-modules/win32-x64.js

@@ -0,0 +1 @@
+module.exports = require('@node-rs/crc32-win32-x64-msvc')

package/test/hook/v14-native-modules.mjs

@@ -0,0 +1,10 @@
+import { strictEqual } from 'assert'
+
+// We dynamically import a specific file that imports the
+// native module for this platform and architecture.
+//
+// This way we know the file exists and the native module can
+// be loaded.
+const lib = await import(`../fixtures/native-modules/${process.platform}-${process.arch}.js`)
+
+strictEqual(typeof lib.default.crc32, 'function')

package/test/hook/vue-server-renderer.mjs

@@ -0,0 +1,5 @@
+// https://github.com/nodejs/import-in-the-middle/issues/139
+import { strictEqual } from 'assert'
+import * as lib from 'vue/server-renderer'
+
+strictEqual(typeof lib.renderToString, 'function')