diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2e7fbcba..e0c2007c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,20 +33,20 @@ jobs: node-version: ${{ matrix.node-version }} - run: npm install - name: Run test with Node.js ${{ matrix.node-version }} - run: npm run pretest; npm run test-node; npm run posttest -# test-karma: -# needs: [lint] -# runs-on: ubuntu-latest -# timeout-minutes: 10 -# strategy: -# matrix: -# node-version: [16.x] -# steps: -# - uses: actions/checkout@v2 -# - name: Use Node.js ${{ matrix.node-version }} -# uses: actions/setup-node@v1 -# with: -# node-version: ${{ matrix.node-version }} -# - run: npm install -# - name: Run karma test -# run: npm run pretest; npm run test-karma; npm run posttest + run: npm run test-node + test-karma: + needs: [lint] + runs-on: ubuntu-latest + timeout-minutes: 10 + strategy: + matrix: + node-version: [18.x] + steps: + - uses: actions/checkout@v2 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v1 + with: + node-version: ${{ matrix.node-version }} + - run: npm install + - name: Run karma test + run: npm run test-karma diff --git a/CHANGELOG.md b/CHANGELOG.md index 4bf01975..3a15a073 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,15 @@ # @digitalcredentials/vc ChangeLog -## 9.0.0 - 2024-09-30 +## 10.0.0 - 2025-04-30 + +### Changed +- **BREAKING**: Removes CJS build + +### Fixed +- move status check before expiry check because expiry check throws error that had prevented the status check from running +- attach the credential to the verification result for each credential submitted as part of a VP verification + +## 9.0.1 - 2024-09-30 ### Fixed - add signature checks to the log before running other verification checks whose errors might prevent that logging diff --git a/build-dist.sh b/build-dist.sh deleted file mode 100755 index 361b7db3..00000000 --- a/build-dist.sh +++ /dev/null @@ -1,18 +0,0 @@ -mkdir ./dist/esm - -cat >dist/esm/index.js <dist/esm/package.json < r.verified); diff --git a/package.json b/package.json index 8b69d1aa..f26d2a68 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@digitalcredentials/vc", - "version": "9.0.1", + "version": "10.0.0", "description": "Verifiable Credentials JavaScript library.", "homepage": "https://github.com/digitalcredentials/vc", "repository": { @@ -8,27 +8,17 @@ "url": "https://github.com/digitalcredentials/vc" }, "license": "BSD-3-Clause", - "main": "dist/index.js", - "module": "dist/esm/index.js", - "exports": { - ".": { - "require": "./dist/index.js", - "import": "./dist/esm/index.js" - }, - "./package.json": "./package.json" - }, + "type": "module", + "exports": "./lib/index.js", "files": [ - "dist", "lib", - "rollup.config.js", - "build-dist.sh", "README.md", "LICENSE" ], "dependencies": { - "@digitalcredentials/credentials-v2-context": "~0.0.1-beta.0", + "@digitalcredentials/credentials-v2-context": "^0.0.1-beta.0", "@digitalcredentials/jsonld": "^9.0.0", - "@digitalcredentials/jsonld-signatures": "^12.0.0", + "@digitalcredentials/jsonld-signatures": "^12.0.1", "@digitalcredentials/open-badges-context": "^2.1.0", "credentials-context": "^2.0.0", "ed25519-signature-2018-context": "^1.1.0" @@ -64,7 +54,6 @@ "mocha-lcov-reporter": "^1.3.0", "nyc": "^15.1.0", "rimraf": "^5.0.5", - "rollup": "^2.77.2", "uuid": "^9.0.0", "veres-one-context": "^12.0.0", "webpack": "^5.75.0" @@ -96,13 +85,6 @@ "Credential" ], "scripts": { - "rollup": "rollup -c rollup.config.js", - "build": "npm run clear && npm run rollup && ./build-dist.sh", - "clear": "rimraf dist/ && mkdir dist", - "posttest": "node post-test.js", - "prepare": "npm run build", - "pretest": "node pre-test.js", - "rebuild": "npm run clear && npm run build", "test": "npm run test-node", "test-node": "cross-env NODE_ENV=test mocha --preserve-symlinks -t 10000 test/*.spec.js", "test-karma": "karma start karma.conf.cjs", diff --git a/post-test.js b/post-test.js deleted file mode 100644 index 2701b215..00000000 --- a/post-test.js +++ /dev/null @@ -1,11 +0,0 @@ -import PackageJson from '@npmcli/package-json'; - -// post-test script -const main = async () => { - const pkgJson = await PackageJson.load('./'); - pkgJson.update({ type: undefined }); - await pkgJson.save(); -}; - -// run post-test script -main(); diff --git a/pre-test.js b/pre-test.js deleted file mode 100644 index dc99e49e..00000000 --- a/pre-test.js +++ /dev/null @@ -1,11 +0,0 @@ -const PackageJson = require('@npmcli/package-json'); - -// pre-test script -const main = async () => { - const pkgJson = await PackageJson.load('./'); - pkgJson.update({ type: 'module' }); - await pkgJson.save(); -}; - -// run pre-test script -main(); diff --git a/rollup.config.js b/rollup.config.js deleted file mode 100644 index c56f7fb8..00000000 --- a/rollup.config.js +++ /dev/null @@ -1,14 +0,0 @@ -import pkg from './package.json'; -export default [ - { - input: './lib/index.js', - output: [ - { - dir: 'dist', - format: 'cjs', - preserveModules: true - } - ], - external: Object.keys(pkg.dependencies) - } -];