refactor: remove local fork of yamlicious (#345)

YAML is a superset of JSON and what we need to write as YAML it is never visible to users. We can just write JSON instead and get rid of this dependency.
invertase · Jul 5, 2022 · 64a15b8 · 64a15b8
1 parent 200450c
commit 64a15b8
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 115 deletions.
diff --git a/packages/melos/lib/src/commands/bootstrap.dart b/packages/melos/lib/src/commands/bootstrap.dart
@@ -398,7 +398,7 @@ Future<void> _generateTemporaryProjects(MelosWorkspace workspace) async {
 
     const header = '# Generated file - do not commit this file.';
     final generatedPubspecYamlString =
-        '$header\n${toYamlString(pubspec.toJson())}';
+        '$header\n${prettyEncodeJson(pubspec.toJson())}';
 
     await writeTextFileAsync(
       utils.pubspecPathForDirectory(packageTemporaryPath),

diff --git a/packages/melos/lib/src/commands/runner.dart b/packages/melos/lib/src/commands/runner.dart
@@ -37,7 +37,6 @@ import '../package.dart';
 import '../scripts.dart';
 import '../workspace.dart';
 import '../workspace_configs.dart';
-import '../yamlicious/yaml_writer.dart';
 
 part 'bootstrap.dart';
 part 'clean.dart';

diff --git a/packages/melos/lib/src/common/utils.dart b/packages/melos/lib/src/common/utils.dart
@@ -514,3 +514,7 @@ extension Utf8StreamUtils on Stream<List<int>> {
     }).join('\n');
   }
 }
+
+// Encodes a [value] as a JSON string with indentation.
+String prettyEncodeJson(Object? value) =>
+    const JsonEncoder.withIndent('  ').convert(value);
diff --git a/packages/melos/lib/src/workspace_configs.dart b/packages/melos/lib/src/workspace_configs.dart
@@ -672,7 +672,7 @@ You must have one of the following to be a valid Melos workspace:
       ide.hashCode ^
       commands.hashCode;
 
-  Map<Object?, Object> toJson() {
+  Map<String, Object> toJson() {
     return {
       'name': name,
       'path': path,

diff --git a/packages/melos/lib/src/yamlicious/README.md b/packages/melos/lib/src/yamlicious/README.md
diff --git a/packages/melos/lib/src/yamlicious/yaml_writer.dart b/packages/melos/lib/src/yamlicious/yaml_writer.dart
diff --git a/packages/melos/test/utils.dart b/packages/melos/test/utils.dart
@@ -6,7 +6,7 @@ import 'package:http/http.dart' as http;
 import 'package:melos/melos.dart';
 import 'package:melos/src/common/io.dart';
 import 'package:melos/src/common/platform.dart';
-import 'package:melos/src/yamlicious/yaml_writer.dart';
+import 'package:melos/src/common/utils.dart';
 import 'package:mockito/mockito.dart';
 import 'package:path/path.dart';
 import 'package:pub_semver/pub_semver.dart';
@@ -83,7 +83,7 @@ Directory createTemporaryWorkspaceDirectory({
       : dir;
   final config = (configBuilder(path)..validatePhysicalWorkspace()).toJson();
 
-  writeTextFile(join(path, 'melos.yaml'), toYamlString(config));
+  writeTextFile(join(path, 'melos.yaml'), prettyEncodeJson(config));
 
   return Directory(dir);
 }