Skip to content

Commit 0e9f60e

Browse files
elenasharmaAdam Berkovec
authored andcommitted
feat(css-compiling): use webpack to compile react components' css
[#113975075] Signed-off-by: Adam Berkovec <aberkovec@pivotal.io>
1 parent 480e00c commit 0e9f60e

File tree

71 files changed

+314
-30
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+314
-30
lines changed

library/helpers/pui-aliases.js

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,20 @@ import glob from 'glob';
22
import path from 'path';
33

44
const reactPackageDirs = glob.sync('src/pivotal-ui-react/*', {realpath: true});
5-
6-
export default reactPackageDirs.reduce((memo, packageDir) => {
5+
const reactAliases = reactPackageDirs.reduce((memo, packageDir) => {
76
const componentName = path.basename(packageDir);
87
memo[`pui-react-${componentName}\$`] = path.join(packageDir, `${componentName}.js`);
98
memo[`pui-react-${componentName}`] = packageDir;
109
return memo;
1110
}, {});
11+
12+
const cssPackageDirs = glob.sync('src/pivotal-ui/components/*', {realpath: true});
13+
const cssAliases = cssPackageDirs.reduce((memo, packageDir) => {
14+
const componentName = path.basename(packageDir);
15+
memo[`pui-css-${componentName}\$`] = path.join(packageDir, 'index.js');
16+
memo[`pui-css-${componentName}`] = packageDir;
17+
return memo;
18+
}, {});
19+
20+
21+
export default {...cssAliases, ...reactAliases}

library/src/pivotal-ui-react/alerts/alerts.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ var React = require('react');
22
var types = React.PropTypes;
33
var BsAlert = require('react-bootstrap/lib/Alert');
44
var {Media} = require('pui-react-media');
5+
import 'pui-css-alerts';
6+
import 'pui-css-iconography';
57

68
var Alert = React.createClass({
79
propTypes: {

library/src/pivotal-ui-react/autocomplete/autocomplete.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ var React = require('react');
77
var ReactDOM = require('react-dom');
88
var scrollIntoView = require('scroll-into-view');
99
var TrieSearch = require('trie-search');
10+
import 'pui-css-autocomplete';
1011

1112
var types = React.PropTypes;
1213

library/src/pivotal-ui-react/back-to-top/back-to-top.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ var AnimationMixin = require('pui-react-animation');
33
var throttle = require('lodash.throttle');
44
var {getScrollTop, setScrollTop} = require('./scroll-top');
55
import {mergeProps} from 'pui-react-helpers';
6+
import 'pui-css-back-to-top';
67

78
var BackToTop = React.createClass({
89
mixins: [AnimationMixin],

library/src/pivotal-ui-react/buttons/buttons.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
var React = require('react');
22
import {mergeProps} from 'pui-react-helpers';
3+
import 'pui-css-buttons';
34

45
var UIButton = React.createClass({
56
propTypes: {

library/src/pivotal-ui-react/collapse/collapse.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ var React = require('react');
22
var types = React.PropTypes;
33
var BsPanel = require('react-bootstrap/lib/Panel');
44
import {mergeProps} from 'pui-react-helpers';
5+
import 'pui-css-collapse';
6+
import 'pui-css-iconography';
7+
import 'pui-css-dividers';
58

69
var BaseCollapse = React.createClass({
710
propTypes: {

library/src/pivotal-ui-react/dividers/dividers.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
var React = require('react');
22
var types = React.PropTypes;
33
import {mergeProps} from 'pui-react-helpers';
4+
import 'pui-css-dividers';
45

56
var DividerProps = {
67
propTypes: {

library/src/pivotal-ui-react/draggable-list/draggable-list.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ var types = React.PropTypes;
33
var classnames = require('classnames');
44
var move = require('./move_helper');
55
import {mergeProps} from 'pui-react-helpers';
6+
import 'pui-css-lists';
67

78
var HoverMixin = {
89
getInitialState() {

library/src/pivotal-ui-react/dropdowns/dropdowns.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
var React = require('react');
22
import classnames from 'classnames';
33
import uniqueid from 'lodash.uniqueid';
4+
import 'pui-css-dropdowns';
5+
import 'pui-css-iconography';
6+
import 'pui-css-button-group';
47

58
var BsDropdown = require('react-bootstrap/lib/Dropdown');
69

library/src/pivotal-ui-react/expander/expander.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
const React = require('react');
22
const Collapse = require('react-bootstrap/lib/Collapse');
3+
import 'pui-css-bootstrap';
34

45
const ExpanderTrigger = React.createClass({
56
getInitialState() {

library/src/pivotal-ui-react/grids/grids.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ var React = require('react');
22
var types = React.PropTypes;
33
var BootstrapRow = require('react-bootstrap/lib/Row');
44
import {mergeProps} from 'pui-react-helpers';
5+
import 'pui-css-grids';
56

67
var Row = React.createClass({
78
propTypes: {

library/src/pivotal-ui-react/iconography/iconography.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ const {PropTypes} = React;
33
const ReactFaIcon = require('react-fa/lib/Icon');
44
const objectAssign = require('object-assign');
55
const classnames = require('classnames');
6+
import 'pui-css-iconography';
67

78
class Icon extends React.Component {
89
render() {

library/src/pivotal-ui-react/images/images.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
var React = require('react');
22
var types = React.PropTypes;
33
import {mergeProps} from 'pui-react-helpers';
4+
import 'pui-css-images';
45

56
var Image = React.createClass({
67
propTypes: {

library/src/pivotal-ui-react/inputs/inputs.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ const React = require('react');
22
const types = React.PropTypes;
33
import {mergeProps} from 'pui-react-helpers';
44
import classnames from 'classnames';
5+
import 'pui-css-forms';
56

67
const SearchInput = React.createClass({
78
propTypes: {

library/src/pivotal-ui-react/labels/labels.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
var React = require('react');
22
import {mergeProps} from 'pui-react-helpers';
3+
import 'pui-css-labels';
34

45
var Label = React.createClass({
56
render() {

library/src/pivotal-ui-react/media/media.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
var React = require('react');
22
var classnames = require('classnames');
3+
import 'pui-css-media';
34

45
const shortSizes = {xsmall: 'xs', small: 'sm', medium: 'md', large: 'lg', xlarge: 'xl'};
56
const charSizes = {small: 's', medium: 'm', large: 'l', xlarge: 'xl'};

library/src/pivotal-ui-react/modals/modals.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
var React = require('react');
22
var {DefaultH4} = require('pui-react-typography');
33
import {mergeProps} from 'pui-react-helpers';
4+
import 'pui-css-modals';
45

56
const BsModal = require('react-bootstrap/lib/Modal');
67
const BsModalHeader = require('react-bootstrap/lib/ModalHeader');

library/src/pivotal-ui-react/overlay-trigger/overlay-trigger.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import BsOverlayTrigger from 'react-bootstrap/lib/OverlayTrigger';
22
import React from 'react';
33
import uniqueid from 'lodash.uniqueid';
4+
import 'pui-css-bootstrap';
45

56
const OverlayTrigger = React.createClass({
67
propTypes: {

library/src/pivotal-ui-react/overlay-trigger/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
"description": "A React component for displaying a tooltip or popover on user action",
44
"dependencies": {
55
"lodash.uniqueid": "^3.0.0",
6-
"react-bootstrap": "0.28.2"
6+
"react-bootstrap": "0.28.2",
7+
"pui-css-bootstrap": "^3.2.0"
78
},
89
"homepage": "http://styleguide.pivotal.io/react.html#tooltips_react"
9-
}
10+
}

library/src/pivotal-ui-react/panels/panels.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ const React = require('react');
22
const types = React.PropTypes;
33
const classnames = require('classnames');
44
import {mergeProps} from 'pui-react-helpers';
5+
import 'pui-css-panels';
56

67
const paddingTypes = [];
78
['p', 'm'].forEach(type => {

library/src/pivotal-ui-react/panes/panes.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
var React = require('react');
22
var types = React.PropTypes;
33
import {mergeProps} from 'pui-react-helpers';
4+
import 'pui-css-panes';
45

56
var BasePane = React.createClass({
67
propTypes: {

library/src/pivotal-ui-react/radio/radio.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
var React = require('react');
22
import {mergeProps} from 'pui-react-helpers';
3+
import 'pui-css-forms';
34

45
var Radio = React.createClass({
56
propTypes: {

library/src/pivotal-ui-react/ribbons/ribbons.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
var React = require('react');
22
import {mergeProps} from 'pui-react-helpers';
3+
import 'pui-css-ribbons';
34

45
var Ribbon = React.createClass({
56
render() {

library/src/pivotal-ui-react/select-fancy/select-fancy.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import classnames from 'classnames';
22
import {mergeProps} from 'pui-react-helpers';
33
import React from 'react';
4+
import 'pui-css-forms';
45

56
const types = React.PropTypes;
67

library/src/pivotal-ui-react/sortable-table/sortable-table.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ const sortBy = require('lodash.sortby');
44
const types = React.PropTypes;
55
import {mergeProps} from 'pui-react-helpers';
66
import findindex from 'lodash.findindex';
7+
import 'pui-css-iconography';
8+
import 'pui-css-tables';
79

810
export const TableHeader = React.createClass({
911
propTypes: {

library/src/pivotal-ui-react/tabs/tabs.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import uniqueid from 'lodash.uniqueid';
77
import classnames from 'classnames';
88
import raf from 'raf';
99
import MediaSize from './media-size';
10+
import 'pui-css-collapse';
11+
import 'pui-css-tabs';
1012

1113
const BaseTabs = React.createClass({
1214
propTypes: {

library/src/pivotal-ui-react/tile-layout/tile-layout.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
const React = require('react');
22
const classnames = require('classnames');
33
import {mergeProps} from 'pui-react-helpers';
4+
import 'pui-css-tile-layout';
45

56
const TileLayout = React.createClass({
67
propTypes: {
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import 'pui-css-tooltips';
2+
13
module.exports = {
24
Tooltip: require('react-bootstrap/lib/Tooltip')
35
};

library/src/pivotal-ui-react/typography/typography.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
var React = require('react');
22
import {mergeProps} from 'pui-react-helpers';
3+
import 'pui-css-typography';
34

45
var TypographyMixin = {
56
propTypes: {
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
try {
2+
require('pui-css-bootstrap');
3+
require('pui-css-typography');
4+
require('./alerts.css');
5+
} catch(e) {
6+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
try {
2+
require('./alignment.css');
3+
} catch(e) {
4+
}
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
try {
2+
require('pui-css-alerts');
3+
require('pui-css-alignment');
4+
require('pui-css-avatars');
5+
require('pui-css-back-to-top');
6+
require('pui-css-backgrounds');
7+
require('pui-css-bootstrap');
8+
require('pui-css-buttons');
9+
require('pui-css-code');
10+
require('pui-css-collapse');
11+
require('pui-css-colors');
12+
require('pui-css-dividers');
13+
require('pui-css-dropdowns');
14+
require('pui-css-ellipsis');
15+
require('pui-css-forms');
16+
require('pui-css-google-maps');
17+
require('pui-css-grids');
18+
require('pui-css-hoverable');
19+
require('pui-css-iconography');
20+
require('pui-css-images');
21+
require('pui-css-labels');
22+
require('pui-css-links');
23+
require('pui-css-lists');
24+
require('pui-css-media');
25+
require('pui-css-modals');
26+
require('pui-css-panels');
27+
require('pui-css-panes');
28+
require('pui-css-progress-bars');
29+
require('pui-css-ribbons');
30+
require('pui-css-scales');
31+
require('pui-css-spinners');
32+
require('pui-css-tables');
33+
require('pui-css-tabs');
34+
require('pui-css-tile-layout');
35+
require('pui-css-tooltips');
36+
require('pui-css-traffic-lights');
37+
require('pui-css-typography');
38+
require('pui-css-vertical-alignment');
39+
require('pui-css-whitespace');
40+
} catch(e) {
41+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
try {
2+
require('pui-css-bootstrap');
3+
require('pui-css-forms');
4+
require('./autocomplete.css');
5+
} catch(e) {
6+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
try {
2+
require('pui-css-bootstrap');
3+
require('./avatars.css');
4+
} catch(e) {
5+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
try {
2+
require('pui-css-bootstrap');
3+
require('pui-css-links');
4+
require('pui-css-iconography');
5+
require('./back-to-top.css');
6+
} catch(e) {
7+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
try {
2+
require('./backgrounds.css');
3+
} catch(e) {
4+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
try {
2+
require('pui-css-bootstrap');
3+
require('pui-css-buttons');
4+
require('./button-group.css');
5+
} catch(e) {
6+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
try {
2+
require('pui-css-bootstrap');
3+
require('pui-css-typography');
4+
require('./buttons.css');
5+
} catch(e) {
6+
}

library/src/pivotal-ui/components/code/code.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
box-shadow: 0 2px 0 $shadow-1;
3131

3232
&::before {
33-
content: '\F111 \0000a0 \0000a0 \0000a0 \0000a0 \F111 \0000a0 \0000a0 \0000a0 \0000a0 \F111';
33+
content: '\F111 \a0 \a0 \F111 \a0 \a0 \F111';
3434
color: $gray-4;
3535
font-size: 13px;
3636
font-family: FontAwesome;
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
try {
2+
require('pui-css-iconography');
3+
require('./code.css');
4+
} catch(e) {
5+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
try {
2+
require('pui-css-bootstrap');
3+
require('./collapse.css');
4+
} catch(e) {
5+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
try {
2+
require('./colors.css');
3+
} catch(e) {
4+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
try {
2+
require('./dividers.css');
3+
} catch(e) {
4+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
try {
2+
require('pui-css-bootstrap');
3+
require('pui-css-buttons');
4+
require('./dropdowns.css');
5+
} catch(e) {
6+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
try {
2+
require('./ellipsis.css');
3+
} catch(e) {
4+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
try {
2+
require('pui-css-bootstrap');
3+
require('./forms.css');
4+
} catch(e) {
5+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
try {
2+
require('./google-maps.css');
3+
} catch(e) {
4+
}

0 commit comments

Comments
 (0)