Skip to content

Commit

Permalink
Fix path for require.js (#118120)
Browse files Browse the repository at this point in the history
- Matches new location in the Dart SDK.
   https://dart-review.googlesource.com/c/sdk/+/275482
- Includes fall back logic so the existing and new locations will work
  depending on the file that is available.
  • Loading branch information
nshahan authored Jan 9, 2023
1 parent 02a8bbf commit e9bbb11
Showing 1 changed file with 25 additions and 8 deletions.
33 changes: 25 additions & 8 deletions packages/flutter_tools/lib/src/isolated/devfs_web.dart
Original file line number Diff line number Diff line change
Expand Up @@ -926,14 +926,31 @@ class WebDevFS implements DevFS {
}

@visibleForTesting
final File requireJS = globals.fs.file(globals.fs.path.join(
globals.artifacts!.getArtifactPath(Artifact.engineDartSdkPath, platform: TargetPlatform.web_javascript),
'lib',
'dev_compiler',
'kernel',
'amd',
'require.js',
));
final File requireJS = (() {
// TODO(nshahan): Remove the initilizing 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 = 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
final File stackTraceMapper = globals.fs.file(globals.fs.path.join(
Expand Down

0 comments on commit e9bbb11

Please sign in to comment.