@atlaskit/codemod-cli 0.24.2 → 0.24.4

package/dist/cjs/main.js

@@ -305,7 +305,7 @@ function _main() {
         case 4:
           _yield$parseArgs = _context5.sent;
           packages = _yield$parseArgs.packages;
-          _process$env$_PACKAGE = "0.24.2", _PACKAGE_VERSION_ = _process$env$_PACKAGE === void 0 ? '0.0.0-dev' : _process$env$_PACKAGE;
+          _process$env$_PACKAGE = "0.24.4", _PACKAGE_VERSION_ = _process$env$_PACKAGE === void 0 ? '0.0.0-dev' : _process$env$_PACKAGE;
           logger.log(_chalk.default.bgBlue(_chalk.default.black("\uD83D\uDCDA Atlassian-Frontend codemod library @ ".concat(_PACKAGE_VERSION_, " \uD83D\uDCDA"))));
           if (packages && packages.length > 0) {
             logger.log(_chalk.default.gray("Searching for codemods for newer versions of the following packages: ".concat(packages.map(function (pkg) {

package/dist/cjs/presets/migrate-to-new-buttons/codemods/next-migrate-to-new-button-variants.js

@@ -1,12 +1,16 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _codemodUtils = require("@atlaskit/codemod-utils");
 var _utils = require("@hypermod/utils");
 var _constants = require("../utils/constants");
+var _getDefaultImports = _interopRequireDefault(require("../utils/get-default-imports"));
+var _getSpecifierNames = _interopRequireDefault(require("../utils/get-specifier-names"));
 var _generateNewButtonElement = require("../utils/generate-new-button-element");
 var _hasUnsupportedProps = require("../utils/has-unsupported-props");
 var _ifVariantAlreadyImported = require("../utils/if-variant-already-imported");
@@ -18,31 +22,44 @@ var transformer = function transformer(file, api) {
   var j = api.jscodeshift;
   var fileSource = j(file.source);
   (0, _addCommentForCustomThemeButtons.addCommentForCustomThemeButtons)(fileSource, j);
-  var buttonImports = fileSource.find(j.ImportDeclaration).filter(function (path) {
-    return path.node.source.value === _constants.entryPointsMapping.Button || path.node.source.value === _constants.entryPointsMapping.LoadingButton || path.node.source.value === _constants.NEW_BUTTON_ENTRY_POINT;
+
+  // Find old buttons
+  var oldButtonImports = fileSource.find(j.ImportDeclaration).filter(function (path) {
+    return path.node.source.value === _constants.entryPointsMapping.Button || path.node.source.value === _constants.entryPointsMapping.LoadingButton || path.node.source.value === _constants.OLD_BUTTON_ENTRY_POINT;
   });
-  if (!buttonImports.length) {
+  if (!oldButtonImports.length) {
     return fileSource.toSource();
   }
-  var defaultButtonImport = buttonImports.find(j.Specifier).filter(function (path) {
-    return path.node.type === 'ImportDefaultSpecifier';
+  var oldDefaultDefaultImports = (0, _getDefaultImports.default)(oldButtonImports, j);
+  var oldDefaultImportSpecifiers = (0, _getSpecifierNames.default)(oldDefaultDefaultImports);
+
+  // Find new buttons
+  var newButtonImports = fileSource.find(j.ImportDeclaration).filter(function (path) {
+    return path.node.source.value === _constants.NEW_BUTTON_ENTRY_POINT;
   });
-  if (defaultButtonImport.length === 0) {
-    return fileSource.toSource();
-  }
-  var specifierIdentifier = defaultButtonImport.get(0).node.local.name;
-  var hasLinkIconButton = (0, _ifVariantAlreadyImported.checkIfVariantAlreadyImported)(_constants.NEW_BUTTON_VARIANTS.linkIcon, fileSource, j);
-  var hasLinkButton = (0, _ifVariantAlreadyImported.checkIfVariantAlreadyImported)(_constants.NEW_BUTTON_VARIANTS.link, fileSource, j);
-  var hasIconButton = (0, _ifVariantAlreadyImported.checkIfVariantAlreadyImported)(_constants.NEW_BUTTON_VARIANTS.icon, fileSource, j);
-  var hasDefaultLoadingButton = false;
-  var allButtons = fileSource.find(j.JSXElement).filter(function (path) {
-    return path.value.openingElement.name.type === 'JSXIdentifier' && path.value.openingElement.name.name === specifierIdentifier;
+  var newDefaultDefaultImports = (0, _getDefaultImports.default)(newButtonImports, j);
+  var newDefaultImportSpecifiers = (0, _getSpecifierNames.default)(newDefaultDefaultImports);
+  var loadingButtonDirectImportName = (0, _utils.getDefaultImportSpecifierName)(j, fileSource, _constants.entryPointsMapping.LoadingButton);
+
+  /**
+   * Which variants should be in this file?
+   *
+   * Any variants enabled here will be added to the final import statement.
+   * Initial values check if the variant is already imported in the file.
+   */
+  var hasVariant = {
+    defaultButton: (0, _ifVariantAlreadyImported.checkIfVariantAlreadyImported)(_constants.NEW_BUTTON_VARIANTS.default, _constants.NEW_BUTTON_ENTRY_POINT, fileSource, j, true),
+    linkButton: (0, _ifVariantAlreadyImported.checkIfVariantAlreadyImported)(_constants.NEW_BUTTON_VARIANTS.link, _constants.NEW_BUTTON_ENTRY_POINT, fileSource, j),
+    iconButton: (0, _ifVariantAlreadyImported.checkIfVariantAlreadyImported)(_constants.NEW_BUTTON_VARIANTS.icon, _constants.NEW_BUTTON_ENTRY_POINT, fileSource, j),
+    linkIconButton: (0, _ifVariantAlreadyImported.checkIfVariantAlreadyImported)(_constants.NEW_BUTTON_VARIANTS.linkIcon, _constants.NEW_BUTTON_ENTRY_POINT, fileSource, j)
+  };
+  var oldButtonElements = fileSource.find(j.JSXElement).filter(function (path) {
+    return path.value.openingElement.name.type === 'JSXIdentifier' && ((oldDefaultImportSpecifiers === null || oldDefaultImportSpecifiers === void 0 ? void 0 : oldDefaultImportSpecifiers.includes(path.value.openingElement.name.name)) || Object.values(_constants.OLD_BUTTON_VARIANTS).includes(path.value.openingElement.name.name));
   });
-  var buttonsWithoutUnsupportedProps = allButtons.filter(function (path) {
+  var oldButtonsWithoutUnsupportedProps = oldButtonElements.filter(function (path) {
     return !(0, _hasUnsupportedProps.ifHasUnsupportedProps)(path.value.openingElement.attributes);
   });
-  var loadingButtonImportName = (0, _utils.getDefaultImportSpecifierName)(j, fileSource, _constants.entryPointsMapping.LoadingButton);
-  buttonsWithoutUnsupportedProps.forEach(function (element) {
+  oldButtonsWithoutUnsupportedProps.forEach(function (element) {
     var _element$value$childr;
     var attributes = element.value.openingElement.attributes;
     if (!attributes) {
@@ -58,9 +75,14 @@ var transformer = function transformer(file, api) {
     var isLinkIconButton = hasHref && hasIcon && hasNoChildren && !isFitContainerIconButton;
     var isLinkButton = hasHref && !isLinkIconButton;
     var isIconButton = !hasHref && hasIcon && hasNoChildren && !isFitContainerIconButton;
-    var isDefaultButtonWithAnIcon = !isLinkIconButton && !isIconButton && !isFitContainerIconButton && hasIcon;
-    var isLoadingButton = element.value.openingElement.name.type === 'JSXIdentifier' && element.value.openingElement.name.name === loadingButtonImportName;
-    if (isDefaultButtonWithAnIcon) {
+    var isDefaultButton = !isLinkButton && !isLinkIconButton && !isIconButton && !isFitContainerIconButton;
+    var isDefaultVariantWithAnIcon = !isLinkIconButton && !isIconButton && !isFitContainerIconButton && hasIcon;
+    var isLoadingButton = element.value.openingElement.name.type === 'JSXIdentifier' && element.value.openingElement.name.name === loadingButtonDirectImportName;
+    var linkAppearanceAttribute = attributes.find(function (node) {
+      var _node$value, _node$name, _node$value2, _node$value3;
+      return node.type === 'JSXAttribute' && ((_node$value = node.value) === null || _node$value === void 0 ? void 0 : _node$value.type) === 'StringLiteral' && (node === null || node === void 0 || (_node$name = node.name) === null || _node$name === void 0 ? void 0 : _node$name.name) === 'appearance' && ((node === null || node === void 0 || (_node$value2 = node.value) === null || _node$value2 === void 0 ? void 0 : _node$value2.value) === 'link' || (node === null || node === void 0 || (_node$value3 = node.value) === null || _node$value3 === void 0 ? void 0 : _node$value3.value) === 'subtle-link');
+    });
+    if (isDefaultVariantWithAnIcon) {
       (0, _generateNewButtonElement.handleIconAttributes)(element.value, j);
     }
     if (isFitContainerIconButton) {
@@ -69,78 +91,113 @@ var transformer = function transformer(file, api) {
         isIconButton = true;
       }
     }
-    if (isLinkIconButton) {
-      hasLinkIconButton = true;
+    if (isLinkIconButton && !isLoadingButton) {
+      hasVariant.linkIconButton = true;
       j(element).replaceWith((0, _generateNewButtonElement.generateNewElement)(_constants.NEW_BUTTON_VARIANTS.linkIcon, element.value, j));
     }
-    if (isIconButton) {
-      hasIconButton = true;
+    if (isIconButton && !isLoadingButton) {
+      hasVariant.iconButton = true;
       j(element).replaceWith((0, _generateNewButtonElement.generateNewElement)(_constants.NEW_BUTTON_VARIANTS.icon, element.value, j));
     }
-    if (isLinkButton) {
-      hasLinkButton = true;
+    if (isLinkButton && !isLoadingButton) {
+      hasVariant.linkButton = true;
       j(element).replaceWith((0, _generateNewButtonElement.generateNewElement)(_constants.NEW_BUTTON_VARIANTS.link, element.value, j));
     }
-    if (isLoadingButton && !isIconButton) {
-      hasDefaultLoadingButton = true;
-      j(element).replaceWith((0, _generateNewButtonElement.generateNewElement)(_constants.NEW_BUTTON_VARIANTS.default, element.value, j));
+    if (isDefaultButton && !isLoadingButton) {
+      hasVariant.defaultButton = true;
+      j(element).replaceWith((0, _generateNewButtonElement.generateNewElement)(newDefaultImportSpecifiers !== null && newDefaultImportSpecifiers !== void 0 && newDefaultImportSpecifiers.length ?
+      // If new button already has a default import, use that incase it's aliased
+      newDefaultImportSpecifiers[0] : _constants.NEW_BUTTON_VARIANTS.default, element.value, j));
     }
-    var linkAppearanceAttribute = attributes.find(function (node) {
-      var _node$value, _node$name, _node$value2, _node$value3;
-      return node.type === 'JSXAttribute' && ((_node$value = node.value) === null || _node$value === void 0 ? void 0 : _node$value.type) === 'StringLiteral' && (node === null || node === void 0 || (_node$name = node.name) === null || _node$name === void 0 ? void 0 : _node$name.name) === 'appearance' && ((node === null || node === void 0 || (_node$value2 = node.value) === null || _node$value2 === void 0 ? void 0 : _node$value2.value) === 'link' || (node === null || node === void 0 || (_node$value3 = node.value) === null || _node$value3 === void 0 ? void 0 : _node$value3.value) === 'subtle-link');
-    });
-    if (!hasHref && linkAppearanceAttribute) {
+    if (isLoadingButton) {
+      var newElement = (0, _generateNewButtonElement.generateNewElement)(_constants.NEW_BUTTON_VARIANTS[isIconButton || isLinkIconButton ? 'icon' : 'default'], element.value, j);
+      if (isIconButton || isLinkIconButton) {
+        hasVariant.iconButton = true;
+      } else {
+        hasVariant.defaultButton = true;
+
+        // rename existing Button to LegacyButton
+        var existingDefaultButtonSpecifier = fileSource.find(j.ImportDefaultSpecifier).filter(function (path) {
+          var _path$value$local;
+          return ((_path$value$local = path.value.local) === null || _path$value$local === void 0 ? void 0 : _path$value$local.name) === _constants.NEW_BUTTON_VARIANTS.default;
+        });
+        if (existingDefaultButtonSpecifier.length > 0) {
+          fileSource.find(j.JSXElement).filter(function (path) {
+            return path.value.openingElement.name.type === 'JSXIdentifier' && path.value.openingElement.name.name === _constants.NEW_BUTTON_VARIANTS.default;
+          }).forEach(function (element) {
+            var _element$value$childr2, _element$value$childr3;
+            // find all default <Button> JSX elements and replace with <LegacyButton>
+            j(element).replaceWith(j.jsxElement(j.jsxOpeningElement(j.jsxIdentifier('LegacyButton'), element.value.openingElement.attributes, ((_element$value$childr2 = element.value.children) === null || _element$value$childr2 === void 0 ? void 0 : _element$value$childr2.length) === 0), ((_element$value$childr3 = element.value.children) === null || _element$value$childr3 === void 0 ? void 0 : _element$value$childr3.length) === 0 ? null : j.jsxClosingElement(j.jsxIdentifier('LegacyButton')), element.value.children));
+          });
+
+          // rename Button to LegacyButton in all call expressions i.e. render(Button), find(Button)
+          fileSource.find(j.CallExpression).find(j.Identifier).forEach(function (path) {
+            if (path.node.name === _constants.NEW_BUTTON_VARIANTS.default) {
+              path.node.name = 'LegacyButton';
+            }
+          });
+
+          // rename Button to LegacyButton in import declaration
+          existingDefaultButtonSpecifier.forEach(function (specifier) {
+            return j(specifier).replaceWith(j.importDefaultSpecifier(j.identifier('LegacyButton')));
+          });
+        }
+      }
+      j(element).replaceWith(newElement);
+      if (hasHref || linkAppearanceAttribute) {
+        (0, _codemodUtils.addCommentBefore)(j, j(newElement), (0, _constants.loadingButtonComment)({
+          hasHref: hasHref,
+          hasLinkAppearance: Boolean(linkAppearanceAttribute)
+        }), 'block');
+      }
+    } else if (!hasHref && linkAppearanceAttribute) {
       (0, _codemodUtils.addCommentBefore)(j, j(linkAppearanceAttribute), _constants.linkButtonMissingHrefComment, 'line');
     }
   });
 
   // modify import declarations
   var specifiers = [];
-  [hasLinkButton ? 'link' : null, hasIconButton ? 'icon' : null, hasLinkIconButton ? 'linkIcon' : null].forEach(function (variant) {
+  [hasVariant.linkButton ? 'link' : null, hasVariant.iconButton ? 'icon' : null, hasVariant.linkIconButton ? 'linkIcon' : null].forEach(function (variant) {
     if (variant) {
       specifiers.push(j.importSpecifier(j.identifier(_constants.NEW_BUTTON_VARIANTS[variant])));
     }
   });
-  var oldButtonImport = fileSource.find(j.ImportDeclaration).filter(function (path) {
-    return path.node.source.value === _constants.NEW_BUTTON_ENTRY_POINT || path.node.source.value === _constants.entryPointsMapping.Button || path.node.source.value === _constants.entryPointsMapping.LoadingButton;
-  });
   var remainingDefaultButtons = fileSource.find(j.JSXElement).filter(function (path) {
-    return path.value.openingElement.name.type === 'JSXIdentifier' && path.value.openingElement.name.name === specifierIdentifier && !(0, _hasUnsupportedProps.ifHasUnsupportedProps)(path.value.openingElement.attributes);
+    return path.value.openingElement.name.type === 'JSXIdentifier' && Boolean(oldDefaultImportSpecifiers === null || oldDefaultImportSpecifiers === void 0 ? void 0 : oldDefaultImportSpecifiers.includes(path.value.openingElement.name.name)) && !(0, _hasUnsupportedProps.ifHasUnsupportedProps)(path.value.openingElement.attributes);
   }).length > 0 || fileSource.find(j.CallExpression).filter(function (path) {
     return path.node.arguments.map(function (argument) {
       return argument.type === 'Identifier' && (argument === null || argument === void 0 ? void 0 : argument.name);
-    }).includes(specifierIdentifier);
+    }).some(function (name) {
+      return name && (oldDefaultImportSpecifiers === null || oldDefaultImportSpecifiers === void 0 ? void 0 : oldDefaultImportSpecifiers.includes(name));
+    });
   }).length > 0;
 
   // Loading buttons map back to default imports
-  if (specifierIdentifier === loadingButtonImportName) {
+  if (loadingButtonDirectImportName && oldDefaultImportSpecifiers !== null && oldDefaultImportSpecifiers !== void 0 && oldDefaultImportSpecifiers.includes(loadingButtonDirectImportName)) {
     fileSource
     // rename LoadingButton to Button in all call expressions i.e. render(LoadingButton), find(LoadingButton)
     .find(j.CallExpression).find(j.Identifier).forEach(function (path) {
-      if (path.node.name === loadingButtonImportName) {
+      if (path.node.name === loadingButtonDirectImportName) {
         path.node.name = _constants.NEW_BUTTON_VARIANTS.default;
       }
     });
-
-    // Only add the Button import if we found a default button, not icon only
-    if (hasDefaultLoadingButton) {
-      specifiers.push(j.importDefaultSpecifier(j.identifier(_constants.NEW_BUTTON_VARIANTS.default)));
-    }
   }
-  if (!specifiers.find(function (specifier) {
+
+  // Only add the Button import if we found a default button, not icon only
+  if (hasVariant.defaultButton || !specifiers.find(function (specifier) {
     return specifier.type === 'ImportDefaultSpecifier';
   }) && remainingDefaultButtons) {
     specifiers.push(j.importDefaultSpecifier(j.identifier(_constants.NEW_BUTTON_VARIANTS.default)));
   }
 
   // update import path for types imports
-  specifiers = (0, _importTypesFromNewEntryPoint.importTypesFromNewEntryPoint)(buttonImports, specifiers, j, fileSource);
-  var buttonsWithUnsupportedProps = allButtons.filter(function (path) {
+  specifiers = (0, _importTypesFromNewEntryPoint.importTypesFromNewEntryPoint)(oldButtonImports, specifiers, j, fileSource);
+  var oldButtonsWithUnsupportedProps = oldButtonElements.filter(function (path) {
     return (0, _hasUnsupportedProps.ifHasUnsupportedProps)(path.value.openingElement.attributes);
   });
-  if (buttonsWithUnsupportedProps.length) {
+  if (oldButtonsWithUnsupportedProps.length) {
     // add comment to all buttons with unsupported props: "component", "style", "css"
-    buttonsWithUnsupportedProps.forEach(function (element) {
+    oldButtonsWithUnsupportedProps.forEach(function (element) {
       var _element$value$openin;
       var attribute = (_element$value$openin = element.value.openingElement.attributes) === null || _element$value$openin === void 0 ? void 0 : _element$value$openin.find(function (node) {
         return node.type === 'JSXAttribute' && typeof node.name.name === 'string' && _constants.unsupportedProps.includes(node.name.name);
@@ -154,22 +211,63 @@ var transformer = function transformer(file, api) {
     if (specifiers.find(function (specifier) {
       return specifier.type === 'ImportDefaultSpecifier';
     })) {
-      (0, _renameDefaultButtonToLegacyButton.renameDefaultButtonToLegacyButtonImport)(oldButtonImport, buttonsWithUnsupportedProps, j);
+      (0, _renameDefaultButtonToLegacyButton.renameDefaultButtonToLegacyButtonImport)(oldButtonImports, oldButtonsWithUnsupportedProps, j);
     }
   }
   if (specifiers.length) {
+    var existingNewButtonImports = fileSource.find(j.ImportDeclaration).filter(function (path) {
+      return path.node.source.value === _constants.NEW_BUTTON_ENTRY_POINT;
+    });
     var newButtonImport = j.importDeclaration(specifiers, j.stringLiteral(_constants.NEW_BUTTON_ENTRY_POINT));
-    oldButtonImport.forEach(function (path) {
+    oldButtonImports.forEach(function (path) {
       var _path$node;
       newButtonImport.comments = path !== null && path !== void 0 && (_path$node = path.node) !== null && _path$node !== void 0 && _path$node.comments ? path.node.comments : undefined;
     });
-    oldButtonImport.replaceWith(newButtonImport);
+    if (existingNewButtonImports.length) {
+      existingNewButtonImports.forEach(function (path) {
+        // Merge specifiers from existing new button import with added specifiers
+        var mergedSpecifiers = [].concat((0, _toConsumableArray2.default)(specifiers.filter(function (specifier) {
+          var _path$node$specifiers;
+          if (specifier.type !== 'ImportDefaultSpecifier') {
+            return true;
+          }
+
+          // Ensure we don't add a duplicate default specifier if one is already imported
+          return !((_path$node$specifiers = path.node.specifiers) !== null && _path$node$specifiers !== void 0 && _path$node$specifiers.find(function (s) {
+            return s.type === 'ImportDefaultSpecifier';
+          }));
+        })), (0, _toConsumableArray2.default)(path.node.specifiers ? path.node.specifiers : [])) // Filter duplicates
+        .filter(function (specifier) {
+          if (specifier.type === 'ImportDefaultSpecifier') {
+            return true;
+          }
+          var isAlreadyImported = specifiers.find(function (s) {
+            var _specifier$local;
+            return s.type === 'ImportSpecifier' && s.imported.name === ((_specifier$local = specifier.local) === null || _specifier$local === void 0 ? void 0 : _specifier$local.name);
+          });
+          return !isAlreadyImported;
+        });
+        newButtonImport = j.importDeclaration(mergedSpecifiers, j.stringLiteral(_constants.NEW_BUTTON_ENTRY_POINT));
+      });
+      oldButtonImports.remove();
+      existingNewButtonImports.replaceWith(newButtonImport);
+    } else {
+      oldButtonImports.replaceWith(function (_, index) {
+        // Only replace the first import
+        if (index === 0) {
+          return newButtonImport;
+        }
+        // Remove the rest
+        return null;
+      });
+    }
   }
 
   // remove empty import declarations
   fileSource.find(j.ImportDeclaration).filter(function (path) {
     return (path.node.source.value === '@atlaskit/button' || path.node.source.value === '@atlaskit/button/types') && !!path.node.specifiers && path.node.specifiers.length === 0;
   }).remove();
+  (0, _addCommentForCustomThemeButtons.addCommentForCustomThemeButtons)(fileSource, j);
   return fileSource.toSource(_constants.PRINT_SETTINGS);
 };
 var _default = exports.default = transformer;

package/dist/cjs/presets/migrate-to-new-buttons/codemods/next-split-imports.js

@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _constants = require("../utils/constants");
+var _renameElements = _interopRequireDefault(require("../utils/rename-elements"));
+var _utils = require("@hypermod/utils");
 var transformer = function transformer(file, api) {
   var j = api.jscodeshift;
   var fileSource = j(file.source);
@@ -32,8 +34,14 @@ var transformer = function transformer(file, api) {
       return specifier.type === 'ImportDefaultSpecifier';
     });
     if (defaultSpecifier && defaultSpecifier.local) {
-      var defaultButtonImport = j.importDeclaration([j.importDefaultSpecifier(j.identifier(defaultSpecifier.local.name))], j.stringLiteral(_constants.entryPointsMapping.Button));
-      j(node).insertAfter(defaultButtonImport);
+      var existingSpecifier = (0, _utils.getDefaultImportSpecifierName)(j, fileSource, _constants.entryPointsMapping.Button);
+      if (existingSpecifier) {
+        var _defaultSpecifier$loc;
+        (0, _renameElements.default)((_defaultSpecifier$loc = defaultSpecifier.local) === null || _defaultSpecifier$loc === void 0 ? void 0 : _defaultSpecifier$loc.name, existingSpecifier, fileSource, j);
+      } else {
+        var newImport = j.importDeclaration([j.importDefaultSpecifier(j.identifier(defaultSpecifier.local.name))], j.stringLiteral(_constants.entryPointsMapping.Button));
+        j(node).insertAfter(newImport);
+      }
     }
     var namedSpecifiers = specifiers === null || specifiers === void 0 ? void 0 : specifiers.filter(function (specifier) {
       return specifier.type === 'ImportSpecifier';
@@ -55,8 +63,14 @@ var transformer = function transformer(file, api) {
     if (namedSpecifiers !== null && namedSpecifiers !== void 0 && namedSpecifiers.length) {
       namedSpecifiers.forEach(function (specifier) {
         if (specifier.local && specifier.type === 'ImportSpecifier' && specifier.local.name && _constants.entryPointsMapping[specifier.imported.name]) {
-          var newImport = j.importDeclaration([j.importDefaultSpecifier(j.identifier(specifier.local.name))], j.stringLiteral(_constants.entryPointsMapping[specifier.imported.name]));
-          j(node).insertAfter(newImport);
+          var _existingSpecifier = (0, _utils.getDefaultImportSpecifierName)(j, fileSource, _constants.entryPointsMapping[specifier.imported.name]);
+          if (_existingSpecifier) {
+            var _specifier$local;
+            (0, _renameElements.default)((_specifier$local = specifier.local) === null || _specifier$local === void 0 ? void 0 : _specifier$local.name, _existingSpecifier, fileSource, j);
+          } else {
+            var _newImport = j.importDeclaration([j.importDefaultSpecifier(j.identifier(specifier.local.name))], j.stringLiteral(_constants.entryPointsMapping[specifier.imported.name]));
+            j(node).insertAfter(_newImport);
+          }
         }
       });
     }

package/dist/cjs/presets/migrate-to-new-buttons/utils/add-comment-for-custom-theme-buttons.js

@@ -29,5 +29,5 @@ var addCommentForCustomThemeButtons = exports.addCommentForCustomThemeButtons =
   if (!customThemeButtonElement.length) {
     return;
   }
-  (0, _codemodUtils.addCommentBefore)(j, j(customThemeButtonElement.get(0).node.openingElement), _constants.customThemeButtonComment, 'line');
+  (0, _codemodUtils.addCommentBefore)(j, j(customThemeButtonElement.get(0).node.openingElement), _constants.customThemeButtonComment, 'block');
 };

package/dist/cjs/presets/migrate-to-new-buttons/utils/constants.js

@@ -3,17 +3,25 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.unsupportedProps = exports.migrateFitContainerButtonToIconButtonComment = exports.migrateFitContainerButtonToDefaultButtonComment = exports.linkButtonMissingHrefComment = exports.entryPointsMapping = exports.customThemeButtonComment = exports.buttonPropsNoLongerSupportedComment = exports.UNSAFE_SIZE_PROPS_MAP = exports.PRINT_SETTINGS = exports.NEW_BUTTON_VARIANTS = exports.NEW_BUTTON_ENTRY_POINT = exports.BUTTON_TYPES = void 0;
+exports.unsupportedProps = exports.migrateFitContainerButtonToIconButtonComment = exports.migrateFitContainerButtonToDefaultButtonComment = exports.loadingButtonComment = exports.linkButtonMissingHrefComment = exports.entryPointsMapping = exports.customThemeButtonComment = exports.buttonPropsNoLongerSupportedComment = exports.UNSAFE_SIZE_PROPS_MAP = exports.PRINT_SETTINGS = exports.OLD_BUTTON_VARIANTS = exports.OLD_BUTTON_ENTRY_POINT = exports.NEW_BUTTON_VARIANTS = exports.NEW_BUTTON_ENTRY_POINT = exports.BUTTON_TYPES = void 0;
 var PRINT_SETTINGS = exports.PRINT_SETTINGS = {
   quote: 'single'
 };
+
+/** NEW button **/
+var NEW_BUTTON_ENTRY_POINT = exports.NEW_BUTTON_ENTRY_POINT = '@atlaskit/button/new';
 var NEW_BUTTON_VARIANTS = exports.NEW_BUTTON_VARIANTS = {
   default: 'Button',
   link: 'LinkButton',
   icon: 'IconButton',
   linkIcon: 'LinkIconButton'
 };
-var NEW_BUTTON_ENTRY_POINT = exports.NEW_BUTTON_ENTRY_POINT = '@atlaskit/button/new';
+
+/** OLD button **/
+var OLD_BUTTON_ENTRY_POINT = exports.OLD_BUTTON_ENTRY_POINT = '@atlaskit/button';
+var OLD_BUTTON_VARIANTS = exports.OLD_BUTTON_VARIANTS = {
+  loading: 'LoadingButton'
+};
 var entryPointsMapping = exports.entryPointsMapping = {
   Button: '@atlaskit/button/standard-button',
   LoadingButton: '@atlaskit/button/loading-button',
@@ -31,4 +39,9 @@ var linkButtonMissingHrefComment = exports.linkButtonMissingHrefComment = "\"lin
 var buttonPropsNoLongerSupportedComment = exports.buttonPropsNoLongerSupportedComment = "Buttons with \"component\", \"css\" or \"style\" prop can't be automatically migrated with codemods. Please migrate it manually.";
 var migrateFitContainerButtonToDefaultButtonComment = exports.migrateFitContainerButtonToDefaultButtonComment = "Migrated to a default button with text which is from the icon label.";
 var migrateFitContainerButtonToIconButtonComment = exports.migrateFitContainerButtonToIconButtonComment = "\"shouldFitContainer\" is not available in icon buttons, please consider using a default button with text.";
-var customThemeButtonComment = exports.customThemeButtonComment = "CustomThemeButton will be deprecated. Please consider migrating to Pressable or Anchor Primitives with custom styles.";
+var customThemeButtonComment = exports.customThemeButtonComment = "CustomThemeButton will be deprecated. Please consider migrating to Pressable or Anchor Primitives with custom styles.";
+var loadingButtonComment = exports.loadingButtonComment = function loadingButtonComment(_ref) {
+  var hasLinkAppearance = _ref.hasLinkAppearance,
+    hasHref = _ref.hasHref;
+  return "This should be migrated to a new Button with a `isLoading` prop. ".concat(hasLinkAppearance ? "\"link\" and \"subtle-link\" appearances are not available for new loading buttons.\"" : '').concat(hasHref ? "The `href` attribute it not compatible with new loading buttons, because links should not need loading states." : '', " Please reconsider the design or change the appearance of the button.");
+};

package/dist/cjs/presets/migrate-to-new-buttons/utils/get-default-imports.js

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = getDefaultImports;
+/**
+ * Returns default import specifiers from the given import declarations.
+ */
+function getDefaultImports(importDeclarations, j) {
+  return importDeclarations.find(j.Specifier).filter(function (path) {
+    return path.node.type === 'ImportDefaultSpecifier';
+  });
+}

package/dist/cjs/presets/migrate-to-new-buttons/utils/get-specifier-names.js

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = getSpecifierNames;
+/**
+ * Returns a list of specifier names from the given specifiers.
+ */
+function getSpecifierNames(specifiers) {
+  return specifiers.length ? specifiers.paths().map(function (path) {
+    return path.get().value.local.name;
+  }) : undefined;
+}

package/dist/cjs/presets/migrate-to-new-buttons/utils/if-variant-already-imported.js

@@ -3,12 +3,20 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.checkIfVariantAlreadyImported = void 0;
-var _constants = require("./constants");
-var checkIfVariantAlreadyImported = exports.checkIfVariantAlreadyImported = function checkIfVariantAlreadyImported(variant, fileSource, j) {
-  return fileSource.find(j.ImportDeclaration).filter(function (path) {
-    return path.node.source.value === _constants.NEW_BUTTON_ENTRY_POINT;
-  }).find(j.ImportSpecifier).filter(function (path) {
+exports.findVariantAlreadyImported = exports.checkIfVariantAlreadyImported = void 0;
+var findVariantAlreadyImported = exports.findVariantAlreadyImported = function findVariantAlreadyImported(variant, entryPoint, fileSource, j) {
+  var isDefaultSpecifier = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
+  var imports = fileSource.find(j.ImportDeclaration).filter(function (path) {
+    return path.node.source.value === entryPoint;
+  });
+  if (isDefaultSpecifier) {
+    return imports.find(j.ImportDefaultSpecifier);
+  }
+  return imports.find(j.ImportSpecifier).filter(function (path) {
     return path.node.imported.name === variant;
-  }).length > 0;
+  });
+};
+var checkIfVariantAlreadyImported = exports.checkIfVariantAlreadyImported = function checkIfVariantAlreadyImported(variant, entryPoint, fileSource, j) {
+  var isDefaultSpecifier = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
+  return findVariantAlreadyImported(variant, entryPoint, fileSource, j, isDefaultSpecifier).length > 0;
 };

package/dist/cjs/presets/migrate-to-new-buttons/utils/rename-elements.js

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = renameElements;
+function renameElements(elementName, newElementName, fileSource, j) {
+  var oldElements = fileSource.find(j.JSXElement).filter(function (path) {
+    return path.value.openingElement.name.type === 'JSXIdentifier' && path.value.openingElement.name.name === elementName;
+  });
+
+  // Rename elements to match existing import name
+  oldElements.forEach(function (element) {
+    var _element$value$childr, _element$value$childr2;
+    var newElement = j.jsxElement(j.jsxOpeningElement(j.jsxIdentifier(newElementName), element.value.openingElement.attributes, ((_element$value$childr = element.value.children) === null || _element$value$childr === void 0 ? void 0 : _element$value$childr.length) === 0), ((_element$value$childr2 = element.value.children) === null || _element$value$childr2 === void 0 ? void 0 : _element$value$childr2.length) === 0 ? null : j.jsxClosingElement(j.jsxIdentifier(newElementName)), element.value.children);
+    j(element).replaceWith(newElement);
+  });
+}