@wordpress/core-data 7.33.0 → 7.33.1

package/build-module/sync.js

@@ -4,11 +4,18 @@ import {
   LOCAL_SYNC_MANAGER_ORIGIN,
   createSyncManager
 } from "@wordpress/sync";
-const syncManager = createSyncManager();
+let syncManager;
+function getSyncManager() {
+  if (syncManager) {
+    return syncManager;
+  }
+  syncManager = createSyncManager();
+  return syncManager;
+}
 export {
   CRDT_RECORD_MAP_KEY,
   LOCAL_EDITOR_ORIGIN,
   LOCAL_SYNC_MANAGER_ORIGIN,
-  syncManager
+  getSyncManager
 };
 //# sourceMappingURL=sync.js.map

package/build-module/sync.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/sync.ts"],
-  "sourcesContent": ["/**\n * WordPress dependencies\n */\nimport {\n\tCRDT_RECORD_MAP_KEY,\n\tLOCAL_EDITOR_ORIGIN,\n\tLOCAL_SYNC_MANAGER_ORIGIN,\n\tcreateSyncManager,\n} from '@wordpress/sync';\n\nexport { CRDT_RECORD_MAP_KEY, LOCAL_EDITOR_ORIGIN, LOCAL_SYNC_MANAGER_ORIGIN };\nexport const syncManager = createSyncManager();\n"],
-  "mappings": "AAGA;AAAA,EACC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACM;AAGA,MAAM,cAAc,kBAAkB;",
+  "sourcesContent": ["/**\n * WordPress dependencies\n */\nimport {\n\tCRDT_RECORD_MAP_KEY,\n\tLOCAL_EDITOR_ORIGIN,\n\tLOCAL_SYNC_MANAGER_ORIGIN,\n\ttype SyncManager,\n\tcreateSyncManager,\n} from '@wordpress/sync';\n\nexport { CRDT_RECORD_MAP_KEY, LOCAL_EDITOR_ORIGIN, LOCAL_SYNC_MANAGER_ORIGIN };\n\nlet syncManager: SyncManager;\n\nexport function getSyncManager(): SyncManager | undefined {\n\tif ( syncManager ) {\n\t\treturn syncManager;\n\t}\n\n\tsyncManager = createSyncManager();\n\n\treturn syncManager;\n}\n"],
+  "mappings": "AAGA;AAAA,EACC;AAAA,EACA;AAAA,EACA;AAAA,EAEA;AAAA,OACM;AAIP,IAAI;AAEG,SAAS,iBAA0C;AACzD,MAAK,aAAc;AAClB,WAAO;AAAA,EACR;AAEA,gBAAc,kBAAkB;AAEhC,SAAO;AACR;",
   "names": []
 }

package/build-types/entities.d.ts

@@ -2,6 +2,7 @@ export const DEFAULT_ENTITY_KEY: "id";
 export const rootEntitiesConfig: ({
     label: import("@wordpress/i18n").TranslatableText<"Base">;
     kind: string;
+    key: boolean;
     name: string;
     baseURL: string;
     baseURLParams: {
@@ -9,7 +10,6 @@ export const rootEntitiesConfig: ({
         context?: undefined;
     };
     plural: string;
-    key?: undefined;
     rawAttributes?: undefined;
     supportsPagination?: undefined;
     transientEdits?: undefined;
@@ -259,6 +259,19 @@ export const rootEntitiesConfig: ({
     transientEdits?: undefined;
     getTitle?: undefined;
     getRevisionsUrl?: undefined;
+} | {
+    label: import("@wordpress/i18n").TranslatableText<"Registered Templates">;
+    name: string;
+    kind: string;
+    baseURL: string;
+    key: string;
+    baseURLParams?: undefined;
+    plural?: undefined;
+    rawAttributes?: undefined;
+    supportsPagination?: undefined;
+    transientEdits?: undefined;
+    getTitle?: undefined;
+    getRevisionsUrl?: undefined;
 })[];
 export namespace deprecatedEntities {
     namespace root {

package/build-types/entities.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"entities.d.ts","sourceRoot":"","sources":["../src/entities.js"],"names":[],"mappings":"AAsBA,iCAAkC,IAAI,CAAC;AAYvC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA0KE;;;;;;;;;;;;AAcF;;;;;;;;;;KASE;AASK,0EAqBN;AAiKM,oCANI,MAAM,QACN,MAAM,WACN,MAAM,GAEL,MAAM,CAMjB;AAnKD;;;;GAIG;AACH,sDA2EC;AAyBD;;;;GAIG;AACH,gDA6BC"}
+{"version":3,"file":"entities.d.ts","sourceRoot":"","sources":["../src/entities.js"],"names":[],"mappings":"AAsBA,iCAAkC,IAAI,CAAC;AAYvC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAkLE;;;;;;;;;;;;AAcF;;;;;;;;;;KASE;AASK,0EAqBN;AAmLM,oCANI,MAAM,QACN,MAAM,WACN,MAAM,GAEL,MAAM,CAMjB;AArLD;;;;GAIG;AACH,sDAoFC;AAyBD;;;;GAIG;AACH,gDAsCC"}

package/build-types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.js"],"names":[],"mappings":"AA6HA;;;;GAIG;AACH;;;;;;;;;;;;;;;;;;;;;;4CAW07pB,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAX93pB;;;;;;;2BAzHxC,aAAa"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.js"],"names":[],"mappings":"AA6HA;;;;GAIG;AACH;;;;;;;;;;;;;;;;;;;;;;4CAWslqB,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAX1hqB;;;;;;;2BAzHxC,aAAa"}

package/build-types/private-selectors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"private-selectors.d.ts","sourceRoot":"","sources":["../src/private-selectors.ts"],"names":[],"mappings":"AAKA;;GAEG;AACH,OAAO,EAAyC,KAAK,KAAK,EAAE,MAAM,aAAa,CAAC;AAKhF,KAAK,eAAe,GAAG,MAAM,GAAG,MAAM,CAAC;AAEvC;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAE,KAAK,EAAE,KAAK,iDAE3C;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACtC,KAAK,EAAE,KAAK,GACV,eAAe,GAAG,SAAS,CAE7B;AAED,eAAO,MAAM,2BAA2B;;;;CAcvC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,2BAA2B;;;;;;;CAwBvC,CAAC;AAEF;;;;;;;;;GASG;AACH,wBAAgB,0BAA0B,CACzC,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,MAAM;;;EAIV;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,UAEpE;AAqBD,eAAO,MAAM,WAAW;;;;;;;CAuCvB,CAAC;AAEF,eAAO,MAAM,cAAc;;;;CAQxB,CAAC;AAEJ,eAAO,MAAM,aAAa;;;;CA4GzB,CAAC"}
+{"version":3,"file":"private-selectors.d.ts","sourceRoot":"","sources":["../src/private-selectors.ts"],"names":[],"mappings":"AAKA;;GAEG;AACH,OAAO,EAAyC,KAAK,KAAK,EAAE,MAAM,aAAa,CAAC;AAKhF,KAAK,eAAe,GAAG,MAAM,GAAG,MAAM,CAAC;AAEvC;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAE,KAAK,EAAE,KAAK,iDAE3C;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACtC,KAAK,EAAE,KAAK,GACV,eAAe,GAAG,SAAS,CAE7B;AAED,eAAO,MAAM,2BAA2B;;;;CAcvC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,2BAA2B;;;;;;;CAwBvC,CAAC;AAEF;;;;;;;;;GASG;AACH,wBAAgB,0BAA0B,CACzC,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,MAAM;;;EAIV;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,UAEpE;AAqBD,eAAO,MAAM,WAAW;;;;;;;CAuCvB,CAAC;AAEF,eAAO,MAAM,cAAc;;;;CAQxB,CAAC;AAEJ,eAAO,MAAM,aAAa;;;;CAmFzB,CAAC"}

package/build-types/resolvers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolvers.d.ts","sourceRoot":"","sources":["../src/resolvers.js"],"names":[],"mappings":"AAkCO,kCAHI,MAAO,SAAS;;oBAYzB;AAKK;;oBAKL;AAYK,sCAPI,MAAM,QACN,MAAM,OACN,MAAM,GAAC,MAAM,qBACb,MAAO,SAAS;;;;;oBAyKzB;;IAIF,kEAcC;;AAED;;GAEG;AACH,0CAAuE;AAEvE;;GAEG;AACH,6CAA0E;AAUnE,uCALI,MAAM,QACN,MAAM,UACN,UAAO;;;;oBAoOhB;;IAEF,kEAOC;;AAED;;GAEG;AACH,kDAAgF;AAEhF;;GAEG;AACH,kDAAgF;AAKzE;;;oBAUL;AAEF;;GAEG;AACH,wCAAqE;AAO9D,qCAFI,MAAM;;oBAcf;AAYK,yCANI,MAAM,YAEN,MAAM,MAAO,MAEZ,MAAM,OAAA;;;;oBAqFhB;AAUK,8CAJI,MAAM,QACN,MAAM,YACN,MAAM,GAAC,MAAM;;oBAMtB;AAQK,uCAHI,MAAM,UACN,MAAM;;;oBAqBf;AAWK,sCAHI,MAAM,UACN,MAAM;;oBAMf;AAEK;;;oBAuBL;AAEK;;;oBAYL;AAEK;;;oBAYL;AAKK;;;oBA+BL;;IAEF,gDAOC;;AAEM;;oBAKL;AAEK;;oBAOL;AAEK;;;oBAwBL;AAEK;;;;oBA0CL;AAEK;;;;oBA8BL;;IAEF,gDAMC;;AAYM,mCAPI,MAAM,QACN,MAAM,aACN,MAAM,GAAC,MAAM,UACb,MAAO,SAAS;;;;oBAwGzB;;IAGF,sFAK8B;;AAavB,kCARI,MAAM,QACN,MAAM,aACN,MAAM,GAAC,MAAM,eACb,MAAM,GAAC,MAAM,SACb,MAAO,SAAS;;;oBA+CzB;AAOK,gDAFI,MAAM;;;oBA0Bf;AAOK,wCAFI,MAAM;;oBAuBf"}
+{"version":3,"file":"resolvers.d.ts","sourceRoot":"","sources":["../src/resolvers.js"],"names":[],"mappings":"AAkCO,kCAHI,MAAO,SAAS;;oBAYzB;AAKK;;oBAKL;AAYK,sCAPI,MAAM,QACN,MAAM,OACN,MAAM,GAAC,MAAM,qBACb,MAAO,SAAS;;;;;oBAyKzB;;IAIF,kEAcC;;AAED;;GAEG;AACH,0CAAuE;AAEvE;;GAEG;AACH,6CAA0E;AAUnE,uCALI,MAAM,QACN,MAAM,UACN,UAAO;;;;oBAoOhB;;IAEF,kEAOC;;AAED;;GAEG;AACH,kDAAgF;AAEhF;;GAEG;AACH,kDAAgF;AAKzE;;;oBAUL;AAEF;;GAEG;AACH,wCAAqE;AAO9D,qCAFI,MAAM;;oBAcf;AAYK,yCANI,MAAM,YAEN,MAAM,MAAO,MAEZ,MAAM,OAAA;;;;oBAqFhB;AAUK,8CAJI,MAAM,QACN,MAAM,YACN,MAAM,GAAC,MAAM;;oBAMtB;AAQK,uCAHI,MAAM,UACN,MAAM;;;oBAqBf;AAWK,sCAHI,MAAM,UACN,MAAM;;oBAMf;AAEK;;;oBAuBL;AAEK;;;oBAYL;AAEK;;;oBAYL;AAKK;;;oBA+BL;;IAEF,gDAOC;;AAEM;;oBAKL;AAEK;;oBAOL;AAEK;;;oBAwBL;AAEK;;;;oBA0CL;AAEK;;;;oBA0BL;;IAEF,gDAMC;;AAYM,mCAPI,MAAM,QACN,MAAM,aACN,MAAM,GAAC,MAAM,UACb,MAAO,SAAS;;;;oBAwGzB;;IAGF,sFAK8B;;AAavB,kCARI,MAAM,QACN,MAAM,aACN,MAAM,GAAC,MAAM,eACb,MAAM,GAAC,MAAM,SACb,MAAO,SAAS;;;oBA+CzB;AAOK,gDAFI,MAAM;;;oBA0Bf;AAOK,wCAFI,MAAM;;oBAuBf"}

package/build-types/sync.d.ts

@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { CRDT_RECORD_MAP_KEY, LOCAL_EDITOR_ORIGIN, LOCAL_SYNC_MANAGER_ORIGIN } from '@wordpress/sync';
+import { CRDT_RECORD_MAP_KEY, LOCAL_EDITOR_ORIGIN, LOCAL_SYNC_MANAGER_ORIGIN, type SyncManager } from '@wordpress/sync';
 export { CRDT_RECORD_MAP_KEY, LOCAL_EDITOR_ORIGIN, LOCAL_SYNC_MANAGER_ORIGIN };
-export declare const syncManager: import("@wordpress/sync").SyncManager;
+export declare function getSyncManager(): SyncManager | undefined;
 //# sourceMappingURL=sync.d.ts.map

package/build-types/sync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../src/sync.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EACN,mBAAmB,EACnB,mBAAmB,EACnB,yBAAyB,EAEzB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,CAAC;AAC/E,eAAO,MAAM,WAAW,uCAAsB,CAAC"}
+{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../src/sync.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EACN,mBAAmB,EACnB,mBAAmB,EACnB,yBAAyB,EACzB,KAAK,WAAW,EAEhB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,CAAC;AAI/E,wBAAgB,cAAc,IAAI,WAAW,GAAG,SAAS,CAQxD"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/core-data",
-	"version": "7.33.0",
+	"version": "7.33.1",
 	"description": "Access to and manipulation of core WordPress entities.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -40,22 +40,22 @@
 		"{src,build,build-module}/index.js"
 	],
 	"dependencies": {
-		"@wordpress/api-fetch": "^7.33.0",
-		"@wordpress/block-editor": "^15.6.0",
-		"@wordpress/blocks": "^15.6.0",
-		"@wordpress/compose": "^7.33.0",
-		"@wordpress/data": "^10.33.0",
-		"@wordpress/deprecated": "^4.33.0",
-		"@wordpress/element": "^6.33.0",
-		"@wordpress/html-entities": "^4.33.0",
-		"@wordpress/i18n": "^6.6.0",
-		"@wordpress/is-shallow-equal": "^5.33.0",
-		"@wordpress/private-apis": "^1.33.0",
-		"@wordpress/rich-text": "^7.33.0",
-		"@wordpress/sync": "^1.33.0",
-		"@wordpress/undo-manager": "^1.33.0",
-		"@wordpress/url": "^4.33.0",
-		"@wordpress/warning": "^3.33.0",
+		"@wordpress/api-fetch": "^7.33.1",
+		"@wordpress/block-editor": "^15.6.1",
+		"@wordpress/blocks": "^15.6.1",
+		"@wordpress/compose": "^7.33.1",
+		"@wordpress/data": "^10.33.1",
+		"@wordpress/deprecated": "^4.33.1",
+		"@wordpress/element": "^6.33.1",
+		"@wordpress/html-entities": "^4.33.1",
+		"@wordpress/i18n": "^6.6.1",
+		"@wordpress/is-shallow-equal": "^5.33.1",
+		"@wordpress/private-apis": "^1.33.1",
+		"@wordpress/rich-text": "^7.33.1",
+		"@wordpress/sync": "^1.33.1",
+		"@wordpress/undo-manager": "^1.33.1",
+		"@wordpress/url": "^4.33.1",
+		"@wordpress/warning": "^3.33.1",
 		"change-case": "^4.1.2",
 		"equivalent-key-map": "^0.2.2",
 		"fast-deep-equal": "^3.1.3",
@@ -69,5 +69,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "2bbe0d34ab65458468758c48826296d7a753428b"
+	"gitHead": "5f84bafdec1bed05247c1080c12f6a237951b862"
 }

package/src/actions.js

@@ -19,7 +19,7 @@ import { receiveItems, removeItems, receiveQueriedItems } from './queried-data';
 import { DEFAULT_ENTITY_KEY } from './entities';
 import { createBatch } from './batch';
 import { STORE_NAME } from './name';
-import { LOCAL_EDITOR_ORIGIN, syncManager } from './sync';
+import { LOCAL_EDITOR_ORIGIN, getSyncManager } from './sync';
 import logEntityDeprecation from './utils/log-entity-deprecation';
 
 /**
@@ -415,7 +415,7 @@ export const editEntityRecord =
 				const objectType = `${ kind }/${ name }`;
 				const objectId = recordId;
 
-				syncManager.update(
+				getSyncManager()?.update(
 					objectType,
 					objectId,
 					edit.edits,
@@ -525,8 +525,9 @@ export const saveEntityRecord =
 		if ( ! entityConfig ) {
 			return;
 		}
-		const entityIdKey = entityConfig.key || DEFAULT_ENTITY_KEY;
+		const entityIdKey = entityConfig.key ?? DEFAULT_ENTITY_KEY;
 		const recordId = record[ entityIdKey ];
+		const isNewRecord = !! entityIdKey && ! recordId;
 
 		const lock = await dispatch.__unstableAcquireStoreLock(
 			STORE_NAME,
@@ -580,11 +581,10 @@ export const saveEntityRecord =
 			}
 			try {
 				const path = `${ baseURL }${ recordId ? '/' + recordId : '' }`;
-				const persistedRecord = select.getRawEntityRecord(
-					kind,
-					name,
-					recordId
-				);
+				// Skip the raw values check when creating a new record; they don't exist yet.
+				const persistedRecord = ! isNewRecord
+					? select.getRawEntityRecord( kind, name, recordId )
+					: {};
 
 				if ( isAutosave ) {
 					// Most of this autosave logic is very specific to posts.

package/src/entities.js

@@ -36,6 +36,7 @@ export const rootEntitiesConfig = [
 	{
 		label: __( 'Base' ),
 		kind: 'root',
+		key: false,
 		name: '__unstableBase',
 		baseURL: '/',
 		baseURLParams: {
@@ -202,6 +203,13 @@ export const rootEntitiesConfig = [
 		plural: 'statuses',
 		key: 'slug',
 	},
+	{
+		label: __( 'Registered Templates' ),
+		name: 'registeredTemplate',
+		kind: 'root',
+		baseURL: '/wp/v2/registered-templates',
+		key: 'id',
+	},
 ];
 
 export const deprecatedEntities = {
@@ -272,41 +280,7 @@ async function loadPostTypeEntities() {
 		);
 		const namespace = postType?.rest_namespace ?? 'wp/v2';
 
-		/**
-		 * @type {import('@wordpress/sync').SyncConfig}
-		 */
-		const syncConfig = {
-			/**
-			 * Apply changes from the local editor to the local CRDT document so
-			 * that those changes can be synced to other peers (via the provider).
-			 *
-			 * @param {import('@wordpress/sync').CRDTDoc}               crdtDoc
-			 * @param {Partial< import('@wordpress/sync').ObjectData >} changes
-			 * @return {void}
-			 */
-			applyChangesToCRDTDoc: ( crdtDoc, changes ) =>
-				applyPostChangesToCRDTDoc( crdtDoc, changes, postType ),
-
-			/**
-			 * Extract changes from a CRDT document that can be used to update the
-			 * local editor state.
-			 *
-			 * @param {import('@wordpress/sync').CRDTDoc}    crdtDoc
-			 * @param {import('@wordpress/sync').ObjectData} editedRecord
-			 * @return {Partial< import('@wordpress/sync').ObjectData >} Changes to record
-			 */
-			getChangesFromCRDTDoc: ( crdtDoc, editedRecord ) =>
-				getPostChangesFromCRDTDoc( crdtDoc, editedRecord, postType ),
-
-			/**
-			 * Sync features supported by the entity.
-			 *
-			 * @type {Record< string, boolean >}
-			 */
-			supports: {},
-		};
-
-		return {
+		const entity = {
 			kind: 'postType',
 			baseURL: `/${ namespace }/${ postType.rest_base }`,
 			baseURLParams: { context: 'edit' },
@@ -326,7 +300,6 @@ async function loadPostTypeEntities() {
 					: String( record.id ) ),
 			__unstablePrePersist: isTemplate ? undefined : prePersistPostType,
 			__unstable_rest_base: postType.rest_base,
-			syncConfig,
 			supportsPagination: true,
 			getRevisionsUrl: ( parentId, revisionId ) =>
 				`/${ namespace }/${
@@ -336,6 +309,50 @@ async function loadPostTypeEntities() {
 				}`,
 			revisionKey: DEFAULT_ENTITY_KEY,
 		};
+
+		if ( window.__experimentalEnableSync ) {
+			if ( globalThis.IS_GUTENBERG_PLUGIN ) {
+				/**
+				 * @type {import('@wordpress/sync').SyncConfig}
+				 */
+				entity.syncConfig = {
+					/**
+					 * Apply changes from the local editor to the local CRDT document so
+					 * that those changes can be synced to other peers (via the provider).
+					 *
+					 * @param {import('@wordpress/sync').CRDTDoc}               crdtDoc
+					 * @param {Partial< import('@wordpress/sync').ObjectData >} changes
+					 * @return {void}
+					 */
+					applyChangesToCRDTDoc: ( crdtDoc, changes ) =>
+						applyPostChangesToCRDTDoc( crdtDoc, changes, postType ),
+
+					/**
+					 * Extract changes from a CRDT document that can be used to update the
+					 * local editor state.
+					 *
+					 * @param {import('@wordpress/sync').CRDTDoc}    crdtDoc
+					 * @param {import('@wordpress/sync').ObjectData} editedRecord
+					 * @return {Partial< import('@wordpress/sync').ObjectData >} Changes to record
+					 */
+					getChangesFromCRDTDoc: ( crdtDoc, editedRecord ) =>
+						getPostChangesFromCRDTDoc(
+							crdtDoc,
+							editedRecord,
+							postType
+						),
+
+					/**
+					 * Sync features supported by the entity.
+					 *
+					 * @type {Record< string, boolean >}
+					 */
+					supports: {},
+				};
+			}
+		}
+
+		return entity;
 	} );
 }
 
@@ -372,14 +389,23 @@ async function loadSiteEntity() {
 		label: __( 'Site' ),
 		name: 'site',
 		kind: 'root',
+		key: false,
 		baseURL: '/wp/v2/settings',
-		syncConfig: {
-			applyChangesToCRDTDoc: defaultApplyChangesToCRDTDoc,
-			getChangesFromCRDTDoc: defaultGetChangesFromCRDTDoc,
-		},
 		meta: {},
 	};
 
+	if ( window.__experimentalEnableSync ) {
+		if ( globalThis.IS_GUTENBERG_PLUGIN ) {
+			/**
+			 * @type {import('@wordpress/sync').SyncConfig}
+			 */
+			entity.syncConfig = {
+				applyChangesToCRDTDoc: defaultApplyChangesToCRDTDoc,
+				getChangesFromCRDTDoc: defaultGetChangesFromCRDTDoc,
+			};
+		}
+	}
+
 	const site = await apiFetch( {
 		path: entity.baseURL,
 		method: 'OPTIONS',

package/src/private-selectors.ts

@@ -240,38 +240,13 @@ export const getTemplateId = createRegistrySelector(
 		// First see if the post/page has an assigned template and fetch it.
 		const currentTemplateSlug = editedEntity.template;
 		if ( currentTemplateSlug ) {
-			const userTemplates = select( STORE_NAME ).getEntityRecords(
-				'postType',
-				'wp_template',
-				{ per_page: -1 }
-			);
-			if ( ! userTemplates ) {
-				return;
-			}
-			const userTemplateWithSlug = userTemplates.find(
-				( { slug } ) => slug === currentTemplateSlug
-			);
-
-			if ( userTemplateWithSlug ) {
-				return userTemplateWithSlug.id;
-			}
-
-			const registeredTemplates = select( STORE_NAME ).getEntityRecords(
-				'postType',
-				'wp_registered_template',
-				{ per_page: -1 }
-			);
-
-			if ( ! registeredTemplates ) {
-				return;
-			}
-
-			const registeredTemplateWithSlug = registeredTemplates.find(
-				( { slug } ) => slug === currentTemplateSlug
-			);
-
-			if ( registeredTemplateWithSlug ) {
-				return registeredTemplateWithSlug.id;
+			const currentTemplate = select( STORE_NAME )
+				.getEntityRecords( 'postType', 'wp_template', {
+					per_page: -1,
+				} )
+				?.find( ( { slug } ) => slug === currentTemplateSlug );
+			if ( currentTemplate ) {
+				return currentTemplate.id;
 			}
 		}
 		// If no template is assigned, use the default template.

package/src/resolvers.js

@@ -15,7 +15,7 @@ import apiFetch from '@wordpress/api-fetch';
  */
 import { STORE_NAME } from './name';
 import { additionalEntityConfigLoaders, DEFAULT_ENTITY_KEY } from './entities';
-import { syncManager } from './sync';
+import { getSyncManager } from './sync';
 import {
 	forwardResolver,
 	getNormalizedCommaSeparable,
@@ -185,7 +185,7 @@ export const getEntityRecord =
 						} );
 
 					// Load the entity record for syncing.
-					await syncManager.load(
+					await getSyncManager()?.load(
 						entityConfig.syncConfig,
 						objectType,
 						objectId,
@@ -329,7 +329,7 @@ export const getEntityRecords =
 			// the registered templates and rewrites IDs in the form of
 			// `theme-slug/template-slug`. When turned off, we only fetch
 			// database templates (posts). To fetch registered templates without
-			// edits applied, use the `wp_registered_template` entity.
+			// edits applied, use the `registeredTemplate` entity.
 			const { combinedTemplates = true } = query;
 
 			if (
@@ -899,10 +899,6 @@ export const getDefaultTemplateId =
 		// Endpoint may return an empty object if no template is found.
 		if ( id ) {
 			template.id = id;
-			template.type =
-				typeof id === 'string'
-					? 'wp_registered_template'
-					: 'wp_template';
 			registry.batch( () => {
 				dispatch.receiveDefaultTemplateId( query, id );
 				dispatch.receiveEntityRecords( 'postType', template.type, [

package/src/sync.ts

@@ -5,8 +5,20 @@ import {
 	CRDT_RECORD_MAP_KEY,
 	LOCAL_EDITOR_ORIGIN,
 	LOCAL_SYNC_MANAGER_ORIGIN,
+	type SyncManager,
 	createSyncManager,
 } from '@wordpress/sync';
 
 export { CRDT_RECORD_MAP_KEY, LOCAL_EDITOR_ORIGIN, LOCAL_SYNC_MANAGER_ORIGIN };
-export const syncManager = createSyncManager();
+
+let syncManager: SyncManager;
+
+export function getSyncManager(): SyncManager | undefined {
+	if ( syncManager ) {
+		return syncManager;
+	}
+
+	syncManager = createSyncManager();
+
+	return syncManager;
+}

package/src/test/resolvers.js

@@ -6,13 +6,11 @@ import triggerFetch from '@wordpress/api-fetch';
 /**
  * Internal dependencies
  */
-import { syncManager } from '../sync';
+import { getSyncManager } from '../sync';
 
 jest.mock( '@wordpress/api-fetch' );
 jest.mock( '../sync', () => ( {
-	syncManager: {
-		load: jest.fn(),
-	},
+	getSyncManager: jest.fn(),
 } ) );
 
 /**
@@ -42,6 +40,8 @@ describe( 'getEntityRecord', () => {
 	const resolveSelect = { getEntitiesConfig: jest.fn( () => ENTITIES ) };
 
 	let dispatch;
+	let syncManager;
+
 	beforeEach( async () => {
 		dispatch = Object.assign( jest.fn(), {
 			receiveEntityRecords: jest.fn(),
@@ -51,7 +51,11 @@ describe( 'getEntityRecord', () => {
 			finishResolutions: jest.fn(),
 		} );
 		triggerFetch.mockReset();
-		syncManager.load.mockClear();
+
+		syncManager = {
+			load: jest.fn(),
+		};
+		getSyncManager.mockImplementation( () => syncManager );
 	} );
 
 	afterEach( () => {