@atlaskit/eslint-plugin-platform 2.9.0 → 2.9.2

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/eslint-plugin-platform
 
+## 2.9.2
+
+### Patch Changes
+
+- [`48fa19b8ba41a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/48fa19b8ba41a) -
+  Add `no-xcss-in-cx` ESLint rule to prevent `xcss()` from `@atlaskit/primitives` being called
+  inline inside `cx()` in an `xcss` prop. Calling `xcss()` inline produces a StyleRule opaque object
+  rather than a Compiled atomic class string, which causes runtime errors. The rule is import-aware
+  and recurses into logical (`&&`) and conditional (`?:`) expressions.
+
+## 2.9.1
+
+### Patch Changes
+
+- [`5fed54075f1b8`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5fed54075f1b8) -
+  add eslint rule for restricting isFedramp and isIsolatedCloud imports
+
 ## 2.9.0
 
 ### Minor Changes

package/dist/cjs/index.js

@@ -32,10 +32,12 @@ var _useRecommendedUtils = _interopRequireDefault(require("./rules/feature-gatin
 var _validGateName = _interopRequireDefault(require("./rules/feature-gating/valid-gate-name"));
 var _expandBackgroundShorthand = _interopRequireDefault(require("./rules/compiled/expand-background-shorthand"));
 var _expandSpacingShorthand = _interopRequireDefault(require("./rules/compiled/expand-spacing-shorthand"));
+var _noCssPropInObjectSpread = _interopRequireDefault(require("./rules/compiled/no-css-prop-in-object-spread"));
 var _noSparseCheckout = _interopRequireDefault(require("./rules/no-sparse-checkout"));
 var _noDirectDocumentUsage = _interopRequireDefault(require("./rules/no-direct-document-usage"));
 var _noSetImmediate = _interopRequireDefault(require("./rules/no-set-immediate"));
 var _preferCryptoRandomUuid = _interopRequireDefault(require("./rules/prefer-crypto-random-uuid"));
+var _noRestrictedFedrampImports = _interopRequireDefault(require("./rules/no-restricted-fedramp-imports"));
 var _noBarrelEntryImports = _interopRequireDefault(require("./rules/import/no-barrel-entry-imports"));
 var _noBarrelEntryJestMock = _interopRequireDefault(require("./rules/import/no-barrel-entry-jest-mock"));
 var _noJestMockBarrelFiles = _interopRequireDefault(require("./rules/import/no-jest-mock-barrel-files"));
@@ -43,6 +45,7 @@ var _noRelativeBarrelFileImports = _interopRequireDefault(require("./rules/impor
 var _noConversationAssistantBarrelImports = _interopRequireDefault(require("./rules/import/no-conversation-assistant-barrel-imports"));
 var _visitExampleTypeImportRequired = _interopRequireDefault(require("./rules/visit-example-type-import-required"));
 var _ensureUseSyncExternalStoreServerSnapshot = _interopRequireDefault(require("./rules/ensure-use-sync-external-store-server-snapshot"));
+var _noXcssInCx = _interopRequireDefault(require("./rules/no-xcss-in-cx"));
 var _nodePath = require("node:path");
 var _nodeFs = require("node:fs");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -75,6 +78,7 @@ var rules = exports.rules = {
   'expand-border-shorthand': _expandBorderShorthand.default,
   'expand-background-shorthand': _expandBackgroundShorthand.default,
   'expand-spacing-shorthand': _expandSpacingShorthand.default,
+  'no-css-prop-in-object-spread': _noCssPropInObjectSpread.default,
   'no-duplicate-dependencies': _noDuplicateDependencies.default,
   'no-invalid-feature-flag-usage': _noInvalidFeatureFlagUsage.default,
   'no-pre-post-install-scripts': _noPrePostInstalls.default,
@@ -94,12 +98,14 @@ var rules = exports.rules = {
   'no-direct-document-usage': _noDirectDocumentUsage.default,
   'no-set-immediate': _noSetImmediate.default,
   'prefer-crypto-random-uuid': _preferCryptoRandomUuid.default,
+  'no-restricted-fedramp-imports': _noRestrictedFedrampImports.default,
   'no-barrel-entry-imports': _noBarrelEntryImports.default,
   'no-barrel-entry-jest-mock': _noBarrelEntryJestMock.default,
   'no-jest-mock-barrel-files': _noJestMockBarrelFiles.default,
   'no-relative-barrel-file-imports': _noRelativeBarrelFileImports.default,
   'no-conversation-assistant-barrel-imports': _noConversationAssistantBarrelImports.default,
   'visit-example-type-import-required': _visitExampleTypeImportRequired.default,
+  'no-xcss-in-cx': _noXcssInCx.default,
   'ensure-use-sync-external-store-server-snapshot': _ensureUseSyncExternalStoreServerSnapshot.default
 };
 var commonConfig = {
@@ -112,10 +118,12 @@ var commonConfig = {
   '@atlaskit/platform/no-module-level-eval-nav4': 'error',
   '@atlaskit/platform/no-direct-document-usage': 'warn',
   '@atlaskit/platform/no-set-immediate': 'error',
+  '@atlaskit/platform/no-xcss-in-cx': 'error',
   // Compiled: rules that are not included via `@compiled/recommended
   '@atlaskit/platform/expand-border-shorthand': 'error',
   '@atlaskit/platform/expand-background-shorthand': 'error',
   '@atlaskit/platform/expand-spacing-shorthand': 'error',
+  '@atlaskit/platform/no-css-prop-in-object-spread': 'error',
   '@compiled/jsx-pragma': ['error', {
     importSources: ['@atlaskit/css'],
     onlyRunIfImportingCompiled: true,
@@ -157,7 +165,6 @@ var plugin = exports.plugin = {
         get '@atlaskit/platform'() {
           return plugin;
         },
-        // @ts-expect-error there's an issue with the types for @compiled/eslint-plugin ('no-css-prop-without-css-function' specifically)
         '@compiled': {
           meta: _eslintPlugin.default.meta,
           rules: _eslintPlugin.default.rules
@@ -174,7 +181,6 @@ var plugin = exports.plugin = {
         get '@atlaskit/platform'() {
           return plugin;
         },
-        // @ts-expect-error there's an issue with the types for @compiled/eslint-plugin ('no-css-prop-without-css-function' specifically)
         '@compiled': {
           meta: _eslintPlugin.default.meta,
           rules: _eslintPlugin.default.rules

package/dist/cjs/rules/compiled/no-css-prop-in-object-spread/index.js

@@ -0,0 +1,162 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.noCssPropInObjectSpread = exports.default = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _contextCompat = require("../../util/context-compat");
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+/**
+ * Returns the `css` Property node from an ObjectExpression, or null if not found.
+ */
+function getCssProperty(objectExpression) {
+  var _iterator = _createForOfIteratorHelper(objectExpression.properties),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var prop = _step.value;
+      if (prop.type !== 'Property') {
+        continue;
+      }
+      var key = prop.key;
+      if (key.type === 'Identifier' && key.name === 'css' || key.type === 'Literal' && key.value === 'css') {
+        return prop;
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return null;
+}
+var noCssPropInObjectSpread = exports.noCssPropInObjectSpread = {
+  meta: {
+    docs: {
+      url: 'https://bitbucket.org/atlassian/atlassian-frontend-monorepo/src/master/platform/packages/platform/eslint-plugin/src/rules/compiled/no-css-prop-in-object-spread/',
+      description: 'Disallows `css` property inside objects spread into JSX — the Compiled JSX pragma ignores it'
+    },
+    fixable: 'code',
+    messages: {
+      noCssPropInObjectSpread: 'The `css` property inside an object spread into JSX is a no-op. The Compiled JSX pragma only processes `css` as a direct JSX attribute. Move `css` out of the spread: <El css={...} />'
+    },
+    type: 'problem'
+  },
+  create: function create(context) {
+    return {
+      JSXSpreadAttribute: function JSXSpreadAttribute(node) {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        var spreadNode = node;
+        var arg = spreadNode.argument;
+
+        // Case 1: inline object literal — <div {...{ css: styles, id: 'foo' }} />
+        if (arg.type === 'ObjectExpression') {
+          var objectArg = arg;
+          var cssProp = getCssProperty(objectArg);
+          if (!cssProp) {
+            return;
+          }
+          context.report({
+            node: node,
+            messageId: 'noCssPropInObjectSpread',
+            fix: function fix(fixer) {
+              var sourceCode = (0, _contextCompat.getSourceCode)(context);
+              var cssValueText = sourceCode.getText(cssProp.value);
+              var remainingProps = objectArg.properties.filter(function (p) {
+                return p !== cssProp;
+              });
+              var directCssProp = "css={".concat(cssValueText, "}");
+              if (remainingProps.length === 0) {
+                return fixer.replaceText(node, directCssProp);
+              }
+              var remainingText = remainingProps.map(function (p) {
+                return sourceCode.getText(p);
+              }).join(', ');
+              return fixer.replaceText(node, "".concat(directCssProp, " {...{ ").concat(remainingText, " }}"));
+            }
+          });
+          return;
+        }
+
+        // Case 2: variable reference — <div {...props} />
+        if (arg.type === 'Identifier') {
+          var scope = (0, _contextCompat.getScope)(context, arg);
+          var currentScope = scope;
+          var variable = null;
+          while (currentScope) {
+            var found = currentScope.variables.find(function (v) {
+              return v.name === arg.name;
+            });
+            if (found) {
+              variable = found;
+              break;
+            }
+            currentScope = currentScope.upper;
+          }
+          if (!variable || variable.defs.length === 0) {
+            return;
+          }
+          var def = variable.defs[0];
+          if (def.type !== 'Variable' || !def.node.init || def.node.init.type !== 'ObjectExpression') {
+            return;
+          }
+          var initObject = def.node.init;
+          var _cssProp = getCssProperty(initObject);
+          if (!_cssProp) {
+            return;
+          }
+
+          // Only auto-fix when there is exactly one JSX spread site for this variable
+          var spreadCount = variable.references.filter(function (ref) {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            var refParent = ref.identifier.parent;
+            return (refParent === null || refParent === void 0 ? void 0 : refParent.type) === 'JSXSpreadAttribute';
+          }).length;
+          context.report(_objectSpread({
+            node: node,
+            messageId: 'noCssPropInObjectSpread'
+          }, spreadCount === 1 ? {
+            fix: function fix(fixer) {
+              var sourceCode = (0, _contextCompat.getSourceCode)(context);
+              var cssValueText = sourceCode.getText(_cssProp.value);
+              var fixes = [];
+              var remainingProps = initObject.properties.filter(function (p) {
+                return p !== _cssProp;
+              });
+              if (remainingProps.length === 0) {
+                fixes.push(fixer.replaceText(initObject, '{}'));
+              } else {
+                var propIndex = initObject.properties.indexOf(_cssProp);
+                var isLast = propIndex === initObject.properties.length - 1;
+                var tokenBefore = sourceCode.getTokenBefore(_cssProp);
+                var tokenAfter = sourceCode.getTokenAfter(_cssProp);
+                if (!isLast && tokenAfter && tokenAfter.value === ',') {
+                  var src = sourceCode.getText();
+                  var afterEnd = tokenAfter.range[1];
+                  var end = afterEnd;
+                  while (end < src.length && src[end] === ' ') {
+                    end++;
+                  }
+                  fixes.push(fixer.removeRange([_cssProp.range[0], end]));
+                } else if (tokenBefore && tokenBefore.value === ',') {
+                  fixes.push(fixer.removeRange([tokenBefore.range[0], _cssProp.range[1]]));
+                } else {
+                  fixes.push(fixer.remove(_cssProp));
+                }
+              }
+              fixes.push(fixer.insertTextBefore(node, "css={".concat(cssValueText, "} ")));
+              return fixes;
+            }
+          } : {}));
+        }
+      }
+    };
+  }
+};
+var _default = exports.default = noCssPropInObjectSpread;

package/dist/cjs/rules/ensure-critical-dependency-resolutions/index.js

@@ -18,7 +18,6 @@ var DESIRED_PKG_VERSIONS = {
   tslib: ['2.6', '2.8'],
   '@types/react': ['16.14', '18.2', '18.3'],
   'react-relay': ['npm:atl-react-relay@0.0.0-main-39e79f66'],
-  'relay-compiler': ['npm:atl-relay-compiler@0.0.0-main-39e79f66'],
   'relay-runtime': ['npm:atl-relay-runtime@0.0.0-main-39e79f66'],
   'relay-test-utils': ['npm:atl-relay-test-utils@0.0.0-main-39e79f66']
 };

package/dist/cjs/rules/import/no-barrel-entry-imports/index.js

@@ -48,6 +48,10 @@ var ruleMeta = {
           type: 'string'
         },
         description: 'The folder paths (relative to workspace root) containing packages whose imports will be checked and autofixed.'
+      },
+      preferImportedPackageSubpath: {
+        type: 'boolean',
+        description: 'Prefer subpaths on the imported barrel package when they bridge to the dependency (e.g. @scope/pkg/subpath instead of @scope/dependency).'
       }
     },
     additionalProperties: false
@@ -247,10 +251,12 @@ function classifySpecifiers(_ref4) {
   var node = _ref4.node,
     importContext = _ref4.importContext,
     workspaceRoot = _ref4.workspaceRoot,
-    fs = _ref4.fs;
+    fs = _ref4.fs,
+    preferImportedPackageSubpath = _ref4.preferImportedPackageSubpath;
   var currentExportPath = importContext.currentExportPath,
     exportsMap = importContext.exportsMap,
-    exportMap = importContext.exportMap;
+    exportMap = importContext.exportMap,
+    importedPackageName = importContext.packageName;
   var specifiers = node.specifiers;
   var specifiersByTarget = new Map();
   var unmappedSpecifiers = [];
@@ -271,6 +277,7 @@ function classifySpecifiers(_ref4) {
       var kind = 'value';
       if (spec.type === 'ImportDefaultSpecifier') {
         nameInSource = 'default';
+        kind = node.importKind === 'type' ? 'type' : 'value';
       } else if (spec.type === 'ImportSpecifier') {
         nameInSource = getImportedName(spec);
         var parentImportKind = node.importKind;
@@ -286,6 +293,36 @@ function classifySpecifiers(_ref4) {
         // Check if this is a cross-package re-export
         var sourcePackageName = (_exportInfo$crossPack = exportInfo.crossPackageSource) === null || _exportInfo$crossPack === void 0 ? void 0 : _exportInfo$crossPack.packageName;
         if (sourcePackageName) {
+          var targetKey = void 0;
+          var resolvedOriginalName = exportInfo.originalName;
+          if (preferImportedPackageSubpath) {
+            var bridge = (0, _packageResolution.findCrossPackageBridgeExportPath)({
+              exportsMap: exportsMap,
+              crossPackageName: sourcePackageName,
+              exportedName: nameInSource,
+              fs: fs
+            });
+            if (bridge) {
+              targetKey = importedPackageName + bridge.exportPath.slice(1);
+              if (bridge.entryPointExportName !== undefined) {
+                resolvedOriginalName = bridge.entryPointExportName === nameInSource ? undefined : bridge.entryPointExportName;
+              }
+              if (!specifiersByTarget.has(targetKey)) {
+                specifiersByTarget.set(targetKey, []);
+              }
+              specifiersByTarget.get(targetKey).push({
+                spec: _objectSpread(_objectSpread({}, spec), {}, {
+                  importKind: effectiveKind
+                }),
+                originalName: resolvedOriginalName,
+                targetExportPath: targetKey,
+                kind: effectiveKind,
+                sourcePackageName: sourcePackageName
+              });
+              continue;
+            }
+          }
+
           // For cross-package re-exports, find the most specific subpath in the source package
           // Note: Package resolution is not constrained by applyToImportsFrom - any package can be resolved
           var sourcePackageExportsMap = sourcePackageExportsMaps.get(sourcePackageName);
@@ -306,7 +343,6 @@ function classifySpecifiers(_ref4) {
 
           // Find the best export path in the source package
           var _targetExportPath = null;
-          var resolvedOriginalName = exportInfo.originalName;
           if (sourcePackageExportsMap) {
             var _exportInfo$originalN, _matchResult$exportPa;
             var _sourceExportName = (_exportInfo$originalN = exportInfo.originalName) !== null && _exportInfo$originalN !== void 0 ? _exportInfo$originalN : nameInSource;
@@ -323,7 +359,7 @@ function classifySpecifiers(_ref4) {
           }
 
           // Build the full import path: @package/subpath or just @package if no subpath found
-          var targetKey = _targetExportPath ? sourcePackageName + _targetExportPath.slice(1) // Remove leading '.' from subpath
+          targetKey = _targetExportPath ? sourcePackageName + _targetExportPath.slice(1) // Remove leading '.' from subpath
           : sourcePackageName;
           if (!specifiersByTarget.has(targetKey)) {
             specifiersByTarget.set(targetKey, []);
@@ -698,7 +734,10 @@ function createBarrelImportFix(_ref0) {
         }
       } else {
         // Create new import
-        var _isTypeImport = node.importKind === 'type';
+        var allSpecsAreType = specsWithTarget.every(function (s) {
+          return s.kind === 'type';
+        });
+        var _isTypeImport = node.importKind === 'type' || allSpecsAreType;
         var importStatement = buildImportStatement({
           specs: specs,
           path: newImportPath,
@@ -724,7 +763,10 @@ function createBarrelImportFix(_ref0) {
     var unmappedSpecs = unmappedSpecifiers.map(function (u) {
       return u.spec;
     });
-    var isTypeImport = node.importKind === 'type';
+    var allUnmappedAreType = unmappedSpecifiers.every(function (u) {
+      return u.kind === 'type';
+    });
+    var isTypeImport = node.importKind === 'type' || allUnmappedAreType;
     var remainingImport = buildImportStatement({
       specs: unmappedSpecs,
       path: importPath,
@@ -900,7 +942,8 @@ function handleRequireMemberExpression(_ref13) {
     context = _ref13.context,
     workspaceRoot = _ref13.workspaceRoot,
     fs = _ref13.fs,
-    applyToImportsFrom = _ref13.applyToImportsFrom;
+    applyToImportsFrom = _ref13.applyToImportsFrom,
+    preferImportedPackageSubpath = _ref13.preferImportedPackageSubpath;
   if (node.computed || node.property.type !== 'Identifier') {
     return;
   }
@@ -924,7 +967,8 @@ function handleRequireMemberExpression(_ref13) {
       node: synthetic,
       importContext: importContext,
       workspaceRoot: workspaceRoot,
-      fs: fs
+      fs: fs,
+      preferImportedPackageSubpath: preferImportedPackageSubpath
     }),
     specifiersByTarget = _classifySpecifiers.specifiersByTarget,
     hasNamespaceImport = _classifySpecifiers.hasNamespaceImport;
@@ -982,7 +1026,8 @@ function handleRequireDestructuringDeclarator(_ref16) {
     context = _ref16.context,
     workspaceRoot = _ref16.workspaceRoot,
     fs = _ref16.fs,
-    applyToImportsFrom = _ref16.applyToImportsFrom;
+    applyToImportsFrom = _ref16.applyToImportsFrom,
+    preferImportedPackageSubpath = _ref16.preferImportedPackageSubpath;
   if (node.id.type !== 'ObjectPattern' || !node.init || node.init.type !== 'CallExpression') {
     return;
   }
@@ -1048,7 +1093,8 @@ function handleRequireDestructuringDeclarator(_ref16) {
       node: synthetic,
       importContext: importContext,
       workspaceRoot: workspaceRoot,
-      fs: fs
+      fs: fs,
+      preferImportedPackageSubpath: preferImportedPackageSubpath
     }),
     specifiersByTarget = _classifySpecifiers2.specifiersByTarget,
     unmappedSpecifiers = _classifySpecifiers2.unmappedSpecifiers,
@@ -1158,7 +1204,8 @@ function handleImportDeclaration(_ref19) {
     context = _ref19.context,
     workspaceRoot = _ref19.workspaceRoot,
     fs = _ref19.fs,
-    applyToImportsFrom = _ref19.applyToImportsFrom;
+    applyToImportsFrom = _ref19.applyToImportsFrom,
+    preferImportedPackageSubpath = _ref19.preferImportedPackageSubpath;
   // Resolve import context (validates and extracts package/export info)
   // applyToImportsFrom is used here to filter which packages the rule applies to
   var importContext = resolveImportContext({
@@ -1181,7 +1228,8 @@ function handleImportDeclaration(_ref19) {
       node: node,
       importContext: importContext,
       workspaceRoot: workspaceRoot,
-      fs: fs
+      fs: fs,
+      preferImportedPackageSubpath: preferImportedPackageSubpath
     }),
     specifiersByTarget = _classifySpecifiers3.specifiersByTarget,
     unmappedSpecifiers = _classifySpecifiers3.unmappedSpecifiers,
@@ -1234,9 +1282,10 @@ function createRule(fs) {
   return {
     meta: ruleMeta,
     create: function create(context) {
-      var _options$applyToImpor;
+      var _options$applyToImpor, _options$preferImport;
       var options = context.options[0] || {};
       var applyToImportsFrom = (_options$applyToImpor = options.applyToImportsFrom) !== null && _options$applyToImpor !== void 0 ? _options$applyToImpor : _fileSystem.DEFAULT_TARGET_FOLDERS;
+      var preferImportedPackageSubpath = (_options$preferImport = options.preferImportedPackageSubpath) !== null && _options$preferImport !== void 0 ? _options$preferImport : false;
       var workspaceRoot = (0, _fileSystem.findWorkspaceRoot)({
         startPath: (0, _path.dirname)(context.filename),
         fs: fs,
@@ -1250,7 +1299,8 @@ function createRule(fs) {
             context: context,
             workspaceRoot: workspaceRoot,
             fs: fs,
-            applyToImportsFrom: applyToImportsFrom
+            applyToImportsFrom: applyToImportsFrom,
+            preferImportedPackageSubpath: preferImportedPackageSubpath
           });
         },
         MemberExpression: function MemberExpression(rawNode) {
@@ -1259,7 +1309,8 @@ function createRule(fs) {
             context: context,
             workspaceRoot: workspaceRoot,
             fs: fs,
-            applyToImportsFrom: applyToImportsFrom
+            applyToImportsFrom: applyToImportsFrom,
+            preferImportedPackageSubpath: preferImportedPackageSubpath
           });
         },
         VariableDeclarator: function VariableDeclarator(rawNode) {
@@ -1268,7 +1319,8 @@ function createRule(fs) {
             context: context,
             workspaceRoot: workspaceRoot,
             fs: fs,
-            applyToImportsFrom: applyToImportsFrom
+            applyToImportsFrom: applyToImportsFrom,
+            preferImportedPackageSubpath: preferImportedPackageSubpath
           });
         }
       };

package/dist/cjs/rules/import/no-barrel-entry-jest-mock/index.js

@@ -671,7 +671,9 @@ function traceSymbolsToExports(_ref10) {
     exportMap = _ref10.exportMap,
     exportsMap = _ref10.exportsMap,
     currentExportPath = _ref10.currentExportPath,
-    fs = _ref10.fs;
+    fs = _ref10.fs,
+    barrelPackageName = _ref10.barrelPackageName,
+    preferImportedPackageSubpath = _ref10.preferImportedPackageSubpath;
   var groupedByExport = new Map();
   var crossPackageGroups = new Map();
   var unmappedSymbols = [];
@@ -689,16 +691,38 @@ function traceSymbolsToExports(_ref10) {
 
       // Check for cross-package source first
       if (exportInfo.crossPackageSource) {
-        var key = "".concat(exportInfo.crossPackageSource.packageName).concat(exportInfo.crossPackageSource.exportPath === '.' ? '' : exportInfo.crossPackageSource.exportPath.slice(1));
+        var key = void 0;
+        var tracedOriginalName = exportInfo.originalName;
+        var barrelBridgeExportPath = void 0;
+        if (preferImportedPackageSubpath) {
+          var bridge = (0, _packageResolution.findCrossPackageBridgeExportPath)({
+            exportsMap: exportsMap,
+            crossPackageName: exportInfo.crossPackageSource.packageName,
+            exportedName: symbolName,
+            fs: fs
+          });
+          if (bridge) {
+            key = "".concat(barrelPackageName).concat(bridge.exportPath.slice(1));
+            barrelBridgeExportPath = bridge.exportPath;
+            if (bridge.entryPointExportName !== undefined) {
+              tracedOriginalName = bridge.entryPointExportName === symbolName ? undefined : bridge.entryPointExportName;
+            }
+          } else {
+            key = "".concat(exportInfo.crossPackageSource.packageName).concat(exportInfo.crossPackageSource.exportPath === '.' ? '' : exportInfo.crossPackageSource.exportPath.slice(1));
+          }
+        } else {
+          key = "".concat(exportInfo.crossPackageSource.packageName).concat(exportInfo.crossPackageSource.exportPath === '.' ? '' : exportInfo.crossPackageSource.exportPath.slice(1));
+        }
         if (!crossPackageGroups.has(key)) {
           crossPackageGroups.set(key, []);
         }
         crossPackageGroups.get(key).push({
           symbolName: symbolName,
-          originalName: exportInfo.originalName,
+          originalName: tracedOriginalName,
           sourceFilePath: exportInfo.path,
           isTypeOnly: exportInfo.isTypeOnly,
-          crossPackageSource: exportInfo.crossPackageSource
+          crossPackageSource: exportInfo.crossPackageSource,
+          barrelBridgeExportPath: barrelBridgeExportPath
         });
         continue;
       }
@@ -1069,6 +1093,10 @@ var ruleMeta = {
           type: 'string'
         },
         description: 'The folder paths (relative to workspace root) containing packages whose imports will be checked and autofixed.'
+      },
+      preferImportedPackageSubpath: {
+        type: 'boolean',
+        description: 'Prefer subpaths on the mocked barrel package when they bridge to the dependency.'
       }
     },
     additionalProperties: false
@@ -1087,9 +1115,10 @@ function createRule(fs) {
   return {
     meta: ruleMeta,
     create: function create(context) {
-      var _options$applyToImpor;
+      var _options$applyToImpor, _options$preferImport;
       var options = context.options[0] || {};
       var applyToImportsFrom = (_options$applyToImpor = options.applyToImportsFrom) !== null && _options$applyToImpor !== void 0 ? _options$applyToImpor : _fileSystem.DEFAULT_TARGET_FOLDERS;
+      var preferImportedPackageSubpath = (_options$preferImport = options.preferImportedPackageSubpath) !== null && _options$preferImport !== void 0 ? _options$preferImport : false;
       var workspaceRoot = (0, _fileSystem.findWorkspaceRoot)({
         startPath: (0, _path.dirname)(context.filename),
         fs: fs,
@@ -1184,7 +1213,9 @@ function createRule(fs) {
                 exportMap: raContext.exportMap,
                 exportsMap: raContext.exportsMap,
                 currentExportPath: raContext.currentExportPath,
-                fs: fs
+                fs: fs,
+                barrelPackageName: raContext.packageName,
+                preferImportedPackageSubpath: preferImportedPackageSubpath
               }),
               _groupedByExport = _traceSymbolsToExport.groupedByExport,
               _crossPackageGroups = _traceSymbolsToExport.crossPackageGroups;
@@ -1281,7 +1312,9 @@ function createRule(fs) {
               exportMap: mockContext.exportMap,
               exportsMap: mockContext.exportsMap,
               currentExportPath: mockContext.currentExportPath,
-              fs: fs
+              fs: fs,
+              barrelPackageName: mockContext.packageName,
+              preferImportedPackageSubpath: preferImportedPackageSubpath
             }),
             groupedByExport = _traceSymbolsToExport2.groupedByExport,
             crossPackageGroups = _traceSymbolsToExport2.crossPackageGroups,
@@ -1373,8 +1406,9 @@ function createRule(fs) {
 
               // Get cross-package source info from the first symbol (all symbols in same group have same source)
               var crossPackageSource = _symbols[0].crossPackageSource;
+              var bridgeExportPath = _symbols[0].barrelBridgeExportPath;
               crossPackageMockGroups.push({
-                exportPath: crossPackageSource.exportPath,
+                exportPath: bridgeExportPath !== null && bridgeExportPath !== void 0 ? bridgeExportPath : crossPackageSource.exportPath,
                 importPath: _importPath,
                 propertyNames: _symbols.map(function (s) {
                   return s.symbolName;