dart-lang · isoos · Apr 24, 2018 · Apr 20, 2018
diff --git a/app/lib/frontend/handlers.dart b/app/lib/frontend/handlers.dart
@@ -444,11 +444,8 @@ Future<shelf.Response> _packageVersionsHandler(
     return backend.downloadUrl(packageName, version.version);
   }).toList());
 
-  final dartdocEntries = await dartdocClient.getEntries(
-      packageName, versions.map((pv) => pv.version).toList());
-
   return htmlResponse(templateService.renderPkgVersionsPage(
-      packageName, versions, dartdocEntries, versionDownloadUrls));
+      packageName, versions, versionDownloadUrls));
 }
 
 /// Handles requests for /packages/<package>
@@ -478,8 +475,6 @@ Future<shelf.Response> _packageVersionHandlerHtml(
     sortPackageVersionsDesc(versions, decreasing: true, pubSorting: true);
     final latestStable = versions[0];
     final first10Versions = versions.take(10).toList();
-    final dartdocEntries = await dartdocClient.getEntries(
-        packageName, first10Versions.map((pv) => pv.version).toList());
 
     sortPackageVersionsDesc(versions, decreasing: true, pubSorting: false);
     final latestDev = versions[0];
@@ -517,7 +512,6 @@ Future<shelf.Response> _packageVersionHandlerHtml(
         package,
         versionName != null,
         first10Versions,
-        dartdocEntries,
         versionDownloadUrls,
         selectedVersion,
         latestStable,

diff --git a/app/lib/frontend/templates.dart b/app/lib/frontend/templates.dart
@@ -13,7 +13,6 @@ import 'package:meta/meta.dart';
 import 'package:mustache/mustache.dart' as mustache;
 
 import '../shared/analyzer_client.dart';
-import '../shared/dartdoc_client.dart' show DartdocEntry;
 import '../shared/markdown.dart';
 import '../shared/platform.dart';
 import '../shared/search_service.dart' show SearchQuery, serializeSearchOrder;
@@ -50,17 +49,16 @@ class TemplateService {
 
   /// Renders the `views/pkg/versions/index` template.
   String renderPkgVersionsPage(String package, List<PackageVersion> versions,
-      List<DartdocEntry> dartdocEntries, List<Uri> versionDownloadUrls) {
+      List<Uri> versionDownloadUrls) {
     assert(versions.length == versionDownloadUrls.length);
 
     final stableVersionRows = [];
     final devVersionRows = [];
     PackageVersion latestDevVersion;
     for (int i = 0; i < versions.length; i++) {
       final PackageVersion version = versions[i];
-      final DartdocEntry dartdocEntry = dartdocEntries[i];
       final String url = versionDownloadUrls[i].toString();
-      final rowHtml = _renderVersionTableRow(version, dartdocEntry, url);
+      final rowHtml = _renderVersionTableRow(version, url);
       if (version.semanticVersion.isPreRelease) {
         latestDevVersion ??= version;
         devVersionRows.add(rowHtml);
@@ -96,18 +94,13 @@ class TemplateService {
         canonicalUrl: urls.pkgPageUrl(package, includeHost: true));
   }
 
-  String _renderVersionTableRow(
-      PackageVersion version, DartdocEntry dartdocEntry, String downloadUrl) {
-    final dartdocOk = dartdocEntry != null && dartdocEntry.hasContent;
-    final dartdocFailed = dartdocEntry != null && !dartdocEntry.hasContent;
+  String _renderVersionTableRow(PackageVersion version, String downloadUrl) {
     final versionData = {
       'package': version.package,
       'version': version.version,
       'version_url': urls.pkgPageUrl(version.package, version: version.version),
       'short_created': version.shortCreated,
       'dartdocs_url': _attr(version.dartdocsUrl),
-      'dartdoc_ok': dartdocOk,
-      'dartdoc_failed': dartdocFailed,
       'download_url': _attr(downloadUrl),
       'icons': staticUrls.versionsTableIcons,
     };
@@ -279,7 +272,6 @@ class TemplateService {
   Map<String, Object> _pkgShowPageValues(
       Package package,
       List<PackageVersion> versions,
-      List<DartdocEntry> dartdocEntries,
       List<Uri> versionDownloadUrls,
       PackageVersion selectedVersion,
       PackageVersion latestStableVersion,
@@ -340,9 +332,8 @@ class TemplateService {
     final versionTableRows = [];
     for (int i = 0; i < versions.length; i++) {
       final PackageVersion version = versions[i];
-      final DartdocEntry dartdocEntry = dartdocEntries[i];
       final String url = versionDownloadUrls[i].toString();
-      versionTableRows.add(_renderVersionTableRow(version, dartdocEntry, url));
+      versionTableRows.add(_renderVersionTableRow(version, url));
     }
 
     final bool should_show_dev =
@@ -481,7 +472,6 @@ class TemplateService {
       Package package,
       bool isVersionPage,
       List<PackageVersion> versions,
-      List<DartdocEntry> dartdocEntries,
       List<Uri> versionDownloadUrls,
       PackageVersion selectedVersion,
       PackageVersion latestStableVersion,
@@ -504,7 +494,6 @@ class TemplateService {
     final Map<String, Object> values = _pkgShowPageValues(
       package,
       versions,
-      dartdocEntries,
       versionDownloadUrls,
       selectedVersion,
       latestStableVersion,

diff --git a/app/lib/shared/memcache.dart b/app/lib/shared/memcache.dart
@@ -12,7 +12,7 @@ const Duration packageJsonExpiration = const Duration(minutes: 10);
 const Duration packageUiPageExpiration = const Duration(minutes: 10);
 const Duration analyzerDataExpiration = const Duration(minutes: 60);
 const Duration analyzerDataLocalExpiration = const Duration(minutes: 15);
-const Duration dartdocEntryExpiration = const Duration(minutes: 60);
+const Duration dartdocEntryExpiration = const Duration(hours: 24);
 const Duration dartdocFileInfoExpiration = const Duration(minutes: 60);
 const Duration searchUiPageExpiration = const Duration(minutes: 10);
 const Duration memcacheRequestTimeout = const Duration(seconds: 5);

diff --git a/app/test/frontend/golden/authorized_page.html b/app/test/frontend/golden/authorized_page.html
@@ -25,7 +25,7 @@
   <link rel="alternate" type="application/atom+xml" title="Updated Packages Feed for Pub" href="/feed.atom" />
   <link href="/static/highlight/github.css" rel="stylesheet" />
   <link href="/static/css/style.css?hash=uda17h8hkah47s3bdscb1sqoai2i751f" rel="stylesheet" type="text/css" />
-  <script src="/static/js/script.dart.js?hash=rj4hsfrjs7ljosruf329pqqf12507bq8" defer></script>
+  <script src="/static/js/script.dart.js?hash=vf5fepsefevp5j4i2qm3b2mgj8m6rpna" defer></script>
 </head>
 <body>
 <header class="site-header">

diff --git a/app/test/frontend/golden/error_page.html b/app/test/frontend/golden/error_page.html
@@ -25,7 +25,7 @@
   <link rel="alternate" type="application/atom+xml" title="Updated Packages Feed for Pub" href="/feed.atom" />
   <link href="/static/highlight/github.css" rel="stylesheet" />
   <link href="/static/css/style.css?hash=uda17h8hkah47s3bdscb1sqoai2i751f" rel="stylesheet" type="text/css" />
-  <script src="/static/js/script.dart.js?hash=rj4hsfrjs7ljosruf329pqqf12507bq8" defer></script>
+  <script src="/static/js/script.dart.js?hash=vf5fepsefevp5j4i2qm3b2mgj8m6rpna" defer></script>
 </head>
 <body>
 <header class="site-header">

diff --git a/app/test/frontend/golden/flutter_landing_page.html b/app/test/frontend/golden/flutter_landing_page.html
@@ -25,7 +25,7 @@
   <link rel="alternate" type="application/atom+xml" title="Updated Packages Feed for Pub" href="/feed.atom" />
   <link href="/static/highlight/github.css" rel="stylesheet" />
   <link href="/static/css/style.css?hash=uda17h8hkah47s3bdscb1sqoai2i751f" rel="stylesheet" type="text/css" />
-  <script src="/static/js/script.dart.js?hash=rj4hsfrjs7ljosruf329pqqf12507bq8" defer></script>
+  <script src="/static/js/script.dart.js?hash=vf5fepsefevp5j4i2qm3b2mgj8m6rpna" defer></script>
   <script async="" defer="" src="//www.google.com/insights/consumersurveys/async_survey?site=5wdvu4vc5lhop3xbatxof6lzcm"></script>
 </head>
 <body>

diff --git a/app/test/frontend/golden/index_page.html b/app/test/frontend/golden/index_page.html
@@ -25,7 +25,7 @@
   <link rel="alternate" type="application/atom+xml" title="Updated Packages Feed for Pub" href="/feed.atom" />
   <link href="/static/highlight/github.css" rel="stylesheet" />
   <link href="/static/css/style.css?hash=uda17h8hkah47s3bdscb1sqoai2i751f" rel="stylesheet" type="text/css" />
-  <script src="/static/js/script.dart.js?hash=rj4hsfrjs7ljosruf329pqqf12507bq8" defer></script>
+  <script src="/static/js/script.dart.js?hash=vf5fepsefevp5j4i2qm3b2mgj8m6rpna" defer></script>
   <script async="" defer="" src="//www.google.com/insights/consumersurveys/async_survey?site=5wdvu4vc5lhop3xbatxof6lzcm"></script>
 </head>
 <body>

diff --git a/app/test/frontend/golden/pkg_index_page.html b/app/test/frontend/golden/pkg_index_page.html
@@ -26,7 +26,7 @@
   <link rel="alternate" type="application/atom+xml" title="Updated Packages Feed for Pub" href="/feed.atom" />
   <link href="/static/highlight/github.css" rel="stylesheet" />
   <link href="/static/css/style.css?hash=uda17h8hkah47s3bdscb1sqoai2i751f" rel="stylesheet" type="text/css" />
-  <script src="/static/js/script.dart.js?hash=rj4hsfrjs7ljosruf329pqqf12507bq8" defer></script>
+  <script src="/static/js/script.dart.js?hash=vf5fepsefevp5j4i2qm3b2mgj8m6rpna" defer></script>
   <script async="" defer="" src="//www.google.com/insights/consumersurveys/async_survey?site=5wdvu4vc5lhop3xbatxof6lzcm"></script>
 </head>
 <body>

diff --git a/app/test/frontend/golden/pkg_show_page.html b/app/test/frontend/golden/pkg_show_page.html
@@ -25,7 +25,7 @@
   <link rel="alternate" type="application/atom+xml" title="Updated Packages Feed for Pub" href="/feed.atom" />
   <link href="/static/highlight/github.css" rel="stylesheet" />
   <link href="/static/css/style.css?hash=uda17h8hkah47s3bdscb1sqoai2i751f" rel="stylesheet" type="text/css" />
-  <script src="/static/js/script.dart.js?hash=rj4hsfrjs7ljosruf329pqqf12507bq8" defer></script>
+  <script src="/static/js/script.dart.js?hash=vf5fepsefevp5j4i2qm3b2mgj8m6rpna" defer></script>
   <script async="" defer="" src="//www.google.com/insights/consumersurveys/async_survey?site=5wdvu4vc5lhop3xbatxof6lzcm"></script>
 </head>
 <body>
@@ -145,7 +145,7 @@ <h3>3. Import it</h3>
         </code></pre>
     </section>
     <section class="content js-content markdown-body" data-name="-versions-tab-">
-      <table class="version-table">
+      <table class="version-table" data-package="foobar_pkg">
         <thead>
         <tr>
           <th>Version</th>
@@ -155,13 +155,14 @@ <h3>3. Import it</h3>
         </tr>
         </thead>
 
-<tr>
+<tr data-version="0.1.1+5">
   <td><strong><a href="/packages/foobar_pkg/versions/0.1.1+5">0.1.1+5</a></strong></td>
   <td>Jan 1, 2014</td>
   <td class="documentation">
     <a href="https://pub.dartlang.org/documentation/foobar_pkg/0.1.1+5/"
+       rel="nofollow"
        title="Go to the documentation of foobar_pkg 0.1.1+5">
-      <img src="/static/img/ic_drive_document_black_24dp.svg" alt="Go to the documentation of foobar_pkg 0.1.1+5" />
+        <img src="/static/img/ic_drive_document_black_24dp.svg" alt="Go to the documentation of foobar_pkg 0.1.1+5" />
     </a>
   </td>
   <td class="archive">

diff --git a/app/test/frontend/golden/pkg_show_page_discontinued.html b/app/test/frontend/golden/pkg_show_page_discontinued.html
@@ -26,7 +26,7 @@
   <link rel="alternate" type="application/atom+xml" title="Updated Packages Feed for Pub" href="/feed.atom" />
   <link href="/static/highlight/github.css" rel="stylesheet" />
   <link href="/static/css/style.css?hash=uda17h8hkah47s3bdscb1sqoai2i751f" rel="stylesheet" type="text/css" />
-  <script src="/static/js/script.dart.js?hash=rj4hsfrjs7ljosruf329pqqf12507bq8" defer></script>
+  <script src="/static/js/script.dart.js?hash=vf5fepsefevp5j4i2qm3b2mgj8m6rpna" defer></script>
   <script async="" defer="" src="//www.google.com/insights/consumersurveys/async_survey?site=5wdvu4vc5lhop3xbatxof6lzcm"></script>
 </head>
 <body>
@@ -142,7 +142,7 @@ <h3>3. Import it</h3>
         </code></pre>
     </section>
     <section class="content js-content markdown-body" data-name="-versions-tab-">
-      <table class="version-table">
+      <table class="version-table" data-package="foobar_pkg">
         <thead>
         <tr>
           <th>Version</th>
@@ -152,11 +152,15 @@ <h3>3. Import it</h3>
         </tr>
         </thead>
 
-<tr>
+<tr data-version="0.1.1+5">
   <td><strong><a href="/packages/foobar_pkg/versions/0.1.1+5">0.1.1+5</a></strong></td>
   <td>Jan 1, 2014</td>
   <td class="documentation">
-    <a href="https://pub.dartlang.org/documentation/foobar_pkg/0.1.1+5/log.txt">failed</a>
+    <a href="https://pub.dartlang.org/documentation/foobar_pkg/0.1.1+5/"
+       rel="nofollow"
+       title="Go to the documentation of foobar_pkg 0.1.1+5">
+        <img src="/static/img/ic_drive_document_black_24dp.svg" alt="Go to the documentation of foobar_pkg 0.1.1+5" />
+    </a>
   </td>
   <td class="archive">
     <a href="http://dart-example.com/"

diff --git a/app/test/frontend/golden/pkg_show_page_flutter_plugin.html b/app/test/frontend/golden/pkg_show_page_flutter_plugin.html
@@ -25,7 +25,7 @@
   <link rel="alternate" type="application/atom+xml" title="Updated Packages Feed for Pub" href="/feed.atom" />
   <link href="/static/highlight/github.css" rel="stylesheet" />
   <link href="/static/css/style.css?hash=uda17h8hkah47s3bdscb1sqoai2i751f" rel="stylesheet" type="text/css" />
-  <script src="/static/js/script.dart.js?hash=rj4hsfrjs7ljosruf329pqqf12507bq8" defer></script>
+  <script src="/static/js/script.dart.js?hash=vf5fepsefevp5j4i2qm3b2mgj8m6rpna" defer></script>
   <script async="" defer="" src="//www.google.com/insights/consumersurveys/async_survey?site=5wdvu4vc5lhop3xbatxof6lzcm"></script>
 </head>
 <body>
@@ -132,7 +132,7 @@ <h3>3. Import it</h3>
         </code></pre>
     </section>
     <section class="content js-content markdown-body" data-name="-versions-tab-">
-      <table class="version-table">
+      <table class="version-table" data-package="foobar_pkg">
         <thead>
         <tr>
           <th>Version</th>
@@ -142,13 +142,14 @@ <h3>3. Import it</h3>
         </tr>
         </thead>
 
-<tr>
+<tr data-version="0.1.1+5">
   <td><strong><a href="/packages/foobar_pkg/versions/0.1.1+5">0.1.1+5</a></strong></td>
   <td>Jan 1, 2015</td>
   <td class="documentation">
     <a href="https://pub.dartlang.org/documentation/foobar_pkg/0.1.1+5/"
+       rel="nofollow"
        title="Go to the documentation of foobar_pkg 0.1.1+5">
-      <img src="/static/img/ic_drive_document_black_24dp.svg" alt="Go to the documentation of foobar_pkg 0.1.1+5" />
+        <img src="/static/img/ic_drive_document_black_24dp.svg" alt="Go to the documentation of foobar_pkg 0.1.1+5" />
     </a>
   </td>
   <td class="archive">

diff --git a/app/test/frontend/golden/pkg_show_page_outdated.html b/app/test/frontend/golden/pkg_show_page_outdated.html
@@ -27,7 +27,7 @@
   <link rel="alternate" type="application/atom+xml" title="Updated Packages Feed for Pub" href="/feed.atom" />
   <link href="/static/highlight/github.css" rel="stylesheet" />
   <link href="/static/css/style.css?hash=uda17h8hkah47s3bdscb1sqoai2i751f" rel="stylesheet" type="text/css" />
-  <script src="/static/js/script.dart.js?hash=rj4hsfrjs7ljosruf329pqqf12507bq8" defer></script>
+  <script src="/static/js/script.dart.js?hash=vf5fepsefevp5j4i2qm3b2mgj8m6rpna" defer></script>
   <script async="" defer="" src="//www.google.com/insights/consumersurveys/async_survey?site=5wdvu4vc5lhop3xbatxof6lzcm"></script>
 </head>
 <body>
@@ -143,7 +143,7 @@ <h3>3. Import it</h3>
         </code></pre>
     </section>
     <section class="content js-content markdown-body" data-name="-versions-tab-">
-      <table class="version-table">
+      <table class="version-table" data-package="foobar_pkg">
         <thead>
         <tr>
           <th>Version</th>
@@ -153,11 +153,15 @@ <h3>3. Import it</h3>
         </tr>
         </thead>
 
-<tr>
+<tr data-version="0.1.1+5">
   <td><strong><a href="/packages/foobar_pkg/versions/0.1.1+5">0.1.1+5</a></strong></td>
   <td>Jan 1, 2014</td>
   <td class="documentation">
-    <a href="https://pub.dartlang.org/documentation/foobar_pkg/0.1.1+5/log.txt">failed</a>
+    <a href="https://pub.dartlang.org/documentation/foobar_pkg/0.1.1+5/"
+       rel="nofollow"
+       title="Go to the documentation of foobar_pkg 0.1.1+5">
+        <img src="/static/img/ic_drive_document_black_24dp.svg" alt="Go to the documentation of foobar_pkg 0.1.1+5" />
+    </a>
   </td>
   <td class="archive">
     <a href="http://dart-example.com/"

diff --git a/app/test/frontend/golden/pkg_show_version_page.html b/app/test/frontend/golden/pkg_show_version_page.html
@@ -27,7 +27,7 @@
   <link rel="alternate" type="application/atom+xml" title="Updated Packages Feed for Pub" href="/feed.atom" />
   <link href="/static/highlight/github.css" rel="stylesheet" />
   <link href="/static/css/style.css?hash=uda17h8hkah47s3bdscb1sqoai2i751f" rel="stylesheet" type="text/css" />
-  <script src="/static/js/script.dart.js?hash=rj4hsfrjs7ljosruf329pqqf12507bq8" defer></script>
+  <script src="/static/js/script.dart.js?hash=vf5fepsefevp5j4i2qm3b2mgj8m6rpna" defer></script>
   <script async="" defer="" src="//www.google.com/insights/consumersurveys/async_survey?site=5wdvu4vc5lhop3xbatxof6lzcm"></script>
 </head>
 <body>
@@ -147,7 +147,7 @@ <h3>3. Import it</h3>
         </code></pre>
     </section>
     <section class="content js-content markdown-body" data-name="-versions-tab-">
-      <table class="version-table">
+      <table class="version-table" data-package="foobar_pkg">
         <thead>
         <tr>
           <th>Version</th>
@@ -157,13 +157,14 @@ <h3>3. Import it</h3>
         </tr>
         </thead>
 
-<tr>
+<tr data-version="0.1.1+5">
   <td><strong><a href="/packages/foobar_pkg/versions/0.1.1+5">0.1.1+5</a></strong></td>
   <td>Jan 1, 2014</td>
   <td class="documentation">
     <a href="https://pub.dartlang.org/documentation/foobar_pkg/0.1.1+5/"
+       rel="nofollow"
        title="Go to the documentation of foobar_pkg 0.1.1+5">
-      <img src="/static/img/ic_drive_document_black_24dp.svg" alt="Go to the documentation of foobar_pkg 0.1.1+5" />
+        <img src="/static/img/ic_drive_document_black_24dp.svg" alt="Go to the documentation of foobar_pkg 0.1.1+5" />
     </a>
   </td>
   <td class="archive">