Merge branch 'v4-hotfix'

avajs · Aug 26, 2022 · 14061be · 14061be
2 parents f4067b2 + 7c48c4d
commit 14061be
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 295 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,7 +29,7 @@ jobs:
           node-version: ${{ matrix.node-version }}
           cache: npm
       - name: Upgrade npm
-        run: npm install --global npm@^8.12
+        run: npm install --global npm@^8.18
       - run: npm install --no-audit
       - run: npm run cover
       - uses: codecov/codecov-action@v2
@@ -50,7 +50,7 @@ jobs:
           node-version: ^18
           cache: npm
       - name: Upgrade npm
-        run: npm install --global npm@^8.12
+        run: npm install --global npm@^8.18
       - run: npm install --no-audit
       - run: npm i typescript@${TS_VERSION}
         env:
@@ -68,7 +68,7 @@ jobs:
           node-version: ^18
           cache: npm
       - name: Upgrade npm
-        run: if [[ "$(npm -v)" != "8.12.0" ]]; then npm install --global npm@8.12.0; fi
+        run: if [[ "$(npm -v)" != "8.18.0" ]]; then npm install --global npm@8.18.0; fi
       - run: npm install --no-audit
       - name: Test package-lock for unexpected modifications
         run: |
@@ -89,7 +89,7 @@ jobs:
         with:
           node-version: ^18
       - name: Upgrade npm
-        run: npm install --global npm@^8.12
+        run: npm install --global npm@^8.18
       - run: npm install --no-package-lock --no-audit
       - run: npm run cover
 
@@ -103,6 +103,6 @@ jobs:
           node-version: ^18
           cache: npm
       - name: Upgrade npm
-        run: npm install --global npm@^8.12
+        run: npm install --global npm@^8.18
       - run: npm install --no-audit
       - run: npx xo
diff --git a/.xo-config.cjs b/.xo-config.cjs
@@ -36,6 +36,7 @@ module.exports = {
 		{
 			files: 'examples/**',
 			rules: {
+				'ava/no-ignored-test-files': 'off',
 				'ava/no-only-test': 'off',
 				'unicorn/prefer-module': 'off',
 			},

diff --git a/lib/worker/line-numbers.js b/lib/worker/line-numbers.js
@@ -61,7 +61,7 @@ function findTest(locations, declaration) {
 const range = (start, end) => Array.from({length: end - start + 1}).fill(start).map((element, index) => element + index);
 
 const translate = (sourceMap, pos) => {
-	if (sourceMap === undefined) {
+	if (sourceMap === null) {
 		return pos;
 	}
 
@@ -88,7 +88,7 @@ export default function lineNumberSelection({file, lineNumbers = []}) {
 
 	let locations = parse(file);
 	let lookedForSourceMap = false;
-	let sourceMap;
+	let sourceMap = null;
 
 	return () => {
 		if (!lookedForSourceMap) {
@@ -98,7 +98,13 @@ export default function lineNumberSelection({file, lineNumbers = []}) {
 			// Source maps are not available before then.
 			sourceMap = findSourceMap(file);
 
-			if (sourceMap !== undefined) {
+			if (sourceMap === undefined) {
+				// Prior to Node.js 18.8.0, the value when a source map could not be found was `undefined`.
+				// This changed to `null` in <https://github.com/nodejs/node/pull/43875>.
+				sourceMap = null;
+			}
+
+			if (sourceMap !== null) {
 				locations = locations.map(({start, end}) => ({
 					start: translate(sourceMap, start),
 					end: translate(sourceMap, end),