From 33b3b5bf2470e2e1039ccbcaa95c7aca58c30022 Mon Sep 17 00:00:00 2001
From: Comus Leong <comus.leong@gmail.com>
Date: Mon, 6 Feb 2017 22:24:05 +0800
Subject: [PATCH] change nova-core folder structure

---
 packages/nova-core/lib/client.js              |  4 ---
 packages/nova-core/lib/client/main.js         |  5 +++
 .../nova-core/lib/client/render_context.js    |  2 +-
 .../nova-core/lib/{ => modules}/callbacks.js  |  0
 .../lib/{ => modules}/components/App.jsx      |  0
 .../lib/{ => modules}/components/Icon.jsx     |  0
 .../lib/{ => modules}/components/Loading.jsx  |  0
 .../{ => modules}/components/ModalTrigger.jsx |  0
 .../lib/{ => modules}/components/ShowIf.jsx   |  0
 .../containers/withCurrentUser.js             |  0
 .../{ => modules}/containers/withDocument.js  |  0
 .../lib/{ => modules}/containers/withEdit.js  |  0
 .../lib/{ => modules}/containers/withList.js  |  0
 .../{ => modules}/containers/withMessages.js  |  0
 .../{ => modules}/containers/withMutation.js  |  0
 .../lib/{ => modules}/containers/withNew.js   |  0
 .../{ => modules}/containers/withRemove.js    |  0
 .../lib/{modules.js => modules/index.js}      | 36 +++++++++++++++++--
 packages/nova-core/lib/server.js              |  8 -----
 .../nova-core/lib/server/apollo_server.js     |  2 +-
 packages/nova-core/lib/server/main.js         |  7 ++++
 .../nova-core/lib/server/render_context.js    |  2 +-
 packages/nova-core/package.js                 |  4 +--
 packages/nova-core/scss.json                  |  6 ----
 24 files changed, 50 insertions(+), 26 deletions(-)
 delete mode 100644 packages/nova-core/lib/client.js
 create mode 100644 packages/nova-core/lib/client/main.js
 rename packages/nova-core/lib/{ => modules}/callbacks.js (100%)
 rename packages/nova-core/lib/{ => modules}/components/App.jsx (100%)
 rename packages/nova-core/lib/{ => modules}/components/Icon.jsx (100%)
 rename packages/nova-core/lib/{ => modules}/components/Loading.jsx (100%)
 rename packages/nova-core/lib/{ => modules}/components/ModalTrigger.jsx (100%)
 rename packages/nova-core/lib/{ => modules}/components/ShowIf.jsx (100%)
 rename packages/nova-core/lib/{ => modules}/containers/withCurrentUser.js (100%)
 rename packages/nova-core/lib/{ => modules}/containers/withDocument.js (100%)
 rename packages/nova-core/lib/{ => modules}/containers/withEdit.js (100%)
 rename packages/nova-core/lib/{ => modules}/containers/withList.js (100%)
 rename packages/nova-core/lib/{ => modules}/containers/withMessages.js (100%)
 rename packages/nova-core/lib/{ => modules}/containers/withMutation.js (100%)
 rename packages/nova-core/lib/{ => modules}/containers/withNew.js (100%)
 rename packages/nova-core/lib/{ => modules}/containers/withRemove.js (100%)
 rename packages/nova-core/lib/{modules.js => modules/index.js} (52%)
 delete mode 100644 packages/nova-core/lib/server.js
 create mode 100644 packages/nova-core/lib/server/main.js
 delete mode 100644 packages/nova-core/scss.json

diff --git a/packages/nova-core/lib/client.js b/packages/nova-core/lib/client.js
deleted file mode 100644
index 81e020170..000000000
--- a/packages/nova-core/lib/client.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import './client/auth.js';
-
-export * from './modules.js';
-export * from './client/render_context.js';
diff --git a/packages/nova-core/lib/client/main.js b/packages/nova-core/lib/client/main.js
new file mode 100644
index 000000000..ed1e43b5d
--- /dev/null
+++ b/packages/nova-core/lib/client/main.js
@@ -0,0 +1,5 @@
+import './auth.js';
+import './mongo_redux.js';
+
+export * from '../modules/index.js';
+export * from './render_context.js';
diff --git a/packages/nova-core/lib/client/render_context.js b/packages/nova-core/lib/client/render_context.js
index 119f8f8be..6459dd83c 100644
--- a/packages/nova-core/lib/client/render_context.js
+++ b/packages/nova-core/lib/client/render_context.js
@@ -1,6 +1,6 @@
 import { createStore, applyMiddleware, compose, combineReducers } from 'redux';
 
-import { createApolloClient, addReducer, addMiddleware, getReducers, getMiddlewares } from '../modules.js';
+import { createApolloClient, addReducer, addMiddleware, getReducers, getMiddlewares } from '../modules/index.js';
 
 const loginToken = global.localStorage['Meteor.loginToken'];
 const apolloClient = createApolloClient();
diff --git a/packages/nova-core/lib/callbacks.js b/packages/nova-core/lib/modules/callbacks.js
similarity index 100%
rename from packages/nova-core/lib/callbacks.js
rename to packages/nova-core/lib/modules/callbacks.js
diff --git a/packages/nova-core/lib/components/App.jsx b/packages/nova-core/lib/modules/components/App.jsx
similarity index 100%
rename from packages/nova-core/lib/components/App.jsx
rename to packages/nova-core/lib/modules/components/App.jsx
diff --git a/packages/nova-core/lib/components/Icon.jsx b/packages/nova-core/lib/modules/components/Icon.jsx
similarity index 100%
rename from packages/nova-core/lib/components/Icon.jsx
rename to packages/nova-core/lib/modules/components/Icon.jsx
diff --git a/packages/nova-core/lib/components/Loading.jsx b/packages/nova-core/lib/modules/components/Loading.jsx
similarity index 100%
rename from packages/nova-core/lib/components/Loading.jsx
rename to packages/nova-core/lib/modules/components/Loading.jsx
diff --git a/packages/nova-core/lib/components/ModalTrigger.jsx b/packages/nova-core/lib/modules/components/ModalTrigger.jsx
similarity index 100%
rename from packages/nova-core/lib/components/ModalTrigger.jsx
rename to packages/nova-core/lib/modules/components/ModalTrigger.jsx
diff --git a/packages/nova-core/lib/components/ShowIf.jsx b/packages/nova-core/lib/modules/components/ShowIf.jsx
similarity index 100%
rename from packages/nova-core/lib/components/ShowIf.jsx
rename to packages/nova-core/lib/modules/components/ShowIf.jsx
diff --git a/packages/nova-core/lib/containers/withCurrentUser.js b/packages/nova-core/lib/modules/containers/withCurrentUser.js
similarity index 100%
rename from packages/nova-core/lib/containers/withCurrentUser.js
rename to packages/nova-core/lib/modules/containers/withCurrentUser.js
diff --git a/packages/nova-core/lib/containers/withDocument.js b/packages/nova-core/lib/modules/containers/withDocument.js
similarity index 100%
rename from packages/nova-core/lib/containers/withDocument.js
rename to packages/nova-core/lib/modules/containers/withDocument.js
diff --git a/packages/nova-core/lib/containers/withEdit.js b/packages/nova-core/lib/modules/containers/withEdit.js
similarity index 100%
rename from packages/nova-core/lib/containers/withEdit.js
rename to packages/nova-core/lib/modules/containers/withEdit.js
diff --git a/packages/nova-core/lib/containers/withList.js b/packages/nova-core/lib/modules/containers/withList.js
similarity index 100%
rename from packages/nova-core/lib/containers/withList.js
rename to packages/nova-core/lib/modules/containers/withList.js
diff --git a/packages/nova-core/lib/containers/withMessages.js b/packages/nova-core/lib/modules/containers/withMessages.js
similarity index 100%
rename from packages/nova-core/lib/containers/withMessages.js
rename to packages/nova-core/lib/modules/containers/withMessages.js
diff --git a/packages/nova-core/lib/containers/withMutation.js b/packages/nova-core/lib/modules/containers/withMutation.js
similarity index 100%
rename from packages/nova-core/lib/containers/withMutation.js
rename to packages/nova-core/lib/modules/containers/withMutation.js
diff --git a/packages/nova-core/lib/containers/withNew.js b/packages/nova-core/lib/modules/containers/withNew.js
similarity index 100%
rename from packages/nova-core/lib/containers/withNew.js
rename to packages/nova-core/lib/modules/containers/withNew.js
diff --git a/packages/nova-core/lib/containers/withRemove.js b/packages/nova-core/lib/modules/containers/withRemove.js
similarity index 100%
rename from packages/nova-core/lib/containers/withRemove.js
rename to packages/nova-core/lib/modules/containers/withRemove.js
diff --git a/packages/nova-core/lib/modules.js b/packages/nova-core/lib/modules/index.js
similarity index 52%
rename from packages/nova-core/lib/modules.js
rename to packages/nova-core/lib/modules/index.js
index 1c4f04989..0dad2b233 100644
--- a/packages/nova-core/lib/modules.js
+++ b/packages/nova-core/lib/modules/index.js
@@ -1,13 +1,43 @@
-// import and re-export
-export { Components, registerComponent, replaceComponent, getRawComponent, getComponent, copyHoCs, populateComponentsApp, createCollection, Callbacks, addCallback, removeCallback, runCallbacks, runCallbacksAsync, GraphQLSchema, Routes, addRoute, getRoute, populateRoutesApp, Utils, getSetting, Strings, addStrings, configureStore, getActions, addAction, getReducers, addReducer, getMiddlewares, addMiddleware, Headtags, Fragments, registerFragment, getFragment, getFragmentName, extendFragment, createApolloClient } from 'meteor/nova:lib';
-
 import './callbacks.js';
 
+// import and re-export
+export {
+  // apollo
+  createApolloClient,
+  // callbacks
+  Callbacks, addCallback, removeCallback, runCallbacks, runCallbacksAsync,
+  // components
+  Components, registerComponent, replaceComponent, getRawComponent, getComponent, copyHoCs, populateComponentsApp,
+  // collections
+  createCollection,
+  // fragments
+  Fragments, registerFragment, getFragment, getFragmentName, extendFragment,
+  // graphql
+  GraphQLSchema,
+  // headtags
+  Headtags,
+  // redux
+  getActions, addAction, getReducers, addReducer, getMiddlewares, addMiddleware,
+  // routes
+  Routes, addRoute, getRoute, populateRoutesApp,
+  // settings
+  getSetting,
+  // strings
+  Strings, addStrings,
+  // utils
+  Utils,
+  // store (for server only)
+  configureStore,
+  // mutations (for server only)
+  newMutation, editMutation, removeMutation,
+} from 'meteor/nova:lib';
+
 export { default as App } from "./components/App.jsx";
 export { default as Icon } from "./components/Icon.jsx";
 export { default as Loading } from "./components/Loading.jsx";
 export { default as ShowIf } from "./components/ShowIf.jsx";
 export { default as ModalTrigger } from './components/ModalTrigger.jsx';
+
 export { default as withMessages } from "./containers/withMessages.js";
 export { default as withList } from './containers/withList.js';
 export { default as withDocument } from './containers/withDocument.js';
diff --git a/packages/nova-core/lib/server.js b/packages/nova-core/lib/server.js
deleted file mode 100644
index 9497c4958..000000000
--- a/packages/nova-core/lib/server.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import './server/oauth.js';
-import './server/start.js';
-import './server/apollo_server.js';
-import './server/meteor_subscribe.js'
-
-export * from './modules.js';
-export { newMutation, editMutation, removeMutation } from 'meteor/nova:lib';
-export * from './server/render_context.js';
diff --git a/packages/nova-core/lib/server/apollo_server.js b/packages/nova-core/lib/server/apollo_server.js
index 98f1de892..c5cbe3988 100644
--- a/packages/nova-core/lib/server/apollo_server.js
+++ b/packages/nova-core/lib/server/apollo_server.js
@@ -14,7 +14,7 @@ import { _ } from 'meteor/underscore';
 
 import Users from 'meteor/nova:users';
 
-import { GraphQLSchema } from '../modules.js';
+import { GraphQLSchema } from '../modules/index.js';
 
 const generateTypeDefs = () => [`
 
diff --git a/packages/nova-core/lib/server/main.js b/packages/nova-core/lib/server/main.js
new file mode 100644
index 000000000..907ee0d92
--- /dev/null
+++ b/packages/nova-core/lib/server/main.js
@@ -0,0 +1,7 @@
+import './oauth.js';
+import './start.js';
+import './apollo_server.js';
+import './meteor_subscribe.js'
+
+export * from '../modules/index.js';
+export * from './render_context.js';
diff --git a/packages/nova-core/lib/server/render_context.js b/packages/nova-core/lib/server/render_context.js
index c4ede25ca..a304d9542 100644
--- a/packages/nova-core/lib/server/render_context.js
+++ b/packages/nova-core/lib/server/render_context.js
@@ -3,7 +3,7 @@ import { WebApp } from 'meteor/webapp';
 import { DDP } from 'meteor/ddp';
 import { Accounts } from 'meteor/accounts-base';
 
-import { createApolloClient, getReducers, getMiddlewares, configureStore } from '../modules.js';
+import { createApolloClient, getReducers, getMiddlewares, configureStore } from '../modules/index.js';
 
 const Fibers = Npm.require('fibers');
 
diff --git a/packages/nova-core/package.js b/packages/nova-core/package.js
index 74b549b0a..e2d7549f1 100644
--- a/packages/nova-core/package.js
+++ b/packages/nova-core/package.js
@@ -18,7 +18,7 @@ Package.onUse(function(api) {
     'nova:lib@1.0.0'
   ]);
 
-  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');
 
 });
diff --git a/packages/nova-core/scss.json b/packages/nova-core/scss.json
deleted file mode 100644
index 6dbafe648..000000000
--- a/packages/nova-core/scss.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "enableAutoprefixer": true,
-  "outputStyle": "compressed",
-  "sourceComments": true,
-  "sourceMap": true
-}
\ No newline at end of file