Simplify the proposal

WordPress · Aug 19, 2022 · c107cd0 · c107cd0
1 parent 6fd9d52
commit c107cd0
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 94 deletions.
diff --git a/packages/block-library/src/experiments.js b/packages/block-library/src/experiments.js
diff --git a/packages/block-library/src/index.js b/packages/block-library/src/index.js
@@ -8,11 +8,19 @@ import {
 	setUnregisteredTypeHandlerName,
 	setGroupingBlockName,
 } from '@wordpress/blocks';
+import {
+	registerAccessToken,
+	registerExperimentalAPIs
+} from '@wordpress/experiments';
+
+const ACCESS_TOKEN = {
+	i_realize_my_code_will_break_in_a_few_months_once_the_experimental_apis_are_removed: true,
+};
+registerAccessToken( ACCESS_TOKEN, '@wordpress/block-library' );
 
 /**
  * Internal dependencies
  */
-import { registerExperimentalAPIs } from './experiments';
 // When IS_GUTENBERG_PLUGIN is set to false, imports of experimental blocks
 // are transformed by packages/block-library/src/index.js as follows:
 //    import * as experimentalBlock from './experimental-block'
@@ -308,7 +316,7 @@ export const __experimentalRegisterExperimentalCoreBlocks = process.env
 	  }
 	: undefined;
 
-registerExperimentalAPIs( {
+registerExperimentalAPIs( ACCESS_TOKEN, {
 	__experimentalGetCoreBlocks,
 	__experimentalRegisterExperimentalCoreBlocks,
 } );
diff --git a/packages/blocks/src/experiments.js b/packages/blocks/src/experiments.js
diff --git a/packages/blocks/src/index.js b/packages/blocks/src/index.js
@@ -8,13 +8,20 @@
 // Blocks are inferred from the HTML source of a post through a parsing mechanism
 // and then stored as objects in state, from which it is then rendered for editing.
 
-/**
- * Internal dependencies
- */
-import { registerExperimentalAPIs, getExperimentalAPIs } from './experiments';
 /**
  * WordPress dependencies
  */
+import {
+	registerAccessToken,
+	registerExperimentalAPIs,
+	getExperimentalAPIs
+} from '@wordpress/experiments';
+
+const ACCESS_TOKEN = {
+	i_realize_my_code_will_break_in_a_few_months_once_the_experimental_apis_are_removed: true,
+};
+registerAccessToken( ACCESS_TOKEN, '@wordpress/blocks' );
+
 import { store } from './store';
 export { store };
 export * from './api';
@@ -27,10 +34,12 @@ import {
 } from './api';
 
 const { __experimentalPrivateDispatch } =
-	getExperimentalAPIs( '@wordpress/data' );
-registerExperimentalAPIs( {
+	getExperimentalAPIs( ACCESS_TOKEN, '@wordpress/data' );
+
+registerExperimentalAPIs( ACCESS_TOKEN, {
 	__unstableGetInnerBlocksProps,
 	unstable__bootstrapServerSideBlockDefinitions,
+
 	__experimentalReapplyBlockTypeFilters: () => {
 		__experimentalPrivateDispatch(
 			store,

diff --git a/packages/core-data/src/experiments.js b/packages/core-data/src/experiments.js
diff --git a/packages/core-data/src/index.js b/packages/core-data/src/index.js
@@ -2,11 +2,19 @@
  * WordPress dependencies
  */
 import { createReduxStore, register } from '@wordpress/data';
+import {
+	registerAccessToken,
+	registerExperimentalAPIs,
+} from '@wordpress/experiments';
+
+const ACCESS_TOKEN = {
+	i_realize_my_code_will_break_in_a_few_months_once_the_experimental_apis_are_removed: true,
+};
+registerAccessToken( ACCESS_TOKEN, '@wordpress/core-data' );
 
 /**
  * Internal dependencies
  */
-import './experiments';
 import reducer from './reducer';
 import * as selectors from './selectors';
 import * as actions from './actions';
@@ -78,3 +86,7 @@ export * from './entity-types';
 export * from './fetch';
 export * from './hooks';
 
+import { __experimentalFetchLinkSuggestions } from "./fetch";
+registerExperimentalAPIs( ACCESS_TOKEN, {
+	__experimentalFetchLinkSuggestions,
+} );
diff --git a/packages/data/src/experiments.js b/packages/data/src/experiments.js
diff --git a/packages/data/src/index.js b/packages/data/src/index.js
@@ -3,10 +3,22 @@
  */
 import combineReducers from 'turbo-combine-reducers';
 
+/**
+ * WordPress dependencies
+ */
+import {
+	registerAccessToken,
+	registerExperimentalAPIs
+} from '@wordpress/experiments';
+
+const ACCESS_TOKEN = {
+	i_realize_my_code_will_break_in_a_few_months_once_the_experimental_apis_are_removed: true,
+};
+registerAccessToken( ACCESS_TOKEN, '@wordpress/data' );
+
 /**
  * Internal dependencies
  */
-import { registerExperimentalAPIs } from './experiments';
 import defaultRegistry from './default-registry';
 import * as plugins from './plugins';
 
@@ -237,7 +249,7 @@ function __experimentalPrivateDispatch( { name }, actionThunk ) {
 	return defaultRegistry.stores[ name ].store.dispatch( actionThunk );
 }
 
-registerExperimentalAPIs( {
+registerExperimentalAPIs( ACCESS_TOKEN, {
 	__experimentalPrivateSelector,
 	__experimentalPrivateDispatch,
 } );
diff --git a/packages/experiments/src/index.js b/packages/experiments/src/index.js
@@ -12,7 +12,7 @@ const CORE_MODULES_USING_EXPERIMENTS = [
 const accessTokens = [];
 const registeredExperiments = {};
 
-export function registerAccessToken( accessToken, packageName ) {
+export const registerAccessToken = ( accessToken, packageName ) => {
 	if ( ! CORE_MODULES_USING_EXPERIMENTS.includes( packageName ) ) {
 		throw new Error(
 			`Cannot register non-gutenberg package ${ packageName }.`
@@ -32,7 +32,7 @@ export function registerAccessToken( accessToken, packageName ) {
 	registeredExperiments[ packageName ] = { experiments: {}, accessToken };
 }
 
-export function registerExperimentalAPIs( accessToken, experiments ) {
+export const registerExperimentalAPIs = ( accessToken, experiments ) => {
 	const registeredEntry = Object.entries( registeredExperiments ).find(
 		( [ , details ] ) => details.accessToken === accessToken
 	);
@@ -46,7 +46,7 @@ export function registerExperimentalAPIs( accessToken, experiments ) {
 	};
 }
 
-export function getExperimentalAPIs( accessToken, packageName ) {
+export const getExperimentalAPIs = ( accessToken, packageName ) => {
 	if ( ! ( packageName in registeredExperiments ) ) {
 		throw new Error( `Module ${ packageName } is not registered yet.` );
 	}