Skip to content

Commit ce7022c

Browse files
committed
Merge pull request #48 from sunesimonsen/fix/unique-component-alias
Unique alias for components to avoid conflicts with host projects.
2 parents fe2edb9 + fab6935 commit ce7022c

File tree

8 files changed

+12
-10
lines changed

8 files changed

+12
-10
lines changed

src/components/Components/Components.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Component, PropTypes } from 'react';
2-
import ReactComponent from 'components/ReactComponent';
2+
import ReactComponent from 'react-styleguidist/components/ReactComponent';
33

44
export default class Components extends Component {
55
static propTypes = {

src/components/Layout/Layout.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Component, PropTypes } from 'react';
2-
import Components from 'components/Components';
2+
import Components from 'react-styleguidist/components/Components';
33

44
import s from './Layout.css';
55

src/components/Playground/Playground.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Component, PropTypes } from 'react';
2-
import Editor from 'components/Editor';
3-
import Preview from 'components/Preview';
2+
import Editor from 'react-styleguidist/components/Editor';
3+
import Preview from 'react-styleguidist/components/Preview';
44

55
import s from './Playground.css';
66

src/components/Preview/Preview.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import React, { Component, PropTypes } from 'react';
44
import ReactDOM from 'react-dom';
55
import babel from 'babel-core/browser';
6-
import Wrapper from 'components/Wrapper';
6+
import Wrapper from 'react-styleguidist/components/Wrapper';
77

88
import s from './Preview.css';
99

src/components/ReactComponent/ReactComponent.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Component, PropTypes } from 'react';
2-
import Props from 'components/Props';
3-
import Playground from 'components/Playground';
2+
import Props from 'react-styleguidist/components/Props';
3+
import Playground from 'react-styleguidist/components/Playground';
44

55
import s from './ReactComponent.css';
66

src/components/StyleGuide/StyleGuide.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Component } from 'react';
2-
import Layout from 'components/Layout';
2+
import Layout from 'react-styleguidist/components/Layout';
33

44
export default class StyleGuide extends Component {
55
render() {

src/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
22
import ReactDOM from 'react-dom';
33
import { setComponentsNames, globalizeComponents } from './utils/utils';
4-
import StyleGuide from 'components/StyleGuide';
4+
import StyleGuide from 'react-styleguidist/components/StyleGuide';
55

66
import './styles.css';
77

src/make-webpack-config.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ module.exports = function(env) {
1212
var isProd = env === 'production';
1313

1414
var codeMirrorPath = path.join(__dirname, '../../codemirror'); // npm 3
15+
var componentsPath = path.join(__dirname, 'components');
1516
if (!fs.existsSync(codeMirrorPath)) {
1617
codeMirrorPath = path.join(__dirname, '../node_modules/codemirror'); // npm 2 or react-styleguidist develop
1718
}
@@ -40,7 +41,8 @@ module.exports = function(env) {
4041
'node_modules'
4142
],
4243
alias: {
43-
'codemirror': codeMirrorPath
44+
'codemirror': codeMirrorPath,
45+
'react-styleguidist/components': componentsPath
4446
}
4547
},
4648
resolveLoader: {

0 commit comments

Comments
 (0)