Skip to content

Commit c8836fb

Browse files
MarcusNotheisMarcusNotheis
authored
refactor(framework): Update dependencies and enable tree shaking (#230)
1 parent 1738a7a commit c8836fb

File tree

12 files changed

+1749
-1155
lines changed

12 files changed

+1749
-1155
lines changed

‎package.json

Lines changed: 31 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -27,86 +27,80 @@
2727
"react-docgen-typescript-loader": "3.3.0"
2828
},
2929
"devDependencies": {
30-
"@babel/core": "^7.4.4",
30+
"@babel/core": "^7.7.2",
3131
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.4.4",
3232
"@storybook/storybook-deployer": "^2.8.1",
3333
"@types/enzyme": "^3.9.3",
34-
"@types/hoist-non-react-statics": "^3.3.1",
35-
"@types/jest": "^24.0.18",
34+
"@types/jest": "^24.0.23",
3635
"@types/modernizr": "^3.5.3",
3736
"@types/react": "^16.9.2",
3837
"@types/react-dom": "^16.9.0",
39-
"@types/sinon": "^7.0.12",
40-
"@webcomponents/webcomponentsjs": "^2.2.10",
38+
"@types/sinon": "^7.5.1",
39+
"@webcomponents/webcomponentsjs": "^2.4.0",
4140
"babel-code-frame": "^6.26.0",
4241
"babel-loader": "^8.0.5",
43-
"babel-preset-react-app": "^9.0.0",
44-
"chalk": "^2.4.2",
42+
"babel-preset-react-app": "^9.0.2",
43+
"chalk": "^3.0.0",
4544
"cli-table": "^0.3.1",
4645
"codecov": "^3.6.1",
47-
"cross-env": "^5.2.0",
4846
"css-loader": "^3.2.0",
4947
"dedent": "^0.7.0",
50-
"deepmerge": "^4.0.0",
5148
"document-register-element": "^1.14.3",
52-
"dotenv": "^8.0.0",
49+
"dotenv": "^8.2.0",
5350
"enzyme": "^3.9.0",
54-
"enzyme-adapter-react-16": "^1.12.1",
55-
"enzyme-to-json": "^3.4.0",
51+
"enzyme-adapter-react-16": "^1.15.1",
52+
"enzyme-to-json": "^3.4.3",
5653
"esm": "^3.2.22",
5754
"extract-comments": "^1.1.0",
58-
"file-loader": "^4.1.0",
55+
"file-loader": "^4.3.0",
5956
"file-url": "^3.0.0",
60-
"filesize": "^4.1.2",
61-
"glob": "^7.1.4",
57+
"filesize": "^6.0.1",
58+
"glob": "^7.1.6",
6259
"global": "^4.4.0",
63-
"google-closure-compiler": "^20190415.0.0",
60+
"google-closure-compiler": "^20191111.0.0",
6461
"gzip-size": "^5.1.0",
6562
"html-webpack-plugin": "^3.2.0",
66-
"husky": "^3.0.2",
63+
"husky": "^3.1.0",
6764
"identity-obj-proxy": "^3.0.0",
68-
"jest": "^24.8.0",
69-
"jest-canvas-mock": "^2.0.0-beta.1",
65+
"jest": "^24.9.0",
66+
"jest-canvas-mock": "^2.2.0",
7067
"jest-environment-jsdom-fifteen": "^1.0.0",
71-
"jest-enzyme": "^7.1.0",
68+
"jest-enzyme": "^7.1.2",
7269
"jss-snapshot-serializer": "^1.0.0",
73-
"lerna": "^3.16.4",
74-
"lint-staged": "^9.2.1",
70+
"lerna": "^3.19.0",
71+
"lint-staged": "^9.4.3",
7572
"minimist": "^1.2.0",
7673
"mkdirp": "^0.5.1",
7774
"ncp": "^2.0.0",
7875
"npm-run-all": "^4.1.5",
79-
"ora": "^3.4.0",
8076
"prettier": "^1.19.1",
81-
"puppeteer": "^1.15.0",
82-
"qs": "^6.7.0",
77+
"puppeteer": "^2.0.0",
78+
"qs": "^6.9.1",
8379
"react": "^16.8.6",
84-
"react-app-polyfill": "^1.0.2",
80+
"react-app-polyfill": "^1.0.4",
8581
"react-dom": "^16.8.6",
86-
"react-highlight.js": "^1.0.7",
8782
"rimraf": "^3.0.0",
88-
"rollup": "^1.19.4",
83+
"rollup": "^1.27.4",
8984
"rollup-plugin-babel": "^4.3.2",
9085
"rollup-plugin-node-resolve": "^5.2.0",
9186
"rollup-plugin-postcss": "^2.0.3",
9287
"rollup-plugin-prettier": "^0.6.0",
9388
"rollup-plugin-replace": "^2.2.0",
94-
"rollup-plugin-strip-banner": "^0.2.0",
89+
"rollup-plugin-strip-banner": "^1.0.0",
9590
"shelljs": "^0.8.3",
96-
"sinon": "^7.4.1",
91+
"sinon": "^7.5.0",
9792
"style-loader": "^1.0.0",
9893
"targz": "^1.0.1",
9994
"tmp": "^0.1.0",
100-
"ts-node": "8.3.0",
101-
"tslint": "^5.15.0",
95+
"ts-node": "8.5.2",
96+
"tslint": "^5.20.1",
10297
"tslint-config-prettier": "^1.18.0",
103-
"tslint-react": "^4.0.0",
98+
"tslint-react": "^4.1.0",
10499
"typescript": "^3.7.2",
105100
"util": "^0.12.0",
106-
"uuid": "^3.3.2",
107-
"webpack": "^4.39.1",
108-
"webpack-cli": "^3.3.2",
109-
"webpack-dev-server": "^3.8.0"
101+
"webpack": "^4.41.2",
102+
"webpack-cli": "^3.3.10",
103+
"webpack-dev-server": "^3.9.0"
110104
},
111105
"resolutions": {
112106
"@types/react": "16.9.2"

‎packages/base/npm/index.esm.js

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎packages/base/package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,13 @@
1111
"directory": "packages/base"
1212
},
1313
"author": "SAP SE (https://www.sap.com)",
14+
"license": "Apache-2.0",
15+
"sideEffects": false,
1416
"scripts": {
1517
"postbuild": "rollup -c && tsc ./src/polyfill/*.ts --outDir ../../build/node_modules/base/polyfill --skipLibCheck"
1618
},
17-
"license": "Apache-2.0",
1819
"dependencies": {
19-
"core-js": "^3.1.4",
20-
"hoist-non-react-statics": "^3.3.0",
21-
"react-jss": "10.0.0",
20+
"core-js": "3.1.4",
2221
"resize-observer-polyfill": "^1.5.1"
2322
},
2423
"peerDependencies": {

‎packages/charts/npm/index.esm.js

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎packages/charts/package.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,10 @@
1313
"author": "SAP SE (https://www.sap.com)",
1414
"license": "Apache-2.0",
1515
"private": false,
16+
"sideEffects": false,
1617
"scripts": {
1718
"postbuild": "rollup -c"
1819
},
19-
"devDependencies": {
20-
"@types/chart.js": "^2.7.56"
21-
},
2220
"dependencies": {
2321
"@ui5/webcomponents-react": "0.7.0-rc.1",
2422
"@ui5/webcomponents-react-base": "0.7.0-rc.1",
@@ -27,7 +25,11 @@
2725
"get-best-contrast-color": "^0.3.1",
2826
"lodash.merge": "^4.6.2",
2927
"react-chartjs-2": "^2.7.6",
30-
"react-content-loader": "^4.2.1"
28+
"react-content-loader": "^4.3.2",
29+
"react-jss": "10.0.0"
30+
},
31+
"devDependencies": {
32+
"@types/chart.js": "^2.7.56"
3133
},
3234
"peerDependencies": {
3335
"react": "^16.8.0"

‎packages/main/npm/index.esm.js

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎packages/main/package.json

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,18 @@
22
"name": "@ui5/webcomponents-react",
33
"version": "0.7.0-rc.1",
44
"description": "React Wrapper for UI5 Web Components and additional components",
5+
"main": "index.cjs.js",
6+
"module": "index.esm.js",
7+
"types": "index.d.ts",
58
"repository": {
69
"type": "git",
710
"url": "https://github.com/SAP/ui5-webcomponents-react.git",
811
"directory": "packages/main"
912
},
10-
"main": "index.cjs.js",
11-
"module": "index.esm.js",
12-
"types": "index.d.ts",
1313
"author": "SAP SE (https://www.sap.com)",
1414
"license": "Apache-2.0",
1515
"private": false,
16+
"sideEffects": false,
1617
"scripts": {
1718
"generateWebComponents": "ts-node -O '{\"module\": \"commonjs\"}' -r esm ./scripts/wrapperGeneration/index.js --onlyStopForMerge",
1819
"build": "webpack --config ./scripts/wrapperGeneration/webpack.config.js",
@@ -23,13 +24,14 @@
2324
"@ui5/webcomponents-react-base": "0.7.0-rc.1",
2425
"lodash.debounce": "^4.0.8",
2526
"react-content-loader": "^4.3.2",
27+
"react-jss": "10.0.0",
2628
"react-table": "7.0.0-beta.12",
27-
"react-toastify": "^5.0.1",
29+
"react-toastify": "^5.4.1",
2830
"react-window": "^1.8.5"
2931
},
3032
"devDependencies": {
3133
"diff": "^4.0.1",
32-
"inquirer": "^6.3.1"
34+
"inquirer": "^7.0.0"
3335
},
3436
"peerDependencies": {
3537
"react": "^16.8.0",

‎packages/main/src/components/MessageToast/index.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@ import '@ui5/webcomponents/dist/icons/sys-enter';
1414

1515
const coloredStyles = ({ parameters }: JSSTheme) => ({
1616
base: {
17-
fontSize: '1.375rem'
17+
width: '1.375rem',
18+
minWidth: '1.375rem',
19+
height: '1.375rem',
20+
minHeight: '1.375rem'
1821
},
1922
Success: {
2023
color: parameters.sapUiPositiveElement

‎scripts/rollup/bundles.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const bundleTypes = {
99
const bundles = [
1010
{
1111
label: 'main',
12-
bundleTypes: [bundleTypes.NODE_DEV, bundleTypes.NODE_PROD, bundleTypes.NODE_ES],
12+
bundleTypes: [bundleTypes.NODE_DEV, bundleTypes.NODE_PROD],
1313
entry: 'main',
1414
externals: [
1515
'react',
@@ -23,13 +23,13 @@ const bundles = [
2323
},
2424
{
2525
label: 'base',
26-
bundleTypes: [bundleTypes.NODE_DEV, bundleTypes.NODE_PROD, bundleTypes.NODE_ES],
26+
bundleTypes: [bundleTypes.NODE_DEV, bundleTypes.NODE_PROD],
2727
entry: 'base',
2828
externals: ['react']
2929
},
3030
{
3131
label: 'charts',
32-
bundleTypes: [bundleTypes.NODE_DEV, bundleTypes.NODE_PROD, bundleTypes.NODE_ES],
32+
bundleTypes: [bundleTypes.NODE_DEV, bundleTypes.NODE_PROD],
3333
entry: 'charts',
3434
externals: ['react', 'react-jss', '@ui5/webcomponents', '@ui5/webcomponents-react-charts']
3535
}

‎scripts/rollup/results.json

Lines changed: 13 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -4,64 +4,43 @@
44
"filename": "charts.development.js",
55
"bundleType": "NODE_DEV",
66
"packageName": "charts",
7-
"size": 18079,
8-
"gzip": 5172
7+
"size": 18139,
8+
"gzip": 5182
99
},
1010
{
1111
"filename": "charts.production.min.js",
1212
"bundleType": "NODE_PROD",
1313
"packageName": "charts",
14-
"size": 18079,
15-
"gzip": 5172
14+
"size": 18139,
15+
"gzip": 5182
1616
},
1717
{
1818
"filename": "base.development.js",
1919
"bundleType": "NODE_DEV",
2020
"packageName": "base",
21-
"size": 67525,
22-
"gzip": 16501
21+
"size": 67659,
22+
"gzip": 16543
2323
},
2424
{
2525
"filename": "base.production.min.js",
2626
"bundleType": "NODE_PROD",
2727
"packageName": "base",
28-
"size": 67525,
29-
"gzip": 16501
28+
"size": 67659,
29+
"gzip": 16543
3030
},
3131
{
3232
"filename": "main.development.js",
3333
"bundleType": "NODE_DEV",
3434
"packageName": "main",
35-
"size": 134945,
36-
"gzip": 35680
35+
"size": 135295,
36+
"gzip": 35738
3737
},
3838
{
3939
"filename": "main.production.min.js",
4040
"bundleType": "NODE_PROD",
4141
"packageName": "main",
42-
"size": 134945,
43-
"gzip": 35680
44-
},
45-
{
46-
"filename": "main.js",
47-
"bundleType": "NODE_ES",
48-
"packageName": "main",
49-
"size": 254630,
50-
"gzip": 49378
51-
},
52-
{
53-
"filename": "base.js",
54-
"bundleType": "NODE_ES",
55-
"packageName": "base",
56-
"size": 143111,
57-
"gzip": 28560
58-
},
59-
{
60-
"filename": "charts.js",
61-
"bundleType": "NODE_ES",
62-
"packageName": "charts",
63-
"size": 36191,
64-
"gzip": 6804
42+
"size": 135295,
43+
"gzip": 35738
6544
}
6645
]
67-
}
46+
}

‎shared/rollup/configFactory.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ const path = require('path');
55
const fs = require('fs');
66
const PATHS = require('../../config/paths');
77
const { highlightLog } = require('../utils');
8+
const { asyncCopyTo } = require('../../scripts/utils');
89

910
const rollupConfigFactory = (pkgName, externals = []) => {
1011
const LIB_BASE_PATH = path.resolve(PATHS.packages, pkgName, 'src', 'lib');
@@ -34,6 +35,12 @@ const rollupConfigFactory = (pkgName, externals = []) => {
3435

3536
highlightLog(`Build lib folder for ${pkgName}`);
3637

38+
console.info('Copy index file');
39+
asyncCopyTo(
40+
path.resolve(PATHS.packages, pkgName, 'src', 'index.ts'),
41+
path.resolve(PATHS.build, 'node_modules', pkgName, `index.esm.js`)
42+
);
43+
3744
return allLibFiles.map((file) => ({
3845
input: `${LIB_BASE_PATH}/${file}`,
3946
external: (id) => EXTERNAL_MODULE_REGEX.test(id),

0 commit comments

Comments
 (0)