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
aeede207
Unverified
Commit
aeede207
authored
Oct 02, 2019
by
Jonah Williams
Committed by
GitHub
Oct 02, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Handle missing .packages file in the flutter tool for prebuilt artifacts (#41697)
parent
41584048
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
36 additions
and
1 deletion
+36
-1
web_fs.dart
packages/flutter_tools/lib/src/build_runner/web_fs.dart
+13
-0
web_fs_test.dart
...ges/flutter_tools/test/general.shard/web/web_fs_test.dart
+23
-1
No files found.
packages/flutter_tools/lib/src/build_runner/web_fs.dart
View file @
aeede207
...
@@ -29,6 +29,7 @@ import '../build_info.dart';
...
@@ -29,6 +29,7 @@ import '../build_info.dart';
import
'../bundle.dart'
;
import
'../bundle.dart'
;
import
'../cache.dart'
;
import
'../cache.dart'
;
import
'../dart/package_map.dart'
;
import
'../dart/package_map.dart'
;
import
'../dart/pub.dart'
;
import
'../device.dart'
;
import
'../device.dart'
;
import
'../globals.dart'
;
import
'../globals.dart'
;
import
'../platform_plugins.dart'
;
import
'../platform_plugins.dart'
;
...
@@ -176,6 +177,18 @@ class WebFs {
...
@@ -176,6 +177,18 @@ class WebFs {
if
(!
flutterProject
.
dartTool
.
existsSync
())
{
if
(!
flutterProject
.
dartTool
.
existsSync
())
{
flutterProject
.
dartTool
.
createSync
(
recursive:
true
);
flutterProject
.
dartTool
.
createSync
(
recursive:
true
);
}
}
// Workaround for https://github.com/flutter/flutter/issues/41681.
final
String
toolPath
=
fs
.
path
.
join
(
Cache
.
flutterRoot
,
'packages'
,
'flutter_tools'
);
if
(!
fs
.
isFileSync
(
fs
.
path
.
join
(
toolPath
,
'.packages'
)))
{
await
pubGet
(
context:
PubContext
.
pubGet
,
directory:
toolPath
,
offline:
true
,
skipPubspecYamlCheck:
true
,
checkLastModified:
false
,
);
}
final
Completer
<
bool
>
firstBuildCompleter
=
Completer
<
bool
>();
final
Completer
<
bool
>
firstBuildCompleter
=
Completer
<
bool
>();
// Initialize the asset bundle.
// Initialize the asset bundle.
...
...
packages/flutter_tools/test/general.shard/web/web_fs_test.dart
View file @
aeede207
...
@@ -8,7 +8,9 @@ import 'package:built_collection/built_collection.dart';
...
@@ -8,7 +8,9 @@ import 'package:built_collection/built_collection.dart';
import
'package:dwds/dwds.dart'
;
import
'package:dwds/dwds.dart'
;
import
'package:flutter_tools/src/base/file_system.dart'
;
import
'package:flutter_tools/src/base/file_system.dart'
;
import
'package:flutter_tools/src/base/os.dart'
;
import
'package:flutter_tools/src/base/os.dart'
;
import
'package:flutter_tools/src/base/process.dart'
;
import
'package:flutter_tools/src/build_info.dart'
;
import
'package:flutter_tools/src/build_info.dart'
;
import
'package:flutter_tools/src/cache.dart'
;
import
'package:flutter_tools/src/project.dart'
;
import
'package:flutter_tools/src/project.dart'
;
import
'package:flutter_tools/src/web/chrome.dart'
;
import
'package:flutter_tools/src/web/chrome.dart'
;
import
'package:flutter_tools/src/build_runner/web_fs.dart'
;
import
'package:flutter_tools/src/build_runner/web_fs.dart'
;
...
@@ -27,6 +29,7 @@ void main() {
...
@@ -27,6 +29,7 @@ void main() {
MockHttpMultiServer
mockHttpMultiServer
;
MockHttpMultiServer
mockHttpMultiServer
;
MockBuildDaemonClient
mockBuildDaemonClient
;
MockBuildDaemonClient
mockBuildDaemonClient
;
MockOperatingSystemUtils
mockOperatingSystemUtils
;
MockOperatingSystemUtils
mockOperatingSystemUtils
;
MockProcessUtils
mockProcessUtils
;
bool
lastInitializePlatform
;
bool
lastInitializePlatform
;
dynamic
lastAddress
;
dynamic
lastAddress
;
int
lastPort
;
int
lastPort
;
...
@@ -41,6 +44,7 @@ void main() {
...
@@ -41,6 +44,7 @@ void main() {
mockBuildDaemonClient
=
MockBuildDaemonClient
();
mockBuildDaemonClient
=
MockBuildDaemonClient
();
mockOperatingSystemUtils
=
MockOperatingSystemUtils
();
mockOperatingSystemUtils
=
MockOperatingSystemUtils
();
mockDwds
=
MockDwds
();
mockDwds
=
MockDwds
();
mockProcessUtils
=
MockProcessUtils
();
when
(
mockBuildDaemonCreator
.
startBuildDaemon
(
any
,
release:
anyNamed
(
'release'
),
initializePlatform:
anyNamed
(
'initializePlatform'
)))
when
(
mockBuildDaemonCreator
.
startBuildDaemon
(
any
,
release:
anyNamed
(
'release'
),
initializePlatform:
anyNamed
(
'initializePlatform'
)))
.
thenAnswer
((
Invocation
invocation
)
async
{
.
thenAnswer
((
Invocation
invocation
)
async
{
lastInitializePlatform
=
invocation
.
namedArguments
[
#initializePlatform
];
lastInitializePlatform
=
invocation
.
namedArguments
[
#initializePlatform
];
...
@@ -49,6 +53,17 @@ void main() {
...
@@ -49,6 +53,17 @@ void main() {
when
(
mockOperatingSystemUtils
.
findFreePort
()).
thenAnswer
((
Invocation
_
)
async
{
when
(
mockOperatingSystemUtils
.
findFreePort
()).
thenAnswer
((
Invocation
_
)
async
{
return
1234
;
return
1234
;
});
});
when
(
mockProcessUtils
.
stream
(
any
,
workingDirectory:
anyNamed
(
'workingDirectory'
),
mapFunction:
anyNamed
(
'mapFunction'
),
environment:
anyNamed
(
'environment'
),
)).
thenAnswer
((
Invocation
invocation
)
async
{
final
String
workingDirectory
=
invocation
.
namedArguments
[
#workingDirectory
];
fs
.
file
(
fs
.
path
.
join
(
workingDirectory
,
'.packages'
)).
createSync
(
recursive:
true
);
fs
.
file
(
fs
.
path
.
join
(
workingDirectory
,
'pubspec.yaml'
)).
createSync
();
return
0
;
});
when
(
mockBuildDaemonClient
.
buildResults
).
thenAnswer
((
Invocation
_
)
{
when
(
mockBuildDaemonClient
.
buildResults
).
thenAnswer
((
Invocation
_
)
{
return
Stream
<
BuildResults
>.
fromFuture
(
Future
<
BuildResults
>.
value
(
return
Stream
<
BuildResults
>.
fromFuture
(
Future
<
BuildResults
>.
value
(
BuildResults
((
BuildResultsBuilder
builder
)
{
BuildResults
((
BuildResultsBuilder
builder
)
{
...
@@ -74,6 +89,7 @@ void main() {
...
@@ -74,6 +89,7 @@ void main() {
OperatingSystemUtils:
()
=>
mockOperatingSystemUtils
,
OperatingSystemUtils:
()
=>
mockOperatingSystemUtils
,
BuildDaemonCreator:
()
=>
mockBuildDaemonCreator
,
BuildDaemonCreator:
()
=>
mockBuildDaemonCreator
,
ChromeLauncher:
()
=>
mockChromeLauncher
,
ChromeLauncher:
()
=>
mockChromeLauncher
,
ProcessUtils:
()
=>
mockProcessUtils
,
HttpMultiServerFactory:
()
=>
(
dynamic
address
,
int
port
)
async
{
HttpMultiServerFactory:
()
=>
(
dynamic
address
,
int
port
)
async
{
lastAddress
=
address
;
lastAddress
=
address
;
lastPort
=
port
;
lastPort
=
port
;
...
@@ -109,6 +125,12 @@ void main() {
...
@@ -109,6 +125,12 @@ void main() {
hostname:
null
,
hostname:
null
,
port:
null
,
port:
null
,
);
);
// Since the .packages file is missing in the memory filesystem, this should
// be called.
verify
(
processUtils
.
stream
(
any
,
workingDirectory:
fs
.
path
.
join
(
Cache
.
flutterRoot
,
'packages'
,
'flutter_tools'
),
mapFunction:
anyNamed
(
'mapFunction'
),
environment:
anyNamed
(
'environment'
),)).
called
(
1
);
// The build daemon is told to build once.
// The build daemon is told to build once.
verify
(
mockBuildDaemonClient
.
startBuild
()).
called
(
1
);
verify
(
mockBuildDaemonClient
.
startBuild
()).
called
(
1
);
...
@@ -189,4 +211,4 @@ class MockDwds extends Mock implements Dwds {}
...
@@ -189,4 +211,4 @@ class MockDwds extends Mock implements Dwds {}
class
MockHttpMultiServer
extends
Mock
implements
HttpMultiServer
{}
class
MockHttpMultiServer
extends
Mock
implements
HttpMultiServer
{}
class
MockChromeLauncher
extends
Mock
implements
ChromeLauncher
{}
class
MockChromeLauncher
extends
Mock
implements
ChromeLauncher
{}
class
MockOperatingSystemUtils
extends
Mock
implements
OperatingSystemUtils
{}
class
MockOperatingSystemUtils
extends
Mock
implements
OperatingSystemUtils
{}
class
MockProcessUtils
extends
Mock
implements
ProcessUtils
{}
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