prepare 2.15.1 release (#14)

Author: LaunchDarklyCI

examples/async-provider/package.json

@@ -26,13 +26,12 @@
   "dependencies": {
     "@babel/polyfill": "^7.2.5",
     "express": "^4.16.4",
-    "launchdarkly-react-client-sdk": "^2.13.0",
-    "ldclient-node": "^5.7.2",
+    "launchdarkly-react-client-sdk": "^2.15.0",
     "lodash": "^4.17.11",
     "prop-types": "^15.7.2",
-    "react": "^16.8.4",
-    "react-dom": "^16.8.4",
-    "react-router-dom": "^4.3.1",
+    "react": "^16.11.0",
+    "react-dom": "^16.11.0",
+    "react-router-dom": "^5.1.2",
     "styled-components": "^4.1.3"
   },
   "devDependencies": {
@@ -53,7 +52,7 @@
     "eslint-plugin-import": "^2.14.0",
     "eslint-plugin-jsx-a11y": "^6.1.2",
     "eslint-plugin-react": "^7.11.1",
-    "universal-hot-reload": "^3.3.3",
+    "universal-hot-reload": "^3.3.4",
     "webpack": "^4.39.3",
     "webpack-cli": "^3.3.7",
     "webpack-node-externals": "^1.7.2",

examples/async-provider/src/client/index.js

@@ -1,13 +1,13 @@
 import React from 'react';
-import { hydrate } from 'react-dom';
+import { render } from 'react-dom';
 import { BrowserRouter } from 'react-router-dom';
 import { asyncWithLDProvider } from 'launchdarkly-react-client-sdk';
 import App from '../universal/app';
 
 (async () => {
   const LDProvider = await asyncWithLDProvider({ clientSideID: '59b2b2596d1a250b1c78baa4' });
 
-  hydrate(
+  render(
     <BrowserRouter>
       <LDProvider>
         <App />

examples/async-provider/yarn.lock

@@ -26,13 +26,12 @@
   "dependencies": {
     "@babel/polyfill": "^7.2.5",
     "express": "^4.16.4",
-    "ldclient-node": "^5.7.2",
-    "launchdarkly-react-client-sdk": "^2.13.0",
+    "launchdarkly-react-client-sdk": "^2.15.0",
     "lodash": "^4.17.11",
     "prop-types": "^15.7.2",
-    "react": "^16.8.4",
-    "react-dom": "^16.8.4",
-    "react-router-dom": "^4.3.1",
+    "react": "^16.11.0",
+    "react-dom": "^16.11.0",
+    "react-router-dom": "^5.1.2",
     "styled-components": "^4.1.3"
   },
   "devDependencies": {
@@ -52,7 +51,7 @@
     "eslint-plugin-import": "^2.14.0",
     "eslint-plugin-jsx-a11y": "^6.1.2",
     "eslint-plugin-react": "^7.11.1",
-    "universal-hot-reload": "^2.0.1",
+    "universal-hot-reload": "^3.3.4",
     "webpack": "^4.27.1",
     "webpack-cli": "^3.1.2",
     "webpack-node-externals": "^1.7.2",

examples/hoc/package.json

@@ -1,9 +1,9 @@
 import React from 'react';
-import { hydrate } from 'react-dom';
+import { render } from 'react-dom';
 import { BrowserRouter } from 'react-router-dom';
 import App from '../universal/app';
 
-hydrate(
+render(
   <BrowserRouter>
     <App />
   </BrowserRouter>,

examples/hoc/src/client/index.js

@@ -1,2 +1,9 @@
 const UniversalHotReload = require('universal-hot-reload').default;
-UniversalHotReload(require('../../webpack.config.server.js'), require('../../webpack.config.client.js'));
+
+// supply your own webpack configs
+const serverConfig = require('../../webpack.config.server.js');
+const clientConfig = require('../../webpack.config.client.js');
+
+// the configs are optional, you can supply either one or both.
+// if you omit say the server config, then your server won't hot reload.
+UniversalHotReload({ serverConfig, clientConfig });

examples/hoc/src/server/index.js

@@ -98,6 +98,20 @@ describe('asyncWithLDProvider', () => {
     expect(receivedNode).toHaveTextContent('{"another-test-flag":false,"test-flag":false}');
   });
 
+  test('consecutive flag changes gets stored in context correctly', async () => {
+    mockLDClient.on.mockImplementationOnce((e: string, cb: (c: LDFlagChangeset) => void) => {
+      cb({ 'another-test-flag': { current: false, previous: true } });
+
+      // simulate second update
+      cb({ 'test-flag': { current: false, previous: true } });
+    });
+
+    const receivedNode = await renderWithConfig({ clientSideID });
+
+    expect(mockLDClient.on).toHaveBeenNthCalledWith(1, 'change', expect.any(Function));
+    expect(receivedNode).toHaveTextContent('{"testFlag":false,"anotherTestFlag":false}');
+  });
+
   test('ldClient bootstraps correctly', async () => {
     // don't subscribe to changes to test bootstrap
     mockLDClient.on.mockImplementation((e: string, cb: (c: LDFlagChangeset) => void) => {
@@ -113,6 +127,18 @@ describe('asyncWithLDProvider', () => {
     expect(receivedNode).toHaveTextContent('{"anotherTestFlag":false,"testFlag":true}');
   });
 
+  test('ldClient bootstraps with empty flags', async () => {
+    // don't subscribe to changes to test bootstrap
+    mockLDClient.on.mockImplementation((e: string, cb: (c: LDFlagChangeset) => void) => {
+      return;
+    });
+    const options: LDOptions = {
+      bootstrap: {},
+    };
+    const receivedNode = await renderWithConfig({ clientSideID, user, options });
+    expect(receivedNode).toHaveTextContent('{}');
+  });
+
   test('ldClient bootstraps correctly with kebab-case', async () => {
     // don't subscribe to changes to test bootstrap
     mockLDClient.on.mockImplementation((e: string, cb: (c: LDFlagChangeset) => void) => {
@@ -146,7 +172,7 @@ describe('asyncWithLDProvider', () => {
       flags: { devTestFlag: true, launchDoggly: true },
       ldClient: mockLDClient,
     }));
-    const options: LDOptions = { bootstrap: {} };
+    const options: LDOptions = {};
     const flags = { 'dev-test-flag': false, 'launch-doggly': false };
     const receivedNode = await renderWithConfig({ clientSideID, user, options, flags });
 

examples/hoc/yarn.lock

@@ -41,7 +41,7 @@ export default async function asyncWithLDProvider(config: ProviderConfig) {
         const { bootstrap } = options;
         if (bootstrap && bootstrap !== 'localStorage') {
           const bootstrappedFlags = reactOptions.useCamelCaseFlagKeys ? camelCaseKeys(bootstrap) : bootstrap;
-          setLDData({ flags: bootstrappedFlags, ldClient });
+          setLDData(prev => ({ ...prev, flags: bootstrappedFlags }));
         }
       }
 
@@ -52,7 +52,8 @@ export default async function asyncWithLDProvider(config: ProviderConfig) {
           const flagKey = reactOptions.useCamelCaseFlagKeys ? camelCase(key) : key;
           flattened[flagKey] = changes[key].current;
         }
-        setLDData({ flags: { ...ldData.flags, ...flattened }, ldClient });
+
+        setLDData(prev => ({ ...prev, flags: { ...prev.flags, ...flattened } }));
       });
     }, []);
 

src/asyncWithLDProvider.test.tsx

@@ -48,6 +48,18 @@ describe('withLDProvider', () => {
     expect(mockInitLDClient).toHaveBeenCalledWith(clientSideID, user, defaultReactOptions, options, undefined);
   });
 
+  test.only('ldClient bootstraps with empty flags', () => {
+    const user: LDUser = { key: 'yus', name: 'yus ng' };
+    const options: LDOptions = {
+      bootstrap: {},
+    };
+    const LaunchDarklyApp = withLDProvider({ clientSideID, user, options })(App);
+    const component = shallow(<LaunchDarklyApp />, { disableLifecycleMethods: true });
+    const initialState = component.state() as HocState;
+
+    expect(initialState.flags).toEqual({});
+  });
+
   test('ld client is bootstrapped correctly and transforms keys to camel case', () => {
     const user: LDUser = { key: 'yus', name: 'yus ng' };
     const options: LDOptions = {