Clean up vulcan:users package directory structure

packages/vulcan-users/lib/client.js

@@ -1,2 +0,0 @@
-export * from './modules.js';
-export {default} from './modules.js';

packages/vulcan-users/lib/client/main.js

@@ -0,0 +1,2 @@
+export * from '../modules/index.js';
+export {default} from '../modules/index.js';

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;

packages/vulcan-users/lib/server.js

@@ -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';

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 => {

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 })

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';

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) {

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");
 
 });