Merge branch 'v6.x'

Author: davidlehn

.eslintrc.js

@@ -6,5 +6,11 @@ module.exports = {
     es2020: true
   },
   extends: 'eslint-config-digitalbazaar',
-  root: true
+  root: true,
+  ignorePatterns: [
+    'dist/',
+    'tests/webidl/WebIDLParser.js',
+    'tests/webidl/idlharness.js',
+    'tests/webidl/testharness.js'
+  ]
 };

.github/workflows/main.yml

@@ -3,12 +3,27 @@ name: Node.js CI
 on: [push]
 
 jobs:
+  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 eslint
+      run: npm run lint
   test-node:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     strategy:
       matrix:
-        node-version: [12.x, 14.x, 16.x]
+        node-version: [14.x, 16.x, 18.x]
     steps:
     - uses: actions/checkout@v2
     - name: Use Node.js ${{ matrix.node-version }}
@@ -26,7 +41,7 @@ jobs:
     timeout-minutes: 10
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [16.x]
         bundler: [webpack, browserify]
     steps:
     - uses: actions/checkout@v2
@@ -42,28 +57,28 @@ jobs:
       run: npm run test-karma
       env:
         BUNDLER: ${{ matrix.bundler }}
-  lint:
+  build:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     strategy:
       matrix:
-        node-version: [14.x]
+        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 eslint
-      run: npm run lint
+    - name: Run build
+      run: npm run build
   coverage:
     needs: [test-node, test-karma]
     runs-on: ubuntu-latest
     timeout-minutes: 10
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [16.x]
     steps:
     - uses: actions/checkout@v2
     - name: Use Node.js ${{ matrix.node-version }}

CHANGELOG.md

@@ -9,6 +9,28 @@
 ### Changed
 - Change EARL Assertor to Digital Bazaar, Inc.
 
+## 6.0.0 - 2022-06-06
+
+### Changed
+- **BREAKING**: Drop testing and support for Node.js 12.x. The majority of the
+  code will still run on Node.js 12.x. However, the
+  `@digitalbazaar/http-client@3` update uses a newer `ky-universal` which uses
+  a top-level `await` that is unsupported in older Node.js versions. That
+  causes the included `node` `documentLoader` to not function and tests to
+  fail. If you wish to still use earlier Node.js versions, you may still be
+  able to do so with your own custom `documentLoader`.
+- **BREAKING**: `npm` `prepublish` script changed to `prepack`. The `dist/`
+  contents will not be generated by default for development installs. Run `npm
+  run build` if needed. This was done to avoid extra work only needed for
+  packing and publication, and for temporary `webpack` version issues. A new CI
+  `build` test has been added to check builds pass. The `prepack` script could
+  be `prepare` instead if use cases exist where that is needed. File an issue
+  if this is a concern.
+- Update to `@digitalbazaar/http-client@3`:
+  - Pulls in newer `ky` and `ky-universal` that should address security alerts
+    and provide other improvements.
+  - Use global `URL` interface to handle relative redirects.
+
 ## 5.2.0 - 2021-04-07
 
 ### Changed

lib/documentLoaders/node.js

@@ -80,6 +80,7 @@ module.exports = ({
       url, headers, strictSSL, httpAgent, httpsAgent
     });
     doc = {contextUrl: null, documentUrl: url, document: body || null};
+
     // handle error
     const statusText = http.STATUS_CODES[res.status];
     if(res.status >= 400) {
@@ -92,7 +93,9 @@ module.exports = ({
         });
     }
     const link = res.headers.get('link');
+    let location = res.headers.get('location');
     const contentType = res.headers.get('content-type');
+
     // handle Link Header
     if(link && contentType !== 'application/ld+json') {
       // only 1 related link header permitted
@@ -110,15 +113,15 @@ module.exports = ({
       }
 
       // "alternate" link header is a redirect
-      alternate = linkHeaders['alternate'];
+      alternate = linkHeaders.alternate;
       if(alternate &&
         alternate.type == 'application/ld+json' &&
         !(contentType || '')
           .match(/^application\/(\w*\+)?json$/)) {
-        res.headers.set('location', prependBase(url, alternate.target));
+        location = prependBase(url, alternate.target);
       }
     }
-    const location = res.headers.get('location');
+
     // handle redirect
     if((alternate ||
       res.status >= 300 && res.status < 400) && location) {
@@ -143,7 +146,9 @@ module.exports = ({
           });
       }
       redirects.push(url);
-      return loadDocument(location, redirects);
+      // location can be relative, turn into full url
+      const nextUrl = new URL(location, url).href;
+      return loadDocument(nextUrl, redirects);
     }
 
     // cache for each redirected URL
@@ -163,7 +168,12 @@ module.exports = ({
 
 async function _fetch({url, headers, strictSSL, httpAgent, httpsAgent}) {
   try {
-    const options = {headers, redirect: 'manual'};
+    const options = {
+      headers,
+      redirect: 'manual',
+      // ky specific to avoid redirects throwing
+      throwHttpErrors: false
+    };
     const isHttps = url.startsWith('https:');
     if(isHttps) {
       options.agent =

lib/documentLoaders/xhr.js

@@ -90,7 +90,7 @@ module.exports = ({
       }
 
       // "alternate" link header is a redirect
-      alternate = linkHeaders['alternate'];
+      alternate = linkHeaders.alternate;
       if(alternate &&
         alternate.type == 'application/ld+json' &&
         !(contentType || '').match(/^application\/(\w*\+)?json$/)) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsonld",
-  "version": "5.2.1-0",
+  "version": "6.0.1-0",
   "description": "A JSON-LD Processor and API implementation in JavaScript.",
   "homepage": "https://github.com/digitalbazaar/jsonld.js",
   "author": {
@@ -29,7 +29,7 @@
     "lib/**/*.js"
   ],
   "dependencies": {
-    "@digitalbazaar/http-client": "^1.1.0",
+    "@digitalbazaar/http-client": "^3.2.0",
     "canonicalize": "^1.0.1",
     "lru-cache": "^6.0.0",
     "rdf-canonize": "^3.0.0"
@@ -78,7 +78,7 @@
     "webpack-merge": "^5.7.3"
   },
   "engines": {
-    "node": ">=12"
+    "node": ">=14"
   },
   "keywords": [
     "JSON",
@@ -89,7 +89,7 @@
     "jsonld"
   ],
   "scripts": {
-    "prepublish": "npm run build",
+    "prepack": "npm run build",
     "build": "npm run build-webpack",
     "build-webpack": "webpack",
     "fetch-test-suites": "npm run fetch-json-ld-wg-test-suite && npm run fetch-json-ld-org-test-suite && npm run fetch-normalization-test-suite",
@@ -104,7 +104,7 @@
     "coverage": "cross-env NODE_ENV=test nyc --reporter=lcov --reporter=text-summary npm test",
     "coverage-ci": "cross-env NODE_ENV=test nyc --reporter=lcovonly npm run test",
     "coverage-report": "nyc report",
-    "lint": "eslint *.js lib/**.js tests/**.js"
+    "lint": "eslint ."
   },
   "nyc": {
     "exclude": [