From bcada79f068fd8aadac8b4948bdc467e46e419d3 Mon Sep 17 00:00:00 2001 From: Olivier NOUGUIER Date: Thu, 8 Aug 2024 10:57:50 +0200 Subject: [PATCH] UI5 v2 --- build.sbt | 4 +- examples/client/package-lock.json | 120 +++++++++++++++++------------- examples/client/package.json | 6 +- 3 files changed, 73 insertions(+), 57 deletions(-) diff --git a/build.sbt b/build.sbt index ecc63c9..34cb11c 100644 --- a/build.sbt +++ b/build.sbt @@ -49,7 +49,7 @@ lazy val generator = project .settings( libraryDependencies += "com.github.scopt" %% "scopt" % "4.1.0", libraryDependencies += "com.lihaoyi" %% "os-lib" % "0.10.3", - libraryDependencies += "org.slf4j" % "slf4j-simple" % "2.0.13" + libraryDependencies += "org.slf4j" % "slf4j-simple" % "2.0.14" ) val dev = sys.env.get("DEV").getOrElse("demo") @@ -182,7 +182,7 @@ lazy val ui5 = scalajsProject("ui5", false) .dependsOn(core) .settings( libraryDependencies ++= Seq( - "be.doeraene" %%% "web-components-ui5" % "1.21.0" + "be.doeraene" %%% "web-components-ui5" % "2.0.0-RC1" ) ) diff --git a/examples/client/package-lock.json b/examples/client/package-lock.json index 4599565..54b8a68 100644 --- a/examples/client/package-lock.json +++ b/examples/client/package-lock.json @@ -9,9 +9,9 @@ "version": "0.0.1", "license": "MIT", "dependencies": { - "@ui5/webcomponents": "1.24.0", - "@ui5/webcomponents-fiori": "1.24.0", - "@ui5/webcomponents-icons": "1.24.0", + "@ui5/webcomponents": "2.0.1", + "@ui5/webcomponents-fiori": "2.0.1", + "@ui5/webcomponents-icons": "2.0.1", "highlight.js": "^11.8.0", "jsdom": "^9.9.0" }, @@ -453,9 +453,10 @@ } }, "node_modules/@lit-labs/ssr-dom-shim": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.2.0.tgz", - "integrity": "sha512-yWJKmpGE6lUURKAaIltoPIE/wrbY3TEkqQt+X0m+7fQNnAv0keydnYvbiJFP1PnMhizmIWRWOG5KLhYyc/xl+g==" + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.2.1.tgz", + "integrity": "sha512-wx4aBmgeGvFmOKucFKY+8VFJSYZxs9poN3SDNQFF6lT6NrQUnHiPB2PWz2sc4ieEcAaYYzN+1uWahEeTq2aRIQ==", + "license": "BSD-3-Clause" }, "node_modules/@rollup/rollup-android-arm-eabi": { "version": "4.17.2", @@ -668,7 +669,8 @@ "node_modules/@sap-theming/theming-base-content": { "version": "11.12.0", "resolved": "https://registry.npmjs.org/@sap-theming/theming-base-content/-/theming-base-content-11.12.0.tgz", - "integrity": "sha512-kPHlziH8e6W8VjzljOiNjgBz81GuvC8WUAi7K6F5k+ZaRc1DUkDU12x9k6B0l4u9nPtprdZTse55r3PFGuELdQ==" + "integrity": "sha512-kPHlziH8e6W8VjzljOiNjgBz81GuvC8WUAi7K6F5k+ZaRc1DUkDU12x9k6B0l4u9nPtprdZTse55r3PFGuELdQ==", + "license": "Apache-2.0" }, "node_modules/@scala-js/vite-plugin-scalajs": { "version": "1.0.0", @@ -1143,6 +1145,7 @@ "version": "3.5.30", "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.30.tgz", "integrity": "sha512-nbWKkkyb919DOUxjmRVk8vwtDb0/k8FKncmUKFi+NY+QXqWltooxTrswvz4LspQwxvLdvzBN1TImr6cw3aQx2A==", + "license": "MIT", "dependencies": { "@types/sizzle": "*" } @@ -1158,9 +1161,10 @@ } }, "node_modules/@types/openui5": { - "version": "1.124.0", - "resolved": "https://registry.npmjs.org/@types/openui5/-/openui5-1.124.0.tgz", - "integrity": "sha512-lRn2aXgmgScvQfmeVEnqWWQSG5mXBmVcyB7Llb/PqTgGNu16ykXUkRqYxfG9YE6I5GPWRDR46GGn1HZ5T5pOJQ==", + "version": "1.127.0", + "resolved": "https://registry.npmjs.org/@types/openui5/-/openui5-1.127.0.tgz", + "integrity": "sha512-MIauyuHgaNnN7PDMZ71vS9XqpVlo0tXL6EaMhdmNjQTMblm6IJxlmOz0UX1BkdJwGKIA2rVE+2WGz6xn7ndJaQ==", + "license": "MIT", "dependencies": { "@types/jquery": "~3.5.13", "@types/qunit": "^2.5.4" @@ -1169,92 +1173,103 @@ "node_modules/@types/qunit": { "version": "2.19.10", "resolved": "https://registry.npmjs.org/@types/qunit/-/qunit-2.19.10.tgz", - "integrity": "sha512-gVB+rxvxmbyPFWa6yjjKgcumWal3hyqoTXI0Oil161uWfo1OCzWZ/rnEumsx+6uVgrwPrCrhpQbLkzfildkSbg==" + "integrity": "sha512-gVB+rxvxmbyPFWa6yjjKgcumWal3hyqoTXI0Oil161uWfo1OCzWZ/rnEumsx+6uVgrwPrCrhpQbLkzfildkSbg==", + "license": "MIT" }, "node_modules/@types/sizzle": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.8.tgz", - "integrity": "sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg==" + "integrity": "sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg==", + "license": "MIT" }, "node_modules/@types/trusted-types": { "version": "2.0.7", "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz", - "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==" + "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==", + "license": "MIT" }, "node_modules/@ui5/webcomponents": { - "version": "1.24.0", - "resolved": "https://registry.npmjs.org/@ui5/webcomponents/-/webcomponents-1.24.0.tgz", - "integrity": "sha512-ctGk8t7wrlF7ZukDrd5kjseSIiKvnJJCEDeLgZCHL0Sd5lTMmZAOpa9OQOLLTf2UXH6uTRavFGgm6zlEIkfXEg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@ui5/webcomponents/-/webcomponents-2.0.1.tgz", + "integrity": "sha512-+TLTH7PUYbThx/47NIEJLrMo/NnaIUIbgTQnWEkPjWH92YGnCQQh/je6Ml4E+vkUVwcEGzb1fTDIB3alHhVctQ==", + "license": "Apache-2.0", "dependencies": { - "@ui5/webcomponents-base": "1.24.0", - "@ui5/webcomponents-icons": "1.24.0", - "@ui5/webcomponents-icons-business-suite": "1.24.0", - "@ui5/webcomponents-icons-tnt": "1.24.0", - "@ui5/webcomponents-localization": "1.24.0", - "@ui5/webcomponents-theming": "1.24.0" + "@ui5/webcomponents-base": "2.0.1", + "@ui5/webcomponents-icons": "2.0.1", + "@ui5/webcomponents-icons-business-suite": "2.0.1", + "@ui5/webcomponents-icons-tnt": "2.0.1", + "@ui5/webcomponents-localization": "2.0.1", + "@ui5/webcomponents-theming": "2.0.1" } }, "node_modules/@ui5/webcomponents-base": { - "version": "1.24.0", - "resolved": "https://registry.npmjs.org/@ui5/webcomponents-base/-/webcomponents-base-1.24.0.tgz", - "integrity": "sha512-8fWEUzFBCG6ovjaMI1G/h6bvg51iopCtjKWBK3UueVMiajdVWgidukW8M27NUlu4UfnTEp44eLA28F6v2XWCiQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@ui5/webcomponents-base/-/webcomponents-base-2.0.1.tgz", + "integrity": "sha512-jdoUmPbZxMTjyx4MOjCFrxz1OCV/dIBiB/4mas4BkiZLV+jYc/jrPSckdko39KR1m152pIN1n1RxtxWa3S1cPA==", + "license": "Apache-2.0", "dependencies": { "@lit-labs/ssr-dom-shim": "^1.1.2", "lit-html": "^2.0.1" } }, "node_modules/@ui5/webcomponents-fiori": { - "version": "1.24.0", - "resolved": "https://registry.npmjs.org/@ui5/webcomponents-fiori/-/webcomponents-fiori-1.24.0.tgz", - "integrity": "sha512-zHsOA5WOFq7LyiLEJjgSvDUnjPHkJuG0JZfKQn7PjmSD30tLQywGqkaZ6mjqm+o3W3MvmdddnucCwos3CMDWeA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@ui5/webcomponents-fiori/-/webcomponents-fiori-2.0.1.tgz", + "integrity": "sha512-o+txrbWlY7TonPfw/5adUYma5imJBDDP0M4IuJnsfp8CiZEh0gKn+07C2M3PaIwcIaRmYnTfqa4A3mj8zyQqSg==", + "license": "Apache-2.0", "dependencies": { - "@ui5/webcomponents": "1.24.0", - "@ui5/webcomponents-base": "1.24.0", - "@ui5/webcomponents-icons": "1.24.0", - "@ui5/webcomponents-theming": "1.24.0", + "@ui5/webcomponents": "2.0.1", + "@ui5/webcomponents-base": "2.0.1", + "@ui5/webcomponents-icons": "2.0.1", + "@ui5/webcomponents-theming": "2.0.1", "@zxing/library": "^0.17.1" } }, "node_modules/@ui5/webcomponents-icons": { - "version": "1.24.0", - "resolved": "https://registry.npmjs.org/@ui5/webcomponents-icons/-/webcomponents-icons-1.24.0.tgz", - "integrity": "sha512-52ZNZC5/+/MuD+rzgxrk7I8BJhI0EKPro/pVwTt5I8D7geEbP6MO9/KPeDvq/EhHbyPEXCKZA2YP0AnTyciheA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@ui5/webcomponents-icons/-/webcomponents-icons-2.0.1.tgz", + "integrity": "sha512-dRSB3722pdQG3+ciKhGlJpU/nlnAQ63SgJ2PKXlIXvcbgc8BMRprasfz7Y7l9ZRsAMZZ2TVO3PUhLNMkZS6vlg==", + "license": "Apache-2.0", "dependencies": { - "@ui5/webcomponents-base": "1.24.0" + "@ui5/webcomponents-base": "2.0.1" } }, "node_modules/@ui5/webcomponents-icons-business-suite": { - "version": "1.24.0", - "resolved": "https://registry.npmjs.org/@ui5/webcomponents-icons-business-suite/-/webcomponents-icons-business-suite-1.24.0.tgz", - "integrity": "sha512-YZY7uw4RPlrGqP7VySlDuaBJQ3SQtHlqIYFT3c8ZIKjD+IfiYTe46ha+56Ce7A2rrA/6bW0O8hp7N47EMu5w/A==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@ui5/webcomponents-icons-business-suite/-/webcomponents-icons-business-suite-2.0.1.tgz", + "integrity": "sha512-OQsLFFMlJWuj7ENFg7ZT1fiEpEqSWPnQ7I/EIIqPyBWjpgvDb84vzOv+c2Hou2DpNB/dGH0gAGmkWJnDHealYw==", + "license": "Apache-2.0", "dependencies": { - "@ui5/webcomponents-base": "1.24.0" + "@ui5/webcomponents-base": "2.0.1" } }, "node_modules/@ui5/webcomponents-icons-tnt": { - "version": "1.24.0", - "resolved": "https://registry.npmjs.org/@ui5/webcomponents-icons-tnt/-/webcomponents-icons-tnt-1.24.0.tgz", - "integrity": "sha512-JavMGjBUNaBTnms9p+iqHcXZA0rSYSWl+zj+W1QOe5/e+YsbK/ms4Ipj6DjupV985XhNyRsN8qmLydTUdX90/Q==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@ui5/webcomponents-icons-tnt/-/webcomponents-icons-tnt-2.0.1.tgz", + "integrity": "sha512-/4QwEYZ0UfJRrRhG7o4kAjoFZ2Wy8bEThq+ZTV1afqJWCiPDcrKZKhPqIEOCHIE1y2TMjmo/w7UIZSIBGF81oQ==", + "license": "Apache-2.0", "dependencies": { - "@ui5/webcomponents-base": "1.24.0" + "@ui5/webcomponents-base": "2.0.1" } }, "node_modules/@ui5/webcomponents-localization": { - "version": "1.24.0", - "resolved": "https://registry.npmjs.org/@ui5/webcomponents-localization/-/webcomponents-localization-1.24.0.tgz", - "integrity": "sha512-qV764Olcgd8uT/kQnHYNZIiOrcsPeLUoij+Sv+WcL63dt8+d8ue3BOisaKmVDUSkyIsv0Rb28ZU9ne9l+7EeYg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@ui5/webcomponents-localization/-/webcomponents-localization-2.0.1.tgz", + "integrity": "sha512-GHtpC9Ayo4Nha2nRgUfc6dnz8qAmj73ldCfWBh2arcDQ6VY7ZdI5d6mSTPQeNn9/5ZzvtDccJScN+IMO1z169g==", + "license": "Apache-2.0", "dependencies": { "@types/openui5": "^1.113.0", - "@ui5/webcomponents-base": "1.24.0" + "@ui5/webcomponents-base": "2.0.1" } }, "node_modules/@ui5/webcomponents-theming": { - "version": "1.24.0", - "resolved": "https://registry.npmjs.org/@ui5/webcomponents-theming/-/webcomponents-theming-1.24.0.tgz", - "integrity": "sha512-boMrIIgU+UJApfz/4a8Hq9jFHrNT69zjXRzBtqWYttUAhr3Jl2mpdGNwVbcwU7YRL3+fxm86ngYnJ7EEwfEakQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@ui5/webcomponents-theming/-/webcomponents-theming-2.0.1.tgz", + "integrity": "sha512-HdofJMU8xPDWReq3zjj6kW0HM3rvXfDm5lhIi3cFkqxZJN0nxY4nVCdIIrwzROxYNupeMmYvnj776B3GsAoAwQ==", + "license": "Apache-2.0", "dependencies": { "@sap-theming/theming-base-content": "11.12.0", - "@ui5/webcomponents-base": "1.24.0" + "@ui5/webcomponents-base": "2.0.1" } }, "node_modules/@zxing/library": { @@ -1753,6 +1768,7 @@ "version": "2.8.0", "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-2.8.0.tgz", "integrity": "sha512-o9t+MQM3P4y7M7yNzqAyjp7z+mQGa4NS4CxiyLqFPyFWyc4O+nodLrkrxSaCTrla6M5YOLaT3RpbbqjszB5g3Q==", + "license": "BSD-3-Clause", "dependencies": { "@types/trusted-types": "^2.0.2" } diff --git a/examples/client/package.json b/examples/client/package.json index e4ed609..49b5c92 100644 --- a/examples/client/package.json +++ b/examples/client/package.json @@ -11,9 +11,9 @@ }, "license": "MIT", "dependencies": { - "@ui5/webcomponents": "1.24.0", - "@ui5/webcomponents-fiori": "1.24.0", - "@ui5/webcomponents-icons": "1.24.0", + "@ui5/webcomponents": "2.0.1", + "@ui5/webcomponents-fiori": "2.0.1", + "@ui5/webcomponents-icons": "2.0.1", "highlight.js": "^11.8.0", "jsdom": "^9.9.0" },