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

Fix path for require.js (#118722)

Matches new location in the Dart SDK.
https://dart-review.googlesource.com/c/sdk/+/275482

Includes fall back logic so the old file location will continue to be used
until the new location change lands. Then we can remove the logic and only
use the new location in a future change.

Issue: #118119
parent ae1cc18c
......@@ -187,14 +187,31 @@ class FlutterWebPlatform extends PlatformPlugin {
));
/// The require js binary.
File get _requireJs => _fileSystem.file(_fileSystem.path.join(
_artifacts!.getArtifactPath(Artifact.engineDartSdkPath, platform: TargetPlatform.web_javascript),
'lib',
'dev_compiler',
'kernel',
'amd',
'require.js',
));
File get _requireJs {
// TODO(nshahan): Remove the initializing function once the file location
// change in the Dart SDK has landed and rolled to the engine
// and flutter repos. There is no long-term need for the
// fallback logic.
// See https://github.com/flutter/flutter/issues/118119
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.
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