DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Correct libraries path and remove dart:io and dart:isolate for web dart platform (#39364)" (#39985)

Browse Source 
This reverts commit 3f4d27c4bc5a8b3afa868b9dfe187d7585c44848.
This commit is contained in:
Jonah Williams 2019-09-06 09:24:14 -07:00 committed by GitHub
parent 8601bb7b38
commit 296e97f322
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packages/flutter_tools/lib/src/build_runner/build_script.dart
View File

@ -41,16 +41,6 @@ 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',
@ -73,6 +63,8 @@ final DartPlatform flutterWebPlatform =
// Flutter web specific libraries.
'ui',
'_engine',
'io',
'isolate',
]);
/// The builders required to compile a Flutter application to the web.
@ -135,7 +127,7 @@ final List<core.BuilderApplication> builders = <core.BuilderApplication>[
sdkKernelPath: path.join('kernel', 'flutter_ddc_sdk.dill'),
outputExtension: ddcKernelExtension,
platform: flutterWebPlatform,
librariesPath: path.absolute(path.join(builderOptions.config['flutterWebSdk'], 'libraries.json')),
librariesPath: 'libraries.json',
kernelTargetName: 'ddc',
),
(BuilderOptions builderOptions) => DevCompilerBuilder(
@ -143,7 +135,7 @@ final List<core.BuilderApplication> builders = <core.BuilderApplication>[
platform: flutterWebPlatform,
platformSdk: builderOptions.config['flutterWebSdk'],
sdkKernelPath: path.url.join('kernel', 'flutter_ddc_sdk.dill'),
librariesPath: path.absolute(path.join(builderOptions.config['flutterWebSdk'], 'libraries.json')),
librariesPath: 'libraries.json',
),
],
core.toAllPackages(),
@ -209,7 +201,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, skipPlatformCheckPackages: skipPlatformCheckPackages);
await bootstrapDdc(buildStep, platform: flutterWebPlatform);
}
}
@ -237,7 +229,7 @@ class FlutterWebEntrypointBuilder implements Builder {
if (release || profile) {
await bootstrapDart2Js(buildStep, flutterWebSdk, profile);
} else {
await bootstrapDdc(buildStep, platform: flutterWebPlatform, skipPlatformCheckPackages: skipPlatformCheckPackages);
await bootstrapDdc(buildStep, platform: flutterWebPlatform);
}
}
}

6
packages/flutter_tools/lib/src/build_runner/web_fs.dart
View File

@ -417,11 +417,7 @@ class BuildDaemonCreator {
}
break;
default:
if (serverLog.message.contains('Skipping compiling')) {
printError(serverLog.message);
} else {
printTrace(serverLog.message);
}
printTrace(serverLog.message);
}
},
buildMode: daemon.BuildMode.Manual,