Skip to content

Commit c0b07a8

Browse files
authored
Merge pull request #161 from data-driven-forms/use-postcss-for-pf3
Use postcss for pf3
2 parents 56cfef8 + ea0e30a commit c0b07a8

File tree

5 files changed

+16
-11
lines changed

5 files changed

+16
-11
lines changed

packages/pf3-component-mapper/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"eslint-plugin-react": "^7.11.1",
4646
"html-webpack-plugin": "^3.2.0",
4747
"mini-css-extract-plugin": "^0.4.4",
48-
"node-sass": "^4.10.0",
48+
"node-sass": "^4.12.0",
4949
"patternfly-react": "^2.28.2",
5050
"prop-types": "^15.6.2",
5151
"react": "^16.6.3",
@@ -58,8 +58,8 @@
5858
"rollup-plugin-commonjs": "^10.1.0",
5959
"rollup-plugin-node-globals": "^1.4.0",
6060
"rollup-plugin-node-resolve": "^5.2.0",
61+
"rollup-plugin-postcss": "^2.0.3",
6162
"rollup-plugin-replace": "^2.2.0",
62-
"rollup-plugin-sass": "^1.2.2",
6363
"rollup-plugin-size-snapshot": "^0.10.0",
6464
"rollup-plugin-terser": "^5.1.2",
6565
"sass-loader": "^7.1.0",

packages/pf3-component-mapper/rollup.config.js

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import replace from 'rollup-plugin-replace';
55
import nodeGlobals from 'rollup-plugin-node-globals';
66
import { terser } from 'rollup-plugin-terser';
77
import { sizeSnapshot } from 'rollup-plugin-size-snapshot';
8-
import sass from 'rollup-plugin-sass';
98
import async from 'rollup-plugin-async';
9+
import postcss from 'rollup-plugin-postcss';
1010

1111
const globals = {
1212
react: 'React',
@@ -23,9 +23,14 @@ const babelOptions = {
2323

2424
const commonjsOptions = {
2525
ignoreGlobal: true,
26-
include: /node_modules/,
26+
include: [
27+
/node_modules/,
28+
'../../node_modules/**',
29+
30+
],
2731
namedExports: {
2832
'../react-form-renderer/dist/index.js': [ 'composeValidators' ],
33+
'../../node_modules/react-day-picker/DayPicker.js': [ 'DayPicker' ],
2934
},
3035
};
3136

@@ -42,17 +47,17 @@ export default [{
4247
plugins: [
4348
async(),
4449
nodeResolve(),
45-
babel(babelOptions),
4650
commonjs(commonjsOptions),
51+
babel(babelOptions),
4752
nodeGlobals(), // Wait for https://github.com/cssinjs/jss/pull/893
4853
replace({ 'process.env.NODE_ENV': JSON.stringify('production') }),
4954
sizeSnapshot({ snapshotPath: 'size-snapshot.json' }),
5055
terser({
5156
keep_classnames: true,
5257
keep_fnames: true,
5358
}),
54-
sass({
55-
insert: true,
59+
postcss({
60+
inject: true,
5661
}),
5762
],
5863
}];

packages/pf3-component-mapper/src/form-fields/date-time-picker/date-picker-styles.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
@import '~react-day-picker/lib/style.css';
2-
31
.picker-input[readonly]:hover {
42
border-color: #7dc3e8;
53
}

packages/pf3-component-mapper/src/form-fields/date-time-picker/date-time-picker.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import PickerInput from './picker-input';
55
import PopoverRoot from './popover-root';
66
import { createDisabledDays } from './helpers';
77

8+
import 'react-day-picker/lib/style.css';
9+
810
const selectValidDate = (newDate, disabledDays) => {
911
const { after, before } = disabledDays.find(item => typeof item === 'object' && !(item instanceof Date)) || {};
1012
if (before && newDate < before) {

packages/pf3-component-mapper/src/form-fields/date-time-picker/popover-root.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import Navbar from './navbar';
44
import MonthSelector from './month-selector';
55
import YearSelector from './year-selector';
66
import TimePicker from './time-picker';
7-
import DayPicker from 'react-day-picker/DayPicker';
7+
import * as DayPicker from 'react-day-picker/DayPicker';
88
import MomentLocaleUtils from 'react-day-picker/moment';
99
import './date-picker-styles.scss';
1010

@@ -54,7 +54,7 @@ const PopoverRoot = ({
5454
onPreviousClick={ () => yearChange(selectedDay ? selectedDay.getFullYear() - 1 : new Date().getFullYear() - 1) }
5555
/>)
5656
:
57-
<DayPicker
57+
<DayPicker.DayPicker
5858
onDayClick={ onDayClick }
5959
selectedDays={ selectedDay }
6060
month={ selectedDay }

0 commit comments

Comments
 (0)