Skip to content

Commit cd5e2da

Browse files
authored
GitHub sync (dart-archive#82)
* Update dependencies and sync recent example changes. * Add dart2js dump info to output. * Cleanup pubspec.yaml files.
1 parent f63ef21 commit cd5e2da

File tree

54 files changed

+844
-276
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+844
-276
lines changed

angular_gallery/lib/builder/gallery_lib_builder.dart

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,15 @@ class GalleryLibBuilder extends Builder {
9191
new AssetId(package, 'lib/gallery_section_summary.json');
9292
if (!await buildStep.canRead(gallerySectionSummaryId)) continue;
9393

94-
final summaries =
95-
JSON.decode(await buildStep.readAsString(gallerySectionSummaryId));
94+
final summaryContents =
95+
await buildStep.readAsString(gallerySectionSummaryId);
96+
final summaries = (jsonDecode(summaryContents) as Iterable)
97+
.map((m) => (m as Map).cast<String, dynamic>());
9698
examples.addAll(summaries.map((summary) => new Example(
9799
summary['displayName'],
98100
summary['dartImport'],
99101
summary['componentClass'],
100-
summary['docs'])));
102+
summary['docs']?.cast<String>())));
101103
}
102104

103105
examples

angular_gallery/lib/builders.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ Builder galleryAppBuilder(BuilderOptions options) => new MultiplexingBuilder([
1616
/// Builder used to generate files in the gallery library target.
1717
Builder galleryLibBuilder(BuilderOptions options) => new GalleryLibBuilder(
1818
options.config['galleryTitle'] ?? 'Example Gallery',
19-
options.config['styleUrls'],
20-
options.config['examples'].split(','),
19+
options.config['styleUrls'].cast<String>(),
20+
(options.config['examples'] as String).split(','),
2121
);

angular_gallery/pubspec.yaml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
name: angular_gallery
2-
version: 0.0.1-dev
3-
description:
4-
homepage:
52
author: Dart Team <misc@dartlang.org>
63
environment:
74
sdk: '>=2.0.0-dev.46.0 <2.0.0'
85
dependencies:
9-
angular: 5.0.0-alpha+11
10-
angular_components: 0.9.0-alpha+11
11-
angular_forms: 2.0.0-alpha+3
6+
angular: 5.0.0-alpha+12
7+
angular_components: 0.9.0-alpha+12
8+
angular_forms: 2.0.0-alpha+4
129
angular_router: 2.0.0-alpha+11
1310
build: '>=0.11.1 <0.13.0'
14-
build_config: ^0.2.5
11+
build_config: ^0.2.6
1512
mustache: ^1.0.0

angular_gallery_section/lib/builder.dart

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,16 @@
44

55
import 'package:build/build.dart';
66
import 'package:angular_gallery_section/builder/component_api_builder.dart';
7+
import 'package:angular_gallery_section/builder/gallery_info_builder.dart';
78
import 'package:angular_gallery_section/builder/gallery_section_builder.dart';
89
import 'package:angular_gallery_section/builder/gallery_section_summary_builder.dart';
910

11+
/// Builder used to generate the json summary files about classes annotated with
12+
/// @GallerySectionConfig to be read by the other builders that might not
13+
/// have access to a resolver.
14+
Builder galleryInfoBuilder(BuilderOptions options) =>
15+
new GalleryInfoBuilder(options.config['staticImageServer']);
16+
1017
/// Builder used to generate the API page for the gallery from a
1118
/// @GallerySectionConfig-annotated class.
1219
Builder componentApiBuilder(BuilderOptions options) =>

angular_gallery_section/lib/builder/component_api_builder.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class ComponentApiBuilder extends Builder {
6363
Future<List<Map<String, dynamic>>> _findDocsMap(
6464
BuildStep buildStep, List<String> docs) async {
6565
final importScanner = new ImportScanner(buildStep);
66-
final results = [];
66+
final results = <Map<String, dynamic>>[];
6767

6868
for (var doc in docs) {
6969
// First look for the assset directly
@@ -127,7 +127,7 @@ class ComponentApiBuilder extends Builder {
127127
}
128128

129129
final docs = configExtraction.docs == null
130-
? []
130+
? <String>[]
131131
: await _findDocsMap(assetReader, configExtraction.docs);
132132

133133
final relatedUrls = [];

0 commit comments

Comments
 (0)