From 8e13c7b667ca5e2173238047dd8d74e59bffa7fc Mon Sep 17 00:00:00 2001
From: Peter Leibiger <kuhnroyal@gmail.com>
Date: Mon, 11 Sep 2023 14:53:15 +0200
Subject: [PATCH] Improve melos configuration

* rename workspace project to avoid conflicts in IDEA (2x dio project)
* add examples to melos
* add .gitignore where missing
---
 .idea/modules.xml                             |  4 ++-
 example/.gitignore                            | 30 +++++++++++++++++++
 .../melos_dio_example.iml                     |  7 +----
 example_flutter_app/.gitignore                |  1 +
 example_flutter_app/pubspec.yaml              |  2 +-
 example_flutter_app/test/widget_test.dart     |  2 +-
 melos.yaml                                    |  3 +-
 melos_dio_workspace.iml                       | 27 +++++++++++++++++
 plugins/native_dio_adapter/.gitignore         | 13 +++++---
 9 files changed, 75 insertions(+), 14 deletions(-)
 create mode 100644 example/.gitignore
 rename melos_dio.iml => example/melos_dio_example.iml (64%)
 create mode 100644 melos_dio_workspace.iml

diff --git a/.idea/modules.xml b/.idea/modules.xml
index dc369a6e8..b86b60dda 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -4,9 +4,11 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/dio/melos_dio.iml" filepath="$PROJECT_DIR$/dio/melos_dio.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/cookie_manager/melos_dio_cookie_manager.iml" filepath="$PROJECT_DIR$/plugins/cookie_manager/melos_dio_cookie_manager.iml" />
+      <module fileurl="file://$PROJECT_DIR$/example/melos_dio_example.iml" filepath="$PROJECT_DIR$/example/melos_dio_example.iml" />
+      <module fileurl="file://$PROJECT_DIR$/example_flutter_app/melos_dio_flutter_example.iml" filepath="$PROJECT_DIR$/example_flutter_app/melos_dio_flutter_example.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/http2_adapter/melos_dio_http2_adapter.iml" filepath="$PROJECT_DIR$/plugins/http2_adapter/melos_dio_http2_adapter.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/native_dio_adapter/melos_native_dio_adapter.iml" filepath="$PROJECT_DIR$/plugins/native_dio_adapter/melos_native_dio_adapter.iml" />
-      <module fileurl="file://$PROJECT_DIR$/melos_dio.iml" filepath="$PROJECT_DIR$/melos_dio.iml" />
+      <module fileurl="file://$PROJECT_DIR$/melos_dio_workspace.iml" filepath="$PROJECT_DIR$/melos_dio_workspace.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/example/.gitignore b/example/.gitignore
new file mode 100644
index 000000000..0a1945d6d
--- /dev/null
+++ b/example/.gitignore
@@ -0,0 +1,30 @@
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+
+# IntelliJ related
+*.ipr
+*.iws
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
+
+# Flutter/Dart/Pub related
+**/doc/api/
+.dart_tool/
+.flutter-plugins
+.packages
+.pub-cache/
+.pub/
+build/
+pubspec_overrides.yaml
diff --git a/melos_dio.iml b/example/melos_dio_example.iml
similarity index 64%
rename from melos_dio.iml
rename to example/melos_dio_example.iml
index c01170bea..389d07a14 100644
--- a/melos_dio.iml
+++ b/example/melos_dio_example.iml
@@ -4,15 +4,10 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/.dart_tool" />
       <excludeFolder url="file://$MODULE_DIR$/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
-      <excludeFolder url="file://$MODULE_DIR$/dio/.dart_tool" />
-      <excludeFolder url="file://$MODULE_DIR$/dio/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/dio/build" />
-      <excludeFolder url="file://$MODULE_DIR$/example/.dart_tool" />
-      <excludeFolder url="file://$MODULE_DIR$/example/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/example/build" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Dart SDK" level="project" />
diff --git a/example_flutter_app/.gitignore b/example_flutter_app/.gitignore
index 0fa6b675c..6606cd9f6 100644
--- a/example_flutter_app/.gitignore
+++ b/example_flutter_app/.gitignore
@@ -30,6 +30,7 @@
 .pub-cache/
 .pub/
 /build/
+pubspec_overrides.yaml
 
 # Web related
 lib/generated_plugin_registrant.dart
diff --git a/example_flutter_app/pubspec.yaml b/example_flutter_app/pubspec.yaml
index 6ec61c5d0..7660ed17f 100644
--- a/example_flutter_app/pubspec.yaml
+++ b/example_flutter_app/pubspec.yaml
@@ -1,4 +1,4 @@
-name: flutter_app
+name: dio_flutter_example
 description: A new Flutter application for dio test
 
 # The following line prevents the package from being accidentally published to
diff --git a/example_flutter_app/test/widget_test.dart b/example_flutter_app/test/widget_test.dart
index 5e7d4e842..cac60cf17 100644
--- a/example_flutter_app/test/widget_test.dart
+++ b/example_flutter_app/test/widget_test.dart
@@ -8,7 +8,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import 'package:flutter_app/main.dart';
+import 'package:dio_flutter_example/main.dart';
 
 void main() {
   testWidgets('Counter increments smoke test', (WidgetTester tester) async {
diff --git a/melos.yaml b/melos.yaml
index 853a62664..f4b73cc36 100644
--- a/melos.yaml
+++ b/melos.yaml
@@ -1,9 +1,10 @@
-name: dio
+name: dio_workspace
 repository: https://github.com/cfug/dio
 
 packages:
   - dio
   - plugins/*
+  - example*
 
 ide:
   intellij: true
diff --git a/melos_dio_workspace.iml b/melos_dio_workspace.iml
new file mode 100644
index 000000000..a559d9797
--- /dev/null
+++ b/melos_dio_workspace.iml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/dio/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/dio/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/dio/build" />
+      <excludeFolder url="file://$MODULE_DIR$/example/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/example/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/example/build" />
+      <excludeFolder url="file://$MODULE_DIR$/example_flutter_app/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/example_flutter_app/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/example_flutter_app/build" />
+      <excludeFolder url="file://$MODULE_DIR$/plugins/cookie_manager/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/plugins/cookie_manager/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/plugins/cookie_manager/build" />
+      <excludeFolder url="file://$MODULE_DIR$/plugins/http2_adapter/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/plugins/http2_adapter/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/plugins/http2_adapter/build" />
+    </content>
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Dart SDK" level="project" />
+    <orderEntry type="library" name="Dart Packages" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/plugins/native_dio_adapter/.gitignore b/plugins/native_dio_adapter/.gitignore
index 8d1fae670..48f7ab40e 100644
--- a/plugins/native_dio_adapter/.gitignore
+++ b/plugins/native_dio_adapter/.gitignore
@@ -1,15 +1,20 @@
-# Files and directories created by pub.
+# Flutter/Dart/Pub related
+**/doc/api/
+**/ios/Flutter/.last_build_id
 .dart_tool/
+.flutter-plugins
+.flutter-plugins-dependencies
 .packages
+.pub-cache/
+.pub/
+/build/
+pubspec_overrides.yaml
 
 # IntelliJ related
 *.ipr
 *.iws
 .idea/
 
-# Conventional directory for build outputs.
-build/
-
 # Omit committing pubspec.lock for library packages; see
 # https://dart.dev/guides/libraries/private-files#pubspeclock.
 pubspec.lock