Skip to content

Commit

Permalink
Replace Calypso progress bar with the one from VideoPress (#33054)
Browse files Browse the repository at this point in the history
* Move progress-bar component from packages/videopress to js-packages/components
* progress-bar: Add `progressClassName` prop to allow for styling
* Replace Calypso progress-bar with Jetpack progress-bar
  Mostly this means translating the `value` and `total` to `progress`. Also
  some cases need `className` and `progressClassName` to allow CSS to apply.
* Remove use of `@automattic/components`

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/6576606216
  • Loading branch information
anomiex authored and matticbot committed Oct 19, 2023
1 parent b67a198 commit 9cd4889
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 50 deletions.
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-my-jetpack/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"yoast/phpunit-polyfills": "1.1.0",
"automattic/jetpack-changelogger": "^3.3.11",
"automattic/wordbless": "@dev",
"automattic/jetpack-videopress": "^0.17.6"
"automattic/jetpack-videopress": "^0.17.7-alpha"
},
"suggest": {
"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."
Expand Down
50 changes: 25 additions & 25 deletions vendor/composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-a8c-mc-stats",
"reference": "3c68a93a60e460fb5e79568723c02f8f73463e35"
"reference": "83f18180fde8dd1a9223d8927410e38bb6ca6787"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11",
Expand Down Expand Up @@ -57,7 +57,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
"reference": "41e20552aa06f5728987f18cb1ddd01e7558bbdd"
"reference": "61a26e81de4ff9ff7ce28b0727d6c059b7fcb388"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11",
Expand Down Expand Up @@ -119,7 +119,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-assets",
"reference": "039de2be06833c19140b37f82b56262f3eeaff26"
"reference": "598156cbf99be8c9c67523830156aa364c661eca"
},
"require": {
"automattic/jetpack-constants": "^1.6.23"
Expand Down Expand Up @@ -187,7 +187,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-autoloader",
"reference": "2a87b3e87526e3bdcfd539b4c2fbc02b86190799"
"reference": "ca2141b2524d070233cc042301c493f1185931a8"
},
"require": {
"composer-plugin-api": "^1.1 || ^2.0"
Expand Down Expand Up @@ -252,7 +252,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-composer-plugin",
"reference": "c37c674cd5be4632600c2554ce053c47f57985a3"
"reference": "0de29f4906961150c682a02328c988b1c1971d92"
},
"require": {
"composer-plugin-api": "^2.1.0"
Expand Down Expand Up @@ -311,7 +311,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-config",
"reference": "76177242c407510d7949da8439745389178b6b58"
"reference": "98cb929666598ca9c03e377df842404f962ec68e"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11"
Expand Down Expand Up @@ -353,7 +353,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-connection",
"reference": "51563aa7a98af659b3ac95b70c7f5232ba78b7d9"
"reference": "44e6cc2db7113259541b31a4d056b88b10aa0b20"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^1.4.22",
Expand Down Expand Up @@ -431,7 +431,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-constants",
"reference": "84434e1b4df0ad44ea0bde15ac65083c87ada8d4"
"reference": "1f5b2f59af3ba21b821180a2909588eac8ceb7d1"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11",
Expand Down Expand Up @@ -482,7 +482,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
"reference": "2fe03abd945894511bfefec33724ddc34539798a"
"reference": "2035db5e3b3805206b0434df4f712bf27772f3b3"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11",
Expand Down Expand Up @@ -532,7 +532,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-identity-crisis",
"reference": "d6498ca5edada954e2589998512bd35307c0b8a0"
"reference": "3d8001eed762cefc8b9144a2485eca192032c56e"
},
"require": {
"automattic/jetpack-assets": "^1.18.12",
Expand Down Expand Up @@ -610,7 +610,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-ip",
"reference": "3f0bf42da4a488cb8ca7592d789b11fc427b3258"
"reference": "265e6ae18fec37f98d51a4a6b78afbc6ebbe3afd"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11",
Expand Down Expand Up @@ -665,7 +665,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
"reference": "80c66b93031ef789e5eb53a253d39905e08fd98e"
"reference": "53a7fb38c0b7bd150205db228903ebf98b78427a"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^1.4.22",
Expand Down Expand Up @@ -740,7 +740,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-licensing",
"reference": "6f717449427211e1ecdfeeb21b222b6cc056d1a6"
"reference": "23e951ee724ebfa57d85ff26c786d89ccb0f2bbd"
},
"require": {
"automattic/jetpack-connection": "^1.58.1"
Expand Down Expand Up @@ -801,7 +801,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-logo",
"reference": "4220ef9e593ccc0b13e1c83c13699705afe75a57"
"reference": "787cef95974f3e33a106e68b54b366f72a37616a"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11",
Expand Down Expand Up @@ -851,7 +851,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-my-jetpack",
"reference": "c2a0ea9126749f2bf98c0526e20e23d703ff9b70"
"reference": "f0c7d1f3455a1f9040463d18e097504314858d63"
},
"require": {
"automattic/jetpack-admin-ui": "^0.2.23",
Expand All @@ -865,7 +865,7 @@
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11",
"automattic/jetpack-videopress": "^0.17.6",
"automattic/jetpack-videopress": "^0.17.7-alpha",
"automattic/wordbless": "@dev",
"yoast/phpunit-polyfills": "1.1.0"
},
Expand Down Expand Up @@ -941,7 +941,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-partner",
"reference": "e2185ef63228f35b5b0be41c56a6133e8344a3ca"
"reference": "98edee513d460df52a8aa0c49cd546d1cde960ba"
},
"require": {
"automattic/jetpack-connection": "^1.58.1",
Expand Down Expand Up @@ -1003,7 +1003,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-password-checker",
"reference": "f0c161ce7bebff994ebd1e0246ed708e577ea267"
"reference": "82895119d1400cdeaae0942736ee8ecd21626e9b"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11",
Expand Down Expand Up @@ -1061,7 +1061,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plugins-installer",
"reference": "cc4c50578fbb3c618c29297f2566bcdf0c5e9ef4"
"reference": "2e06d637aeefdadc2ae1fa799e65b2bdfee30de3"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^1.4.22"
Expand Down Expand Up @@ -1115,7 +1115,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
"reference": "aba4dd8fbeef3c8b36a80d3c7f6372d29b733f35"
"reference": "c05847e381b18b63235860293356dedf2ef65f25"
},
"require": {
"automattic/jetpack-status": "^1.18.5"
Expand Down Expand Up @@ -1169,7 +1169,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-roles",
"reference": "48b8003c4de3f757376b87696afedc8467ee54de"
"reference": "e52c1ffca324abebdf5d71b11edc3d0203c6c60e"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11",
Expand Down Expand Up @@ -1220,7 +1220,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-search",
"reference": "d3f6429c753793d7ba350410f2c1d0089359bf08"
"reference": "158d9423176557eba6fe0a90c1a21d6dbf7bc3c5"
},
"require": {
"automattic/jetpack-assets": "^1.18.12",
Expand Down Expand Up @@ -1306,7 +1306,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-stats",
"reference": "6ade1334d02135ef8d242f48c783a60190ee950e"
"reference": "0b2e0284752c181703f12444d27573fa47b450c5"
},
"require": {
"automattic/jetpack-assets": "^1.18.12",
Expand Down Expand Up @@ -1370,7 +1370,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-status",
"reference": "9999a8b869af7eb78219a9ed0aaff82f63588c32"
"reference": "55a8420f73eb8e35cb45170827757836e4e13d10"
},
"require": {
"automattic/jetpack-constants": "^1.6.23"
Expand Down Expand Up @@ -1425,7 +1425,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-sync",
"reference": "9ee1f7c014b6f1bce8f526da192c8f078c1c7835"
"reference": "03051b989e021b8a36359f36d255a5019ac15554"
},
"require": {
"automattic/jetpack-connection": "^1.58.1",
Expand Down
Loading

0 comments on commit 9cd4889

Please sign in to comment.