diff --git a/Gruntfile.js b/Gruntfile.js
index 7c212ab2759..54875f0527a 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -369,6 +369,18 @@ module.exports = function( grunt ) {
 				dest: '<%= dirs.php %>/blocks/',
 				options: {
 					process: ( content ) => content.replace( /'woo-gutenberg-products-block'/g, "'woocommerce'" )
+						.replace(
+							/plugins_url\( 'build\/([\w-]*)\.js', WGPB_PLUGIN_FILE \)/g,
+							"WC()->plugin_url() . '/assets/js/blocks/$1.js'"
+						)
+						.replace(
+							/plugins_url\( 'build\/([\w-]*)\.css', WGPB_PLUGIN_FILE \)/g,
+							"WC()->plugin_url() . '/assets/css/blocks/$1.css'"
+						)
+						.replace( /WGPB_ABSPATH/g, 'WC_ABSPATH' )
+						.replace( /WGPB_PLUGIN_FILE/g, 'WC_PLUGIN_FILE' )
+						.replace( /WGPB_VERSION/g, 'WC_VERSION' )
+						.replace( /WGPB_Block_Library/g, 'WC_Block_Library' )
 				}
 			}
 		}
diff --git a/includes/blocks/class-wc-block-featured-product.php b/includes/blocks/class-wc-block-featured-product.php
index 1c6390c824c..adfa41acbe8 100644
--- a/includes/blocks/class-wc-block-featured-product.php
+++ b/includes/blocks/class-wc-block-featured-product.php
@@ -3,6 +3,7 @@
  * Display the featured product block in the content.
  *
  * @package WooCommerce\Blocks
+ * @version 3.6.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/blocks/class-wc-block-library.php b/includes/blocks/class-wc-block-library.php
new file mode 100644
index 00000000000..62c33f3e02a
--- /dev/null
+++ b/includes/blocks/class-wc-block-library.php
@@ -0,0 +1,226 @@
+<?php
+/**
+ * Register the scripts, styles, and blocks needed for the block editor.
+ *
+ * @package WooCommerce\Blocks
+ * @version 3.6.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC_Block_Library Class.
+ */
+class WC_Block_Library {
+
+	/**
+	 * Get the file modified time as a cache buster if we're in dev mode.
+	 *
+	 * @param string $file Local path to the file.
+	 * @return string The cache buster value to use for the given file.
+	 */
+	protected static function get_file_version( $file ) {
+		if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) {
+			$file = trim( $file, '/' );
+			return filemtime( WC_ABSPATH . $file );
+		}
+		return WC_VERSION;
+	}
+
+	/**
+	 * Registers a script according to `wp_register_script`, additionally loading the translations for the file.
+	 *
+	 * @since 3.6.0
+	 *
+	 * @param string $handle    Name of the script. Should be unique.
+	 * @param string $src       Full URL of the script, or path of the script relative to the WordPress root directory.
+	 * @param array  $deps      Optional. An array of registered script handles this script depends on. Default empty array.
+	 * @param bool   $has_i18n  Optional. Whether to add a script translation call to this file. Default 'false'.
+	 */
+	protected static function register_script( $handle, $src, $deps = array(), $has_i18n = true ) {
+		wp_deregister_script( $handle );
+		$filename = str_replace( plugins_url( '/', WC_PLUGIN_FILE ), '', $src );
+		$ver = self::get_file_version( $filename );
+		wp_register_script( $handle, $src, $deps, $ver, true );
+		if ( $has_i18n && function_exists( 'wp_set_script_translations' ) ) {
+			wp_set_script_translations( $handle, 'woocommerce', WC_ABSPATH . 'languages' );
+		}
+	}
+
+	/**
+	 * Registers a style according to `wp_register_style`.
+	 *
+	 * @since 4.1.0
+	 *
+	 * @param string $handle Name of the stylesheet. Should be unique.
+	 * @param string $src    Full URL of the stylesheet, or path of the stylesheet relative to the WordPress root directory.
+	 * @param array  $deps   Optional. An array of registered stylesheet handles this stylesheet depends on. Default empty array.
+	 * @param string $media  Optional. The media for which this stylesheet has been defined. Default 'all'. Accepts media types like
+	 *                       'all', 'print' and 'screen', or media queries like '(orientation: portrait)' and '(max-width: 640px)'.
+	 */
+	protected static function register_style( $handle, $src, $deps = array(), $media = 'all' ) {
+		wp_deregister_style( $handle );
+		$filename = str_replace( plugins_url( '/', WC_PLUGIN_FILE ), '', $src );
+		$ver = self::get_file_version( $filename );
+		wp_register_style( $handle, $src, $deps, $ver, $media );
+	}
+
+	/**
+	 * Register block scripts & styles.
+	 */
+	public static function register_assets() {
+		self::register_style( 'wc-block-editor', WC()->plugin_url() . '/assets/css/blocks/editor.css', array( 'wp-edit-blocks' ) );
+		self::register_style( 'wc-block-style', WC()->plugin_url() . '/assets/css/blocks/style.css', array() );
+
+		// Shared libraries and components across all blocks.
+		self::register_script( 'wc-vendors', WC()->plugin_url() . '/assets/js/blocks/vendors.js', array(), false );
+
+		$block_dependencies = array(
+			'wp-api-fetch',
+			'wp-blocks',
+			'wp-components',
+			'wp-compose',
+			'wp-data',
+			'wp-element',
+			'wp-editor',
+			'wp-i18n',
+			'wp-url',
+			'lodash',
+			'wc-vendors',
+		);
+
+		self::register_script( 'wc-handpicked-products', WC()->plugin_url() . '/assets/js/blocks/handpicked-products.js', $block_dependencies );
+		self::register_script( 'wc-product-best-sellers', WC()->plugin_url() . '/assets/js/blocks/product-best-sellers.js', $block_dependencies );
+		self::register_script( 'wc-product-category', WC()->plugin_url() . '/assets/js/blocks/product-category.js', $block_dependencies );
+		self::register_script( 'wc-product-new', WC()->plugin_url() . '/assets/js/blocks/product-new.js', $block_dependencies );
+		self::register_script( 'wc-product-on-sale', WC()->plugin_url() . '/assets/js/blocks/product-on-sale.js', $block_dependencies );
+		self::register_script( 'wc-product-top-rated', WC()->plugin_url() . '/assets/js/blocks/product-top-rated.js', $block_dependencies );
+		self::register_script( 'wc-products-attribute', WC()->plugin_url() . '/assets/js/blocks/products-attribute.js', $block_dependencies );
+		self::register_script( 'wc-featured-product', WC()->plugin_url() . '/assets/js/blocks/featured-product.js', $block_dependencies );
+	}
+
+	/**
+	 * Register blocks, hooking up assets and render functions as needed.
+	 */
+	public static function register_blocks() {
+		require_once dirname( __FILE__ ) . '/class-wc-block-featured-product.php';
+
+		register_block_type(
+			'woocommerce/handpicked-products',
+			array(
+				'editor_script' => 'wc-handpicked-products',
+				'editor_style'  => 'wc-block-editor',
+				'style'         => 'wc-block-style',
+			)
+		);
+		register_block_type(
+			'woocommerce/product-best-sellers',
+			array(
+				'editor_script' => 'wc-product-best-sellers',
+				'editor_style'  => 'wc-block-editor',
+				'style'         => 'wc-block-style',
+			)
+		);
+		register_block_type(
+			'woocommerce/product-category',
+			array(
+				'editor_script' => 'wc-product-category',
+				'editor_style'  => 'wc-block-editor',
+				'style'         => 'wc-block-style',
+			)
+		);
+		register_block_type(
+			'woocommerce/product-new',
+			array(
+				'editor_script' => 'wc-product-new',
+				'editor_style'  => 'wc-block-editor',
+				'style'         => 'wc-block-style',
+			)
+		);
+		register_block_type(
+			'woocommerce/product-on-sale',
+			array(
+				'editor_script' => 'wc-product-on-sale',
+				'editor_style'  => 'wc-block-editor',
+				'style'         => 'wc-block-style',
+			)
+		);
+		register_block_type(
+			'woocommerce/product-top-rated',
+			array(
+				'editor_script' => 'wc-product-top-rated',
+				'editor_style'  => 'wc-block-editor',
+				'style'         => 'wc-block-style',
+			)
+		);
+		register_block_type(
+			'woocommerce/products-by-attribute',
+			array(
+				'editor_script' => 'wc-products-attribute',
+				'editor_style'  => 'wc-block-editor',
+				'style'         => 'wc-block-style',
+			)
+		);
+		register_block_type(
+			'woocommerce/featured-product',
+			array(
+				'render_callback' => array( 'WC_Block_Featured_Product', 'render' ),
+				'editor_script'   => 'wc-featured-product',
+				'editor_style'    => 'wc-block-editor',
+				'style'           => 'wc-block-style',
+			)
+		);
+	}
+
+	/**
+	 * Adds a WooCommerce category to the block inserter.
+	 *
+	 * @param array $categories Array of categories.
+	 * @return array Array of block categories.
+	 */
+	public static function add_block_category( $categories ) {
+		return array_merge(
+			$categories,
+			array(
+				array(
+					'slug'  => 'woocommerce',
+					'title' => __( 'WooCommerce', 'woocommerce' ),
+					'icon'  => 'woocommerce',
+				),
+			)
+		);
+	}
+
+	/**
+	 * Output the wcSettings global before printing any script tags.
+	 */
+	public static function print_script_settings() {
+		// Global settings used in each block.
+		$block_settings = array(
+			'min_columns'       => wc_get_theme_support( 'product_grid::min_columns', 1 ),
+			'max_columns'       => wc_get_theme_support( 'product_grid::max_columns', 6 ),
+			'default_columns'   => wc_get_default_products_per_row(),
+			'min_rows'          => wc_get_theme_support( 'product_grid::min_rows', 1 ),
+			'max_rows'          => wc_get_theme_support( 'product_grid::max_rows', 6 ),
+			'default_rows'      => wc_get_default_product_rows_per_page(),
+			'placeholderImgSrc' => wc_placeholder_img_src(),
+			'min_height'        => wc_get_theme_support( 'featured_block::min_height', 500 ),
+			'default_height'    => wc_get_theme_support( 'featured_block::default_height', 500 ),
+		);
+		?>
+		<script type="text/javascript">
+			<?php // Use the wcSettings from wc-admin if already present. ?>
+			var wc_product_block_data = <?php echo wp_json_encode( $block_settings ); ?>;
+		</script>
+		<?php
+	}
+}
+
+if ( function_exists( 'register_block_type' ) ) {
+	add_action( 'init', array( 'WC_Block_Library', 'register_blocks' ) );
+	add_action( 'init', array( 'WC_Block_Library', 'register_assets' ) );
+	add_filter( 'block_categories', array( 'WC_Block_Library', 'add_block_category' ) );
+	add_action( 'admin_print_footer_scripts', array( 'WC_Block_Library', 'print_script_settings' ), 1 );
+}
diff --git a/includes/class-woocommerce.php b/includes/class-woocommerce.php
index 862a5be3d18..d7cf8e7b4a9 100644
--- a/includes/class-woocommerce.php
+++ b/includes/class-woocommerce.php
@@ -409,6 +409,13 @@ final class WooCommerce {
 		include_once WC_ABSPATH . 'includes/class-wc-auth.php';
 		include_once WC_ABSPATH . 'includes/class-wc-register-wp-admin-settings.php';
 
+		/**
+		 * Blocks.
+		 */
+		if ( file_exists( WC_ABSPATH . 'includes/blocks/class-wc-block-library.php' ) ) {
+			include_once WC_ABSPATH . 'includes/blocks/class-wc-block-library.php';
+		}
+
 		/**
 		 * Libraries
 		 */