Skip to content

Commit

Permalink
chore: update flopflip
Browse files Browse the repository at this point in the history
  • Loading branch information
tdeekens committed Feb 10, 2020
1 parent a169f4d commit 5bb7490
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 69 deletions.
4 changes: 2 additions & 2 deletions packages/application-shell/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@
"@commercetools-uikit/text": "^10.13.0",
"@emotion/core": "10.0.27",
"@emotion/styled": "10.0.27",
"@flopflip/launchdarkly-adapter": "2.10.0",
"@flopflip/memory-adapter": "1.5.0",
"@flopflip/launchdarkly-adapter": "2.11.0",
"@flopflip/memory-adapter": "1.5.1",
"@flopflip/react-broadcast": "10.1.0",
"@sentry/browser": "5.12.1",
"@types/classnames": "^2.2.9",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { SyntheticEvent } from 'react';
import { Dispatch } from 'redux';
import { Redirect, Route, Switch, useLocation } from 'react-router-dom';
import { ApolloError } from 'apollo-client';
import { TFlags } from '@flopflip/types';
import { Flags } from '@flopflip/types';
import { Global, css } from '@emotion/core';
import styled from '@emotion/styled';
import {
Expand Down Expand Up @@ -70,8 +70,8 @@ type Props<AdditionalEnvironmentProperties extends {}> = {
environment: TApplicationContext<
AdditionalEnvironmentProperties
>['environment'];
featureFlags?: TFlags;
defaultFeatureFlags?: TFlags;
featureFlags?: Flags;
defaultFeatureFlags?: Flags;
trackingEventWhitelist?: TrackingWhitelist;
applicationMessages: TAsyncLocaleDataProps['applicationMessages'];
onRegisterErrorListeners: (args: { dispatch: Dispatch }) => void;
Expand Down Expand Up @@ -225,7 +225,7 @@ export const RestrictedApplication = <
projectKey={projectKeyFromUrl}
appEnv={props.environment.env}
flags={props.featureFlags}
defaultFlags={props.defaultFeatureFlags}
defaulFlags={props.defaultFeatureFlags}
>
<React.Fragment>
<VersionTracker />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import React from 'react';
import ldAdapter from '@flopflip/launchdarkly-adapter';
import { ConfigureFlopFlip } from '@flopflip/react-broadcast';
import { TFlags } from '@flopflip/types';
import { Flags } from '@flopflip/types';
import { TFetchLoggedInUserQuery } from '../../types/generated/mc';
import useAllMenuFeatureToggles from '../../hooks/use-all-menu-feature-toggles';
import { FLAGS } from '../../feature-toggles';

type Props = {
projectKey?: string;
user?: TFetchLoggedInUserQuery['user'];
flags?: TFlags;
defaultFlags?: TFlags;
flags?: Flags;
defaultFlags?: Flags;
appEnv: string;
children: React.ReactNode;
shouldDeferAdapterConfiguration?: boolean;
Expand Down
8 changes: 4 additions & 4 deletions packages/application-shell/src/test-utils/test-utils.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import * as rtl from '@testing-library/react';
import { createMemoryHistory } from 'history';
import { IntlProvider } from 'react-intl';
import { ConfigureFlopFlip } from '@flopflip/react-broadcast';
import { TFlags } from '@flopflip/types';
import { Flags } from '@flopflip/types';
import {
MockedProvider as ApolloMockProvider,
MockedProviderProps,
Expand Down Expand Up @@ -37,7 +37,7 @@ import { createReduxStore } from '../configure-store';
import { createApolloClient } from '../configure-apollo';

// Reset memoryAdapter after each test, so that the next test accepts the
// defaultFlags param.
// defaulFlags param.
// This could also be moved into setup-test-framework, not sure which
// location is better for it.
afterEach(memoryAdapter.reset);
Expand Down Expand Up @@ -290,7 +290,7 @@ type TRenderAppOptions<AdditionalEnvironmentProperties = {}> = {
route: string;
history: ReturnType<typeof createEnhancedHistory>;
adapter: typeof memoryAdapter;
flags: TFlags;
flags: Flags;
environment: Partial<
TProviderProps<AdditionalEnvironmentProperties>['environment']
>;
Expand Down Expand Up @@ -372,7 +372,7 @@ function renderApp<AdditionalEnvironmentProperties = {}>(
<ApolloProviderComponent mocks={mocks} addTypename={addTypename}>
<ConfigureFlopFlip
adapter={adapter}
defaultFlags={flags}
defaulFlags={flags}
adapterArgs={defaultFlopflipAdapterArgs}
>
<ApplicationContextProvider
Expand Down
93 changes: 37 additions & 56 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1053,14 +1053,6 @@
"@babel/helper-create-regexp-features-plugin" "^7.8.3"
"@babel/helper-plugin-utils" "^7.8.3"

"@babel/polyfill@7.6.0":
version "7.6.0"
resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.6.0.tgz#6d89203f8b6cd323e8d946e47774ea35dc0619cc"
integrity sha512-q5BZJI0n/B10VaQQvln1IlDK3BTBJFbADx7tv+oXDPIDZuTo37H5Adb9jhlXm/fEN4Y7/64qD9mnrJJG7rmaTw==
dependencies:
core-js "^2.6.5"
regenerator-runtime "^0.13.2"

"@babel/polyfill@^7.7.0":
version "7.8.3"
resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.8.3.tgz#2333fc2144a542a7c07da39502ceeeb3abe4debd"
Expand Down Expand Up @@ -1237,20 +1229,20 @@
dependencies:
regenerator-runtime "^0.13.2"

"@babel/runtime@7.8.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4":
version "7.8.4"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.4.tgz#d79f5a2040f7caa24d53e563aad49cbc05581308"
integrity sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==
dependencies:
regenerator-runtime "^0.13.2"

"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.2.0", "@babel/runtime@^7.4.0", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.4", "@babel/runtime@^7.6.2", "@babel/runtime@^7.7.4":
version "7.8.3"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.3.tgz#0811944f73a6c926bb2ad35e918dcc1bfab279f1"
integrity sha512-fVHx1rzEmwB130VTkLnxR+HmxcTjGzH12LYQcFFoBwakMd3aOMD4OsRN7tGG/UOYE2ektgFrS8uACAoRk1CY0w==
dependencies:
regenerator-runtime "^0.13.2"

"@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4":
version "7.8.4"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.4.tgz#d79f5a2040f7caa24d53e563aad49cbc05581308"
integrity sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==
dependencies:
regenerator-runtime "^0.13.2"

"@babel/template@^7.4.0", "@babel/template@^7.7.4", "@babel/template@^7.8.0", "@babel/template@^7.8.3":
version "7.8.3"
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.3.tgz#e02ad04fe262a657809327f578056ca15fd4d1b8"
Expand Down Expand Up @@ -3133,24 +3125,24 @@
unique-filename "^1.1.1"
which "^1.3.1"

"@flopflip/launchdarkly-adapter@2.10.0":
version "2.10.0"
resolved "https://registry.yarnpkg.com/@flopflip/launchdarkly-adapter/-/launchdarkly-adapter-2.10.0.tgz#222d4c7ce1f2e7f89d5694b5b9ac8166985b7f7a"
integrity sha512-S6MiUcAbYwuwq3vVd3+lykYrWgYDdq7k6ZAopTNEBEA4avwf9tUOvrFUNKqSC1bnNi8OMQBt8xI433RNeuhegQ==
"@flopflip/launchdarkly-adapter@2.11.0":
version "2.11.0"
resolved "https://registry.yarnpkg.com/@flopflip/launchdarkly-adapter/-/launchdarkly-adapter-2.11.0.tgz#3cfa1be3e142e1edd0c2bff0c27d0cc1bc12d0a5"
integrity sha512-4kHqKR2kxbpjmERi6xSH1AdFkxmTtC//9CbjWb0J1iLIExkBSQoe+g9urs/fLP1V06DqZ1mk8jAwbLANRBLMXw==
dependencies:
"@babel/runtime" "7.7.7"
"@babel/runtime" "7.8.4"
debounce-fn "3.0.1"
deepmerge "4.2.2"
launchdarkly-js-client-sdk "2.16.0"
launchdarkly-js-client-sdk "2.16.3"
lodash "4.17.15"
tiny-warning "1.0.3"

"@flopflip/memory-adapter@1.5.0":
version "1.5.0"
resolved "https://registry.yarnpkg.com/@flopflip/memory-adapter/-/memory-adapter-1.5.0.tgz#391167b8d4311f1e9e169b033c1854151656cfa2"
integrity sha512-+oJLE18VvdlH3I99YHP2f0CBbEt+QMXVYUNe4YTsb9HK1Jjg3hMvB9gxh04M6HV5trW3Qh7TKybvHn/asmBKXw==
"@flopflip/memory-adapter@1.5.1":
version "1.5.1"
resolved "https://registry.yarnpkg.com/@flopflip/memory-adapter/-/memory-adapter-1.5.1.tgz#ca2524690e8f4bbdf741953d8108f6dbdd6e2fda"
integrity sha512-XLBy4fGJIHn8UhV4SLtbJwH7no/qtVnThUAmcj+tQkdCuOCvVxQoiLkO2eNEBwU3hqkYGDYGTjw+QTwEYY/S/A==
dependencies:
"@babel/runtime" "7.7.7"
"@babel/runtime" "7.8.4"
invariant "2.2.4"
mitt "1.2.0"

Expand Down Expand Up @@ -7569,12 +7561,7 @@ base64-arraybuffer@0.1.5:
resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
integrity sha1-c5JncZI7Whl0etZmqlzUv5xunOg=

base64-js@1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
integrity sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==

base64-js@^1.0.2:
base64-js@^1.0.2, base64-js@^1.3.0:
version "1.3.1"
resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==
Expand Down Expand Up @@ -12195,16 +12182,16 @@ faker@4.1.0:
resolved "https://registry.yarnpkg.com/faker/-/faker-4.1.0.tgz#1e45bbbecc6774b3c195fad2835109c6d748cc3f"
integrity sha1-HkW7vsxndLPBlfrSg1EJxtdIzD8=

fast-deep-equal@2.0.1, fast-deep-equal@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=

fast-deep-equal@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=

fast-deep-equal@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=

fast-deep-equal@^3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
Expand Down Expand Up @@ -17282,23 +17269,22 @@ latest-version@^5.0.0:
dependencies:
package-json "^6.3.0"

launchdarkly-js-client-sdk@2.16.0:
version "2.16.0"
resolved "https://registry.yarnpkg.com/launchdarkly-js-client-sdk/-/launchdarkly-js-client-sdk-2.16.0.tgz#aac4273a5499a69006a95ec0097fdd4d4c8023fd"
integrity sha512-nr8UAmWDw1UmhfC4u8TyRg/kjsuN/mja8iH5gQpNXbO9ot7AlZIfsd8bPRoMhAgNHMFeE6PnqpOhZuURE7OgdA==
launchdarkly-js-client-sdk@2.16.3:
version "2.16.3"
resolved "https://registry.yarnpkg.com/launchdarkly-js-client-sdk/-/launchdarkly-js-client-sdk-2.16.3.tgz#c96d4635456e103d87c053c4ba8051847ecf344c"
integrity sha512-Ygc6Bckj1xEbTbGKLHlgvhY8Nruzs39KnZlsImtxblRBMj9MMLAjqO+Y+F/bFIlT677eJEbF5aqF7aNbbr6clw==
dependencies:
escape-string-regexp "1.0.5"
launchdarkly-js-sdk-common "3.1.0"
escape-string-regexp "^1.0.5"
launchdarkly-js-sdk-common "3.1.2"

launchdarkly-js-sdk-common@3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/launchdarkly-js-sdk-common/-/launchdarkly-js-sdk-common-3.1.0.tgz#565e0fbe9af214d1b74f5a55011e2d47d407e277"
integrity sha512-htP7QkOnsXmcWlsJxLvrAjxYCSU0XjKBBbjvpHH/SBD+mmfInjN/P7S3Y89HAen/o8O+FHz3/FbBhqoZ+W4uyQ==
launchdarkly-js-sdk-common@3.1.2:
version "3.1.2"
resolved "https://registry.yarnpkg.com/launchdarkly-js-sdk-common/-/launchdarkly-js-sdk-common-3.1.2.tgz#8382aabae3c0247c3f96dc44d6bf65823f74a2e4"
integrity sha512-R7OIP+io5cE3Q0lMzHFV5fc5+2ColJOzBPJOl/orUd5ip6Nla33UfZsTUV6xp58Lmgvx2XkXEe/Rn1uVEZ8i0w==
dependencies:
"@babel/polyfill" "7.6.0"
base64-js "1.3.0"
fast-deep-equal "2.0.1"
uuid "3.3.2"
base64-js "^1.3.0"
fast-deep-equal "^2.0.1"
uuid "^3.3.2"

lazy-ass@1.6.0:
version "1.6.0"
Expand Down Expand Up @@ -26816,11 +26802,6 @@ utils-merge@1.0.1:
resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=

uuid@3.3.2:
version "3.3.2"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==

uuid@3.3.3:
version "3.3.3"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz#4568f0216e78760ee1dbf3a4d2cf53e224112866"
Expand Down

0 comments on commit 5bb7490

Please sign in to comment.