account for default import

patternfly · Sep 26, 2024 · 2fa1ae7 · 2fa1ae7
1 parent 68e55d7
commit 2fa1ae7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 23 deletions.
diff --git a/packages/eslint-plugin-pf-codemods/src/rules/helpers/pfPackageMatches.ts b/packages/eslint-plugin-pf-codemods/src/rules/helpers/pfPackageMatches.ts
@@ -16,7 +16,7 @@ export function pfPackageMatches(
       parts[1] +
       "(/dist/(esm|js|dynamic))?" +
       (parts[2] ? "/" + parts[2] : "") +
-      (parts[1] === "react-component-groups"
+      (parts[1] === "react-component-groups" || parts[1] === "react-user-feedback"
         ? `(/.*)?$`
         : `(/(components|helpers${
             parts[1] === "react-icons" ? "|icons" : ""

diff --git a/...lugin-pf-codemods/src/rules/v6/userFeedbackWarnChanges/user-feedback-warn-changes.test.ts b/...lugin-pf-codemods/src/rules/v6/userFeedbackWarnChanges/user-feedback-warn-changes.test.ts
@@ -31,15 +31,15 @@ ruleTester.run("user-feedback-warn-changes", rule, {
         },
       ],
     },
-    // {
-    //   code: `import myDefaultModal from '@patternfly/react-user-feedback';`,
-    //   output: `import myDefaultModal from '@patternfly/react-user-feedback';`,
-    //   errors: [
-    //     {
-    //       message: `FeedbackModal no longer internally references a scss stylesheet. You may have to import "Feedback.css" located in the dist "@patternfly/react-user-feedback/dist/esm/Feedback/Feedback.css" to maintain styling on FeedbackModal.`,
-    //       type: "ImportDeclaration",
-    //     },
-    //   ],
-    // },
+    {
+      code: `import myDefaultModal from '@patternfly/react-user-feedback/dist/esm/Feedback/FeedbackModal';`,
+      output: `import myDefaultModal from '@patternfly/react-user-feedback/dist/esm/Feedback/FeedbackModal';`,
+      errors: [
+        {
+          message: `FeedbackModal no longer internally references a scss stylesheet. You may have to import "Feedback.css" located in the dist "@patternfly/react-user-feedback/dist/esm/Feedback/Feedback.css" to maintain styling on FeedbackModal.`,
+          type: "ImportDeclaration",
+        },
+      ],
+    },
   ],
 });
diff --git a/...int-plugin-pf-codemods/src/rules/v6/userFeedbackWarnChanges/user-feedback-warn-changes.ts b/...int-plugin-pf-codemods/src/rules/v6/userFeedbackWarnChanges/user-feedback-warn-changes.ts
@@ -8,24 +8,15 @@ module.exports = {
   create: function (context: Rule.RuleContext) {
     const imports = getAllImportsFromPackage(context, "@patternfly/react-user-feedback", ["FeedbackModal"]);
 
-    const namedImports = imports.filter(
-      (imp) => imp.type === "ImportSpecifier"
-    ) as ImportSpecifier[];
-
-    const feedbackModalImport = namedImports.find(
-      (specifier: { imported: { name: string } }) =>
-        specifier.imported.name === "FeedbackModal"
-    );
-
-    return !feedbackModalImport
+    return !imports.length
       ? {}
       : {
           ImportDeclaration(node: ImportDeclaration) {
             if (
               node.specifiers.find(
                 (specifier) =>
-                  specifier.type === "ImportSpecifier" &&
-                  specifier.imported.name === getComponentImportName(feedbackModalImport, ["FeedbackModal"])
+                  (specifier.type === "ImportSpecifier" || specifier.type === "ImportDefaultSpecifier")
+                  && getComponentImportName(specifier, ["FeedbackModal"]) === "FeedbackModal"
                 )
             ) {
               context.report({