Merge pull request #419 from jeffijoe/fix/esm-again-fr

fix(esm): provide separate CJS and ESM versions of load-module-native

Author: jeffijoe

CHANGELOG.md

@@ -1,3 +1,7 @@
+# v13.0.3
+
+- Fix CJS environments (e.g. Jest + esbuild) failing to `require()` the `.mjs` native loader by providing separate CJS and ESM versions of `load-module-native` ([#418](https://github.com/jeffijoe/awilix/issues/418), [#419](https://github.com/jeffijoe/awilix/pull/419))
+
 # v13.0.2
 
 - Fix ESM interop by renaming `load-module-native.js` to `load-module-native.mjs` so Node.js treats it as ESM regardless of the package `type` field ([#416](https://github.com/jeffijoe/awilix/issues/416), [#417](https://github.com/jeffijoe/awilix/pull/417))

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "awilix",
-  "version": "13.0.2",
+  "version": "13.0.3-alpha.0",
   "description": "Extremely powerful dependency injection container.",
   "main": "lib/awilix.js",
   "module": "lib/awilix.module.mjs",
@@ -48,7 +48,7 @@
     "cover": "npm run test -- --coverage",
     "publish:pre": "npm run lint && npm run build && npm run cover",
     "publish:post": "npm publish && git push --follow-tags",
-    "release:prerelease": "npm run publish:pre && npm version prerelease --preid alpha && npm run publish:post",
+    "release:prerelease": "npm run publish:pre && npm version prerelease --preid alpha && npm publish --tag alpha && git push --follow-tags",
     "release:patch": "npm run publish:pre && npm version patch && npm run publish:post",
     "release:minor": "npm run publish:pre && npm version minor && npm run publish:post",
     "release:major": "npm run publish:pre && npm version major && npm run publish:post"
@@ -148,6 +148,7 @@
       "__tests__",
       "lib",
       "src/load-module-native.mjs",
+      "src/load-module-native.js",
       "src/awilix.ts"
     ],
     "moduleFileExtensions": [

package.json

@@ -25,13 +25,7 @@ export default [
   // Build 1: ES modules for Node.
   {
     input: 'src/awilix.ts',
-    external: [
-      'fast-glob',
-      'path',
-      'url',
-      'util',
-      './load-module-native.mjs',
-    ],
+    external: ['fast-glob', 'path', 'url', 'util'],
     treeshake: { moduleSideEffects: 'no-external' },
     onwarn,
     output: [
@@ -41,9 +35,23 @@ export default [
       },
     ],
     plugins: [
-      // Copy the native module loader
+      // The source imports ./load-module-native.js (the CJS version) so that
+      // tsc emits require("./load-module-native.js") in the CJS build.
+      // For this ESM bundle we remap it to the .mjs version.
+      // Returning a relative id with external: true tells rollup to preserve
+      // the path as-is in the output (see https://rollupjs.org/plugin-development/#resolveid).
+      {
+        name: 'rewrite-native-loader',
+        resolveId(source) {
+          if (source === './load-module-native.js') {
+            return { id: './load-module-native.mjs', external: true }
+          }
+          return null
+        },
+      },
+      // Copy the native module loaders and their type declarations to lib/
       copy({
-        targets: [{ src: 'src/load-module-native.mjs', dest: 'lib' }],
+        targets: [{ src: 'src/load-module-native.*', dest: 'lib' }],
       }),
       typescript(tsOpts),
     ],

rollup.config.mjs

@@ -7,7 +7,7 @@ import {
 import { type InjectionModeType, InjectionMode } from './injection-mode'
 import { type LifetimeType, Lifetime, isLifetimeLonger } from './lifetime'
 import { type GlobWithOptions, listModules } from './list-modules'
-import { importModule } from './load-module-native.mjs'
+import { importModule } from './load-module-native.js'
 import {
   type LoadModulesOptions,
   type LoadModulesResult,

src/container.ts

@@ -0,0 +1 @@
+export function importModule(path: string): Promise<any>

src/load-module-native.d.ts

@@ -0,0 +1,5 @@
+// This is kept in a separate .js file to prevent TypeScript re-writing the import() statement to a require() statement
+// This is the CJS version; the .mjs version is used by the ESM build.
+module.exports.importModule = function importModule(path) {
+  return import(path)
+}