Merge 6edab0c into e6516e9

Changelog.md

@@ -4,6 +4,17 @@ Expect active development and potentially significant breaking changes in the `0
 
 ### vNext
 
+#### Breaking
+```js
+// old
+import { getDataFromTree, renderToStringWithData } from 'react-apollo/server'
+
+// new
+import { getDataFromTree, renderToStringWithData } from 'react-apollo'
+```
+
+- Feature: Better packaging [PR #306](https://github.com/apollostack/react-apollo/pull/306)
+
 ### v0.5.15
 - Feature: Added test utilities and examples to library.
 

examples/create-react-app/src/App.js

@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import ApolloClient, { createNetworkInterface } from 'apollo-client';
-import { ApolloProvider } from "../../../lib/src";
+import { ApolloProvider } from "../../../lib";
 
 import Pokemon from "./Pokemon";
 

examples/create-react-app/src/Pokemon.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import gql from 'graphql-tag';
-import { graphql } from '../../../lib/src';
+import { graphql } from '../../../lib';
 
 // The data prop, which is provided by the wrapper below contains,
 // a `loading` key while the query is in flight and posts when it is ready

examples/create-react-app/src/Pokemon.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import renderer from 'react-test-renderer';
-import { MockedProvider } from '../../../lib/src/test-utils';
+import { MockedProvider } from '../../../lib/test-utils';
 import { print } from 'graphql-tag/printer';
 import { addTypenameToDocument } from 'apollo-client/queries/queryTransform';
 

package.json

@@ -2,15 +2,16 @@
   "name": "react-apollo",
   "version": "0.5.16",
   "description": "React data container for Apollo Client",
-  "main": "index.js",
-  "typings": "index.d.ts",
+  "main": "lib/index.js",
+  "browser": "lib/browser.js",
+  "typings": "lib/index.d.ts",
   "scripts": {
     "test": "jest",
     "flow": "flow; test $? -eq 0 -o $? -eq 2",
     "posttest": "npm run lint",
     "filesize": "npm run compile:browser && ./scripts/filesize.js --file=./dist/index.min.js --maxGzip=15",
     "compile": "tsc",
-    "compile:browser": "rm -rf ./dist && mkdir ./dist && browserify ./lib/src/index.js --i react --i apollo-client -o=./dist/index.js && npm run minify:browser",
+    "compile:browser": "rm -rf ./dist && mkdir ./dist && browserify ./lib/index.js --i react --i apollo-client -o=./dist/index.js && npm run minify:browser",
     "minify:browser": "uglifyjs --compress --mangle --screw-ie8 -o=./dist/index.min.js -- ./dist/index.js",
     "watch": "tsc -w",
     "lint": "tslint 'src/*.ts*' && tslint 'test/*.ts*'"
@@ -48,6 +49,15 @@
     "collectCoverage": true
   },
   "license": "MIT",
+  "files": [
+    "dist",
+    "lib",
+    "src",
+    "exports.d.ts",
+    "CHANGELOG.md",
+    "LICENSE",
+    "README.md"
+  ],
   "peerDependencies": {
     "apollo-client": "^0.4.21 || ^0.5.0",
     "react": "0.14.x || 15.* || ^15.0.0",

src/browser.ts

@@ -0,0 +1,5 @@
+export { default as ApolloProvider } from './ApolloProvider';
+export { default as graphql, withApollo } from './graphql';
+
+// expose easy way to join queries from redux
+export { compose } from 'redux';

src/index.ts

@@ -1,7 +1,3 @@
-import ApolloProvider from './ApolloProvider';
-import graphql, { withApollo } from './graphql';
+export * from './browser';
 
-// expose easy way to join queries from redux
-import { compose } from 'redux';
-
-export { ApolloProvider, graphql, withApollo, compose };
+export { getDataFromTree, renderToStringWithData } from './server';

tsconfig.json

@@ -7,7 +7,7 @@
     "sourceMap": true,
     "declaration": true,
     "noImplicitAny": false,
-    "rootDir": ".",
+    "rootDir": "src",
     "outDir": "lib",
     "allowSyntheticDefaultImports": true,
     "experimentalDecorators": true,