Skip to content
This repository has been archived by the owner on Jul 28, 2020. It is now read-only.

Commit

Permalink
Merge branch 'master-x' into Milestone-Hooks!
Browse files Browse the repository at this point in the history
  • Loading branch information
conor-cafferkey-sociomantic committed Mar 6, 2019
2 parents bc9c2ad + 7551e85 commit 7208d77
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 20 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nessie-ui",
"version": "10.0.0-alpha.5",
"version": "10.0.0-alpha.6",
"description": "dunnhumby media UI component library",
"author": "Sociomantic Labs GmbH",
"main": "dist",
Expand Down
13 changes: 0 additions & 13 deletions src/Theming/index.js

This file was deleted.

24 changes: 24 additions & 0 deletions src/Theming/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/*
* Copyright (c) 2018-2019 dunnhumby Germany GmbH.
* All rights reserved.
*
* This source code is licensed under the MIT license found in the LICENSE file
* in the root directory of this source tree.
*
*/
/* eslint-disable react/prop-types */

import React from 'react';

import DefaultTheme from '../DefaultTheme';
import ThemeContext from './ThemeContext';

const { Consumer : ThemeConsumer, Provider } = ThemeContext;

const ThemeProvider = props => (
<Provider value = { { ...DefaultTheme, ...props.value } }>
{props.children}
</Provider>
);

export { ThemeConsumer, ThemeProvider };
6 changes: 0 additions & 6 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1318,7 +1318,6 @@ [email protected]:
async@^1.4.0, async@^1.5.2:
version "1.5.2"
resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=

async@^2.1.2, async@^2.1.4:
version "2.6.1"
Expand Down Expand Up @@ -5682,7 +5681,6 @@ lodash.camelcase@^3.0.1:
lodash.debounce@^4.0.8:
version "4.0.8"
resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=

lodash.deburr@^3.0.0:
version "3.2.0"
Expand Down Expand Up @@ -9422,7 +9420,6 @@ [email protected], uglify-js@^3.0.0:
uglify-js@^2.6, uglify-js@^2.8.29:
version "2.8.29"
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
integrity sha1-KcVzMUgFe7Th913zW3qcty5qWd0=
dependencies:
source-map "~0.5.1"
yargs "~3.10.0"
Expand Down Expand Up @@ -9676,7 +9673,6 @@ [email protected], uuid@^3.2.1, uuid@^3.3.2:
v8-compile-cache@^2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz#a428b28bb26790734c4fc8bc9fa106fccebf6a6c"
integrity sha512-1wFuMUIM16MDJRCrpbpuEPTUGmM5QMUg0cr3KFwra2XgOgFcPGDQHDh3CszSCD2Zewc/dh/pamNEW8CbfDebUw==

validate-npm-package-license@^3.0.1:
version "3.0.4"
Expand Down Expand Up @@ -9765,7 +9761,6 @@ webpack-sources@^1.0.1, webpack-sources@^1.1.0:
webpack-sources@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.3.0.tgz#2a28dcb9f1f45fe960d8f1493252b5ee6530fa85"
integrity sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==
dependencies:
source-list-map "^2.0.0"
source-map "~0.6.1"
Expand Down Expand Up @@ -9983,7 +9978,6 @@ xmlbuilder@~9.0.1:
[email protected]:
version "4.0.0"
resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
integrity sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==

xtend@^4.0.0, xtend@~4.0.1:
version "4.0.1"
Expand Down

0 comments on commit 7208d77

Please sign in to comment.