Merge branch 'master' into feature/AnalyticalTable

SAP · Nov 25, 2019 · e8246d0 · e8246d0
2 parents cb51032 + c8836fb
commit e8246d0
Show file tree

Hide file tree

Showing 12 changed files with 1,749 additions and 1,155 deletions.
diff --git a/package.json b/package.json
@@ -27,86 +27,80 @@
     "react-docgen-typescript-loader": "3.3.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.4.4",
+    "@babel/core": "^7.7.2",
     "@babel/plugin-proposal-nullish-coalescing-operator": "^7.4.4",
     "@storybook/storybook-deployer": "^2.8.1",
     "@types/enzyme": "^3.9.3",
-    "@types/hoist-non-react-statics": "^3.3.1",
-    "@types/jest": "^24.0.18",
+    "@types/jest": "^24.0.23",
     "@types/modernizr": "^3.5.3",
     "@types/react": "^16.9.2",
     "@types/react-dom": "^16.9.0",
-    "@types/sinon": "^7.0.12",
-    "@webcomponents/webcomponentsjs": "^2.2.10",
+    "@types/sinon": "^7.5.1",
+    "@webcomponents/webcomponentsjs": "^2.4.0",
     "babel-code-frame": "^6.26.0",
     "babel-loader": "^8.0.5",
-    "babel-preset-react-app": "^9.0.0",
-    "chalk": "^2.4.2",
+    "babel-preset-react-app": "^9.0.2",
+    "chalk": "^3.0.0",
     "cli-table": "^0.3.1",
     "codecov": "^3.6.1",
-    "cross-env": "^5.2.0",
     "css-loader": "^3.2.0",
     "dedent": "^0.7.0",
-    "deepmerge": "^4.0.0",
     "document-register-element": "^1.14.3",
-    "dotenv": "^8.0.0",
+    "dotenv": "^8.2.0",
     "enzyme": "^3.9.0",
-    "enzyme-adapter-react-16": "^1.12.1",
-    "enzyme-to-json": "^3.4.0",
+    "enzyme-adapter-react-16": "^1.15.1",
+    "enzyme-to-json": "^3.4.3",
     "esm": "^3.2.22",
     "extract-comments": "^1.1.0",
-    "file-loader": "^4.1.0",
+    "file-loader": "^4.3.0",
     "file-url": "^3.0.0",
-    "filesize": "^4.1.2",
-    "glob": "^7.1.4",
+    "filesize": "^6.0.1",
+    "glob": "^7.1.6",
     "global": "^4.4.0",
-    "google-closure-compiler": "^20190415.0.0",
+    "google-closure-compiler": "^20191111.0.0",
     "gzip-size": "^5.1.0",
     "html-webpack-plugin": "^3.2.0",
-    "husky": "^3.0.2",
+    "husky": "^3.1.0",
     "identity-obj-proxy": "^3.0.0",
-    "jest": "^24.8.0",
-    "jest-canvas-mock": "^2.0.0-beta.1",
+    "jest": "^24.9.0",
+    "jest-canvas-mock": "^2.2.0",
     "jest-environment-jsdom-fifteen": "^1.0.0",
-    "jest-enzyme": "^7.1.0",
+    "jest-enzyme": "^7.1.2",
     "jss-snapshot-serializer": "^1.0.0",
-    "lerna": "^3.16.4",
-    "lint-staged": "^9.2.1",
+    "lerna": "^3.19.0",
+    "lint-staged": "^9.4.3",
     "minimist": "^1.2.0",
     "mkdirp": "^0.5.1",
     "ncp": "^2.0.0",
     "npm-run-all": "^4.1.5",
-    "ora": "^3.4.0",
     "prettier": "^1.19.1",
-    "puppeteer": "^1.15.0",
-    "qs": "^6.7.0",
+    "puppeteer": "^2.0.0",
+    "qs": "^6.9.1",
     "react": "^16.8.6",
-    "react-app-polyfill": "^1.0.2",
+    "react-app-polyfill": "^1.0.4",
     "react-dom": "^16.8.6",
-    "react-highlight.js": "^1.0.7",
     "rimraf": "^3.0.0",
-    "rollup": "^1.19.4",
+    "rollup": "^1.27.4",
     "rollup-plugin-babel": "^4.3.2",
     "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-postcss": "^2.0.3",
     "rollup-plugin-prettier": "^0.6.0",
     "rollup-plugin-replace": "^2.2.0",
-    "rollup-plugin-strip-banner": "^0.2.0",
+    "rollup-plugin-strip-banner": "^1.0.0",
     "shelljs": "^0.8.3",
-    "sinon": "^7.4.1",
+    "sinon": "^7.5.0",
     "style-loader": "^1.0.0",
     "targz": "^1.0.1",
     "tmp": "^0.1.0",
-    "ts-node": "8.3.0",
-    "tslint": "^5.15.0",
+    "ts-node": "8.5.2",
+    "tslint": "^5.20.1",
     "tslint-config-prettier": "^1.18.0",
-    "tslint-react": "^4.0.0",
+    "tslint-react": "^4.1.0",
     "typescript": "^3.7.2",
     "util": "^0.12.0",
-    "uuid": "^3.3.2",
-    "webpack": "^4.39.1",
-    "webpack-cli": "^3.3.2",
-    "webpack-dev-server": "^3.8.0"
+    "webpack": "^4.41.2",
+    "webpack-cli": "^3.3.10",
+    "webpack-dev-server": "^3.9.0"
   },
   "resolutions": {
     "@types/react": "16.9.2"

diff --git a/packages/base/npm/index.esm.js b/packages/base/npm/index.esm.js
diff --git a/packages/base/package.json b/packages/base/package.json
@@ -11,14 +11,13 @@
     "directory": "packages/base"
   },
   "author": "SAP SE (https://www.sap.com)",
+  "license": "Apache-2.0",
+  "sideEffects": false,
   "scripts": {
     "postbuild": "rollup -c && tsc ./src/polyfill/*.ts --outDir ../../build/node_modules/base/polyfill --skipLibCheck"
   },
-  "license": "Apache-2.0",
   "dependencies": {
-    "core-js": "^3.1.4",
-    "hoist-non-react-statics": "^3.3.0",
-    "react-jss": "10.0.0",
+    "core-js": "3.1.4",
     "resize-observer-polyfill": "^1.5.1"
   },
   "peerDependencies": {

diff --git a/packages/charts/npm/index.esm.js b/packages/charts/npm/index.esm.js
diff --git a/packages/charts/package.json b/packages/charts/package.json
@@ -13,12 +13,10 @@
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
   "private": false,
+  "sideEffects": false,
   "scripts": {
     "postbuild": "rollup -c"
   },
-  "devDependencies": {
-    "@types/chart.js": "^2.7.56"
-  },
   "dependencies": {
     "@ui5/webcomponents-react": "0.7.0-rc.1",
     "@ui5/webcomponents-react-base": "0.7.0-rc.1",
@@ -27,7 +25,11 @@
     "get-best-contrast-color": "^0.3.1",
     "lodash.merge": "^4.6.2",
     "react-chartjs-2": "^2.7.6",
-    "react-content-loader": "^4.2.1"
+    "react-content-loader": "^4.3.2",
+    "react-jss": "10.0.0"
+  },
+  "devDependencies": {
+    "@types/chart.js": "^2.7.56"
   },
   "peerDependencies": {
     "react": "^16.8.0"

diff --git a/packages/main/npm/index.esm.js b/packages/main/npm/index.esm.js
diff --git a/packages/main/package.json b/packages/main/package.json
@@ -2,17 +2,18 @@
   "name": "@ui5/webcomponents-react",
   "version": "0.7.0-rc.1",
   "description": "React Wrapper for UI5 Web Components and additional components",
+  "main": "index.cjs.js",
+  "module": "index.esm.js",
+  "types": "index.d.ts",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/ui5-webcomponents-react.git",
     "directory": "packages/main"
   },
-  "main": "index.cjs.js",
-  "module": "index.esm.js",
-  "types": "index.d.ts",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
   "private": false,
+  "sideEffects": false,
   "scripts": {
     "generateWebComponents": "ts-node -O '{\"module\": \"commonjs\"}' -r esm ./scripts/wrapperGeneration/index.js --onlyStopForMerge",
     "build": "webpack --config ./scripts/wrapperGeneration/webpack.config.js",
@@ -23,13 +24,14 @@
     "@ui5/webcomponents-react-base": "0.7.0-rc.1",
     "lodash.debounce": "^4.0.8",
     "react-content-loader": "^4.3.2",
+    "react-jss": "10.0.0",
     "react-table": "7.0.0-beta.12",
-    "react-toastify": "^5.0.1",
+    "react-toastify": "^5.4.1",
     "react-window": "^1.8.5"
   },
   "devDependencies": {
     "diff": "^4.0.1",
-    "inquirer": "^6.3.1"
+    "inquirer": "^7.0.0"
   },
   "peerDependencies": {
     "react": "^16.8.0",

diff --git a/packages/main/src/components/MessageToast/index.tsx b/packages/main/src/components/MessageToast/index.tsx
@@ -14,7 +14,10 @@ import '@ui5/webcomponents/dist/icons/sys-enter';
 
 const coloredStyles = ({ parameters }: JSSTheme) => ({
   base: {
-    fontSize: '1.375rem'
+    width: '1.375rem',
+    minWidth: '1.375rem',
+    height: '1.375rem',
+    minHeight: '1.375rem'
   },
   Success: {
     color: parameters.sapUiPositiveElement

diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js
@@ -9,7 +9,7 @@ const bundleTypes = {
 const bundles = [
   {
     label: 'main',
-    bundleTypes: [bundleTypes.NODE_DEV, bundleTypes.NODE_PROD, bundleTypes.NODE_ES],
+    bundleTypes: [bundleTypes.NODE_DEV, bundleTypes.NODE_PROD],
     entry: 'main',
     externals: [
       'react',
@@ -23,13 +23,13 @@ const bundles = [
   },
   {
     label: 'base',
-    bundleTypes: [bundleTypes.NODE_DEV, bundleTypes.NODE_PROD, bundleTypes.NODE_ES],
+    bundleTypes: [bundleTypes.NODE_DEV, bundleTypes.NODE_PROD],
     entry: 'base',
     externals: ['react']
   },
   {
     label: 'charts',
-    bundleTypes: [bundleTypes.NODE_DEV, bundleTypes.NODE_PROD, bundleTypes.NODE_ES],
+    bundleTypes: [bundleTypes.NODE_DEV, bundleTypes.NODE_PROD],
     entry: 'charts',
     externals: ['react', 'react-jss', '@ui5/webcomponents', '@ui5/webcomponents-react-charts']
   }

diff --git a/scripts/rollup/results.json b/scripts/rollup/results.json
@@ -4,64 +4,43 @@
       "filename": "charts.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "charts",
-      "size": 18079,
-      "gzip": 5172
+      "size": 18139,
+      "gzip": 5182
     },
     {
       "filename": "charts.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "charts",
-      "size": 18079,
-      "gzip": 5172
+      "size": 18139,
+      "gzip": 5182
     },
     {
       "filename": "base.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "base",
-      "size": 67525,
-      "gzip": 16501
+      "size": 67659,
+      "gzip": 16543
     },
     {
       "filename": "base.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "base",
-      "size": 67525,
-      "gzip": 16501
+      "size": 67659,
+      "gzip": 16543
     },
     {
       "filename": "main.development.js",
       "bundleType": "NODE_DEV",
       "packageName": "main",
-      "size": 134945,
-      "gzip": 35680
+      "size": 135295,
+      "gzip": 35738
     },
     {
       "filename": "main.production.min.js",
       "bundleType": "NODE_PROD",
       "packageName": "main",
-      "size": 134945,
-      "gzip": 35680
-    },
-    {
-      "filename": "main.js",
-      "bundleType": "NODE_ES",
-      "packageName": "main",
-      "size": 254630,
-      "gzip": 49378
-    },
-    {
-      "filename": "base.js",
-      "bundleType": "NODE_ES",
-      "packageName": "base",
-      "size": 143111,
-      "gzip": 28560
-    },
-    {
-      "filename": "charts.js",
-      "bundleType": "NODE_ES",
-      "packageName": "charts",
-      "size": 36191,
-      "gzip": 6804
+      "size": 135295,
+      "gzip": 35738
     }
   ]
-}
+}
diff --git a/shared/rollup/configFactory.js b/shared/rollup/configFactory.js
@@ -5,6 +5,7 @@ const path = require('path');
 const fs = require('fs');
 const PATHS = require('../../config/paths');
 const { highlightLog } = require('../utils');
+const { asyncCopyTo } = require('../../scripts/utils');
 
 const rollupConfigFactory = (pkgName, externals = []) => {
   const LIB_BASE_PATH = path.resolve(PATHS.packages, pkgName, 'src', 'lib');
@@ -34,6 +35,12 @@ const rollupConfigFactory = (pkgName, externals = []) => {
 
   highlightLog(`Build lib folder for ${pkgName}`);
 
+  console.info('Copy index file');
+  asyncCopyTo(
+    path.resolve(PATHS.packages, pkgName, 'src', 'index.ts'),
+    path.resolve(PATHS.build, 'node_modules', pkgName, `index.esm.js`)
+  );
+
   return allLibFiles.map((file) => ({
     input: `${LIB_BASE_PATH}/${file}`,
     external: (id) => EXTERNAL_MODULE_REGEX.test(id),