From 4920bad732cb408c519d766f34bb7e873bc9f290 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Jan 2022 04:26:35 +0000 Subject: [PATCH 01/12] Bump glob-parent from 5.1.1 to 5.1.2 Bumps [glob-parent](https://github.com/gulpjs/glob-parent) from 5.1.1 to 5.1.2. - [Release notes](https://github.com/gulpjs/glob-parent/releases) - [Changelog](https://github.com/gulpjs/glob-parent/blob/main/CHANGELOG.md) - [Commits](https://github.com/gulpjs/glob-parent/compare/v5.1.1...v5.1.2) --- updated-dependencies: - dependency-name: glob-parent dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 13af17ab..ca9e0fa0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -171,9 +171,9 @@ "optional": true }, "glob-parent": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", - "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "requires": { "is-glob": "^4.0.1" } From 12137431e07847ff41bb6072f8ec629de4044843 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 24 Mar 2022 16:42:05 +0000 Subject: [PATCH 02/12] Bump minimist from 1.2.5 to 1.2.6 Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6. - [Release notes](https://github.com/substack/minimist/releases) - [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6) --- updated-dependencies: - dependency-name: minimist dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index ca9e0fa0..1fc0f83d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -274,9 +274,9 @@ } }, "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", + "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==" }, "ms": { "version": "2.1.2", From ca13a44f383ed6a43fc430ae1f380bea1cadc848 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 Sep 2022 08:48:15 +0000 Subject: [PATCH 03/12] Bump engine.io and socket.io Bumps [engine.io](https://github.com/socketio/engine.io) and [socket.io](https://github.com/socketio/socket.io). These dependencies needed to be updated together. Updates `engine.io` from 5.1.1 to 6.2.0 - [Release notes](https://github.com/socketio/engine.io/releases) - [Changelog](https://github.com/socketio/engine.io/blob/main/CHANGELOG.md) - [Commits](https://github.com/socketio/engine.io/compare/5.1.1...6.2.0) Updates `socket.io` from 4.1.2 to 4.5.2 - [Release notes](https://github.com/socketio/socket.io/releases) - [Changelog](https://github.com/socketio/socket.io/blob/main/CHANGELOG.md) - [Commits](https://github.com/socketio/socket.io/compare/4.1.2...4.5.2) --- updated-dependencies: - dependency-name: engine.io dependency-type: indirect - dependency-name: socket.io dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 132 +++++++++++++++++++++++----------------------- 1 file changed, 65 insertions(+), 67 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1fc0f83d..f60814d3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,20 +4,10 @@ "lockfileVersion": 1, "requires": true, "dependencies": { - "@types/component-emitter": { - "version": "1.2.10", - "resolved": "https://registry.npmjs.org/@types/component-emitter/-/component-emitter-1.2.10.tgz", - "integrity": "sha512-bsjleuRKWmGqajMerkzox19aGbscQX5rmmvvXl3wlIp5gMG1HgkiwPxsN5p070fBDKTNSPgojVbuY1+HWMbFhg==" - }, - "@types/cookie": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.0.tgz", - "integrity": "sha512-y7mImlc/rNkvCRmg8gC3/lj87S7pTUIJ6QGjwHR9WQJcFs+ZMTOaoPrkdFA/YdbuqVEmEbb5RdhVxMkAcgOnpg==" - }, - "@types/cors": { - "version": "2.8.10", - "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.10.tgz", - "integrity": "sha512-C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ==" + "@socket.io/component-emitter": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz", + "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==" }, "@types/node": { "version": "15.9.0", @@ -42,11 +32,6 @@ "picomatch": "^2.0.4" } }, - "base64-arraybuffer": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz", - "integrity": "sha1-mBjHngWbE1X5fgQooBfIOOkLqBI=" - }, "base64id": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz", @@ -80,11 +65,6 @@ "readdirp": "~3.5.0" } }, - "component-emitter": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", - "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==" - }, "cookie": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz", @@ -116,25 +96,42 @@ } }, "engine.io": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-5.1.1.tgz", - "integrity": "sha512-aMWot7H5aC8L4/T8qMYbLdvKlZOdJTH54FxfdFunTGvhMx1BHkJOntWArsVfgAZVwAO9LC2sryPWRcEeUzCe5w==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.2.0.tgz", + "integrity": "sha512-4KzwW3F3bk+KlzSOY57fj/Jx6LyRQ1nbcyIadehl+AnXjKT7gDO0ORdRi/84ixvMKTym6ZKuxvbzN62HDDU1Lg==", "requires": { + "@types/cookie": "^0.4.1", + "@types/cors": "^2.8.12", + "@types/node": ">=10.0.0", "accepts": "~1.3.4", "base64id": "2.0.0", "cookie": "~0.4.1", "cors": "~2.8.5", "debug": "~4.3.1", - "engine.io-parser": "~4.0.0", - "ws": "~7.4.2" - } - }, - "engine.io-parser": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-4.0.2.tgz", - "integrity": "sha512-sHfEQv6nmtJrq6TKuIz5kyEKH/qSdK56H/A+7DnAuUPWosnIZAS2NHNcPLmyjtY3cGS/MqJdZbUjW97JU72iYg==", - "requires": { - "base64-arraybuffer": "0.1.4" + "engine.io-parser": "~5.0.3", + "ws": "~8.2.3" + }, + "dependencies": { + "@types/cookie": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz", + "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==" + }, + "@types/cors": { + "version": "2.8.12", + "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz", + "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==" + }, + "engine.io-parser": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.4.tgz", + "integrity": "sha512-+nVFp+5z1E3HcToEnO7ZIj3g+3k9389DvWtvJZz0T6/eOCPIyyxehFcedoYrZQrp0LgQbD9pPXhpMBKMd5QURg==" + }, + "ws": { + "version": "8.2.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz", + "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==" + } } }, "errno": { @@ -336,34 +333,40 @@ "optional": true }, "socket.io": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.1.2.tgz", - "integrity": "sha512-xK0SD1C7hFrh9+bYoYCdVt+ncixkSLKtNLCax5aEy1o3r5PaO5yQhVb97exIe67cE7lAK+EpyMytXWTWmyZY8w==", + "version": "4.5.2", + "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.5.2.tgz", + "integrity": "sha512-6fCnk4ARMPZN448+SQcnn1u8OHUC72puJcNtSgg2xS34Cu7br1gQ09YKkO1PFfDn/wyUE9ZgMAwosJed003+NQ==", "requires": { - "@types/cookie": "^0.4.0", - "@types/cors": "^2.8.8", - "@types/node": ">=10.0.0", "accepts": "~1.3.4", "base64id": "~2.0.0", - "debug": "~4.3.1", - "engine.io": "~5.1.0", - "socket.io-adapter": "~2.3.0", - "socket.io-parser": "~4.0.3" - } - }, - "socket.io-adapter": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.3.1.tgz", - "integrity": "sha512-8cVkRxI8Nt2wadkY6u60Y4rpW3ejA1rxgcK2JuyIhmF+RMNpTy1QRtkHIDUOf3B4HlQwakMsWbKftMv/71VMmw==" - }, - "socket.io-parser": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.4.tgz", - "integrity": "sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==", - "requires": { - "@types/component-emitter": "^1.2.10", - "component-emitter": "~1.3.0", - "debug": "~4.3.1" + "debug": "~4.3.2", + "engine.io": "~6.2.0", + "socket.io-adapter": "~2.4.0", + "socket.io-parser": "~4.2.0" + }, + "dependencies": { + "debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "requires": { + "ms": "2.1.2" + } + }, + "socket.io-adapter": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz", + "integrity": "sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg==" + }, + "socket.io-parser": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.1.tgz", + "integrity": "sha512-V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g==", + "requires": { + "@socket.io/component-emitter": "~3.1.0", + "debug": "~4.3.1" + } + } } }, "source-map": { @@ -395,11 +398,6 @@ "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" }, - "ws": { - "version": "7.4.6", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", - "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==" - }, "zkless-engine": { "version": "1.1.8", "resolved": "https://registry.npmjs.org/zkless-engine/-/zkless-engine-1.1.8.tgz", From 8af26d1893e646f6aaea95002b3c8b5697ea26a1 Mon Sep 17 00:00:00 2001 From: learningstud Date: Thu, 29 Sep 2022 15:02:44 +0800 Subject: [PATCH 04/12] ZK-5170: borderlayout title css rules are missing under sapphire theme --- .../src/archive/web/js/zul/layout/less/borderlayout.less | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sapphire/src/archive/web/js/zul/layout/less/borderlayout.less b/sapphire/src/archive/web/js/zul/layout/less/borderlayout.less index 1729ae57..21ae050f 100644 --- a/sapphire/src/archive/web/js/zul/layout/less/borderlayout.less +++ b/sapphire/src/archive/web/js/zul/layout/less/borderlayout.less @@ -150,6 +150,13 @@ .opacity(0.5); position: absolute; } + &-title { + .fontStyle(@baseTitleFontFamily, @fontSizeMedium, bold, @textColorGray); + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + line-height: @baseButtonHeight; + } } .z-north-splitter, .z-south-splitter { From 9ffafd96faed3de3f7b88b73bde182791a103595 Mon Sep 17 00:00:00 2001 From: zkadmin Date: Tue, 25 Oct 2022 12:09:42 +0800 Subject: [PATCH 05/12] release 9.6.3 --- breeze/pom.xml | 2 +- dist/breeze.jar | Bin 366644 -> 366645 bytes dist/sapphire.jar | Bin 376657 -> 376693 bytes dist/silvertail.jar | Bin 371885 -> 371884 bytes package-lock.json | 587 +++++++++++++++++++++++++++++++++++++++++++- pom.xml | 2 +- sapphire/pom.xml | 2 +- silvertail/pom.xml | 2 +- zkthemedemo/pom.xml | 4 +- 9 files changed, 591 insertions(+), 8 deletions(-) diff --git a/breeze/pom.xml b/breeze/pom.xml index 2a55a601..b47f5423 100644 --- a/breeze/pom.xml +++ b/breeze/pom.xml @@ -4,7 +4,7 @@ zktheme org.zkoss.theme - 9.6.3-SNAPSHOT + 9.6.3 breeze jar diff --git a/dist/breeze.jar b/dist/breeze.jar index 35975719e2db1319091c2999ca3e510c62baced7..b56f34d427d2ebf49c7ff91556fb9063bd086f63 100644 GIT binary patch delta 9687 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 N0!K+CcP0U&s8Np$p#c&$xA7U%~bzB64S0 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 0.6" + } + }, + "node_modules/anymatch": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", + "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/base64id": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz", + "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==", + "engines": { + "node": "^4.5.0 || >= 5.9" + } + }, + "node_modules/binary-extensions": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", + "engines": { + "node": ">=8" + } + }, + "node_modules/braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dependencies": { + "fill-range": "^7.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/chokidar": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz", + "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==", + "dependencies": { + "anymatch": "~3.1.1", + "braces": "~3.0.2", + "glob-parent": "~5.1.0", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.5.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "optionalDependencies": { + "fsevents": "~2.3.1" + } + }, + "node_modules/cookie": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz", + "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/copy-anything": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.1.tgz", + "integrity": "sha512-lA57e7viQHOdPQcrytv5jFeudZZOXuyk47lZym279FiDQ8jeZomXiGuVf6ffMKkJ+3TIai3J1J3yi6M+/4U35g==", + "dependencies": { + "is-what": "^3.7.1" + } + }, + "node_modules/cors": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", + "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "dependencies": { + "object-assign": "^4", + "vary": "^1" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/debug": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/engine.io": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.2.0.tgz", + "integrity": "sha512-4KzwW3F3bk+KlzSOY57fj/Jx6LyRQ1nbcyIadehl+AnXjKT7gDO0ORdRi/84ixvMKTym6ZKuxvbzN62HDDU1Lg==", + "dependencies": { + "@types/cookie": "^0.4.1", + "@types/cors": "^2.8.12", + "@types/node": ">=10.0.0", + "accepts": "~1.3.4", + "base64id": "2.0.0", + "cookie": "~0.4.1", + "cors": "~2.8.5", + "debug": "~4.3.1", + "engine.io-parser": "~5.0.3", + "ws": "~8.2.3" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/engine.io/node_modules/@types/cookie": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz", + "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==" + }, + "node_modules/engine.io/node_modules/@types/cors": { + "version": "2.8.12", + "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz", + "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==" + }, + "node_modules/engine.io/node_modules/engine.io-parser": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.4.tgz", + "integrity": "sha512-+nVFp+5z1E3HcToEnO7ZIj3g+3k9389DvWtvJZz0T6/eOCPIyyxehFcedoYrZQrp0LgQbD9pPXhpMBKMd5QURg==", + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/engine.io/node_modules/ws": { + "version": "8.2.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz", + "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==", + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": "^5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, + "node_modules/errno": { + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz", + "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==", + "optional": true, + "dependencies": { + "prr": "~1.0.1" + }, + "bin": { + "errno": "cli.js" + } + }, + "node_modules/fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/fs-extra": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", + "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + }, + "engines": { + "node": ">=6 <7 || >=8" + } + }, + "node_modules/fsevents": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.1.tgz", + "integrity": "sha512-YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw==", + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==" + }, + "node_modules/image-size": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz", + "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=", + "optional": true, + "bin": { + "image-size": "bin/image-size.js" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-glob": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", + "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/is-what": { + "version": "3.12.0", + "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.12.0.tgz", + "integrity": "sha512-2ilQz5/f/o9V7WRWJQmpFYNmQFZ9iM+OXRonZKcYgTkCzjb949Vi4h282PD1UfmgHk666rcWonbRJ++KI41VGw==" + }, + "node_modules/jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/less": { + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/less/-/less-3.13.1.tgz", + "integrity": "sha512-SwA1aQXGUvp+P5XdZslUOhhLnClSLIjWvJhmd+Vgib5BFIr9lMNlQwmwUNOjXThF/A0x+MCYYPeWEfeWiLRnTw==", + "dependencies": { + "copy-anything": "^2.0.1", + "tslib": "^1.10.0" + }, + "bin": { + "lessc": "bin/lessc" + }, + "engines": { + "node": ">=6" + }, + "optionalDependencies": { + "errno": "^0.1.1", + "graceful-fs": "^4.1.2", + "image-size": "~0.5.0", + "make-dir": "^2.1.0", + "mime": "^1.4.1", + "native-request": "^1.0.5", + "source-map": "~0.6.0" + } + }, + "node_modules/make-dir": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", + "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", + "optional": true, + "dependencies": { + "pify": "^4.0.1", + "semver": "^5.6.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "optional": true, + "bin": { + "mime": "cli.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/mime-db": { + "version": "1.48.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz", + "integrity": "sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.31", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz", + "integrity": "sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==", + "dependencies": { + "mime-db": "1.48.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/minimist": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", + "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==" + }, + "node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, + "node_modules/native-request": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/native-request/-/native-request-1.0.8.tgz", + "integrity": "sha512-vU2JojJVelUGp6jRcLwToPoWGxSx23z/0iX+I77J3Ht17rf2INGjrhOoQnjVo60nQd8wVsgzKkPfRXBiVdD2ag==", + "optional": true + }, + "node_modules/negotiator": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", + "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/picomatch": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", + "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/pify": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", + "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", + "optional": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/prr": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", + "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=", + "optional": true + }, + "node_modules/readdirp": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", + "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==", + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "optional": true, + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/socket.io": { + "version": "4.5.2", + "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.5.2.tgz", + "integrity": "sha512-6fCnk4ARMPZN448+SQcnn1u8OHUC72puJcNtSgg2xS34Cu7br1gQ09YKkO1PFfDn/wyUE9ZgMAwosJed003+NQ==", + "dependencies": { + "accepts": "~1.3.4", + "base64id": "~2.0.0", + "debug": "~4.3.2", + "engine.io": "~6.2.0", + "socket.io-adapter": "~2.4.0", + "socket.io-parser": "~4.2.0" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/socket.io/node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/socket.io/node_modules/socket.io-adapter": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz", + "integrity": "sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg==" + }, + "node_modules/socket.io/node_modules/socket.io-parser": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.1.tgz", + "integrity": "sha512-V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g==", + "dependencies": { + "@socket.io/component-emitter": "~3.1.0", + "debug": "~4.3.1" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "optional": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + }, + "node_modules/universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/zkless-engine": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/zkless-engine/-/zkless-engine-1.1.8.tgz", + "integrity": "sha512-plLqdVIhHrMKPcaHHfXZuaCkMT1HXqMhK6nXaYMYh34wQN53sXTs0MJwiFCYaEcm7kBi6O9JDM1ubE+jXs1TLg==", + "dependencies": { + "chokidar": "^3.5.1", + "fs-extra": "^8.1.0", + "less": "^3.13.1", + "minimist": "^1.2.5", + "socket.io": "^4.1.2" + }, + "bin": { + "zklessc": "bin/zkless-cli.js" + }, + "engines": { + "node": ">= 10.16" + } + } + }, "dependencies": { "@socket.io/component-emitter": { "version": "3.1.0", @@ -130,7 +712,8 @@ "ws": { "version": "8.2.3", "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz", - "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==" + "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==", + "requires": {} } } }, diff --git a/pom.xml b/pom.xml index 226ec42a..fb460b5f 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.zkoss.theme zktheme - 9.6.3-SNAPSHOT + 9.6.3 pom ZK Theme Maven Bulider http://www.zkoss.org/themes diff --git a/sapphire/pom.xml b/sapphire/pom.xml index 3a575382..60203240 100644 --- a/sapphire/pom.xml +++ b/sapphire/pom.xml @@ -6,7 +6,7 @@ org.zkoss.theme zktheme - 9.6.3-SNAPSHOT + 9.6.3 sapphire jar diff --git a/silvertail/pom.xml b/silvertail/pom.xml index c72b3ac4..1e7c9846 100644 --- a/silvertail/pom.xml +++ b/silvertail/pom.xml @@ -6,7 +6,7 @@ org.zkoss.theme zktheme - 9.6.3-SNAPSHOT + 9.6.3 silvertail jar diff --git a/zkthemedemo/pom.xml b/zkthemedemo/pom.xml index 2142aeca..a59f6874 100644 --- a/zkthemedemo/pom.xml +++ b/zkthemedemo/pom.xml @@ -4,7 +4,7 @@ zktheme org.zkoss.theme - 9.6.3-SNAPSHOT + 9.6.3 zkthemedemo war @@ -63,7 +63,7 @@ org.zkoss.theme atlantic - 9.6.2 + 9.6.3 org.zkoss.theme From 83ab8f9a5ad3ad737a44351734543c9de42ac7d0 Mon Sep 17 00:00:00 2001 From: James Chu Date: Tue, 25 Oct 2022 15:00:22 +0800 Subject: [PATCH 06/12] upgrade to ZK 9.6.4 version --- breeze/pom.xml | 2 +- breeze/src/archive/metainfo/zk/config.xml | 2 +- breeze/src/archive/metainfo/zk/lang-addon.xml | 2 +- breeze/src/org/zkoss/theme/breeze/Version.java | 2 +- breeze/version | 2 +- pom.xml | 2 +- sapphire/pom.xml | 2 +- sapphire/src/archive/metainfo/zk/config.xml | 2 +- sapphire/src/archive/metainfo/zk/lang-addon.xml | 2 +- sapphire/src/org/zkoss/theme/sapphire/Version.java | 2 +- sapphire/version | 2 +- silvertail/pom.xml | 2 +- silvertail/src/archive/metainfo/zk/config.xml | 2 +- silvertail/src/archive/metainfo/zk/lang-addon.xml | 2 +- silvertail/src/org/zkoss/theme/silvertail/Version.java | 2 +- silvertail/version | 2 +- version | 2 +- zkthemedemo/pom.xml | 2 +- zkthemedemo/version | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/breeze/pom.xml b/breeze/pom.xml index b47f5423..6aae6ad2 100644 --- a/breeze/pom.xml +++ b/breeze/pom.xml @@ -4,7 +4,7 @@ zktheme org.zkoss.theme - 9.6.3 + 9.6.4-SNAPSHOT breeze jar diff --git a/breeze/src/archive/metainfo/zk/config.xml b/breeze/src/archive/metainfo/zk/config.xml index 0adedf62..1a95b61c 100644 --- a/breeze/src/archive/metainfo/zk/config.xml +++ b/breeze/src/archive/metainfo/zk/config.xml @@ -5,7 +5,7 @@ zul org.zkoss.theme.breeze.Version - 9.6.3 + 9.6.4 diff --git a/breeze/src/archive/metainfo/zk/lang-addon.xml b/breeze/src/archive/metainfo/zk/lang-addon.xml index 3334f94a..8da1c013 100644 --- a/breeze/src/archive/metainfo/zk/lang-addon.xml +++ b/breeze/src/archive/metainfo/zk/lang-addon.xml @@ -5,7 +5,7 @@ org.zkoss.theme.breeze.Version - 9.6.3 + 9.6.4 diff --git a/breeze/src/org/zkoss/theme/breeze/Version.java b/breeze/src/org/zkoss/theme/breeze/Version.java index 46926d7a..28216c8e 100644 --- a/breeze/src/org/zkoss/theme/breeze/Version.java +++ b/breeze/src/org/zkoss/theme/breeze/Version.java @@ -26,5 +26,5 @@ public class Version { /** Returns the version UID. */ - public static final String UID = "9.6.3"; + public static final String UID = "9.6.4"; } diff --git a/breeze/version b/breeze/version index 3a2d20d3..23b4d391 100644 --- a/breeze/version +++ b/breeze/version @@ -1 +1 @@ -9.6.3 \ No newline at end of file +9.6.4 \ No newline at end of file diff --git a/pom.xml b/pom.xml index fb460b5f..b9437ac5 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.zkoss.theme zktheme - 9.6.3 + 9.6.4-SNAPSHOT pom ZK Theme Maven Bulider http://www.zkoss.org/themes diff --git a/sapphire/pom.xml b/sapphire/pom.xml index 60203240..5e7a0d80 100644 --- a/sapphire/pom.xml +++ b/sapphire/pom.xml @@ -6,7 +6,7 @@ org.zkoss.theme zktheme - 9.6.3 + 9.6.4-SNAPSHOT sapphire jar diff --git a/sapphire/src/archive/metainfo/zk/config.xml b/sapphire/src/archive/metainfo/zk/config.xml index e137a83f..9b374497 100644 --- a/sapphire/src/archive/metainfo/zk/config.xml +++ b/sapphire/src/archive/metainfo/zk/config.xml @@ -5,7 +5,7 @@ zul org.zkoss.theme.sapphire.Version - 9.6.3 + 9.6.4 diff --git a/sapphire/src/archive/metainfo/zk/lang-addon.xml b/sapphire/src/archive/metainfo/zk/lang-addon.xml index 0768b298..a7533f0d 100644 --- a/sapphire/src/archive/metainfo/zk/lang-addon.xml +++ b/sapphire/src/archive/metainfo/zk/lang-addon.xml @@ -5,7 +5,7 @@ org.zkoss.theme.sapphire.Version - 9.6.3 + 9.6.4 diff --git a/sapphire/src/org/zkoss/theme/sapphire/Version.java b/sapphire/src/org/zkoss/theme/sapphire/Version.java index 5e37ba1c..932b72b1 100644 --- a/sapphire/src/org/zkoss/theme/sapphire/Version.java +++ b/sapphire/src/org/zkoss/theme/sapphire/Version.java @@ -26,5 +26,5 @@ public class Version { /** Returns the version UID. */ - public static final String UID = "9.6.3"; + public static final String UID = "9.6.4"; } diff --git a/sapphire/version b/sapphire/version index 3a2d20d3..23b4d391 100644 --- a/sapphire/version +++ b/sapphire/version @@ -1 +1 @@ -9.6.3 \ No newline at end of file +9.6.4 \ No newline at end of file diff --git a/silvertail/pom.xml b/silvertail/pom.xml index 1e7c9846..98ec3517 100644 --- a/silvertail/pom.xml +++ b/silvertail/pom.xml @@ -6,7 +6,7 @@ org.zkoss.theme zktheme - 9.6.3 + 9.6.4-SNAPSHOT silvertail jar diff --git a/silvertail/src/archive/metainfo/zk/config.xml b/silvertail/src/archive/metainfo/zk/config.xml index 63434efc..9e4c62f4 100644 --- a/silvertail/src/archive/metainfo/zk/config.xml +++ b/silvertail/src/archive/metainfo/zk/config.xml @@ -5,7 +5,7 @@ zul org.zkoss.theme.silvertail.Version - 9.6.3 + 9.6.4 diff --git a/silvertail/src/archive/metainfo/zk/lang-addon.xml b/silvertail/src/archive/metainfo/zk/lang-addon.xml index 69ee3e6a..88961d9f 100644 --- a/silvertail/src/archive/metainfo/zk/lang-addon.xml +++ b/silvertail/src/archive/metainfo/zk/lang-addon.xml @@ -5,7 +5,7 @@ org.zkoss.theme.silvertail.Version - 9.6.3 + 9.6.4 diff --git a/silvertail/src/org/zkoss/theme/silvertail/Version.java b/silvertail/src/org/zkoss/theme/silvertail/Version.java index e81b4fad..7815b22a 100644 --- a/silvertail/src/org/zkoss/theme/silvertail/Version.java +++ b/silvertail/src/org/zkoss/theme/silvertail/Version.java @@ -26,5 +26,5 @@ public class Version { /** Returns the version UID. */ - public static final String UID = "9.6.3"; + public static final String UID = "9.6.4"; } diff --git a/silvertail/version b/silvertail/version index 3a2d20d3..23b4d391 100644 --- a/silvertail/version +++ b/silvertail/version @@ -1 +1 @@ -9.6.3 \ No newline at end of file +9.6.4 \ No newline at end of file diff --git a/version b/version index 3a2d20d3..23b4d391 100644 --- a/version +++ b/version @@ -1 +1 @@ -9.6.3 \ No newline at end of file +9.6.4 \ No newline at end of file diff --git a/zkthemedemo/pom.xml b/zkthemedemo/pom.xml index a59f6874..9b0ab441 100644 --- a/zkthemedemo/pom.xml +++ b/zkthemedemo/pom.xml @@ -4,7 +4,7 @@ zktheme org.zkoss.theme - 9.6.3 + 9.6.4-SNAPSHOT zkthemedemo war diff --git a/zkthemedemo/version b/zkthemedemo/version index 3a2d20d3..23b4d391 100644 --- a/zkthemedemo/version +++ b/zkthemedemo/version @@ -1 +1 @@ -9.6.3 \ No newline at end of file +9.6.4 \ No newline at end of file From 7439968790d3437c6b09a9074c1868dd93b5d0c7 Mon Sep 17 00:00:00 2001 From: Jumper Chen Date: Mon, 30 Jan 2023 11:05:28 +0800 Subject: [PATCH 07/12] Create contributing.md --- contributing.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 contributing.md diff --git a/contributing.md b/contributing.md new file mode 100644 index 00000000..32d2a0ba --- /dev/null +++ b/contributing.md @@ -0,0 +1,21 @@ + +Contributions of all kinds are welcome! + +**Reporting Issues** + +\* Before creating an issue, please review open issues to avoid a duplicate. + +\* If you have a question, not an issue, please discuss it in [ZK Forum](https://forum.zkoss.org/questions/). + +**Contributing codes** + +If you wish to contribute code, please create a corresponding issue and a pull request containing the ID of the issue with your comments. Your request will be reviewed before being merged. + +**License and Copyright** + +This project is created and maintained by Potix Corporation.  + +Any contributed content is licensed under the same license and terms as the project license. By contributing your code, you certify that you created the content and agree to surrender your copyright of the contributed code to Potix.  + + +For any inquiries and questions, please contact us at info@zkoss.org. From 6e855f66dff1d1f3ad36f8f746a3b44092323691 Mon Sep 17 00:00:00 2001 From: Jumper Chen Date: Mon, 30 Jan 2023 11:12:46 +0800 Subject: [PATCH 08/12] Update contributing.md --- contributing.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/contributing.md b/contributing.md index 32d2a0ba..18a7fa5d 100644 --- a/contributing.md +++ b/contributing.md @@ -3,19 +3,21 @@ Contributions of all kinds are welcome! **Reporting Issues** +\* Please use [ZK tracker](https://tracker.zkoss.org/projects/ZK) to report issues. + \* Before creating an issue, please review open issues to avoid a duplicate. \* If you have a question, not an issue, please discuss it in [ZK Forum](https://forum.zkoss.org/questions/). **Contributing codes** -If you wish to contribute code, please create a corresponding issue and a pull request containing the ID of the issue with your comments. Your request will be reviewed before being merged. +If you wish to contribute code, please create a corresponding issue [in tracker](https://tracker.zkoss.org/projects/ZK) and a pull request containing the ID of the issue from the tracker with your comments. Your request will be reviewed before being merged. **License and Copyright** -This project is created and maintained by Potix Corporation.  +This project is created and maintained by Potix Corporation. -Any contributed content is licensed under the same license and terms as the project license. By contributing your code, you certify that you created the content and agree to surrender your copyright of the contributed code to Potix.  +Any contributed content is licensed under the same license and terms as the project license. By contributing your code, you certify that you created the content and agree to surrender your copyright of the contributed code to Potix. For any inquiries and questions, please contact us at info@zkoss.org. From 54a993e47b264e9d5ab51c65c7ca6e8c73078ea4 Mon Sep 17 00:00:00 2001 From: James Chu Date: Fri, 21 Apr 2023 18:45:20 +0800 Subject: [PATCH 09/12] ZK-5061: ZK Embedded loading default ZK styles causes style changes to the outer page --- breeze/src/archive/web/zul/less/_reset.less | 110 +++++++++--------- breeze/src/archive/web/zul/less/norm.less | 25 ++-- sapphire/src/archive/web/zul/less/_reset.less | 110 +++++++++--------- sapphire/src/archive/web/zul/less/norm.less | 25 ++-- .../src/archive/web/zul/less/_reset.less | 110 +++++++++--------- silvertail/src/archive/web/zul/less/norm.less | 25 ++-- 6 files changed, 210 insertions(+), 195 deletions(-) diff --git a/breeze/src/archive/web/zul/less/_reset.less b/breeze/src/archive/web/zul/less/_reset.less index 8f8f7857..ac199b75 100644 --- a/breeze/src/archive/web/zul/less/_reset.less +++ b/breeze/src/archive/web/zul/less/_reset.less @@ -6,26 +6,27 @@ // Display in IE6-9 and FF3 // ------------------------- - -article, -aside, -details, -figcaption, -figure, -footer, -header, -hgroup, -nav, -section { +@browserDefault: "'org.zkoss.zul.theme.browserDefault'"; +@browserDefaultPrefix: e('${".z-page "}'); +@{browserDefaultPrefix}article, +@{browserDefaultPrefix}aside, +@{browserDefaultPrefix}details, +@{browserDefaultPrefix}figcaption, +@{browserDefaultPrefix}figure, +@{browserDefaultPrefix}footer, +@{browserDefaultPrefix}header, +@{browserDefaultPrefix}hgroup, +@{browserDefaultPrefix}nav, +@{browserDefaultPrefix}section { display: block; } // Display block in IE6-9 and FF3 // ------------------------- -audio, -canvas, -video { +@{browserDefaultPrefix}audio, +@{browserDefaultPrefix}canvas, +@{browserDefaultPrefix}video { display: inline-block; *display: inline; *zoom: 1; @@ -34,51 +35,53 @@ video { // Prevents modern browsers from displaying 'audio' without controls // ------------------------- -audio:not([controls]) { - display: none; +@{browserDefaultPrefix}audio:not([controls]) { + display: none; } // Base settings // ------------------------- +e(''); html { font-size: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; } +e(''); // Focus states -a:focus { +@{browserDefaultPrefix}a:focus { outline: none; // Disable for Potix on 5/29/2013 //.tab-focus(); } // Hover & Active -a:hover, -a:active { +@{browserDefaultPrefix}a:hover, +@{browserDefaultPrefix}a:active { outline: 0; } // Prevents sub and sup affecting line-height in all browsers // ------------------------- -sub, -sup { +@{browserDefaultPrefix}sub, +@{browserDefaultPrefix}sup { position: relative; font-size: 75%; line-height: 0; vertical-align: baseline; } -sup { +@{browserDefaultPrefix}sup { top: -0.5em; } -sub { +@{browserDefaultPrefix}sub { bottom: -0.25em; } // Img border in a's and image quality // ------------------------- -img { +@{browserDefaultPrefix}img { /* Responsive images (ensure images don't scale beyond their parents) */ // Potix: this style will make img invisible in ie8 @@ -101,52 +104,53 @@ img { // ------------------------- // Font size in all browsers, margin changes, misc consistency -button, -input, -select, -textarea { +@{browserDefaultPrefix}button, +@{browserDefaultPrefix}input, +@{browserDefaultPrefix}select, +@{browserDefaultPrefix}textarea { margin: 0; font-size: 100%; vertical-align: middle; } -button, -input { +@{browserDefaultPrefix}button, +@{browserDefaultPrefix}input { *overflow: visible; // Inner spacing ie IE6/7 line-height: normal; // FF3/4 have !important on line-height in UA stylesheet } -button::-moz-focus-inner, -input::-moz-focus-inner { // Inner padding and border oddities in FF3/4 +@{browserDefaultPrefix}label, +@{browserDefaultPrefix}select, +@{browserDefaultPrefix}button, +@{browserDefaultPrefix}input[type="button"], +@{browserDefaultPrefix}input[type="reset"], +@{browserDefaultPrefix}input[type="submit"], +@{browserDefaultPrefix}input[type="radio"], +@{browserDefaultPrefix}input[type="checkbox"] { + cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others. +} +// Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. +@{browserDefaultPrefix}button, +html @{browserDefaultPrefix}input[type="button"], +@{browserDefaultPrefix}input[type="reset"], +@{browserDefaultPrefix}input[type="submit"] { + -webkit-appearance: button; // Corrects inability to style clickable `input` types in iOS. + cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others. +} +@{browserDefaultPrefix}button::-moz-focus-inner, +@{browserDefaultPrefix}input::-moz-focus-inner { // Inner padding and border oddities in FF3/4 padding: 0; border: 0; } -button, -html input[type="button"], // Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. -input[type="reset"], -input[type="submit"] { - -webkit-appearance: button; // Corrects inability to style clickable `input` types in iOS. - cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others. -} -label, -select, -button, -input[type="button"], -input[type="reset"], -input[type="submit"], -input[type="radio"], -input[type="checkbox"] { - cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others. -} -input[type="search"] { // Appearance in Safari/Chrome +@{browserDefaultPrefix}input[type="search"] { // Appearance in Safari/Chrome // Potix: using zk mixins //.box-sizing(content-box); .applyCSS3('box-sizing', 'content-box'); -webkit-appearance: textfield; } -input[type="search"]::-webkit-search-decoration, -input[type="search"]::-webkit-search-cancel-button { +@{browserDefaultPrefix}input[type="search"]::-webkit-search-decoration, +@{browserDefaultPrefix}input[type="search"]::-webkit-search-cancel-button { -webkit-appearance: none; // Inner-padding issues in Chrome OSX, Safari 5 } -textarea { +@{browserDefaultPrefix}textarea { overflow: auto; // Remove vertical scrollbar in IE6-9 vertical-align: top; // Readability and alignment cross-browser } diff --git a/breeze/src/archive/web/zul/less/norm.less b/breeze/src/archive/web/zul/less/norm.less index 816b375a..1e45daf2 100644 --- a/breeze/src/archive/web/zul/less/norm.less +++ b/breeze/src/archive/web/zul/less/norm.less @@ -1,9 +1,11 @@ @import "~./zul/less/_header.less"; @import "~./zul/less/_reset.less"; +e(''); html, body { height: 100%; } +e(''); // affect ZK component only [class^="z-"], @@ -17,33 +19,33 @@ html, body { } // Reset -input[type=number]::-webkit-inner-spin-button, -input[type=number]::-webkit-outer-spin-button { +@{browserDefaultPrefix}input[type=number]::-webkit-inner-spin-button, +@{browserDefaultPrefix}input[type=number]::-webkit-outer-spin-button { -webkit-appearance: none; margin: 0; } -input, -input:focus, -textarea, -textarea:focus { +@{browserDefaultPrefix}input, +@{browserDefaultPrefix}input:focus, +@{browserDefaultPrefix}textarea, +@{browserDefaultPrefix}textarea:focus { -webkit-appearance: none; -moz-appearance: none; outline: none; -webkit-user-select: text; } -*:focus { +@{browserDefaultPrefix}*:focus { outline: none; } -fieldset { +@{browserDefaultPrefix}fieldset { border: 1px solid #c0c0c0; border-radius: 0; margin: 0 2px; padding: 0px; } -legend { +@{browserDefaultPrefix}legend { border: 0; padding: 0; } @@ -54,7 +56,6 @@ legend { } } -@browserDefault: "'org.zkoss.zul.theme.browserDefault'"; e(''); body { margin: 0; @@ -166,14 +167,14 @@ div.z-log { } //radio, radiogroup -input[type="radio"] { +@{browserDefaultPrefix}input[type="radio"] { -webkit-appearance: radio; -moz-appearance: radio; margin: 0px 2px 2px; } //checkbox -input[type="checkbox"] { +@{browserDefaultPrefix}input[type="checkbox"] { -webkit-appearance: checkbox; -moz-appearance: checkbox; margin: 0px 2px 2px; diff --git a/sapphire/src/archive/web/zul/less/_reset.less b/sapphire/src/archive/web/zul/less/_reset.less index cc10a0a7..37e8413d 100644 --- a/sapphire/src/archive/web/zul/less/_reset.less +++ b/sapphire/src/archive/web/zul/less/_reset.less @@ -6,26 +6,27 @@ // Display in IE6-9 and FF3 // ------------------------- - -article, -aside, -details, -figcaption, -figure, -footer, -header, -hgroup, -nav, -section { +@browserDefault: "'org.zkoss.zul.theme.browserDefault'"; +@browserDefaultPrefix: e('${".z-page "}'); +@{browserDefaultPrefix}article, +@{browserDefaultPrefix}aside, +@{browserDefaultPrefix}details, +@{browserDefaultPrefix}figcaption, +@{browserDefaultPrefix}figure, +@{browserDefaultPrefix}footer, +@{browserDefaultPrefix}header, +@{browserDefaultPrefix}hgroup, +@{browserDefaultPrefix}nav, +@{browserDefaultPrefix}section { display: block; } // Display block in IE6-9 and FF3 // ------------------------- -audio, -canvas, -video { +@{browserDefaultPrefix}audio, +@{browserDefaultPrefix}canvas, +@{browserDefaultPrefix}video { display: inline-block; *display: inline; *zoom: 1; @@ -34,51 +35,53 @@ video { // Prevents modern browsers from displaying 'audio' without controls // ------------------------- -audio:not([controls]) { - display: none; +@{browserDefaultPrefix}audio:not([controls]) { + display: none; } // Base settings // ------------------------- +e(''); html { font-size: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; } +e(''); // Focus states -a:focus { +@{browserDefaultPrefix}a:focus { outline: none; // Disable for Potix on 5/29/2013 //.tab-focus(); } // Hover & Active -a:hover, -a:active { +@{browserDefaultPrefix}a:hover, +@{browserDefaultPrefix}a:active { outline: 0; } // Prevents sub and sup affecting line-height in all browsers // ------------------------- -sub, -sup { +@{browserDefaultPrefix}sub, +@{browserDefaultPrefix}sup { position: relative; font-size: 75%; line-height: 0; vertical-align: baseline; } -sup { +@{browserDefaultPrefix}sup { top: -0.5em; } -sub { +@{browserDefaultPrefix}sub { bottom: -0.25em; } // Img border in a's and image quality // ------------------------- -img { +@{browserDefaultPrefix}img { /* Responsive images (ensure images don't scale beyond their parents) */ // Potix: this style will make img invisible in ie8 @@ -101,52 +104,53 @@ img { // ------------------------- // Font size in all browsers, margin changes, misc consistency -button, -input, -select, -textarea { +@{browserDefaultPrefix}button, +@{browserDefaultPrefix}input, +@{browserDefaultPrefix}select, +@{browserDefaultPrefix}textarea { margin: 0; font-size: 100%; vertical-align: middle; } -button, -input { +@{browserDefaultPrefix}button, +@{browserDefaultPrefix}input { *overflow: visible; // Inner spacing ie IE6/7 line-height: normal; // FF3/4 have !important on line-height in UA stylesheet } -button::-moz-focus-inner, -input::-moz-focus-inner { // Inner padding and border oddities in FF3/4 +@{browserDefaultPrefix}label, +@{browserDefaultPrefix}select, +@{browserDefaultPrefix}button, +@{browserDefaultPrefix}input[type="button"], +@{browserDefaultPrefix}input[type="reset"], +@{browserDefaultPrefix}input[type="submit"], +@{browserDefaultPrefix}input[type="radio"], +@{browserDefaultPrefix}input[type="checkbox"] { + cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others. +} +// Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. +@{browserDefaultPrefix}button, +html @{browserDefaultPrefix}input[type="button"], +@{browserDefaultPrefix}input[type="reset"], +@{browserDefaultPrefix}input[type="submit"] { + -webkit-appearance: button; // Corrects inability to style clickable `input` types in iOS. + cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others. +} +@{browserDefaultPrefix}button::-moz-focus-inner, +@{browserDefaultPrefix}input::-moz-focus-inner { // Inner padding and border oddities in FF3/4 padding: 0; border: 0; } -button, -html input[type="button"], // Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. -input[type="reset"], -input[type="submit"] { - -webkit-appearance: button; // Corrects inability to style clickable `input` types in iOS. - cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others. -} -label, -select, -button, -input[type="button"], -input[type="reset"], -input[type="submit"], -input[type="radio"], -input[type="checkbox"] { - cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others. -} -input[type="search"] { // Appearance in Safari/Chrome +@{browserDefaultPrefix}input[type="search"] { // Appearance in Safari/Chrome // Potix: using zk mixins //.box-sizing(content-box); .applyCSS3('box-sizing', 'content-box'); -webkit-appearance: textfield; } -input[type="search"]::-webkit-search-decoration, -input[type="search"]::-webkit-search-cancel-button { +@{browserDefaultPrefix}input[type="search"]::-webkit-search-decoration, +@{browserDefaultPrefix}input[type="search"]::-webkit-search-cancel-button { -webkit-appearance: none; // Inner-padding issues in Chrome OSX, Safari 5 } -textarea { +@{browserDefaultPrefix}textarea { overflow: auto; // Remove vertical scrollbar in IE6-9 vertical-align: top; // Readability and alignment cross-browser } diff --git a/sapphire/src/archive/web/zul/less/norm.less b/sapphire/src/archive/web/zul/less/norm.less index feedac85..f9c2ff07 100644 --- a/sapphire/src/archive/web/zul/less/norm.less +++ b/sapphire/src/archive/web/zul/less/norm.less @@ -1,9 +1,11 @@ @import "~./zul/less/_header.less"; @import "~./zul/less/_reset.less"; +e(''); html, body { height: 100%; } +e(''); // affect ZK component only [class^="z-"], @@ -17,33 +19,33 @@ html, body { } // Reset -input[type=number]::-webkit-inner-spin-button, -input[type=number]::-webkit-outer-spin-button { +@{browserDefaultPrefix}input[type=number]::-webkit-inner-spin-button, +@{browserDefaultPrefix}input[type=number]::-webkit-outer-spin-button { -webkit-appearance: none; margin: 0; } -input, -input:focus, -textarea, -textarea:focus { +@{browserDefaultPrefix}input, +@{browserDefaultPrefix}input:focus, +@{browserDefaultPrefix}textarea, +@{browserDefaultPrefix}textarea:focus { -webkit-appearance: none; -moz-appearance: none; outline: none; -webkit-user-select: text; } -*:focus { +@{browserDefaultPrefix}*:focus { outline: none; } -fieldset { +@{browserDefaultPrefix}fieldset { border: 1px solid #c0c0c0; border-radius: 0; margin: 0 2px; padding: 0px; } -legend { +@{browserDefaultPrefix}legend { border: 0; padding: 0; } @@ -54,7 +56,6 @@ legend { } } -@browserDefault: "'org.zkoss.zul.theme.browserDefault'"; e(''); body { margin: 0; @@ -166,14 +167,14 @@ div.z-log { } //radio, radiogroup -input[type="radio"] { +@{browserDefaultPrefix}input[type="radio"] { -webkit-appearance: radio; -moz-appearance: radio; margin: 0px 2px 2px; } //checkbox -input[type="checkbox"] { +@{browserDefaultPrefix}input[type="checkbox"] { -webkit-appearance: checkbox; -moz-appearance: checkbox; margin: 0px 2px 2px; diff --git a/silvertail/src/archive/web/zul/less/_reset.less b/silvertail/src/archive/web/zul/less/_reset.less index cc10a0a7..37e8413d 100644 --- a/silvertail/src/archive/web/zul/less/_reset.less +++ b/silvertail/src/archive/web/zul/less/_reset.less @@ -6,26 +6,27 @@ // Display in IE6-9 and FF3 // ------------------------- - -article, -aside, -details, -figcaption, -figure, -footer, -header, -hgroup, -nav, -section { +@browserDefault: "'org.zkoss.zul.theme.browserDefault'"; +@browserDefaultPrefix: e('${".z-page "}'); +@{browserDefaultPrefix}article, +@{browserDefaultPrefix}aside, +@{browserDefaultPrefix}details, +@{browserDefaultPrefix}figcaption, +@{browserDefaultPrefix}figure, +@{browserDefaultPrefix}footer, +@{browserDefaultPrefix}header, +@{browserDefaultPrefix}hgroup, +@{browserDefaultPrefix}nav, +@{browserDefaultPrefix}section { display: block; } // Display block in IE6-9 and FF3 // ------------------------- -audio, -canvas, -video { +@{browserDefaultPrefix}audio, +@{browserDefaultPrefix}canvas, +@{browserDefaultPrefix}video { display: inline-block; *display: inline; *zoom: 1; @@ -34,51 +35,53 @@ video { // Prevents modern browsers from displaying 'audio' without controls // ------------------------- -audio:not([controls]) { - display: none; +@{browserDefaultPrefix}audio:not([controls]) { + display: none; } // Base settings // ------------------------- +e(''); html { font-size: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; } +e(''); // Focus states -a:focus { +@{browserDefaultPrefix}a:focus { outline: none; // Disable for Potix on 5/29/2013 //.tab-focus(); } // Hover & Active -a:hover, -a:active { +@{browserDefaultPrefix}a:hover, +@{browserDefaultPrefix}a:active { outline: 0; } // Prevents sub and sup affecting line-height in all browsers // ------------------------- -sub, -sup { +@{browserDefaultPrefix}sub, +@{browserDefaultPrefix}sup { position: relative; font-size: 75%; line-height: 0; vertical-align: baseline; } -sup { +@{browserDefaultPrefix}sup { top: -0.5em; } -sub { +@{browserDefaultPrefix}sub { bottom: -0.25em; } // Img border in a's and image quality // ------------------------- -img { +@{browserDefaultPrefix}img { /* Responsive images (ensure images don't scale beyond their parents) */ // Potix: this style will make img invisible in ie8 @@ -101,52 +104,53 @@ img { // ------------------------- // Font size in all browsers, margin changes, misc consistency -button, -input, -select, -textarea { +@{browserDefaultPrefix}button, +@{browserDefaultPrefix}input, +@{browserDefaultPrefix}select, +@{browserDefaultPrefix}textarea { margin: 0; font-size: 100%; vertical-align: middle; } -button, -input { +@{browserDefaultPrefix}button, +@{browserDefaultPrefix}input { *overflow: visible; // Inner spacing ie IE6/7 line-height: normal; // FF3/4 have !important on line-height in UA stylesheet } -button::-moz-focus-inner, -input::-moz-focus-inner { // Inner padding and border oddities in FF3/4 +@{browserDefaultPrefix}label, +@{browserDefaultPrefix}select, +@{browserDefaultPrefix}button, +@{browserDefaultPrefix}input[type="button"], +@{browserDefaultPrefix}input[type="reset"], +@{browserDefaultPrefix}input[type="submit"], +@{browserDefaultPrefix}input[type="radio"], +@{browserDefaultPrefix}input[type="checkbox"] { + cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others. +} +// Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. +@{browserDefaultPrefix}button, +html @{browserDefaultPrefix}input[type="button"], +@{browserDefaultPrefix}input[type="reset"], +@{browserDefaultPrefix}input[type="submit"] { + -webkit-appearance: button; // Corrects inability to style clickable `input` types in iOS. + cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others. +} +@{browserDefaultPrefix}button::-moz-focus-inner, +@{browserDefaultPrefix}input::-moz-focus-inner { // Inner padding and border oddities in FF3/4 padding: 0; border: 0; } -button, -html input[type="button"], // Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. -input[type="reset"], -input[type="submit"] { - -webkit-appearance: button; // Corrects inability to style clickable `input` types in iOS. - cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others. -} -label, -select, -button, -input[type="button"], -input[type="reset"], -input[type="submit"], -input[type="radio"], -input[type="checkbox"] { - cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others. -} -input[type="search"] { // Appearance in Safari/Chrome +@{browserDefaultPrefix}input[type="search"] { // Appearance in Safari/Chrome // Potix: using zk mixins //.box-sizing(content-box); .applyCSS3('box-sizing', 'content-box'); -webkit-appearance: textfield; } -input[type="search"]::-webkit-search-decoration, -input[type="search"]::-webkit-search-cancel-button { +@{browserDefaultPrefix}input[type="search"]::-webkit-search-decoration, +@{browserDefaultPrefix}input[type="search"]::-webkit-search-cancel-button { -webkit-appearance: none; // Inner-padding issues in Chrome OSX, Safari 5 } -textarea { +@{browserDefaultPrefix}textarea { overflow: auto; // Remove vertical scrollbar in IE6-9 vertical-align: top; // Readability and alignment cross-browser } diff --git a/silvertail/src/archive/web/zul/less/norm.less b/silvertail/src/archive/web/zul/less/norm.less index feedac85..f9c2ff07 100644 --- a/silvertail/src/archive/web/zul/less/norm.less +++ b/silvertail/src/archive/web/zul/less/norm.less @@ -1,9 +1,11 @@ @import "~./zul/less/_header.less"; @import "~./zul/less/_reset.less"; +e(''); html, body { height: 100%; } +e(''); // affect ZK component only [class^="z-"], @@ -17,33 +19,33 @@ html, body { } // Reset -input[type=number]::-webkit-inner-spin-button, -input[type=number]::-webkit-outer-spin-button { +@{browserDefaultPrefix}input[type=number]::-webkit-inner-spin-button, +@{browserDefaultPrefix}input[type=number]::-webkit-outer-spin-button { -webkit-appearance: none; margin: 0; } -input, -input:focus, -textarea, -textarea:focus { +@{browserDefaultPrefix}input, +@{browserDefaultPrefix}input:focus, +@{browserDefaultPrefix}textarea, +@{browserDefaultPrefix}textarea:focus { -webkit-appearance: none; -moz-appearance: none; outline: none; -webkit-user-select: text; } -*:focus { +@{browserDefaultPrefix}*:focus { outline: none; } -fieldset { +@{browserDefaultPrefix}fieldset { border: 1px solid #c0c0c0; border-radius: 0; margin: 0 2px; padding: 0px; } -legend { +@{browserDefaultPrefix}legend { border: 0; padding: 0; } @@ -54,7 +56,6 @@ legend { } } -@browserDefault: "'org.zkoss.zul.theme.browserDefault'"; e(''); body { margin: 0; @@ -166,14 +167,14 @@ div.z-log { } //radio, radiogroup -input[type="radio"] { +@{browserDefaultPrefix}input[type="radio"] { -webkit-appearance: radio; -moz-appearance: radio; margin: 0px 2px 2px; } //checkbox -input[type="checkbox"] { +@{browserDefaultPrefix}input[type="checkbox"] { -webkit-appearance: checkbox; -moz-appearance: checkbox; margin: 0px 2px 2px; From 15019f82e9511800a3e14e7bfaa71d4fa224d49e Mon Sep 17 00:00:00 2001 From: zkadmin Date: Tue, 16 May 2023 14:35:31 +0800 Subject: [PATCH 10/12] release 9.6.4 --- breeze/pom.xml | 2 +- dist/breeze.jar | Bin 366645 -> 366773 bytes dist/sapphire.jar | Bin 376693 -> 376825 bytes dist/silvertail.jar | Bin 371884 -> 372013 bytes pom.xml | 2 +- sapphire/pom.xml | 2 +- silvertail/pom.xml | 2 +- zkthemedemo/pom.xml | 4 ++-- 8 files changed, 6 insertions(+), 6 deletions(-) diff --git a/breeze/pom.xml b/breeze/pom.xml index 6aae6ad2..a8dd72e9 100644 --- a/breeze/pom.xml +++ b/breeze/pom.xml @@ -4,7 +4,7 @@ zktheme org.zkoss.theme - 9.6.4-SNAPSHOT + 9.6.4 breeze jar diff --git a/dist/breeze.jar b/dist/breeze.jar index b56f34d427d2ebf49c7ff91556fb9063bd086f63..8b52153d80401635db0e816fffd77eabb14ae349 100644 GIT binary patch delta 13691 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 delta 13420 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 y_^}G_)`Q~n24m3_(p delta 14629 zcmZu22Rv2Z|8ej2p6%J$QrR=9s1T7onn)#SnoY9H%GQgM$_gnGA}>nP(ofPZ4UzVg zHcJ0uAu$hxo2jQ(w`D8>mRv{mQ)dR69bCW8P9SU>~IX(Jx#Dp|Z23=~5W5);xiQ`Hqfb%|r z&Jtm8I4UsoM?{{98mWxgs8Jv=8C;Jd__+=B0QJ&=O7!10R3Rp^3iuhUAbt+Lk-d^F(Pzuqn!9Bgj^V^z+xvM#;sPY@FbAA^KYI70;)hIoA@W*NNAN^{|B1o zDntijff)X`f+R-u|HU{bM9(=${DaUB5iH^eI=7g5bXAstFf_3+#|W{)Mo48+RD+6t zMeP@!iU1%g2$uLaf+@{U5I8GEgyS}nlxyYxBQ=TjLqv3x9F&A$8Hh4b$2uO$=B)Li z!l;Ae1XlhC1mwiJFFNWyRUp>L#e@oNH8C9&;|xrZ6)Yx!UR)UD3x7^7!OuF&0oR26F65k+&V2*l@gJ_J9M#!^-C79ejASMB)vz#RasGQAO zCZU8HQ4*6-Zem2NUL@I@w+cIFpA#E+NlfoK6Li?=Z9IDeL()bqT(GG5oS` zix~W|OOrD*wPXbzbgi1KchviV2o`-Q?&3N6CpU)r!d0th4mofCk^lSK?|%LsNi)O! zo&H7L=cS7VLc^V2XT16qU%Rs+)#+fC)@hY3Hl7}>*$!cD$tLyuH%k}Z@*e2C8Dh_{ z8MG5?^gVjfyJ4Temvd#&@ka)~rpjneKhdjg7~D`7ccI2)LU`o8dqyB7er1k6XfWPc zdVcBA>;grXE$i3x+AMBaT`F2WS)#7Srt?o#+>N2|+rPKytw|Tl7wzD)QYd`-hozU~*-)Mc7rEp!1 z-Qa`UAS>7A?p??+{Tu~cnPYlAO`MHWUMMrP!Z8t&*OLmbPd|8Qw9h=O7Hx(>o&fJ{`wM5F7VP3m4E#eQWz4T5i|_ zHJBof5IbG*QaXyOPctQuMy#RgJW2$`u-p5uiqL2oW~^9D0?u3pOFv#X+EZ}zqf^Xb z?PHtrAI@|?oL_Tg^ULS#+bOJ{y))c)H1XKYKQvEV$IdQi+S{PMUdv=j%hvR++~wi! zvs7iyt*Ys4WyeH49Q3feab>fvpIpPx$&fv9mp^`tm{Zm5G+*Jqo$d` zpE?}JRBB`oO*?(qziIeQ(X+lO^3fOil%^eYE=a8@@Xd7P)39Im=z>K0YXgDqtztOrr?yjmTfBGFm8gE>cAjMM`UP5zm~n)dv$<1_2J!J0FE@u{jcW&L{`CA9boXcK&m zc3ql?wTQ2svGMMb{yXl^)}Ioxdw=V$JoCHQ2jAnwj=K+x9@w{bDyB(TO^=8bU{^SBu_fWf!v#ORnm)PxH0#zN4!gZmn`@(VFQ%R0 zpxm_~BJi-(Mu9yjQ6Kx&ui}Ar8?h8dx`R$?!&B5xo+Bn1fv7j-<#FCXup2nnoTD*JrE7P`=dR zRFJxiq??six_Vu&D(6q@vwB+JX zBzp^7tSgRB%

WF0di5QDu>;YW`v~=oW!|e1+fzoM< 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 diff --git a/dist/silvertail.jar b/dist/silvertail.jar index fc434232147366f6c809ef0325bc635739a11105..6c95937a1cce44889eec62d895f92c12cb7cb6fb 100644 GIT binary patch delta 14050 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 delta 14385 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 diff --git a/pom.xml b/pom.xml index b9437ac5..e1ad2eb6 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.zkoss.theme zktheme - 9.6.4-SNAPSHOT + 9.6.4 pom ZK Theme Maven Bulider http://www.zkoss.org/themes diff --git a/sapphire/pom.xml b/sapphire/pom.xml index 5e7a0d80..923af05b 100644 --- a/sapphire/pom.xml +++ b/sapphire/pom.xml @@ -6,7 +6,7 @@ org.zkoss.theme zktheme - 9.6.4-SNAPSHOT + 9.6.4 sapphire jar diff --git a/silvertail/pom.xml b/silvertail/pom.xml index 98ec3517..45265ba2 100644 --- a/silvertail/pom.xml +++ b/silvertail/pom.xml @@ -6,7 +6,7 @@ org.zkoss.theme zktheme - 9.6.4-SNAPSHOT + 9.6.4 silvertail jar diff --git a/zkthemedemo/pom.xml b/zkthemedemo/pom.xml index 9b0ab441..0777e80d 100644 --- a/zkthemedemo/pom.xml +++ b/zkthemedemo/pom.xml @@ -4,7 +4,7 @@ zktheme org.zkoss.theme - 9.6.4-SNAPSHOT + 9.6.4 zkthemedemo war @@ -63,7 +63,7 @@ org.zkoss.theme atlantic - 9.6.3 + 9.6.4 org.zkoss.theme From d3ce29f7c661780c8db2f2efb22bb28898633088 Mon Sep 17 00:00:00 2001 From: James Chu Date: Tue, 16 May 2023 15:49:53 +0800 Subject: [PATCH 11/12] upgrade to ZK 9.6.5 version --- breeze/pom.xml | 2 +- breeze/src/archive/metainfo/zk/config.xml | 2 +- breeze/src/archive/metainfo/zk/lang-addon.xml | 2 +- breeze/src/org/zkoss/theme/breeze/Version.java | 2 +- breeze/version | 2 +- pom.xml | 2 +- sapphire/pom.xml | 2 +- sapphire/src/archive/metainfo/zk/config.xml | 2 +- sapphire/src/archive/metainfo/zk/lang-addon.xml | 2 +- sapphire/src/org/zkoss/theme/sapphire/Version.java | 2 +- sapphire/version | 2 +- silvertail/pom.xml | 2 +- silvertail/src/archive/metainfo/zk/config.xml | 2 +- silvertail/src/archive/metainfo/zk/lang-addon.xml | 2 +- silvertail/src/org/zkoss/theme/silvertail/Version.java | 2 +- silvertail/version | 2 +- version | 2 +- zkthemedemo/pom.xml | 2 +- zkthemedemo/version | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/breeze/pom.xml b/breeze/pom.xml index a8dd72e9..6e08062a 100644 --- a/breeze/pom.xml +++ b/breeze/pom.xml @@ -4,7 +4,7 @@ zktheme org.zkoss.theme - 9.6.4 + 9.6.5-SNAPSHOT breeze jar diff --git a/breeze/src/archive/metainfo/zk/config.xml b/breeze/src/archive/metainfo/zk/config.xml index 1a95b61c..2c560d95 100644 --- a/breeze/src/archive/metainfo/zk/config.xml +++ b/breeze/src/archive/metainfo/zk/config.xml @@ -5,7 +5,7 @@ zul org.zkoss.theme.breeze.Version - 9.6.4 + 9.6.5 diff --git a/breeze/src/archive/metainfo/zk/lang-addon.xml b/breeze/src/archive/metainfo/zk/lang-addon.xml index 8da1c013..95ec55a1 100644 --- a/breeze/src/archive/metainfo/zk/lang-addon.xml +++ b/breeze/src/archive/metainfo/zk/lang-addon.xml @@ -5,7 +5,7 @@ org.zkoss.theme.breeze.Version - 9.6.4 + 9.6.5 diff --git a/breeze/src/org/zkoss/theme/breeze/Version.java b/breeze/src/org/zkoss/theme/breeze/Version.java index 28216c8e..3019bbd3 100644 --- a/breeze/src/org/zkoss/theme/breeze/Version.java +++ b/breeze/src/org/zkoss/theme/breeze/Version.java @@ -26,5 +26,5 @@ public class Version { /** Returns the version UID. */ - public static final String UID = "9.6.4"; + public static final String UID = "9.6.5"; } diff --git a/breeze/version b/breeze/version index 23b4d391..462e1ca0 100644 --- a/breeze/version +++ b/breeze/version @@ -1 +1 @@ -9.6.4 \ No newline at end of file +9.6.5 \ No newline at end of file diff --git a/pom.xml b/pom.xml index e1ad2eb6..1551ae32 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.zkoss.theme zktheme - 9.6.4 + 9.6.5-SNAPSHOT pom ZK Theme Maven Bulider http://www.zkoss.org/themes diff --git a/sapphire/pom.xml b/sapphire/pom.xml index 923af05b..973306eb 100644 --- a/sapphire/pom.xml +++ b/sapphire/pom.xml @@ -6,7 +6,7 @@ org.zkoss.theme zktheme - 9.6.4 + 9.6.5-SNAPSHOT sapphire jar diff --git a/sapphire/src/archive/metainfo/zk/config.xml b/sapphire/src/archive/metainfo/zk/config.xml index 9b374497..f7eb6d70 100644 --- a/sapphire/src/archive/metainfo/zk/config.xml +++ b/sapphire/src/archive/metainfo/zk/config.xml @@ -5,7 +5,7 @@ zul org.zkoss.theme.sapphire.Version - 9.6.4 + 9.6.5 diff --git a/sapphire/src/archive/metainfo/zk/lang-addon.xml b/sapphire/src/archive/metainfo/zk/lang-addon.xml index a7533f0d..b53e2d90 100644 --- a/sapphire/src/archive/metainfo/zk/lang-addon.xml +++ b/sapphire/src/archive/metainfo/zk/lang-addon.xml @@ -5,7 +5,7 @@ org.zkoss.theme.sapphire.Version - 9.6.4 + 9.6.5 diff --git a/sapphire/src/org/zkoss/theme/sapphire/Version.java b/sapphire/src/org/zkoss/theme/sapphire/Version.java index 932b72b1..56a8a42d 100644 --- a/sapphire/src/org/zkoss/theme/sapphire/Version.java +++ b/sapphire/src/org/zkoss/theme/sapphire/Version.java @@ -26,5 +26,5 @@ public class Version { /** Returns the version UID. */ - public static final String UID = "9.6.4"; + public static final String UID = "9.6.5"; } diff --git a/sapphire/version b/sapphire/version index 23b4d391..462e1ca0 100644 --- a/sapphire/version +++ b/sapphire/version @@ -1 +1 @@ -9.6.4 \ No newline at end of file +9.6.5 \ No newline at end of file diff --git a/silvertail/pom.xml b/silvertail/pom.xml index 45265ba2..c9d4df51 100644 --- a/silvertail/pom.xml +++ b/silvertail/pom.xml @@ -6,7 +6,7 @@ org.zkoss.theme zktheme - 9.6.4 + 9.6.5-SNAPSHOT silvertail jar diff --git a/silvertail/src/archive/metainfo/zk/config.xml b/silvertail/src/archive/metainfo/zk/config.xml index 9e4c62f4..27f29698 100644 --- a/silvertail/src/archive/metainfo/zk/config.xml +++ b/silvertail/src/archive/metainfo/zk/config.xml @@ -5,7 +5,7 @@ zul org.zkoss.theme.silvertail.Version - 9.6.4 + 9.6.5 diff --git a/silvertail/src/archive/metainfo/zk/lang-addon.xml b/silvertail/src/archive/metainfo/zk/lang-addon.xml index 88961d9f..1f104391 100644 --- a/silvertail/src/archive/metainfo/zk/lang-addon.xml +++ b/silvertail/src/archive/metainfo/zk/lang-addon.xml @@ -5,7 +5,7 @@ org.zkoss.theme.silvertail.Version - 9.6.4 + 9.6.5 diff --git a/silvertail/src/org/zkoss/theme/silvertail/Version.java b/silvertail/src/org/zkoss/theme/silvertail/Version.java index 7815b22a..cb0d994d 100644 --- a/silvertail/src/org/zkoss/theme/silvertail/Version.java +++ b/silvertail/src/org/zkoss/theme/silvertail/Version.java @@ -26,5 +26,5 @@ public class Version { /** Returns the version UID. */ - public static final String UID = "9.6.4"; + public static final String UID = "9.6.5"; } diff --git a/silvertail/version b/silvertail/version index 23b4d391..462e1ca0 100644 --- a/silvertail/version +++ b/silvertail/version @@ -1 +1 @@ -9.6.4 \ No newline at end of file +9.6.5 \ No newline at end of file diff --git a/version b/version index 23b4d391..462e1ca0 100644 --- a/version +++ b/version @@ -1 +1 @@ -9.6.4 \ No newline at end of file +9.6.5 \ No newline at end of file diff --git a/zkthemedemo/pom.xml b/zkthemedemo/pom.xml index 0777e80d..61c9c222 100644 --- a/zkthemedemo/pom.xml +++ b/zkthemedemo/pom.xml @@ -4,7 +4,7 @@ zktheme org.zkoss.theme - 9.6.4 + 9.6.5-SNAPSHOT zkthemedemo war diff --git a/zkthemedemo/version b/zkthemedemo/version index 23b4d391..462e1ca0 100644 --- a/zkthemedemo/version +++ b/zkthemedemo/version @@ -1 +1 @@ -9.6.4 \ No newline at end of file +9.6.5 \ No newline at end of file From 925c3b6a94e009708417b3356d64af3298d14633 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Jul 2023 06:48:41 +0000 Subject: [PATCH 12/12] Bump semver from 5.7.1 to 5.7.2 Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2. - [Release notes](https://github.com/npm/node-semver/releases) - [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md) - [Commits](https://github.com/npm/node-semver/compare/v5.7.1...v5.7.2) --- updated-dependencies: - dependency-name: semver dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 25ac4157..773725ff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -468,9 +468,9 @@ } }, "node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "optional": true, "bin": { "semver": "bin/semver" @@ -910,9 +910,9 @@ } }, "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "optional": true }, "socket.io": {