diff --git a/apps/pwabuilder/package-lock.json b/apps/pwabuilder/package-lock.json
index 448ff696c..f4f183d72 100644
--- a/apps/pwabuilder/package-lock.json
+++ b/apps/pwabuilder/package-lock.json
@@ -14,7 +14,7 @@
"@pwabuilder/manifest-editor": "file:../../components/manifest-editor",
"@pwabuilder/manifest-validation": "file:../../libraries/manifest-validation",
"@pwabuilder/site-analytics": "file:../../libraries/site-analytics",
- "@shoelace-style/shoelace": "^2.0.0-beta.83",
+ "@shoelace-style/shoelace": "^2.2.0",
"@vaadin/router": "^1.7.4",
"browser-fs-access": "^0.23.0",
"colorjs.io": "^0.4.0",
@@ -468,6 +468,14 @@
"node": ">=12"
}
},
+ "node_modules/@ctrl/tinycolor": {
+ "version": "3.6.0",
+ "resolved": "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-3.6.0.tgz",
+ "integrity": "sha512-/Z3l6pXthq0JvMYdUFyX9j0MaCltlIn6mfh9jLyQwg5aPKxkyNa0PTHtU1AlFXLNk55ZuAeJRcpvq+tmLfKmaQ==",
+ "engines": {
+ "node": ">=10"
+ }
+ },
"node_modules/@esbuild/linux-loong64": {
"version": "0.14.54",
"resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.14.54.tgz",
@@ -563,16 +571,16 @@
}
},
"node_modules/@floating-ui/core": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.0.1.tgz",
- "integrity": "sha512-bO37brCPfteXQfFY0DyNDGB3+IMe4j150KFQcgJ5aBP295p9nBGeHEs/p0czrRbtlHq4Px/yoPXO/+dOCcF4uA=="
+ "version": "1.2.2",
+ "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.2.2.tgz",
+ "integrity": "sha512-FaO9KVLFnxknZaGWGmNtjD2CVFuc0u4yeGEofoyXO2wgRA7fLtkngT6UB0vtWQWuhH3iMTZZ/Y89CMeyGfn8pA=="
},
"node_modules/@floating-ui/dom": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.0.2.tgz",
- "integrity": "sha512-5X9WSvZ8/fjy3gDu8yx9HAA4KG1lazUN2P4/VnaXLxTO9Dz53HI1oYoh1OlhqFNlHgGDiwFX5WhFCc2ljbW3yA==",
+ "version": "1.2.3",
+ "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.2.3.tgz",
+ "integrity": "sha512-lK9cZUrHSJLMVAdCvDqs6Ug8gr0wmqksYiaoj/bxj2gweRQkSuhg2/V6Jswz2KiQ0RAULbqw1oQDJIMpQ5GfGA==",
"dependencies": {
- "@floating-ui/core": "^1.0.1"
+ "@floating-ui/core": "^1.2.2"
}
},
"node_modules/@gitbeaker/core": {
@@ -770,14 +778,22 @@
}
},
"node_modules/@lit-labs/react": {
- "version": "1.0.8",
- "resolved": "https://registry.npmjs.org/@lit-labs/react/-/react-1.0.8.tgz",
- "integrity": "sha512-5qQzixu/bVqI819cNgr/fY8KX0v5C3FmanMaT7Q8qzUJ+EpB4BsOSQwacdaWfNkm7SV4jkWerSHxa9hvncszCA=="
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/@lit-labs/react/-/react-1.1.1.tgz",
+ "integrity": "sha512-9TC+/ZWb6BJlWCyUr14FKFlaGnyKpeEDorufXozQgke/VoVrslUQNaL7nBmrAWdNrmzx5jWgi8lFmWwrxMjnlA=="
+ },
+ "node_modules/@lit-labs/ssr-dom-shim": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.0.0.tgz",
+ "integrity": "sha512-ic93MBXfApIFTrup4a70M/+ddD8xdt2zxxj9sRwHQzhS9ag/syqkD8JPdTXsc1gUy2K8TTirhlCqyTEM/sifNw=="
},
"node_modules/@lit/reactive-element": {
- "version": "1.4.1",
- "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-1.4.1.tgz",
- "integrity": "sha512-qDv4851VFSaBWzpS02cXHclo40jsbAjRXnebNXpm0uVg32kCneZPo9RYVQtrTNICtZ+1wAYHu1ZtxWSWMbKrBw=="
+ "version": "1.6.1",
+ "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-1.6.1.tgz",
+ "integrity": "sha512-va15kYZr7KZNNPZdxONGQzpUr+4sxVu7V/VG7a8mRfPPXUyhEYj5RzXCQmGrlP3tAh0L3HHm5AjBMFYRqlM9SA==",
+ "dependencies": {
+ "@lit-labs/ssr-dom-shim": "^1.0.0"
+ }
},
"node_modules/@mrmlnc/readdir-enhanced": {
"version": "2.2.1",
@@ -1191,21 +1207,22 @@
}
},
"node_modules/@shoelace-style/localize": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/@shoelace-style/localize/-/localize-3.0.1.tgz",
- "integrity": "sha512-nmv1syJ3ormbGq29GsuxGRK6BFq7Jhx+kVFyuuozz0Pckkvk1SGk2vpZZcdnj2vRZCETvlVB7KYgakUwgGmn+A=="
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/@shoelace-style/localize/-/localize-3.1.0.tgz",
+ "integrity": "sha512-evGxn5wIQh1/Ks1RbZm7rY4DxPKAUnXKTixZNgnYV/N2V8Bbbvsi+S14gNa42SQNUJK5WooNtlar2B8cehEwZQ=="
},
"node_modules/@shoelace-style/shoelace": {
- "version": "2.0.0-beta.83",
- "resolved": "https://registry.npmjs.org/@shoelace-style/shoelace/-/shoelace-2.0.0-beta.83.tgz",
- "integrity": "sha512-dHVBtapuqxSRu3klBZhf9/LtEtircaLLnDajNbhuiBiY7PVCxjjf/9Kyd/S/BpbhKwMICqJr+PaKoCTd2iWDJA==",
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/@shoelace-style/shoelace/-/shoelace-2.2.0.tgz",
+ "integrity": "sha512-53do7etYwygRRnx1tt5SPGfTL8YFtZVNTlfn5Tabno66otBXROKnUjWVqyLRP6xvj6BG6BP62DkZQG6pxIDMVg==",
"dependencies": {
- "@floating-ui/dom": "^1.0.0",
- "@lit-labs/react": "^1.0.7",
+ "@ctrl/tinycolor": "^3.5.0",
+ "@floating-ui/dom": "^1.2.1",
+ "@lit-labs/react": "^1.1.1",
"@shoelace-style/animations": "^1.1.0",
- "@shoelace-style/localize": "^3.0.1",
- "color": "4.2",
- "lit": "^2.2.8",
+ "@shoelace-style/localize": "^3.1.0",
+ "composed-offset-position": "^0.0.4",
+ "lit": "^2.6.1",
"qr-creator": "^1.0.0"
},
"engines": {
@@ -3036,18 +3053,6 @@
"node": ">=0.10.0"
}
},
- "node_modules/color": {
- "version": "4.2.3",
- "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz",
- "integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==",
- "dependencies": {
- "color-convert": "^2.0.1",
- "color-string": "^1.9.0"
- },
- "engines": {
- "node": ">=12.5.0"
- }
- },
"node_modules/color-convert": {
"version": "1.9.3",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
@@ -3060,32 +3065,8 @@
"node_modules/color-name": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
- "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
- },
- "node_modules/color-string": {
- "version": "1.9.1",
- "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz",
- "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==",
- "dependencies": {
- "color-name": "^1.0.0",
- "simple-swizzle": "^0.2.2"
- }
- },
- "node_modules/color/node_modules/color-convert": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
- "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
- "dependencies": {
- "color-name": "~1.1.4"
- },
- "engines": {
- "node": ">=7.0.0"
- }
- },
- "node_modules/color/node_modules/color-name": {
- "version": "1.1.4",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
- "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+ "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+ "dev": true
},
"node_modules/colorjs.io": {
"version": "0.4.0",
@@ -3179,6 +3160,11 @@
"integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
"dev": true
},
+ "node_modules/composed-offset-position": {
+ "version": "0.0.4",
+ "resolved": "https://registry.npmjs.org/composed-offset-position/-/composed-offset-position-0.0.4.tgz",
+ "integrity": "sha512-vMlvu1RuNegVE0YsCDSV/X4X10j56mq7PCIyOKK74FxkXzGLwhOUmdkJLSdOBOMwWycobGUMgft2lp+YgTe8hw=="
+ },
"node_modules/concat-map": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -6253,11 +6239,6 @@
"node": ">=0.10.0"
}
},
- "node_modules/is-arrayish": {
- "version": "0.3.2",
- "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
- "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
- },
"node_modules/is-bigint": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
@@ -7171,13 +7152,13 @@
"dev": true
},
"node_modules/lit": {
- "version": "2.3.1",
- "resolved": "https://registry.npmjs.org/lit/-/lit-2.3.1.tgz",
- "integrity": "sha512-TejktDR4mqG3qB32Y8Lm5Lye3c8SUehqz7qRsxe1PqGYL6me2Ef+jeQAEqh20BnnGncv4Yxy2njEIT0kzK1WCw==",
+ "version": "2.6.1",
+ "resolved": "https://registry.npmjs.org/lit/-/lit-2.6.1.tgz",
+ "integrity": "sha512-DT87LD64f8acR7uVp7kZfhLRrHkfC/N4BVzAtnw9Yg8087mbBJ//qedwdwX0kzDbxgPccWRW6mFwGbRQIxy0pw==",
"dependencies": {
- "@lit/reactive-element": "^1.4.0",
+ "@lit/reactive-element": "^1.6.0",
"lit-element": "^3.2.0",
- "lit-html": "^2.3.0"
+ "lit-html": "^2.6.0"
}
},
"node_modules/lit-analyzer": {
@@ -7388,9 +7369,9 @@
}
},
"node_modules/lit-html": {
- "version": "2.3.1",
- "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-2.3.1.tgz",
- "integrity": "sha512-FyKH6LTW6aBdkfNhNSHyZTnLgJSTe5hMk7HFtc/+DcN1w74C215q8B+Cfxc2OuIEpBNcEKxgF64qL8as30FDHA==",
+ "version": "2.6.1",
+ "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-2.6.1.tgz",
+ "integrity": "sha512-Z3iw+E+3KKFn9t2YKNjsXNEu/LRLI98mtH/C6lnFg7kvaqPIzPn124Yd4eT/43lyqrejpc5Wb6BHq3fdv4S8Rw==",
"dependencies": {
"@types/trusted-types": "^2.0.2"
}
@@ -10162,14 +10143,6 @@
"integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
"dev": true
},
- "node_modules/simple-swizzle": {
- "version": "0.2.2",
- "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
- "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==",
- "dependencies": {
- "is-arrayish": "^0.3.1"
- }
- },
"node_modules/slash": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
@@ -12206,6 +12179,11 @@
"@jridgewell/trace-mapping": "0.3.9"
}
},
+ "@ctrl/tinycolor": {
+ "version": "3.6.0",
+ "resolved": "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-3.6.0.tgz",
+ "integrity": "sha512-/Z3l6pXthq0JvMYdUFyX9j0MaCltlIn6mfh9jLyQwg5aPKxkyNa0PTHtU1AlFXLNk55ZuAeJRcpvq+tmLfKmaQ=="
+ },
"@esbuild/linux-loong64": {
"version": "0.14.54",
"resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.14.54.tgz",
@@ -12272,16 +12250,16 @@
}
},
"@floating-ui/core": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.0.1.tgz",
- "integrity": "sha512-bO37brCPfteXQfFY0DyNDGB3+IMe4j150KFQcgJ5aBP295p9nBGeHEs/p0czrRbtlHq4Px/yoPXO/+dOCcF4uA=="
+ "version": "1.2.2",
+ "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.2.2.tgz",
+ "integrity": "sha512-FaO9KVLFnxknZaGWGmNtjD2CVFuc0u4yeGEofoyXO2wgRA7fLtkngT6UB0vtWQWuhH3iMTZZ/Y89CMeyGfn8pA=="
},
"@floating-ui/dom": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.0.2.tgz",
- "integrity": "sha512-5X9WSvZ8/fjy3gDu8yx9HAA4KG1lazUN2P4/VnaXLxTO9Dz53HI1oYoh1OlhqFNlHgGDiwFX5WhFCc2ljbW3yA==",
+ "version": "1.2.3",
+ "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.2.3.tgz",
+ "integrity": "sha512-lK9cZUrHSJLMVAdCvDqs6Ug8gr0wmqksYiaoj/bxj2gweRQkSuhg2/V6Jswz2KiQ0RAULbqw1oQDJIMpQ5GfGA==",
"requires": {
- "@floating-ui/core": "^1.0.1"
+ "@floating-ui/core": "^1.2.2"
}
},
"@gitbeaker/core": {
@@ -12436,14 +12414,22 @@
}
},
"@lit-labs/react": {
- "version": "1.0.8",
- "resolved": "https://registry.npmjs.org/@lit-labs/react/-/react-1.0.8.tgz",
- "integrity": "sha512-5qQzixu/bVqI819cNgr/fY8KX0v5C3FmanMaT7Q8qzUJ+EpB4BsOSQwacdaWfNkm7SV4jkWerSHxa9hvncszCA=="
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/@lit-labs/react/-/react-1.1.1.tgz",
+ "integrity": "sha512-9TC+/ZWb6BJlWCyUr14FKFlaGnyKpeEDorufXozQgke/VoVrslUQNaL7nBmrAWdNrmzx5jWgi8lFmWwrxMjnlA=="
+ },
+ "@lit-labs/ssr-dom-shim": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.0.0.tgz",
+ "integrity": "sha512-ic93MBXfApIFTrup4a70M/+ddD8xdt2zxxj9sRwHQzhS9ag/syqkD8JPdTXsc1gUy2K8TTirhlCqyTEM/sifNw=="
},
"@lit/reactive-element": {
- "version": "1.4.1",
- "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-1.4.1.tgz",
- "integrity": "sha512-qDv4851VFSaBWzpS02cXHclo40jsbAjRXnebNXpm0uVg32kCneZPo9RYVQtrTNICtZ+1wAYHu1ZtxWSWMbKrBw=="
+ "version": "1.6.1",
+ "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-1.6.1.tgz",
+ "integrity": "sha512-va15kYZr7KZNNPZdxONGQzpUr+4sxVu7V/VG7a8mRfPPXUyhEYj5RzXCQmGrlP3tAh0L3HHm5AjBMFYRqlM9SA==",
+ "requires": {
+ "@lit-labs/ssr-dom-shim": "^1.0.0"
+ }
},
"@mrmlnc/readdir-enhanced": {
"version": "2.2.1",
@@ -12837,21 +12823,22 @@
"integrity": "sha512-Be+cahtZyI2dPKRm8EZSx3YJQ+jLvEcn3xzRP7tM4tqBnvd/eW/64Xh0iOf0t2w5P8iJKfdBbpVNE9naCaOf2g=="
},
"@shoelace-style/localize": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/@shoelace-style/localize/-/localize-3.0.1.tgz",
- "integrity": "sha512-nmv1syJ3ormbGq29GsuxGRK6BFq7Jhx+kVFyuuozz0Pckkvk1SGk2vpZZcdnj2vRZCETvlVB7KYgakUwgGmn+A=="
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/@shoelace-style/localize/-/localize-3.1.0.tgz",
+ "integrity": "sha512-evGxn5wIQh1/Ks1RbZm7rY4DxPKAUnXKTixZNgnYV/N2V8Bbbvsi+S14gNa42SQNUJK5WooNtlar2B8cehEwZQ=="
},
"@shoelace-style/shoelace": {
- "version": "2.0.0-beta.83",
- "resolved": "https://registry.npmjs.org/@shoelace-style/shoelace/-/shoelace-2.0.0-beta.83.tgz",
- "integrity": "sha512-dHVBtapuqxSRu3klBZhf9/LtEtircaLLnDajNbhuiBiY7PVCxjjf/9Kyd/S/BpbhKwMICqJr+PaKoCTd2iWDJA==",
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/@shoelace-style/shoelace/-/shoelace-2.2.0.tgz",
+ "integrity": "sha512-53do7etYwygRRnx1tt5SPGfTL8YFtZVNTlfn5Tabno66otBXROKnUjWVqyLRP6xvj6BG6BP62DkZQG6pxIDMVg==",
"requires": {
- "@floating-ui/dom": "^1.0.0",
- "@lit-labs/react": "^1.0.7",
+ "@ctrl/tinycolor": "^3.5.0",
+ "@floating-ui/dom": "^1.2.1",
+ "@lit-labs/react": "^1.1.1",
"@shoelace-style/animations": "^1.1.0",
- "@shoelace-style/localize": "^3.0.1",
- "color": "4.2",
- "lit": "^2.2.8",
+ "@shoelace-style/localize": "^3.1.0",
+ "composed-offset-position": "^0.0.4",
+ "lit": "^2.6.1",
"qr-creator": "^1.0.0"
}
},
@@ -14259,30 +14246,6 @@
"object-visit": "^1.0.0"
}
},
- "color": {
- "version": "4.2.3",
- "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz",
- "integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==",
- "requires": {
- "color-convert": "^2.0.1",
- "color-string": "^1.9.0"
- },
- "dependencies": {
- "color-convert": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
- "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
- "requires": {
- "color-name": "~1.1.4"
- }
- },
- "color-name": {
- "version": "1.1.4",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
- "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
- }
- }
- },
"color-convert": {
"version": "1.9.3",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
@@ -14295,16 +14258,8 @@
"color-name": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
- "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
- },
- "color-string": {
- "version": "1.9.1",
- "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz",
- "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==",
- "requires": {
- "color-name": "^1.0.0",
- "simple-swizzle": "^0.2.2"
- }
+ "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+ "dev": true
},
"colorjs.io": {
"version": "0.4.0",
@@ -14382,6 +14337,11 @@
"integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
"dev": true
},
+ "composed-offset-position": {
+ "version": "0.0.4",
+ "resolved": "https://registry.npmjs.org/composed-offset-position/-/composed-offset-position-0.0.4.tgz",
+ "integrity": "sha512-vMlvu1RuNegVE0YsCDSV/X4X10j56mq7PCIyOKK74FxkXzGLwhOUmdkJLSdOBOMwWycobGUMgft2lp+YgTe8hw=="
+ },
"concat-map": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -16593,11 +16553,6 @@
"kind-of": "^6.0.0"
}
},
- "is-arrayish": {
- "version": "0.3.2",
- "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
- "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
- },
"is-bigint": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
@@ -17278,13 +17233,13 @@
"dev": true
},
"lit": {
- "version": "2.3.1",
- "resolved": "https://registry.npmjs.org/lit/-/lit-2.3.1.tgz",
- "integrity": "sha512-TejktDR4mqG3qB32Y8Lm5Lye3c8SUehqz7qRsxe1PqGYL6me2Ef+jeQAEqh20BnnGncv4Yxy2njEIT0kzK1WCw==",
+ "version": "2.6.1",
+ "resolved": "https://registry.npmjs.org/lit/-/lit-2.6.1.tgz",
+ "integrity": "sha512-DT87LD64f8acR7uVp7kZfhLRrHkfC/N4BVzAtnw9Yg8087mbBJ//qedwdwX0kzDbxgPccWRW6mFwGbRQIxy0pw==",
"requires": {
- "@lit/reactive-element": "^1.4.0",
+ "@lit/reactive-element": "^1.6.0",
"lit-element": "^3.2.0",
- "lit-html": "^2.3.0"
+ "lit-html": "^2.6.0"
},
"dependencies": {
"lit-element": {
@@ -17475,9 +17430,9 @@
}
},
"lit-html": {
- "version": "2.3.1",
- "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-2.3.1.tgz",
- "integrity": "sha512-FyKH6LTW6aBdkfNhNSHyZTnLgJSTe5hMk7HFtc/+DcN1w74C215q8B+Cfxc2OuIEpBNcEKxgF64qL8as30FDHA==",
+ "version": "2.6.1",
+ "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-2.6.1.tgz",
+ "integrity": "sha512-Z3iw+E+3KKFn9t2YKNjsXNEu/LRLI98mtH/C6lnFg7kvaqPIzPn124Yd4eT/43lyqrejpc5Wb6BHq3fdv4S8Rw==",
"requires": {
"@types/trusted-types": "^2.0.2"
}
@@ -19553,14 +19508,6 @@
"integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
"dev": true
},
- "simple-swizzle": {
- "version": "0.2.2",
- "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
- "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==",
- "requires": {
- "is-arrayish": "^0.3.1"
- }
- },
"slash": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
diff --git a/apps/pwabuilder/package.json b/apps/pwabuilder/package.json
index 84fc63063..5bda7e893 100644
--- a/apps/pwabuilder/package.json
+++ b/apps/pwabuilder/package.json
@@ -24,7 +24,7 @@
"@pwabuilder/manifest-editor": "file:../../components/manifest-editor",
"@pwabuilder/manifest-validation": "file:../../libraries/manifest-validation",
"@pwabuilder/site-analytics": "file:../../libraries/site-analytics",
- "@shoelace-style/shoelace": "^2.0.0-beta.83",
+ "@shoelace-style/shoelace": "^2.2.0",
"@vaadin/router": "^1.7.4",
"browser-fs-access": "^0.23.0",
"colorjs.io": "^0.4.0",
diff --git a/apps/pwabuilder/src/script/components/publish-pane.ts b/apps/pwabuilder/src/script/components/publish-pane.ts
index ef73f5ba3..b582e7848 100644
--- a/apps/pwabuilder/src/script/components/publish-pane.ts
+++ b/apps/pwabuilder/src/script/components/publish-pane.ts
@@ -75,9 +75,9 @@ export class PublishPane extends LitElement {
title: 'Windows',
factoids: [
"PWAs can be indistinguishable from native apps on Windows",
- "PWAs are first class applications.",
- "Collect 100% of revenue generated via third party commerce platforms.",
- "1B+ store enabled devices."
+ "PWAs are first class applications",
+ "Collect 100% of revenue generated via third party commerce platforms",
+ "1B+ store enabled devices"
],
isActionCard: true,
icon: '/assets/Publish_Windows.svg',
@@ -99,8 +99,8 @@ export class PublishPane extends LitElement {
title: 'iOS',
factoids: [
"Leverage same codebase across all platforms",
- "Large user base.",
- "Premium devices."
+ "Large user base",
+ "Premium devices"
],
isActionCard: true,
icon: '/assets/Publish_Apple.svg',
diff --git a/apps/pwabuilder/src/script/components/test-publish-pane.ts b/apps/pwabuilder/src/script/components/test-publish-pane.ts
index cfcca9be8..4e985a7dd 100644
--- a/apps/pwabuilder/src/script/components/test-publish-pane.ts
+++ b/apps/pwabuilder/src/script/components/test-publish-pane.ts
@@ -45,9 +45,9 @@ export class TestPublishPane extends LitElement {
title: 'Windows',
factoids: [
"PWAs can be indistinguishable from native apps on Windows",
- "PWAs are first class applications.",
- "Collect 100% of revenue generated via third party commerce platforms.",
- "1B+ store enabled devices."
+ "PWAs are first class applications",
+ "Collect 100% of revenue generated via third party commerce platforms",
+ "1B+ store enabled devices"
],
isActionCard: true,
icon: '/assets/Publish_Windows.svg',
diff --git a/apps/pwabuilder/src/script/components/windows-form.ts b/apps/pwabuilder/src/script/components/windows-form.ts
index c67a74418..4c1605691 100644
--- a/apps/pwabuilder/src/script/components/windows-form.ts
+++ b/apps/pwabuilder/src/script/components/windows-form.ts
@@ -17,6 +17,9 @@ import { ManifestContext, PackageOptions } from '../utils/interfaces';
export class WindowsForm extends AppPackageFormBase {
@property({ type: Boolean }) generating: boolean = false;
@state() showAdvanced = false;
+ @state() customSelected = false;
+ @state() initialBgColor: string = '';
+ @state() currentSelectedColor: string = '';
@state() packageOptions: WindowsPackageOptions = emptyWindowsPackageOptions();
@state() activeLanguages: string[] = [];
@state() activeLanguageCodes: string[] = [];
@@ -93,28 +96,38 @@ export class WindowsForm extends AppPackageFormBase {
color: rgba(0,0,0,.5);
}
+ #color-input-holder {
+ display: flex;
+ align-items: center;
+ gap: 10px;
+ }
+
+ #color-input-holder p {
+ margin: 0;
+ color: var(--secondary-font-color);
+ }
+
:host{
--sl-focus-ring-width: 3px;
--sl-input-focus-ring-color: #4f3fb670;
--sl-focus-ring: 0 0 0 var(--sl-focus-ring-width) var(--sl-input-focus-ring-color);
--sl-input-border-color-focus: #4F3FB6ac;
+ --sl-input-font-size-small: 22px;
+
}
- #languageDrop::part(control){
+ #languageDrop::part(display-input){
min-height: 40px;
}
- #languageDrop::part(tag__base){
- height: 35px;
+ #languageDrop::part(tag){
font-size: var(--body-font-size);
color: #757575;
background-color: #f0f0f0;
border-radius: var(--input-border-radius);
- padding: 8px 15px;
- gap: 40px;
}
- #languageDrop::part(menu){
+ #languageDrop::part(listbox){
background-color: #ffffff;
height: 200px;
overflow-y: scroll;
@@ -123,17 +136,17 @@ export class WindowsForm extends AppPackageFormBase {
margin-top: 3px;
}
- #languageDrop sl-menu-item::part(base){
+ #languageDrop sl-option::part(base){
font-size: var(--body-font-size);
color: #757575;
}
- #languageDrop sl-menu-item:focus-within::part(base) {
+ #languageDrop sl-option:focus-within::part(base) {
color: #ffffff;
background-color: #4F3FB6;
}
- #languageDrop sl-menu-item::part(base):hover{
+ #languageDrop sl-option::part(base):hover{
color: #ffffff;
background-color: #4F3FB6;
}
@@ -142,6 +155,23 @@ export class WindowsForm extends AppPackageFormBase {
font-size: var(--body-font-size);
color: #757575;
}
+
+ sl-color-picker {
+ --grid-width: 315px;
+ height: 25px;
+ }
+
+ sl-color-picker::part(trigger){
+ border-radius: 0;
+ height: 25px;
+ width: 75px;
+ display: flex;
+ }
+
+ .color-radio::part(control--checked){
+ background-color: var(--primary-color);
+ border-color: var(--primary-color);
+ }
`
];
@@ -164,6 +194,9 @@ export class WindowsForm extends AppPackageFormBase {
);
this.packageOptions.targetDeviceFamilies = ['Desktop', 'Holographic'];
+
+ this.customSelected = this.packageOptions.images?.backgroundColor != 'transparent';
+ this.initialBgColor = this.currentSelectedColor = (this.packageOptions.images?.backgroundColor as string);
}
toggleSettings(settingsToggleValue: 'basic' | 'advanced') {
@@ -248,29 +281,77 @@ export class WindowsForm extends AppPackageFormBase {
Select your Windows icons background color
+${this.currentSelectedColor}
+Select a Background color
${this.manifest.background_color?.toLocaleUpperCase() || defaultColor}
Select a Theme color
${this.manifest.theme_color?.toLocaleUpperCase() || defaultColor}
Should a user prefer a related app to this one
The categories your PWA belongs to
The text direction of your PWA
The primary language of your app
The default screen orientation of your app
The appearance of your app window