From d810e27673b05c0479b194a874234215c4972f01 Mon Sep 17 00:00:00 2001 From: thomashii Date: Sat, 11 Sep 2021 11:18:35 +0800 Subject: [PATCH] Updated hot --- packages/hot/CHANGELOG.md | 5 ++++ packages/hot/LICENSE | 42 ++++++++++++++++++------------ packages/hot/README.md | 8 +++--- packages/hot/analysis_options.yaml | 9 +------ packages/hot/lib/angel3_hot.dart | 7 ++--- packages/hot/pubspec.yaml | 8 +++--- 6 files changed, 43 insertions(+), 36 deletions(-) diff --git a/packages/hot/CHANGELOG.md b/packages/hot/CHANGELOG.md index b5a0fb97..f973940c 100644 --- a/packages/hot/CHANGELOG.md +++ b/packages/hot/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 4.2.0 + +* Updated to use `belatuk_html_builder` package +* Upgraded from `pendantic` to `lints` linter + ## 4.1.1 * Fixed NNBD issues diff --git a/packages/hot/LICENSE b/packages/hot/LICENSE index 8f65b579..df5e0635 100644 --- a/packages/hot/LICENSE +++ b/packages/hot/LICENSE @@ -1,21 +1,29 @@ -MIT License (MIT) +BSD 3-Clause License -Copyright (c) 2021 dukefirehawk.com +Copyright (c) 2021, dukefirehawk.com +All rights reserved. -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/packages/hot/README.md b/packages/hot/README.md index 2a32f79b..55bdf3de 100644 --- a/packages/hot/README.md +++ b/packages/hot/README.md @@ -1,6 +1,6 @@ # Angel3 Hot Reloader -[![version](https://img.shields.io/badge/pub-v4.1.1-brightgreen)](https://pub.dartlang.org/packages/angel3_hot) +[![version](https://img.shields.io/badge/pub-v4.2.0-brightgreen)](https://pub.dartlang.org/packages/angel3_hot) [![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) @@ -9,7 +9,7 @@ ![Screenshot of terminal](screenshots/angel3-screenshot.png) Supports *hot reloading* of Angel3 servers on file changes. This is faster and more reliable than merely reactively restarting a `Process`. -This package only works with the [Angel3 framework](https://github.com/dukefirehawk/angel). +This package only works with the [Angel3 framework](https://pub.dev/packages/angel3_framework). **Not recommended to use in production, unless you are specifically intending for a "hot code push" in production..** @@ -19,8 +19,8 @@ In your `pubspec.yaml`: ```yaml dependencies: - angel3_framework: ^4.0.0 - angel3_hot: ^4.0.0 + angel3_framework: ^4.1.0 + angel3_hot: ^4.2.0 ``` ## Usage diff --git a/packages/hot/analysis_options.yaml b/packages/hot/analysis_options.yaml index 085be64d..ea2c9e94 100644 --- a/packages/hot/analysis_options.yaml +++ b/packages/hot/analysis_options.yaml @@ -1,8 +1 @@ -include: package:pedantic/analysis_options.yaml -analyzer: - strong-mode: - implicit-casts: false -linter: - rules: - - unnecessary_const - - unnecessary_new \ No newline at end of file +include: package:lints/recommended.yaml \ No newline at end of file diff --git a/packages/hot/lib/angel3_hot.dart b/packages/hot/lib/angel3_hot.dart index 18affc7d..6d2d4a94 100644 --- a/packages/hot/lib/angel3_hot.dart +++ b/packages/hot/lib/angel3_hot.dart @@ -10,8 +10,8 @@ import 'package:angel3_websocket/server.dart'; import 'package:charcode/ascii.dart'; import 'package:glob/glob.dart'; import 'package:glob/list_local_fs.dart'; -import 'package:angel3_html_builder/elements.dart'; -import 'package:angel3_html_builder/angel3_html_builder.dart'; +import 'package:belatuk_html_builder/elements.dart'; +import 'package:belatuk_html_builder/belatuk_html_builder.dart'; import 'package:io/ansi.dart'; import 'package:path/path.dart' as p; import 'package:vm_service/vm_service.dart' as vm; @@ -211,7 +211,7 @@ class HotReloader { var serverUri = Uri(scheme: 'http', host: server.address.address, port: server.port); - var observatoryUri; + Uri? observatoryUri; if (isHot) { observatoryUri = await dev.Service.getInfo().then((i) => i.serverUri!); } @@ -224,6 +224,7 @@ class HotReloader { if (isHot) { stdout.write( 'An Observatory debugger and profiler on ${Platform.operatingSystem} is available at: '); + print(wrapWith('$observatoryUri', [cyan, styleUnderlined])); } else { stdout.write( diff --git a/packages/hot/pubspec.yaml b/packages/hot/pubspec.yaml index bc902a74..c0e0186d 100644 --- a/packages/hot/pubspec.yaml +++ b/packages/hot/pubspec.yaml @@ -1,14 +1,14 @@ name: angel3_hot description: Supports hot reloading/hot code push of Angel3 servers on file changes. -version: 4.1.1 +version: 4.2.0 homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/angel3/packages/hot environment: sdk: '>=2.12.0 <3.0.0' dependencies: - angel3_framework: ^4.0.0 + angel3_framework: ^4.1.0 angel3_websocket: ^4.0.0 - angel3_html_builder: ^2.0.0 + belatuk_html_builder: ^3.0.0 charcode: ^1.2.0 glob: ^2.0.1 io: ^1.0.0 @@ -18,4 +18,4 @@ dependencies: dev_dependencies: http: ^0.13.2 logging: ^1.0.1 - pedantic: ^1.11.0 + lints: ^1.0.0