Merge branch 'main' into add-failing-test

Author: iambumblehead

.github/workflows/coverage.yml

@@ -14,7 +14,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-node@v4
       with:
-        node-version: 20
+        node-version: 24
     - run: npm install
     - run: npm run build --if-present
     - run: |

.github/workflows/lint.yml

@@ -12,6 +12,6 @@ jobs:
     steps:
     - uses: actions/checkout@v4
       with:
-        node-version: 20
+        node-version: 24
     - run: npm install
     - run: npm run lint

.github/workflows/publish.yml

@@ -20,7 +20,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 24
           registry-url: https://npm.pkg.github.com/
       - name: Insert repository owner as scope into package name
         run: |

.github/workflows/test-pnpm.yml

@@ -0,0 +1,28 @@
+name: test-pnpm
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  test-pnpm:
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 12
+    strategy:
+      fail-fast: false
+      matrix:
+        node-version: [22.x]
+        os: [ubuntu-latest]
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-node@v4
+      with:
+        node-version: ${{ matrix.node-version }}      
+    - uses: pnpm/action-setup@v4
+      with:
+        version: 9
+    - run: npm install
+    - run: npm run build --if-present
+    - run: npm run test-ci-pnpm

.github/workflows/test.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [18.x, 20.x, 22.x]
+        node-version: [22.x, 24.x]
         os: [ubuntu-latest, windows-latest]
     steps:
     - uses: actions/checkout@v4

CHANGELOG.md

@@ -1,5 +1,25 @@
 # changelog
 
+ * 2.7.3 _Sep.12.2025_
+   * drop node version [18 and 20 from tests.](https://github.com/iambumblehead/esmock/pull/326)
+   * increment some dependencies [and reduce audit warnings.](https://github.com/iambumblehead/esmock/pull/327)
+   * restore [ava and all other disabled test-runner tests](https://github.com/iambumblehead/esmock/pull/328)
+ * 2.7.2 _Sep.01.2025_
+   * [increment resolvewithplus,](https://github.com/iambumblehead/esmock/pull/325) match [exact export paths,](https://github.com/iambumblehead/resolvewithplus/pull/71) thanks @matz3
+ * 2.7.1 _Jul.01.2025_
+   * [added node v24 to test matrix](https://github.com/iambumblehead/esmock/pull/324)
+ * 2.7.0 _Jan.24.2025_
+   * [update resolver](https://github.com/iambumblehead/esmock/pull/322) to correctly resolve openai package
+   * [update typescript-eslint](https://github.com/iambumblehead/esmock/pull/323)
+ * 2.6.9 _Oct.18.2024_
+   * [added --glob option for rimraf](https://github.com/iambumblehead/esmock/pull/317) usage removing un-used sources
+   * [added node v23 to test matrix](https://github.com/iambumblehead/esmock/pull/316)
+   * [resolve v23-related error](https://github.com/iambumblehead/esmock/pull/316) when `module.exports` is exported
+ * 2.6.8 _Oct.17.2024_
+   * [added pnpm unit-test,](https://github.com/iambumblehead/esmock/pull/315) thanks @darcyrush
+   * [resolve issue for pnpm](https://github.com/iambumblehead/esmock/pull/315) by escaping '+' char in regexp
+   * [add log utility function](https://github.com/iambumblehead/esmock/pull/314) for debugging loader
+   * [dropped ava and jest](https://github.com/iambumblehead/esmock/pull/314) from test sequence, node v22 --loader issues
  * 2.6.7 _Jul.16.2024_
    * [add swc tests and remove swc caution from README](https://github.com/iambumblehead/esmock/pull/309) thanks @Brooooooklyn
    * [unpin node 22.1 at test CI](https://github.com/iambumblehead/esmock/pull/309) and use latest 22.x

eslint.config.js

@@ -17,6 +17,7 @@ export default [
     rules: {
       "@typescript-eslint/no-unused-expressions": 0,
       "@typescript-eslint/no-explicit-any": 0,
+      "@typescript-eslint/no-unused-vars": 0,
       "comma-dangle": "off"
     }
   },
@@ -47,6 +48,7 @@ export default [
       "no-unused-vars": ["error", {
         "vars": "all",
         "args": "after-used",
+        "varsIgnorePattern": "log",
         "ignoreRestSiblings": false
       }],
       "global-require": 0,

package.json

@@ -1,7 +1,7 @@
 {
   "name": "esmock",
   "type": "module",
-  "version": "2.6.7",
+  "version": "2.7.3",
   "license": "ISC",
   "readmeFilename": "README.md",
   "description": "provides native ESM import and globals mocking for unit tests",
@@ -60,27 +60,28 @@
     "node": ">=14.16.0"
   },
   "dependencies": {
-    "resolvewithplus": "^2.1.5"
+    "resolvewithplus": "^2.1.7"
   },
   "devDependencies": {
-    "c8": "^10.1.2",
-    "eslint": "^9.5.0",
-    "eslint-plugin-markdown": "^5.0.0",
-    "typescript-eslint": "^8.0.0-alpha.30",
-    "@typescript-eslint/parser": "^8.0.0-alpha.30",
-    "@typescript-eslint/eslint-plugin": "^8.0.0-alpha.30"
+    "c8": "^10.1.3",
+    "eslint": "^9.34.0",
+    "eslint-plugin-markdown": "^5.1.0",
+    "typescript-eslint": "^8.41.0",
+    "@typescript-eslint/parser": "^8.41.0",
+    "@typescript-eslint/eslint-plugin": "^8.41.0"
   },
   "scripts": {
     "test:install": "cd tests && npm run install:all",
     "test:all": "cd tests && npm run test:all",
     "test:all-ci": "cd tests && npm run test:all-ci",
     "test": "npm run test:all",
+    "test-ci-pnpm": "cd tests && cd tests-pnpm && pnpm i && npm run test",
     "test-ci": "npm run test:install && npm run test:all-ci",
     "test-cover": "npm run test:install && c8 npm run test:all",
     "lint": "eslint .",
     "lint-fix": "eslint --fix .",
     "mini:pkg": "npm pkg delete scripts devDependencies dependencies",
-    "mini:src": "cd src && npx rimraf \"!(esmock|esmockLoader).js\"",
+    "mini:src": "cd src && npx rimraf --glob \"!(esmock|esmockLoader).js\"",
     "mini": "npm run mini:src && npm run mini:pkg",
     "prepublishOnly": "npm run lint && npm run test-ci && npm run mini"
   }

src/esmockLoader.js

@@ -1,4 +1,4 @@
-import fs from 'node:fs/promises'
+import fs from 'node:fs'
 import module from 'node:module'
 import process from 'process'
 import esmockErr from './esmockErr.js'
@@ -25,14 +25,23 @@ const isnotfoundRe = /isfound=false/
 const iscommonjsmoduleRe = /^(commonjs|module)$/
 const isstrict3 = /strict=3/
 const hashbangRe = /^(#![^\n]*\n)/
+
+// escape '+' char, pnpm generates long pathnames serialized with these
+const moduleIdEsc = str =>
+  str.indexOf('+') >= 0 ? str.replace(/(?!\\)\+/g, '\\+') : str
+
 // returned regexp will match embedded moduleid w/ treeid
 const moduleIdReCreate = (moduleid, treeid) => new RegExp(
-  `.*(${moduleid}(\\?${treeid}(?:(?!#-#).)*)).*`)
+  `.*(${moduleIdEsc(moduleid)}(\\?${treeid}(?:(?!#-#).)*)).*`)
 
 // node v12.0-v18.x, global
 const mockKeys = global.mockKeys = (global.mockKeys || {})
 const mockKeysSource = global.mockKeysSource = (global.mockKeysSource || {})
 
+// use fs when logging from hooks, console.log async unpredictable
+const log = (...args) => (
+  fs.writeSync(1, JSON.stringify(args, null, '  ').slice(2, -1)))
+
 // node v20.0-v20.6
 const globalPreload = !module.register && (({ port }) => (
   port.addEventListener('message', ev => (
@@ -170,7 +179,7 @@ const load = async (url, context, nextLoad) => {
       const sourceIsNullLike = (
         nextLoadRes.source === null || nextLoadRes.source === undefined)
       const source = sourceIsNullLike
-        ? String(await fs.readFile(new URL(url)))
+        ? String(fs.readFileSync(new URL(url)))
         : String(nextLoadRes.source)
       const hbang = (source.match(hashbangRe) || [])[0] || ''
       const sourcesafe = hbang ? source.replace(hashbangRe, '') : source

src/esmockModule.js

@@ -24,7 +24,7 @@ const isJSONExtnRe = /\.json$/i
 
 // https://github.com/iambumblehead/esmock/issues/284
 // older applications may export names that are reserved in newer runtimes
-const reservedKeywordsFoundInWild = /(^|,)static($|,)/g
+const reservedKeywordsFoundInWild = /(^|,)(static|module\.exports)($|,)/g
 
 // assigning the object to its own prototypal inheritor can error, eg
 //   'Cannot assign to read only property \'F_OK\' of object \'#<Object>\''