From 5dd45c73dc7e5649119e2d36ddffd6e93b0bb4d7 Mon Sep 17 00:00:00 2001 From: thomashii Date: Sat, 15 May 2021 21:28:26 +0800 Subject: [PATCH] Publish static --- packages/static/README.md | 22 +++++++++------- packages/static/example/main.dart | 6 ++--- .../{angel_static.dart => angel3_static.dart} | 0 packages/static/lib/src/cache.dart | 2 +- .../static/lib/src/virtual_directory.dart | 4 +-- packages/static/pubspec.yaml | 26 +++++-------------- packages/static/test/all_test.dart | 6 ++--- packages/static/test/cache_sample.dart | 6 ++--- packages/static/test/cache_test.dart | 6 ++--- packages/static/test/issue41_test.dart | 6 ++--- packages/static/test/push_state_test.dart | 6 ++--- 11 files changed, 40 insertions(+), 50 deletions(-) rename packages/static/lib/{angel_static.dart => angel3_static.dart} (100%) diff --git a/packages/static/README.md b/packages/static/README.md index f20e9a1e..dabe366c 100644 --- a/packages/static/README.md +++ b/packages/static/README.md @@ -1,6 +1,10 @@ -# static -[![Pub](https://img.shields.io/pub/v/angel_static.svg)](https://pub.dartlang.org/packages/angel_static) -[![build status](https://travis-ci.org/angel-dart/static.svg?branch=master)](https://travis-ci.org/angel-dart/static) +# angel3_static +[![version](https://img.shields.io/badge/pub-v4.0.1-brightgreen)](https://pub.dartlang.org/packages/angel3_static) +[![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/static/LICENSE) + Static server infrastructure for Angel. @@ -11,20 +15,20 @@ In `pubspec.yaml`: ```yaml dependencies: - angel_static: ^2.0.0-alpha + angel3_static: ^4.0.0 ``` # Usage To serve files from a directory, you need to create a `VirtualDirectory`. -Keep in mind that `angel_static` uses `package:file` instead of `dart:io`. +Keep in mind that `angel3_static` uses `package:file` instead of `dart:io`. ```dart -import 'package:angel_framework/angel_framework.dart'; -import 'package:angel_framework/http.dart'; -import 'package:angel_static/angel_static.dart'; +import 'package:angel3_framework/angel3_framework.dart'; +import 'package:angel3_framework/http.dart'; +import 'package:angel3_static/angel3_static.dart'; import 'package:file/local.dart'; -main() async { +void main() async { var app = Angel(); var fs = const LocalFileSystem(); diff --git a/packages/static/example/main.dart b/packages/static/example/main.dart index 477bd093..badf1245 100644 --- a/packages/static/example/main.dart +++ b/packages/static/example/main.dart @@ -1,6 +1,6 @@ -import 'package:angel_framework/angel_framework.dart'; -import 'package:angel_framework/http.dart'; -import 'package:angel_static/angel_static.dart'; +import 'package:angel3_framework/angel3_framework.dart'; +import 'package:angel3_framework/http.dart'; +import 'package:angel3_static/angel3_static.dart'; import 'package:file/local.dart'; import 'package:logging/logging.dart'; diff --git a/packages/static/lib/angel_static.dart b/packages/static/lib/angel3_static.dart similarity index 100% rename from packages/static/lib/angel_static.dart rename to packages/static/lib/angel3_static.dart diff --git a/packages/static/lib/src/cache.dart b/packages/static/lib/src/cache.dart index 513c1e1e..b25e0840 100644 --- a/packages/static/lib/src/cache.dart +++ b/packages/static/lib/src/cache.dart @@ -1,6 +1,6 @@ import 'dart:async'; import 'dart:io' show HttpDate; -import 'package:angel_framework/angel_framework.dart'; +import 'package:angel3_framework/angel3_framework.dart'; import 'package:file/file.dart'; import 'virtual_directory.dart'; diff --git a/packages/static/lib/src/virtual_directory.dart b/packages/static/lib/src/virtual_directory.dart index 0626ca42..9df95ec1 100644 --- a/packages/static/lib/src/virtual_directory.dart +++ b/packages/static/lib/src/virtual_directory.dart @@ -1,9 +1,9 @@ import 'dart:async'; -import 'package:angel_framework/angel_framework.dart'; +import 'package:angel3_framework/angel3_framework.dart'; import 'package:file/file.dart'; import 'package:http_parser/http_parser.dart'; import 'package:path/path.dart' as p; -import 'package:range_header/range_header.dart'; +import 'package:angel3_range_header/angel3_range_header.dart'; final RegExp _param = RegExp(r':([A-Za-z0-9_]+)(\((.+)\))?'); final RegExp _straySlashes = RegExp(r'(^/+)|(/+$)'); diff --git a/packages/static/pubspec.yaml b/packages/static/pubspec.yaml index f013257f..81fa4f45 100644 --- a/packages/static/pubspec.yaml +++ b/packages/static/pubspec.yaml @@ -1,36 +1,22 @@ -name: angel_static +name: angel3_static description: Static server middleware for Angel. Also capable of serving Range responses. version: 4.0.0 -homepage: https://github.com/dukefirehawk/angel -publish_to: none +homepage: https://github.com/dukefirehawk/angel/tree/angel3/packages/static environment: sdk: '>=2.12.0 <3.0.0' dependencies: - angel_framework: - git: - url: https://github.com/dukefirehawk/angel.git - ref: sdk-2.12.x_nnbd - path: packages/framework - range_header: - git: - url: https://github.com/dukefirehawk/angel.git - ref: sdk-2.12.x_nnbd - path: packages/range_header + angel3_framework: ^4.0.0 + angel3_range_header: ^3.0.0 convert: ^3.0.0 crypto: ^3.0.1 file: ^6.1.0 http_parser: ^4.0.0 path: ^1.8.0 - dev_dependencies: - angel_test: - git: - url: https://github.com/dukefirehawk/angel.git - ref: sdk-2.12.x_nnbd - path: packages/test + angel3_test: ^4.0.0 http: ^0.13.2 logging: ^1.0.1 matcher: ^0.12.10 pedantic: ^1.11.0 - test: ^1.17.3 + test: ^1.17.4 diff --git a/packages/static/test/all_test.dart b/packages/static/test/all_test.dart index 28f06920..9dedd9ed 100644 --- a/packages/static/test/all_test.dart +++ b/packages/static/test/all_test.dart @@ -1,6 +1,6 @@ -import 'package:angel_framework/angel_framework.dart'; -import 'package:angel_framework/http.dart'; -import 'package:angel_static/angel_static.dart'; +import 'package:angel3_framework/angel3_framework.dart'; +import 'package:angel3_framework/http.dart'; +import 'package:angel3_static/angel3_static.dart'; import 'package:file/local.dart'; import 'package:http/http.dart' show Client; import 'package:logging/logging.dart'; diff --git a/packages/static/test/cache_sample.dart b/packages/static/test/cache_sample.dart index af65bd8e..679ca6ce 100644 --- a/packages/static/test/cache_sample.dart +++ b/packages/static/test/cache_sample.dart @@ -1,6 +1,6 @@ -import 'package:angel_framework/angel_framework.dart'; -import 'package:angel_framework/http.dart'; -import 'package:angel_static/angel_static.dart'; +import 'package:angel3_framework/angel3_framework.dart'; +import 'package:angel3_framework/http.dart'; +import 'package:angel3_static/angel3_static.dart'; import 'package:file/local.dart'; void main() async { diff --git a/packages/static/test/cache_test.dart b/packages/static/test/cache_test.dart index 1e944758..374e6032 100644 --- a/packages/static/test/cache_test.dart +++ b/packages/static/test/cache_test.dart @@ -1,7 +1,7 @@ import 'dart:io' show HttpDate; -import 'package:angel_framework/angel_framework.dart'; -import 'package:angel_framework/http.dart'; -import 'package:angel_static/angel_static.dart'; +import 'package:angel3_framework/angel3_framework.dart'; +import 'package:angel3_framework/http.dart'; +import 'package:angel3_static/angel3_static.dart'; import 'package:file/local.dart'; import 'package:http/http.dart' show Client; import 'package:logging/logging.dart'; diff --git a/packages/static/test/issue41_test.dart b/packages/static/test/issue41_test.dart index f9acbc2a..b469c408 100644 --- a/packages/static/test/issue41_test.dart +++ b/packages/static/test/issue41_test.dart @@ -1,6 +1,6 @@ -import 'package:angel_framework/angel_framework.dart'; -import 'package:angel_static/angel_static.dart'; -import 'package:angel_test/angel_test.dart'; +import 'package:angel3_framework/angel3_framework.dart'; +import 'package:angel3_static/angel3_static.dart'; +import 'package:angel3_test/angel3_test.dart'; import 'package:file/file.dart'; import 'package:file/local.dart'; import 'package:logging/logging.dart'; diff --git a/packages/static/test/push_state_test.dart b/packages/static/test/push_state_test.dart index 59d89b43..349620f4 100644 --- a/packages/static/test/push_state_test.dart +++ b/packages/static/test/push_state_test.dart @@ -1,6 +1,6 @@ -import 'package:angel_framework/angel_framework.dart'; -import 'package:angel_static/angel_static.dart'; -import 'package:angel_test/angel_test.dart'; +import 'package:angel3_framework/angel3_framework.dart'; +import 'package:angel3_static/angel3_static.dart'; +import 'package:angel3_test/angel3_test.dart'; import 'package:file/memory.dart'; import 'package:logging/logging.dart'; import 'package:test/test.dart';