diff --git a/lib/resources/sdk_footer_text.html b/lib/resources/sdk_footer_text.html deleted file mode 100644 index e613e68048..0000000000 --- a/lib/resources/sdk_footer_text.html +++ /dev/null @@ -1,4 +0,0 @@ -• - - cc license - diff --git a/lib/resources/sdk_footer_text.md b/lib/resources/sdk_footer_text.md deleted file mode 100644 index 5c286c79ec..0000000000 --- a/lib/resources/sdk_footer_text.md +++ /dev/null @@ -1 +0,0 @@ -• [cc license](http://creativecommons.org/licenses/by-sa/4.0/) diff --git a/lib/src/generator/generator.dart b/lib/src/generator/generator.dart index b77dff3cc0..d2ba4c35ac 100644 --- a/lib/src/generator/generator.dart +++ b/lib/src/generator/generator.dart @@ -7,7 +7,6 @@ library dartdoc.generator; import 'dart:async' show Future; -import 'package:analyzer/file_system/file_system.dart'; import 'package:dartdoc/src/dartdoc_options.dart'; import 'package:dartdoc/src/model/model.dart' show PackageGraph; import 'package:dartdoc/src/package_meta.dart'; @@ -38,9 +37,6 @@ mixin GeneratorContext on DartdocOptionContextBase { List get footerText => optionSet['footerText'].valueAt(context); - // Synthetic. TODO(jcollins-g): Eliminate special case for SDK and use config file. - bool get addSdkFooter => optionSet['addSdkFooter'].valueAt(context); - List get header => optionSet['header'].valueAt(context); bool get prettyIndexJson => optionSet['prettyIndexJson'].valueAt(context); @@ -75,14 +71,6 @@ Future>> createGeneratorOptions( 'package name and version).', mustExist: true, splitCommas: true), - DartdocOptionSyntheticOnly( - 'addSdkFooter', - (DartdocSyntheticOption option, Folder dir) { - return option.root['topLevelPackageMeta'].valueAt(dir).isSdk; - }, - resourceProvider, - help: 'Whether the SDK footer text should be added (synthetic)', - ), DartdocOptionArgFile>('header', [], resourceProvider, isFile: true, help: 'Paths to files with content to add to page headers.', diff --git a/lib/src/generator/html_resources.g.dart b/lib/src/generator/html_resources.g.dart index f53e47ed45..75f8d83e63 100644 --- a/lib/src/generator/html_resources.g.dart +++ b/lib/src/generator/html_resources.g.dart @@ -10,8 +10,6 @@ const List resource_names = [ 'package:dartdoc/resources/play_button.svg', 'package:dartdoc/resources/readme.md', 'package:dartdoc/resources/script.js', - 'package:dartdoc/resources/sdk_footer_text.html', - 'package:dartdoc/resources/sdk_footer_text.md', 'package:dartdoc/resources/styles.css', 'package:dartdoc/resources/typeahead.bundle.min.js' ]; diff --git a/lib/src/generator/templates.dart b/lib/src/generator/templates.dart index ec90e16736..4339e78b7e 100644 --- a/lib/src/generator/templates.dart +++ b/lib/src/generator/templates.dart @@ -6,7 +6,6 @@ library dartdoc.templates; import 'dart:async' show Future; import 'dart:io' show File, Directory; -import 'dart:isolate'; import 'package:dartdoc/dartdoc.dart'; import 'package:dartdoc/src/generator/resource_loader.dart' as loader; @@ -101,6 +100,7 @@ Future> _loadPartials( abstract class _TemplatesLoader { Future> loadPartials(); + Future loadTemplate(String name); } @@ -196,11 +196,6 @@ class Templates { var templatesDir = context.templatesDir; var format = context.format; var footerTextPaths = context.footerText; - if (context.addSdkFooter) { - var sdkFooter = await Isolate.resolvePackageUri( - Uri.parse('package:dartdoc/resources/sdk_footer_text.$format')); - footerTextPaths.add(path.canonicalize(sdkFooter.toFilePath())); - } if (templatesDir != null) { return fromDirectory(Directory(templatesDir), format,