diff --git a/.storybook-css/config.js b/.storybook-css/config.js index 12dc8d78..2c3a05b8 100644 --- a/.storybook-css/config.js +++ b/.storybook-css/config.js @@ -2,7 +2,7 @@ import { configure } from '@kadira/storybook'; import ThemedStyleSheet from 'react-with-styles/lib/ThemedStyleSheet'; import aphroditeInterface from 'react-with-styles-interface-aphrodite'; import '../css/rheostat.css'; -import registerCSSInterfaceWithDefaultTheme from '../scripts/utils/registerCSSInterfaceWithDefaultTheme'; +import registerCSSInterfaceWithDefaultTheme from '../src/utils/registerCSSInterfaceWithDefaultTheme'; /* Register react with styles interface */ diff --git a/.storybook/config.js b/.storybook/config.js index ffdd19d5..c7c85ea4 100644 --- a/.storybook/config.js +++ b/.storybook/config.js @@ -1,7 +1,7 @@ import { configure } from '@kadira/storybook'; import ThemedStyleSheet from 'react-with-styles/lib/ThemedStyleSheet'; import aphroditeInterface from 'react-with-styles-interface-aphrodite'; -import registerInterfaceWithDefaultTheme from '../scripts/utils/registerInterfaceWithDefaultTheme'; +import registerInterfaceWithDefaultTheme from '../src/utils/registerInterfaceWithDefaultTheme'; /* Register react with styles interface */ registerInterfaceWithDefaultTheme(aphroditeInterface); diff --git a/scripts/buildCSS.js b/scripts/buildCSS.js index c2d09d06..7c3976da 100644 --- a/scripts/buildCSS.js +++ b/scripts/buildCSS.js @@ -4,7 +4,7 @@ const fs = require('fs'); const CleanCSS = require('clean-css'); const compileCSS = require('react-with-styles-interface-css-compiler'); const registerMaxSpecificity = require('react-with-styles-interface-css/dist/utils/registerMaxSpecificity').default; -const registerCSSInterfaceWithDefaultTheme = require('./utils/registerCSSInterfaceWithDefaultTheme').default; +const registerCSSInterfaceWithDefaultTheme = require('../lib/utils/registerCSSInterfaceWithDefaultTheme').default; const args = process.argv.slice(2); const optimizeForProduction = args.includes('-o') || args.includes('--optimize'); diff --git a/scripts/utils/registerCSSInterfaceWithDefaultTheme.js b/scripts/utils/registerCSSInterfaceWithDefaultTheme.js index 6b3956ce..d6b2ff26 100644 --- a/scripts/utils/registerCSSInterfaceWithDefaultTheme.js +++ b/scripts/utils/registerCSSInterfaceWithDefaultTheme.js @@ -1,7 +1,5 @@ -import CSSInterface from 'react-with-styles-interface-css'; +/* This file should be removed in the next major version update of Rheostat */ -import registerInterfaceWithDefaultTheme from './registerInterfaceWithDefaultTheme'; +import registerCSSInterfaceWithDefaultTheme from '../../lib/utils/registerCSSInterfaceWithDefaultTheme'; -export default function registerCSSInterfaceWithDefaultTheme() { - registerInterfaceWithDefaultTheme(CSSInterface); -} +export default registerCSSInterfaceWithDefaultTheme; diff --git a/scripts/utils/registerInterfaceWithDefaultTheme.js b/scripts/utils/registerInterfaceWithDefaultTheme.js index 252ce698..eab79c99 100644 --- a/scripts/utils/registerInterfaceWithDefaultTheme.js +++ b/scripts/utils/registerInterfaceWithDefaultTheme.js @@ -1,7 +1,5 @@ -import ThemedStyleSheet from 'react-with-styles/lib/ThemedStyleSheet'; -import DefaultTheme from '../../src/themes/DefaultTheme'; +/* This file should be removed in the next major version update of Rheostat */ -export default function registerInterfaceWithDefaultTheme(reactWithStylesInterface) { - ThemedStyleSheet.registerInterface(reactWithStylesInterface); - ThemedStyleSheet.registerTheme(DefaultTheme); -} +import registerInterfaceWithDefaultTheme from '../../lib/utils/registerInterfaceWithDefaultTheme'; + +export default registerInterfaceWithDefaultTheme; diff --git a/src/initialize.js b/src/initialize.js index 4530f1f3..9b357071 100644 --- a/src/initialize.js +++ b/src/initialize.js @@ -1,3 +1,3 @@ -import registerCSSInterfaceWithDefaultTheme from '../scripts/utils/registerCSSInterfaceWithDefaultTheme'; +import registerCSSInterfaceWithDefaultTheme from './utils/registerCSSInterfaceWithDefaultTheme'; registerCSSInterfaceWithDefaultTheme(); diff --git a/src/utils/registerCSSInterfaceWithDefaultTheme.js b/src/utils/registerCSSInterfaceWithDefaultTheme.js new file mode 100644 index 00000000..6b3956ce --- /dev/null +++ b/src/utils/registerCSSInterfaceWithDefaultTheme.js @@ -0,0 +1,7 @@ +import CSSInterface from 'react-with-styles-interface-css'; + +import registerInterfaceWithDefaultTheme from './registerInterfaceWithDefaultTheme'; + +export default function registerCSSInterfaceWithDefaultTheme() { + registerInterfaceWithDefaultTheme(CSSInterface); +} diff --git a/src/utils/registerInterfaceWithDefaultTheme.js b/src/utils/registerInterfaceWithDefaultTheme.js new file mode 100644 index 00000000..4092b870 --- /dev/null +++ b/src/utils/registerInterfaceWithDefaultTheme.js @@ -0,0 +1,7 @@ +import ThemedStyleSheet from 'react-with-styles/lib/ThemedStyleSheet'; +import DefaultTheme from '../themes/DefaultTheme'; + +export default function registerInterfaceWithDefaultTheme(reactWithStylesInterface) { + ThemedStyleSheet.registerInterface(reactWithStylesInterface); + ThemedStyleSheet.registerTheme(DefaultTheme); +}