Skip to content

fix(pf4): use tree shaking for PF4 dep #299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 3, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions packages/pf4-component-mapper/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
"@babel/preset-env": "^7.1.6",
"@babel/preset-react": "^7.0.0",
"@data-driven-forms/react-form-renderer": "*",
"@patternfly/react-core": "^3.104.0",
"@patternfly/react-icons": "^3.14.23",
"@patternfly/react-core": "^3.134.2",
"@patternfly/react-icons": "^3.14.39",
"@semantic-release/git": "^7.0.5",
"@semantic-release/npm": "^5.1.1",
"babel-core": "^7.0.0-bridge.0",
Expand Down Expand Up @@ -61,6 +61,7 @@
"rollup-plugin-sass": "^1.2.2",
"rollup-plugin-size-snapshot": "^0.10.0",
"rollup-plugin-terser": "^5.1.2",
"rollup-pluginutils": "^2.8.2",
"sass-loader": "^7.1.0",
"semantic-release": "15.12.0",
"style-loader": "^0.23.1",
Expand Down
15 changes: 13 additions & 2 deletions packages/pf4-component-mapper/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,24 @@ import replace from 'rollup-plugin-replace';
import nodeGlobals from 'rollup-plugin-node-globals';
import { terser } from 'rollup-plugin-terser';
import { sizeSnapshot } from 'rollup-plugin-size-snapshot';
import { createFilter } from 'rollup-pluginutils';
import sass from 'rollup-plugin-sass';
import async from 'rollup-plugin-async';

const pf4Externals = createFilter([
'react',
'react-dom',
'prop-types',
'@data-driven-forms/react-form-renderer',
'@patternfly/react-core/**',
'@patternfly/react-icons/**',
], null, { resolve: false });

const globals = {
react: 'React',
'react-dom': 'ReactDOM',
'@patternfly/react-core': 'PatternflyReact',
'@patternfly/react-core': '@patternfly/react-core',
'@patternfly/react-icons': '@patternfly/react-icons',
'@data-driven-forms/react-form-renderer': '@data-driven-forms/react-form-renderer',
};

Expand All @@ -38,7 +49,7 @@ export default [{
exports: 'named',
globals,
},
external: Object.keys(globals),
external: pf4Externals,
plugins: [
async(),
nodeResolve(),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import React, { Fragment } from 'react';
import PropTypes from 'prop-types';
import { Grid, GridItem, Bullseye, FormHelperText } from '@patternfly/react-core';

import { Grid, GridItem } from '@patternfly/react-core/dist/js/layouts/Grid/index';
import { Bullseye } from '@patternfly/react-core/dist/js/layouts/Bullseye/index';
import { FormHelperText } from '@patternfly/react-core/dist/js/components/Form/FormHelperText';

import CloseIcon from '@patternfly/react-icons/dist/js/icons/close-icon';
import AddCircleOIcon from '@patternfly/react-icons/dist/js/icons/add-circle-o-icon';
Expand Down
19 changes: 9 additions & 10 deletions packages/pf4-component-mapper/src/form-fields/form-fields.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
import React from 'react';
import PropTypes from 'prop-types';
import MultipleChoiceList from './multiple-choice-list';
import {
TextInput,
Checkbox,
TextArea,
FormGroup,
TextContent,
Text,
TextVariants,
Switch,
} from '@patternfly/react-core';

import { Text, TextVariants } from '@patternfly/react-core/dist/js/components/Text/Text';
import { TextContent } from '@patternfly/react-core/dist/js/components/Text/TextContent';
import { FormGroup } from '@patternfly/react-core/dist/js/components/Form/FormGroup';
import { Switch } from '@patternfly/react-core/dist/js/components/Switch/Switch';
import { TextArea } from '@patternfly/react-core/dist/js/components/TextArea/TextArea';
import { Checkbox } from '@patternfly/react-core/dist/js/components/Checkbox/Checkbox';
import { TextInput } from '@patternfly/react-core/dist/js/components/TextInput/TextInput';

import { componentTypes } from '@data-driven-forms/react-form-renderer';
import Select from './select/select';
import RadioGroup from './radio';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
import React from 'react';
import PropTypes from 'prop-types';
import { layoutComponents } from '@data-driven-forms/react-form-renderer';
import { Form, Button, ActionGroup, TextContent, Text, TextVariants } from '@patternfly/react-core';

import { Text, TextVariants } from '@patternfly/react-core/dist/js/components/Text/Text';
import { TextContent } from '@patternfly/react-core/dist/js/components/Text/TextContent';
import { Form } from '@patternfly/react-core/dist/js/components/Form/Form';
import { ActionGroup } from '@patternfly/react-core/dist/js/components/Form/ActionGroup';
import { Button } from '@patternfly/react-core/dist/js/components/Button/Button';

import './layout-components-styles.scss';

const ButtonLayout = ({ label, bsStyle, children, disabled, ...props }) =>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Checkbox, FormGroup } from '@patternfly/react-core';

import { FormGroup } from '@patternfly/react-core/dist/js/components/Form/FormGroup';
import { Checkbox } from '@patternfly/react-core/dist/js/components/Checkbox/Checkbox';

import MultipleChoiceListCommon, { wrapperProps } from '@data-driven-forms/common/src/multiple-choice-list';

const FinalCheckbox = (props) => (
Expand Down
4 changes: 3 additions & 1 deletion packages/pf4-component-mapper/src/form-fields/plain-text.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Text, TextContent, TextVariants } from '@patternfly/react-core';

import { Text, TextVariants } from '@patternfly/react-core/dist/js/components/Text/Text';
import { TextContent } from '@patternfly/react-core/dist/js/components/Text/TextContent';

const PlainText = ({ label, name }) => (
<TextContent>
Expand Down
3 changes: 2 additions & 1 deletion packages/pf4-component-mapper/src/form-fields/radio.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Radio } from '@patternfly/react-core';

import { Radio } from '@patternfly/react-core/dist/js/components/Radio/Radio';

const RadioGroup = ({ FieldProvider, options, isDisabled, isReadOnly, input, ...props }) => options.map(option => (
<FieldProvider
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Button, ButtonVariant } from '@patternfly/react-core';

import { Button, ButtonVariant } from '@patternfly/react-core/dist/js/components/Button/Button';

import TimesCircleIcon from '@patternfly/react-icons/dist/js/icons/times-circle-icon';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import { components } from 'react-select';
import PropTypes from 'prop-types';
import { Checkbox } from '@patternfly/react-core';
import { Checkbox } from '@patternfly/react-core/dist/js/components/Checkbox/Checkbox';

import CheckIcon from '@patternfly/react-icons/dist/js/icons/check-icon';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { Button } from '@patternfly/react-core';

import { Button } from '@patternfly/react-core/dist/js/components/Button/Button';

class ValueContainer extends Component {
state = {
Expand Down
7 changes: 5 additions & 2 deletions packages/pf4-component-mapper/src/form-fields/sub-form.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Title } from '@patternfly/react-core';
import { TextContent, Text, TextVariants, Grid, GridItem } from '@patternfly/react-core';

import { Text, TextVariants } from '@patternfly/react-core/dist/js/components/Text/Text';
import { TextContent } from '@patternfly/react-core/dist/js/components/Text/TextContent';
import { Grid, GridItem } from '@patternfly/react-core/dist/js/layouts/Grid/index';
import { Title } from '@patternfly/react-core/dist/js/components/Title/Title';

const SubForm = ({
fields,
Expand Down
4 changes: 3 additions & 1 deletion packages/pf4-component-mapper/src/form-fields/tabs.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Tabs, Tab } from '@patternfly/react-core';

import { Tab } from '@patternfly/react-core/dist/js/components/Tabs/Tab';
import { Tabs } from '@patternfly/react-core/dist/js/components/Tabs/Tabs';

class FormTabs extends React.Component {
state = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Button } from '@patternfly/react-core';
import { Button } from '@patternfly/react-core/dist/js/components/Button/Button';
import selectNext from '@data-driven-forms/common/src/wizard/select-next';

const SimpleNext = ({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import React from 'react';
import { WizardNavItem, WizardNav } from '@patternfly/react-core';

import { WizardNavItem } from '@patternfly/react-core/dist/js/components/Wizard/WizardNavItem';
import { WizardNav } from '@patternfly/react-core/dist/js/components/Wizard/WizardNav';

import isEqual from 'lodash/isEqual';
import get from 'lodash/get';
import PropTypes from 'prop-types';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React, { Fragment } from 'react';
import { WizardBody, Title } from '@patternfly/react-core';
import { WizardBody } from '@patternfly/react-core/dist/js/components/Wizard/WizardBody';
import { Title } from '@patternfly/react-core/dist/js/components/Title/Title';
import PropTypes from 'prop-types';
import WizardStepButtons from './step-buttons';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
import React, { cloneElement } from 'react';
import { createPortal } from 'react-dom';
import PropTypes from 'prop-types';
import { WizardHeader, Backdrop, Bullseye, WizardNav } from '@patternfly/react-core';

import { WizardHeader } from '@patternfly/react-core/dist/js/components/Wizard/WizardHeader';
import { WizardNav } from '@patternfly/react-core/dist/js/components/Wizard/WizardNav';
import { Backdrop } from '@patternfly/react-core/dist/js/components/Backdrop/Backdrop';
import { Bullseye } from '@patternfly/react-core/dist/js/layouts/Bullseye/index';

import WizardStep from './wizard-step';
import './wizard-styles.scss';
import get from 'lodash/get';
Expand Down
Loading