Merge branch 'master' into coverage-fix

istanbuljs · Oct 4, 2023 · da8dd0f · da8dd0f
2 parents a1a7314 + fc509cc
commit da8dd0f
Show file tree

Hide file tree

Showing 20 changed files with 79 additions and 28 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
  runs-on: ubuntu-latest
  strategy:
  matrix:
- node: [8, 12, 14, 16]
+ node: [10, 12, 14, 16]
  steps:
  - uses: actions/checkout@v2
  - uses: actions/setup-node@v1

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1 +1 @@
-{"packages/istanbul-lib-coverage":"3.2.0","packages/istanbul-lib-hook":"3.0.0","packages/istanbul-lib-instrument":"5.2.1","packages/istanbul-lib-report":"3.0.0","packages/istanbul-lib-source-maps":"4.0.1","packages/istanbul-reports":"3.1.5","packages/nyc-config-babel":"3.0.0","packages/nyc-config-hook-run-in-this-context":"1.0.0","packages/nyc-config-typescript":"1.0.2"}
+{"packages/istanbul-lib-coverage":"3.2.0","packages/istanbul-lib-hook":"3.0.0","packages/istanbul-lib-instrument":"6.0.0","packages/istanbul-lib-report":"3.0.1","packages/istanbul-lib-source-maps":"4.0.1","packages/istanbul-reports":"3.1.6","packages/nyc-config-babel":"3.0.0","packages/nyc-config-hook-run-in-this-context":"2.0.0","packages/nyc-config-typescript":"1.0.2"}
diff --git a/packages/istanbul-lib-hook/CHANGELOG.md b/packages/istanbul-lib-hook/CHANGELOG.md
@@ -113,7 +113,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 ### BREAKING CHANGES
 
-* the closure provied to hookRequire, hookRunInThisContext, etc., is now passed an object with a filename member, rather than a string representing filename.
+* the closure provided to hookRequire, hookRunInThisContext, etc., is now passed an object with a filename member, rather than a string representing filename.
 
 
 
@@ -124,7 +124,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 ### Bug Fixes
 
-* pass correct args to tranformer ([#153](https://github.com/istanbuljs/istanbuljs/issues/153)) ([#154](https://github.com/istanbuljs/istanbuljs/issues/154)) ([2b2250f](https://github.com/istanbuljs/istanbuljs/commit/2b2250f))
+* pass correct args to transformer ([#153](https://github.com/istanbuljs/istanbuljs/issues/153)) ([#154](https://github.com/istanbuljs/istanbuljs/issues/154)) ([2b2250f](https://github.com/istanbuljs/istanbuljs/commit/2b2250f))
 
 
 

diff --git a/packages/istanbul-lib-instrument/CHANGELOG.md b/packages/istanbul-lib-instrument/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [6.0.0](https://github.com/istanbuljs/istanbuljs/compare/istanbul-lib-instrument-v5.2.1...istanbul-lib-instrument-v6.0.0) (2023-07-25)
+
+
+### ⚠ BREAKING CHANGES
+
+* **deps:** minimum Node version bumped to 10.
+
+### Bug Fixes
+
+* **deps:** upgrade semver CVE-2022-25883 ([#731](https://github.com/istanbuljs/istanbuljs/issues/731)) ([d8399f3](https://github.com/istanbuljs/istanbuljs/commit/d8399f39eab6767a6fca5ef3b1b458a14d48775a))
+
 ## [5.2.1](https://github.com/istanbuljs/istanbuljs/compare/istanbul-lib-instrument-v5.2.0...istanbul-lib-instrument-v5.2.1) (2022-10-05)
 
 
@@ -43,14 +54,14 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 ### Bug Fixes
 
-* **build:** verfiy automated publication ([b232690](https://www.github.com/istanbuljs/istanbuljs/commit/b232690193f4b524332046c96dd1cdc6e881c6c7))
+* **build:** verify automated publication ([b232690](https://www.github.com/istanbuljs/istanbuljs/commit/b232690193f4b524332046c96dd1cdc6e881c6c7))
 
 ### [5.0.1](https://www.github.com/istanbuljs/istanbuljs/compare/istanbul-lib-instrument-v5.0.0...istanbul-lib-instrument-v5.0.1) (2021-09-13)
 
 
 ### Bug Fixes
 
-* **build:** verfiy automated publication ([74c96bd](https://www.github.com/istanbuljs/istanbuljs/commit/74c96bdc4224a06e2e1166ebd9adf8faf28438b1))
+* **build:** verify automated publication ([74c96bd](https://www.github.com/istanbuljs/istanbuljs/commit/74c96bdc4224a06e2e1166ebd9adf8faf28438b1))
 
 ## [5.0.0](https://www.github.com/istanbuljs/istanbuljs/compare/istanbul-lib-instrument-v4.0.3...istanbul-lib-instrument-v5.0.0) (2021-09-13)
 
@@ -346,7 +357,7 @@ plugin. Add it to get tests working again, commit updated api.md.
 
 ### Bug Fixes
 
-* parenthesize superClass on non-idetifier case ([#158](https://github.com/istanbuljs/istanbuljs/issues/158)) ([6202c88](https://github.com/istanbuljs/istanbuljs/commit/6202c88))
+* parenthesize superClass on non-identifier case ([#158](https://github.com/istanbuljs/istanbuljs/issues/158)) ([6202c88](https://github.com/istanbuljs/istanbuljs/commit/6202c88))
 
 
 ### Chores
@@ -367,7 +378,7 @@ plugin. Add it to get tests working again, commit updated api.md.
 
 ### Bug Fixes
 
-* default value for ignorelassMethods ([#151](https://github.com/istanbuljs/istanbuljs/issues/151)) ([5dd88e8](https://github.com/istanbuljs/istanbuljs/commit/5dd88e8))
+* default value for ignoreClassMethods ([#151](https://github.com/istanbuljs/istanbuljs/issues/151)) ([5dd88e8](https://github.com/istanbuljs/istanbuljs/commit/5dd88e8))
 
 
 

diff --git a/packages/istanbul-lib-instrument/package.json b/packages/istanbul-lib-instrument/package.json
@@ -1,6 +1,6 @@
 {
  "name": "istanbul-lib-instrument",
- "version": "5.2.1",
+ "version": "6.0.0",
  "description": "Core istanbul API for JS code coverage",
  "author": "Krishnan Anantheswaran <[email protected]>",
  "main": "src/index.js",
@@ -15,7 +15,7 @@
  "@babel/parser": "^7.14.7",
  "@istanbuljs/schema": "^0.1.2",
  "istanbul-lib-coverage": "^3.2.0",
- "semver": "^6.3.0"
+ "semver": "^7.5.4"
  },
  "devDependencies": {
  "@babel/cli": "^7.7.5",
@@ -45,6 +45,6 @@
  "instrumentation"
  ],
  "engines": {
- "node": ">=8"
+ "node": ">=10"
  }
 }
diff --git a/packages/istanbul-lib-instrument/src/read-coverage.js b/packages/istanbul-lib-instrument/src/read-coverage.js
@@ -21,7 +21,7 @@ function getAst(code) {
  allowImportExportEverywhere: true,
  allowReturnOutsideFunction: true,
  allowSuperOutsideMethod: true,
- sourceType: 'script',
+ sourceType: 'unambiguous',
  plugins: defaults.instrumenter.parserPlugins
  }
  });

diff --git a/packages/istanbul-lib-instrument/src/visitor.js b/packages/istanbul-lib-instrument/src/visitor.js
@@ -136,7 +136,7 @@ class VisitState {
  }
 
  // all the generic stuff on exit of a node,
- // including reseting ignores and custom node attrs
+ // including resetting ignores and custom node attrs
  onExit(path) {
  // restore ignore status, if needed
  if (path.node === this.nextIgnore) {

diff --git a/packages/istanbul-lib-instrument/test/specs/if.yaml b/packages/istanbul-lib-instrument/test/specs/if.yaml
@@ -1,5 +1,5 @@
 ---
-name: simple if statment
+name: simple if statement
 code: |
  output = -1;
  if (args[0] > args [1])

diff --git a/packages/istanbul-lib-instrument/test/util/verifier.js b/packages/istanbul-lib-instrument/test/util/verifier.js
@@ -26,6 +26,22 @@ function annotatedCode(code) {
 }
 
 function getGlobalObject() {
+ if (typeof globalThis !== 'undefined') {
+ // eslint-disable-next-line no-undef
+ return globalThis;
+ }
+ if (typeof global !== 'undefined') {
+ // eslint-disable-next-line no-undef
+ return global;
+ }
+ if (typeof window !== 'undefined') {
+ // eslint-disable-next-line no-undef
+ return window;
+ }
+ if (typeof self !== 'undefined') {
+ // eslint-disable-next-line no-undef
+ return self;
+ }
  return new Function('return this')();
 }
 

diff --git a/packages/istanbul-lib-report/CHANGELOG.md b/packages/istanbul-lib-report/CHANGELOG.md
@@ -51,6 +51,13 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
+## [3.0.1](https://github.com/istanbuljs/istanbuljs/compare/istanbul-lib-report-v3.0.0...istanbul-lib-report-v3.0.1) (2023-07-25)
+
+
+### Bug Fixes
+
+* **deps:** update make-dir CVE-2022-25883 ([eab82a9](https://github.com/istanbuljs/istanbuljs/commit/eab82a9aeff140a8fd2981c7f872830c985d479f))
+
 ## [2.0.8](https://github.com/istanbuljs/istanbuljs/compare/[email protected]@2.0.8) (2019-04-24)
 
 **Note:** Version bump only for package istanbul-lib-report

diff --git a/packages/istanbul-lib-report/lib/report-base.js b/packages/istanbul-lib-report/lib/report-base.js
@@ -1,6 +1,6 @@
 'use strict';
 
-// TODO: switch to class private field when targetting node.js 12
+// TODO: switch to class private field when targeting node.js 12
 const _summarizer = Symbol('ReportBase.#summarizer');
 
 class ReportBase {

diff --git a/packages/istanbul-lib-report/package.json b/packages/istanbul-lib-report/package.json
@@ -1,6 +1,6 @@
 {
  "name": "istanbul-lib-report",
- "version": "3.0.0",
+ "version": "3.0.1",
  "description": "Base reporting library for istanbul",
  "author": "Krishnan Anantheswaran <[email protected]>",
  "main": "index.js",
@@ -13,7 +13,7 @@
  },
  "dependencies": {
  "istanbul-lib-coverage": "^3.0.0",
- "make-dir": "^3.0.0",
+ "make-dir": "^4.0.0",
  "supports-color": "^7.1.0"
  },
  "devDependencies": {

diff --git a/packages/istanbul-reports/CHANGELOG.md b/packages/istanbul-reports/CHANGELOG.md
@@ -3,6 +3,13 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.1.6](https://github.com/istanbuljs/istanbuljs/compare/istanbul-reports-v3.1.5...istanbul-reports-v3.1.6) (2023-07-25)
+
+
+### Bug Fixes
+
+* **clover:** always close last open tag ([07c6ea6](https://github.com/istanbuljs/istanbuljs/commit/07c6ea6537261a19b117702b7362dee0bdc001ac))
+
 ## [3.1.5](https://github.com/istanbuljs/istanbuljs/compare/istanbul-reports-v3.1.4...istanbul-reports-v3.1.5) (2022-07-13)
 
 
@@ -249,7 +256,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 ### Bug Fixes
 
-* update dependendencies due to vulnerabilities ([#294](https://github.com/istanbuljs/istanbuljs/issues/294)) ([4c14fed](https://github.com/istanbuljs/istanbuljs/commit/4c14fed))
+* update dependencies due to vulnerabilities ([#294](https://github.com/istanbuljs/istanbuljs/issues/294)) ([4c14fed](https://github.com/istanbuljs/istanbuljs/commit/4c14fed))
 
 
 

diff --git a/packages/istanbul-reports/lib/clover/index.js b/packages/istanbul-reports/lib/clover/index.js
@@ -11,7 +11,6 @@ class CloverReport extends ReportBase {
 
  this.cw = null;
  this.xml = null;
- this.projectRoot = opts.projectRoot || process.cwd();
  this.file = opts.file || 'clover.xml';
  }
 
@@ -113,7 +112,7 @@ class CloverReport extends ReportBase {
  if (node.isRoot()) {
  return;
  }
- this.xml.closeTag('package');
+ this.xml.closeTag(this.xml.stack[this.xml.stack.length - 1]);
  }
 
  onDetail(node) {

diff --git a/packages/istanbul-reports/lib/html/annotator.js b/packages/istanbul-reports/lib/html/annotator.js
@@ -148,7 +148,7 @@ function annotateBranches(fileCoverage, structuredText) {
  branchMeta[branchName].type === 'if' &&
  // Check if the branch has an implicit else.
  branchArray.length === 2 &&
- // Check if the implicit else branch is unnacounted for.
+ // Check if the implicit else branch is unaccounted for.
  metaArray.length === 1 &&
  // Check if the implicit else branch is uncovered.
  branchArray[1] === 0
@@ -207,7 +207,7 @@ function annotateBranches(fileCoverage, structuredText) {
  text = structuredText[startLine].text;
  if (branchMeta[branchName].type === 'if') {
  // 'if' is a special case
- // since the else branch might not be visible, being non-existent
+ // since the else branch might not be visible, being nonexistent
  text.insertAt(
  startCol,
  lt +

diff --git a/packages/istanbul-reports/package.json b/packages/istanbul-reports/package.json
@@ -1,6 +1,6 @@
 {
  "name": "istanbul-reports",
- "version": "3.1.5",
+ "version": "3.1.6",
  "description": "istanbul reports",
  "author": "Krishnan Anantheswaran <[email protected]>",
  "main": "index.js",

diff --git a/packages/istanbul-reports/test/fixtures/specs/coalescence.json b/packages/istanbul-reports/test/fixtures/specs/coalescence.json
@@ -1,5 +1,5 @@
 {
- "title": "coalescense ranges of missing lines",
+ "title": "coalesce ranges of missing lines",
  "opts": {
  "maxCols": 80,
  "projectRoot": "/"

diff --git a/packages/istanbul-reports/test/fixtures/specs/different-path-files.json b/packages/istanbul-reports/test/fixtures/specs/different-path-files.json
@@ -1,5 +1,5 @@
 {
- "title": "different path files in seperate packages",
+ "title": "different path files in separate packages",
  "opts": {
  "maxCols": 80,
  "projectRoot": "/Users/jschmidle/oss/istanbuljs-test/"

diff --git a/packages/nyc-config-hook-run-in-this-context/CHANGELOG.md b/packages/nyc-config-hook-run-in-this-context/CHANGELOG.md
@@ -48,6 +48,17 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
+## [2.0.0](https://github.com/istanbuljs/istanbuljs/compare/nyc-config-hook-run-in-this-context-v1.0.0...nyc-config-hook-run-in-this-context-v2.0.0) (2023-07-25)
+
+
+### ⚠ BREAKING CHANGES
+
+* **deps:** minimum Node version bumped to 10.
+
+### Bug Fixes
+
+* **deps:** upgrade semver CVE-2022-25883 ([#731](https://github.com/istanbuljs/istanbuljs/issues/731)) ([d8399f3](https://github.com/istanbuljs/istanbuljs/commit/d8399f39eab6767a6fca5ef3b1b458a14d48775a))
+
 ## [0.1.1](https://github.com/istanbuljs/istanbuljs/compare/@istanbuljs/[email protected]...@istanbuljs/[email protected]) (2019-04-24)
 
 **Note:** Version bump only for package @istanbuljs/nyc-config-hook-run-in-this-context
diff --git a/packages/nyc-config-hook-run-in-this-context/package.json b/packages/nyc-config-hook-run-in-this-context/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@istanbuljs/nyc-config-hook-run-in-this-context",
- "version": "1.0.0",
+ "version": "2.0.0",
  "description": "nyc configuration for hook-run-in-this-context",
  "main": "index.js",
  "files": [
@@ -31,14 +31,14 @@
  "access": "public"
  },
  "dependencies": {
- "semver": "^6.3.0"
+ "semver": "^7.5.4"
  },
  "devDependencies": {
  "chai": "^4.2.0",
  "mocha": "^6.2.2",
  "nyc": "^15.0.0-beta.2"
  },
  "engines": {
- "node": ">=8"
+ "node": ">=10"
  }
 }