From 0bdfcfb1838a0dc020d6aea325406651253d74d7 Mon Sep 17 00:00:00 2001 From: thomashii Date: Tue, 14 Sep 2021 09:45:16 +0800 Subject: [PATCH] Updated user_agent --- packages/shelf/README.md | 4 +- .../user_agent/angel_user_agent/.gitignore | 30 ------------- .../user_agent/angel_user_agent/CHANGELOG.md | 3 +- packages/user_agent/angel_user_agent/LICENSE | 42 +++++++++++-------- .../user_agent/angel_user_agent/README.md | 7 ++-- .../angel_user_agent/analysis_options.yaml | 5 +-- .../user_agent/angel_user_agent/pubspec.yaml | 9 ++-- 7 files changed, 39 insertions(+), 61 deletions(-) delete mode 100644 packages/user_agent/angel_user_agent/.gitignore diff --git a/packages/shelf/README.md b/packages/shelf/README.md index efa01835..1ba956e3 100644 --- a/packages/shelf/README.md +++ b/packages/shelf/README.md @@ -5,7 +5,9 @@ [![Gitter](https://img.shields.io/gitter/room/angel_dart/discussion)](https://gitter.im/angel_dart/discussion) [![License](https://img.shields.io/github/license/dart-backend/belatuk-common-utilities)](https://github.com/dukefirehawk/angel/tree/angel3/packages/shelf/LICENSE) -Shelf interop with Angel. This package lets you run `package:shelf` handlers via a custom adapter. +**Replacement of `package:angel_shelf` with breaking changes to support NNBD.** + +Shelf interop with Angel3. This package lets you run `package:shelf` handlers via a custom adapter. Use the code in this repo to embed existing Angel/shelf apps into other Angel/shelf applications. This way, you can migrate legacy applications without diff --git a/packages/user_agent/angel_user_agent/.gitignore b/packages/user_agent/angel_user_agent/.gitignore deleted file mode 100644 index db7ee919..00000000 --- a/packages/user_agent/angel_user_agent/.gitignore +++ /dev/null @@ -1,30 +0,0 @@ -# See https://www.dartlang.org/tools/private-files.html - -# Files and directories created by pub -.buildlog -.packages -.project -.pub/ -.scripts-bin/ -build/ -**/packages/ - -# Files created by dart2js -# (Most Dart developers will use pub build to compile Dart, use/modify these -# rules if you intend to use dart2js directly -# Convention is to use extension '.dart.js' for Dart compiled to Javascript to -# differentiate from explicit Javascript files) -*.dart.js -*.part.js -*.js.deps -*.js.map -*.info.json - -# Directory created by dartdoc -doc/api/ - -# Don't commit pubspec lock file -# (Library packages only! Remove pattern if developing an application package) -pubspec.lock - -.dart_tool \ No newline at end of file diff --git a/packages/user_agent/angel_user_agent/CHANGELOG.md b/packages/user_agent/angel_user_agent/CHANGELOG.md index f5ffca77..fecf791f 100644 --- a/packages/user_agent/angel_user_agent/CHANGELOG.md +++ b/packages/user_agent/angel_user_agent/CHANGELOG.md @@ -1,8 +1,9 @@ # Change Log -## 3.0.0 +## 3.0.0-beta.1 * Migrated to support Dart SDK 2.12.x NNBD +* Upgraded from `pendantic` to `lints` linter ## 2.0.0 diff --git a/packages/user_agent/angel_user_agent/LICENSE b/packages/user_agent/angel_user_agent/LICENSE index b593ac86..df5e0635 100644 --- a/packages/user_agent/angel_user_agent/LICENSE +++ b/packages/user_agent/angel_user_agent/LICENSE @@ -1,21 +1,29 @@ -MIT License +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. +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/user_agent/angel_user_agent/README.md b/packages/user_agent/angel_user_agent/README.md index 851a05de..a0ad51a3 100644 --- a/packages/user_agent/angel_user_agent/README.md +++ b/packages/user_agent/angel_user_agent/README.md @@ -1,11 +1,10 @@ # Angel3 User Agent -[![version](https://img.shields.io/badge/pub-v3.0.0-brightgreen)](https://pub.dartlang.org/packages/angel3_user_agent) +![Pub Version (including pre-releases)](https://img.shields.io/pub/v/angel3_user_agent?include_prereleases) [![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/dart-backend/belatuk-common-utilities)](https://github.com/dukefirehawk/angel/tree/angel3/packages/user_agent/angel_user_agent/LICENSE) -[![License](https://img.shields.io/github/license/dukefirehawk/angel)](https://github.com/dukefirehawk/angel/tree/angel3/packages/user_agent/angel_user_agent/LICENSE) - -**Forked from `angel_user_agent` to support NNBD** +**Replacement of `package:angel_user_agent` with breaking changes to support NNBD.** Middleware to inject a User Agent object into requests. For convenience's sake, it also exports the `user_agent` library. diff --git a/packages/user_agent/angel_user_agent/analysis_options.yaml b/packages/user_agent/angel_user_agent/analysis_options.yaml index c230cee7..ea2c9e94 100644 --- a/packages/user_agent/angel_user_agent/analysis_options.yaml +++ b/packages/user_agent/angel_user_agent/analysis_options.yaml @@ -1,4 +1 @@ -include: package:pedantic/analysis_options.yaml -analyzer: - strong-mode: - implicit-casts: false \ No newline at end of file +include: package:lints/recommended.yaml \ No newline at end of file diff --git a/packages/user_agent/angel_user_agent/pubspec.yaml b/packages/user_agent/angel_user_agent/pubspec.yaml index bf3e17a0..74a0ad54 100644 --- a/packages/user_agent/angel_user_agent/pubspec.yaml +++ b/packages/user_agent/angel_user_agent/pubspec.yaml @@ -1,10 +1,11 @@ name: angel3_user_agent -version: 3.0.0 +version: 3.0.0-beta.1 description: Angel3 middleware to parse and inject a User Agent object into requests. -homepage: https://github.com/dukefirehawk/angel/tree/angel3/packages/user_agent/angel_user_agent +homepage: https://angel3-framework.web.app/ +repository: https://github.com/dukefirehawk/angel/tree/angel3/packages/user_agent/angel_user_agent environment: sdk: '>=2.12.0 <3.0.0' dependencies: - angel3_framework: ^4.0.0 + angel3_framework: ^4.1.0 user_agent_analyzer: ^3.0.0 - pedantic: ^1.11.1 \ No newline at end of file + lints: ^1.0.0 \ No newline at end of file