From 091d7c93a3e399ff02bf099c77965e63021b5d82 Mon Sep 17 00:00:00 2001 From: thomashii Date: Sat, 15 May 2021 18:28:09 +0800 Subject: [PATCH] Publish jael_preprocessor --- packages/jael/jael_preprocessor/README.md | 15 ++++++---- .../jael/jael_preprocessor/example/main.dart | 4 +-- ...processor.dart => jael3_preprocessor.dart} | 4 +-- packages/jael/jael_preprocessor/pubspec.yaml | 28 +++++-------------- .../jael_preprocessor/test/block_test.dart | 10 +++---- .../jael_preprocessor/test/include_test.dart | 10 +++---- 6 files changed, 30 insertions(+), 41 deletions(-) rename packages/jael/jael_preprocessor/lib/{jael_preprocessor.dart => jael3_preprocessor.dart} (99%) diff --git a/packages/jael/jael_preprocessor/README.md b/packages/jael/jael_preprocessor/README.md index 55f86328..dbd095db 100644 --- a/packages/jael/jael_preprocessor/README.md +++ b/packages/jael/jael_preprocessor/README.md @@ -1,16 +1,19 @@ -# jael_preprocessor -[![Pub](https://img.shields.io/pub/v/jael_preprocessor.svg)](https://pub.dartlang.org/packages/jael_preprocessor) -[![build status](https://travis-ci.org/angel-dart/jael.svg)](https://travis-ci.org/angel-dart/jael) +# jael3_preprocessor +[![version](https://img.shields.io/badge/pub-v4.0.0-brightgreen)](https://pub.dartlang.org/packages/jael3_preprocessor) +[![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety) +[![Gitter](https://img.shields.io/gitter/room/angel_dart/discussion)](https://gitter.im/angel_dart/discussion) + +[![License](https://img.shields.io/github/license/dukefirehawk/angel)](https://github.com/dukefirehawk/angel/tree/angel3/packages/jael/jael_preprocessor/LICENSE) A pre-processor for resolving blocks and includes within -[Jael](https://github.com/angel-dart/jael) templates. +[Jael](https://github.com/dukefirehawk/angel/tree/angel3/packages/jael/jael) templates. # Installation In your `pubspec.yaml`: ```yaml dependencies: - jael_prepreprocessor: ^1.0.0-alpha + jael3_prepreprocessor: ^4.0.0 ``` # Usage @@ -24,7 +27,7 @@ To keep things simple, just use the `resolve` function, which will take care of inheritance for you. ```dart -import 'package:jael_preprocessor/jael_preprocessor.dart' as jael; +import 'package:jael3_preprocessor/jael3_preprocessor.dart' as jael; myFunction() async { var doc = await parseTemplateSomehow(); diff --git a/packages/jael/jael_preprocessor/example/main.dart b/packages/jael/jael_preprocessor/example/main.dart index b9cf691b..14ff3f9c 100644 --- a/packages/jael/jael_preprocessor/example/main.dart +++ b/packages/jael/jael_preprocessor/example/main.dart @@ -1,8 +1,8 @@ import 'dart:async'; import 'package:file/file.dart'; -import 'package:jael/jael.dart' as jael; -import 'package:jael_preprocessor/jael_preprocessor.dart' as jael; +import 'package:jael3/jael3.dart' as jael; +import 'package:jael3_preprocessor/jael3_preprocessor.dart' as jael; Future process( jael.Document doc, Directory dir, errorHandler(jael.JaelError e)) { diff --git a/packages/jael/jael_preprocessor/lib/jael_preprocessor.dart b/packages/jael/jael_preprocessor/lib/jael3_preprocessor.dart similarity index 99% rename from packages/jael/jael_preprocessor/lib/jael_preprocessor.dart rename to packages/jael/jael_preprocessor/lib/jael3_preprocessor.dart index 604aa85d..c4ed9adc 100644 --- a/packages/jael/jael_preprocessor/lib/jael_preprocessor.dart +++ b/packages/jael/jael_preprocessor/lib/jael3_preprocessor.dart @@ -2,8 +2,8 @@ import 'dart:async'; import 'dart:collection'; import 'package:collection/collection.dart' show IterableExtension; import 'package:file/file.dart'; -import 'package:jael/jael.dart'; -import 'package:symbol_table/symbol_table.dart'; +import 'package:jael3/jael3.dart'; +import 'package:angel3_symbol_table/angel3_symbol_table.dart'; /// Modifies a Jael document. typedef FutureOr? Patcher(Document? document, diff --git a/packages/jael/jael_preprocessor/pubspec.yaml b/packages/jael/jael_preprocessor/pubspec.yaml index 497e1f00..5b6d8434 100644 --- a/packages/jael/jael_preprocessor/pubspec.yaml +++ b/packages/jael/jael_preprocessor/pubspec.yaml @@ -1,28 +1,14 @@ -name: jael_preprocessor +name: jael3_preprocessor version: 4.0.0 description: A pre-processor for resolving blocks and includes within Jael templates. -homepage: https://github.com/dukefirehawk/angel -publish_to: none +homepage: https://github.com/dukefirehawk/angel/tree/angel3/packages/jael/jael_preprocessor environment: sdk: '>=2.12.0 <3.0.0' dependencies: file: ^6.1.0 - jael: - git: - url: https://github.com/dukefirehawk/angel.git - ref: sdk-2.12.x_nnbd - path: packages/jael/jael - symbol_table: - git: - url: https://github.com/dukefirehawk/angel.git - ref: sdk-2.12.x_nnbd - path: packages/symbol_table - collection: ^1.15.0-nullsafety.4 + jael3: ^4.0.0 + angel3_symbol_table: ^2.0.0 + collection: ^1.15.0 dev_dependencies: - code_buffer: - git: - url: https://github.com/dukefirehawk/angel.git - ref: sdk-2.12.x_nnbd - path: packages/code_buffer - - test: ^1.17.3 \ No newline at end of file + angel3_code_buffer: ^2.0.0 + test: ^1.17.4 \ No newline at end of file diff --git a/packages/jael/jael_preprocessor/test/block_test.dart b/packages/jael/jael_preprocessor/test/block_test.dart index c429d85d..a78294f4 100644 --- a/packages/jael/jael_preprocessor/test/block_test.dart +++ b/packages/jael/jael_preprocessor/test/block_test.dart @@ -1,12 +1,12 @@ -import 'package:code_buffer/code_buffer.dart'; +import 'package:angel3_code_buffer/angel3_code_buffer.dart'; import 'package:file/file.dart'; import 'package:file/memory.dart'; -import 'package:jael/jael.dart' as jael; -import 'package:jael_preprocessor/jael_preprocessor.dart' as jael; -import 'package:symbol_table/symbol_table.dart'; +import 'package:jael3/jael3.dart' as jael; +import 'package:jael3_preprocessor/jael3_preprocessor.dart' as jael; +import 'package:angel3_symbol_table/angel3_symbol_table.dart'; import 'package:test/test.dart'; -main() { +void main() { late FileSystem fileSystem; setUp(() { diff --git a/packages/jael/jael_preprocessor/test/include_test.dart b/packages/jael/jael_preprocessor/test/include_test.dart index 8f6ca89e..56b090f1 100644 --- a/packages/jael/jael_preprocessor/test/include_test.dart +++ b/packages/jael/jael_preprocessor/test/include_test.dart @@ -1,12 +1,12 @@ -import 'package:code_buffer/code_buffer.dart'; +import 'package:angel3_code_buffer/angel3_code_buffer.dart'; import 'package:file/file.dart'; import 'package:file/memory.dart'; -import 'package:jael/jael.dart' as jael; -import 'package:jael_preprocessor/jael_preprocessor.dart' as jael; -import 'package:symbol_table/symbol_table.dart'; +import 'package:jael3/jael3.dart' as jael; +import 'package:jael3_preprocessor/jael3_preprocessor.dart' as jael; +import 'package:angel3_symbol_table/angel3_symbol_table.dart'; import 'package:test/test.dart'; -main() { +void main() { late FileSystem fileSystem; setUp(() {