-
Notifications
You must be signed in to change notification settings - Fork 29.7k
Have flutter.js load local canvaskit instead of the CDN when appropriate #150806
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
…ate. If the user specifies the `--no-web-resources-cdn` or `--local-web-sdk`, we should use the local version of CanvasKit. `flutter.js` now has a flag that can be specified in the build configuration that tells it to load locally instead. Also, added a link to the relevant docs in the web template warnings.
yjbanov
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM with nitpicks
| /// If set, builds native assets with `build.dart` from all packages. | ||
| final bool buildNativeAssets; | ||
|
|
||
| /// If set, web builds will use the locally build CanvasKit instead of using the CDN |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: s/build/built/
| decodeDartDefines(environment.defines, kDartDefines), | ||
| ); | ||
| if (environment.defines[kUseLocalCanvasKitFlag] != 'true') { | ||
| if (!dartDefines.any((String define) => define.startsWith('FLUTTER_WEB_CANVASKIT_URL='))) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe turn the if expression into a descriptively named variable? See http://go/tott/705
| Iterable<String> get buildPatternStems; | ||
|
|
||
| List<String> dartDefines(Environment environment) { | ||
| final List<String> dartDefines = compilerConfig.renderer.updateDartDefines( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Feels strange to see a variable named exactly the same as the function it's defined in. Maybe the function name should follow https://dart.dev/effective-dart/design#prefer-an-imperative-verb-phrase-for-a-function-or-method-whose-main-purpose-is-a-side-effect? Something like computeDartDefines
| } | ||
|
|
||
| String buildConfigString(Environment environment) { | ||
| final Map<String, Object?> buildConfig = <String, Object?>{ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like none of the values are null, so maybe this can be Map<String, Object>?
|
|
||
| expect(response.statusCode, 200); | ||
| final String body = await response.readAsString(); | ||
| expect(body, isNot(contains('"useLocalCanvasKit":true'))); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this be broader, like isNot(contains('useLocalCanvasKit'))? What if someone changes the code and now it contains "useLocalCanvasKit":false? Or "useLocalCanvasKit":shouldUseLocalCanvasKit?
Manual roll Flutter from e726eb4 to 15f95ce (48 revisions) Manual roll requested by [email protected] flutter/flutter@e726eb4...15f95ce 2024-06-28 [email protected] Roll Flutter Engine from ddd4814b9d40 to 94591ffb20df (5 revisions) (flutter/flutter#150968) 2024-06-27 [email protected] Manual engine roll to ddd4814 (flutter/flutter#150952) 2024-06-27 [email protected] local lint copy gradle task config (flutter/flutter#150957) 2024-06-27 [email protected] Roll Flutter Engine from b42c80460538 to d1506c12808e (3 revisions) (flutter/flutter#150951) 2024-06-27 [email protected] [tool] make the `systemTempDirectory` getter on `ErrorHandlingFileSystem` wrap the underlying filesystem's temp directory in a`ErrorHandlingDirectory` (flutter/flutter#150876) 2024-06-27 [email protected] Have flutter.js load local canvaskit instead of the CDN when appropriate (flutter/flutter#150806) 2024-06-27 [email protected] Roll Flutter Engine from a9194f0f01f4 to b42c80460538 (10 revisions) (flutter/flutter#150940) 2024-06-27 [email protected] [a11y] Reland [#149375 ] Update semantics in dropdown.dart (flutter/flutter#150578) 2024-06-27 [email protected] Bump dartdoc to 8.0.9+1 (flutter/flutter#150935) 2024-06-27 [email protected] add onFocus to text fields (flutter/flutter#150648) 2024-06-27 [email protected] Fixes `flutter build ipa` failure: Command line name "app-store" is deprecated. Use "app-store-connect" (flutter/flutter#150407) 2024-06-27 [email protected] Copy any previous `IconThemeData` instead of overwriting it in CupertinoButton (flutter/flutter#149777) 2024-06-27 [email protected] Improve the behavior of scrollbar drag-scrolls triggered by the trackpad (flutter/flutter#150275) 2024-06-27 [email protected] feat: Add autofocus for `MenuItemButton` (flutter/flutter#139396) 2024-06-27 [email protected] Roll Flutter Engine from 1d5e3cc55a75 to a9194f0f01f4 (7 revisions) (flutter/flutter#150888) 2024-06-26 [email protected] Reland "Remove dual_screen from new_gallery integration test" (flutter/flutter#150873) 2024-06-26 [email protected] Switch to more reliable flutter.dev link destinations in the tool (flutter/flutter#150587) 2024-06-26 [email protected] Adding `@docImport`s to the `animation` library (flutter/flutter#150798) 2024-06-26 [email protected] Remove CODEOWNERS trailing whitespace (flutter/flutter#150882) 2024-06-26 [email protected] Roll Flutter Engine from e03cf86c4170 to 1d5e3cc55a75 (3 revisions) (flutter/flutter#150875) 2024-06-26 [email protected] Remind folks we are moving. (flutter/flutter#150872) 2024-06-26 [email protected] Remove `bringup: true` from web test shard. (flutter/flutter#150785) 2024-06-26 [email protected] Roll Flutter Engine from c0017bed42c2 to e03cf86c4170 (1 revision) (flutter/flutter#150867) 2024-06-26 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Remove `dual_screen` from `new_gallery` integration test (#150808)" (flutter/flutter#150871) 2024-06-26 [email protected] Remove `dual_screen` from `new_gallery` integration test (flutter/flutter#150808) 2024-06-26 [email protected] Roll Flutter Engine from d4624a36712b to c0017bed42c2 (4 revisions) (flutter/flutter#150865) 2024-06-26 [email protected] Fixes for Style Guide for Flutter Repo (flutter/flutter#150167) 2024-06-26 [email protected] Roll Flutter Engine from da62c629ed5c to d4624a36712b (3 revisions) (flutter/flutter#150852) 2024-06-26 [email protected] Use `Isolate.packageConfigSync! to locate the packageconfig of flutter tools (flutter/flutter#150340) 2024-06-26 [email protected] Roll Flutter Engine from 25af762ffbb3 to da62c629ed5c (2 revisions) (flutter/flutter#150829) 2024-06-26 [email protected] Fix leaky tests. (flutter/flutter#150817) 2024-06-26 [email protected] Roll Flutter Engine from 94023d711db3 to 25af762ffbb3 (4 revisions) (flutter/flutter#150818) 2024-06-26 [email protected] Roll pub packages (flutter/flutter#150810) 2024-06-25 [email protected] Remove reference to `MaterialApp` and `showCupertinoModalPopup` from `CupertinoAlertDialog` (flutter/flutter#150725) 2024-06-25 [email protected] Read `AndroidManifest.xml` and emit `manifest-impeller-(enabled|disabled)` analytics (flutter/flutter#150791) 2024-06-25 [email protected] [flutter_tools] Shut down Chromium cleanly using a command sent through the debug protocol (flutter/flutter#150645) 2024-06-25 [email protected] Reland fix inputDecorator hint color on M3 (flutter/flutter#150278) 2024-06-25 [email protected] Roll Flutter Engine from 62e0b5f9c340 to 94023d711db3 (7 revisions) (flutter/flutter#150797) 2024-06-25 [email protected] Fix collapsed InputDecorator minimum height (flutter/flutter#150770) 2024-06-25 [email protected] Add more warm up frame docs (flutter/flutter#150464) 2024-06-25 [email protected] Roll pub packages (flutter/flutter#150739) 2024-06-25 [email protected] Add `focusNode`, `focusColor`, `onFocusChange`, `autofocus` to `CupertinoButton` (flutter/flutter#150721) 2024-06-25 [email protected] Document RenderObject._relayoutBoundary and its invariant; small refactors (flutter/flutter#150527) 2024-06-25 [email protected] Roll Flutter Engine from 6313b1e5afd7 to 62e0b5f9c340 (1 revision) (flutter/flutter#150790) ...
…ate (flutter#150806) If the user specifies the `--no-web-resources-cdn` or `--local-web-sdk`, we should use the local version of CanvasKit. `flutter.js` now has a flag that can be specified in the build configuration that tells it to load locally instead. Also, added a link to the relevant docs in the web template warnings. This addresses flutter#148713 Also fixes flutter#145559
If the user specifies the
--no-web-resources-cdnor--local-web-sdk, we should use the local version of CanvasKit.flutter.jsnow has a flag that can be specified in the build configuration that tells it to load locally instead.Also, added a link to the relevant docs in the web template warnings.
This addresses #148713
Also fixes #145559