Skip to content

Commit 5f846b2

Browse files
Hyperkid123Hyperkid123
authored
Merge pull request #153 from data-driven-forms/switch-to-rollup
fix(all): migrated to rullop because of webpack issues.
2 parents 9d2d1c8 + 78c9e60 commit 5f846b2

File tree

12 files changed

+306
-8
lines changed

12 files changed

+306
-8
lines changed

‎.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,7 @@ yarn.lock
6868
packages/react-renderer-demo/public/vendor.css
6969

7070
# Firebase
71-
.firebase
71+
.firebase
72+
73+
# Rollup build info
74+
**/size-snapshot.json

‎packages/mui-component-mapper/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"license": "Apache-2.0",
77
"scripts": {
88
"start": "webpack-dev-server --env dev --config ./config/webpack.config.js --open --hot",
9-
"build": "webpack --env prod --config ./config/webpack.config.js",
9+
"build": "rollup -c ./rollup.config.js",
1010
"vendor": "webpack --env vendor --config ./config/webpack.config.js",
1111
"release": "semantic-release"
1212
},
@@ -48,6 +48,7 @@
4848
"react-dom": "^16.8.3",
4949
"regenerator-runtime": "^0.12.1",
5050
"resolve-url-loader": "^3.0.0",
51+
"rollup-pluginutils": "^2.8.2",
5152
"sass-loader": "^7.1.0",
5253
"semantic-release": "15.12.0",
5354
"style-loader": "^0.23.1",

‎packages/mui-component-mapper/rollup.config.js

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
import nodeResolve from 'rollup-plugin-node-resolve';
2+
import commonjs from 'rollup-plugin-commonjs';
3+
import babel from 'rollup-plugin-babel';
4+
import replace from 'rollup-plugin-replace';
5+
import nodeGlobals from 'rollup-plugin-node-globals';
6+
import { terser } from 'rollup-plugin-terser';
7+
import { sizeSnapshot } from 'rollup-plugin-size-snapshot';
8+
import { createFilter } from 'rollup-pluginutils';
9+
import sass from 'rollup-plugin-sass';
10+
import async from 'rollup-plugin-async';
11+
12+
const muiExternals = createFilter([
13+
'react',
14+
'react-dom',
15+
'prop-types',
16+
'@data-driven-forms/react-form-renderer',
17+
'@material-ui/core/**',
18+
'@material-ui/styles/**',
19+
'@material-ui/icons/**',
20+
], null, { resolve: false });
21+
22+
const globals = {
23+
react: 'React',
24+
'react-dom': 'ReactDOM',
25+
'@data-driven-forms/react-form-renderer': '@data-driven-forms/react-form-renderer',
26+
'@material-ui/core': '@material-ui/core',
27+
'@material-ui/utils': '@material-ui/utils',
28+
};
29+
30+
const babelOptions = {
31+
exclude: /node_modules/,
32+
runtimeHelpers: true,
33+
configFile: '../../babel.config.js',
34+
};
35+
36+
const commonjsOptions = {
37+
ignoreGlobal: true,
38+
include: /node_modules/,
39+
namedExports: {
40+
'../react-form-renderer/dist/index.js': [ 'composeValidators' ],
41+
'../../node_modules/prop-types/index.js': [
42+
'elementType',
43+
'bool',
44+
'func',
45+
'object',
46+
'oneOfType',
47+
'element',
48+
'string',
49+
'number',
50+
'instanceOf',
51+
'oneOf',
52+
'arrayOf',
53+
'any',
54+
'shape',
55+
'node',
56+
],
57+
'../../node_modules/react-is/index.js': [
58+
'ForwardRef',
59+
'isLazy',
60+
'isMemo',
61+
'isValidElementType',
62+
],
63+
},
64+
};
65+
66+
export default [{
67+
input: './src/index.js',
68+
output: {
69+
file: './dist/index.js',
70+
format: 'umd',
71+
name: '@data-driven-forms/mui-component-mapper',
72+
exports: 'named',
73+
globals,
74+
},
75+
external: muiExternals,
76+
plugins: [
77+
async(),
78+
nodeResolve(),
79+
babel(babelOptions),
80+
commonjs(commonjsOptions),
81+
nodeGlobals(), // Wait for https://github.com/cssinjs/jss/pull/893
82+
replace({ 'process.env.NODE_ENV': JSON.stringify('production') }),
83+
sizeSnapshot({ snapshotPath: 'size-snapshot.json' }),
84+
terser({
85+
keep_classnames: true,
86+
keep_fnames: true,
87+
}),
88+
sass({
89+
insert: true,
90+
}),
91+
],
92+
}];

‎packages/pf3-component-mapper/package.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"license": "Apache-2.0",
77
"scripts": {
88
"start": "webpack-dev-server --env dev --config ./config/webpack.config.js --open --hot",
9-
"build": "webpack --env prod --config ./config/webpack.config.js",
9+
"build": "rollup -c ./rollup.config.js",
1010
"vendor": "webpack --env vendor --config ./config/webpack.config.js",
1111
"release": "semantic-release"
1212
},
@@ -52,6 +52,16 @@
5252
"react-dom": "^16.6.3",
5353
"regenerator-runtime": "^0.12.1",
5454
"resolve-url-loader": "^3.0.0",
55+
"rollup": "^1.23.1",
56+
"rollup-plugin-async": "^1.2.0",
57+
"rollup-plugin-babel": "^4.3.3",
58+
"rollup-plugin-commonjs": "^10.1.0",
59+
"rollup-plugin-node-globals": "^1.4.0",
60+
"rollup-plugin-node-resolve": "^5.2.0",
61+
"rollup-plugin-replace": "^2.2.0",
62+
"rollup-plugin-sass": "^1.2.2",
63+
"rollup-plugin-size-snapshot": "^0.10.0",
64+
"rollup-plugin-terser": "^5.1.2",
5565
"sass-loader": "^7.1.0",
5666
"semantic-release": "15.12.0",
5767
"style-loader": "^0.23.1",

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

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
import nodeResolve from 'rollup-plugin-node-resolve';
2+
import commonjs from 'rollup-plugin-commonjs';
3+
import babel from 'rollup-plugin-babel';
4+
import replace from 'rollup-plugin-replace';
5+
import nodeGlobals from 'rollup-plugin-node-globals';
6+
import { terser } from 'rollup-plugin-terser';
7+
import { sizeSnapshot } from 'rollup-plugin-size-snapshot';
8+
import sass from 'rollup-plugin-sass';
9+
import async from 'rollup-plugin-async';
10+
11+
const globals = {
12+
react: 'React',
13+
'react-dom': 'ReactDOM',
14+
'patternfly-react': 'PatternflyReact',
15+
'@data-driven-forms/react-form-renderer': '@data-driven-forms/react-form-renderer',
16+
};
17+
18+
const babelOptions = {
19+
exclude: /node_modules/,
20+
runtimeHelpers: true,
21+
configFile: '../../babel.config.js',
22+
};
23+
24+
const commonjsOptions = {
25+
ignoreGlobal: true,
26+
include: /node_modules/,
27+
namedExports: {
28+
'../react-form-renderer/dist/index.js': [ 'composeValidators' ],
29+
},
30+
};
31+
32+
export default [{
33+
input: './src/index.js',
34+
output: {
35+
file: './dist/index.js',
36+
format: 'umd',
37+
name: '@data-driven-forms/pf3-component-mapper',
38+
exports: 'named',
39+
globals,
40+
},
41+
external: Object.keys(globals),
42+
plugins: [
43+
async(),
44+
nodeResolve(),
45+
babel(babelOptions),
46+
commonjs(commonjsOptions),
47+
nodeGlobals(), // Wait for https://github.com/cssinjs/jss/pull/893
48+
replace({ 'process.env.NODE_ENV': JSON.stringify('production') }),
49+
sizeSnapshot({ snapshotPath: 'size-snapshot.json' }),
50+
terser({
51+
keep_classnames: true,
52+
keep_fnames: true,
53+
}),
54+
sass({
55+
insert: true,
56+
}),
57+
],
58+
}];

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

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

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import YearSelector from './year-selector';
66
import TimePicker from './time-picker';
77
import DayPicker from 'react-day-picker/DayPicker';
88
import MomentLocaleUtils from 'react-day-picker/moment';
9-
import 'react-day-picker/lib/style.css';
109
import './date-picker-styles.scss';
1110

1211
const PopoverRoot = ({

‎packages/pf4-component-mapper/package.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"license": "Apache-2.0",
77
"scripts": {
88
"start": "webpack-dev-server --env dev --config ./config/webpack.config.js --open --hot",
9-
"build": "webpack --env prod --config ./config/webpack.config.js",
9+
"build": "rollup -c ./rollup.config.js",
1010
"release": "semantic-release"
1111
},
1212
"repository": "[email protected]:data-driven-forms/react-forms.git",
@@ -51,6 +51,16 @@
5151
"react-dom": "^16.6.3",
5252
"regenerator-runtime": "^0.12.1",
5353
"resolve-url-loader": "^3.0.0",
54+
"rollup": "^1.23.1",
55+
"rollup-plugin-async": "^1.2.0",
56+
"rollup-plugin-babel": "^4.3.3",
57+
"rollup-plugin-commonjs": "^10.1.0",
58+
"rollup-plugin-node-globals": "^1.4.0",
59+
"rollup-plugin-node-resolve": "^5.2.0",
60+
"rollup-plugin-replace": "^2.2.0",
61+
"rollup-plugin-sass": "^1.2.2",
62+
"rollup-plugin-size-snapshot": "^0.10.0",
63+
"rollup-plugin-terser": "^5.1.2",
5464
"sass-loader": "^7.1.0",
5565
"semantic-release": "15.12.0",
5666
"style-loader": "^0.23.1",

‎packages/pf4-component-mapper/rollup.config.js

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
import nodeResolve from 'rollup-plugin-node-resolve';
2+
import commonjs from 'rollup-plugin-commonjs';
3+
import babel from 'rollup-plugin-babel';
4+
import replace from 'rollup-plugin-replace';
5+
import nodeGlobals from 'rollup-plugin-node-globals';
6+
import { terser } from 'rollup-plugin-terser';
7+
import { sizeSnapshot } from 'rollup-plugin-size-snapshot';
8+
import sass from 'rollup-plugin-sass';
9+
import async from 'rollup-plugin-async';
10+
11+
const globals = {
12+
react: 'React',
13+
'react-dom': 'ReactDOM',
14+
'@patternfly/react-core': 'PatternflyReact',
15+
'@patternfly/react-icons': 'PatternflyReactIcons',
16+
'@data-driven-forms/react-form-renderer': '@data-driven-forms/react-form-renderer',
17+
};
18+
19+
const babelOptions = {
20+
exclude: /node_modules/,
21+
runtimeHelpers: true,
22+
configFile: '../../babel.config.js',
23+
};
24+
25+
const commonjsOptions = {
26+
ignoreGlobal: true,
27+
include: /node_modules/,
28+
namedExports: {
29+
'../react-form-renderer/dist/index.js': [ 'composeValidators' ],
30+
},
31+
};
32+
33+
export default [{
34+
input: './src/index.js',
35+
output: {
36+
file: './dist/index.js',
37+
format: 'umd',
38+
name: '@data-driven-forms/pf4-component-mapper',
39+
exports: 'named',
40+
globals,
41+
},
42+
external: Object.keys(globals),
43+
plugins: [
44+
async(),
45+
nodeResolve(),
46+
babel(babelOptions),
47+
commonjs(commonjsOptions),
48+
nodeGlobals(), // Wait for https://github.com/cssinjs/jss/pull/893
49+
replace({ 'process.env.NODE_ENV': JSON.stringify('production') }),
50+
sizeSnapshot({ snapshotPath: 'size-snapshot.json' }),
51+
terser({
52+
keep_classnames: true,
53+
keep_fnames: true,
54+
}),
55+
sass({
56+
insert: true,
57+
}),
58+
],
59+
}];

‎packages/react-form-renderer/package.json

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"license": "Apache-2.0",
77
"scripts": {
88
"start": "webpack-dev-server --env dev --config ./config/webpack.config.js --open --hot",
9-
"build": "webpack --env prod --config ./config/webpack.config.js",
9+
"build": "rollup -c ./rollup.config.js",
1010
"release": "semantic-release"
1111
},
1212
"repository": "[email protected]:data-driven-forms/react-forms.git",
@@ -17,6 +17,7 @@
1717
],
1818
"devDependencies": {
1919
"@babel/core": "^7.2.2",
20+
"@babel/plugin-proposal-class-properties": "^7.1.0",
2021
"@babel/plugin-syntax-dynamic-import": "^7.0.0",
2122
"@babel/preset-env": "^7.1.6",
2223
"@babel/preset-react": "^7.0.0",
@@ -47,6 +48,14 @@
4748
"react-dom": "^16.6.3",
4849
"regenerator-runtime": "^0.12.1",
4950
"resolve-url-loader": "^3.0.0",
51+
"rollup": "^1.23.1",
52+
"rollup-plugin-babel": "^4.3.3",
53+
"rollup-plugin-commonjs": "^10.1.0",
54+
"rollup-plugin-node-globals": "^1.4.0",
55+
"rollup-plugin-node-resolve": "^5.2.0",
56+
"rollup-plugin-replace": "^2.2.0",
57+
"rollup-plugin-size-snapshot": "^0.10.0",
58+
"rollup-plugin-terser": "^5.1.2",
5059
"sass-loader": "^7.1.0",
5160
"semantic-release": "15.12.0",
5261
"style-loader": "^0.23.1",
@@ -69,10 +78,10 @@
6978
]
7079
},
7180
"dependencies": {
72-
"@babel/plugin-proposal-class-properties": "^7.1.0",
7381
"final-form": "^4.12.0",
7482
"final-form-arrays": "^3.0.1",
7583
"final-form-focus": "^1.1.2",
84+
"lodash": "^4.17.15",
7685
"react-final-form": "^4.1.0",
7786
"react-final-form-arrays": "^2.0.1"
7887
},

0 commit comments

Comments
 (0)