github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

make sure profile is forwarded through build web command (#39414)

Browse Source
This commit is contained in:
Jonah Williams 2019-08-28 14:05:01 -07:00 committed by GitHub
parent 13f18d5a66
commit f362419601
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/flutter_tools/lib/src/build_runner/web_compilation_delegate.dart
View File

@ -22,6 +22,7 @@ import '../artifacts.dart';
import '../base/file_system.dart'; import '../base/file_system.dart';
import '../base/logger.dart'; import '../base/logger.dart';
import '../base/platform.dart'; import '../base/platform.dart';
import '../build_info.dart';
import '../compile.dart'; import '../compile.dart';
import '../convert.dart'; import '../convert.dart';
import '../dart/package_map.dart'; import '../dart/package_map.dart';
@ -41,7 +42,7 @@ class BuildRunnerWebCompilationProxy extends WebCompilationProxy {
Future<bool> initialize({ Future<bool> initialize({
Directory projectDirectory, Directory projectDirectory,
String testOutputDir, String testOutputDir,
bool release = false, BuildMode mode,
}) async { }) async {
// Create the .dart_tool directory if it doesn't exist. // Create the .dart_tool directory if it doesn't exist.
projectDirectory.childDirectory('.dart_tool').createSync(); projectDirectory.childDirectory('.dart_tool').createSync();
@ -92,7 +93,7 @@ class BuildRunnerWebCompilationProxy extends WebCompilationProxy {
result = await _runBuilder( result = await _runBuilder(
buildEnvironment, buildEnvironment,
buildOptions, buildOptions,
release, mode,
buildDirs, buildDirs,
); );
return result.status == core.BuildStatus.success; return result.status == core.BuildStatus.success;
@ -101,7 +102,7 @@ class BuildRunnerWebCompilationProxy extends WebCompilationProxy {
result = await _runBuilder( result = await _runBuilder(
buildEnvironment, buildEnvironment,
buildOptions, buildOptions,
release, mode,
buildDirs, buildDirs,
); );
return result.status == core.BuildStatus.success; return result.status == core.BuildStatus.success;
@ -110,7 +111,7 @@ class BuildRunnerWebCompilationProxy extends WebCompilationProxy {
result = await _runBuilder( result = await _runBuilder(
buildEnvironment, buildEnvironment,
buildOptions, buildOptions,
release, mode,
buildDirs, buildDirs,
); );
return result.status == core.BuildStatus.success; return result.status == core.BuildStatus.success;
@ -135,7 +136,7 @@ class BuildRunnerWebCompilationProxy extends WebCompilationProxy {
return result.status == core.BuildStatus.success; return result.status == core.BuildStatus.success;
} }
Future<core.BuildResult> _runBuilder(core.BuildEnvironment buildEnvironment, BuildOptions buildOptions, bool release, Set<core.BuildDirectory> buildDirs) async { Future<core.BuildResult> _runBuilder(core.BuildEnvironment buildEnvironment, BuildOptions buildOptions, BuildMode buildMode, Set<core.BuildDirectory> buildDirs) async {
_builder = await BuildImpl.create( _builder = await BuildImpl.create(
buildOptions, buildOptions,
buildEnvironment, buildEnvironment,
@ -145,11 +146,13 @@ class BuildRunnerWebCompilationProxy extends WebCompilationProxy {
'flutterWebSdk': artifacts.getArtifactPath(Artifact.flutterWebSdk), 'flutterWebSdk': artifacts.getArtifactPath(Artifact.flutterWebSdk),
}, },
'flutter_tools:entrypoint': <String, dynamic>{ 'flutter_tools:entrypoint': <String, dynamic>{
'release': release, 'release': buildMode == BuildMode.release,
'flutterWebSdk': artifacts.getArtifactPath(Artifact.flutterWebSdk), 'flutterWebSdk': artifacts.getArtifactPath(Artifact.flutterWebSdk),
'profile': buildMode == BuildMode.profile,
}, },
'flutter_tools:test_entrypoint': <String, dynamic>{ 'flutter_tools:test_entrypoint': <String, dynamic>{
'release': release, 'release': buildMode == BuildMode.release,
'profile': buildMode == BuildMode.profile,
}, },
}, },
isReleaseBuild: false, isReleaseBuild: false,

4
packages/flutter_tools/lib/src/web/compile.dart
View File

@ -30,7 +30,7 @@ Future<void> buildWeb(FlutterProject flutterProject, String target, BuildInfo bu
try { try {
result = await webCompilationProxy.initialize( result = await webCompilationProxy.initialize(
projectDirectory: FlutterProject.current().directory, projectDirectory: FlutterProject.current().directory,
release: buildInfo.isRelease, mode: buildInfo.mode,
); );
if (result) { if (result) {
// Places assets adjacent to the web stuff. // Places assets adjacent to the web stuff.
@ -81,7 +81,7 @@ class WebCompilationProxy {
Future<bool> initialize({ Future<bool> initialize({
@required Directory projectDirectory, @required Directory projectDirectory,
String testOutputDir, String testOutputDir,
bool release, BuildMode mode,
}) async { }) async {
throw UnimplementedError(); throw UnimplementedError();
} }

2
packages/flutter_tools/test/general.shard/commands/build_web_test.dart
View File

@ -41,7 +41,7 @@ void main() {
fs.file(fs.path.join('lib', 'main.dart')).createSync(recursive: true); fs.file(fs.path.join('lib', 'main.dart')).createSync(recursive: true);
when(mockWebCompilationProxy.initialize( when(mockWebCompilationProxy.initialize(
projectDirectory: anyNamed('projectDirectory'), projectDirectory: anyNamed('projectDirectory'),
release: anyNamed('release') mode: anyNamed('mode')
)).thenAnswer((Invocation invocation) { )).thenAnswer((Invocation invocation) {
final String path = fs.path.join('.dart_tool', 'build', 'flutter_web', 'foo', 'lib', 'main_web_entrypoint.dart.js'); final String path = fs.path.join('.dart_tool', 'build', 'flutter_web', 'foo', 'lib', 'main_web_entrypoint.dart.js');
fs.file(path).createSync(recursive: true); fs.file(path).createSync(recursive: true);