From 5b91dc834ca1446bf528bd0156fdf7590afd01ba Mon Sep 17 00:00:00 2001
From: SachaG <358832+SachaG@users.noreply.github.com>
Date: Sat, 17 Feb 2018 11:17:07 +0900
Subject: [PATCH] Clean up vulcan:users package directory structure

---
 packages/vulcan-users/lib/client.js                        | 2 --
 packages/vulcan-users/lib/client/main.js                   | 2 ++
 packages/vulcan-users/lib/{ => modules}/avatar.js          | 0
 packages/vulcan-users/lib/{ => modules}/callbacks.js       | 0
 packages/vulcan-users/lib/{ => modules}/collection.js      | 0
 packages/vulcan-users/lib/{ => modules}/fragments.js       | 0
 packages/vulcan-users/lib/{ => modules}/helpers.js         | 0
 packages/vulcan-users/lib/{modules.js => modules/index.js} | 6 +++---
 packages/vulcan-users/lib/{ => modules}/mutations.js       | 0
 packages/vulcan-users/lib/{ => modules}/permissions.js     | 0
 packages/vulcan-users/lib/{ => modules}/resolvers.js       | 0
 packages/vulcan-users/lib/{ => modules}/schema.js          | 0
 packages/vulcan-users/lib/{ => modules}/views.js           | 0
 packages/vulcan-users/lib/server.js                        | 7 -------
 packages/vulcan-users/lib/server/create_user.js            | 2 +-
 packages/vulcan-users/lib/server/graphql_context.js        | 2 +-
 packages/vulcan-users/lib/server/main.js                   | 7 +++++++
 packages/vulcan-users/lib/server/on_create_user.js         | 2 +-
 packages/vulcan-users/package.js                           | 4 ++--
 19 files changed, 17 insertions(+), 17 deletions(-)
 delete mode 100644 packages/vulcan-users/lib/client.js
 create mode 100644 packages/vulcan-users/lib/client/main.js
 rename packages/vulcan-users/lib/{ => modules}/avatar.js (100%)
 rename packages/vulcan-users/lib/{ => modules}/callbacks.js (100%)
 rename packages/vulcan-users/lib/{ => modules}/collection.js (100%)
 rename packages/vulcan-users/lib/{ => modules}/fragments.js (100%)
 rename packages/vulcan-users/lib/{ => modules}/helpers.js (100%)
 rename packages/vulcan-users/lib/{modules.js => modules/index.js} (100%)
 rename packages/vulcan-users/lib/{ => modules}/mutations.js (100%)
 rename packages/vulcan-users/lib/{ => modules}/permissions.js (100%)
 rename packages/vulcan-users/lib/{ => modules}/resolvers.js (100%)
 rename packages/vulcan-users/lib/{ => modules}/schema.js (100%)
 rename packages/vulcan-users/lib/{ => modules}/views.js (100%)
 delete mode 100644 packages/vulcan-users/lib/server.js
 create mode 100644 packages/vulcan-users/lib/server/main.js

diff --git a/packages/vulcan-users/lib/client.js b/packages/vulcan-users/lib/client.js
deleted file mode 100644
index 59ec3b566..000000000
--- a/packages/vulcan-users/lib/client.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './modules.js';
-export {default} from './modules.js';
diff --git a/packages/vulcan-users/lib/client/main.js b/packages/vulcan-users/lib/client/main.js
new file mode 100644
index 000000000..50874c32c
--- /dev/null
+++ b/packages/vulcan-users/lib/client/main.js
@@ -0,0 +1,2 @@
+export * from '../modules/index.js';
+export {default} from '../modules/index.js';
diff --git a/packages/vulcan-users/lib/avatar.js b/packages/vulcan-users/lib/modules/avatar.js
similarity index 100%
rename from packages/vulcan-users/lib/avatar.js
rename to packages/vulcan-users/lib/modules/avatar.js
diff --git a/packages/vulcan-users/lib/callbacks.js b/packages/vulcan-users/lib/modules/callbacks.js
similarity index 100%
rename from packages/vulcan-users/lib/callbacks.js
rename to packages/vulcan-users/lib/modules/callbacks.js
diff --git a/packages/vulcan-users/lib/collection.js b/packages/vulcan-users/lib/modules/collection.js
similarity index 100%
rename from packages/vulcan-users/lib/collection.js
rename to packages/vulcan-users/lib/modules/collection.js
diff --git a/packages/vulcan-users/lib/fragments.js b/packages/vulcan-users/lib/modules/fragments.js
similarity index 100%
rename from packages/vulcan-users/lib/fragments.js
rename to packages/vulcan-users/lib/modules/fragments.js
diff --git a/packages/vulcan-users/lib/helpers.js b/packages/vulcan-users/lib/modules/helpers.js
similarity index 100%
rename from packages/vulcan-users/lib/helpers.js
rename to packages/vulcan-users/lib/modules/helpers.js
diff --git a/packages/vulcan-users/lib/modules.js b/packages/vulcan-users/lib/modules/index.js
similarity index 100%
rename from packages/vulcan-users/lib/modules.js
rename to packages/vulcan-users/lib/modules/index.js
index 4faaa2497..821399682 100644
--- a/packages/vulcan-users/lib/modules.js
+++ b/packages/vulcan-users/lib/modules/index.js
@@ -1,10 +1,10 @@
 import Users from './collection.js';
 
-import './callbacks.js';
-import './helpers.js';
 import './avatar.js';
-import './permissions.js';
+import './callbacks.js';
 import './fragments.js';
+import './helpers.js';
+import './permissions.js';
 import './views.js';
 
 export default Users;
diff --git a/packages/vulcan-users/lib/mutations.js b/packages/vulcan-users/lib/modules/mutations.js
similarity index 100%
rename from packages/vulcan-users/lib/mutations.js
rename to packages/vulcan-users/lib/modules/mutations.js
diff --git a/packages/vulcan-users/lib/permissions.js b/packages/vulcan-users/lib/modules/permissions.js
similarity index 100%
rename from packages/vulcan-users/lib/permissions.js
rename to packages/vulcan-users/lib/modules/permissions.js
diff --git a/packages/vulcan-users/lib/resolvers.js b/packages/vulcan-users/lib/modules/resolvers.js
similarity index 100%
rename from packages/vulcan-users/lib/resolvers.js
rename to packages/vulcan-users/lib/modules/resolvers.js
diff --git a/packages/vulcan-users/lib/schema.js b/packages/vulcan-users/lib/modules/schema.js
similarity index 100%
rename from packages/vulcan-users/lib/schema.js
rename to packages/vulcan-users/lib/modules/schema.js
diff --git a/packages/vulcan-users/lib/views.js b/packages/vulcan-users/lib/modules/views.js
similarity index 100%
rename from packages/vulcan-users/lib/views.js
rename to packages/vulcan-users/lib/modules/views.js
diff --git a/packages/vulcan-users/lib/server.js b/packages/vulcan-users/lib/server.js
deleted file mode 100644
index 289e3f7e1..000000000
--- a/packages/vulcan-users/lib/server.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import './server/on_create_user.js';
-import './server/urls.js';
-import './server/graphql_context.js';
-
-export {default as createUser} from './server/create_user.js';
-export * from './modules.js';
-export {default} from './modules.js';
diff --git a/packages/vulcan-users/lib/server/create_user.js b/packages/vulcan-users/lib/server/create_user.js
index e6dde9966..1a3bdddea 100644
--- a/packages/vulcan-users/lib/server/create_user.js
+++ b/packages/vulcan-users/lib/server/create_user.js
@@ -1,4 +1,4 @@
-import Users from '../collection.js';
+import Users from '../modules/index.js';
 import { newMutation } from 'meteor/vulcan:lib'; // import from vulcan:lib because vulcan:core isn't loaded yet
 
 const createUser = user => {
diff --git a/packages/vulcan-users/lib/server/graphql_context.js b/packages/vulcan-users/lib/server/graphql_context.js
index 1c3a249b6..7a902ca9d 100644
--- a/packages/vulcan-users/lib/server/graphql_context.js
+++ b/packages/vulcan-users/lib/server/graphql_context.js
@@ -1,4 +1,4 @@
 import { addToGraphQLContext } from 'meteor/vulcan:lib';
-import Users from '../modules.js';
+import Users from '../modules/index.js';
 
 addToGraphQLContext({ getViewableFields: Users.getViewableFields })
diff --git a/packages/vulcan-users/lib/server/main.js b/packages/vulcan-users/lib/server/main.js
new file mode 100644
index 000000000..9e6b750f3
--- /dev/null
+++ b/packages/vulcan-users/lib/server/main.js
@@ -0,0 +1,7 @@
+import './on_create_user.js';
+import './urls.js';
+import './graphql_context.js';
+
+export {default as createUser} from './create_user.js';
+export * from '../modules/index.js';
+export {default} from '../modules/index.js';
diff --git a/packages/vulcan-users/lib/server/on_create_user.js b/packages/vulcan-users/lib/server/on_create_user.js
index 929ccd957..36d05b5ad 100644
--- a/packages/vulcan-users/lib/server/on_create_user.js
+++ b/packages/vulcan-users/lib/server/on_create_user.js
@@ -1,4 +1,4 @@
-import Users from '../collection.js';
+import Users from '../modules/index.js';
 import { runCallbacks, runCallbacksAsync, Utils } from 'meteor/vulcan:lib'; // import from vulcan:lib because vulcan:core isn't loaded yet
 
 function onCreateUserCallback (options, user) {
diff --git a/packages/vulcan-users/package.js b/packages/vulcan-users/package.js
index a1dcd7bcb..198bb997a 100644
--- a/packages/vulcan-users/package.js
+++ b/packages/vulcan-users/package.js
@@ -13,7 +13,7 @@ Package.onUse(function (api) {
     'vulcan:lib@1.8.9'
   ]);
 
-  api.mainModule("lib/server.js", "server");
-  api.mainModule("lib/client.js", "client");
+  api.mainModule("lib/server/main.js", "server");
+  api.mainModule("lib/client/main.js", "client");
 
 });