Skip to content

Commit e57e690

Browse files
authored
Merge branch 'master' into feat/analytical-table-dnd
2 parents 73c3716 + 14c75e0 commit e57e690

24 files changed

+368
-1235
lines changed

config/jest.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ module.exports = {
3232
'^@shared/(.*)$': '<rootDir>/shared/$1',
3333
'^@ui5/webcomponents-react/lib/(.*)$': '<rootDir>/packages/main/src/lib/$1',
3434
'^@ui5/webcomponents-react-base/lib/(.*)$': '<rootDir>/packages/base/src/lib/$1',
35+
'^@ui5/webcomponents-react-base/third-party/(.*)$': '<rootDir>/packages/base/src/third-party/$1',
3536
'^@ui5/webcomponents-react-charts/lib/(.*)$': '<rootDir>/packages/charts/src/lib/$1',
3637
'\\.(css|less)$': 'identity-obj-proxy'
3738
},

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
"@storybook/storybook-deployer": "^2.8.1",
3333
"@types/enzyme": "^3.9.3",
3434
"@types/jest": "^24.0.23",
35-
"@types/modernizr": "^3.5.3",
3635
"@types/react": "^16.9.2",
3736
"@types/react-dom": "^16.9.0",
3837
"@types/sinon": "^7.5.1",
@@ -50,6 +49,7 @@
5049
"enzyme": "^3.9.0",
5150
"enzyme-adapter-react-16": "^1.15.1",
5251
"enzyme-to-json": "^3.4.3",
52+
"escape-string-regexp": "^2.0.0",
5353
"esm": "^3.2.22",
5454
"extract-comments": "^1.1.0",
5555
"file-loader": "^4.3.0",
@@ -82,6 +82,7 @@
8282
"rimraf": "^3.0.0",
8383
"rollup": "^1.27.4",
8484
"rollup-plugin-babel": "^4.3.2",
85+
"rollup-plugin-commonjs": "^10.1.0",
8586
"rollup-plugin-node-resolve": "^5.2.0",
8687
"rollup-plugin-postcss": "^2.0.3",
8788
"rollup-plugin-prettier": "^0.6.0",

packages/base/package.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,13 @@
1212
},
1313
"author": "SAP SE (https://www.sap.com)",
1414
"license": "Apache-2.0",
15-
"sideEffects": false,
15+
"sideEffects": [
16+
"modernizr.js",
17+
"core-js/**/*"
18+
],
1619
"scripts": {
17-
"postbuild": "rollup -c && tsc ./src/polyfill/*.ts --outDir ../../build/node_modules/base/polyfill --skipLibCheck"
20+
"build:copy-third-party": "ncp src/third-party/ ../../build/node_modules/base/third-party/",
21+
"postbuild": "npm run build:copy-third-party && rollup -c && tsc ./src/polyfill/*.ts --outDir ../../build/node_modules/base/polyfill --skipLibCheck"
1822
},
1923
"dependencies": {
2024
"core-js": "3.1.4",

packages/base/rollup.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
const rollupConfigFactory = require('../../shared/rollup/configFactory');
22

3-
const config = rollupConfigFactory('base');
3+
const config = rollupConfigFactory('base', ['@ui5/webcomponents-core']);
44
module.exports = config;

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

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

0 commit comments

Comments
 (0)