chore(release): merge master for 2020.04

.eslintignore

@@ -13,6 +13,7 @@ coverage
 **/build
 css
 packages/react-icons/src/icons
+packages/react-docs/static
 
 # package managers
 yarn-error.log

package.json

@@ -75,8 +75,8 @@
     "lint": "node --max-old-space-size=4096 node_modules/.bin/eslint --ext js,jsx,ts,tsx --cache",
     "lint:md": "yarn eslint packages --ext md --no-eslintrc --config .eslintrc-md.json --cache",
     "lint:ts": "yarn lint packages",
-    "lint:versions": "node ./scripts/verifyPatternflyVersions.js",
-    "prettier": "node node_modules/.bin/prettier --write \"packages/**/*.{js,ts,tsx}\" \"scripts/**/*.{js,ts,tsx}\"",
+    "lint:versions": "node scripts/verifyPatternflyVersions.js",
+    "prettier": "node node_modules/.bin/prettier --write \"packages/**/*.{js,jsx,ts,tsx}\" \"scripts/**/*.{js,jsx,ts,tsx}\"",
     "serve:docs": "lerna run serve",
     "serve:integration": "lerna run serve:demo-app",
     "start": "yarn build && lerna run develop --parallel --stream",

packages/react-catalog-view-extension/package.json

@@ -29,7 +29,7 @@
   },
   "homepage": "https://github.com/patternfly/patternfly-react/blob/master/packages/react-catalog-view-extension/README.md",
   "scripts": {
-    "build": "yarn build:babel && yarn build:types && node ./scripts/copyTS.js && yarn build:sass",
+    "build": "yarn build:babel && yarn build:types && yarn build:sass",
     "build:babel": "concurrently 'yarn build:babel:esm && yarn build:babel:umd' 'yarn build:babel:cjs'",
     "build:babel:cjs": "babel --source-maps --extensions '.js,.ts,.tsx' src --out-dir dist/js --presets=@babel/env",
     "build:babel:esm": "babel --source-maps --extensions '.js,.ts,.tsx' src --out-dir dist/esm",

packages/react-catalog-view-extension/src/components/CatalogItemHeader/CatalogItemHeader.tsx

@@ -1,8 +1,6 @@
 import * as React from 'react';
 import classNames from 'classnames';
 
-import { Omit } from '../../helpers/typeUtils';
-
 export interface CatalogItemHeaderProps extends Omit<React.HTMLProps<HTMLElement>, 'title'> {
   /** Additional css classes */
   className?: string;

packages/react-catalog-view-extension/src/components/CatalogTile/CatalogTile.tsx

@@ -7,7 +7,6 @@ import { CardBody } from '@patternfly/react-core/dist/js/components/Card/CardBod
 import { CardFooter } from '@patternfly/react-core/dist/js/components/Card/CardFooter';
 import classNames from 'classnames';
 
-import { Omit } from '../../helpers/typeUtils';
 export interface CatalogTileProps extends Omit<React.HTMLProps<HTMLElement>, 'title'> {
   /** Id */
   id?: any;

packages/react-catalog-view-extension/src/components/CatalogTile/CatalogTileBadge.tsx

@@ -2,8 +2,6 @@ import * as React from 'react';
 import { Tooltip } from '@patternfly/react-core';
 import classNames from 'classnames';
 
-import { Omit } from '../../helpers/typeUtils';
-
 export interface CatalogTileBadgeProps extends Omit<React.HTMLProps<HTMLElement>, 'title'> {
   /** Children (typically an Icon) */
   children?: React.ReactNode;

packages/react-catalog-view-extension/src/components/FilterSidePanel/FilterSidePanelCategory.tsx

@@ -5,7 +5,6 @@ import { default as formStyles } from '@patternfly/react-styles/css/components/F
 import { css } from '@patternfly/react-styles';
 
 import { childrenToArray } from '../../helpers/util';
-import { Omit } from '../../helpers/typeUtils';
 
 export interface FilterSidePanelCategoryProps extends Omit<React.HTMLProps<HTMLFormElement>, 'title'> {
   /** Children nodes */

packages/react-catalog-view-extension/src/components/PropertiesSidePanel/PropertyItem.tsx

@@ -1,7 +1,6 @@
 import * as React from 'react';
 import classNames from 'classnames';
 
-import { Omit } from '../../helpers/typeUtils';
 import { Text, TextVariants } from '@patternfly/react-core/dist/js/components/Text/Text';
 
 export interface PropertyItemProps extends Omit<React.HTMLProps<HTMLDivElement>, 'label' | 'value'> {

packages/react-catalog-view-extension/src/components/VerticalTabs/VerticalTabsTab.tsx

@@ -1,8 +1,6 @@
 import * as React from 'react';
 import classNames from 'classnames';
 
-import { Omit } from '../../helpers/typeUtils';
-
 export interface VerticalTabsTabProps extends Omit<React.HTMLProps<HTMLLIElement>, 'title'> {
   /** Child tab nodes (VerticalTabsTab's) */
   children?: React.ReactNode;

packages/react-charts/CHANGELOG.md

@@ -3,9 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [6.1.1](https://github.com/patternfly/patternfly-react/compare/@patternfly/react-charts@6.1.0...@patternfly/react-charts@6.1.1) (2020-03-27)
-
-
 ### Bug Fixes
 
 * **icons:** fix types, upgrade typescript ([#3978](https://github.com/patternfly/patternfly-react/issues/3978)) ([aa28738](https://github.com/patternfly/patternfly-react/commit/aa28738c2864b637d1ef1d0cc380a379cc6d3a51))
@@ -16,7 +13,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 # [6.1.0](https://github.com/patternfly/patternfly-react/compare/@patternfly/react-charts@6.0.4...@patternfly/react-charts@6.1.0) (2020-03-26)
 
-
 ### Features
 
 * **Charts:** Bump Victory packages (3973) ([#3974](https://github.com/patternfly/patternfly-react/issues/3974)) ([23bd48e](https://github.com/patternfly/patternfly-react/commit/23bd48e1f14fd45a2d403ccd630313971e6a2ebe))

packages/react-charts/package.json

@@ -42,7 +42,7 @@
     "react": "^16.4.0"
   },
   "scripts": {
-    "build": "yarn build:babel && yarn build:types && node ./scripts/copyTS.js",
+    "build": "yarn build:babel && yarn build:types",
     "build:babel": "concurrently \"yarn build:babel:esm && yarn build:babel:umd\" \"yarn build:babel:cjs\"",
     "build:babel:cjs": "babel --source-maps --extensions \".js,.ts,.tsx\" src --out-dir dist/js --presets=@babel/env",
     "build:babel:esm": "babel --source-maps --extensions \".js,.ts,.tsx\" src --out-dir dist/esm",

packages/react-charts/src/components/ChartLegend/ChartLegend.tsx

@@ -4,7 +4,6 @@ import {
   BlockProps,
   ColorScalePropType,
   EventPropTypeInterface,
-  Omit,
   OrientationTypes,
   PaddingProps,
   StringOrNumberOrCallback,

packages/react-core/package.json

@@ -29,12 +29,13 @@
   },
   "homepage": "https://github.com/patternfly/patternfly-react#readme",
   "scripts": {
-    "build": "yarn build:babel && yarn build:types && node ./scripts/copyTS.js && node ./scripts/copyStyles.js",
+    "build": "yarn build:babel && yarn build:umd && yarn build:types && node ./scripts/copyStyles.js",
     "build:babel": "concurrently \"yarn build:babel:esm && yarn build:babel:umd\" \"yarn build:babel:cjs\"",
     "build:babel:cjs": "babel --source-maps --extensions \".js,.ts,.tsx\" src --out-dir dist/js --presets=@babel/env",
     "build:babel:esm": "babel --source-maps --extensions \".js,.ts,.tsx\" src --out-dir dist/esm",
     "build:babel:umd": "babel --source-maps --extensions \".js\" dist/esm --out-dir dist/umd --plugins=transform-es2015-modules-umd",
     "build:types": "tsc -p tsconfig.gen-dts.json",
+    "build:umd": "rollup -c && rollup -c --environment IS_PRODUCTION",
     "clean": "rimraf dist",
     "develop": "yarn build:babel:esm --skip-initial-build --watch --verbose",
     "gen:tests": "yo tsx-docgen"
@@ -43,9 +44,7 @@
     "@patternfly/react-icons": "^4.0.5",
     "@patternfly/react-styles": "^4.0.5",
     "@patternfly/react-tokens": "^4.0.2",
-    "emotion": "^9.2.9",
-    "exenv": "^1.2.2",
-    "focus-trap-react": "^4.0.1",
+    "focus-trap": "4.0.2",
     "react-dropzone": "9.0.0",
     "tippy.js": "5.1.2"
   },
@@ -60,6 +59,9 @@
     "@babel/preset-react": "^7.0.0",
     "@patternfly/patternfly": "4.0.4",
     "@types/exenv": "^1.2.0",
+    "@rollup/plugin-commonjs": "^11.0.2",
+    "@rollup/plugin-node-resolve": "^7.1.1",
+    "@rollup/plugin-replace": "^2.3.1",
     "@types/jest": "^24.0.11",
     "@types/react": "^16.4.0",
     "@types/react-dom": "^16.4.0",
@@ -70,6 +72,9 @@
     "generator-tsx-docgen": "^0.1.0",
     "glob": "^7.1.2",
     "rimraf": "^2.6.2",
+    "rollup": "^2.2.0",
+    "rollup-plugin-scss": "^2.1.0",
+    "rollup-plugin-terser": "^5.3.0",
     "typescript": "^3.8.3",
     "yo": "^3.1.1"
   },

packages/react-core/rollup.config.js

@@ -0,0 +1,31 @@
+import resolve from '@rollup/plugin-node-resolve';
+import commonjs from '@rollup/plugin-commonjs';
+import scss from 'rollup-plugin-scss';
+import replace from '@rollup/plugin-replace';
+import { terser } from 'rollup-plugin-terser';
+
+const isProduction = process.env.IS_PRODUCTION;
+
+module.exports = {
+  input: 'dist/esm/index.js',
+  output: {
+    file: `dist/umd/react-core${isProduction ? '.min' : ''}.js`,
+    format: 'umd',
+    name: 'PatternFlyReact',
+    globals: {
+      react: 'React',
+      'react-dom': 'ReactDOM',
+      'prop-types': 'PropTypes'
+    }
+  },
+  external: ['react', 'react-dom', 'prop-types'],
+  plugins: [
+    replace({
+      'process.env.NODE_ENV': `'${isProduction ? 'production' : 'development'}'`
+    }),
+    resolve(),
+    commonjs(),
+    scss(),
+    isProduction && terser()
+  ]
+};