Use home url during crawling and post-processing for Bedrock support

See elementor#840.
john-shaffer · Nov 27, 2021 · 5d8f643 · 5d8f643
1 parent 82317d1
commit 5d8f643
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/Crawler.php b/src/Crawler.php
@@ -113,7 +113,9 @@ public function crawlSite( string $static_site_path ) : void {
         $urls = [];
 
         foreach ( $crawlable_paths as $root_relative_path ) {
-            $absolute_uri = new URL( $this->site_path . $root_relative_path );
+            $absolute_uri = new URL(
+                rtrim( SiteInfo::getURL( 'home' ), '/' ) . $root_relative_path
+            );
             $urls[] = [
                 'url' => $absolute_uri->get(),
                 'path' => $root_relative_path,

diff --git a/src/SimpleRewriter.php b/src/SimpleRewriter.php
@@ -50,21 +50,21 @@ public static function rewriteFileContents( string $file_contents ) : string
             CoreOptions::getValue( 'deploymentURL' )
         );
 
-        $wordpress_site_url = apply_filters(
-            'wp2static_set_wordpress_site_url',
-            untrailingslashit( SiteInfo::getUrl( 'site' ) )
+        $wordpress_home_url = apply_filters(
+            'wp2static_set_wordpress_home_url',
+            untrailingslashit( SiteInfo::getUrl( 'home' ) )
         );
 
-        $wordpress_site_url = untrailingslashit( $wordpress_site_url );
+        $wordpress_home_url = untrailingslashit( $wordpress_home_url );
         $destination_url = untrailingslashit( $destination_url );
         $destination_url_rel = URLHelper::getProtocolRelativeURL( $destination_url );
         $destination_url_rel_c = addcslashes( $destination_url_rel, '/' );
 
         $replacement_patterns = [
-            $wordpress_site_url => $destination_url,
-            URLHelper::getProtocolRelativeURL( $wordpress_site_url ) =>
+            $wordpress_home_url => $destination_url,
+            URLHelper::getProtocolRelativeURL( $wordpress_home_url ) =>
                 URLHelper::getProtocolRelativeURL( $destination_url ),
-            addcslashes( URLHelper::getProtocolRelativeURL( $wordpress_site_url ), '/' ) =>
+            addcslashes( URLHelper::getProtocolRelativeURL( $wordpress_home_url ), '/' ) =>
                 addcslashes( URLHelper::getProtocolRelativeURL( $destination_url ), '/' ),
         ];