Block Directory: Update endpoints to remove __experimental namespace (

#23528)
WordPress · Jul 1, 2020 · 7f8b9da · 7f8b9da
1 parent df55dee
commit 7f8b9da
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 1,219 deletions.
diff --git a/lib/class-wp-rest-block-directory-controller.php b/lib/class-wp-rest-block-directory-controller.php
@@ -10,6 +10,8 @@
 /**
  * Controller which provides REST endpoint for the blocks.
  *
+ * This class can be removed when plugin support requires WordPress 5.5.0+.
+ *
  * @since 5.5.0
  *
  * @see   WP_REST_Controller
@@ -20,7 +22,7 @@ class WP_REST_Block_Directory_Controller extends WP_REST_Controller {
 	 * Constructs the controller.
 	 */
 	public function __construct() {
-		$this->namespace = '__experimental';
+		$this->namespace = 'wp/v2';
 		$this->rest_base = 'block-directory';
 	}
 
@@ -177,15 +179,15 @@ public function prepare_item_for_response( $plugin, $request ) {
 	protected function prepare_links( $plugin ) {
 		$links = array(
 			'https://api.w.org/install-plugin' => array(
-				'href' => add_query_arg( 'slug', urlencode( $plugin['slug'] ), rest_url( '__experimental/plugins' ) ),
+				'href' => add_query_arg( 'slug', urlencode( $plugin['slug'] ), rest_url( 'wp/v2/plugins' ) ),
 			),
 		);
 
 		$plugin_file = $this->find_plugin_for_slug( $plugin['slug'] );
 
 		if ( $plugin_file ) {
 			$links['https://api.w.org/plugin'] = array(
-				'href'       => rest_url( '__experimental/plugins/' . substr( $plugin_file, 0, - 4 ) ),
+				'href'       => rest_url( 'wp/v2/plugins/' . substr( $plugin_file, 0, - 4 ) ),
 				'embeddable' => true,
 			);
 		}
@@ -322,8 +324,7 @@ public function get_item_schema() {
 	public function get_collection_params() {
 		$query_params = parent::get_collection_params();
 
-		$query_params['context']['default']  = 'view';
-		$query_params['per_page']['default'] = 3;
+		$query_params['context']['default'] = 'view';
 
 		$query_params['term'] = array(
 			'description' => __( 'Limit result set to blocks matching the search term.', 'gutenberg' ),

diff --git a/lib/class-wp-rest-plugins-controller.php b/lib/class-wp-rest-plugins-controller.php
@@ -10,6 +10,8 @@
 /**
  * Core class to access plugins via the REST API.
  *
+ * This class can be removed when plugin support requires WordPress 5.5.0+.
+ *
  * @since 5.5.0
  *
  * @see   WP_REST_Controller
@@ -24,7 +26,7 @@ class WP_REST_Plugins_Controller extends WP_REST_Controller {
 	 * @since 5.5.0
 	 */
 	public function __construct() {
-		$this->namespace = '__experimental';
+		$this->namespace = 'wp/v2';
 		$this->rest_base = 'plugins';
 	}
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/block-directory/package.json b/packages/block-directory/package.json
@@ -39,6 +39,7 @@
 		"@wordpress/icons": "file:../icons",
 		"@wordpress/notices": "file:../notices",
 		"@wordpress/plugins": "file:../plugins",
+		"@wordpress/url": "file:../url",
 		"lodash": "^4.17.15"
 	},
 	"publishConfig": {

diff --git a/packages/block-directory/src/store/actions.js b/packages/block-directory/src/store/actions.js
@@ -67,7 +67,7 @@ export function* installBlockType( block ) {
 		}
 		yield setIsInstalling( block.id, true );
 		const response = yield apiFetch( {
-			path: '__experimental/plugins',
+			path: 'wp/v2/plugins',
 			data: {
 				slug: block.id,
 				status: 'active',

diff --git a/packages/block-directory/src/store/controls.js b/packages/block-directory/src/store/controls.js
@@ -1,3 +1,8 @@
+/**
+ * WordPress dependencies
+ */
+import { getPath } from '@wordpress/url';
+
 /**
  * Loads a JavaScript file.
  *
@@ -6,7 +11,7 @@
  * @return {Promise} Promise which will resolve when the asset is loaded.
  */
 export const loadScript = ( asset ) => {
-	if ( ! asset || ! /\.js$/.test( asset ) ) {
+	if ( ! asset || ! /\.js$/.test( getPath( asset ) ) ) {
 		return Promise.reject( new Error( 'No script found.' ) );
 	}
 	return new Promise( ( resolve, reject ) => {
@@ -30,7 +35,7 @@ export const loadScript = ( asset ) => {
  * @return {Promise} Promise which will resolve when the asset is added.
  */
 export const loadStyle = ( asset ) => {
-	if ( ! asset || ! /\.css$/.test( asset ) ) {
+	if ( ! asset || ! /\.css$/.test( getPath( asset ) ) ) {
 		return Promise.reject( new Error( 'No style found.' ) );
 	}
 	return new Promise( ( resolve, reject ) => {
@@ -60,7 +65,7 @@ export function loadAssets( assets ) {
 const controls = {
 	LOAD_ASSETS( { assets } ) {
 		const scripts = assets.map( ( asset ) =>
-			asset.match( /\.js$/ ) !== null
+			getPath( asset ).match( /\.js$/ ) !== null
 				? loadScript( asset )
 				: loadStyle( asset )
 		);

diff --git a/packages/block-directory/src/store/resolvers.js b/packages/block-directory/src/store/resolvers.js
@@ -26,7 +26,7 @@ export default {
 		try {
 			yield fetchDownloadableBlocks( filterValue );
 			const results = yield apiFetch( {
-				path: `__experimental/block-directory/search?term=${ filterValue }`,
+				path: `wp/v2/block-directory/search?term=${ filterValue }`,
 			} );
 			const blocks = results.map( ( result ) =>
 				mapKeys( result, ( value, key ) => {
@@ -45,7 +45,7 @@ export default {
 		try {
 			const response = yield apiFetch( {
 				method: 'OPTIONS',
-				path: `__experimental/block-directory/search`,
+				path: `wp/v2/block-directory/search`,
 				parse: false,
 			} );
 

diff --git a/packages/block-directory/src/store/test/actions.js b/packages/block-directory/src/store/test/actions.js
@@ -4,7 +4,7 @@
 import { installBlockType, uninstallBlockType } from '../actions';
 
 describe( 'actions', () => {
-	const endpoint = '/wp-json/__experimental/plugins/block/block';
+	const endpoint = '/wp-json/wp/v2/plugins/block/block';
 	const item = {
 		id: 'block/block',
 		name: 'Test Block',
@@ -43,7 +43,7 @@ describe( 'actions', () => {
 			expect( generator.next().value ).toMatchObject( {
 				type: 'API_FETCH',
 				request: {
-					path: '__experimental/plugins',
+					path: 'wp/v2/plugins',
 					method: 'POST',
 				},
 			} );
@@ -122,7 +122,7 @@ describe( 'actions', () => {
 			expect( generator.next().value ).toMatchObject( {
 				type: 'API_FETCH',
 				request: {
-					path: '__experimental/plugins',
+					path: 'wp/v2/plugins',
 					method: 'POST',
 				},
 			} );

diff --git a/packages/e2e-tests/specs/editor/plugins/block-directory-add.test.js b/packages/e2e-tests/specs/editor/plugins/block-directory-add.test.js
@@ -11,15 +11,13 @@ import {
 
 // Urls to mock
 const SEARCH_URLS = [
-	'/__experimental/block-directory/search',
-	`rest_route=${ encodeURIComponent(
-		'/__experimental/block-directory/search'
-	) }`,
+	'/wp/v2/block-directory/search',
+	`rest_route=${ encodeURIComponent( '/wp/v2/block-directory/search' ) }`,
 ];
 
 const INSTALL_URLS = [
-	'/__experimental/plugins',
-	`rest_route=${ encodeURIComponent( '/__experimental/plugins' ) }`,
+	'/wp/v2/plugins',
+	`rest_route=${ encodeURIComponent( '/wp/v2/plugins' ) }`,
 ];
 
 // Example Blocks
@@ -36,7 +34,7 @@ const MOCK_BLOCK1 = {
 	author: 'No Author',
 	icon: 'block-default',
 	assets: [
-		'fake_url.com/block.js', // we will mock this
+		'https://fake_url.com/block.js', // we will mock this
 	],
 	humanized_updated: '5 months ago',
 };
@@ -86,7 +84,7 @@ const block = `( function() {
 } )();`;
 
 const MOCK_OPTIONS = {
-	namespace: '__experimental',
+	namespace: 'wp/v2',
 	methods: [ 'GET' ],
 	endpoints: [
 		{

diff --git a/phpunit/class-wp-rest-block-directory-controller-test.php b/phpunit/class-wp-rest-block-directory-controller-test.php