Move shouldExcludeFromSync to its own module and use path.basename

Author: ivan-ottinger

apps/cli/lib/sync-file-tree.ts

@@ -2,7 +2,8 @@ import fs from 'fs';
 import nodePath from 'path';
 import { createDeployIgnoreFilter } from '@studio/common/lib/deploy-ignore';
 import { SYNC_IGNORE_DEFAULTS } from '@studio/common/lib/sync/constants';
-import { shouldExcludeFromSync, shouldLimitDepth } from '@studio/common/lib/sync/tree-utils';
+import { shouldExcludeFromSync } from '@studio/common/lib/sync/exclude-from-sync';
+import { shouldLimitDepth } from '@studio/common/lib/sync/tree-utils';
 import type { RawDirectoryEntry } from '@studio/common/types/sync-tree';
 import type { Ignore } from 'ignore';
 

apps/studio/src/ipc-handlers.ts

@@ -57,7 +57,8 @@ import {
 	updateSharedConfig,
 } from '@studio/common/lib/shared-config';
 import { SYNC_IGNORE_DEFAULTS } from '@studio/common/lib/sync/constants';
-import { shouldExcludeFromSync, shouldLimitDepth } from '@studio/common/lib/sync/tree-utils';
+import { shouldExcludeFromSync } from '@studio/common/lib/sync/exclude-from-sync';
+import { shouldLimitDepth } from '@studio/common/lib/sync/tree-utils';
 import { isWordPressDevVersion } from '@studio/common/lib/wordpress-version-utils';
 import { __, sprintf, LocaleData, defaultI18n } from '@wordpress/i18n';
 import {

tools/common/lib/sync/exclude-from-sync.ts

@@ -0,0 +1,14 @@
+import path from 'path';
+import type { Ignore } from 'ignore';
+
+export const shouldExcludeFromSync = ( relativePath: string, deployIgnore: Ignore ): boolean => {
+	const itemName = path.basename( relativePath );
+	// Hide dotfiles from the sync tree UI. The remote import drops root
+	// dotfiles on its own, so this keeps the tree aligned with what ends
+	// up on the remote. The tree does not render deeper than plugin and
+	// theme directories, so nested dotfiles aren't a concern here.
+	if ( itemName.startsWith( '.' ) ) {
+		return true;
+	}
+	return deployIgnore.ignores( relativePath );
+};

tools/common/lib/sync/tree-utils.ts

@@ -1,17 +1,4 @@
 import type { SyncOption } from '@studio/common/types/sync';
-import type { Ignore } from 'ignore';
-
-export const shouldExcludeFromSync = ( relativePath: string, deployIgnore: Ignore ): boolean => {
-	const itemName = relativePath.split( '/' ).pop() || '';
-	// Hide dotfiles from the sync tree UI. The remote import drops root
-	// dotfiles on its own, so this keeps the tree aligned with what ends
-	// up on the remote. The tree does not render deeper than plugin and
-	// theme directories, so nested dotfiles aren't a concern here.
-	if ( itemName.startsWith( '.' ) ) {
-		return true;
-	}
-	return deployIgnore.ignores( relativePath );
-};
 
 export const shouldLimitDepth = ( relativePath: string ): boolean => {
 	const normalizedPath = relativePath.replace( /^wp-content\//, '' );