Unverified Commit 37352318 authored by Nicholas Shahan's avatar Nicholas Shahan Committed by GitHub

Cleanup old Dart SDK layout compatibility (#118819)

The changes to the Dart SDK have rolled so the backward compatibility
is no longer needed.
parent c35efdaa
...@@ -926,31 +926,13 @@ class WebDevFS implements DevFS { ...@@ -926,31 +926,13 @@ class WebDevFS implements DevFS {
} }
@visibleForTesting @visibleForTesting
final File requireJS = (() { final File requireJS = globals.fs.file(globals.fs.path.join(
// TODO(nshahan): Remove the initilizing function once the file location globals.artifacts!.getArtifactPath(Artifact.engineDartSdkPath, platform: TargetPlatform.web_javascript),
// change in the Dart SDK has landed and rolled to the engine 'lib',
// and flutter repos. There is no long-term need for the 'dev_compiler',
// fallback logic. 'amd',
// See https://github.com/flutter/flutter/issues/118119 'require.js',
final File oldFile = globals.fs.file(globals.fs.path.join( ));
globals.artifacts!.getArtifactPath(Artifact.engineDartSdkPath, platform: TargetPlatform.web_javascript),
'lib',
'dev_compiler',
'kernel',
'amd',
'require.js',
));
return oldFile.existsSync()
? oldFile
: globals.fs.file(globals.fs.path.join(
globals.artifacts!.getArtifactPath(Artifact.engineDartSdkPath, platform: TargetPlatform.web_javascript),
'lib',
'dev_compiler',
'amd',
'require.js',
));
})();
@visibleForTesting @visibleForTesting
final File stackTraceMapper = globals.fs.file(globals.fs.path.join( final File stackTraceMapper = globals.fs.file(globals.fs.path.join(
......
...@@ -187,31 +187,13 @@ class FlutterWebPlatform extends PlatformPlugin { ...@@ -187,31 +187,13 @@ class FlutterWebPlatform extends PlatformPlugin {
)); ));
/// The require js binary. /// The require js binary.
File get _requireJs { File get _requireJs => _fileSystem.file(_fileSystem.path.join(
// TODO(nshahan): Remove the initializing function once the file location _artifacts!.getArtifactPath(Artifact.engineDartSdkPath, platform: TargetPlatform.web_javascript),
// change in the Dart SDK has landed and rolled to the engine 'lib',
// and flutter repos. There is no long-term need for the 'dev_compiler',
// fallback logic. 'amd',
// See https://github.com/flutter/flutter/issues/118119 'require.js',
final File oldFile = _fileSystem.file(_fileSystem.path.join( ));
_artifacts!.getArtifactPath(Artifact.engineDartSdkPath, platform: TargetPlatform.web_javascript),
'lib',
'dev_compiler',
'kernel',
'amd',
'require.js',
));
return oldFile.existsSync()
? oldFile
: _fileSystem.file(_fileSystem.path.join(
_artifacts!.getArtifactPath(Artifact.engineDartSdkPath, platform: TargetPlatform.web_javascript),
'lib',
'dev_compiler',
'amd',
'require.js',
));
}
/// The ddc to dart stack trace mapper. /// The ddc to dart stack trace mapper.
File get _stackTraceMapper => _fileSystem.file(_fileSystem.path.join( File get _stackTraceMapper => _fileSystem.file(_fileSystem.path.join(
......
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