Commit e4fa97dac35 for woocommerce

commit e4fa97dac35af26909c71a7fac4a221ccaf7ebbd
Author: Manzoor Wani <manzoorwani.jk@gmail.com>
Date:   Thu Jul 2 21:57:17 2026 +0530

    Replace @woocommerce/dependency-group rule with import/order (#66086)

    * build(eslint-plugin): replace dependency-group rule with import/order

    Remove the @woocommerce/dependency-group rule (rule, test, docs, and
    export) and enforce import grouping via import/order in the recommended
    config instead. The plugin is now config-only. The /* External/Internal
    dependencies */ comment-block convention is no longer enforced.

    Part of #66078.

    * Remove obsolete dependency-group eslint-disable directives

    Following the switch to import/order, the @woocommerce/dependency-group
    disable comments are no longer meaningful. Remove the ones that only
    suppressed the old comment-block check; convert the three that suppress
    genuine intentional ordering to import/order disables. Update the
    email-editor docs example accordingly.

    In the two metrics specs whose combined directive is edited here, also
    drop the stale jest/no-test-callback token (the rule was renamed to
    jest/no-done-callback years ago, so the reference resolved to an unknown
    rule once the file entered the branch lint).

    Part of #66078.

    * Restore jest/no-test-callback suppression in metrics specs

    A prior commit dropped the jest/no-test-callback token from these specs'
    eslint-disable directives, mistaking it for a renamed/dead rule (local
    node_modules resolve a newer eslint-plugin-jest where it is
    no-done-callback). CI's pinned version still defines jest/no-test-callback,
    and these tests legitimately use test callbacks, so removing the
    suppression surfaced real errors. Keep only the dead
    @woocommerce/dependency-group token removed; restore the rest.

    Part of #66078.

    * Make internal-only changelog entries comment-only

    The dependency-group eslint-disable cleanup in email-editor,
    experimental-products-app, plugin-woocommerce, and beta-tester is
    internal-only and not something users of those packages care about, so
    record it as a changelogger Comment (no user-facing changelog line). The
    @woocommerce/eslint-plugin entry stays a user-facing major, since the
    rule removal affects that package's consumers.

    Part of #66078.

diff --git a/packages/js/email-editor/changelog/wooplug-6930-adopt-import-order b/packages/js/email-editor/changelog/wooplug-6930-adopt-import-order
new file mode 100644
index 00000000000..6a2c44e8ef9
--- /dev/null
+++ b/packages/js/email-editor/changelog/wooplug-6930-adopt-import-order
@@ -0,0 +1,3 @@
+Significance: patch
+Type: dev
+Comment: Remove obsolete @woocommerce/dependency-group eslint-disable directives following the switch to import/order in @woocommerce/eslint-plugin.
diff --git a/packages/js/email-editor/development.md b/packages/js/email-editor/development.md
index 53b79ba0e92..5bbc18e450b 100644
--- a/packages/js/email-editor/development.md
+++ b/packages/js/email-editor/development.md
@@ -93,7 +93,7 @@ jest.mock('@wordpress/data', () => ({
 #### Example Basic Component Test

 ```tsx
-/* eslint-disable @woocommerce/dependency-group -- because we import mocks first, we deactivate this rule to avoid es lint errors */
+// Mocks must be imported before the modules that use them.
 import '../../__mocks__/setup-shared-mocks';

 /**
diff --git a/packages/js/email-editor/src/components/block-editor/editor.tsx b/packages/js/email-editor/src/components/block-editor/editor.tsx
index 7a7bc70e4b5..fbe3b28fbcf 100644
--- a/packages/js/email-editor/src/components/block-editor/editor.tsx
+++ b/packages/js/email-editor/src/components/block-editor/editor.tsx
@@ -7,7 +7,6 @@ import { SlotFillProvider, ProgressBar } from '@wordpress/components';
 import { store as coreStore, Post } from '@wordpress/core-data';
 import { CommandMenu, store as commandsStore } from '@wordpress/commands';
 import { PluginArea } from '@wordpress/plugins';
-// eslint-disable-next-line @woocommerce/dependency-group
 import {
 	AutosaveMonitor as _AutosaveMonitor,
 	LocalAutosaveMonitor,
diff --git a/packages/js/email-editor/src/components/header/test/back-button-content.spec.tsx b/packages/js/email-editor/src/components/header/test/back-button-content.spec.tsx
index 53dbaa76992..e9e29046448 100644
--- a/packages/js/email-editor/src/components/header/test/back-button-content.spec.tsx
+++ b/packages/js/email-editor/src/components/header/test/back-button-content.spec.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @woocommerce/dependency-group -- because we import mocks first, we deactivate this rule to avoid ESLint errors */
 import '../../test/__mocks__/setup-shared-mocks';

 /**
diff --git a/packages/js/email-editor/src/components/header/test/send-button.spec.tsx b/packages/js/email-editor/src/components/header/test/send-button.spec.tsx
index 9ebb04b1120..0358b66de9d 100644
--- a/packages/js/email-editor/src/components/header/test/send-button.spec.tsx
+++ b/packages/js/email-editor/src/components/header/test/send-button.spec.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @woocommerce/dependency-group -- because we import mocks first, we deactivate this rule to avoid ESLint errors */
 import '../../test/__mocks__/setup-shared-mocks';

 /**
diff --git a/packages/js/email-editor/src/components/personalization-tags/test/category-menu.spec.tsx b/packages/js/email-editor/src/components/personalization-tags/test/category-menu.spec.tsx
index fd02a6ee1af..16aaf932886 100644
--- a/packages/js/email-editor/src/components/personalization-tags/test/category-menu.spec.tsx
+++ b/packages/js/email-editor/src/components/personalization-tags/test/category-menu.spec.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @woocommerce/dependency-group -- because we import mocks first, we deactivate this rule to avoid ESLint errors */
 import '../../test/__mocks__/setup-shared-mocks';

 /**
diff --git a/packages/js/email-editor/src/components/personalization-tags/test/category-section.spec.tsx b/packages/js/email-editor/src/components/personalization-tags/test/category-section.spec.tsx
index 8ed107ef255..2510f288e52 100644
--- a/packages/js/email-editor/src/components/personalization-tags/test/category-section.spec.tsx
+++ b/packages/js/email-editor/src/components/personalization-tags/test/category-section.spec.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @woocommerce/dependency-group -- because we import mocks first, we deactivate this rule to avoid ESLint errors */
 import '../../test/__mocks__/setup-shared-mocks';

 /**
diff --git a/packages/js/email-editor/src/components/preview/send-preview.tsx b/packages/js/email-editor/src/components/preview/send-preview.tsx
index df036e6f74a..294e8daa646 100644
--- a/packages/js/email-editor/src/components/preview/send-preview.tsx
+++ b/packages/js/email-editor/src/components/preview/send-preview.tsx
@@ -4,7 +4,6 @@
 import { useDispatch } from '@wordpress/data';
 import { __ } from '@wordpress/i18n';
 import { external } from '@wordpress/icons';
-// eslint-disable-next-line @woocommerce/dependency-group
 import { PluginPreviewMenuItem } from '@wordpress/editor';

 /**
diff --git a/packages/js/email-editor/src/components/preview/test/send-preview-email.spec.tsx b/packages/js/email-editor/src/components/preview/test/send-preview-email.spec.tsx
index 50bc22f17f3..9ae7fe64004 100644
--- a/packages/js/email-editor/src/components/preview/test/send-preview-email.spec.tsx
+++ b/packages/js/email-editor/src/components/preview/test/send-preview-email.spec.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @woocommerce/dependency-group -- because we import mocks first, we deactivate this rule to avoid ESLint errors */
 import '../../test/__mocks__/setup-shared-mocks';

 /**
diff --git a/packages/js/email-editor/src/components/sidebar/settings-panel.tsx b/packages/js/email-editor/src/components/sidebar/settings-panel.tsx
index d36e3d4f182..d317eed3ac0 100644
--- a/packages/js/email-editor/src/components/sidebar/settings-panel.tsx
+++ b/packages/js/email-editor/src/components/sidebar/settings-panel.tsx
@@ -5,7 +5,6 @@ import { __ } from '@wordpress/i18n';
 import { applyFilters } from '@wordpress/hooks';
 import { useMemo } from '@wordpress/element';
 import { createSlotFill } from '@wordpress/components';
-// eslint-disable-next-line @woocommerce/dependency-group
 import { ErrorBoundary, PluginDocumentSettingPanel } from '@wordpress/editor';

 /**
diff --git a/packages/js/email-editor/src/components/sidebar/template-settings-panel.tsx b/packages/js/email-editor/src/components/sidebar/template-settings-panel.tsx
index 59b9e7832b0..54314da17b9 100644
--- a/packages/js/email-editor/src/components/sidebar/template-settings-panel.tsx
+++ b/packages/js/email-editor/src/components/sidebar/template-settings-panel.tsx
@@ -3,7 +3,6 @@
  */
 import { __ } from '@wordpress/i18n';
 import { applyFilters } from '@wordpress/hooks';
-// eslint-disable-next-line @woocommerce/dependency-group
 import { PluginDocumentSettingPanel, ErrorBoundary } from '@wordpress/editor';

 /**
diff --git a/packages/js/email-editor/src/components/styles-sidebar/styles-sidebar.tsx b/packages/js/email-editor/src/components/styles-sidebar/styles-sidebar.tsx
index 7dd5abec74b..eb78e7db460 100644
--- a/packages/js/email-editor/src/components/styles-sidebar/styles-sidebar.tsx
+++ b/packages/js/email-editor/src/components/styles-sidebar/styles-sidebar.tsx
@@ -5,7 +5,6 @@ import { memo } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 import { useSelect } from '@wordpress/data';
 import { styles } from '@wordpress/icons';
-// eslint-disable-next-line @woocommerce/dependency-group
 import { PluginSidebar, PluginSidebarMoreMenuItem } from '@wordpress/editor';

 /**
diff --git a/packages/js/email-editor/src/components/template-canvas-affordance/test/template-canvas-affordance.spec.tsx b/packages/js/email-editor/src/components/template-canvas-affordance/test/template-canvas-affordance.spec.tsx
index 785e3506062..ea35d8b694b 100644
--- a/packages/js/email-editor/src/components/template-canvas-affordance/test/template-canvas-affordance.spec.tsx
+++ b/packages/js/email-editor/src/components/template-canvas-affordance/test/template-canvas-affordance.spec.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @woocommerce/dependency-group -- because we import mocks first, we deactivate this rule to avoid ESLint errors */
 import '../../test/__mocks__/setup-shared-mocks';

 /**
diff --git a/packages/js/email-editor/src/hooks/test/use-notice-overrides.spec.ts b/packages/js/email-editor/src/hooks/test/use-notice-overrides.spec.ts
index c80901b29c5..8a9f1efe561 100644
--- a/packages/js/email-editor/src/hooks/test/use-notice-overrides.spec.ts
+++ b/packages/js/email-editor/src/hooks/test/use-notice-overrides.spec.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @woocommerce/dependency-group -- mocks must be imported first */
 /**
  * External dependencies
  */
diff --git a/packages/js/email-editor/src/private-apis/index.ts b/packages/js/email-editor/src/private-apis/index.ts
index c80dd200be3..5ba12070e36 100644
--- a/packages/js/email-editor/src/private-apis/index.ts
+++ b/packages/js/email-editor/src/private-apis/index.ts
@@ -7,7 +7,6 @@ import {
 	privateApis as editorPrivateApis,
 	store as editorStore,
 } from '@wordpress/editor';
-// eslint-disable-next-line @woocommerce/dependency-group
 import {
 	// @ts-expect-error privateApis is not in the DT types for @wordpress/block-editor.
 	privateApis as blockEditorPrivateApis,
diff --git a/packages/js/eslint-plugin/README.md b/packages/js/eslint-plugin/README.md
index 08e7f0cf3ab..bd49ea7823c 100644
--- a/packages/js/eslint-plugin/README.md
+++ b/packages/js/eslint-plugin/README.md
@@ -39,9 +39,3 @@ If you want to use prettier in your code editor, you'll need to create a `.prett
 ```js
 module.exports = require("@wordpress/prettier-config");
 ```
-
-### Rules
-
-| Rule                                                                       | Description                               | Recommended |
-| -------------------------------------------------------------------------- | ----------------------------------------- | ----------- |
-| [dependency-group](/packages/js/eslint-plugin/docs/rules/dependency-group.md) | Enforce dependencies docblocks formatting | ✓           |
diff --git a/packages/js/eslint-plugin/changelog/wooplug-6930-adopt-import-order b/packages/js/eslint-plugin/changelog/wooplug-6930-adopt-import-order
new file mode 100644
index 00000000000..770f78e0bca
--- /dev/null
+++ b/packages/js/eslint-plugin/changelog/wooplug-6930-adopt-import-order
@@ -0,0 +1,4 @@
+Significance: major
+Type: update
+
+Replace the `@woocommerce/dependency-group` rule with `import/order`. The custom rule is removed (rule, test, docs, and export); the recommended config now enforces import grouping via `import/order` and no longer requires the `/* External/Internal dependencies */` comment blocks.
diff --git a/packages/js/eslint-plugin/configs/custom.js b/packages/js/eslint-plugin/configs/custom.js
index 968f33b69de..8c2e83adfaf 100644
--- a/packages/js/eslint-plugin/configs/custom.js
+++ b/packages/js/eslint-plugin/configs/custom.js
@@ -1,7 +1,18 @@
 module.exports = {
-	plugins: [ '@wordpress', '@woocommerce' ],
+	plugins: [ '@wordpress' ],
 	rules: {
-		'@woocommerce/dependency-group': 'error',
+		// Group external imports before internal ones (`~/…` and relative).
+		'import/order': [
+			'error',
+			{
+				groups: [
+					[ 'builtin', 'external', 'internal' ],
+					[ 'parent', 'sibling', 'index' ],
+				],
+				pathGroups: [ { pattern: '~/**', group: 'parent' } ],
+				pathGroupsExcludedImportTypes: [ 'builtin' ],
+			},
+		],
 	},
 	settings: {
 		jsdoc: {
diff --git a/packages/js/eslint-plugin/docs/rules/dependency-group.md b/packages/js/eslint-plugin/docs/rules/dependency-group.md
deleted file mode 100644
index 2a3dcc4fa47..00000000000
--- a/packages/js/eslint-plugin/docs/rules/dependency-group.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# Enforce dependencies docblocks formatting (dependency-group)
-
-Ensures that all top-level package imports adhere to dependencies grouping conventions.
-
-Specifically, this ensures that:
-
-- An import is preceded by "External dependencies" or "Internal dependencies" as appropriate by the import source.
-
-## Rule details
-
-Examples of **incorrect** code for this rule:
-
-```js
-import { get } from 'lodash';
-import { Component } from '@wordpress/element';
-import edit from './edit';
-```
-
-Examples of **correct** code for this rule:
-
-```js
-/*
- * External dependencies
- */
-import { get } from 'lodash';
-import { Component } from '@wordpress/element';
-
-/*
- * Internal dependencies
- */
-import edit from './edit';
-```
diff --git a/packages/js/eslint-plugin/index.js b/packages/js/eslint-plugin/index.js
index 86840ad7432..0b9ae349ca6 100644
--- a/packages/js/eslint-plugin/index.js
+++ b/packages/js/eslint-plugin/index.js
@@ -2,7 +2,4 @@ module.exports = {
 	configs: {
 		recommended: require( './configs/recommended' ),
 	},
-	rules: {
-		'dependency-group': require( './rules/dependency-group' ),
-	},
 };
diff --git a/packages/js/eslint-plugin/package.json b/packages/js/eslint-plugin/package.json
index 35b10d6d2fd..69504c0d655 100644
--- a/packages/js/eslint-plugin/package.json
+++ b/packages/js/eslint-plugin/package.json
@@ -24,7 +24,6 @@
 	},
 	"files": [
 		"configs",
-		"rules",
 		"index.js"
 	],
 	"main": "index.js",
@@ -44,8 +43,8 @@
 		"update:php": "XDEBUG_MODE=off composer update --quiet",
 		"lint": "pnpm --if-present '/^lint:lang:.*$/'",
 		"lint:fix": "pnpm --if-present '/^lint:fix:lang:.*$/'",
-		"lint:fix:lang:js": "eslint ./rules ./configs --fix",
-		"lint:lang:js": "eslint ./rules ./configs"
+		"lint:fix:lang:js": "eslint ./configs ./index.js --fix",
+		"lint:lang:js": "eslint ./configs ./index.js"
 	},
 	"devDependencies": {
 		"@babel/core": "7.25.7",
@@ -66,8 +65,8 @@
 			"lint": {
 				"command": "lint",
 				"changes": [
-					"rules/**/*.js",
-					"configs/**/*.js"
+					"configs/**/*.js",
+					"index.js"
 				]
 			}
 		}
diff --git a/packages/js/eslint-plugin/rules/__tests__/dependency-group.js b/packages/js/eslint-plugin/rules/__tests__/dependency-group.js
deleted file mode 100644
index 56e88245154..00000000000
--- a/packages/js/eslint-plugin/rules/__tests__/dependency-group.js
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * External dependencies
- */
-import { RuleTester } from 'eslint';
-
-/**
- * Internal dependencies
- */
-import rule from '../dependency-group';
-
-const ruleTester = new RuleTester( {
-	parserOptions: {
-		sourceType: 'module',
-		ecmaVersion: 6,
-	},
-} );
-
-ruleTester.run( 'dependency-group', rule, {
-	valid: [
-		{
-			code: `
-/**
- * External dependencies
- */
-import { get } from 'lodash';
-import classnames from 'classnames';
-import { Component } from '@wordpress/element';
-import { SearchListControl } from '@woocommerce/components';
-import { withProductVariations } from '@woocommerce/block-hocs';
-/**
- * Internal dependencies
- */
-import edit from './edit';
-import './style.scss';`,
-		},
-	],
-	invalid: [
-		{
-			code: `
-/**
- * External dependencies
- */
-import { get } from 'lodash';
-import './style.scss';
-import { withProductVariations } from '@woocommerce/block-hocs';
-/**
- * Internal dependencies
- */
-import edit from './edit';
-import classnames from 'classnames';
-import { Component } from '@wordpress/element';
-import { SearchListControl } from '@woocommerce/components';`,
-			errors: [
-				{
-					message:
-						'Expected preceding "Internal dependencies" comment block',
-				},
-				{
-					message:
-						'Expected "External dependencies" to be defined before Internal',
-				},
-				{
-					message:
-						'Expected "External dependencies" to be defined before Internal',
-				},
-				{
-					message:
-						'Expected preceding "External dependencies" comment block',
-				},
-				{
-					message:
-						'Expected preceding "External dependencies" comment block',
-				},
-				{
-					message:
-						'Expected preceding "External dependencies" comment block',
-				},
-			],
-		},
-	],
-} );
diff --git a/packages/js/eslint-plugin/rules/dependency-group.js b/packages/js/eslint-plugin/rules/dependency-group.js
deleted file mode 100644
index 8777cf54dad..00000000000
--- a/packages/js/eslint-plugin/rules/dependency-group.js
+++ /dev/null
@@ -1,207 +0,0 @@
-module.exports = {
-	meta: {
-		type: 'layout',
-		schema: [],
-	},
-	create( context ) {
-		const comments = context.getSourceCode().getAllComments();
-
-		/**
-		 * Locality classification of an import, "External" or "Internal".
-		 *
-		 * @typedef {string} WCPackageLocality
-		 */
-
-		/**
-		 * Given a desired locality, generates the expected comment node value
-		 * property.
-		 *
-		 * @param {WCPackageLocality} locality Desired package locality.
-		 *
-		 * @return {string} Expected comment node value.
-		 */
-		function getCommentValue( locality ) {
-			return `*\n * ${ locality } dependencies\n `;
-		}
-
-		/**
-		 * Given an import source string, returns the locality classification
-		 * of the import sort.
-		 *
-		 * @param {string} source Import source string.
-		 *
-		 * @return {WCPackageLocality} Package locality.
-		 */
-		function getPackageLocality( source ) {
-			if ( source.startsWith( '.' ) || source.startsWith( '~/' ) ) {
-				return 'Internal';
-			}
-			return 'External';
-		}
-
-		/**
-		 * Returns true if the given comment node satisfies a desired locality,
-		 * or false otherwise.
-		 *
-		 * @param {espree.Node}       node     Comment node to check.
-		 * @param {WCPackageLocality} locality Desired package locality.
-		 *
-		 * @return {boolean} Whether comment node satisfies locality.
-		 */
-		function isLocalityDependencyBlock( node, locality ) {
-			const { type, value } = node;
-			if ( type !== 'Block' ) {
-				return false;
-			}
-
-			// Tolerances:
-			// - Normalize `/**` and `/*`
-			// - Case insensitive "Dependencies" vs. "dependencies"
-			// - Ending period
-			// - "Node" dependencies as an alias for External
-
-			if ( locality === 'External' ) {
-				locality = '(External|Node)';
-			}
-
-			const pattern = new RegExp(
-				`^\\*?\\n \\* ${ locality } dependencies\\.?\\n $`,
-				'i'
-			);
-			return pattern.test( value );
-		}
-
-		/**
-		 * Returns true if the given node occurs prior in code to a reference,
-		 * or false otherwise.
-		 *
-		 * @param {espree.Node} node      Node to test being before reference.
-		 * @param {espree.Node} reference Node against which to compare.
-		 *
-		 * @return {boolean} Whether node occurs before reference.
-		 */
-		function isBefore( node, reference ) {
-			if ( ! node.range || ! reference.range ) {
-				return false;
-			}
-			return node.range[ 0 ] < reference.range[ 0 ];
-		}
-
-		/**
-		 * Tests source comments to determine whether a comment exists which
-		 * satisfies the desired locality. If a match is found and requires no
-		 * updates, the function returns false. Otherwise, it will return true.
-		 *
-		 * @param {espree.Node}       node     Node to test.
-		 * @param {WCPackageLocality} locality Desired package locality.
-		 *
-		 * @return {boolean} Whether the node is in the correct locality.
-		 */
-		function isNodeInLocality( node, locality ) {
-			const value = getCommentValue( locality );
-
-			let comment;
-			let nextComment;
-			for ( let i = 0; i < comments.length; i++ ) {
-				comment = comments[ i ];
-				nextComment =
-					i < comments.length - 1 ? comments[ i + 1 ] : null;
-
-				if ( nextComment && isBefore( nextComment, node ) ) {
-					// If it's not the immediately previous comment, continue.
-					continue;
-				}
-
-				if ( ! isBefore( comment, node ) ) {
-					// Exhausted options.
-					break;
-				}
-
-				if ( ! isLocalityDependencyBlock( comment, locality ) ) {
-					// Not usable (either not an block comment, or not one
-					// matching a tolerable pattern).
-					continue;
-				}
-
-				if ( comment.value === value ) {
-					// No change needed. (OK)
-					return true;
-				}
-
-				// Found a comment needing correction.
-				return false;
-			}
-
-			return false;
-		}
-
-		/**
-		 * Tests if the locality is defined in the correct order (External, WooCommerce, Internal).
-		 *
-		 * @param {espree.Node}       child            Node to test.
-		 * @param {WCPackageLocality} locality         Package locality.
-		 * @param {WCPackageLocality} previousLocality Previous package locality.
-		 */
-		function checkLocalityOrder( child, locality, previousLocality ) {
-			switch ( locality ) {
-				case 'External':
-					if ( previousLocality === 'Internal' ) {
-						context.report( {
-							node: child,
-							message: `Expected "External dependencies" to be defined before ${ previousLocality }`,
-						} );
-					}
-					break;
-			}
-		}
-
-		return {
-			Program( node ) {
-				let previousLocality = null;
-
-				// Since we only care to enforce imports which occur at the
-				// top-level scope, match on Program and test its children,
-				// rather than matching the import nodes directly.
-				node.body.forEach( ( child ) => {
-					let source;
-					switch ( child.type ) {
-						case 'ImportDeclaration':
-							source = child.source.value;
-							break;
-
-						case 'CallExpression':
-							const { callee, arguments: args } = child;
-							if (
-								callee.name === 'require' &&
-								args.length === 1 &&
-								args[ 0 ].type === 'Literal' &&
-								typeof args[ 0 ].value === 'string'
-							) {
-								source = args[ 0 ].value;
-							}
-							break;
-					}
-
-					if ( ! source ) {
-						return;
-					}
-
-					const locality = getPackageLocality( source );
-
-					checkLocalityOrder( child, locality, previousLocality );
-
-					previousLocality = locality;
-
-					if ( isNodeInLocality( child, locality ) ) {
-						return;
-					}
-
-					context.report( {
-						node: child,
-						message: `Expected preceding "${ locality } dependencies" comment block`,
-					} );
-				} );
-			},
-		};
-	},
-};
diff --git a/packages/js/experimental-products-app/changelog/wooplug-6930-adopt-import-order b/packages/js/experimental-products-app/changelog/wooplug-6930-adopt-import-order
new file mode 100644
index 00000000000..6a2c44e8ef9
--- /dev/null
+++ b/packages/js/experimental-products-app/changelog/wooplug-6930-adopt-import-order
@@ -0,0 +1,3 @@
+Significance: patch
+Type: dev
+Comment: Remove obsolete @woocommerce/dependency-group eslint-disable directives following the switch to import/order in @woocommerce/eslint-plugin.
diff --git a/packages/js/experimental-products-app/src/layout.tsx b/packages/js/experimental-products-app/src/layout.tsx
index 2afdf40abb4..99a8d4d1038 100644
--- a/packages/js/experimental-products-app/src/layout.tsx
+++ b/packages/js/experimental-products-app/src/layout.tsx
@@ -13,7 +13,6 @@ import {
 	__unstableAnimatePresence as AnimatePresence,
 } from '@wordpress/components';
 // @ts-expect-error - This component isn't available in WordPress 6.9. Given that it's an experimental project, it's okay to use it here. Remove the check below when WordPress 7.0 is the minimum supported version.
-// eslint-disable-next-line @woocommerce/dependency-group
 import { SnackbarNotices } from '@wordpress/notices';

 /**
diff --git a/plugins/woocommerce-beta-tester/changelog/wooplug-6930-adopt-import-order b/plugins/woocommerce-beta-tester/changelog/wooplug-6930-adopt-import-order
new file mode 100644
index 00000000000..6a2c44e8ef9
--- /dev/null
+++ b/plugins/woocommerce-beta-tester/changelog/wooplug-6930-adopt-import-order
@@ -0,0 +1,3 @@
+Significance: patch
+Type: dev
+Comment: Remove obsolete @woocommerce/dependency-group eslint-disable directives following the switch to import/order in @woocommerce/eslint-plugin.
diff --git a/plugins/woocommerce-beta-tester/src/remote-logging/index.tsx b/plugins/woocommerce-beta-tester/src/remote-logging/index.tsx
index 3568fc35328..772be0dea3a 100644
--- a/plugins/woocommerce-beta-tester/src/remote-logging/index.tsx
+++ b/plugins/woocommerce-beta-tester/src/remote-logging/index.tsx
@@ -8,7 +8,6 @@ import apiFetch from '@wordpress/api-fetch';
 import { log, init as initRemoteLogging } from '@woocommerce/remote-logging';
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore no types
-// eslint-disable-next-line @woocommerce/dependency-group
 import { dispatch } from '@wordpress/data';

 /**
@@ -17,7 +16,6 @@ import { dispatch } from '@wordpress/data';
 import { API_NAMESPACE } from './constants';
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore no types
-// eslint-disable-next-line @woocommerce/dependency-group
 import { STORE_KEY as optionsStore } from '../options/data/constants';

 interface RemoteLoggingStatus {
diff --git a/plugins/woocommerce-beta-tester/src/remote-logging/register-exception-filter.tsx b/plugins/woocommerce-beta-tester/src/remote-logging/register-exception-filter.tsx
index 9e9b6dc6cd4..e05a6fcce16 100644
--- a/plugins/woocommerce-beta-tester/src/remote-logging/register-exception-filter.tsx
+++ b/plugins/woocommerce-beta-tester/src/remote-logging/register-exception-filter.tsx
@@ -1,5 +1,4 @@
 /* eslint-disable @typescript-eslint/ban-ts-comment */
-/* eslint-disable @woocommerce/dependency-group */

 /**
  * External dependencies
diff --git a/plugins/woocommerce-beta-tester/src/tools/data/index.js b/plugins/woocommerce-beta-tester/src/tools/data/index.js
index 5750dc3cbd0..ea99d3b9ebd 100644
--- a/plugins/woocommerce-beta-tester/src/tools/data/index.js
+++ b/plugins/woocommerce-beta-tester/src/tools/data/index.js
@@ -1,4 +1,3 @@
-/* eslint-disable @woocommerce/dependency-group */
 /**
  * External dependencies
  */
diff --git a/plugins/woocommerce-beta-tester/src/tools/data/index.ts b/plugins/woocommerce-beta-tester/src/tools/data/index.ts
index c49d085aa44..ed521f2be79 100644
--- a/plugins/woocommerce-beta-tester/src/tools/data/index.ts
+++ b/plugins/woocommerce-beta-tester/src/tools/data/index.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @woocommerce/dependency-group */
 /**
  * External dependencies
  */
diff --git a/plugins/woocommerce/changelog/wooplug-6930-adopt-import-order b/plugins/woocommerce/changelog/wooplug-6930-adopt-import-order
new file mode 100644
index 00000000000..6a2c44e8ef9
--- /dev/null
+++ b/plugins/woocommerce/changelog/wooplug-6930-adopt-import-order
@@ -0,0 +1,3 @@
+Significance: patch
+Type: dev
+Comment: Remove obsolete @woocommerce/dependency-group eslint-disable directives following the switch to import/order in @woocommerce/eslint-plugin.
diff --git a/plugins/woocommerce/client/admin/client/customize-store/index.tsx b/plugins/woocommerce/client/admin/client/customize-store/index.tsx
index 4c9ab3ff26e..3c6c7c0945d 100644
--- a/plugins/woocommerce/client/admin/client/customize-store/index.tsx
+++ b/plugins/woocommerce/client/admin/client/customize-store/index.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable @woocommerce/dependency-group */
+/* eslint-disable import/order */
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 /**
  * External dependencies
diff --git a/plugins/woocommerce/client/admin/client/customize-store/site-hub/index.tsx b/plugins/woocommerce/client/admin/client/customize-store/site-hub/index.tsx
index 289564c0ce6..5d48692f800 100644
--- a/plugins/woocommerce/client/admin/client/customize-store/site-hub/index.tsx
+++ b/plugins/woocommerce/client/admin/client/customize-store/site-hub/index.tsx
@@ -1,5 +1,4 @@
 // Reference: https://github.com/WordPress/gutenberg/blob/v16.4.0/packages/edit-site/src/components/site-hub/index.js
-/* eslint-disable @woocommerce/dependency-group */
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 /**
  * External dependencies
diff --git a/plugins/woocommerce/client/admin/client/launch-your-store/hub/sidebar/components/launch-store-hub.tsx b/plugins/woocommerce/client/admin/client/launch-your-store/hub/sidebar/components/launch-store-hub.tsx
index bd037015357..b2079b64142 100644
--- a/plugins/woocommerce/client/admin/client/launch-your-store/hub/sidebar/components/launch-store-hub.tsx
+++ b/plugins/woocommerce/client/admin/client/launch-your-store/hub/sidebar/components/launch-store-hub.tsx
@@ -1,5 +1,4 @@
 /* eslint-disable @typescript-eslint/ban-ts-comment */
-/* eslint-disable @woocommerce/dependency-group */
 /**
  * External dependencies
  */
diff --git a/plugins/woocommerce/client/admin/client/launch-your-store/hub/sidebar/components/payments-sidebar.tsx b/plugins/woocommerce/client/admin/client/launch-your-store/hub/sidebar/components/payments-sidebar.tsx
index 1cda761d8fd..0538e4e70c5 100644
--- a/plugins/woocommerce/client/admin/client/launch-your-store/hub/sidebar/components/payments-sidebar.tsx
+++ b/plugins/woocommerce/client/admin/client/launch-your-store/hub/sidebar/components/payments-sidebar.tsx
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/ban-ts-comment */
-/* eslint-disable @woocommerce/dependency-group */
+/* eslint-disable import/order */
 /**
  * External dependencies
  */
diff --git a/plugins/woocommerce/client/admin/client/launch-your-store/hub/sidebar/components/sidebar-container.tsx b/plugins/woocommerce/client/admin/client/launch-your-store/hub/sidebar/components/sidebar-container.tsx
index 33e5899e79b..ee3d867fd29 100644
--- a/plugins/woocommerce/client/admin/client/launch-your-store/hub/sidebar/components/sidebar-container.tsx
+++ b/plugins/woocommerce/client/admin/client/launch-your-store/hub/sidebar/components/sidebar-container.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @woocommerce/dependency-group */
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 /**
  * External dependencies
diff --git a/plugins/woocommerce/client/admin/client/launch-your-store/hub/sidebar/tasklist.tsx b/plugins/woocommerce/client/admin/client/launch-your-store/hub/sidebar/tasklist.tsx
index b03f6e6f655..733ddba112f 100644
--- a/plugins/woocommerce/client/admin/client/launch-your-store/hub/sidebar/tasklist.tsx
+++ b/plugins/woocommerce/client/admin/client/launch-your-store/hub/sidebar/tasklist.tsx
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/ban-ts-comment */
-/* eslint-disable @woocommerce/dependency-group */
+/* eslint-disable import/order */
 /**
  * External dependencies
  */
diff --git a/plugins/woocommerce/client/admin/client/settings-email/settings-email-listing-data.ts b/plugins/woocommerce/client/admin/client/settings-email/settings-email-listing-data.ts
index a788e4f8c33..2478ff81a0f 100644
--- a/plugins/woocommerce/client/admin/client/settings-email/settings-email-listing-data.ts
+++ b/plugins/woocommerce/client/admin/client/settings-email/settings-email-listing-data.ts
@@ -7,7 +7,7 @@ import { settingsStore } from '@woocommerce/data';
 import { useState, useCallback, useMemo } from '@wordpress/element';
 import apiFetch from '@wordpress/api-fetch';
 // @ts-expect-error - We need to use this /wp see https://developer.wordpress.org/block-editor/reference-guides/packages/packages-dataviews/#dataviews
-import { View } from '@wordpress/dataviews/wp'; // eslint-disable-line @woocommerce/dependency-group
+import { View } from '@wordpress/dataviews/wp';

 /**
  * Internal dependencies
diff --git a/plugins/woocommerce/client/admin/client/settings-email/settings-email-listing-listview.tsx b/plugins/woocommerce/client/admin/client/settings-email/settings-email-listing-listview.tsx
index 1287675abb9..645057b2218 100644
--- a/plugins/woocommerce/client/admin/client/settings-email/settings-email-listing-listview.tsx
+++ b/plugins/woocommerce/client/admin/client/settings-email/settings-email-listing-listview.tsx
@@ -7,7 +7,7 @@ import { Icon } from '@wordpress/components';
 import { getAdminLink } from '@woocommerce/settings';
 import { __ } from '@wordpress/i18n';
 // @ts-expect-error - We need to use this /wp see https://developer.wordpress.org/block-editor/reference-guides/packages/packages-dataviews/#dataviews
-import { DataViews, View } from '@wordpress/dataviews/wp'; // eslint-disable-line @woocommerce/dependency-group
+import { DataViews, View } from '@wordpress/dataviews/wp';

 /**
  * Internal dependencies
diff --git a/plugins/woocommerce/client/admin/client/wp-admin-scripts/email-editor-integration/reset-notification-email-content.tsx b/plugins/woocommerce/client/admin/client/wp-admin-scripts/email-editor-integration/reset-notification-email-content.tsx
index 4e4a58ea473..de97e11a388 100644
--- a/plugins/woocommerce/client/admin/client/wp-admin-scripts/email-editor-integration/reset-notification-email-content.tsx
+++ b/plugins/woocommerce/client/admin/client/wp-admin-scripts/email-editor-integration/reset-notification-email-content.tsx
@@ -16,7 +16,6 @@ import {
 import { decodeEntities } from '@wordpress/html-entities';
 import apiFetch from '@wordpress/api-fetch';

-// eslint-disable-next-line @woocommerce/dependency-group
 import type { PostWithPermissions } from '@woocommerce/email-editor';

 function getItemTitle( item: {
diff --git a/plugins/woocommerce/client/blocks/assets/js/blocks/category-title/edit.tsx b/plugins/woocommerce/client/blocks/assets/js/blocks/category-title/edit.tsx
index 321e6a14d31..1c1d5321f82 100644
--- a/plugins/woocommerce/client/blocks/assets/js/blocks/category-title/edit.tsx
+++ b/plugins/woocommerce/client/blocks/assets/js/blocks/category-title/edit.tsx
@@ -17,7 +17,6 @@ import {
 } from '@wordpress/block-editor';
 import { usePreviewMode } from '@woocommerce/base-hooks';
 import { previewCategories } from '@woocommerce/resource-previews';
-// eslint-disable-next-line @woocommerce/dependency-group
 import {
 	ToggleControl,
 	TextControl,
diff --git a/plugins/woocommerce/client/blocks/assets/js/blocks/product-filters/inner-blocks/price-slider/edit.tsx b/plugins/woocommerce/client/blocks/assets/js/blocks/product-filters/inner-blocks/price-slider/edit.tsx
index fd03932214d..779e3ad2f02 100644
--- a/plugins/woocommerce/client/blocks/assets/js/blocks/product-filters/inner-blocks/price-slider/edit.tsx
+++ b/plugins/woocommerce/client/blocks/assets/js/blocks/product-filters/inner-blocks/price-slider/edit.tsx
@@ -15,7 +15,6 @@ import {
 	// eslint-disable-next-line @wordpress/no-unsafe-wp-apis
 	__experimentalUseMultipleOriginColorsAndGradients as useMultipleOriginColorsAndGradients,
 } from '@wordpress/block-editor';
-// eslint-disable-next-line @woocommerce/dependency-group
 import {
 	ToggleControl,
 	Disabled,
diff --git a/plugins/woocommerce/client/blocks/assets/js/blocks/product-gallery/inner-blocks/product-gallery-thumbnails/block-settings/index.tsx b/plugins/woocommerce/client/blocks/assets/js/blocks/product-gallery/inner-blocks/product-gallery-thumbnails/block-settings/index.tsx
index a8da7a48dd2..e6ee31b83eb 100644
--- a/plugins/woocommerce/client/blocks/assets/js/blocks/product-gallery/inner-blocks/product-gallery-thumbnails/block-settings/index.tsx
+++ b/plugins/woocommerce/client/blocks/assets/js/blocks/product-gallery/inner-blocks/product-gallery-thumbnails/block-settings/index.tsx
@@ -5,7 +5,7 @@ import { __ } from '@wordpress/i18n';
 import {
 	// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 	// @ts-ignore - Ignoring because `__experimentalUnitControl` is not yet in the type definitions.
-	// eslint-disable-next-line @wordpress/no-unsafe-wp-apis, @woocommerce/dependency-group
+	// eslint-disable-next-line @wordpress/no-unsafe-wp-apis
 	__experimentalUnitControl as UnitControl,
 	SelectControl,
 	// eslint-disable-next-line @wordpress/no-unsafe-wp-apis
diff --git a/plugins/woocommerce/client/blocks/assets/js/blocks/product-tag/block.tsx b/plugins/woocommerce/client/blocks/assets/js/blocks/product-tag/block.tsx
index d77ac663346..ba485e68e25 100644
--- a/plugins/woocommerce/client/blocks/assets/js/blocks/product-tag/block.tsx
+++ b/plugins/woocommerce/client/blocks/assets/js/blocks/product-tag/block.tsx
@@ -1,5 +1,4 @@
 // @ts-expect-error: `ServerSideRender ` currently does not have a type definition in WordPress core
-// eslint-disable-next-line @woocommerce/dependency-group
 import ServerSideRender from '@wordpress/server-side-render';
 /**
  * External dependencies
diff --git a/plugins/woocommerce/client/blocks/assets/js/blocks/single-product/edit/layout-editor.tsx b/plugins/woocommerce/client/blocks/assets/js/blocks/single-product/edit/layout-editor.tsx
index f45a238b537..e88d1319411 100644
--- a/plugins/woocommerce/client/blocks/assets/js/blocks/single-product/edit/layout-editor.tsx
+++ b/plugins/woocommerce/client/blocks/assets/js/blocks/single-product/edit/layout-editor.tsx
@@ -18,7 +18,6 @@ import {
 	// @ts-ignore
 	BlockContextProvider,
 } from '@wordpress/block-editor';
-// eslint-disable-next-line @woocommerce/dependency-group
 import { createBlocksFromInnerBlocksTemplate } from '@wordpress/blocks';

 /**
diff --git a/plugins/woocommerce/client/blocks/assets/js/data/cart/notify-quantity-changes.ts b/plugins/woocommerce/client/blocks/assets/js/data/cart/notify-quantity-changes.ts
index f2fb1ee064b..baa7fa96767 100644
--- a/plugins/woocommerce/client/blocks/assets/js/data/cart/notify-quantity-changes.ts
+++ b/plugins/woocommerce/client/blocks/assets/js/data/cart/notify-quantity-changes.ts
@@ -7,7 +7,7 @@ import { decodeEntities } from '@wordpress/html-entities';
 import { __, sprintf } from '@wordpress/i18n';
 import { applyFilters } from '@wordpress/hooks';
 import { CurriedSelectorsOf } from '@wordpress/data/build-types/types';
-// eslint-disable-next-line @wordpress/no-unsafe-wp-apis, @woocommerce/dependency-group
+// eslint-disable-next-line @wordpress/no-unsafe-wp-apis
 import { __unstableStripHTML as stripHTML } from '@wordpress/dom';

 /**
diff --git a/plugins/woocommerce/client/blocks/bin/webpack-config-interactive-blocks.js b/plugins/woocommerce/client/blocks/bin/webpack-config-interactive-blocks.js
index 5ce78447563..1a8a908460d 100644
--- a/plugins/woocommerce/client/blocks/bin/webpack-config-interactive-blocks.js
+++ b/plugins/woocommerce/client/blocks/bin/webpack-config-interactive-blocks.js
@@ -7,26 +7,17 @@ const [
 	,
 	moduleConfig,
 ] = require( '@wordpress/scripts/config/webpack.config' );
-const RemoveFilesPlugin = require( './remove-files-webpack-plugin' );
+const DependencyExtractionWebpackPlugin = require( '@woocommerce/dependency-extraction-webpack-plugin' );
+const {
+	WebpackRTLPlugin,
+} = require( '@woocommerce/internal-build/style-build' );

 /**
  * Internal dependencies
  */
+const RemoveFilesPlugin = require( './remove-files-webpack-plugin' );
 const { getResolve } = require( './webpack-helpers' );
-
-// Blocks' webpack writes directly to the WooCommerce plugin's
-// `assets/client/blocks/` so PHP can enqueue files from their final location
-// without an intermediate rsync step.
-const BUILD_DIR = path.resolve( __dirname, '../../../assets/client/blocks' );
-
-/**
- * Internal dependencies
- */
-const DependencyExtractionWebpackPlugin = require( '@woocommerce/dependency-extraction-webpack-plugin' );
 const FilesystemCacheWarningsPlugin = require( './filesystem-cache-warnings-webpack-plugin.js' );
-const {
-	WebpackRTLPlugin,
-} = require( '@woocommerce/internal-build/style-build' );
 const { sharedOptimizationConfig } = require( './webpack-shared-config' );
 const {
 	scriptModuleEntries,
@@ -34,6 +25,11 @@ const {
 	editorStyleEntries,
 } = require( './webpack-interactivity-entries' );

+// Blocks' webpack writes directly to the WooCommerce plugin's
+// `assets/client/blocks/` so PHP can enqueue files from their final location
+// without an intermediate rsync step.
+const BUILD_DIR = path.resolve( __dirname, '../../../assets/client/blocks' );
+
 const entries = {
 	// Blocks
 	...scriptModuleEntries,
diff --git a/plugins/woocommerce/client/blocks/bin/webpack-configs.js b/plugins/woocommerce/client/blocks/bin/webpack-configs.js
index 0d45d2ee522..527fedcf83b 100644
--- a/plugins/woocommerce/client/blocks/bin/webpack-configs.js
+++ b/plugins/woocommerce/client/blocks/bin/webpack-configs.js
@@ -5,7 +5,6 @@ const path = require( 'path' );
 const fs = require( 'fs' );
 const { paramCase } = require( 'change-case' );
 const webpack = require( 'webpack' );
-const RemoveFilesPlugin = require( './remove-files-webpack-plugin' );
 const MiniCssExtractPlugin = require( 'mini-css-extract-plugin' );
 const ProgressBarPlugin = require( 'progress-bar-webpack-plugin' );
 const CircularDependencyPlugin = require( 'circular-dependency-plugin' );
@@ -16,10 +15,11 @@ const CopyWebpackPlugin = require( 'copy-webpack-plugin' );
  * Internal dependencies
  */
 const DependencyExtractionWebpackPlugin = require( '@woocommerce/dependency-extraction-webpack-plugin' );
-const FilesystemCacheWarningsPlugin = require( './filesystem-cache-warnings-webpack-plugin.js' );
 const {
 	WebpackRTLPlugin,
 } = require( '@woocommerce/internal-build/style-build' );
+const FilesystemCacheWarningsPlugin = require( './filesystem-cache-warnings-webpack-plugin.js' );
+const RemoveFilesPlugin = require( './remove-files-webpack-plugin' );
 const { getEntryConfig, genericBlocks } = require( './webpack-entries' );
 const {
 	ASSET_CHECK,
diff --git a/plugins/woocommerce/client/blocks/tests/integration/helpers/integration-test-editor.tsx b/plugins/woocommerce/client/blocks/tests/integration/helpers/integration-test-editor.tsx
index d87a4646a40..60012d94d2a 100644
--- a/plugins/woocommerce/client/blocks/tests/integration/helpers/integration-test-editor.tsx
+++ b/plugins/woocommerce/client/blocks/tests/integration/helpers/integration-test-editor.tsx
@@ -14,7 +14,6 @@ import {
 	// @ts-expect-error privateApis exists but is not typed
 	privateApis as blockEditorPrivateApis,
 } from '@wordpress/block-editor';
-// eslint-disable-next-line @woocommerce/dependency-group
 import {
 	type BlockAttributes,
 	type BlockInstance,
diff --git a/plugins/woocommerce/tests/metrics/specs/editor.spec.js b/plugins/woocommerce/tests/metrics/specs/editor.spec.js
index 7269d6f0327..01a0b4559c0 100644
--- a/plugins/woocommerce/tests/metrics/specs/editor.spec.js
+++ b/plugins/woocommerce/tests/metrics/specs/editor.spec.js
@@ -1,4 +1,4 @@
-/* eslint-disable @woocommerce/dependency-group, jest/expect-expect, jest/no-test-callback, array-callback-return, jest/no-identical-title */
+/* eslint-disable jest/expect-expect, jest/no-test-callback, array-callback-return, jest/no-identical-title */

 /**
  * WordPress dependencies
@@ -164,4 +164,4 @@ test.describe( 'Editor Performance', () => {
 	} );
 } );

-/* eslint-enable @woocommerce/dependency-group, jest/expect-expect, jest/no-test-callback, array-callback-return, jest/no-identical-title */
+/* eslint-enable jest/expect-expect, jest/no-test-callback, array-callback-return, jest/no-identical-title */
diff --git a/plugins/woocommerce/tests/metrics/specs/frontend.spec.js b/plugins/woocommerce/tests/metrics/specs/frontend.spec.js
index 438f386150a..3714543f4f8 100644
--- a/plugins/woocommerce/tests/metrics/specs/frontend.spec.js
+++ b/plugins/woocommerce/tests/metrics/specs/frontend.spec.js
@@ -1,4 +1,4 @@
-/* eslint-disable @woocommerce/dependency-group, jest/expect-expect, jest/no-test-callback, array-callback-return, jest/no-identical-title */
+/* eslint-disable jest/expect-expect, jest/no-test-callback, array-callback-return, jest/no-identical-title */

 /**
  * WordPress dependencies
@@ -92,4 +92,4 @@ test.describe( 'Frontend Performance', () => {
 	} );
 } );

-/* eslint-enable @woocommerce/dependency-group, jest/expect-expect, jest/no-test-callback, array-callback-return, jest/no-identical-title */
+/* eslint-enable jest/expect-expect, jest/no-test-callback, array-callback-return, jest/no-identical-title */
diff --git a/plugins/woocommerce/tests/performance/setup/add-customer-order.js b/plugins/woocommerce/tests/performance/setup/add-customer-order.js
index 543e27c8e90..7d34b49f973 100644
--- a/plugins/woocommerce/tests/performance/setup/add-customer-order.js
+++ b/plugins/woocommerce/tests/performance/setup/add-customer-order.js
@@ -1,5 +1,4 @@
 /* eslint-disable jsdoc/require-property-description */
-/* eslint-disable @woocommerce/dependency-group */
 /* eslint-disable import/no-unresolved */
 /**
  * k6 dependencies
diff --git a/tools/release-posts/commands/release-post/release-post-beta.ts b/tools/release-posts/commands/release-post/release-post-beta.ts
index 923492b502f..50052891d11 100755
--- a/tools/release-posts/commands/release-post/release-post-beta.ts
+++ b/tools/release-posts/commands/release-post/release-post-beta.ts
@@ -10,7 +10,6 @@ import { getEnvVar } from '@woocommerce/monorepo-utils/src/core/environment';
 import { Command } from '@commander-js/extra-typings';
 import dotenv from 'dotenv';
 // @ts-expect-error - The enquirer types are incorrect.
-// eslint-disable-next-line @woocommerce/dependency-group
 import { Select } from 'enquirer';

 /**
diff --git a/tools/release-posts/commands/release-post/release-post-rc.ts b/tools/release-posts/commands/release-post/release-post-rc.ts
index 4d6ac92961b..e74a76dfce7 100644
--- a/tools/release-posts/commands/release-post/release-post-rc.ts
+++ b/tools/release-posts/commands/release-post/release-post-rc.ts
@@ -10,7 +10,6 @@ import { getEnvVar } from '@woocommerce/monorepo-utils/src/core/environment';
 import { Command } from '@commander-js/extra-typings';
 import dotenv from 'dotenv';
 // @ts-expect-error - The enquirer types are incorrect.
-// eslint-disable-next-line @woocommerce/dependency-group
 import { Select } from 'enquirer';

 /**