Skip to content

Commit 8a8596a

Browse files
committed
move renderContext from core to lib, so that every components/containers includes core’s (such as withList, App) can use renderContext.get() to get store, apolloClient, loginToken, history, reducers, middlewares
1 parent b789211 commit 8a8596a

File tree

11 files changed

+14
-10
lines changed

11 files changed

+14
-10
lines changed

packages/nova-core/lib/client/main.js

-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
import './auth.js';
2-
import './mongo_redux.js';
3-
41
export * from '../modules/index.js';
5-
export * from './render_context.js';

packages/nova-core/lib/modules/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import './callbacks.js';
33
// import and re-export
44
export {
55
// apollo
6-
createApolloClient,
6+
createApolloClient, renderContext,
77
// callbacks
88
Callbacks, addCallback, removeCallback, runCallbacks, runCallbacksAsync,
99
// components

packages/nova-core/lib/server/main.js

-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
import './oauth.js';
21
import './start.js';
32
import './apollo_server.js';
4-
import './meteor_subscribe.js'
53

64
export * from '../modules/index.js';
7-
export * from './render_context.js';
File renamed without changes.

packages/nova-lib/lib/client/main.js

+4
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
1+
import './auth.js';
2+
13
export * from '../modules/index.js';
4+
export * from './mongo_redux.js';
25
export * from './apollo.js';
6+
export * from './render_context.js';

packages/nova-core/lib/client/render_context.js packages/nova-lib/lib/client/render_context.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { createStore, applyMiddleware, compose, combineReducers } from 'redux';
22

3-
import { createApolloClient, addReducer, addMiddleware, getReducers, getMiddlewares } from '../modules/index.js';
3+
import { addReducer, addMiddleware, getReducers, getMiddlewares } from '../modules/index.js';
4+
import { createApolloClient } from './apollo.js'
45

56
const loginToken = global.localStorage['Meteor.loginToken'];
67
const apolloClient = createApolloClient();

packages/nova-lib/lib/server/main.js

+4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
import './oauth_config.js';
2+
import './meteor_subscribe.js'
3+
14
export * from '../modules/index.js';
25
export * from './apollo.js';
36
export * from './store.js';
47
export * from './mutations.js';
8+
export * from './render_context.js';

packages/nova-core/lib/server/render_context.js packages/nova-lib/lib/server/render_context.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ import { WebApp } from 'meteor/webapp';
33
import { DDP } from 'meteor/ddp';
44
import { Accounts } from 'meteor/accounts-base';
55

6-
import { createApolloClient, getReducers, getMiddlewares, configureStore } from '../modules/index.js';
6+
import { getReducers, getMiddlewares } from '../modules/index.js';
7+
import { createApolloClient } from './apollo.js';
8+
import { configureStore } from './store.js';
79

810
const Fibers = Npm.require('fibers');
911

0 commit comments

Comments
 (0)