Merge pull request #4361 from apollographql/release-2.5.0

Release 2.5.0

.gitignore

@@ -1,5 +1,6 @@
 # fs
 .DS_Store
+.rpt2_cache
 
 # Logs
 logs

.npmignore

@@ -3,6 +3,7 @@ test
 typings
 .gitignore
 .travis.yml
+.rpt2_cache
 ambient.d.ts
 CHANGELOG.md
 design.md

.vscode/settings.json

@@ -7,6 +7,7 @@
   "files.exclude": {
     "**/.git": true,
     "**/.DS_Store": true,
+    "**/.rpt2_cache": true,
     "node_modules": true,
     "test-lib": true,
     "lib": true,

CHANGELOG.md

@@ -1,16 +1,24 @@
 **Note:** This is a cumulative changelog that outlines all of the Apollo Client project child package changes that were bundled into a specific `apollo-client` release.
 
-## Apollo Client (vNext)
+## Apollo Client (2.5.0)
 
-## Apollo Client (vNext)
+## Apollo Client (2.5.0)
 
-- Fixes an issue where the `QueryManager` was accidentally returning cached 
+- Introduces new local state management features (client-side schema
+  and local resolver / `@client` support) and many overall code improvements,
+  to help reduce the Apollo Client bundle size.  <br/>
+  [#4361](https://github.com/apollographql/apollo-client/pull/4361)
+- Revamped CJS and ESM bundling approach with Rollup.  <br/>
+  [@rosskevin](https://github.com/rosskevin) in [#4261](https://github.com/apollographql/apollo-client/pull/4261)
+- Fixes an issue where the `QueryManager` was accidentally returning cached
   data for `network-only` queries.  <br/>
   [@danilobuerger](https://github.com/danilobuerger) in [#4352](https://github.com/apollographql/apollo-client/pull/4352)
 - Fixed an issue in the repo `.gitattributes` that was causing binary files
-  to have their line endings adjusted, and cleaned up corrupted documentation 
+  to have their line endings adjusted, and cleaned up corrupted documentation
   images (ref: https://github.com/apollographql/apollo-client/pull/4232).  <br/>
   [@rajington](https://github.com/rajington) in [#4438](https://github.com/apollographql/apollo-client/pull/4438)
+- Improve (and shorten) query polling implementation.  <br/>
+  [PR #4337](https://github.com/apollographql/apollo-client/pull/4337)
 
 
 ## Apollo Client (2.4.13)

config/jest.config.settings.js

@@ -0,0 +1,21 @@
+module.exports = {
+  transform: {
+    '.(ts|tsx)': 'ts-jest',
+  },
+
+  globals: {
+    'ts-jest': {
+      diagnostics: false,
+    },
+  },
+
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'json'],
+  testURL: 'http://localhost',
+
+  testMatch: ['<rootDir>/src/**/__tests__/**/*.ts'],
+  testPathIgnorePatterns: [
+    '/node_modules/',
+    '/lib/',
+    '<rootDir>/lib/',
+  ],
+};

config/rollup.config.js

@@ -1,8 +1,19 @@
-import node from 'rollup-plugin-node-resolve';
-import sourcemaps from 'rollup-plugin-sourcemaps';
+import nodeResolve from 'rollup-plugin-node-resolve';
+import typescriptPlugin from 'rollup-plugin-typescript2';
+import typescript from 'typescript';
+import path from 'path';
+import invariantPlugin from 'rollup-plugin-invariant';
+import { terser as minify } from 'rollup-plugin-terser';
 
-export const globals = {
-  // Apollo
+function onwarn(message) {
+  const suppressed = ['UNRESOLVED_IMPORT', 'THIS_IS_UNDEFINED'];
+
+  if (!suppressed.find(code => message.code === code)) {
+    return console.warn(message.message);
+  }
+}
+
+const defaultGlobals = {
   'apollo-client': 'apollo.core',
   'apollo-cache': 'apolloCache.core',
   'apollo-link': 'apolloLink.core',
@@ -11,49 +22,87 @@ export const globals = {
   'graphql-anywhere': 'graphqlAnywhere',
   'graphql-anywhere/lib/async': 'graphqlAnywhere.async',
   'apollo-boost': 'apollo.boost',
+  'tslib': 'tslib',
+  'ts-invariant': 'invariant',
 };
 
-export default (name, override = {}) => {
-  const config = Object.assign(
+export function rollup({
+  name,
+  input = './src/index.ts',
+  outputPrefix = 'bundle',
+  extraGlobals = {},
+}) {
+  const projectDir = path.join(__filename, '..');
+  console.info(`Building project esm ${projectDir}`);
+  const tsconfig = `${projectDir}/tsconfig.json`;
+
+  const globals = {
+    ...defaultGlobals,
+    ...extraGlobals,
+  };
+
+  function external(id) {
+    return Object.prototype.hasOwnProperty.call(globals, id);
+  }
+
+  function outputFile(format) {
+    return './lib/' + outputPrefix + '.' + format + '.js';
+  }
+
+  function convert(format) {
+    return {
+      input: outputFile('esm'),
+      external,
+      output: {
+        file: outputFile(format),
+        format,
+        sourcemap: true,
+        name,
+        globals,
+      },
+      onwarn,
+    };
+  }
+
+  return [
     {
-      input: 'lib/index.js',
-      //output: merged separately
+      input,
+      external,
+      output: {
+        file: outputFile('esm'),
+        format: 'esm',
+        sourcemap: true,
+      },
+      plugins: [
+        nodeResolve({
+          extensions: ['.ts', '.tsx'],
+          module: true,
+        }),
+        typescriptPlugin({ typescript, tsconfig }),
+        invariantPlugin(),
+      ],
       onwarn,
-      external: Object.keys(globals),
     },
-    override,
-  );
-
-  config.output = Object.assign(
+    convert('umd'),
+    convert('cjs'),
     {
-      file: 'lib/bundle.umd.js',
-      format: 'umd',
-      name,
-      exports: 'named',
-      sourcemap: true,
-      globals,
+      input: outputFile('cjs'),
+      output: {
+        file: outputFile('cjs.min'),
+        format: 'cjs',
+      },
+      plugins: [
+        minify({
+          mangle: {
+            toplevel: true,
+          },
+          compress: {
+            global_defs: {
+              '@process.env.NODE_ENV': JSON.stringify('production'),
+            },
+          },
+        }),
+      ],
     },
-    config.output,
-  );
-
-  config.plugins = config.plugins || [];
-  config.plugins.push(
-    sourcemaps(),
-    node({
-      // Inline anything imported from the tslib package, e.g. __extends
-      // and __assign. This depends on the "importHelpers":true option in
-      // tsconfig.base.json.
-      module: true,
-      only: ['tslib'],
-    }),
-  );
-  return config;
-};
-
-function onwarn(message) {
-  const suppressed = ['UNRESOLVED_IMPORT', 'THIS_IS_UNDEFINED'];
-
-  if (!suppressed.find(code => message.code === code)) {
-    return console.warn(message.message);
-  }
+  ];
 }

config/tsconfig.base.json

@@ -11,7 +11,7 @@
     "declaration": true,
     "declarationMap": true,
     "target": "es5",
-    "module": "es2015",
+    "module": "commonjs",
     "esModuleInterop": true
   }
 }

jest.config.js

@@ -0,0 +1,4 @@
+module.exports = {
+  rootDir: '.',
+  projects: ['<rootDir>/packages/*'],
+};