Merge bdf6128 into eeac992

Changelog.md

@@ -2,6 +2,18 @@
 
 ### vNext
 
+* Fix regression on refetchQueries [#1794](https://github.com/apollographql/react-apollo/pull/1794)
+* Added a new `called` prop for mutations [#1775](https://github.com/apollographql/react-apollo/pull/1775)
+* Fix inconsistency in naming of subscription document prop [#1774](https://github.com/apollographql/react-apollo/pull/1774)
+
+## 2.1.0-rc.3
+
+* remove .mjs support
+
+## 2.1.0-rc.2
+
+* attempt to fix .mjs support for create react app
+
 ## 2.1.0-rc.1
 
 * Fix default values being set as falsy in options merging

jest.preact.config.json

@@ -4,7 +4,6 @@
     "^.+\\.tsx?$": "ts-jest",
     "^.+\\.jsx?$": "babel-jest"
   },
-  "mapCoverage": true,
   "moduleFileExtensions": ["ts", "tsx", "js", "json"],
   "modulePathIgnorePatterns": [
     "<rootDir>/examples",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-apollo",
-  "version": "2.1.0-rc.1",
+  "version": "2.1.0-rc.3",
   "author": "opensource@apollographql.com",
   "browser": "lib/react-apollo.browser.umd.js",
   "description": "React data container for Apollo Client",
@@ -18,9 +18,7 @@
     "url": "apollostack/react-apollo"
   },
   "scripts": {
-    "compile": "npm run compile:esm && npm run compile:cjs",
-    "compile:cjs": "tsc --project tsconfig.cjs.json && rimraf lib/test && mv lib/src/* lib/. && rimraf lib/src",
-    "compile:esm": "tsc --project tsconfig.json -d && rimraf lib/test && mv lib/src/* lib/. && rimraf lib/src && cd lib && rename js mjs",
+    "compile": "tsc && rimraf lib/test && mv lib/src/* lib/. && rimraf lib/src",
     "danger": "danger run --verbose",
     "deploy": "cd lib && npm publish --tag=next",
     "filesize": "bundlesize",
@@ -150,6 +148,5 @@
     "invariant": "^2.2.2",
     "lodash": "4.17.5",
     "prop-types": "^15.6.0"
-  },
-  "sideEffects": false
+  }
 }

scripts/prepare-package.sh

@@ -16,9 +16,11 @@ node -e "var package = require('./package.json'); \
   delete package[\"husky\"]; \
   delete package.scripts; \
   delete package.options; \
+  delete package.prettier; \
+  delete package.devDependencies; \
   package.main = 'react-apollo.umd.js'; \
   package.browser = 'react-apollo.browser.umd.js'; \
-  package.module = 'index.mjs'; \
+  package.module = 'index.js'; \
   package.typings = 'index.d.ts'; \
   var origVersion = 'local';
   var fs = require('fs'); \
@@ -29,5 +31,4 @@ node -e "var package = require('./package.json'); \
 # Copy few more files to ./lib
 cp README.md lib/
 cp LICENSE lib/
-cp src/index.js.flow lib/
 cp .npmignore lib/

test/client/graphql/queries/errors.test.tsx

@@ -556,8 +556,8 @@ describe('[queries] errors', () => {
           try {
             switch (count++) {
               case 0:
-                props.data!
-                  .refetch()
+                props
+                  .data!.refetch()
                   .then(() => {
                     done.fail('Expected error value on first refetch.');
                   })
@@ -569,8 +569,8 @@ describe('[queries] errors', () => {
               case 2:
                 expect(props.data!.loading).toBeFalsy();
                 expect(props.data!.error).toBeTruthy();
-                props.data!
-                  .refetch()
+                props
+                  .data!.refetch()
                   .then(noop)
                   .catch(() => {
                     done.fail('Expected good data on second refetch.');
@@ -655,8 +655,8 @@ describe('[queries] errors', () => {
           try {
             switch (count++) {
               case 0:
-                props.data!
-                  .refetch()
+                props
+                  .data!.refetch()
                   .then(() => {
                     done.fail('Expected error value on first refetch.');
                   })
@@ -736,7 +736,6 @@ describe('[queries] errors', () => {
     });
 
     let count = 0;
-    const noop = () => null;
     type ContainerOwnProps = { toggle: () => void };
     const Container = graphql<ContainerOwnProps, Data>(query, {
       options: { notifyOnNetworkStatusChange: true },

test/client/graphql/queries/index.test.tsx

@@ -4,7 +4,7 @@ import * as renderer from 'react-test-renderer';
 import gql from 'graphql-tag';
 import ApolloClient from 'apollo-client';
 import { InMemoryCache as Cache } from 'apollo-cache-inmemory';
-import { ApolloLink, Observable } from 'apollo-link';
+import { ApolloLink } from 'apollo-link';
 import { mockSingleLink } from '../../../../src/test-utils';
 import { ApolloProvider, graphql, DataProps, ChildProps } from '../../../../src';
 

tsconfig.json

@@ -1,9 +1,10 @@
 {
   "compilerOptions": {
     "module": "es2015",
-    "target": "es2015",
-    "lib": ["es2015", "dom"],
+    "target": "es5",
+    "lib": ["es6", "dom"],
     "moduleResolution": "node",
+    "sourceMap": true,
     "strict": true,
     "outDir": "lib",
     "allowSyntheticDefaultImports": false,