Skip to content

Commit 0fb4406

Browse files
authored
Revert "[web] Move JS content to its own .js files (#117691)" (#120275)
This reverts commit e03029e.
1 parent ef854a3 commit 0fb4406

File tree

9 files changed

+568
-667
lines changed

9 files changed

+568
-667
lines changed

packages/flutter_tools/lib/src/artifacts.dart

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import 'base/common.dart';
99
import 'base/file_system.dart';
1010
import 'base/os.dart';
1111
import 'base/platform.dart';
12-
import 'base/user_messages.dart';
1312
import 'base/utils.dart';
1413
import 'build_info.dart';
1514
import 'cache.dart';
@@ -63,9 +62,6 @@ enum Artifact {
6362
/// Tools related to subsetting or icon font files.
6463
fontSubset,
6564
constFinder,
66-
67-
/// The location of file generators.
68-
flutterToolsFileGenerators,
6965
}
7066

7167
/// A subset of [Artifact]s that are platform and build mode independent
@@ -206,8 +202,6 @@ String? _artifactToFileName(Artifact artifact, Platform hostPlatform, [ BuildMod
206202
return 'font-subset$exe';
207203
case Artifact.constFinder:
208204
return 'const_finder.dart.snapshot';
209-
case Artifact.flutterToolsFileGenerators:
210-
return '';
211205
}
212206
}
213207

@@ -531,8 +525,6 @@ class CachedArtifacts implements Artifacts {
531525
case Artifact.windowsCppClientWrapper:
532526
case Artifact.windowsDesktopPath:
533527
return _getHostArtifactPath(artifact, platform, mode);
534-
case Artifact.flutterToolsFileGenerators:
535-
return _getFileGeneratorsPath();
536528
}
537529
}
538530

@@ -570,8 +562,6 @@ class CachedArtifacts implements Artifacts {
570562
case Artifact.windowsCppClientWrapper:
571563
case Artifact.windowsDesktopPath:
572564
return _getHostArtifactPath(artifact, platform, mode);
573-
case Artifact.flutterToolsFileGenerators:
574-
return _getFileGeneratorsPath();
575565
}
576566
}
577567

@@ -621,8 +611,6 @@ class CachedArtifacts implements Artifacts {
621611
case Artifact.windowsCppClientWrapper:
622612
case Artifact.windowsDesktopPath:
623613
return _getHostArtifactPath(artifact, platform, mode);
624-
case Artifact.flutterToolsFileGenerators:
625-
return _getFileGeneratorsPath();
626614
}
627615
}
628616

@@ -697,8 +685,6 @@ class CachedArtifacts implements Artifacts {
697685
case Artifact.fuchsiaFlutterRunner:
698686
case Artifact.fuchsiaKernelCompiler:
699687
throw StateError('Artifact $artifact not available for platform $platform.');
700-
case Artifact.flutterToolsFileGenerators:
701-
return _getFileGeneratorsPath();
702688
}
703689
}
704690

@@ -966,8 +952,6 @@ class CachedLocalEngineArtifacts implements Artifacts {
966952
case Artifact.dart2wasmSnapshot:
967953
case Artifact.frontendServerSnapshotForEngineDartSdk:
968954
return _fileSystem.path.join(_getDartSdkPath(), 'bin', 'snapshots', artifactFileName);
969-
case Artifact.flutterToolsFileGenerators:
970-
return _getFileGeneratorsPath();
971955
}
972956
}
973957

@@ -1115,7 +1099,6 @@ class CachedLocalWebSdkArtifacts implements Artifacts {
11151099
case Artifact.fuchsiaFlutterRunner:
11161100
case Artifact.fontSubset:
11171101
case Artifact.constFinder:
1118-
case Artifact.flutterToolsFileGenerators:
11191102
break;
11201103
}
11211104
}
@@ -1315,11 +1298,6 @@ class _TestArtifacts implements Artifacts {
13151298
BuildMode? mode,
13161299
EnvironmentType? environmentType,
13171300
}) {
1318-
// The path to file generators is the same even in the test environment.
1319-
if (artifact == Artifact.flutterToolsFileGenerators) {
1320-
return _getFileGeneratorsPath();
1321-
}
1322-
13231301
final StringBuffer buffer = StringBuffer();
13241302
buffer.write(artifact);
13251303
if (platform != null) {
@@ -1362,20 +1340,3 @@ class _TestLocalEngine extends _TestArtifacts {
13621340
@override
13631341
final LocalEngineInfo localEngineInfo;
13641342
}
1365-
1366-
String _getFileGeneratorsPath() {
1367-
final String flutterRoot = Cache.defaultFlutterRoot(
1368-
fileSystem: globals.localFileSystem,
1369-
platform: const LocalPlatform(),
1370-
userMessages: UserMessages(),
1371-
);
1372-
return globals.localFileSystem.path.join(
1373-
flutterRoot,
1374-
'packages',
1375-
'flutter_tools',
1376-
'lib',
1377-
'src',
1378-
'web',
1379-
'file_generators',
1380-
);
1381-
}

packages/flutter_tools/lib/src/build_system/targets/web.dart

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -529,10 +529,7 @@ class WebBuiltInAssets extends Target {
529529

530530
// Write the flutter.js file
531531
final File flutterJsFile = environment.outputDir.childFile('flutter.js');
532-
final String fileGeneratorsPath =
533-
globals.artifacts!.getArtifactPath(Artifact.flutterToolsFileGenerators);
534-
flutterJsFile.writeAsStringSync(
535-
flutter_js.generateFlutterJsFile(fileGeneratorsPath));
532+
flutterJsFile.writeAsStringSync(flutter_js.generateFlutterJsFile());
536533
}
537534
}
538535

@@ -601,10 +598,7 @@ class WebServiceWorker extends Target {
601598
final ServiceWorkerStrategy serviceWorkerStrategy = _serviceWorkerStrategyFromString(
602599
environment.defines[kServiceWorkerStrategy],
603600
);
604-
final String fileGeneratorsPath =
605-
globals.artifacts!.getArtifactPath(Artifact.flutterToolsFileGenerators);
606601
final String serviceWorker = generateServiceWorker(
607-
fileGeneratorsPath,
608602
urlToHash,
609603
<String>[
610604
'main.dart.js',

packages/flutter_tools/lib/src/isolated/devfs_web.dart

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -828,10 +828,7 @@ class WebDevFS implements DevFS {
828828
'stack_trace_mapper.js', stackTraceMapper.readAsBytesSync());
829829
webAssetServer.writeFile(
830830
'manifest.json', '{"info":"manifest not generated in run mode."}');
831-
final String fileGeneratorsPath = globals.artifacts!
832-
.getArtifactPath(Artifact.flutterToolsFileGenerators);
833-
webAssetServer.writeFile(
834-
'flutter.js', flutter_js.generateFlutterJsFile(fileGeneratorsPath));
831+
webAssetServer.writeFile('flutter.js', flutter_js.generateFlutterJsFile());
835832
webAssetServer.writeFile('flutter_service_worker.js',
836833
'// Service worker not loaded in run mode.');
837834
webAssetServer.writeFile(

0 commit comments

Comments
 (0)