Revert "JSON LD Stuff"

This reverts commit 56e3001.
GoogleChrome · Feb 3, 2019 · 624690f · 624690f
1 parent 3a92230
commit 624690f
Show file tree

Hide file tree

Showing 27 changed files with 3 additions and 13,437 deletions.
diff --git a/build/build-bundle.js b/build/build-bundle.js
@@ -64,13 +64,7 @@ async function browserifyFile(entryPath, distPath) {
     .ignore('raven')
     .ignore('mkdirp')
     .ignore('rimraf')
-    .ignore('pako/lib/zlib/inflate.js')
-    .ignore('file')
-    .ignore('system');
-
-  // there is no way to add './doug-json-parse' to ignored packages via public API
-  // w/o browserify resolving the path into an absolute path
-  bundle._ignore.push('./doug-json-parse');
+    .ignore('pako/lib/zlib/inflate.js');
 
   // Don't include the desktop protocol connection.
   bundle.ignore(require.resolve('../lighthouse-core/gather/connections/cri.js'));

diff --git a/jslondtest.js b/jslondtest.js
diff --git a/lighthouse-cli/test/fixtures/seo/seo-failure-cases.html b/lighthouse-cli/test/fixtures/seo/seo-failure-cases.html
@@ -20,26 +20,6 @@
   <link rel="alternate" href="http://example.com/" hreflang=" x-default" />
   <!-- FAIL(canonical): multiple canonical URLs provided (another one is in the HTTP header) -->
   <link rel="canonical" href="https://example.com/" />
-  <!-- FAIL(structured-data-automatic): invalid JSON -->
-  <script type="application/ld+json">
-    {
-      "@context": "http://schema.org"
-  </script>
-  <!-- FAIL(structured-data-automatic): invalid JSON-LD -->
-  <script type="application/ld+json">
-  {
-    "@invalid-keyword": "oh no"
-  }
-  </script>
-  <!-- FAIL(structured-data-automatic): invalid schema.org type -->
-  <script type="application/ld+json">
-  {
-    "@context": "http://schema.org/",
-    "@type": "Cat",
-    "name": "Garfield",
-    "url": "https://garfield.com/"
-  }
-  </script>
 </head>
 <body>
   <h1>SEO</h1>

diff --git a/lighthouse-cli/test/fixtures/seo/seo-tester.html b/lighthouse-cli/test/fixtures/seo/seo-tester.html
@@ -19,48 +19,6 @@
   <link rel="alternate" href="http://example.com/" hreflang="x-default" />
   <!-- PASS(canonical): valid canonical URL -->
   <link rel="canonical" href="http://localhost:10200/seo/" />
-  <!-- PASS(structured-data-automatic): valid JSON-LD -->
-  <script type="application/ld+json">
-  {
-    "@context": "http://schema.org",
-    "@type": "Recipe",
-    "author": "John Smith",
-    "cookTime": "PT1H",
-    "datePublished": "2009-05-08",
-    "description": "This classic banana bread recipe comes from my mom -- the walnuts add a nice texture and flavor to the banana bread.",
-    "image": "bananabread.jpg",
-    "recipeIngredient": [
-      "3 or 4 ripe bananas, smashed",
-      "1 egg",
-      "3/4 cup of sugar"
-    ],
-    "interactionStatistic": {
-      "@type": "InteractionCounter",
-      "interactionType": "http://schema.org/Comment",
-      "userInteractionCount": "140"
-    },
-    "name": "Mom's World Famous Banana Bread",
-    "nutrition": {
-      "@type": "NutritionInformation",
-      "calories": "240 calories",
-      "fatContent": "9 grams fat"
-    },
-    "prepTime": "PT15M",
-    "recipeInstructions": "Preheat the oven to 350 degrees. Mix in the ingredients in a bowl. Add the flour last. Pour the mixture into a loaf pan and bake for one hour.",
-    "recipeYield": "1 loaf",
-    "suitableForDiet": "http://schema.org/LowFatDiet"
-  }
-  </script>
-  <script type="application/ld+json">
-  {
-    "@context": "http://schema.org/",
-    "@type": "Person",
-    "name": "Jane Doe",
-    "jobTitle": "Professor",
-    "telephone": "(425) 123-4567",
-    "url": "http://www.janedoe.com"
-  }
-  </script>
 
   <style>
     .small {

diff --git a/lighthouse-cli/test/smokehouse/seo/expectations.js b/lighthouse-cli/test/smokehouse/seo/expectations.js
@@ -79,9 +79,6 @@ module.exports = [
         rawValue: true,
         scoreDisplayMode: 'notApplicable',
       },
-      'structured-data-automatic': {
-        rawValue: true,
-      },
     },
   },
   {
@@ -142,14 +139,6 @@ module.exports = [
         score: 0,
         explanation: 'Multiple conflicting URLs (https://example.com, https://example.com/)',
       },
-      'structured-data-automatic': {
-        rawValue: false,
-        details: {
-          items: {
-            length: 3,
-          },
-        },
-      },
     },
   },
   {

diff --git a/lighthouse-core/audits/seo/structured-data-automatic.js b/lighthouse-core/audits/seo/structured-data-automatic.js
diff --git a/lighthouse-core/config/default-config.js b/lighthouse-core/config/default-config.js
@@ -107,7 +107,6 @@ const defaultConfig = {
       'seo/hreflang',
       'seo/embedded-content',
       'seo/canonical',
-      'seo/json-ld',
       'seo/robots-txt',
       'seo/tap-targets',
     ],
@@ -248,7 +247,6 @@ const defaultConfig = {
     'seo/hreflang',
     'seo/plugins',
     'seo/canonical',
-    'seo/structured-data-automatic',
     'seo/manual/mobile-friendly',
     'seo/manual/structured-data',
   ],
@@ -453,7 +451,6 @@ const defaultConfig = {
         {id: 'font-size', weight: 1, group: 'seo-mobile'},
         {id: 'plugins', weight: 1, group: 'seo-content'},
         {id: 'tap-targets', weight: 1, group: 'seo-mobile'},
-        {id: 'structured-data-automatic', weight: 1, group: 'seo-content'},
         // Manual audits
         {id: 'mobile-friendly', weight: 0},
         {id: 'structured-data', weight: 0},

diff --git a/lighthouse-core/gather/gatherers/seo/json-ld.js b/lighthouse-core/gather/gatherers/seo/json-ld.js
diff --git a/package.json b/package.json
@@ -32,9 +32,8 @@
     "unit-cli": "jest  --runInBand \"lighthouse-cli/\"",
     "unit-cli:ci": "jest --runInBand --coverage --ci \"lighthouse-cli/\"",
     "unit-viewer": "mocha --reporter dot \"lighthouse-viewer/test/**/*-test.js\"",
-    "unit-sd-validation": "mocha --reporter dot \"sd-validation/test/**/*-test.js\"",
-    "unit": "yarn unit-core && yarn unit-cli && yarn unit-viewer && yarn unit-sd-validation",
-    "unit:ci": "yarn unit-core:ci && yarn unit-cli:ci && yarn unit-viewer && yarn unit-sd-validation",
+    "unit": "yarn unit-core && yarn unit-cli && yarn unit-viewer",
+    "unit:ci": "yarn unit-core:ci && yarn unit-cli:ci && yarn unit-viewer",
     "core-unit": "yarn unit-core",
     "cli-unit": "yarn unit-cli",
     "viewer-unit": "yarn unit-viewer",
@@ -149,8 +148,6 @@
     "intl-messageformat": "^2.2.0",
     "intl-messageformat-parser": "^1.4.0",
     "jpeg-js": "0.1.2",
-    "jsonld": "^1.0.2",
-    "jsonlint-mod": "^1.7.2",
     "js-library-detector": "^5.1.0",
     "lighthouse-logger": "^1.2.0",
     "lodash.isequal": "^4.5.0",