From 3fbd98ac46fd659d76d69bfc7780fa1db35b602d Mon Sep 17 00:00:00 2001 From: fengmk2 Date: Fri, 14 Mar 2025 09:41:50 +0800 Subject: [PATCH 1/2] feat: use mocha@11 BREAKING CHANGE: drop Node.js < 18.19.0 support part of https://github.com/eggjs/egg/issues/3644 https://github.com/eggjs/egg/issues/5257 --- .github/workflows/nodejs.yml | 39 +++++++++++-------------------- .github/workflows/npm-publish.yml | 15 ------------ .github/workflows/release.yml | 13 +++++++++++ LICENSE.md | 1 + README.md | 8 ++++--- package.json | 5 +++- 6 files changed, 36 insertions(+), 45 deletions(-) delete mode 100644 .github/workflows/npm-publish.yml create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 33a2bf3..55d9b80 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -1,30 +1,17 @@ name: Node.js CI -on: + +on: push: - branches: - - master - paths-ignore: - - 'docs' - - '**.yml' - - '**.md' - - '.*' + branches: [ master ] pull_request: - paths-ignore: - - 'docs' - - '**.yml' - - '**.md' - - '.*' + branches: [ master ] + jobs: - test: - runs-on: ubuntu-latest - strategy: - matrix: - node-version: [12.x, 14.x, 16.x, 18.x] - steps: - - uses: actions/checkout@v2 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v2 - with: - node-version: ${{ matrix.node-version }} - - run: npm install - - run: npm test + Job: + name: Node.js + uses: node-modules/github-actions/.github/workflows/node-test.yml@master + with: + os: 'ubuntu-latest' + version: '18.19.0, 18, 20, 22' + secrets: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml deleted file mode 100644 index e2fc215..0000000 --- a/.github/workflows/npm-publish.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: npm publish - -on: workflow_dispatch - -jobs: - publish: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 - - run: npm install - - run: npm test - - uses: JS-DevTools/npm-publish@v1 - with: - token: ${{ secrets.NPM_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..1c6cbb1 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,13 @@ +name: Release + +on: + push: + branches: [ master ] + +jobs: + release: + name: Node.js + uses: node-modules/github-actions/.github/workflows/node-release.yml@master + secrets: + NPM_TOKEN: ${{ secrets.NPM_TOKEN }} + GIT_TOKEN: ${{ secrets.GIT_TOKEN }} diff --git a/LICENSE.md b/LICENSE.md index 13ceb39..e982e9a 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,7 @@ MIT License Copyright (c) 2015-2017 Adam Gruber +Copyright (c) 2023-present node-modules and the contributors. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index f82953b..ab2c63f 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,12 @@ -# mochawesome +# mochawesome-with-mocha -[![npm](https://img.shields.io/npm/v/mochawesome-with-mocha.svg?style=flat-square)](http://www.npmjs.com/package/mochawesome-with-mocha) ![Node.js CI](https://github.com/adamgruber/mochawesome/workflows/Node.js%20CI/badge.svg) [![Gitter](https://img.shields.io/gitter/room/nwjs/nw.js.svg?style=flat-square)](https://gitter.im/mochawesome/general) +[![npm](https://img.shields.io/npm/v/mochawesome-with-mocha.svg?style=flat-square)](http://www.npmjs.com/package/mochawesome-with-mocha) +[![Node.js CI](https://github.com/node-modules/mochawesome/actions/workflows/nodejs.yml/badge.svg?branch=master)](https://github.com/node-modules/mochawesome/actions/workflows/nodejs.yml) Mochawesome is a custom reporter for use with the Javascript testing framework, [mocha][mocha]. It runs on Node.js (>=10) and works in conjunction with [mochawesome-report-generator][marge] to generate a standalone HTML/CSS report to help visualize your test runs. +> Forked [mochawesome](https://github.com/adamgruber/mochawesome) add mocha to dependencies. + ## Features Mochawesome Report @@ -241,5 +244,4 @@ mochawesome is [MIT licensed][license]. [mocha]: https://mochajs.org/ [marge]: https://github.com/adamgruber/mochawesome-report-generator [marge-options]: https://github.com/adamgruber/mochawesome-report-generator#options -[changelog]: CHANGELOG.md [license]: LICENSE.md diff --git a/package.json b/package.json index 98b0718..0fa5d54 100644 --- a/package.json +++ b/package.json @@ -47,6 +47,9 @@ "functions": 100, "branches": 90 }, + "engines": { + "node": ">=18.19.0" + }, "dependencies": { "chalk": "^4.1.2", "diff": "^5.0.0", @@ -55,7 +58,7 @@ "lodash.isfunction": "^3.0.9", "lodash.isobject": "^3.0.2", "lodash.isstring": "^4.0.1", - "mocha": "^10.2.0", + "mocha": "^11.1.0", "mochawesome-report-generator": "^6.2.0", "strip-ansi": "^6.0.1", "uuid": "^8.3.2" From e7f5d850165d0ae23307ef316d3ab15a5d2fdce9 Mon Sep 17 00:00:00 2001 From: fengmk2 Date: Fri, 14 Mar 2025 09:44:05 +0800 Subject: [PATCH 2/2] f --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0fa5d54..be36723 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "test:mem": "mocha test-functional/mem-test.js --config test-functional/.mocharc.json", "test:ctx": "mocha test-functional/test-context.js --config test-functional/.mocharc.json", "tdd": "npm run lint && cross-env NODE_ENV=test nyc mocha --config test/.mocharc.json --watch", - "prepack": "npm run test" + "ci": "npm run test" }, "author": "Adam Gruber", "license": "MIT",