Switch http requests in web code to package:http

Author: parlough

CHANGELOG.md

@@ -1,5 +1,6 @@
 ## 8.0.4-wip
 
+* Require Dart 3.2 or later.
 * Remove explicit library names. (#3609)
 
 ## 8.0.3

lib/resources/docs.dart.js

@@ -4,7 +4,7 @@ description: A non-interactive HTML documentation generator for Dart source code
 repository: https://github.com/dart-lang/dartdoc
 
 environment:
-  sdk: ^3.0.0
+  sdk: ^3.2.0
 
 dependencies:
   analyzer: ^6.3.0
@@ -25,7 +25,7 @@ dependencies:
 dev_dependencies:
   async: ^2.11.0
   dart_style: ^2.3.1
-  http: ">=0.13.6 <2.0.0"
+  http: ^1.1.2
   js: ^0.6.7
   lints: ^3.0.0
   matcher: ^0.12.15

lib/resources/docs.dart.js.map

@@ -2,7 +2,9 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'dart:html';
+import 'dart:html' hide HttpRequest;
+
+import 'package:http/http.dart' as http show read;
 
 import 'highlight.dart' as highlight;
 import 'search.dart' as search;
@@ -45,7 +47,7 @@ void initializeSidebars() {
   if (aboveSidebarPath != null &&
       aboveSidebarPath.isNotEmpty &&
       leftSidebar != null) {
-    HttpRequest.getString('$baseHref$aboveSidebarPath').then((content) {
+    http.read(Uri.parse('$baseHref$aboveSidebarPath')).then((content) {
       leftSidebar.setInnerHtml(content, treeSanitizer: sanitizer);
     });
   }
@@ -54,7 +56,7 @@ void initializeSidebars() {
   if (belowSidebarPath != null &&
       belowSidebarPath.isNotEmpty &&
       rightSidebar != null) {
-    HttpRequest.getString('$baseHref$belowSidebarPath').then((content) {
+    http.read(Uri.parse('$baseHref$belowSidebarPath')).then((content) {
       rightSidebar.setInnerHtml(content, treeSanitizer: sanitizer);
     });
   }

pubspec.yaml

@@ -4,9 +4,9 @@
 
 import 'dart:convert';
 import 'dart:html';
-import 'package:dartdoc/src/search.dart';
 
-import 'web_interop.dart';
+import 'package:dartdoc/src/search.dart';
+import 'package:http/http.dart' as http show read;
 
 final String _htmlBase = () {
   final body = document.querySelector('body')!;
@@ -35,16 +35,8 @@ void init() {
     searchSidebar?.placeholder = 'Failed to initialize search';
   }
 
-  window.fetch('${_htmlBase}index.json').then((response) async {
-    response = response as FetchResponse;
-    var code = response.status;
-    if (code == 404) {
-      disableSearch();
-      return;
-    }
-
-    var text = await response.text;
-    final index = Index.fromJson(text);
+  http.read(Uri.parse('${_htmlBase}index.json')).then((response) {
+    final index = Index.fromJson(response);
 
     // Navigate to the first result from the 'search' query parameter
     // if specified and found.
@@ -71,6 +63,8 @@ void init() {
     if (searchSidebar != null) {
       _Search(index).initialize(searchSidebar);
     }
+  }).catchError((_) {
+    disableSearch();
   });
 }
 

web/docs.dart

@@ -1 +1 @@
-8C67B39F09940FC20D8C13F6BBE0B1EE
+51B7F201B78DED71A64BF38FC05AA595