deps: update jsonld to latest (#12257)

GoogleChrome · Mar 18, 2021 · 8e32e49 · 8e32e49
1 parent b571ab6
commit 8e32e49
Show file tree

Hide file tree

Showing 5 changed files with 222 additions and 85 deletions.
diff --git a/lighthouse-core/lib/sd-validation/json-expander.js b/lighthouse-core/lib/sd-validation/json-expander.js
@@ -14,27 +14,27 @@ const SCHEMA_ORG_HOST = 'schema.org';
  * Custom loader that prevents network calls and allows us to return local version of the
  * schema.org document
  * @param {string} schemaUrl
- * @param {(err: null|Error, value?: any) => void} callback
+ * @return {Promise<import('jsonld').RemoteDocument>}
  */
-function documentLoader(schemaUrl, callback) {
+async function documentLoader(schemaUrl) {
   let urlObj = null;
 
   try {
     // Give a dummy base URL so relative URLs will be considered valid.
     urlObj = new URL(schemaUrl, 'http://example.com');
   } catch (e) {
-    return callback(new Error('Error parsing URL: ' + schemaUrl), undefined);
+    throw new Error('Error parsing URL: ' + schemaUrl);
   }
 
   if (urlObj.host === SCHEMA_ORG_HOST && urlObj.pathname === '/') {
-    callback(null, {
+    return {
       document: schemaOrgContext,
-    });
+    };
   } else {
     // We only process schema.org, for other schemas we return an empty object
-    callback(null, {
+    return {
       document: {},
-    });
+    };
   }
 }
 

diff --git a/lighthouse-core/test/lib/sd-validation-test.js b/lighthouse-core/test/lib/sd-validation-test.js
@@ -98,7 +98,7 @@ describe('JSON-LD validation', () => {
     const errors = await validateJSONLD(`{
       "@context": {
         "image": {
-          "@id": "@error"
+          "@id": "/error/"
         }
       }
     }`);

diff --git a/package.json b/package.json
@@ -171,8 +171,8 @@
     "intl-pluralrules": "^1.0.3",
     "jpeg-js": "^0.4.1",
     "js-library-detector": "^6.4.0",
-    "jsonld": "^1.5.0",
-    "jsonlint-mod": "^1.7.5",
+    "jsonld": "^4.0.1",
+    "jsonlint-mod": "^1.7.6",
     "lighthouse-logger": "^1.2.0",
     "lighthouse-stack-packs": "^1.4.0",
     "lodash.get": "^4.4.2",

diff --git a/types/jsonld/index.d.ts b/types/jsonld/index.d.ts
@@ -5,11 +5,15 @@
  */
 
 declare module 'jsonld' {
-  type CallbackFn = (err: null|Error, result?: any) => void
+  interface RemoteDocument {
+    contextUrl?: string;
+    documentUrl?: string;
+    document: unknown;
+  }
 
   interface JsonldOptions {
-    documentLoader: (url: string, callback: CallbackFn) => void
+    documentLoader: (url: string) => Promise<RemoteDocument>;
   }
 
-  export function expand(object: any, options: JsonldOptions): Promise<any>;
+  export function expand(object: unknown, options: JsonldOptions): Promise<any>;
 }