Skip to content

Commit 61b8d9e

Browse files
chore: Update dependencies (#265)
* docs(Storybook): Update to version 5.3.2 * chore(charts): make web-components-react a peer dependency * chore(main): update react-jss version * chore: update snapshots to match new jss rules * Update Chart.js related dependencies * Update toastify, content-loader and core-js * Simplify Storybook setup * Update react-jss typings and optimize imports
1 parent 295b8df commit 61b8d9e

File tree

278 files changed

+3547
-5526
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

278 files changed

+3547
-5526
lines changed

netlify.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616
# Deploy Preview context: all deploys generated from a pull/merge request will
1717
# inherit these settings.
1818
[context.deploy-preview]
19-
environment = { SKIP_DOC_GENERATION = "true" }
19+
environment = { }
2020

package.json

Lines changed: 25 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -15,60 +15,58 @@
1515
"prettier:all": "prettier --write --config ./prettier.config.js \"packages/**/*.{ts,tsx}\""
1616
},
1717
"dependencies": {
18-
"@babel/plugin-proposal-optional-chaining": "^7.7.5",
19-
"@storybook/addon-actions": "5.3.0-beta.31",
20-
"@storybook/addon-docs": "5.3.0-beta.31",
21-
"@storybook/addon-info": "5.3.0-beta.31",
22-
"@storybook/addon-knobs": "5.3.0-beta.31",
23-
"@storybook/addons": "5.3.0-beta.31",
24-
"@storybook/cli": "5.3.0-beta.31",
25-
"@storybook/react": "5.3.0-beta.31",
26-
"@storybook/theming": "5.3.0-beta.31",
18+
"@storybook/addon-actions": "5.3.2",
19+
"@storybook/addon-docs": "5.3.2",
20+
"@storybook/addon-info": "5.3.2",
21+
"@storybook/addon-knobs": "5.3.2",
22+
"@storybook/addons": "5.3.2",
23+
"@storybook/cli": "5.3.2",
24+
"@storybook/react": "5.3.2",
25+
"@storybook/theming": "5.3.2",
2726
"react-docgen-typescript-loader": "3.6.0"
2827
},
2928
"devDependencies": {
30-
"@babel/core": "^7.7.5",
31-
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.7.4",
29+
"@babel/core": "^7.8.0",
30+
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.0",
31+
"@babel/plugin-proposal-optional-chaining": "^7.8.0",
3232
"@storybook/storybook-deployer": "^2.8.1",
3333
"@types/enzyme": "^3.9.3",
3434
"@types/jest": "^24.0.24",
3535
"@types/react": "^16.9.2",
3636
"@types/react-dom": "^16.9.0",
3737
"@types/sinon": "^7.5.1",
38-
"@webcomponents/webcomponentsjs": "^2.4.0",
38+
"@webcomponents/webcomponentsjs": "^2.4.1",
3939
"babel-code-frame": "^6.26.0",
4040
"babel-loader": "^8.0.5",
4141
"babel-preset-react-app": "^9.1.0",
4242
"chalk": "^3.0.0",
4343
"cli-table": "^0.3.1",
4444
"codecov": "^3.6.1",
45-
"css-loader": "^3.2.0",
4645
"dedent": "^0.7.0",
4746
"document-register-element": "^1.14.3",
4847
"dotenv": "^8.2.0",
49-
"enzyme": "^3.9.0",
50-
"enzyme-adapter-react-16": "^1.15.1",
48+
"enzyme": "^3.11.0",
49+
"enzyme-adapter-react-16": "^1.15.2",
5150
"enzyme-to-json": "^3.4.3",
5251
"escape-string-regexp": "^2.0.0",
5352
"esm": "^3.2.22",
5453
"extract-comments": "^1.1.0",
55-
"file-loader": "^4.3.0",
54+
"file-loader": "^5.0.2",
5655
"file-url": "^3.0.0",
5756
"filesize": "^6.0.1",
5857
"glob": "^7.1.6",
5958
"global": "^4.4.0",
60-
"google-closure-compiler": "^20191111.0.0",
59+
"google-closure-compiler": "^20200112.0.0",
6160
"gzip-size": "^5.1.0",
62-
"html-webpack-plugin": "^3.2.0",
63-
"husky": "^3.1.0",
61+
"husky": "^4.0.7",
6462
"identity-obj-proxy": "^3.0.0",
6563
"jest": "^24.9.0",
6664
"jest-canvas-mock": "^2.2.0",
6765
"jest-environment-jsdom-fifteen": "^1.0.2",
6866
"jest-enzyme": "^7.1.2",
6967
"jss-snapshot-serializer": "^1.0.0",
70-
"lerna": "^3.19.0",
71-
"lint-staged": "^9.4.3",
68+
"lerna": "^3.20.2",
69+
"lint-staged": "^9.5.0",
7270
"minimist": "^1.2.0",
7371
"mkdirp": "^0.5.1",
7472
"ncp": "^2.0.0",
@@ -80,7 +78,7 @@
8078
"react-app-polyfill": "^1.0.5",
8179
"react-dom": "^16.8.6",
8280
"rimraf": "^3.0.0",
83-
"rollup": "^1.27.4",
81+
"rollup": "^1.29.0",
8482
"rollup-plugin-babel": "^4.3.2",
8583
"rollup-plugin-commonjs": "^10.1.0",
8684
"rollup-plugin-node-resolve": "^5.2.0",
@@ -89,19 +87,17 @@
8987
"rollup-plugin-replace": "^2.2.0",
9088
"rollup-plugin-strip-banner": "^1.0.0",
9189
"shelljs": "^0.8.3",
92-
"sinon": "^7.5.0",
93-
"style-loader": "^1.0.0",
90+
"sinon": "^8.0.4",
9491
"targz": "^1.0.1",
9592
"tmp": "^0.1.0",
96-
"ts-node": "8.5.2",
93+
"ts-node": "8.6.2",
9794
"tslint": "^5.20.1",
9895
"tslint-config-prettier": "^1.18.0",
9996
"tslint-react": "^4.1.0",
100-
"typescript": "^3.7.3",
97+
"typescript": "^3.7.4",
10198
"util": "^0.12.0",
102-
"webpack": "^4.41.3",
103-
"webpack-cli": "^3.3.10",
104-
"webpack-dev-server": "^3.9.0"
99+
"webpack": "^4.41.5",
100+
"webpack-cli": "^3.3.10"
105101
},
106102
"resolutions": {
107103
"@types/react": "16.9.2"

packages/base/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"postbuild": "npm-run-all -s build:rollup build:polyfills"
2424
},
2525
"dependencies": {
26-
"core-js": "3.1.4",
26+
"core-js": "3.6.4",
2727
"resize-observer-polyfill": "^1.5.1"
2828
},
2929
"peerDependencies": {

packages/base/src/Device/Media.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { Media, RANGESETS } from './Media';
2-
import { EventRegistry } from './EventRegistry';
31
import * as sinon from 'sinon';
42
import { setupMatchMedia } from '../../../../config/jestsetup';
3+
import { EventRegistry } from './EventRegistry';
4+
import { Media, RANGESETS } from './Media';
55

66
const defaultSupportInstance = {
77
matchmedialistener: false,

packages/base/src/Device/Media.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { changeRootCSSClass, getQuery, matchLegacyBySize, windowSize } from './utils';
2-
import { EventRegistry } from './EventRegistry';
31
import { Logger } from '../utils/Logger';
2+
import { EventRegistry } from './EventRegistry';
3+
import { changeRootCSSClass, getQuery, matchLegacyBySize, windowSize } from './utils';
44

55
export enum RANGESETS {
66
SAP_3STEPS = '3Step',
@@ -30,6 +30,7 @@ const refreshCSSClasses = (sSetName, sRangeName, bRemove?) => {
3030
export class Media {
3131
private readonly media_timeout;
3232
public matches;
33+
3334
constructor(supportInstance) {
3435
support = supportInstance;
3536
this.media_timeout = support.matchmedialistener ? 0 : 100;

packages/base/src/Device/Orientation.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { Orientation } from './Orientation';
21
import * as sinon from 'sinon';
32
import { EventRegistry } from './EventRegistry';
3+
import { Orientation } from './Orientation';
44

55
describe('Device - Orientation', () => {
66
test('Add and remove handler', () => {

packages/base/src/Device/Utils.test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { Media } from './Media';
21
import { convertToPx, matchLegacyBySize } from './utils';
32

43
describe('Device - Utils', () => {

packages/base/src/Scroller/ScrollContextProvider.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import React, { useMemo } from 'react';
21
import { ScrollContext } from '@ui5/webcomponents-react-base/lib/ScrollContext';
2+
import React, { useMemo } from 'react';
33

44
export const ScrollContentProvider = (props) => {
55
const {

packages/base/src/Scroller/ScrollLink.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import React, { useCallback, useContext, useEffect } from 'react';
21
import { ScrollContext } from '@ui5/webcomponents-react-base/lib/ScrollContext';
2+
import React, { useCallback, useContext, useEffect } from 'react';
33

44
export const ScrollLink = (props) => {
55
const {

packages/base/src/Scroller/Scroller.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
import { IScroller } from '@ui5/webcomponents-react-base/interfaces/IScroller';
12
import React, { forwardRef, RefObject, useCallback, useEffect, useImperativeHandle, useRef, useState } from 'react';
23

34
import { ScrollContentProvider } from './ScrollContextProvider';
45
import { scrollTo } from './ScrollHelper';
5-
import { IScroller } from '@ui5/webcomponents-react-base/interfaces/IScroller';
66

77
export interface Props {
88
scrollContainer: RefObject<HTMLDivElement>;

packages/base/src/Scroller/useScrollElement.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { useContext, useEffect } from 'react';
21
import { ScrollContext } from '@ui5/webcomponents-react-base/lib/ScrollContext';
2+
import { useContext, useEffect } from 'react';
33

44
export const useScrollElement = (id, htmlRef, options = {}) => {
55
const { registerElement, unregisterElement } = useContext(ScrollContext);

packages/base/src/hooks/useViewportRange.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { useCallback, useEffect, useState } from 'react';
21
import { Device } from '@ui5/webcomponents-react-base/lib/Device';
2+
import { useCallback, useEffect, useState } from 'react';
33

44
export const useViewportRange = (rangeSet) => {
55
const [currentRange, setCurrentRange] = useState(Device.media.getCurrentRange(rangeSet, window.innerWidth).name);
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
import { ScrollContext } from '../Scroller/ScrollContext';
2+
23
export { ScrollContext };

packages/base/src/lib/ScrollLink.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
import { ScrollLink } from '../Scroller/ScrollLink';
2+
23
export { ScrollLink };

packages/base/src/lib/Scroller.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
import { Scroller } from '../Scroller/Scroller';
2+
23
export { Scroller };
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
import { useScrollElement } from '../Scroller/useScrollElement';
2+
23
export { useScrollElement };

packages/base/src/polyfill/IE11.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import 'core-js/modules/es.array.flat';
12
import 'core-js/modules/es.object.assign';
23
import 'core-js/modules/es.object.values';
3-
import 'core-js/modules/es.array.flat';
44
import ResizeObserver from 'resize-observer-polyfill';
55

66
// @ts-ignore

packages/base/src/utils/Logger.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { LOG_LEVEL, Logger } from './Logger';
2-
import * as sinon from 'sinon';
31
import { modifyObjectProperty } from '@shared/tests/utils';
2+
import * as sinon from 'sinon';
3+
import { LOG_LEVEL, Logger } from './Logger';
44

55
describe('Logger', () => {
66
test('fatal', () => {

packages/base/src/utils/Optional.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { getEventFromCallback } from '@shared/tests/utils';
2-
import { Optional } from './Optional';
32
import sinon from 'sinon';
3+
import { Optional } from './Optional';
44

55
describe('Optional', () => {
66
test('get deep value', () => {

packages/base/third-party/modernizr.js

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,20 @@
44
function r(e, t) {
55
return typeof e === t;
66
}
7+
78
function o() {
89
return 'function' != typeof t.createElement
910
? t.createElement(arguments[0])
1011
: b
1112
? t.createElementNS.call(t, 'http://www.w3.org/2000/svg', arguments[0])
1213
: t.createElement.apply(t, arguments);
1314
}
15+
1416
function i() {
1517
var e = t.body;
1618
return e || ((e = o(b ? 'svg' : 'body')), (e.fake = !0)), e;
1719
}
20+
1821
function s(e, n, r, s) {
1922
var a,
2023
u,
@@ -43,16 +46,19 @@
4346
!!u
4447
);
4548
}
49+
4650
function a(e, t) {
4751
return !!~('' + e).indexOf(t);
4852
}
53+
4954
function u(e) {
5055
return e
5156
.replace(/([A-Z])/g, function(e, t) {
5257
return '-' + t.toLowerCase();
5358
})
5459
.replace(/^ms-/, '-ms-');
5560
}
61+
5662
function l(t, n, r) {
5763
var o;
5864
if ('getComputedStyle' in e) {
@@ -66,6 +72,7 @@
6672
} else o = !n && t.currentStyle && t.currentStyle[r];
6773
return o;
6874
}
75+
6976
function f(t, r) {
7077
var o = t.length;
7178
if ('CSS' in e && 'supports' in e.CSS) {
@@ -83,17 +90,20 @@
8390
}
8491
return n;
8592
}
93+
8694
function c(e) {
8795
return e
8896
.replace(/([a-z])-([a-z])/g, function(e, t, n) {
8997
return t + n.toUpperCase();
9098
})
9199
.replace(/^-/, '');
92100
}
101+
93102
function d(e, t, i, s) {
94103
function u() {
95104
d && (delete A.style, delete A.modElem);
96105
}
106+
97107
if (((s = !r(s, 'undefined') && s), !r(i, 'undefined'))) {
98108
var l = f(e, i);
99109
if (!r(l, 'undefined')) return l;
@@ -110,23 +120,27 @@
110120
}
111121
return u(), !1;
112122
}
123+
113124
function p(e, t) {
114125
return function() {
115126
return e.apply(t, arguments);
116127
};
117128
}
129+
118130
function v(e, t, n) {
119131
var o;
120132
for (var i in e) if (e[i] in t) return !1 === n ? e[i] : ((o = t[e[i]]), r(o, 'function') ? p(o, n || t) : o);
121133
return !1;
122134
}
135+
123136
function m(e, t, n, o, i) {
124137
var s = e.charAt(0).toUpperCase() + e.slice(1),
125138
a = (e + ' ' + P.join(s + ' ') + s).split(' ');
126139
return r(t, 'string') || r(t, 'undefined')
127140
? d(a, t, o, i)
128141
: ((a = (e + ' ' + S.join(s + ' ') + s).split(' ')), v(a, t, n));
129142
}
143+
130144
var h = [],
131145
y = {
132146
_version: '3.8.0',
@@ -173,6 +187,7 @@
173187
i)
174188
);
175189
}
190+
176191
var t = !('onblur' in _);
177192
return e;
178193
})();

packages/charts/package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,21 @@
2020
"postbuild": "rollup -c rollup.config.js"
2121
},
2222
"dependencies": {
23-
"@ui5/webcomponents-react": "^0.7.0-rc.7",
24-
"@ui5/webcomponents-react-base": "0.7.0-rc.4",
25-
"chart.js": "^2.8.0",
26-
"chartjs-plugin-datalabels": "^0.6.0",
23+
"chart.js": "^2.9.3",
24+
"chartjs-plugin-datalabels": "^0.7.0",
2725
"get-best-contrast-color": "^0.3.1",
2826
"lodash.merge": "^4.6.2",
29-
"react-chartjs-2": "^2.7.6",
30-
"react-content-loader": "^4.3.2",
31-
"react-jss": "10.0.0"
27+
"react-chartjs-2": "^2.8.0",
28+
"react-content-loader": "^4.3.4"
3229
},
3330
"devDependencies": {
34-
"@types/chart.js": "^2.7.56"
31+
"@types/chart.js": "^2.9.8"
3532
},
3633
"peerDependencies": {
37-
"react": "^16.8.0"
34+
"@ui5/webcomponents-react": "^0.7.0-rc.7",
35+
"@ui5/webcomponents-react-base": "^0.7.0-rc.4",
36+
"react": "^16.8.0",
37+
"react-jss": "^10.0.0"
3838
},
3939
"publishConfig": {
4040
"access": "public"

packages/charts/src/components/BarChart/BarChart.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { mountThemedComponent, renderThemedComponent } from '@shared/tests/utils';
1+
import { mountThemedComponent } from '@shared/tests/utils';
22
import * as React from 'react';
33
import { datasets, labels, singleDataset } from '../../test/resources/ChartProps';
44
import { BarChart } from './index';

0 commit comments

Comments
 (0)