Move dartdoc_page.dart to _pub_shared. (dart-lang#7210)

isoos · Nov 21, 2023 · 11a71f3 · 11a71f3
1 parent c6348ba
commit 11a71f3
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 5 deletions.
diff --git a/app/lib/dartdoc/dartdoc_page.dart b/app/lib/dartdoc/dartdoc_page.dart
@@ -2,15 +2,15 @@
 // 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 'package:_pub_shared/dartdoc/dartdoc_page.dart';
 import 'package:collection/collection.dart';
 import 'package:path/path.dart' as p;
-import 'package:pub_dartdoc_data/dartdoc_page.dart';
 import 'package:pub_dev/frontend/dom/dom.dart' as d;
 import 'package:pub_dev/frontend/static_files.dart';
 
 import '../shared/urls.dart';
 
-export 'package:pub_dartdoc_data/dartdoc_page.dart';
+export 'package:_pub_shared/dartdoc/dartdoc_page.dart';
 
 final class DartDocPageOptions {
   final String package;

diff --git a/app/lib/fake/backend/fake_pub_worker.dart b/app/lib/fake/backend/fake_pub_worker.dart
@@ -6,6 +6,7 @@ import 'dart:convert';
 import 'dart:io';
 import 'dart:math';
 
+import 'package:_pub_shared/dartdoc/dartdoc_page.dart';
 import 'package:_pub_shared/data/package_api.dart';
 import 'package:_pub_shared/data/task_payload.dart';
 import 'package:clock/clock.dart';
@@ -15,7 +16,6 @@ import 'package:indexed_blob/indexed_blob.dart';
 import 'package:meta/meta.dart';
 import 'package:pana/pana.dart';
 import 'package:path/path.dart' as p;
-import 'package:pub_dartdoc_data/dartdoc_page.dart';
 import 'package:pub_dartdoc_data/pub_dartdoc_data.dart';
 import 'package:pub_dev/fake/backend/fake_pana_runner.dart';
 import 'package:pub_dev/frontend/handlers/pubapi.client.dart';

diff --git a/pkg/_pub_shared/build.yaml b/pkg/_pub_shared/build.yaml
@@ -5,6 +5,7 @@ targets:
     sources:
       - '$package$'
       - 'lib/$lib$'
+      - 'lib/dartdoc/dartdoc_page.dart'
       - 'lib/data/account_api.dart'
       - 'lib/data/admin_api.dart'
       - 'lib/data/advisories_api.dart'

diff --git a/pkg/pub_dartdoc_data/lib/dartdoc_page.dart → ..._pub_shared/lib/dartdoc/dartdoc_page.dart b/pkg/pub_dartdoc_data/lib/dartdoc_page.dart → ..._pub_shared/lib/dartdoc/dartdoc_page.dart
diff --git a/pkg/pub_dartdoc_data/lib/dartdoc_page.g.dart → ...ub_shared/lib/dartdoc/dartdoc_page.g.dart b/pkg/pub_dartdoc_data/lib/dartdoc_page.g.dart → ...ub_shared/lib/dartdoc/dartdoc_page.g.dart
diff --git a/pkg/_pub_shared/pubspec.lock b/pkg/_pub_shared/pubspec.lock
@@ -376,6 +376,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.3"
+  sanitize_html:
+    dependency: "direct main"
+    description:
+      name: sanitize_html
+      sha256: "12669c4a913688a26555323fb9cec373d8f9fbe091f2d01c40c723b33caa8989"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
   shelf:
     dependency: transitive
     description:

diff --git a/pkg/_pub_shared/pubspec.yaml b/pkg/_pub_shared/pubspec.yaml
@@ -8,6 +8,7 @@ dependencies:
   html: ^0.15.0
   json_annotation: ^4.3.0
   meta: ^1.3.0
+  sanitize_html: ^2.1.0
   api_builder:
     path: ../api_builder
 

diff --git a/pkg/pub_dartdoc_data/build.yaml b/pkg/pub_dartdoc_data/build.yaml
@@ -6,5 +6,4 @@ targets:
       - '$package$'
       - 'lib/$lib$'
       - 'lib/dartdoc_index.dart'
-      - 'lib/dartdoc_page.dart'
       - 'lib/pub_dartdoc_data.dart'
diff --git a/pkg/pub_worker/lib/src/bin/dartdoc_wrapper.dart b/pkg/pub_worker/lib/src/bin/dartdoc_wrapper.dart
@@ -6,9 +6,9 @@ import 'dart:async';
 import 'dart:convert' show json, utf8, Utf8Codec;
 import 'dart:io';
 
+import 'package:_pub_shared/dartdoc/dartdoc_page.dart';
 import 'package:logging/logging.dart' show Logger;
 import 'package:path/path.dart' as p;
-import 'package:pub_dartdoc_data/dartdoc_page.dart';
 import 'package:stream_transform/stream_transform.dart';
 import 'package:tar/tar.dart';