Skip to content

Commit f5580ac

Browse files
authored
Merge pull request #1041 from airbnb/maja-bump-rws-and-rws-css
Bump RWS and RWS interfaces
2 parents c22ccc2 + f953b03 commit f5580ac

File tree

3 files changed

+23
-11
lines changed

3 files changed

+23
-11
lines changed

package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@
9999
"raw-loader": "^0.5.1",
100100
"react": "^0.14 || ^15.5.4 || ^16.1.1",
101101
"react-dom": "^0.14 || ^15.5.4 || ^16.1.1",
102-
"react-with-styles-interface-aphrodite": "^3.1.1",
103-
"react-with-styles-interface-css-compiler": "^1.1.0",
102+
"react-with-styles-interface-aphrodite": "^4.0.1",
103+
"react-with-styles-interface-css-compiler": "^1.1.2",
104104
"rimraf": "^2.6.2",
105105
"safe-publish-latest": "^1.1.1",
106106
"sass-loader": "^6.0.6",
@@ -120,7 +120,7 @@
120120
"react-addons-shallow-compare": "^15.6.2",
121121
"react-moment-proptypes": "^1.5.0",
122122
"react-portal": "^4.1.2",
123-
"react-with-styles": "=2.2.0",
123+
"react-with-styles": "^3.1.0",
124124
"react-with-styles-interface-css": "^4.0.0"
125125
},
126126
"peerDependencies": {

scripts/buildCSS.js

+2-8
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,8 @@ require('../test/_helpers/ignoreSVGStrings');
1616
registerMaxSpecificity(0);
1717
registerCSSInterfaceWithDefaultTheme();
1818

19-
const DateRangePickerPath = './examples/DateRangePickerWrapper.jsx';
20-
const SingleDatePickerPath = './examples/SingleDatePickerWrapper.jsx';
21-
const PresetDateRangePickerPath = './examples/PresetDateRangePicker.jsx';
22-
23-
const dateRangePickerCSS = compileCSS(DateRangePickerPath);
24-
const singleDatePickerCSS = compileCSS(SingleDatePickerPath);
25-
const presetDatePickerCSS = compileCSS(PresetDateRangePickerPath);
26-
const CSS = dateRangePickerCSS + singleDatePickerCSS + presetDatePickerCSS;
19+
const path = './scripts/renderAllComponents.jsx';
20+
const CSS = compileCSS(path);
2721

2822
const format = new CleanCSS({
2923
level: optimizeForProduction ? 2 : 0,

scripts/renderAllComponents.jsx

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import React from 'react';
2+
import ReactDOM from 'react-dom';
3+
4+
import DateRangePickerWrapper from '../examples/DateRangePickerWrapper';
5+
import SingleDatePickerWrapper from '../examples/SingleDatePickerWrapper';
6+
import PresetDateRangePickerWrapper from '../examples/PresetDateRangePicker';
7+
8+
function App() {
9+
return (
10+
<div>
11+
<DateRangePickerWrapper />
12+
<SingleDatePickerWrapper />
13+
<PresetDateRangePickerWrapper />
14+
</div>
15+
);
16+
}
17+
18+
ReactDOM.render(<App />, document.querySelector('#root'));

0 commit comments

Comments
 (0)