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
1000ae80
Unverified
Commit
1000ae80
authored
May 14, 2020
by
Jonah Williams
Committed by
GitHub
May 14, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[flutter_tools] ensure package_config is re-created if pub get is run (#57184)
parent
8ede83b8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
7 deletions
+22
-7
template.dart
packages/flutter_tools/lib/src/template.dart
+7
-2
template_test.dart
packages/flutter_tools/test/template_test.dart
+15
-5
No files found.
packages/flutter_tools/lib/src/template.dart
View file @
1000ae80
...
@@ -249,14 +249,19 @@ Future<Directory> _templateImageDirectory(String name, FileSystem fileSystem) as
...
@@ -249,14 +249,19 @@ Future<Directory> _templateImageDirectory(String name, FileSystem fileSystem) as
if
(!
fileSystem
.
file
(
packageFilePath
).
existsSync
())
{
if
(!
fileSystem
.
file
(
packageFilePath
).
existsSync
())
{
await
_ensurePackageDependencies
(
toolPackagePath
);
await
_ensurePackageDependencies
(
toolPackagePath
);
}
}
final
PackageConfig
packageConfig
=
await
loadPackageConfigWithLogging
(
PackageConfig
packageConfig
=
await
loadPackageConfigWithLogging
(
fileSystem
.
file
(
packageFilePath
),
fileSystem
.
file
(
packageFilePath
),
logger:
globals
.
logger
,
logger:
globals
.
logger
,
);
);
final
Uri
imagePackageLibDir
=
packageConfig
[
'flutter_template_images'
]?.
packageUriRoot
;
Uri
imagePackageLibDir
=
packageConfig
[
'flutter_template_images'
]?.
packageUriRoot
;
// Ensure that the template image package is present.
// Ensure that the template image package is present.
if
(
imagePackageLibDir
==
null
||
!
fileSystem
.
directory
(
imagePackageLibDir
).
existsSync
())
{
if
(
imagePackageLibDir
==
null
||
!
fileSystem
.
directory
(
imagePackageLibDir
).
existsSync
())
{
await
_ensurePackageDependencies
(
toolPackagePath
);
await
_ensurePackageDependencies
(
toolPackagePath
);
packageConfig
=
await
loadPackageConfigWithLogging
(
fileSystem
.
file
(
packageFilePath
),
logger:
globals
.
logger
,
);
imagePackageLibDir
=
packageConfig
[
'flutter_template_images'
]?.
packageUriRoot
;
}
}
return
fileSystem
.
directory
(
imagePackageLibDir
)
return
fileSystem
.
directory
(
imagePackageLibDir
)
.
parent
.
parent
...
...
packages/flutter_tools/test/template_test.dart
View file @
1000ae80
...
@@ -5,6 +5,7 @@
...
@@ -5,6 +5,7 @@
import
'package:file/memory.dart'
;
import
'package:file/memory.dart'
;
import
'package:flutter_tools/src/base/file_system.dart'
;
import
'package:flutter_tools/src/base/file_system.dart'
;
import
'package:flutter_tools/src/cache.dart'
;
import
'package:flutter_tools/src/cache.dart'
;
import
'package:flutter_tools/src/dart/pub.dart'
;
import
'package:flutter_tools/src/template.dart'
;
import
'package:flutter_tools/src/template.dart'
;
import
'package:flutter_tools/src/globals.dart'
as
globals
;
import
'package:flutter_tools/src/globals.dart'
as
globals
;
import
'package:mockito/mockito.dart'
;
import
'package:mockito/mockito.dart'
;
...
@@ -77,12 +78,21 @@ void main() {
...
@@ -77,12 +78,21 @@ void main() {
.
childDirectory
(
'flutter_tools'
)
.
childDirectory
(
'flutter_tools'
)
.
childFile
(
'.packages'
);
.
childFile
(
'.packages'
);
packagesFile
.
createSync
(
recursive:
true
);
packagesFile
.
createSync
(
recursive:
true
);
packagesFile
.
writeAsStringSync
(
'flutter_template_images:file:///flutter_template_images'
);
packagesFile
.
writeAsStringSync
(
'
\n
'
);
// Attempting to run pub in a test throws.
when
(
pub
.
get
(
await
expectLater
(
Template
.
fromName
(
'app'
,
fileSystem:
fileSystem
),
context:
PubContext
.
pubGet
,
throwsUnsupportedError
);
directory:
anyNamed
(
'directory'
),
)).
thenAnswer
((
Invocation
invocation
)
async
{
// Create valid package entry.
packagesFile
.
writeAsStringSync
(
'flutter_template_images:file:///flutter_template_images'
);
});
await
Template
.
fromName
(
'app'
,
fileSystem:
fileSystem
);
},
overrides:
<
Type
,
Generator
>{
Pub:
()
=>
MockPub
(),
}));
}));
}
}
class
MockPub
extends
Mock
implements
Pub
{}
class
MockDirectory
extends
Mock
implements
Directory
{}
class
MockDirectory
extends
Mock
implements
Directory
{}
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