Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
3f4d27c4
Unverified
Commit
3f4d27c4
authored
Sep 06, 2019
by
Jonah Williams
Committed by
GitHub
Sep 06, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correct libraries path and remove dart:io and dart:isolate for web dart platform (#39364)
parent
95168fcc
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
7 deletions
+19
-7
build_script.dart
...ages/flutter_tools/lib/src/build_runner/build_script.dart
+14
-6
web_fs.dart
packages/flutter_tools/lib/src/build_runner/web_fs.dart
+5
-1
No files found.
packages/flutter_tools/lib/src/build_runner/build_script.dart
View file @
3f4d27c4
...
...
@@ -41,6 +41,16 @@ const String jsSourceMapExtension = '.ddc.js.map';
const
String
kReleaseFlag
=
'release'
;
const
String
kProfileFlag
=
'profile'
;
const
Set
<
String
>
skipPlatformCheckPackages
=
<
String
>{
'flutter'
,
'flutter_test'
,
'flutter_driver'
,
'flutter_goldens'
,
'flutter_goldens_client'
,
'flutter_gallery'
,
'connectivity'
,
};
final
DartPlatform
flutterWebPlatform
=
DartPlatform
.
register
(
'flutter_web'
,
<
String
>[
'async'
,
...
...
@@ -63,8 +73,6 @@ final DartPlatform flutterWebPlatform =
// Flutter web specific libraries.
'ui'
,
'_engine'
,
'io'
,
'isolate'
,
]);
/// The builders required to compile a Flutter application to the web.
...
...
@@ -127,7 +135,7 @@ final List<core.BuilderApplication> builders = <core.BuilderApplication>[
sdkKernelPath:
path
.
join
(
'kernel'
,
'flutter_ddc_sdk.dill'
),
outputExtension:
ddcKernelExtension
,
platform:
flutterWebPlatform
,
librariesPath:
'libraries.json'
,
librariesPath:
path
.
absolute
(
path
.
join
(
builderOptions
.
config
[
'flutterWebSdk'
],
'libraries.json'
))
,
kernelTargetName:
'ddc'
,
),
(
BuilderOptions
builderOptions
)
=>
DevCompilerBuilder
(
...
...
@@ -135,7 +143,7 @@ final List<core.BuilderApplication> builders = <core.BuilderApplication>[
platform:
flutterWebPlatform
,
platformSdk:
builderOptions
.
config
[
'flutterWebSdk'
],
sdkKernelPath:
path
.
url
.
join
(
'kernel'
,
'flutter_ddc_sdk.dill'
),
librariesPath:
'libraries.json'
,
librariesPath:
path
.
absolute
(
path
.
join
(
builderOptions
.
config
[
'flutterWebSdk'
],
'libraries.json'
))
,
),
],
core
.
toAllPackages
(),
...
...
@@ -201,7 +209,7 @@ class FlutterWebTestEntrypointBuilder implements Builder {
@override
Future
<
void
>
build
(
BuildStep
buildStep
)
async
{
log
.
info
(
'building for target
${buildStep.inputId.path}
'
);
await
bootstrapDdc
(
buildStep
,
platform:
flutterWebPlatform
);
await
bootstrapDdc
(
buildStep
,
platform:
flutterWebPlatform
,
skipPlatformCheckPackages:
skipPlatformCheckPackages
);
}
}
...
...
@@ -229,7 +237,7 @@ class FlutterWebEntrypointBuilder implements Builder {
if
(
release
||
profile
)
{
await
bootstrapDart2Js
(
buildStep
,
flutterWebSdk
,
profile
);
}
else
{
await
bootstrapDdc
(
buildStep
,
platform:
flutterWebPlatform
);
await
bootstrapDdc
(
buildStep
,
platform:
flutterWebPlatform
,
skipPlatformCheckPackages:
skipPlatformCheckPackages
);
}
}
}
...
...
packages/flutter_tools/lib/src/build_runner/web_fs.dart
View file @
3f4d27c4
...
...
@@ -417,8 +417,12 @@ class BuildDaemonCreator {
}
break
;
default
:
if
(
serverLog
.
message
.
contains
(
'Skipping compiling'
))
{
printError
(
serverLog
.
message
);
}
else
{
printTrace
(
serverLog
.
message
);
}
}
},
buildMode:
daemon
.
BuildMode
.
Manual
,
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment