From a8e679a9a2ba64703ac2c9930bd7ed6912845fff Mon Sep 17 00:00:00 2001 From: Dmitri Zagidulin Date: Sat, 3 Aug 2024 20:35:33 -0400 Subject: [PATCH 1/2] Re-fork as digitalcredentials/jsonld v9.0.0. --- .github/workflows/main.yml | 49 +++++-------------------------------- CHANGELOG.md | 8 +++++- lib/documentLoaders/node.js | 2 +- package.json | 10 ++++---- 4 files changed, 19 insertions(+), 50 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 08332857..dbcdb7d5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,7 +8,7 @@ jobs: timeout-minutes: 10 strategy: matrix: - node-version: [18.x] + node-version: [20.x] steps: - uses: actions/checkout@v3 - name: Use Node.js ${{ matrix.node-version }} @@ -23,7 +23,7 @@ jobs: timeout-minutes: 10 strategy: matrix: - node-version: [14.x, 16.x, 18.x, 20.x] + node-version: [20.x] steps: - uses: actions/checkout@v3 - name: Use Node.js ${{ matrix.node-version }} @@ -41,8 +41,8 @@ jobs: timeout-minutes: 10 strategy: matrix: - node-version: [16.x] - bundler: [webpack, browserify] + node-version: [20.x] + bundler: [webpack] steps: - uses: actions/checkout@v3 - name: Use Node.js ${{ matrix.node-version }} @@ -57,42 +57,5 @@ jobs: run: npm run test-karma env: BUNDLER: ${{ matrix.bundler }} - build: - runs-on: ubuntu-latest - timeout-minutes: 10 - strategy: - matrix: - node-version: [16.x] - steps: - - uses: actions/checkout@v3 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 - with: - node-version: ${{ matrix.node-version }} - - run: npm install - - name: Run build - run: npm run build - coverage: - needs: [test-node, test-karma] - runs-on: ubuntu-latest - timeout-minutes: 10 - strategy: - matrix: - node-version: [18.x] - steps: - - uses: actions/checkout@v3 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 - with: - node-version: ${{ matrix.node-version }} - - name: Install - run: npm install - - name: Fetch test suites - run: npm run fetch-test-suites - - name: Generate coverage report - run: npm run coverage-ci - - name: Upload coverage to Codecov - uses: codecov/codecov-action@v1 - with: - file: ./coverage/lcov.info - fail_ci_if_error: true + + diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c0926a8..fb1281c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,10 @@ -# jsonld ChangeLog +# @digitalcredentials/jsonld ChangeLog + +## 9.0.0 - + +### Changed +- **BREAKING**: Re-fork as `@digitalcredentials/jsonld` (to fix upstream http-client export error). +- Use `@digitalcredentials/http-client@5.0.0` fork. ## 8.3.2 - 2023-12-06 diff --git a/lib/documentLoaders/node.js b/lib/documentLoaders/node.js index 61ad6b30..13814708 100644 --- a/lib/documentLoaders/node.js +++ b/lib/documentLoaders/node.js @@ -9,7 +9,7 @@ const {LINK_HEADER_CONTEXT} = require('../constants'); const JsonLdError = require('../JsonLdError'); const RequestQueue = require('../RequestQueue'); const {prependBase} = require('../url'); -const {httpClient} = require('@digitalbazaar/http-client'); +const {httpClient} = require('@digitalcredentials/http-client'); /** * Creates a built-in node document loader. diff --git a/package.json b/package.json index d1e84e37..c8d54b4b 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { - "name": "jsonld", + "name": "@digitalcredentials/jsonld", "version": "8.3.3-0", "description": "A JSON-LD Processor and API implementation in JavaScript.", - "homepage": "https://github.com/digitalbazaar/jsonld.js", + "homepage": "https://github.com/digitalcredentials/jsonld.js", "author": { "name": "Digital Bazaar, Inc.", "email": "support@digitalbazaar.com", @@ -14,10 +14,10 @@ ], "repository": { "type": "git", - "url": "https://github.com/digitalbazaar/jsonld.js" + "url": "https://github.com/digitalcredentials/jsonld.js" }, "bugs": { - "url": "https://github.com/digitalbazaar/jsonld.js/issues", + "url": "https://github.com/digitalcredentials/jsonld.js/issues", "email": "support@digitalbazaar.com" }, "license": "BSD-3-Clause", @@ -29,7 +29,7 @@ "lib/**/*.js" ], "dependencies": { - "@digitalbazaar/http-client": "^3.4.1", + "@digitalcredentials/http-client": "^5.0.1", "canonicalize": "^1.0.1", "lru-cache": "^6.0.0", "rdf-canonize": "^3.4.0" From 52f8e934a1bd0ce59d60c1fd0cfa946c5654d8dc Mon Sep 17 00:00:00 2001 From: Dmitri Zagidulin Date: Sat, 3 Aug 2024 20:43:58 -0400 Subject: [PATCH 2/2] Release 9.0.0 --- CHANGELOG.md | 2 +- README.md | 4 +--- package.json | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fb1281c6..8fe5b6eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # @digitalcredentials/jsonld ChangeLog -## 9.0.0 - +## 9.0.0 - 2024-08-03 ### Changed - **BREAKING**: Re-fork as `@digitalcredentials/jsonld` (to fix upstream http-client export error). diff --git a/README.md b/README.md index 98299837..04626b3b 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,7 @@ jsonld.js ========= -[![Build status](https://img.shields.io/github/actions/workflow/status/digitalbazaar/jsonld.js/main.yml)](https://github.com/digitalbazaar/jsonld.js/actions/workflows/main.yml) -[![Coverage status](https://img.shields.io/codecov/c/github/digitalbazaar/jsonld.js)](https://codecov.io/gh/digitalbazaar/jsonld.js) -[![npm](https://img.shields.io/npm/v/jsonld)](https://npm.im/jsonld) +[![NPM Version](https://img.shields.io/npm/v/@digitalcredentials/jsonld.svg)](https://npm.im/@digitalcredentials/jsonld) Introduction ------------ diff --git a/package.json b/package.json index c8d54b4b..9ac757e4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@digitalcredentials/jsonld", - "version": "8.3.3-0", + "version": "9.0.0", "description": "A JSON-LD Processor and API implementation in JavaScript.", "homepage": "https://github.com/digitalcredentials/jsonld.js", "author": {