Reverting the mess caused renaming template folders (#5317)

Automattic · Jan 13, 2022 · ad9d522 · ad9d522
1 parent 79e6594
commit ad9d522
Show file tree

Hide file tree

Showing 219 changed files with 44 additions and 44 deletions.
diff --git a/altofocus/style.css b/altofocus/style.css
@@ -5,7 +5,7 @@ Theme URI: https://wordpress.com/themes/altofocus/
 Author: Automattic, Inc
 Author URI: http://automattic.com
 Description: AltoFocus is a theme for photographers, artists, and other creative types in search of a simple and easy way to display their work.
-Version: 1.0.11-wpcom
+Version: 1.0.10-wpcom
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: altofocus

diff --git a/ames/templates/index.html → ames/block-templates/index.html b/ames/templates/index.html → ames/block-templates/index.html
diff --git a/ames/style.css b/ames/style.css
@@ -7,7 +7,7 @@ Description: Ames is a minimalist theme, designed for single-page websites.
 Requires at least: 5.8
 Tested up to: 5.8
 Requires PHP: 5.7
-Version: 1.0.1
+Version: 1.0.0
 License: GNU General Public License v2 or later
 License URI: https://raw.githubusercontent.com/Automattic/themes/trunk/LICENSE
 Template: blockbase

diff --git a/arbutus/parts/footer.html → arbutus/block-template-parts/footer.html b/arbutus/parts/footer.html → arbutus/block-template-parts/footer.html
diff --git a/arbutus/parts/header.html → arbutus/block-template-parts/header.html b/arbutus/parts/header.html → arbutus/block-template-parts/header.html
diff --git a/arbutus/templates/archive.html → arbutus/block-templates/archive.html b/arbutus/templates/archive.html → arbutus/block-templates/archive.html
diff --git a/arbutus/templates/header-footer-only.html → ...s/block-templates/header-footer-only.html b/arbutus/templates/header-footer-only.html → ...s/block-templates/header-footer-only.html
diff --git a/arbutus/templates/index.html → arbutus/block-templates/index.html b/arbutus/templates/index.html → arbutus/block-templates/index.html
diff --git a/arbutus/templates/page.html → arbutus/block-templates/page.html b/arbutus/templates/page.html → arbutus/block-templates/page.html
diff --git a/arbutus/templates/single.html → arbutus/block-templates/single.html b/arbutus/templates/single.html → arbutus/block-templates/single.html
diff --git a/arbutus/style.css b/arbutus/style.css
@@ -7,7 +7,7 @@ Description: Arbutus is a simple blogging theme that supports full-site editing.
 Requires at least: 5.8
 Tested up to: 5.8
 Requires PHP: 5.7
-Version: 0.0.10
+Version: 0.0.9
 License: GNU General Public License v2 or later
 License URI: https://raw.githubusercontent.com/Automattic/themes/trunk/LICENSE
 Template: blockbase

diff --git a/blank-canvas-blocks/templates/home.html → ...k-canvas-blocks/block-templates/home.html b/blank-canvas-blocks/templates/home.html → ...k-canvas-blocks/block-templates/home.html
diff --git a/blank-canvas-blocks/style.css b/blank-canvas-blocks/style.css
@@ -7,7 +7,7 @@ Description: Blank Canvas is a minimalist theme, designed for single-page websit
 Requires at least: 5.8
 Tested up to: 5.8
 Requires PHP: 5.7
-Version: 0.0.4
+Version: 0.0.3
 License: GNU General Public License v2 or later
 License URI: https://raw.githubusercontent.com/Automattic/themes/trunk/LICENSE
 Template: blockbase

diff --git a/blockbase/parts/footer.html → blockbase/block-template-parts/footer.html b/blockbase/parts/footer.html → blockbase/block-template-parts/footer.html
diff --git a/blockbase/parts/header-centered.html → ...block-template-parts/header-centered.html b/blockbase/parts/header-centered.html → ...block-template-parts/header-centered.html
diff --git a/blockbase/parts/header-default.html → .../block-template-parts/header-default.html b/blockbase/parts/header-default.html → .../block-template-parts/header-default.html
diff --git a/blockbase/parts/header-linear.html → ...e/block-template-parts/header-linear.html b/blockbase/parts/header-linear.html → ...e/block-template-parts/header-linear.html
diff --git a/blockbase/parts/header-minimal.html → .../block-template-parts/header-minimal.html b/blockbase/parts/header-minimal.html → .../block-template-parts/header-minimal.html
diff --git a/blockbase/parts/header-rounded-logo.html → ...k-template-parts/header-rounded-logo.html b/blockbase/parts/header-rounded-logo.html → ...k-template-parts/header-rounded-logo.html
diff --git a/blockbase/parts/header-wide.html → ...ase/block-template-parts/header-wide.html b/blockbase/parts/header-wide.html → ...ase/block-template-parts/header-wide.html
diff --git a/blockbase/parts/header.html → blockbase/block-template-parts/header.html b/blockbase/parts/header.html → blockbase/block-template-parts/header.html
diff --git a/blockbase/parts/post-meta-icons.html → ...block-template-parts/post-meta-icons.html b/blockbase/parts/post-meta-icons.html → ...block-template-parts/post-meta-icons.html
diff --git a/blockbase/parts/post-meta.html → ...kbase/block-template-parts/post-meta.html b/blockbase/parts/post-meta.html → ...kbase/block-template-parts/post-meta.html
diff --git a/blockbase/templates/404.html → blockbase/block-templates/404.html b/blockbase/templates/404.html → blockbase/block-templates/404.html
diff --git a/blockbase/templates/archive.html → blockbase/block-templates/archive.html b/blockbase/templates/archive.html → blockbase/block-templates/archive.html
diff --git a/blockbase/templates/blank.html → blockbase/block-templates/blank.html b/blockbase/templates/blank.html → blockbase/block-templates/blank.html
diff --git a/blockbase/templates/footer-only.html → blockbase/block-templates/footer-only.html b/blockbase/templates/footer-only.html → blockbase/block-templates/footer-only.html
diff --git a/blockbase/templates/header-footer-only.html → ...e/block-templates/header-footer-only.html b/blockbase/templates/header-footer-only.html → ...e/block-templates/header-footer-only.html
diff --git a/blockbase/templates/index.html → blockbase/block-templates/index.html b/blockbase/templates/index.html → blockbase/block-templates/index.html
diff --git a/blockbase/templates/page.html → blockbase/block-templates/page.html b/blockbase/templates/page.html → blockbase/block-templates/page.html
diff --git a/blockbase/templates/search.html → blockbase/block-templates/search.html b/blockbase/templates/search.html → blockbase/block-templates/search.html
diff --git a/blockbase/templates/single.html → blockbase/block-templates/single.html b/blockbase/templates/single.html → blockbase/block-templates/single.html
diff --git a/blockbase/inc/block-patterns.php b/blockbase/inc/block-patterns.php
@@ -52,7 +52,7 @@ function blockbase_register_block_patterns() {
 						'title'      => __( 'Blockbase Header (' . $header_pattern . ')', 'blockbase' ),
 						'categories' => array( 'header' ),
 						'blockTypes' => array( 'core/template-part/header' ),
-						'content'    => file_get_contents (get_template_directory() . '/parts/header-' . $header_pattern . '.html'),
+						'content'    => file_get_contents (get_template_directory() . '/block-template-parts/header-' . $header_pattern . '.html'),
 					)
 				);
 			}

diff --git a/geologist-blue/parts/footer.html → ...ist-blue/block-template-parts/footer.html b/geologist-blue/parts/footer.html → ...ist-blue/block-template-parts/footer.html
diff --git a/geologist-blue/parts/header.html → ...ist-blue/block-template-parts/header.html b/geologist-blue/parts/header.html → ...ist-blue/block-template-parts/header.html
diff --git a/geologist-blue/templates/archive.html → geologist-blue/block-templates/archive.html b/geologist-blue/templates/archive.html → geologist-blue/block-templates/archive.html
diff --git a/geologist-blue/templates/index.html → geologist-blue/block-templates/index.html b/geologist-blue/templates/index.html → geologist-blue/block-templates/index.html
diff --git a/...st-blue/templates/page-without-title.html → ...e/block-templates/page-without-title.html b/...st-blue/templates/page-without-title.html → ...e/block-templates/page-without-title.html
diff --git a/geologist-blue/templates/page.html → geologist-blue/block-templates/page.html b/geologist-blue/templates/page.html → geologist-blue/block-templates/page.html
diff --git a/geologist-blue/templates/search.html → geologist-blue/block-templates/search.html b/geologist-blue/templates/search.html → geologist-blue/block-templates/search.html
diff --git a/geologist-blue/templates/single.html → geologist-blue/block-templates/single.html b/geologist-blue/templates/single.html → geologist-blue/block-templates/single.html
diff --git a/geologist-cream/parts/footer.html → ...st-cream/block-template-parts/footer.html b/geologist-cream/parts/footer.html → ...st-cream/block-template-parts/footer.html
diff --git a/geologist-cream/parts/header.html → ...st-cream/block-template-parts/header.html b/geologist-cream/parts/header.html → ...st-cream/block-template-parts/header.html
diff --git a/geologist-cream/templates/archive.html → geologist-cream/block-templates/archive.html b/geologist-cream/templates/archive.html → geologist-cream/block-templates/archive.html
diff --git a/geologist-cream/templates/index.html → geologist-cream/block-templates/index.html b/geologist-cream/templates/index.html → geologist-cream/block-templates/index.html
diff --git a/...t-cream/templates/page-without-title.html → ...m/block-templates/page-without-title.html b/...t-cream/templates/page-without-title.html → ...m/block-templates/page-without-title.html
diff --git a/geologist-cream/templates/page.html → geologist-cream/block-templates/page.html b/geologist-cream/templates/page.html → geologist-cream/block-templates/page.html
diff --git a/geologist-cream/templates/search.html → geologist-cream/block-templates/search.html b/geologist-cream/templates/search.html → geologist-cream/block-templates/search.html
diff --git a/geologist-cream/templates/single.html → geologist-cream/block-templates/single.html b/geologist-cream/templates/single.html → geologist-cream/block-templates/single.html
diff --git a/geologist-slate/parts/footer.html → ...st-slate/block-template-parts/footer.html b/geologist-slate/parts/footer.html → ...st-slate/block-template-parts/footer.html
diff --git a/geologist-slate/parts/header.html → ...st-slate/block-template-parts/header.html b/geologist-slate/parts/header.html → ...st-slate/block-template-parts/header.html
diff --git a/geologist-slate/templates/archive.html → geologist-slate/block-templates/archive.html b/geologist-slate/templates/archive.html → geologist-slate/block-templates/archive.html
diff --git a/geologist-slate/templates/index.html → geologist-slate/block-templates/index.html b/geologist-slate/templates/index.html → geologist-slate/block-templates/index.html
diff --git a/...t-slate/templates/page-without-title.html → ...e/block-templates/page-without-title.html b/...t-slate/templates/page-without-title.html → ...e/block-templates/page-without-title.html
diff --git a/geologist-slate/templates/page.html → geologist-slate/block-templates/page.html b/geologist-slate/templates/page.html → geologist-slate/block-templates/page.html
diff --git a/geologist-slate/templates/search.html → geologist-slate/block-templates/search.html b/geologist-slate/templates/search.html → geologist-slate/block-templates/search.html
diff --git a/geologist-slate/templates/single.html → geologist-slate/block-templates/single.html b/geologist-slate/templates/single.html → geologist-slate/block-templates/single.html
diff --git a/geologist-yellow/parts/footer.html → ...t-yellow/block-template-parts/footer.html b/geologist-yellow/parts/footer.html → ...t-yellow/block-template-parts/footer.html
diff --git a/geologist-yellow/parts/header.html → ...t-yellow/block-template-parts/header.html b/geologist-yellow/parts/header.html → ...t-yellow/block-template-parts/header.html
diff --git a/geologist-yellow/templates/archive.html → ...ogist-yellow/block-templates/archive.html b/geologist-yellow/templates/archive.html → ...ogist-yellow/block-templates/archive.html
diff --git a/geologist-yellow/templates/index.html → geologist-yellow/block-templates/index.html b/geologist-yellow/templates/index.html → geologist-yellow/block-templates/index.html
diff --git a/...-yellow/templates/page-without-title.html → ...w/block-templates/page-without-title.html b/...-yellow/templates/page-without-title.html → ...w/block-templates/page-without-title.html
diff --git a/geologist-yellow/templates/page.html → geologist-yellow/block-templates/page.html b/geologist-yellow/templates/page.html → geologist-yellow/block-templates/page.html
diff --git a/geologist-yellow/templates/search.html → geologist-yellow/block-templates/search.html b/geologist-yellow/templates/search.html → geologist-yellow/block-templates/search.html
diff --git a/geologist-yellow/templates/single.html → geologist-yellow/block-templates/single.html b/geologist-yellow/templates/single.html → geologist-yellow/block-templates/single.html
diff --git a/geologist/parts/footer.html → geologist/block-template-parts/footer.html b/geologist/parts/footer.html → geologist/block-template-parts/footer.html
diff --git a/geologist/parts/header.html → geologist/block-template-parts/header.html b/geologist/parts/header.html → geologist/block-template-parts/header.html
diff --git a/geologist/templates/archive.html → geologist/block-templates/archive.html b/geologist/templates/archive.html → geologist/block-templates/archive.html
diff --git a/geologist/templates/index.html → geologist/block-templates/index.html b/geologist/templates/index.html → geologist/block-templates/index.html
diff --git a/geologist/templates/page-without-title.html → ...t/block-templates/page-without-title.html b/geologist/templates/page-without-title.html → ...t/block-templates/page-without-title.html
diff --git a/geologist/templates/page.html → geologist/block-templates/page.html b/geologist/templates/page.html → geologist/block-templates/page.html
diff --git a/geologist/templates/search.html → geologist/block-templates/search.html b/geologist/templates/search.html → geologist/block-templates/search.html
diff --git a/geologist/templates/single.html → geologist/block-templates/single.html b/geologist/templates/single.html → geologist/block-templates/single.html
diff --git a/geologist/package.json b/geologist/package.json
@@ -1,6 +1,6 @@
 {
   "name": "geologist",
-  "version": "1.0.20",
+  "version": "1.0.19",
   "description": "",
   "main": "style.css",
   "dependencies": {},

diff --git a/geologist/style.css b/geologist/style.css
@@ -7,7 +7,7 @@ Description: Geologist is a streamlined theme for modern bloggers. It consists o
 Requires at least: 5.7
 Tested up to: 5.8
 Requires PHP: 5.7
-Version: 1.0.20
+Version: 1.0.19
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Template: blockbase

diff --git a/ibis/parts/footer.html → ibis/block-template-parts/footer.html b/ibis/parts/footer.html → ibis/block-template-parts/footer.html
diff --git a/ibis/parts/header.html → ibis/block-template-parts/header.html b/ibis/parts/header.html → ibis/block-template-parts/header.html
diff --git a/ibis/templates/index.html → ibis/block-templates/index.html b/ibis/templates/index.html → ibis/block-templates/index.html
diff --git a/ibis/templates/singular.html → ibis/block-templates/singular.html b/ibis/templates/singular.html → ibis/block-templates/singular.html
diff --git a/ibis/style.css b/ibis/style.css
@@ -5,7 +5,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: A long-legged theme that inhabits wetlands, forests and plains.
 Requires at least: 4.9.6
-Version: 1.1
+Version: 1.0
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: seedlet

diff --git a/jackson/templates/index.html → jackson/block-templates/index.html b/jackson/templates/index.html → jackson/block-templates/index.html
diff --git a/jackson/style.css b/jackson/style.css
@@ -7,7 +7,7 @@ Description: Jackson is a minimalist theme, designed for single-page websites.
 Requires at least: 5.8
 Tested up to: 5.8
 Requires PHP: 5.7
-Version: 1.0.1
+Version: 1.0.0
 License: GNU General Public License v2 or later
 License URI: https://raw.githubusercontent.com/Automattic/themes/trunk/LICENSE
 Template: blockbase

diff --git a/kingsley/parts/footer.html → kingsley/block-template-parts/footer.html b/kingsley/parts/footer.html → kingsley/block-template-parts/footer.html
diff --git a/kingsley/templates/index.html → kingsley/block-templates/index.html b/kingsley/templates/index.html → kingsley/block-templates/index.html
diff --git a/kingsley/style.css b/kingsley/style.css
@@ -7,7 +7,7 @@ Description: Kingsley is a minimalist theme, designed for single-page websites.
 Requires at least: 5.8
 Tested up to: 5.8
 Requires PHP: 5.7
-Version: 1.0.2
+Version: 1.0.1
 License: GNU General Public License v2 or later
 License URI: https://raw.githubusercontent.com/Automattic/themes/trunk/LICENSE
 Template: blockbase

diff --git a/mayland-blocks/parts/footer.html → ...d-blocks/block-template-parts/footer.html b/mayland-blocks/parts/footer.html → ...d-blocks/block-template-parts/footer.html
diff --git a/mayland-blocks/parts/header.html → ...d-blocks/block-template-parts/header.html b/mayland-blocks/parts/header.html → ...d-blocks/block-template-parts/header.html
diff --git a/mayland-blocks/parts/post-meta.html → ...locks/block-template-parts/post-meta.html b/mayland-blocks/parts/post-meta.html → ...locks/block-template-parts/post-meta.html
diff --git a/mayland-blocks/templates/archive.html → mayland-blocks/block-templates/archive.html b/mayland-blocks/templates/archive.html → mayland-blocks/block-templates/archive.html
diff --git a/mayland-blocks/templates/front-page.html → ...nd-blocks/block-templates/front-page.html b/mayland-blocks/templates/front-page.html → ...nd-blocks/block-templates/front-page.html
diff --git a/mayland-blocks/templates/index.html → mayland-blocks/block-templates/index.html b/mayland-blocks/templates/index.html → mayland-blocks/block-templates/index.html
diff --git a/mayland-blocks/templates/page.html → mayland-blocks/block-templates/page.html b/mayland-blocks/templates/page.html → mayland-blocks/block-templates/page.html
diff --git a/mayland-blocks/templates/single.html → mayland-blocks/block-templates/single.html b/mayland-blocks/templates/single.html → mayland-blocks/block-templates/single.html
diff --git a/mayland-blocks/package.json b/mayland-blocks/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "mayland-blocks",
-	"version": "2.1.22",
+	"version": "2.1.21",
 	"description": "",
 	"main": "index.js",
 	"dependencies": {},

diff --git a/mayland-blocks/style.css b/mayland-blocks/style.css
@@ -7,7 +7,7 @@ Description: Make your online portfolio wonderfully uncluttered with Mayland. Gr
 Requires at least: 5.7
 Tested up to: 5.8
 Requires PHP: 5.7
-Version: 2.1.22
+Version: 2.1.21
 License: GNU General Public License v2 or later
 License URI: https://raw.githubusercontent.com/Automattic/themes/trunk/LICENSE
 Template: blockbase

diff --git a/quadrat-black/parts/footer.html → ...at-black/block-template-parts/footer.html b/quadrat-black/parts/footer.html → ...at-black/block-template-parts/footer.html
diff --git a/quadrat-black/parts/header.html → ...at-black/block-template-parts/header.html b/quadrat-black/parts/header.html → ...at-black/block-template-parts/header.html
diff --git a/quadrat-black/templates/archive.html → quadrat-black/block-templates/archive.html b/quadrat-black/templates/archive.html → quadrat-black/block-templates/archive.html
diff --git a/quadrat-black/templates/index.html → quadrat-black/block-templates/index.html b/quadrat-black/templates/index.html → quadrat-black/block-templates/index.html
diff --git a/...t-black/templates/page-without-title.html → ...k/block-templates/page-without-title.html b/...t-black/templates/page-without-title.html → ...k/block-templates/page-without-title.html
diff --git a/quadrat-black/templates/page.html → quadrat-black/block-templates/page.html b/quadrat-black/templates/page.html → quadrat-black/block-templates/page.html
diff --git a/quadrat-black/templates/search.html → quadrat-black/block-templates/search.html b/quadrat-black/templates/search.html → quadrat-black/block-templates/search.html
diff --git a/quadrat-black/templates/single.html → quadrat-black/block-templates/single.html b/quadrat-black/templates/single.html → quadrat-black/block-templates/single.html
diff --git a/quadrat-black/package.json b/quadrat-black/package.json
@@ -1,6 +1,6 @@
 {
   "name": "quadrat",
-  "version": "1.1.34",
+  "version": "1.1.33",
   "description": "",
   "main": "index.php",
   "dependencies": {},

diff --git a/quadrat-black/style.css b/quadrat-black/style.css
@@ -7,7 +7,7 @@ Description: Quadrat is a simple, versatile WordPress theme, designed for blogs
 Requires at least: 5.7
 Tested up to: 5.8
 Requires PHP: 5.7
-Version: 1.1.34
+Version: 1.1.33
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Template: blockbase

diff --git a/quadrat-green/parts/footer.html → ...at-green/block-template-parts/footer.html b/quadrat-green/parts/footer.html → ...at-green/block-template-parts/footer.html
diff --git a/quadrat-green/parts/header.html → ...at-green/block-template-parts/header.html b/quadrat-green/parts/header.html → ...at-green/block-template-parts/header.html
diff --git a/quadrat-green/templates/archive.html → quadrat-green/block-templates/archive.html b/quadrat-green/templates/archive.html → quadrat-green/block-templates/archive.html
diff --git a/quadrat-green/templates/index.html → quadrat-green/block-templates/index.html b/quadrat-green/templates/index.html → quadrat-green/block-templates/index.html
diff --git a/...t-green/templates/page-without-title.html → ...n/block-templates/page-without-title.html b/...t-green/templates/page-without-title.html → ...n/block-templates/page-without-title.html
diff --git a/quadrat-green/templates/page.html → quadrat-green/block-templates/page.html b/quadrat-green/templates/page.html → quadrat-green/block-templates/page.html
diff --git a/quadrat-green/templates/search.html → quadrat-green/block-templates/search.html b/quadrat-green/templates/search.html → quadrat-green/block-templates/search.html
diff --git a/quadrat-green/templates/single.html → quadrat-green/block-templates/single.html b/quadrat-green/templates/single.html → quadrat-green/block-templates/single.html
diff --git a/quadrat-green/package.json b/quadrat-green/package.json
@@ -1,6 +1,6 @@
 {
   "name": "quadrat",
-  "version": "1.1.34",
+  "version": "1.1.33",
   "description": "",
   "main": "index.php",
   "dependencies": {},

diff --git a/quadrat-green/style.css b/quadrat-green/style.css
@@ -7,7 +7,7 @@ Description: Quadrat is a simple, versatile WordPress theme, designed for blogs
 Requires at least: 5.7
 Tested up to: 5.8
 Requires PHP: 5.7
-Version: 1.1.34
+Version: 1.1.33
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Template: blockbase

diff --git a/quadrat-red/parts/footer.html → quadrat-red/block-template-parts/footer.html b/quadrat-red/parts/footer.html → quadrat-red/block-template-parts/footer.html
diff --git a/quadrat-red/parts/header.html → quadrat-red/block-template-parts/header.html b/quadrat-red/parts/header.html → quadrat-red/block-template-parts/header.html
diff --git a/quadrat-red/templates/archive.html → quadrat-red/block-templates/archive.html b/quadrat-red/templates/archive.html → quadrat-red/block-templates/archive.html
diff --git a/quadrat-red/templates/index.html → quadrat-red/block-templates/index.html b/quadrat-red/templates/index.html → quadrat-red/block-templates/index.html
diff --git a/...rat-red/templates/page-without-title.html → ...d/block-templates/page-without-title.html b/...rat-red/templates/page-without-title.html → ...d/block-templates/page-without-title.html
diff --git a/quadrat-red/templates/page.html → quadrat-red/block-templates/page.html b/quadrat-red/templates/page.html → quadrat-red/block-templates/page.html
diff --git a/quadrat-red/templates/search.html → quadrat-red/block-templates/search.html b/quadrat-red/templates/search.html → quadrat-red/block-templates/search.html
diff --git a/quadrat-red/templates/single.html → quadrat-red/block-templates/single.html b/quadrat-red/templates/single.html → quadrat-red/block-templates/single.html
diff --git a/quadrat-red/package.json b/quadrat-red/package.json
@@ -1,6 +1,6 @@
 {
   "name": "quadrat",
-  "version": "1.1.34",
+  "version": "1.1.33",
   "description": "",
   "main": "index.php",
   "dependencies": {},

diff --git a/quadrat-red/style.css b/quadrat-red/style.css
@@ -7,7 +7,7 @@ Description: Quadrat is a simple, versatile WordPress theme, designed for blogs
 Requires at least: 5.7
 Tested up to: 5.8
 Requires PHP: 5.7
-Version: 1.1.34
+Version: 1.1.33
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Template: blockbase

diff --git a/quadrat-white/parts/footer.html → ...at-white/block-template-parts/footer.html b/quadrat-white/parts/footer.html → ...at-white/block-template-parts/footer.html
diff --git a/quadrat-white/parts/header.html → ...at-white/block-template-parts/header.html b/quadrat-white/parts/header.html → ...at-white/block-template-parts/header.html
diff --git a/quadrat-white/templates/archive.html → quadrat-white/block-templates/archive.html b/quadrat-white/templates/archive.html → quadrat-white/block-templates/archive.html
diff --git a/quadrat-white/templates/index.html → quadrat-white/block-templates/index.html b/quadrat-white/templates/index.html → quadrat-white/block-templates/index.html
diff --git a/...t-white/templates/page-without-title.html → ...e/block-templates/page-without-title.html b/...t-white/templates/page-without-title.html → ...e/block-templates/page-without-title.html
diff --git a/quadrat-white/templates/page.html → quadrat-white/block-templates/page.html b/quadrat-white/templates/page.html → quadrat-white/block-templates/page.html
diff --git a/quadrat-white/templates/search.html → quadrat-white/block-templates/search.html b/quadrat-white/templates/search.html → quadrat-white/block-templates/search.html
diff --git a/quadrat-white/templates/single.html → quadrat-white/block-templates/single.html b/quadrat-white/templates/single.html → quadrat-white/block-templates/single.html
diff --git a/quadrat-white/package.json b/quadrat-white/package.json
@@ -1,6 +1,6 @@
 {
   "name": "quadrat",
-  "version": "1.1.34",
+  "version": "1.1.33",
   "description": "",
   "main": "index.php",
   "dependencies": {},

diff --git a/quadrat-white/style.css b/quadrat-white/style.css
@@ -7,7 +7,7 @@ Description: Quadrat is a simple, versatile WordPress theme, designed for blogs
 Requires at least: 5.7
 Tested up to: 5.8
 Requires PHP: 5.7
-Version: 1.1.34
+Version: 1.1.33
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Template: blockbase

diff --git a/quadrat-yellow/parts/footer.html → ...t-yellow/block-template-parts/footer.html b/quadrat-yellow/parts/footer.html → ...t-yellow/block-template-parts/footer.html
diff --git a/quadrat-yellow/parts/header.html → ...t-yellow/block-template-parts/header.html b/quadrat-yellow/parts/header.html → ...t-yellow/block-template-parts/header.html
diff --git a/quadrat-yellow/templates/archive.html → quadrat-yellow/block-templates/archive.html b/quadrat-yellow/templates/archive.html → quadrat-yellow/block-templates/archive.html
diff --git a/quadrat-yellow/templates/index.html → quadrat-yellow/block-templates/index.html b/quadrat-yellow/templates/index.html → quadrat-yellow/block-templates/index.html
diff --git a/...-yellow/templates/page-without-title.html → ...w/block-templates/page-without-title.html b/...-yellow/templates/page-without-title.html → ...w/block-templates/page-without-title.html
diff --git a/quadrat-yellow/templates/page.html → quadrat-yellow/block-templates/page.html b/quadrat-yellow/templates/page.html → quadrat-yellow/block-templates/page.html
diff --git a/quadrat-yellow/templates/search.html → quadrat-yellow/block-templates/search.html b/quadrat-yellow/templates/search.html → quadrat-yellow/block-templates/search.html
diff --git a/quadrat-yellow/templates/single.html → quadrat-yellow/block-templates/single.html b/quadrat-yellow/templates/single.html → quadrat-yellow/block-templates/single.html
diff --git a/quadrat-yellow/package.json b/quadrat-yellow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "quadrat",
-  "version": "1.1.34",
+  "version": "1.1.33",
   "description": "",
   "main": "index.php",
   "dependencies": {},

diff --git a/quadrat-yellow/style.css b/quadrat-yellow/style.css
@@ -7,7 +7,7 @@ Description: Quadrat is a simple, versatile WordPress theme, designed for blogs
 Requires at least: 5.7
 Tested up to: 5.8
 Requires PHP: 5.7
-Version: 1.1.34
+Version: 1.1.33
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Template: blockbase

diff --git a/quadrat/parts/footer.html → quadrat/block-template-parts/footer.html b/quadrat/parts/footer.html → quadrat/block-template-parts/footer.html
diff --git a/quadrat/parts/header.html → quadrat/block-template-parts/header.html b/quadrat/parts/header.html → quadrat/block-template-parts/header.html
diff --git a/quadrat/templates/archive.html → quadrat/block-templates/archive.html b/quadrat/templates/archive.html → quadrat/block-templates/archive.html
diff --git a/quadrat/templates/index.html → quadrat/block-templates/index.html b/quadrat/templates/index.html → quadrat/block-templates/index.html
diff --git a/quadrat/templates/page-without-title.html → ...t/block-templates/page-without-title.html b/quadrat/templates/page-without-title.html → ...t/block-templates/page-without-title.html
diff --git a/quadrat/templates/page.html → quadrat/block-templates/page.html b/quadrat/templates/page.html → quadrat/block-templates/page.html
diff --git a/quadrat/templates/search.html → quadrat/block-templates/search.html b/quadrat/templates/search.html → quadrat/block-templates/search.html
diff --git a/quadrat/templates/single.html → quadrat/block-templates/single.html b/quadrat/templates/single.html → quadrat/block-templates/single.html
diff --git a/quadrat/package.json b/quadrat/package.json
@@ -1,6 +1,6 @@
 {
   "name": "quadrat",
-  "version": "1.1.32",
+  "version": "1.1.31",
   "description": "",
   "main": "index.php",
   "dependencies": {},

diff --git a/quadrat/style.css b/quadrat/style.css
@@ -7,7 +7,7 @@ Description: Quadrat is a simple, versatile WordPress theme, designed for blogs
 Requires at least: 5.7
 Tested up to: 5.8
 Requires PHP: 5.7
-Version: 1.1.32
+Version: 1.1.31
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Template: blockbase

diff --git a/russell/parts/header.html → russell/block-template-parts/header.html b/russell/parts/header.html → russell/block-template-parts/header.html
diff --git a/russell/parts/post-meta.html → russell/block-template-parts/post-meta.html b/russell/parts/post-meta.html → russell/block-template-parts/post-meta.html
diff --git a/russell/templates/archive.html → russell/block-templates/archive.html b/russell/templates/archive.html → russell/block-templates/archive.html
diff --git a/russell/templates/blank.html → russell/block-templates/blank.html b/russell/templates/blank.html → russell/block-templates/blank.html
diff --git a/russell/templates/header-footer-only.html → ...l/block-templates/header-footer-only.html b/russell/templates/header-footer-only.html → ...l/block-templates/header-footer-only.html
diff --git a/russell/templates/index.html → russell/block-templates/index.html b/russell/templates/index.html → russell/block-templates/index.html
diff --git a/russell/templates/page.html → russell/block-templates/page.html b/russell/templates/page.html → russell/block-templates/page.html
diff --git a/russell/templates/search.html → russell/block-templates/search.html b/russell/templates/search.html → russell/block-templates/search.html
diff --git a/russell/templates/single.html → russell/block-templates/single.html b/russell/templates/single.html → russell/block-templates/single.html
diff --git a/russell/package.json b/russell/package.json
@@ -1,6 +1,6 @@
 {
   "name": "russell",
-  "version": "0.0.17",
+  "version": "0.0.16",
   "description": "",
   "main": "style.css",
   "dependencies": {},

diff --git a/russell/style.css b/russell/style.css
@@ -7,7 +7,7 @@ Description: Russell is a simple blogging theme that supports full-site editing.
 Requires at least: 5.7
 Tested up to: 5.7
 Requires PHP: 5.7
-Version: 0.0.17
+Version: 0.0.16
 License: GNU General Public License v2 or later
 License URI: https://raw.githubusercontent.com/Automattic/themes/trunk/LICENSE
 Template: blockbase

diff --git a/seedlet-blocks/parts/footer.html → ...t-blocks/block-template-parts/footer.html b/seedlet-blocks/parts/footer.html → ...t-blocks/block-template-parts/footer.html
diff --git a/seedlet-blocks/parts/header.html → ...t-blocks/block-template-parts/header.html b/seedlet-blocks/parts/header.html → ...t-blocks/block-template-parts/header.html
diff --git a/seedlet-blocks/parts/post-meta.html → ...locks/block-template-parts/post-meta.html b/seedlet-blocks/parts/post-meta.html → ...locks/block-template-parts/post-meta.html
diff --git a/seedlet-blocks/templates/archive.html → seedlet-blocks/block-templates/archive.html b/seedlet-blocks/templates/archive.html → seedlet-blocks/block-templates/archive.html
diff --git a/seedlet-blocks/templates/index.html → seedlet-blocks/block-templates/index.html b/seedlet-blocks/templates/index.html → seedlet-blocks/block-templates/index.html
diff --git a/seedlet-blocks/templates/page.html → seedlet-blocks/block-templates/page.html b/seedlet-blocks/templates/page.html → seedlet-blocks/block-templates/page.html
diff --git a/seedlet-blocks/templates/single.html → seedlet-blocks/block-templates/single.html b/seedlet-blocks/templates/single.html → seedlet-blocks/block-templates/single.html
diff --git a/seedlet-blocks/package.json b/seedlet-blocks/package.json
@@ -1,6 +1,6 @@
 {
   "name": "seedlet-blocks",
-  "version": "2.1.21",
+  "version": "2.1.20",
   "description": "",
   "main": "index.js",
   "dependencies": {},

diff --git a/seedlet-blocks/style.css b/seedlet-blocks/style.css
@@ -7,7 +7,7 @@ Description: A simple, text-driven, single-column block-based theme.
 Requires at least: 5.7
 Tested up to: 5.8
 Requires PHP: 5.7
-Version: 2.1.21
+Version: 2.1.20
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Template: blockbase

diff --git a/skatepark/parts/footer.html → skatepark/block-template-parts/footer.html b/skatepark/parts/footer.html → skatepark/block-template-parts/footer.html
diff --git a/skatepark/parts/header.html → skatepark/block-template-parts/header.html b/skatepark/parts/header.html → skatepark/block-template-parts/header.html
diff --git a/skatepark/templates/404.html → skatepark/block-templates/404.html b/skatepark/templates/404.html → skatepark/block-templates/404.html
diff --git a/skatepark/templates/archive.html → skatepark/block-templates/archive.html b/skatepark/templates/archive.html → skatepark/block-templates/archive.html
diff --git a/skatepark/templates/index.html → skatepark/block-templates/index.html b/skatepark/templates/index.html → skatepark/block-templates/index.html
diff --git a/skatepark/templates/page.html → skatepark/block-templates/page.html b/skatepark/templates/page.html → skatepark/block-templates/page.html
diff --git a/skatepark/templates/search.html → skatepark/block-templates/search.html b/skatepark/templates/search.html → skatepark/block-templates/search.html
diff --git a/skatepark/templates/single.html → skatepark/block-templates/single.html b/skatepark/templates/single.html → skatepark/block-templates/single.html
diff --git a/skatepark/package.json b/skatepark/package.json
@@ -1,6 +1,6 @@
 {
   "name": "skatepark",
-  "version": "1.0.28",
+  "version": "1.0.27",
   "description": "",
   "main": "index.php",
   "dependencies": {},

diff --git a/skatepark/style.css b/skatepark/style.css
@@ -7,7 +7,7 @@ Description: Skatepark is a bold and exciting WordPress theme designed for moder
 Requires at least: 5.7.2
 Tested up to: 5.8
 Requires PHP: 5.7
-Version: 1.0.28
+Version: 1.0.27
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Template: blockbase

diff --git a/theme-utils.mjs b/theme-utils.mjs
@@ -606,12 +606,12 @@ async function pushChangesToSandbox() {
 		`, true);
 	}
 
-	// if(changedFiles.length > 0) {
-	// 	console.log('pushing changed files to sandbox:', changedFiles);
-	// 	await executeCommand(`
-	// 		rsync -avR --no-p --no-times --exclude-from='.sandbox-ignore' ${changedFiles.join(' ')} wpcom-sandbox:${sandboxPublicThemesFolder}/
-	// 	`, true);
-	// }
+	if(changedFiles.length > 0) {
+		console.log('pushing changed files to sandbox:', changedFiles);
+		await executeCommand(`
+			rsync -avR --no-p --no-times --exclude-from='.sandbox-ignore' ${changedFiles.join(' ')} wpcom-sandbox:${sandboxPublicThemesFolder}/
+		`, true);
+	}
 }
 
 /*
@@ -620,7 +620,7 @@ async function pushChangesToSandbox() {
 */
 async function getComittedChangesSinceHash(hash) {
 	const directoriesToIgnoreString = directoriesToIgnore.map( directory => ':^' + directory ).join(' ');
-	let comittedChanges = await executeCommand(`git diff ${hash} HEAD --name-only --diff-filter=AM -- . ${directoriesToIgnoreString}`);
+	let comittedChanges = await executeCommand(`git diff ${hash} HEAD --name-only -- . ${directoriesToIgnoreString}`);
 	comittedChanges = comittedChanges.replace(/\r?\n|\r/g, " ").split(" ");
 
 	let uncomittedChanges = await executeCommand(`git diff HEAD --name-only -- . ${directoriesToIgnoreString}`);
@@ -636,7 +636,7 @@ async function getComittedChangesSinceHash(hash) {
 async function getDeletedFilesSince(hash){
 
 	let deletedSinceHash = await executeCommand(`
-		git log --format=format:"" --name-only -M100% --diff-filter=DR ${hash}..HEAD
+		git log --format=format:"" --name-only -M100% --diff-filter=D ${hash}..HEAD
 	`);
 	deletedSinceHash = deletedSinceHash.replace(/\r?\n|\r/g, " ").trim().split(" ");
 

diff --git a/videomaker-white/parts/footer.html → ...er-white/block-template-parts/footer.html b/videomaker-white/parts/footer.html → ...er-white/block-template-parts/footer.html
diff --git a/videomaker-white/parts/header.html → ...er-white/block-template-parts/header.html b/videomaker-white/parts/header.html → ...er-white/block-template-parts/header.html
diff --git a/videomaker-white/templates/404.html → videomaker-white/block-templates/404.html b/videomaker-white/templates/404.html → videomaker-white/block-templates/404.html
diff --git a/videomaker-white/templates/archive.html → ...omaker-white/block-templates/archive.html b/videomaker-white/templates/archive.html → ...omaker-white/block-templates/archive.html
diff --git a/...r-white/templates/header-footer-only.html → ...e/block-templates/header-footer-only.html b/...r-white/templates/header-footer-only.html → ...e/block-templates/header-footer-only.html
diff --git a/videomaker-white/templates/index.html → videomaker-white/block-templates/index.html b/videomaker-white/templates/index.html → videomaker-white/block-templates/index.html
diff --git a/videomaker-white/templates/page.html → videomaker-white/block-templates/page.html b/videomaker-white/templates/page.html → videomaker-white/block-templates/page.html
diff --git a/videomaker-white/templates/search.html → videomaker-white/block-templates/search.html b/videomaker-white/templates/search.html → videomaker-white/block-templates/search.html
diff --git a/videomaker-white/templates/single.html → videomaker-white/block-templates/single.html b/videomaker-white/templates/single.html → videomaker-white/block-templates/single.html
diff --git a/videomaker-white/package.json b/videomaker-white/package.json
@@ -1,6 +1,6 @@
 {
   "name": "videomaker",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "",
   "main": "style.css",
   "dependencies": {},

diff --git a/videomaker-white/style.css b/videomaker-white/style.css
@@ -7,7 +7,7 @@ Description: Videomaker is a free, minimalistic WordPress theme ideal for film d
 Requires at least: 5.8
 Tested up to: 5.8
 Requires PHP: 5.7
-Version: 1.0.4
+Version: 1.0.3
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Template: blockbase

diff --git a/videomaker/parts/footer.html → videomaker/block-template-parts/footer.html b/videomaker/parts/footer.html → videomaker/block-template-parts/footer.html
diff --git a/videomaker/parts/header.html → videomaker/block-template-parts/header.html b/videomaker/parts/header.html → videomaker/block-template-parts/header.html
diff --git a/videomaker/templates/404.html → videomaker/block-templates/404.html b/videomaker/templates/404.html → videomaker/block-templates/404.html
diff --git a/videomaker/templates/archive.html → videomaker/block-templates/archive.html b/videomaker/templates/archive.html → videomaker/block-templates/archive.html
diff --git a/videomaker/templates/header-footer-only.html → ...r/block-templates/header-footer-only.html b/videomaker/templates/header-footer-only.html → ...r/block-templates/header-footer-only.html
diff --git a/videomaker/templates/index.html → videomaker/block-templates/index.html b/videomaker/templates/index.html → videomaker/block-templates/index.html
diff --git a/videomaker/templates/page.html → videomaker/block-templates/page.html b/videomaker/templates/page.html → videomaker/block-templates/page.html
diff --git a/videomaker/templates/search.html → videomaker/block-templates/search.html b/videomaker/templates/search.html → videomaker/block-templates/search.html
diff --git a/videomaker/templates/single.html → videomaker/block-templates/single.html b/videomaker/templates/single.html → videomaker/block-templates/single.html
diff --git a/videomaker/package.json b/videomaker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "videomaker",
-  "version": "1.0.7",
+  "version": "1.0.6",
   "description": "",
   "main": "style.css",
   "dependencies": {},

diff --git a/videomaker/style.css b/videomaker/style.css
@@ -7,7 +7,7 @@ Description: Videomaker is a free, minimalistic WordPress theme ideal for film d
 Requires at least: 5.8
 Tested up to: 5.8
 Requires PHP: 5.7
-Version: 1.0.7
+Version: 1.0.6
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Template: blockbase

diff --git a/zoologist/parts/footer.html → zoologist/block-template-parts/footer.html b/zoologist/parts/footer.html → zoologist/block-template-parts/footer.html
diff --git a/zoologist/parts/header.html → zoologist/block-template-parts/header.html b/zoologist/parts/header.html → zoologist/block-template-parts/header.html
diff --git a/zoologist/parts/post-meta.html → ...ogist/block-template-parts/post-meta.html b/zoologist/parts/post-meta.html → ...ogist/block-template-parts/post-meta.html
diff --git a/zoologist/templates/archive.html → zoologist/block-templates/archive.html b/zoologist/templates/archive.html → zoologist/block-templates/archive.html
diff --git a/zoologist/templates/index.html → zoologist/block-templates/index.html b/zoologist/templates/index.html → zoologist/block-templates/index.html
diff --git a/zoologist/templates/page-without-title.html → ...t/block-templates/page-without-title.html b/zoologist/templates/page-without-title.html → ...t/block-templates/page-without-title.html
diff --git a/zoologist/templates/page.html → zoologist/block-templates/page.html b/zoologist/templates/page.html → zoologist/block-templates/page.html
diff --git a/zoologist/templates/search.html → zoologist/block-templates/search.html b/zoologist/templates/search.html → zoologist/block-templates/search.html
diff --git a/zoologist/templates/single.html → zoologist/block-templates/single.html b/zoologist/templates/single.html → zoologist/block-templates/single.html
diff --git a/zoologist/package.json b/zoologist/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zoologist",
-  "version": "1.0.21",
+  "version": "1.0.20",
   "description": "",
   "main": "style.css",
   "dependencies": {},

diff --git a/zoologist/style.css b/zoologist/style.css
@@ -7,7 +7,7 @@ Description: Zoologist is a simple blogging theme that supports full-site editin
 Requires at least: 5.8
 Tested up to: 5.8
 Requires PHP: 5.7
-Version: 1.0.21
+Version: 1.0.20
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Template: blockbase