AF-1837 dart 1 and dart2 compat #38

robbecker-wf · 2018-05-17T17:55:50Z

Overview

Prepare the code and process to work under both dart 1 and dart 2

Testing

CI should pass under both dart 1 and dart 2

aviary2-wf · 2018-05-17T17:56:20Z

Security Insights

No security relevant content was detected by automated scans.

Action Items

Review PR for security impact; comment "security review required" if needed or unsure
Verify aviary.yaml coverage of security relevant code

Questions or Comments? Reach out on HipChat: InfoSec Forum.

robbecker-wf · 2018-05-17T22:32:17Z

Dockerfile

-		tar czvf font_face_observer.pub.tgz LICENSE README.md pubspec.yaml lib/ && \
-		./tool/codecov.sh && \
-		echo "Script sections completed"
+	pub get && \


remove --packages-dir

robbecker-wf · 2018-05-17T22:33:04Z

Dockerfile

+	pub publish --dry-run && \
+	pub run dart_dev analyze && \
+	pub run dart_dev format --check && \
+	xvfb-run -s '-screen 0 1024x768x24' pub run dart_dev test --web-compiler=dartdevc -p chrome && \


removed coverage since there isn't a way to collect coverage under dart 2 yet

robbecker-wf · 2018-05-17T22:34:15Z

lib/data_uri.dart

 import 'dart:html';
 import 'dart:typed_data';
+import 'package:dart2_constant/convert.dart' as convert;


use dart2_constant to use dart 1&2 compatible constant names

For my own edification, is there a reference you can provide explaining this change?

There's a library that allows you to use constants that work under both dart 1 and dart 2 https://pub.dartlang.org/packages/dart2_constant
If we didn't care about backwards compatibility, we could just move to dart 2 camelcase constants by running https://pub.dartlang.org/packages/dart2_fix

robbecker-wf · 2018-05-17T22:34:27Z

lib/src/adobe_blank.dart

@@ -66,7 +66,7 @@ https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document
 const String adobeBlankFamily = 'AdobeBlank';

 /// The font key for the AdobeBlank font
-final String adobeBlankKey = '${adobeBlankFamily}_normal_normal_normal';
+const String adobeBlankKey = '${adobeBlankFamily}_normal_normal_normal';


robbecker-wf · 2018-05-17T22:34:47Z

test/font_face_observer_test.dart

@@ -216,7 +216,7 @@ void main() {


    test('should keep data-uses attribute up to date', () async {
-      final String differentGroup = 'diff';
+      const String differentGroup = 'diff';


robbecker-wf · 2018-05-17T22:35:02Z

test/index.html

+      border: solid 1px #ccc;
+      border-collapse: collapse;
+      padding: 5px;
+    }


just format changes

robbecker-wf · 2018-05-17T22:35:37Z

test/index.html

@@ -25,7 +30,7 @@
      <th>DOM</th>
      <th>Canvas</th>
    </tr>
-  <script type="application/dart" src="main.dart"></script>
-  <script src="../packages/browser/dart.js"></script>
+    <script defer src="main.dart.js"></script>


get rid of transformers, browser package according to https://webdev-dartlang-org-dev.firebaseapp.com/dart-2

robbecker-wf · 2018-05-17T22:35:48Z

test/main.dart

+        ..text = message
+        ..style.fontFamily = uniqFamily
+        ..style.fontSize = '18px'))
+    ..append(new TableCellElement()..append(canvas));


robbecker-wf · 2018-05-29T22:58:43Z

test/unload.html

@@ -30,7 +30,6 @@ <h1>Memory / Perf Analysis</h1>
  <div style="font-family: Roboto_2, Times New Roman">Roboto_2 group_A &amp; group_B</div>
  <div style="font-family: Roboto_3, Times New Roman">Roboto_3 group_A</div>

-  <script type="application/dart" src="unload.dart"></script>
-  <script src="../packages/browser/dart.js"></script>
+  <script defer src="unload.dart.js"></script>


Changes for Dart 2 / DDC .. no rewriting, no transformers

robbecker-wf · 2018-06-14T13:47:05Z

Dockerfile

+	export D2PATH=`pwd`/dart-sdk/bin && \
+	export PATH=$D2PATH:$PATH && \
+	dart --version && \
+	pub --version && \


Download dart 2 dev, extract and add it to the path to use dart 2 in CI. Maybe we could include both versions of Dart this way in CI images include a quick command to switch versions easily?

robbecker-wf · 2018-07-30T19:23:55Z

example/unload.dart

@@ -67,10 +67,14 @@ import 'package:font_face_observer/font_face_observer.dart';

 String _groupA = 'group_A';
 String _groupB = 'group_B';
-_FontConfig _cfg = new _FontConfig(family: 'Roboto_1', url: '/fonts/Roboto.ttf', useSimulatedLoadEvents: true);


move to example dir, reformatted

joelleibow-wf · 2018-07-30T20:03:50Z

test/font_face_observer_test.dart

-      final String stretch = 'my stretch';
-      final String testString = 'my testString';
-      final int timeout = 1337;
+      const String family = 'my family';


Is const the new Dart 2 preferred?

Yes, Dart 2 now recommends you use const in certain places. It isn't an error, just a lint.

corwinsheahan-wf · 2018-08-01T00:25:42Z

QA +1 / +10

Testing instruction
Dev +1's
Dev/QA +10 with detail of what was tested:
- CI Passes
Security review (if required)
Unit tests created/updated
All unit tests pass
Rosie has run and reports properly the release the ticket will be included in

Merging into master.
@Workiva/release-management-p

dart2 prep

17bdd95

robbecker-wf added 2 commits May 17, 2018 12:37

restore ddc in pubspec

b1d2f67

sdk constraints

82386f9

rmconsole3-wf changed the title ~~dart2 prep~~ HY-5901 dart2 prep May 17, 2018

robbecker-wf added 3 commits May 17, 2018 15:17

update smithy image

7c64382

remove coverage

936fcd1

fix dockerfile again

ea9de85

robbecker-wf commented May 17, 2018

View reviewed changes

test/index.html

border: solid 1px #ccc;

border-collapse: collapse;

padding: 5px;

}

Copy link

Member Author

robbecker-wf May 17, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just format changes

robbecker-wf commented May 17, 2018

View reviewed changes

robbecker-wf added 5 commits May 29, 2018 15:59

Try running CI with Dart 2 ?

00f6f74

fix CI for dart 2

d03ffca

leave coverage in but commented, make travis do more work

e16fe76

try to fix travis

5066872

dartfmt test directory

a430d3a

robbecker-wf commented May 29, 2018

View reviewed changes

robbecker-wf added 4 commits May 29, 2018 17:48

Try with the Dart 2 image?

b2d47dd

1 more time

5c202ab

go back to how it was

e4a0847

Merge remote-tracking branch 'origin/master' into dart2

eb795f9

rmconsole-wf added the Merge Requirements Unmet label Jun 14, 2018

robbecker-wf commented Jun 14, 2018

View reviewed changes

robbecker-wf added 2 commits June 14, 2018 07:51

update dart 2 to latest dev version, run under both versions

94346f6

coverage hanging forever

e5e7c67

robbecker-wf added 16 commits July 18, 2018 17:19

remove build.yaml, update dockerfile and pubspec

2ef8019

update dockerfile to dart 2 dev69

4348516

revert dart 2 only changes

7f7ad1c

refine dep ranges

9140e36

update dart sdk version restriction

d91a598

fix dart 2 download url for workiva build

e5b7faa

fix dart analyzer cmd

79ed152

dart format

67b507e

another dockerfile fix

e7e3c5a

pubclean and fix dartfmt

7d1f4eb

ugh typo fix

6b783f0

alternate pubclean impl

fdaf36e

oops, remove old call to pubclean

d147ab7

fix dartfmt cmd

48d6a50

just bag building the test directory

47ffae0

ok, just do dart 1 in Workiva build. Let travis do dart 2.

673e88c

robbecker-wf commented Jul 30, 2018

View reviewed changes

joelleibow-wf reviewed Jul 30, 2018

View reviewed changes

include browser tests in travis

ad7d387

robbecker-wf changed the title ~~HY-5901 dart2 prep~~ HY-5901 dart 1 and dart2 compat Jul 31, 2018

robbecker-wf changed the title ~~HY-5901 dart 1 and dart2 compat~~ AF-1837 dart 1 and dart2 compat Jul 31, 2018

sebastianmalysa-wf approved these changes Jul 31, 2018

View reviewed changes

evanweible-wf approved these changes Jul 31, 2018

View reviewed changes

rmconsole-wf added RM Ready Merge Requirements Met and removed Merge Requirements Unmet labels Aug 1, 2018

rm-astro-wf merged commit adb9824 into master Aug 1, 2018

rm-astro-wf deleted the dart2 branch August 1, 2018 14:21

rmconsole-readonly-wk mentioned this pull request Aug 1, 2018

HY-5774 Release font_face_observer 2.0.9 #44

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

AF-1837 dart 1 and dart2 compat #38

AF-1837 dart 1 and dart2 compat #38

robbecker-wf commented May 17, 2018 •

edited

Loading

aviary2-wf commented May 17, 2018

robbecker-wf May 17, 2018

robbecker-wf May 17, 2018

robbecker-wf May 17, 2018

joelleibow-wf Jul 30, 2018

robbecker-wf Jul 30, 2018

robbecker-wf May 17, 2018

robbecker-wf May 17, 2018

robbecker-wf May 17, 2018

robbecker-wf May 17, 2018

robbecker-wf May 17, 2018

robbecker-wf May 29, 2018

robbecker-wf Jun 14, 2018

robbecker-wf Jul 30, 2018

joelleibow-wf Jul 30, 2018

robbecker-wf Jul 30, 2018

corwinsheahan-wf commented Aug 1, 2018

AF-1837 dart 1 and dart2 compat #38

AF-1837 dart 1 and dart2 compat #38

Conversation

robbecker-wf commented May 17, 2018 • edited Loading

Overview

Testing

aviary2-wf commented May 17, 2018

Security Insights

Action Items

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

corwinsheahan-wf commented Aug 1, 2018

robbecker-wf commented May 17, 2018 •

edited

Loading