Visitar URL original
Update markdown dependency to allow reverting the uri rewrite. (#158) · stuartmorgan-g/packages@2be7d7e · GitHub
Skip to content

Commit 2be7d7e

Browse files
domesticmousedomesticmouse
authored
Update markdown dependency to allow reverting the uri rewrite. (flutter#158)
1 parent 43aa2e3 commit 2be7d7e

8 files changed

Lines changed: 44 additions & 49 deletions

File tree

‎packages/flutter_markdown/.travis.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
os: linux
22
before_script:
3-
- git clone https://github.com/flutter/flutter.git --depth 1
3+
# TODO(domesticmouse): downgrade this to stable after the next stable release
4+
- git clone --branch beta https://github.com/flutter/flutter.git
45
- export PATH=`pwd`/flutter/bin:`pwd`/flutter/bin/cache/dart-sdk/bin:$PATH
56
- flutter doctor
67
script:

‎packages/flutter_markdown/CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 0.3.2
2+
3+
* Uplift `package:markdown` dependency version to enable deleting HTML unescape URI workaround
4+
* Explictly state that Flutter 1.10.7 is the minimum supported Flutter version in the library `pubspec.yaml`.
5+
16
## 0.3.1
27

38
* Expose `tableColumnWidth`
@@ -11,6 +16,9 @@
1116
* HTML unescape URIs (temporary workaround for [dart-lang/markdown #272](https://github.com/dart-lang/markdown/issues/272))
1217
* Rebuilt `example/android` and `example/ios` directories
1318

19+
**Note:** this version has an implicit minimum supported version of Flutter 1.10.7.
20+
See [flutter/flutter_markdown issue #156](https://github.com/flutter/flutter_markdown/issues/156) for more detail.
21+
1422
## 0.3.0
1523

1624
* Supporting GitHub flavoured Markdown

‎packages/flutter_markdown/example/pubspec.lock‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ packages:
77
name: archive
88
url: "https://pub.dartlang.org"
99
source: hosted
10-
version: "2.0.11"
10+
version: "2.0.10"
1111
args:
1212
dependency: transitive
1313
description:
@@ -21,7 +21,7 @@ packages:
2121
name: async
2222
url: "https://pub.dartlang.org"
2323
source: hosted
24-
version: "2.4.0"
24+
version: "2.3.0"
2525
boolean_selector:
2626
dependency: transitive
2727
description:
@@ -68,7 +68,7 @@ packages:
6868
path: ".."
6969
relative: true
7070
source: path
71-
version: "0.3.0"
71+
version: "0.3.2"
7272
flutter_test:
7373
dependency: "direct dev"
7474
description: flutter
@@ -87,21 +87,21 @@ packages:
8787
name: markdown
8888
url: "https://pub.dartlang.org"
8989
source: hosted
90-
version: "2.1.2"
90+
version: "2.1.3"
9191
matcher:
9292
dependency: transitive
9393
description:
9494
name: matcher
9595
url: "https://pub.dartlang.org"
9696
source: hosted
97-
version: "0.12.6"
97+
version: "0.12.5"
9898
meta:
9999
dependency: transitive
100100
description:
101101
name: meta
102102
url: "https://pub.dartlang.org"
103103
source: hosted
104-
version: "1.1.8"
104+
version: "1.1.7"
105105
path:
106106
dependency: transitive
107107
description:
@@ -176,7 +176,7 @@ packages:
176176
name: test_api
177177
url: "https://pub.dartlang.org"
178178
source: hosted
179-
version: "0.2.11"
179+
version: "0.2.5"
180180
typed_data:
181181
dependency: transitive
182182
description:
@@ -200,3 +200,4 @@ packages:
200200
version: "3.5.0"
201201
sdks:
202202
dart: ">=2.5.0 <3.0.0"
203+
flutter: ">=1.10.7 <2.0.0"

‎packages/flutter_markdown/example/pubspec.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ publish_to: 'none'
44

55
environment:
66
sdk: ">=2.5.0 <3.0.0"
7+
flutter: '>=1.10.7 <2.0.0'
78

89
dependencies:
910
flutter:

‎packages/flutter_markdown/lib/src/_functions_io.dart‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ final ImageBuilder kDefaultImageBuilder = (
2020
double height,
2121
) {
2222
if (uri.scheme == 'http' || uri.scheme == 'https') {
23-
// TODO(domesticmouse): Revert when https://github.com/dart-lang/markdown/commit/73f9db9fb18ddf4b535e78697dc0cee6f7309f49 is released
24-
// return Image.network(uri.toString(), width: width, height: height);
25-
return Image.network(uri.toString().replaceAll('&amp;', '&'), width: width, height: height);
23+
return Image.network(uri.toString(), width: width, height: height);
2624
} else if (uri.scheme == 'data') {
2725
return _handleDataSchemeUri(uri, width, height);
2826
} else if (uri.scheme == "resource") {

‎packages/flutter_markdown/lib/src/_functions_web.dart‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ final ImageBuilder kDefaultImageBuilder = (
2121
double height,
2222
) {
2323
if (uri.scheme == 'http' || uri.scheme == 'https') {
24-
// TODO(domesticmouse): Revert when https://github.com/dart-lang/markdown/commit/73f9db9fb18ddf4b535e78697dc0cee6f7309f49 is released
25-
// return Image.network(uri.toString(), width: width, height: height);
26-
return Image.network(uri.toString().replaceAll('&amp;', '&'), width: width, height: height);
24+
return Image.network(uri.toString(), width: width, height: height);
2725
} else if (uri.scheme == 'data') {
2826
return _handleDataSchemeUri(uri, width, height);
2927
} else if (uri.scheme == "resource") {

‎packages/flutter_markdown/pubspec.lock‎

Lines changed: 20 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,20 @@
11
# Generated by pub
22
# See https://dart.dev/tools/pub/glossary#lockfile
33
packages:
4-
_fe_analyzer_shared:
5-
dependency: transitive
6-
description:
7-
name: _fe_analyzer_shared
8-
url: "https://pub.dartlang.org"
9-
source: hosted
10-
version: "1.0.0"
114
analyzer:
125
dependency: transitive
136
description:
147
name: analyzer
158
url: "https://pub.dartlang.org"
169
source: hosted
17-
version: "0.39.1"
10+
version: "0.36.4"
1811
archive:
1912
dependency: transitive
2013
description:
2114
name: archive
2215
url: "https://pub.dartlang.org"
2316
source: hosted
24-
version: "2.0.11"
17+
version: "2.0.10"
2518
args:
2619
dependency: transitive
2720
description:
@@ -35,7 +28,7 @@ packages:
3528
name: async
3629
url: "https://pub.dartlang.org"
3730
source: hosted
38-
version: "2.4.0"
31+
version: "2.3.0"
3932
boolean_selector:
4033
dependency: transitive
4134
description:
@@ -64,13 +57,6 @@ packages:
6457
url: "https://pub.dartlang.org"
6558
source: hosted
6659
version: "2.1.1"
67-
coverage:
68-
dependency: transitive
69-
description:
70-
name: coverage
71-
url: "https://pub.dartlang.org"
72-
source: hosted
73-
version: "0.13.3+1"
7460
crypto:
7561
dependency: transitive
7662
description:
@@ -101,7 +87,7 @@ packages:
10187
name: front_end
10288
url: "https://pub.dartlang.org"
10389
source: hosted
104-
version: "0.1.29"
90+
version: "0.1.19"
10591
glob:
10692
dependency: transitive
10793
description:
@@ -158,41 +144,41 @@ packages:
158144
url: "https://pub.dartlang.org"
159145
source: hosted
160146
version: "0.6.1+1"
161-
kernel:
147+
json_rpc_2:
162148
dependency: transitive
163149
description:
164-
name: kernel
150+
name: json_rpc_2
165151
url: "https://pub.dartlang.org"
166152
source: hosted
167-
version: "0.3.29"
168-
logging:
153+
version: "2.1.0"
154+
kernel:
169155
dependency: transitive
170156
description:
171-
name: logging
157+
name: kernel
172158
url: "https://pub.dartlang.org"
173159
source: hosted
174-
version: "0.11.3+2"
160+
version: "0.3.19"
175161
markdown:
176162
dependency: "direct main"
177163
description:
178164
name: markdown
179165
url: "https://pub.dartlang.org"
180166
source: hosted
181-
version: "2.1.2"
167+
version: "2.1.3"
182168
matcher:
183169
dependency: transitive
184170
description:
185171
name: matcher
186172
url: "https://pub.dartlang.org"
187173
source: hosted
188-
version: "0.12.6"
174+
version: "0.12.5"
189175
meta:
190176
dependency: "direct main"
191177
description:
192178
name: meta
193179
url: "https://pub.dartlang.org"
194180
source: hosted
195-
version: "1.1.8"
181+
version: "1.1.7"
196182
mime:
197183
dependency: transitive
198184
description:
@@ -379,21 +365,21 @@ packages:
379365
name: test
380366
url: "https://pub.dartlang.org"
381367
source: hosted
382-
version: "1.9.4"
368+
version: "1.6.3"
383369
test_api:
384370
dependency: transitive
385371
description:
386372
name: test_api
387373
url: "https://pub.dartlang.org"
388374
source: hosted
389-
version: "0.2.11"
375+
version: "0.2.5"
390376
test_core:
391377
dependency: transitive
392378
description:
393379
name: test_core
394380
url: "https://pub.dartlang.org"
395381
source: hosted
396-
version: "0.2.15"
382+
version: "0.2.5"
397383
typed_data:
398384
dependency: transitive
399385
description:
@@ -408,13 +394,13 @@ packages:
408394
url: "https://pub.dartlang.org"
409395
source: hosted
410396
version: "2.0.8"
411-
vm_service:
397+
vm_service_client:
412398
dependency: transitive
413399
description:
414-
name: vm_service
400+
name: vm_service_client
415401
url: "https://pub.dartlang.org"
416402
source: hosted
417-
version: "2.1.1"
403+
version: "0.2.6+3"
418404
watcher:
419405
dependency: transitive
420406
description:
@@ -445,3 +431,4 @@ packages:
445431
version: "2.2.0"
446432
sdks:
447433
dart: ">=2.5.0 <3.0.0"
434+
flutter: ">=1.10.7 <2.0.0"

‎packages/flutter_markdown/pubspec.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ name: flutter_markdown
22
author: Flutter Authors <flutter-dev@googlegroups.com>
33
description: A Markdown renderer for Flutter.
44
homepage: https://github.com/flutter/flutter_markdown
5-
version: 0.3.1
5+
version: 0.3.2
66

77
dependencies:
88
flutter:
99
sdk: flutter
10-
markdown: ^2.0.0
10+
markdown: ^2.1.3
1111
meta: ^1.1.7
1212
path: ^1.6.4
1313

@@ -18,6 +18,7 @@ dev_dependencies:
1818

1919
environment:
2020
sdk: '>=2.5.0 <3.0.0'
21+
flutter: '>=1.10.7 <2.0.0'
2122

2223
flutter:
2324
assets:

0 commit comments

Comments
 (0)