Skip to content

F
Front-End
Unverified Commit b4e0472b authored by Zachary Anderson's avatar Zachary Anderson Committed by GitHub
Browse files
Options

Revert "Use `dart pub` instead of `pub` to invoke pub from tools (#88509)" (#88792) 

This reverts commit 7c24ff2c.
parent 7c24ff2c
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 67 deletions
packages/flutter_tools/lib/src/dart/pub.dart
View file @ b4e0472b
...@@ -234,7 +234,9 @@ class _DefaultPub implements Pub { ...@@ -234,7 +234,9 @@ class _DefaultPub implements Pub {
final bool verbose = _logger.isVerbose; final bool verbose = _logger.isVerbose;
final List<String> args = <String>[ final List<String> args = <String>[
if (verbose) if (verbose)
'--verbose', '--verbose'
else
'--verbosity=warning',
...<String>[ ...<String>[
command, command,
'--no-precompile', '--no-precompile',
...@@ -417,7 +419,7 @@ class _DefaultPub implements Pub { ...@@ -417,7 +419,7 @@ class _DefaultPub implements Pub {
'cache', 'cache',
'dart-sdk', 'dart-sdk',
'bin', 'bin',
'dart', 'pub',
]); ]);
if (!_processManager.canRun(sdkPath)) { if (!_processManager.canRun(sdkPath)) {
throwToolExit( throwToolExit(
...@@ -426,7 +428,7 @@ class _DefaultPub implements Pub { ...@@ -426,7 +428,7 @@ class _DefaultPub implements Pub {
'permissions for the current user.' 'permissions for the current user.'
); );
} }
return <String>[sdkPath, '--no-analytics', 'pub', ...arguments]; return <String>[sdkPath, ...arguments];
} }
// Returns the environment value that should be used when running pub. // Returns the environment value that should be used when running pub.
......
packages/flutter_tools/test/commands.shard/permeable/create_test.dart
View file @ b4e0472b
...@@ -1729,7 +1729,7 @@ void main() { ...@@ -1729,7 +1729,7 @@ void main() {
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
await runner.run(<String>['create', '--pub', '--offline', projectDir.path]); await runner.run(<String>['create', '--pub', '--offline', projectDir.path]);
expect(loggingProcessManager.commands.first, contains(matches(r'dart-sdk[\\/]bin[\\/]dart'))); expect(loggingProcessManager.commands.first, contains(matches(r'dart-sdk[\\/]bin[\\/]pub')));
expect(loggingProcessManager.commands.first, contains('--offline')); expect(loggingProcessManager.commands.first, contains('--offline'));
}, },
overrides: <Type, Generator>{ overrides: <Type, Generator>{
...@@ -1754,7 +1754,7 @@ void main() { ...@@ -1754,7 +1754,7 @@ void main() {
final CommandRunner<void> runner = createTestCommandRunner(command); final CommandRunner<void> runner = createTestCommandRunner(command);
await runner.run(<String>['create', '--pub', projectDir.path]); await runner.run(<String>['create', '--pub', projectDir.path]);
expect(loggingProcessManager.commands.first, contains(matches(r'dart-sdk[\\/]bin[\\/]dart'))); expect(loggingProcessManager.commands.first, contains(matches(r'dart-sdk[\\/]bin[\\/]pub')));
expect(loggingProcessManager.commands.first, isNot(contains('--offline'))); expect(loggingProcessManager.commands.first, isNot(contains('--offline')));
}, },
overrides: <Type, Generator>{ overrides: <Type, Generator>{
......
packages/flutter_tools/test/commands.shard/permeable/packages_test.dart
View file @ b4e0472b
...@@ -451,7 +451,7 @@ void main() { ...@@ -451,7 +451,7 @@ void main() {
Cache.flutterRoot = ''; Cache.flutterRoot = '';
globals.fs.file('pubspec.yaml').createSync(); globals.fs.file('pubspec.yaml').createSync();
processManager.addCommand( processManager.addCommand(
const FakeCommand(command: <String>['/bin/cache/dart-sdk/bin/dart', '--no-analytics', 'pub', 'run', 'test']), const FakeCommand(command: <String>['/bin/cache/dart-sdk/bin/pub', 'run', 'test']),
); );
await createTestCommandRunner(PackagesCommand()).run(<String>['packages', 'test']); await createTestCommandRunner(PackagesCommand()).run(<String>['packages', 'test']);
...@@ -476,7 +476,7 @@ void main() { ...@@ -476,7 +476,7 @@ void main() {
Cache.flutterRoot = ''; Cache.flutterRoot = '';
globals.fs.file('pubspec.yaml').createSync(); globals.fs.file('pubspec.yaml').createSync();
processManager.addCommand( processManager.addCommand(
const FakeCommand(command: <String>['/bin/cache/dart-sdk/bin/dart', '--no-analytics', 'pub', '--trace', 'run', 'test']), const FakeCommand(command: <String>['/bin/cache/dart-sdk/bin/pub', '--trace', 'run', 'test']),
); );
await createTestCommandRunner(PackagesCommand()).run(<String>['packages', 'test']); await createTestCommandRunner(PackagesCommand()).run(<String>['packages', 'test']);
...@@ -503,7 +503,7 @@ void main() { ...@@ -503,7 +503,7 @@ void main() {
final IOSink stdin = IOSink(StreamController<List<int>>().sink); final IOSink stdin = IOSink(StreamController<List<int>>().sink);
processManager.addCommand( processManager.addCommand(
FakeCommand(command: const <String>[ FakeCommand(command: const <String>[
'/bin/cache/dart-sdk/bin/dart', '--no-analytics', 'pub', 'run', '--foo', 'bar'], '/bin/cache/dart-sdk/bin/pub', 'run', '--foo', 'bar'],
stdin: stdin, stdin: stdin,
), ),
); );
...@@ -529,7 +529,7 @@ void main() { ...@@ -529,7 +529,7 @@ void main() {
Cache.flutterRoot = ''; Cache.flutterRoot = '';
processManager.addCommand( processManager.addCommand(
FakeCommand(command: const <String>[ FakeCommand(command: const <String>[
'/bin/cache/dart-sdk/bin/dart', '--no-analytics', 'pub', 'upgrade', '-h'], '/bin/cache/dart-sdk/bin/pub', 'upgrade', '-h'],
stdin: IOSink(StreamController<List<int>>().sink), stdin: IOSink(StreamController<List<int>>().sink),
), ),
); );
......
packages/flutter_tools/test/general.shard/dart/pub_get_test.dart
View file @ b4e0472b
...@@ -26,7 +26,7 @@ void main() { ...@@ -26,7 +26,7 @@ void main() {
final FakeProcessManager processManager = FakeProcessManager.empty(); final FakeProcessManager processManager = FakeProcessManager.empty();
final BufferLogger logger = BufferLogger.test(); final BufferLogger logger = BufferLogger.test();
final MemoryFileSystem fileSystem = MemoryFileSystem.test(); final MemoryFileSystem fileSystem = MemoryFileSystem.test();
processManager.excludedExecutables.add('bin/cache/dart-sdk/bin/dart'); processManager.excludedExecutables.add('bin/cache/dart-sdk/bin/pub');
fileSystem.file('pubspec.yaml').createSync(); fileSystem.file('pubspec.yaml').createSync();
...@@ -51,9 +51,8 @@ void main() { ...@@ -51,9 +51,8 @@ void main() {
testWithoutContext('does not skip pub get the parameter is false', () async { testWithoutContext('does not skip pub get the parameter is false', () async {
final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[ final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
const FakeCommand(command: <String>[ const FakeCommand(command: <String>[
'bin/cache/dart-sdk/bin/dart', 'bin/cache/dart-sdk/bin/pub',
'--no-analytics', '--verbosity=warning',
'pub',
'get', 'get',
'--no-precompile', '--no-precompile',
]) ])
...@@ -100,9 +99,8 @@ void main() { ...@@ -100,9 +99,8 @@ void main() {
testWithoutContext('does not skip pub get if package_config.json has "generator": "pub"', () async { testWithoutContext('does not skip pub get if package_config.json has "generator": "pub"', () async {
final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[ final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
const FakeCommand(command: <String>[ const FakeCommand(command: <String>[
'bin/cache/dart-sdk/bin/dart', 'bin/cache/dart-sdk/bin/pub',
'--no-analytics', '--verbosity=warning',
'pub',
'get', 'get',
'--no-precompile', '--no-precompile',
]) ])
...@@ -149,9 +147,8 @@ void main() { ...@@ -149,9 +147,8 @@ void main() {
testWithoutContext('does not skip pub get if package_config.json has "generator": "pub"', () async { testWithoutContext('does not skip pub get if package_config.json has "generator": "pub"', () async {
final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[ final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
const FakeCommand(command: <String>[ const FakeCommand(command: <String>[
'bin/cache/dart-sdk/bin/dart', 'bin/cache/dart-sdk/bin/pub',
'--no-analytics', '--verbosity=warning',
'pub',
'get', 'get',
'--no-precompile', '--no-precompile',
]) ])
...@@ -265,9 +262,8 @@ void main() { ...@@ -265,9 +262,8 @@ void main() {
'but the current framework version is not the same as the last version', () async { 'but the current framework version is not the same as the last version', () async {
final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[ final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
const FakeCommand(command: <String>[ const FakeCommand(command: <String>[
'bin/cache/dart-sdk/bin/dart', 'bin/cache/dart-sdk/bin/pub',
'--no-analytics', '--verbosity=warning',
'pub',
'get', 'get',
'--no-precompile', '--no-precompile',
]) ])
...@@ -305,9 +301,8 @@ void main() { ...@@ -305,9 +301,8 @@ void main() {
'but the current framework version does not exist yet', () async { 'but the current framework version does not exist yet', () async {
final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[ final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
const FakeCommand(command: <String>[ const FakeCommand(command: <String>[
'bin/cache/dart-sdk/bin/dart', 'bin/cache/dart-sdk/bin/pub',
'--no-analytics', '--verbosity=warning',
'pub',
'get', 'get',
'--no-precompile', '--no-precompile',
]) ])
...@@ -344,9 +339,8 @@ void main() { ...@@ -344,9 +339,8 @@ void main() {
final MemoryFileSystem fileSystem = MemoryFileSystem.test(); final MemoryFileSystem fileSystem = MemoryFileSystem.test();
final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[ final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
FakeCommand(command: const <String>[ FakeCommand(command: const <String>[
'bin/cache/dart-sdk/bin/dart', 'bin/cache/dart-sdk/bin/pub',
'--no-analytics', '--verbosity=warning',
'pub',
'get', 'get',
'--no-precompile', '--no-precompile',
], onRun: () { ], onRun: () {
...@@ -383,9 +377,8 @@ void main() { ...@@ -383,9 +377,8 @@ void main() {
final MemoryFileSystem fileSystem = MemoryFileSystem.test(); final MemoryFileSystem fileSystem = MemoryFileSystem.test();
final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[ final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
const FakeCommand(command: <String>[ const FakeCommand(command: <String>[
'bin/cache/dart-sdk/bin/dart', 'bin/cache/dart-sdk/bin/pub',
'--no-analytics', '--verbosity=warning',
'pub',
'get', 'get',
'--no-precompile', '--no-precompile',
]), ]),
...@@ -420,9 +413,8 @@ void main() { ...@@ -420,9 +413,8 @@ void main() {
testWithoutContext('checkUpToDate does not skip pub get if the package config is older that the pubspec', () async { testWithoutContext('checkUpToDate does not skip pub get if the package config is older that the pubspec', () async {
final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[ final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
const FakeCommand(command: <String>[ const FakeCommand(command: <String>[
'bin/cache/dart-sdk/bin/dart', 'bin/cache/dart-sdk/bin/pub',
'--no-analytics', '--verbosity=warning',
'pub',
'get', 'get',
'--no-precompile', '--no-precompile',
]) ])
...@@ -460,9 +452,8 @@ void main() { ...@@ -460,9 +452,8 @@ void main() {
testWithoutContext('checkUpToDate does not skip pub get if the pubspec.lock is older that the pubspec', () async { testWithoutContext('checkUpToDate does not skip pub get if the pubspec.lock is older that the pubspec', () async {
final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[ final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
const FakeCommand(command: <String>[ const FakeCommand(command: <String>[
'bin/cache/dart-sdk/bin/dart', 'bin/cache/dart-sdk/bin/pub',
'--no-analytics', '--verbosity=warning',
'pub',
'get', 'get',
'--no-precompile', '--no-precompile',
]) ])
...@@ -504,9 +495,8 @@ void main() { ...@@ -504,9 +495,8 @@ void main() {
const FakeCommand pubGetCommand = FakeCommand( const FakeCommand pubGetCommand = FakeCommand(
command: <String>[ command: <String>[
'bin/cache/dart-sdk/bin/dart', 'bin/cache/dart-sdk/bin/pub',
'--no-analytics', '--verbosity=warning',
'pub',
'get', 'get',
'--no-precompile', '--no-precompile',
], ],
...@@ -601,9 +591,8 @@ void main() { ...@@ -601,9 +591,8 @@ void main() {
final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[ final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
const FakeCommand( const FakeCommand(
command: <String>[ command: <String>[
'bin/cache/dart-sdk/bin/dart', 'bin/cache/dart-sdk/bin/pub',
'--no-analytics', '--verbosity=warning',
'pub',
'get', 'get',
'--no-precompile', '--no-precompile',
], ],
...@@ -647,9 +636,8 @@ void main() { ...@@ -647,9 +636,8 @@ void main() {
final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[ final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
FakeCommand( FakeCommand(
command: const <String>[ command: const <String>[
'bin/cache/dart-sdk/bin/dart', 'bin/cache/dart-sdk/bin/pub',
'--no-analytics', '--verbosity=warning',
'pub',
'get', 'get',
'--no-precompile', '--no-precompile',
], ],
...@@ -689,9 +677,8 @@ void main() { ...@@ -689,9 +677,8 @@ void main() {
final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[ final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
const FakeCommand( const FakeCommand(
command: <String>[ command: <String>[
'bin/cache/dart-sdk/bin/dart', 'bin/cache/dart-sdk/bin/pub',
'--no-analytics', '--verbosity=warning',
'pub',
'get', 'get',
'--no-precompile', '--no-precompile',
], ],
...@@ -812,9 +799,8 @@ void main() { ...@@ -812,9 +799,8 @@ void main() {
final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[ final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
const FakeCommand( const FakeCommand(
command: <String>[ command: <String>[
'bin/cache/dart-sdk/bin/dart', 'bin/cache/dart-sdk/bin/pub',
'--no-analytics', '--verbosity=warning',
'pub',
'get', 'get',
'--no-precompile', '--no-precompile',
], ],
...@@ -854,9 +840,8 @@ void main() { ...@@ -854,9 +840,8 @@ void main() {
final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[ final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
const FakeCommand( const FakeCommand(
command: <String>[ command: <String>[
'bin/cache/dart-sdk/bin/dart', 'bin/cache/dart-sdk/bin/pub',
'--no-analytics', '--verbosity=warning',
'pub',
'get', 'get',
'--no-precompile', '--no-precompile',
], ],
...@@ -897,9 +882,8 @@ void main() { ...@@ -897,9 +882,8 @@ void main() {
final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[ final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
FakeCommand( FakeCommand(
command: const <String>[ command: const <String>[
'bin/cache/dart-sdk/bin/dart', 'bin/cache/dart-sdk/bin/pub',
'--no-analytics', '--verbosity=warning',
'pub',
'get', 'get',
'--no-precompile', '--no-precompile',
], ],
...@@ -910,18 +894,16 @@ void main() { ...@@ -910,18 +894,16 @@ void main() {
), ),
const FakeCommand( const FakeCommand(
command: <String>[ command: <String>[
'bin/cache/dart-sdk/bin/dart', 'bin/cache/dart-sdk/bin/pub',
'--no-analytics', '--verbosity=warning',
'pub',
'get', 'get',
'--no-precompile', '--no-precompile',
], ],
), ),
FakeCommand( FakeCommand(
command: const <String>[ command: const <String>[
'bin/cache/dart-sdk/bin/dart', 'bin/cache/dart-sdk/bin/pub',
'--no-analytics', '--verbosity=warning',
'pub',
'get', 'get',
'--no-precompile', '--no-precompile',
], ],
...@@ -932,9 +914,8 @@ void main() { ...@@ -932,9 +914,8 @@ void main() {
), ),
const FakeCommand( const FakeCommand(
command: <String>[ command: <String>[
'bin/cache/dart-sdk/bin/dart', 'bin/cache/dart-sdk/bin/pub',
'--no-analytics', '--verbosity=warning',
'pub',
'get', 'get',
'--no-precompile', '--no-precompile',
], ],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

HIAST - GitLab