Changeset 9119

Timestamp:

08/28/2019 09:12:29 AM (5 years ago)

Author:

tellyworth

Message:

Plugin directory: guess more block asset files.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php

@@ -443 +443 @@
         // Find blocks
         $blocks = array();
+        $files_with_blocks = array();
         foreach ( Filesystem::list_files( "$tmp_dir/export/", true /* recursive */, '!\.(?:php|js|jsx|json)$!i' ) as $filename ) {
             $file_blocks = $this->find_blocks_in_file( $filename );
             if ( $file_blocks ) {
+                $files_with_blocks[] = str_replace( "$tmp_dir/export/", '', $filename );
                 foreach ( $file_blocks as $block ) {
                     // If the info came from a block.json file with more metadata (like description) then we want it to override less detailed info scraped from php/js.
@@ -461 +463 @@
 
         foreach ( $dist_files as $file ) {
-            #$block_files[] = 'https://plugins.svn.wordpress.org' . "/{$plugin_slug}/trunk/dist/" . $file;
             $block_files[] = '/trunk/dist/' . $file;
         }
 
         foreach ( $build_files as $file ) {
-            #$block_files[] = 'https://plugins.svn.wordpress.org' . "/{$plugin_slug}/trunk/build/" . $file;
             $block_files[] = '/trunk/build/' . $file;
         }
+
+        if ( empty( $block_files ) ) {
+            foreach ( $files_with_blocks as $file ) {
+                $block_files[] = '/trunk/' . $file;
+            }
+        }
+
+        // Only allow js or css files
+        $block_files = array_unique( array_filter( $block_files, function( $filename ) {
+            return preg_match( '!\.(?:js|jsx|css)$!i', $filename );
+        } ) );
 
         return compact( 'readme', 'stable_tag', 'tmp_dir', 'plugin_headers', 'assets', 'tagged_versions', 'blocks', 'block_files' );