fix: generate correct path in modules.xml for package at workspace …

…root (#539)
invertase · Jul 2, 2023 · 712ae6c · 712ae6c
1 parent 979d0b1
commit 712ae6c
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 15 deletions.
diff --git a/packages/melos/lib/src/common/intellij_project.dart b/packages/melos/lib/src/common/intellij_project.dart
@@ -150,7 +150,7 @@ class IntellijProject {
 
   String ideaModuleStringForName(String moduleName, {String? relativePath}) {
     final imlPath = relativePath != null
-        ? '$relativePath/$moduleName.iml'
+        ? p.normalize('$relativePath/$moduleName.iml')
         : '$moduleName.iml';
     final module = '<module '
         'fileurl="file://\$PROJECT_DIR\$/$imlPath" '

diff --git a/packages/melos/test/commands/bootstrap_test.dart b/packages/melos/test/commands/bootstrap_test.dart
@@ -2,7 +2,6 @@ import 'dart:io' as io;
 
 import 'package:melos/melos.dart';
 import 'package:melos/src/commands/runner.dart';
-import 'package:melos/src/common/io.dart';
 import 'package:melos/src/common/utils.dart';
 import 'package:path/path.dart' as p;
 import 'package:pub_semver/pub_semver.dart';
@@ -13,12 +12,6 @@ import '../matchers.dart';
 import '../utils.dart';
 import '../workspace_config_test.dart';
 
-io.Directory createTestTempDir() {
-  final dir = createTempDir(io.Directory.systemTemp.path);
-  addTearDown(() => deleteEntry(dir));
-  return io.Directory(dir);
-}
-
 void main() {
   group('bootstrap', () {
     test(

diff --git a/packages/melos/test/common/intellij_project_test.dart b/packages/melos/test/common/intellij_project_test.dart
@@ -0,0 +1,32 @@
+import 'package:melos/src/common/intellij_project.dart';
+import 'package:melos/src/common/io.dart';
+import 'package:test/test.dart';
+
+import '../utils.dart';
+
+void main() {
+  // /~https://github.com/invertase/melos/issues/379
+  test(
+    'generates correct path for package at root in modules.xml ',
+    () async {
+      final tempDir = createTestTempDir();
+      final workspaceBuilder = VirtualWorkspaceBuilder(
+        path: tempDir.path,
+        '''
+        packages:
+          - .
+        ''',
+      )..addPackage(
+          '''
+          name: root
+          ''',
+          path: '.',
+        );
+      final workspace = workspaceBuilder.build();
+      final project = IntellijProject.fromWorkspace(workspace);
+      await project.generate();
+      final modulesXml = readTextFile(project.pathModulesXml);
+      expect(modulesXml, contains(r'file://$PROJECT_DIR$/melos_root.iml'));
+    },
+  );
+}
diff --git a/packages/melos/test/utils.dart b/packages/melos/test/utils.dart
@@ -71,6 +71,12 @@ class TestLogger extends StandardLogger {
   }
 }
 
+Directory createTestTempDir() {
+  final dir = createTempDir(Directory.systemTemp.path);
+  addTearDown(() => deleteEntry(dir));
+  return Directory(dir);
+}
+
 Future<void> runPubGet(String workspacePath) async {
   final result = await Process.run(
     'dart',
@@ -283,21 +289,19 @@ PubSpec pubSpecFromJsonFile({
 class VirtualWorkspaceBuilder {
   VirtualWorkspaceBuilder(
     this.melosYaml, {
-    this.path = '/workspace',
+    String? path,
     this.defaultPackagesPath = 'packages',
     this.sdkPath,
     Logger? logger,
-  }) : logger = (logger ?? TestLogger()).toMelosLogger() {
-    if (currentPlatform.isWindows) {
-      path = r'\\workspace';
-    }
-  }
+  })  : logger = (logger ?? TestLogger()).toMelosLogger(),
+        path =
+            path ?? (currentPlatform.isWindows ? r'\\workspace' : '/workspace');
 
   /// The contents of the melos.yaml file, to configure the workspace.
   final String melosYaml;
 
   /// The absolute path to the workspace.
-  late String path;
+  late final String path;
 
   /// The path relative to the workspace root, where packages are located,
   /// unless a path is provided in [addPackage].