Skip to content

Commit b739041

Browse files
committed
Merge branch 'master' into release-1.3.0
2 parents 066ff40 + aba6aab commit b739041

File tree

733 files changed

+10215
-10011
lines changed

Some content is hidden

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

733 files changed

+10215
-10011
lines changed

.husky/common.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
command_exists () {
2+
command -v "$1" >/dev/null 2>&1
3+
}
4+
5+
# Windows 10, Git Bash and Yarn workaround
6+
if command_exists winpty && test -t 1; then
7+
exec < /dev/tty
8+
fi

.husky/pre-push

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/sh
2+
. "$(dirname "$0")/_/husky.sh"
3+
. "$(dirname "$0")/common.sh"
4+
5+
yarn husky:pre-push

.reuse/dep5

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@ Copyright: 2020 SAP SE or an SAP affiliate company and OpenUI5 contributors
3030
License: Apache-2.0
3131

3232

33-
Files: packages/playground/assets/js/webcomponentsjs/* packages/ie11/src/thirdparty/Array.from.js packages/ie11/src/thirdparty/events-polyfills.js packages/ie11/src/thirdparty/Object.assign.js packages/ie11/src/thirdparty/template.js packages/ie11/src/thirdparty/webcomponents-sd-ce-pf.js
34-
Copyright: 2018 The Polymer Project Authors
35-
License: BSD-3-Clause-Clear
36-
3733
Files: packages/base/dist/sap/ui/thirdparty/caja-html-sanitizer.js
3834
Copyright: Google Inc.
3935
License: Apache-2.0
@@ -46,3 +42,11 @@ License: MIT
4642
Files: packages/playground/assets/js/vendor/lunr.min.js
4743
Copyright: 2017 Oliver Nightingale
4844
License: MIT
45+
46+
Files: packages/tools/lib/copy-and-watch/index.js
47+
Copyright: 2017 Aleksandr Zonov
48+
License: MIT
49+
50+
Files: packages/tools/lib/postcss-combine-duplicated-selectors/index.js
51+
Copyright: 2016 Christian Murphy
52+
License: MIT

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ before_install:
1515
- gem install jekyll-seo-tag
1616

1717
script:
18-
- DEPLOY_PUBLIC_PATH=/resources/ ENABLE_CLDR=1 yarn build
18+
- ENABLE_CLDR=1 yarn build
1919
- yarn test
2020

2121
deploy:

commitlint.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = {extends: ['@commitlint/config-conventional']}

deploy/deploy.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ if [ "$TRAVIS_BRANCH" == "$TRAVIS_LATEST_RELEASE_WEBSITE_BRANCH" ]; then
5656

5757
# Run the build again so rollup can generate the correct public path urls
5858
cd $TRAVIS_BUILD_DIR
59-
DEPLOY_PUBLIC_PATH=https://sap.github.io/ui5-webcomponents/assets/js/ui5-webcomponents/ yarn build:playground
59+
yarn build:playground
6060

6161
# Move master build folder to gh-pages folder
6262
cp -Rf $TRAVIS_BUILD_DIR/packages/playground/dist/* gh-pages
@@ -80,12 +80,12 @@ if [ "$TRAVIS_BRANCH" == "$TRAVIS_LATEST_RELEASE_WEBSITE_BRANCH" ]; then
8080

8181
# Clean gh-pages existing contents
8282
rm -rf gh-pages/master|| exit 0
83-
83+
8484
mkdir gh-pages/master
8585

8686
# Run the build again so rollup can generate the correct public path urls
8787
cd $TRAVIS_BUILD_DIR
88-
DEPLOY_PUBLIC_PATH=https://sap.github.io/ui5-webcomponents/master/assets/js/ui5-webcomponents/ yarn build:playground:master
88+
yarn build:playground:master
8989

9090
# Move master build folder to gh-pages folder
9191
cp -Rf $TRAVIS_BUILD_DIR/packages/playground/dist/* gh-pages/master

docs/6-contributing/02-conventions-and-guidelines.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ The commit header is the first line of the commit message. It consists of three
2525
+ `fix` - a bug fix (note: this will indicate a release). If possible, include a test in your change.
2626
+ `feat` - a new feature (note: this will indicate a release)
2727
+ `docs` - documentation only changes
28-
+ `style` - changes that do not affect the meaning of the code
28+
+ `style` - changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)
2929
+ `refactor` - a code change that neither fixes a bug nor adds a feature
3030
+ `perf` - a code change that improves performance
3131
+ `test` - adding missing tests

package.json

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@
99
"ui5"
1010
],
1111
"scripts": {
12-
"build": "npm-run-all --sequential build:base build:ie11 build:localization build:theming build:icons build:icons-business-suite build:icons-tnt build:main build:fiori",
12+
"build": "npm-run-all --sequential build:base build:localization build:theming build:icons build:icons-business-suite build:icons-tnt build:main build:fiori",
1313
"build:localization": "cd packages/localization && yarn build",
1414
"build:base": "cd packages/base && yarn build",
15-
"build:ie11": "cd packages/ie11 && yarn build",
1615
"build:theming": "cd packages/theming && yarn build",
1716
"build:icons": "cd packages/icons && yarn build",
1817
"build:icons-business-suite": "cd packages/icons-business-suite && yarn build",
@@ -21,41 +20,33 @@
2120
"build:fiori": "cd packages/fiori && yarn build",
2221
"build:playground": "yarn build:main && yarn build:fiori && yarn copy-css && cd packages/playground && yarn build",
2322
"build:playground:master": "yarn build:main && yarn build:fiori && yarn copy-css && cd packages/playground && yarn build:master",
24-
"clean": "npm-run-all --sequential clean:base clean:ie11 clean:localization clean:theming clean:icons clean:icons-business-suite clean:icons-tnt clean:main clean:fiori",
23+
"clean": "npm-run-all --parallel clean:base clean:localization clean:theming clean:icons clean:icons-business-suite clean:icons-tnt clean:main clean:fiori",
2524
"clean:localization": "cd packages/localization && yarn clean",
2625
"clean:base": "cd packages/base && yarn clean",
27-
"clean:ie11": "cd packages/ie11 && yarn clean",
2826
"clean:theming": "cd packages/theming && yarn clean",
2927
"clean:icons": "cd packages/icons && yarn clean",
3028
"clean:icons-business-suite": "cd packages/icons-business-suite && yarn clean",
3129
"clean:icons-tnt": "cd packages/icons-tnt && yarn clean",
3230
"clean:main": "cd packages/main && yarn clean",
3331
"clean:fiori": "cd packages/fiori && yarn clean",
3432
"prepare:main": "cd packages/main && nps prepare",
35-
"prepare:main:es5": "cd packages/main && nps prepare.es5",
3633
"prepare:fiori": "cd packages/fiori && nps prepare",
37-
"prepare:fiori:es5": "cd packages/fiori && nps prepare.es5",
3834
"scopePrepare:main": "cd packages/main && nps scope.prepare",
3935
"scopePrepare:fiori": "cd packages/fiori && nps scope.prepare",
4036
"dev:base": "cd packages/base && nps dev",
41-
"dev:ie11": "cd packages/ie11 && nps watch",
4237
"dev:localization": "cd packages/localization && nps watch",
4338
"dev:main": "cd packages/main && nps dev",
44-
"dev:main:es5": "cd packages/main && nps dev.es5",
4539
"dev:fiori": "cd packages/fiori && nps dev",
46-
"dev:fiori:es5": "cd packages/fiori && nps dev.es5",
4740
"scopeDev:main": "cd packages/main && nps scope.dev",
4841
"scopeDev:fiori": "cd packages/fiori && nps scope.dev",
49-
"start": "npm-run-all --sequential build:base build:ie11 build:localization build:theming build:icons build:icons-business-suite build:icons-tnt prepare:main prepare:fiori copy-css start:all",
50-
"start:es5": "npm-run-all --sequential build:base build:ie11 build:localization build:theming build:icons build:icons-business-suite build:icons-tnt prepare:main:es5 prepare:fiori:es5 copy-css start:all:es5",
51-
"startWithScope": "npm-run-all --sequential build:base build:ie11 build:localization build:theming build:icons build:icons-business-suite build:icons-tnt scopePrepare:main scopePrepare:fiori copy-css scopeStart:all",
42+
"start": "npm-run-all --sequential build:base build:localization build:theming build:icons build:icons-business-suite build:icons-tnt prepare:main prepare:fiori copy-css start:all",
43+
"startWithScope": "npm-run-all --sequential build:base build:localization build:theming build:icons build:icons-business-suite build:icons-tnt scopePrepare:main scopePrepare:fiori copy-css scopeStart:all",
5244
"start:all": "npm-run-all --parallel dev:base dev:localization dev:main dev:fiori",
53-
"start:all:es5": "npm-run-all --parallel dev:base dev:ie11 dev:localization dev:main:es5 dev:fiori:es5",
54-
"scopeStart:all": "npm-run-all --parallel dev:base dev:ie11 dev:localization scopeDev:main scopeDev:fiori",
45+
"scopeStart:all": "npm-run-all --parallel dev:base dev:localization scopeDev:main scopeDev:fiori",
5546
"start:base": "cd packages/base && yarn start",
5647
"start:main": "cd packages/main && yarn start",
5748
"start:fiori": "cd packages/fiori && yarn start",
58-
"start:playground": "yarn build:theming && cross-env DEPLOY_PUBLIC_PATH=/assets/js/ui5-webcomponents/ yarn build:main && cross-env DEPLOY_PUBLIC_PATH=/assets/js/ui5-webcomponents/ yarn build:fiori && yarn copy-css && cd packages/playground && yarn start",
49+
"start:playground": "yarn build:theming && yarn build:main && yarn build:fiori && yarn copy-css && cd packages/playground && yarn start",
5950
"test:base": "cd packages/base && yarn test",
6051
"test:main": "cd packages/main && yarn test",
6152
"test:fiori": "cd packages/fiori && yarn test",
@@ -65,14 +56,21 @@
6556
"unlink-all": "wsrun unlink",
6657
"hash": "wsrun --exclude-missing hash",
6758
"copy-css": "copy-and-watch \"packages/base/dist/css/**/*\" packages/main/dist/resources/css/base/ && copy-and-watch \"packages/theming/dist/css/**/*\" packages/main/dist/resources/css/theming/ && copy-and-watch \"packages/main/dist/css/**/*\" packages/main/dist/resources/css/main/ && copy-and-watch \"packages/base/dist/css/**/*\" packages/fiori/dist/resources/css/base/ && copy-and-watch \"packages/theming/dist/css/**/*\" packages/fiori/dist/resources/css/theming/ && copy-and-watch \"packages/main/dist/css/**/*\" packages/fiori/dist/resources/css/main/",
68-
"prerelease": "node ./.github/actions/pre-release.js"
59+
"prerelease": "node ./.github/actions/pre-release.js",
60+
"prepare": "husky install",
61+
"husky:commit-msg": "commitlint -e",
62+
"husky:lint": "yarn lint",
63+
"husky:pre-push": "npm-run-all --sequential husky:commit-msg husky:lint"
6964
},
7065
"devDependencies": {
66+
"@commitlint/cli": "^16.2.3",
67+
"@commitlint/config-conventional": "^16.2.1",
7168
"command-line-args": "^5.1.1",
7269
"copy-and-watch": "^0.1.5",
7370
"cross-env": "^7.0.3",
7471
"glob": "^7.2.0",
7572
"glob-promise": "^4.1.0",
73+
"husky": "^7.0.4",
7674
"npm-run-all": "^4.1.3",
7775
"nps": "^5.10.0",
7876
"wsrun": "^5.2.4"
@@ -86,7 +84,6 @@
8684
"packages/icons",
8785
"packages/icons-business-suite",
8886
"packages/icons-tnt",
89-
"packages/ie11",
9087
"packages/tools",
9188
"packages/playground",
9289
"packages/create-package"

packages/base/.eslintignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Note: Changes to this file also must be applied to the top level .eslintignore file.
22
test
33
lib
4-
overlay
54
dist
65
src/thirdparty
76
bundle.esm.js

packages/base/.npmignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
test/
2-
overlay/
32
!core

0 commit comments

Comments
 (0)