Skip to content

Commit ea0392e

Browse files
authored
Remove mustache4dart copy inside dartdoc and use 'mustache' pub package (#1894)
* avoid relying on literal version for meta package * Remove mustache (breaks everything) * Mustache shave passes tests * Use newly published mustache version for dartdoc * dartfmt
1 parent 11abbbc commit ea0392e

33 files changed

+337
-2717
lines changed

lib/src/html/html_generator_instance.dart

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import 'package:dartdoc/src/html/templates.dart';
1515
import 'package:dartdoc/src/logging.dart';
1616
import 'package:dartdoc/src/model.dart';
1717
import 'package:dartdoc/src/model_utils.dart';
18-
import 'package:dartdoc/src/third_party/pkg/mustache4dart/lib/mustache4dart.dart';
1918
import 'package:dartdoc/src/warnings.dart';
19+
import 'package:mustache/mustache.dart';
2020
import 'package:path/path.dart' as pathLib;
2121

2222
typedef void FileWriter(String path, Object content, {bool allowOverwrite});
@@ -377,9 +377,8 @@ class HtmlGeneratorInstance {
377377
}
378378
}
379379

380-
void _build(String filename, TemplateRenderer template, TemplateData data) {
381-
String content = template(data,
382-
assumeNullNonExistingProperty: false, errorOnMissingProperty: true);
380+
void _build(String filename, Template template, TemplateData data) {
381+
String content = template.renderString(data);
383382

384383
_writer(filename, content);
385384
if (data.self is Indexable) _indexedElements.add(data.self as Indexable);

lib/src/html/templates.dart

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import 'dart:async' show Future;
88
import 'dart:io' show File;
99

1010
import 'package:dartdoc/src/html/resource_loader.dart' as loader;
11-
import 'package:dartdoc/src/third_party/pkg/mustache4dart/lib/mustache4dart.dart';
11+
import 'package:mustache/mustache.dart';
1212

1313
const _partials = const <String>[
1414
'callable',
@@ -83,21 +83,21 @@ Future<String> _getTemplateFile(String templateFileName) =>
8383
loader.loadAsString('package:dartdoc/templates/$templateFileName');
8484

8585
class Templates {
86-
final TemplateRenderer categoryTemplate;
87-
final TemplateRenderer classTemplate;
88-
final TemplateRenderer enumTemplate;
89-
final TemplateRenderer constantTemplate;
90-
final TemplateRenderer constructorTemplate;
91-
final TemplateRenderer errorTemplate;
92-
final TemplateRenderer functionTemplate;
93-
final TemplateRenderer indexTemplate;
94-
final TemplateRenderer libraryTemplate;
95-
final TemplateRenderer methodTemplate;
96-
final TemplateRenderer mixinTemplate;
97-
final TemplateRenderer propertyTemplate;
98-
final TemplateRenderer topLevelConstantTemplate;
99-
final TemplateRenderer topLevelPropertyTemplate;
100-
final TemplateRenderer typeDefTemplate;
86+
final Template categoryTemplate;
87+
final Template classTemplate;
88+
final Template enumTemplate;
89+
final Template constantTemplate;
90+
final Template constructorTemplate;
91+
final Template errorTemplate;
92+
final Template functionTemplate;
93+
final Template indexTemplate;
94+
final Template libraryTemplate;
95+
final Template methodTemplate;
96+
final Template mixinTemplate;
97+
final Template propertyTemplate;
98+
final Template topLevelConstantTemplate;
99+
final Template topLevelPropertyTemplate;
100+
final Template typeDefTemplate;
101101

102102
static Future<Templates> create(
103103
{List<String> headerPaths,
@@ -106,17 +106,17 @@ class Templates {
106106
var partials =
107107
await _loadPartials(headerPaths, footerPaths, footerTextPaths);
108108

109-
String _partial(String name) {
109+
Template _partial(String name) {
110110
String partial = partials[name];
111111
if (partial == null || partial.isEmpty) {
112112
throw new StateError('Did not find partial "$name"');
113113
}
114-
return partial;
114+
return Template(partial);
115115
}
116116

117-
Future<TemplateRenderer> _loadTemplate(String templatePath) async {
117+
Future<Template> _loadTemplate(String templatePath) async {
118118
String templateContents = await _getTemplateFile(templatePath);
119-
return compile(templateContents, partial: _partial);
119+
return Template(templateContents, partialResolver: _partial);
120120
}
121121

122122
var indexTemplate = await _loadTemplate('index.html');

lib/src/third_party/pkg/000-mustache4dart-pubspec.patch

Lines changed: 0 additions & 11 deletions
This file was deleted.

lib/src/third_party/pkg/001-mustache4dart-import-rewrite.patch

Lines changed: 0 additions & 1023 deletions
This file was deleted.

lib/src/third_party/pkg/mustache4dart/.gitignore

Lines changed: 0 additions & 8 deletions
This file was deleted.

lib/src/third_party/pkg/mustache4dart/.gitmodules

Lines changed: 0 additions & 3 deletions
This file was deleted.

lib/src/third_party/pkg/mustache4dart/.travis.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

lib/src/third_party/pkg/mustache4dart/CHANGELOG.md

Lines changed: 0 additions & 48 deletions
This file was deleted.

lib/src/third_party/pkg/mustache4dart/LICENSE.txt

Lines changed: 0 additions & 13 deletions
This file was deleted.

lib/src/third_party/pkg/mustache4dart/README.md

Lines changed: 0 additions & 145 deletions
This file was deleted.

lib/src/third_party/pkg/mustache4dart/build.sh

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)