Expose edit site store

packages/edit-site/src/components/editor/index.js

@@ -48,7 +48,7 @@ const interfaceLabels = {
 	drawer: __( 'Navigation Sidebar' ),
 };
 
-function Editor() {
+function Editor( { initialSettings } ) {
 	const {
 		isFullscreenActive,
 		isInserterOpen,
@@ -94,7 +94,12 @@ function Editor() {
 		};
 	}, [] );
 	const { updateEditorSettings } = useDispatch( 'core/editor' );
-	const { setPage, setIsInserterOpened } = useDispatch( editSiteStore );
+	const { setPage, setIsInserterOpened, updateSettings } = useDispatch(
+		editSiteStore
+	);
+	useEffect( () => {
+		updateSettings( initialSettings );
+	}, [ initialSettings ] );
 
 	// Keep the defaultTemplateTypes in the core/editor settings too,
 	// so that they can be selected with core/editor selectors in any editor.
@@ -152,6 +157,11 @@ function Editor() {
 		onClose: () => setIsInserterOpened( false ),
 	} );
 
+	// Don't render the Editor until the settings are set and loaded
+	if ( ! settings?.siteUrl ) {
+		return null;
+	}
+
 	return (
 		<>
 			<URLQueryController />

packages/edit-site/src/index.js

@@ -15,7 +15,7 @@ import { render } from '@wordpress/element';
  */
 import './plugins';
 import './hooks';
-import registerEditSiteStore from './store';
+import './store';
 import Editor from './components/editor';
 
 const fetchLinkSuggestions = ( search, { perPage = 20 } = {} ) =>
@@ -54,14 +54,15 @@ export function initialize( id, settings ) {
 	settings.__experimentalFetchLinkSuggestions = fetchLinkSuggestions;
 	settings.__experimentalSpotlightEntityBlocks = [ 'core/template-part' ];
 
-	registerEditSiteStore( { settings } );
-
 	registerCoreBlocks();
 	if ( process.env.GUTENBERG_PHASE === 2 ) {
 		__experimentalRegisterExperimentalCoreBlocks( true );
 	}
 
-	render( <Editor />, document.getElementById( id ) );
+	render(
+		<Editor initialSettings={ settings } />,
+		document.getElementById( id )
+	);
 }
 
 export { default as __experimentalMainDashboardButton } from './components/main-dashboard-button';

packages/edit-site/src/store/index.js

@@ -12,24 +12,14 @@ import * as actions from './actions';
 import * as selectors from './selectors';
 import { STORE_NAME } from './constants';
 
-export let store = null;
+export const storeConfig = {
+	reducer,
+	actions,
+	selectors,
+	controls,
+	persist: [ 'preferences' ],
+};
 
-export default function registerEditSiteStore( initialState ) {
-	if ( store !== null ) {
-		return;
-	}
+export const store = createReduxStore( STORE_NAME, storeConfig );
 
-	const _store = createReduxStore( STORE_NAME, {
-		reducer,
-		actions,
-		selectors,
-		controls,
-		persist: [ 'preferences' ],
-		initialState,
-	} );
-	register( _store );
-
-	store = _store;
-
-	return _store;
-}
+register( store );