Merge pull request #428 from jeffijoe/chore/update-packages

Update packages

Author: jeffijoe

CHANGELOG.md

@@ -1,3 +1,7 @@
+# v13.0.4
+
+- Update packages and simplify build ([#428](https://github.com/jeffijoe/awilix/pull/428)))
+
 # 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))

package-lock.json

@@ -76,31 +76,28 @@
   },
   "homepage": "https://github.com/jeffijoe/awilix#readme",
   "devDependencies": {
-    "@babel/core": "^7.29.0",
-    "@babel/plugin-transform-runtime": "^7.29.0",
-    "@babel/preset-env": "^7.29.0",
-    "@babel/runtime": "^7.28.6",
-    "@rollup/plugin-commonjs": "^29.0.0",
-    "@rollup/plugin-node-resolve": "^16.0.3",
+    "@babel/core": "^7.29.7",
+    "@babel/plugin-transform-runtime": "^7.29.7",
+    "@babel/preset-env": "^7.29.7",
+    "@babel/runtime": "^7.29.7",
     "@rollup/plugin-replace": "^6.0.3",
     "@types/jest": "^30.0.0",
-    "@types/node": "^25.3.3",
-    "babel-jest": "^30.2.0",
+    "@types/node": "^25.9.3",
+    "babel-jest": "^30.4.1",
     "eslint": "^9.22.0",
     "husky": "^9.1.7",
-    "jest": "^30.2.0",
+    "jest": "^30.4.2",
     "lint-staged": "^16.3.1",
-    "prettier": "^3.8.1",
+    "prettier": "^3.8.4",
     "rimraf": "^6.1.3",
-    "rollup": "^4.59.0",
-    "rollup-plugin-copy": "^3.5.0",
-    "rollup-plugin-typescript2": "^0.36.0",
+    "rollup": "^4.61.1",
+    "rollup-plugin-typescript2": "^0.37.0",
     "smid": "^0.1.1",
-    "tinybench": "^6.0.0",
-    "ts-jest": "^29.4.6",
+    "tinybench": "^6.0.2",
+    "ts-jest": "^29.4.11",
     "tslib": "^2.8.1",
-    "typescript": "^5.9.3",
-    "typescript-eslint": "^8.56.1"
+    "typescript": "^6.0.3",
+    "typescript-eslint": "^8.61.0"
   },
   "dependencies": {
     "fast-glob": "^3.3.3"
@@ -147,15 +144,17 @@
       "/node_modules/",
       "__tests__",
       "lib",
-      "src/load-module-native.mjs",
-      "src/load-module-native.js",
+      "src/load-module-native.ts",
       "src/awilix.ts"
     ],
     "moduleFileExtensions": [
       "ts",
       "tsx",
       "js"
     ],
+    "moduleNameMapper": {
+      "^(\\.{1,2}/.*)\\.js$": "$1"
+    },
     "transform": {
       "^.+\\.tsx?$": [
         "ts-jest",

package.json

@@ -1,9 +1,6 @@
 import typescript from 'rollup-plugin-typescript2'
 import typescriptCompiler from 'typescript'
 import replace from '@rollup/plugin-replace'
-import commonjs from '@rollup/plugin-commonjs'
-import resolve from '@rollup/plugin-node-resolve'
-import copy from 'rollup-plugin-copy'
 
 const comment = '/* removed in browser build */'
 const ignoredWarnings = ['UNUSED_EXTERNAL_IMPORT']
@@ -17,6 +14,7 @@ const tsOpts = {
       // Don't emit declarations, that's done by the regular build.
       declaration: false,
       module: 'ESNext',
+      moduleResolution: 'bundler',
     },
   },
 }
@@ -34,27 +32,7 @@ export default [
         format: 'es',
       },
     ],
-    plugins: [
-      // 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.*', dest: 'lib' }],
-      }),
-      typescript(tsOpts),
-    ],
+    plugins: [typescript(tsOpts)],
   },
   // Build 2: ES modules for browser builds.
   {
@@ -86,7 +64,7 @@ export default [
         '[util.inspect.custom]: inspect,': comment,
         '[util.inspect.custom]: toStringRepresentationFn,': comment,
         'case util.inspect.custom:': '',
-[`export {
+        [`export {
   type GlobWithOptions,
   type ListModulesOptions,
   type ModuleDescriptor,
@@ -102,14 +80,11 @@ export default [
               declaration: false,
               noUnusedLocals: false,
               module: 'ESNext',
+              moduleResolution: 'bundler',
             },
           },
         }),
       ),
-      resolve({
-        preferBuiltins: true,
-      }),
-      commonjs(),
     ],
   },
 ]

rollup.config.mjs

@@ -0,0 +1,5 @@
+// Kept in a separate module so it can be excluded from test coverage;
+// jest cannot execute a native dynamic import.
+export function importModule(path: string): Promise<any> {
+  return import(path)
+}

src/load-module-native.d.mts

@@ -3,6 +3,9 @@
   "exclude": ["__tests__", "**/__tests__/*", "node_modules/*", "examples", "benchmarks"],
   "compilerOptions": {
     "forceConsistentCasingInFileNames": false,
-    "baseUrl": "src"
+    "rootDir": "src",
+    // The base config enables this for ts-jest, but the build keeps it off
+    // so `const enum` values (e.g. TokenizerFlags) are inlined in the output.
+    "isolatedModules": false
   }
 }