@atlaskit/codemod-cli 0.17.4 → 0.17.6

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/codemod-cli
 
+## 0.17.6
+
+### Patch Changes
+
+- [#61943](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/61943) [`dfdb42df4b4c`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/dfdb42df4b4c) - Now building the `@atlaskit/tokens` package when during `"prestart"` as tokens is required to be built for some of the patterns to run.
+
+## 0.17.5
+
+### Patch Changes
+
+- [#59501](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/59501) [`2c30839b5156`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/2c30839b5156) - Button migration codemods- updated import path to the new entry point "@atlaskit/button/new"
+
 ## 0.17.4
 
 ### Patch Changes

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.17.4", _PACKAGE_VERSION_ = _process$env$_PACKAGE === void 0 ? '0.0.0-dev' : _process$env$_PACKAGE;
+          _process$env$_PACKAGE = "0.17.6", _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

@@ -11,7 +11,8 @@ var _hasUnsupportedProps = require("../utils/has-unsupported-props");
 var _ifVariantAlreadyImported = require("../utils/if-variant-already-imported");
 var _renameDefaultButtonToLegacyButton = require("../utils/rename-default-button-to-legacy-button");
 var _migrateFitContainerIconButton = require("../utils/migrate-fit-container-icon-button");
-var transformer = function transformer(file, api, options) {
+var _importTypesFromNewEntryPoint = require("../utils/import-types-from-new-entry-point");
+var transformer = function transformer(file, api) {
   var j = api.jscodeshift;
   var fileSource = j(file.source);
   var buttonImports = fileSource.find(j.ImportDeclaration).filter(function (path) {
@@ -27,9 +28,9 @@ var transformer = function transformer(file, api, options) {
     return fileSource.toSource();
   }
   var specifierIdentifier = defaultButtonImport.get(0).node.local.name;
-  var hasLinkIconButton = (0, _ifVariantAlreadyImported.checkIfVariantAlreadyImported)(_constants.NEW_BUTTON_VARIANTS.linkIcon.import, fileSource, j);
-  var hasLinkButton = (0, _ifVariantAlreadyImported.checkIfVariantAlreadyImported)(_constants.NEW_BUTTON_VARIANTS.link.import, fileSource, j);
-  var hasIconButton = (0, _ifVariantAlreadyImported.checkIfVariantAlreadyImported)(_constants.NEW_BUTTON_VARIANTS.icon.import, fileSource, j);
+  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 allButtons = fileSource.find(j.JSXElement).filter(function (path) {
     return path.value.openingElement.name.type === 'JSXIdentifier' && path.value.openingElement.name.name === specifierIdentifier;
   });
@@ -64,15 +65,15 @@ var transformer = function transformer(file, api, options) {
     }
     if (isLinkIconButton) {
       hasLinkIconButton = true;
-      j(element).replaceWith((0, _generateNewButtonElement.generateNewElement)(_constants.NEW_BUTTON_VARIANTS.linkIcon.as, element.value, j));
+      j(element).replaceWith((0, _generateNewButtonElement.generateNewElement)(_constants.NEW_BUTTON_VARIANTS.linkIcon, element.value, j));
     }
     if (isIconButton) {
       hasIconButton = true;
-      j(element).replaceWith((0, _generateNewButtonElement.generateNewElement)(_constants.NEW_BUTTON_VARIANTS.icon.as, element.value, j));
+      j(element).replaceWith((0, _generateNewButtonElement.generateNewElement)(_constants.NEW_BUTTON_VARIANTS.icon, element.value, j));
     }
     if (isLinkButton) {
       hasLinkButton = true;
-      j(element).replaceWith((0, _generateNewButtonElement.generateNewElement)(_constants.NEW_BUTTON_VARIANTS.link.as, element.value, j));
+      j(element).replaceWith((0, _generateNewButtonElement.generateNewElement)(_constants.NEW_BUTTON_VARIANTS.link, element.value, j));
     }
     if (!hasHref && attributes.find(function (node) {
       var _node$value, _node$name, _node$value2, _node$value3;
@@ -82,10 +83,12 @@ var transformer = function transformer(file, api, options) {
       (0, _codemodUtils.addCommentBefore)(j, [element], _constants.linkButtonMissingHrefComment);
     }
   });
+
+  // modify import declarations
   var specifiers = [];
   [hasLinkButton ? 'link' : null, hasIconButton ? 'icon' : null, hasLinkIconButton ? 'linkIcon' : null].forEach(function (variant) {
     if (variant) {
-      specifiers.push(j.importSpecifier(j.identifier(_constants.NEW_BUTTON_VARIANTS[variant].import), j.identifier(_constants.NEW_BUTTON_VARIANTS[variant].as)));
+      specifiers.push(j.importSpecifier(j.identifier(_constants.NEW_BUTTON_VARIANTS[variant])));
     }
   });
   var oldButtonImport = fileSource.find(j.ImportDeclaration).filter(function (path) {
@@ -99,8 +102,11 @@ var transformer = function transformer(file, api, options) {
     }).includes(specifierIdentifier);
   }).length > 0;
   if (remainingDefaultButtons) {
-    specifiers.push(j.importSpecifier(j.identifier(_constants.NEW_BUTTON_VARIANTS.default.import), j.identifier(specifierIdentifier)));
+    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) {
     return (0, _hasUnsupportedProps.ifHasUnsupportedProps)(path.value.openingElement.attributes);
   });
@@ -118,28 +124,19 @@ var transformer = function transformer(file, api, options) {
 
     // rename all buttons with unsupported props to LegacyButton if default new button is imported
     if (specifiers.find(function (specifier) {
-      return specifier.imported.name === _constants.NEW_BUTTON_VARIANTS.default.import;
+      return specifier.type === 'ImportDefaultSpecifier';
     })) {
       (0, _renameDefaultButtonToLegacyButton.renameDefaultButtonToLegacyButtonImport)(oldButtonImport, buttonsWithUnsupportedProps, j);
     }
   }
-  if (specifiers.length || remainingDefaultButtons) {
-    // split the type imports into a separate import
-    var typeSpecifier = buttonImports.find(j.ImportSpecifier).filter(function (path) {
-      return path.node.imported.name === _constants.ButtonPropsTypeName;
-    });
-    if (typeSpecifier.length > 0) {
-      oldButtonImport.insertBefore(j.importDeclaration([j.importSpecifier(j.identifier(_constants.ButtonPropsTypeName), j.identifier(typeSpecifier.get(0).node.local.name))], j.stringLiteral(_constants.entryPointsMapping.Button), 'type'));
-    }
+  if (specifiers.length) {
     oldButtonImport.replaceWith(j.importDeclaration(specifiers, j.stringLiteral(_constants.NEW_BUTTON_ENTRY_POINT)));
-
-    // add eslint-disable-next-line @atlaskit/design-system/no-banned-imports comment if unsafe import is allowed in custom options
-    if (_constants.NEW_BUTTON_ENTRY_POINT.includes('unsafe') && (options === null || options === void 0 ? void 0 : options.allowUnsafeImport) === true) {
-      (0, _codemodUtils.addCommentBefore)(j, fileSource.find(j.ImportDeclaration).filter(function (path) {
-        return path.node.source.value === _constants.NEW_BUTTON_ENTRY_POINT;
-      }), _constants.eslintDisableComment, 'line', '');
-    }
   }
+
+  // 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();
   return fileSource.toSource(_constants.PRINT_SETTINGS);
 };
 var _default = exports.default = transformer;

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

@@ -33,19 +33,19 @@ var transformer = function transformer(file, api) {
       var defaultButtonImport = j.importDeclaration([j.importDefaultSpecifier(j.identifier(defaultSpecifier.local.name))], j.stringLiteral(_constants.entryPointsMapping.Button));
       j(node).insertAfter(defaultButtonImport);
     }
-    var defaultTypeSpecifiers = specifiers === null || specifiers === void 0 ? void 0 : specifiers.filter(function (specifier) {
-      return specifier.importKind === 'type';
-    });
-    if (defaultTypeSpecifiers !== null && defaultTypeSpecifiers !== void 0 && defaultTypeSpecifiers.length) {
-      var typeImport = j.importDeclaration(defaultTypeSpecifiers, j.stringLiteral('@atlaskit/button/types'));
-      j(node).insertAfter(typeImport);
-    }
     var valueSpecifiers = specifiers === null || specifiers === void 0 ? void 0 : specifiers.filter(function (specifier) {
       return specifier.type === 'ImportSpecifier';
     });
+    var newTypeSpecifier = valueSpecifiers === null || valueSpecifiers === void 0 ? void 0 : valueSpecifiers.filter(function (specifier) {
+      return specifier.type === 'ImportSpecifier' && (specifier.imported.name === 'Appearance' || specifier.imported.name === 'Spacing');
+    });
     var otherTypeSpecifiers = valueSpecifiers === null || valueSpecifiers === void 0 ? void 0 : valueSpecifiers.filter(function (specifier) {
       return _constants.BUTTON_TYPES.includes(specifier.imported.name);
     });
+    if (newTypeSpecifier !== null && newTypeSpecifier !== void 0 && newTypeSpecifier.length) {
+      var typeImport = j.importDeclaration(newTypeSpecifier, j.stringLiteral('@atlaskit/button/types'));
+      j(node).insertAfter(typeImport);
+    }
     if (otherTypeSpecifiers !== null && otherTypeSpecifiers !== void 0 && otherTypeSpecifiers.length) {
       var _typeImport = j.importDeclaration(otherTypeSpecifiers, j.stringLiteral('@atlaskit/button'));
       j(node).insertAfter(_typeImport);

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

@@ -12,11 +12,11 @@ var _nextSplitImports = _interopRequireDefault(require("./codemods/next-split-im
 var _nextMigrateToNewButtonVariants = _interopRequireDefault(require("./codemods/next-migrate-to-new-button-variants"));
 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 transformer(_x, _x2, _x3) {
+function transformer(_x, _x2) {
   return _transformer.apply(this, arguments);
 }
 function _transformer() {
-  _transformer = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(file, api, options) {
+  _transformer = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(file, api) {
     var transformers, src;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -29,7 +29,7 @@ function _transformer() {
             }
             var nextSrc = transformer(_objectSpread(_objectSpread({}, file), {}, {
               source: src
-            }), api, options);
+            }), api);
             if (nextSrc) {
               src = nextSrc;
             }

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

@@ -3,38 +3,24 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.unsupportedProps = exports.migrateFitContainerButtonToIconButtonComment = exports.migrateFitContainerButtonToDefaultButtonComment = exports.linkButtonMissingHrefComment = exports.iconPropsNoLongerSupportedComment = exports.eslintDisableComment = exports.entryPointsMapping = exports.buttonPropsNoLongerSupportedComment = exports.PRINT_SETTINGS = exports.NEW_BUTTON_VARIANTS = exports.NEW_BUTTON_ENTRY_POINT = exports.ButtonPropsTypeName = exports.BUTTON_TYPES = void 0;
+exports.unsupportedProps = exports.migrateFitContainerButtonToIconButtonComment = exports.migrateFitContainerButtonToDefaultButtonComment = exports.linkButtonMissingHrefComment = exports.iconPropsNoLongerSupportedComment = exports.entryPointsMapping = exports.buttonPropsNoLongerSupportedComment = exports.PRINT_SETTINGS = exports.NEW_BUTTON_VARIANTS = exports.NEW_BUTTON_ENTRY_POINT = exports.BUTTON_TYPES = void 0;
 var PRINT_SETTINGS = exports.PRINT_SETTINGS = {
   quote: 'single'
 };
 var NEW_BUTTON_VARIANTS = exports.NEW_BUTTON_VARIANTS = {
-  default: {
-    import: 'UNSAFE_BUTTON',
-    as: 'Button'
-  },
-  link: {
-    import: 'UNSAFE_LINK_BUTTON',
-    as: 'LinkButton'
-  },
-  icon: {
-    import: 'UNSAFE_ICON_BUTTON',
-    as: 'IconButton'
-  },
-  linkIcon: {
-    import: 'UNSAFE_LINK_ICON_BUTTON',
-    as: 'LinkIconButton'
-  }
+  default: 'Button',
+  link: 'LinkButton',
+  icon: 'IconButton',
+  linkIcon: 'LinkIconButton'
 };
-var NEW_BUTTON_ENTRY_POINT = exports.NEW_BUTTON_ENTRY_POINT = '@atlaskit/button/unsafe';
+var NEW_BUTTON_ENTRY_POINT = exports.NEW_BUTTON_ENTRY_POINT = '@atlaskit/button/new';
 var entryPointsMapping = exports.entryPointsMapping = {
   Button: '@atlaskit/button/standard-button',
   LoadingButton: '@atlaskit/button/loading-button',
   ButtonGroup: '@atlaskit/button/button-group',
   CustomThemeButton: '@atlaskit/button/custom-theme-button'
 };
-var BUTTON_TYPES = exports.BUTTON_TYPES = ['Appearance', 'Spacing', 'BaseOwnProps', 'BaseProps', 'ButtonProps', 'LoadingButtonProps', 'LoadingButtonOwnProps', 'ThemeTokens', 'ThemeProps', 'InteractionState', 'CustomThemeButtonProps', 'CustomThemeButtonOwnProps'];
-var eslintDisableComment = exports.eslintDisableComment = 'eslint-disable-next-line @atlaskit/design-system/no-banned-imports';
-var ButtonPropsTypeName = exports.ButtonPropsTypeName = 'ButtonProps';
+var BUTTON_TYPES = exports.BUTTON_TYPES = ['BaseOwnProps', 'BaseProps', 'ButtonProps', 'LoadingButtonProps', 'LoadingButtonOwnProps', 'ThemeTokens', 'ThemeProps', 'InteractionState', 'CustomThemeButtonProps', 'CustomThemeButtonOwnProps'];
 var unsupportedProps = exports.unsupportedProps = ['component', 'css', 'style'];
 var linkButtonMissingHrefComment = exports.linkButtonMissingHrefComment = "\"link\" and \"subtle-link\" appearances are only available in LinkButton, please either provide a href prop then migrate to LinkButton, or remove the appearance from the default button.";
 var iconPropsNoLongerSupportedComment = exports.iconPropsNoLongerSupportedComment = "\"glyph\", \"primaryColor\", \"secondaryColor\" and \"testId\" are no longer supported in button icons, please refactor the code and/or revisit the UI.";

package/dist/cjs/presets/migrate-to-new-buttons/utils/generate-new-button-element.js

@@ -35,7 +35,6 @@ var moveSizeAndLabelAttributes = exports.moveSizeAndLabelAttributes = function m
     var iconJSXElementAttributes = iconElement.openingElement.attributes;
     // add inlined comment to the icon if it has any attributes other than label and size
     if (Array.isArray(iconJSXElementAttributes)) {
-      var _sizeAttribute$value;
       var ifIconAttributeEitherLabelOrSize = iconJSXElementAttributes === null || iconJSXElementAttributes === void 0 ? void 0 : iconJSXElementAttributes.every(function (attribute) {
         return attribute.type === 'JSXAttribute' && typeof attribute.name.name === 'string' && (attribute.name.name === 'size' || attribute.name.name === 'label');
       });
@@ -53,7 +52,7 @@ var moveSizeAndLabelAttributes = exports.moveSizeAndLabelAttributes = function m
       var sizeAttribute = iconJSXElementAttributes.find(function (attribute) {
         return attribute.type === 'JSXAttribute' && attribute.name.name === 'size';
       });
-      if (sizeAttribute && sizeAttribute.type === 'JSXAttribute' && ((_sizeAttribute$value = sizeAttribute.value) === null || _sizeAttribute$value === void 0 ? void 0 : _sizeAttribute$value.type) === 'Literal' && sizeAttribute.value.value !== 'medium') {
+      if (sizeAttribute && sizeAttribute.type === 'JSXAttribute') {
         sizeAttribute.name.name = iconRenamed ? 'UNSAFE_size' : "UNSAFE_".concat(iconAttr.name.name, "_size");
         attributes === null || attributes === void 0 || attributes.push(sizeAttribute);
       }
@@ -68,7 +67,7 @@ var moveSizeAndLabelAttributes = exports.moveSizeAndLabelAttributes = function m
 var generateNewElement = exports.generateNewElement = function generateNewElement(variant, element, j) {
   var attributes = element.openingElement.attributes;
   var iconAttrs = attributes && getIconAttributes(attributes);
-  var isIconOrLinkIcon = variant === _constants.NEW_BUTTON_VARIANTS.icon.as || variant === _constants.NEW_BUTTON_VARIANTS.linkIcon.as;
+  var isIconOrLinkIcon = variant === _constants.NEW_BUTTON_VARIANTS.icon || variant === _constants.NEW_BUTTON_VARIANTS.linkIcon;
   if (isIconOrLinkIcon && iconAttrs !== null && iconAttrs !== void 0 && iconAttrs.length) {
     moveSizeAndLabelAttributes(element, j, true);
 

package/dist/cjs/presets/migrate-to-new-buttons/utils/import-types-from-new-entry-point.js

@@ -0,0 +1,39 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.importTypesFromNewEntryPoint = void 0;
+var _constants = require("./constants");
+var importTypesFromNewEntryPoint = exports.importTypesFromNewEntryPoint = function importTypesFromNewEntryPoint(buttonImports, specifiers, j, fileSource) {
+  var buttonPropsTypeSpecifier = buttonImports.find(j.ImportSpecifier).filter(function (path) {
+    return path.node.imported.name === 'ButtonProps';
+  });
+  if (buttonPropsTypeSpecifier.length > 0) {
+    var typeSpecifier;
+    specifiers.forEach(function (specifier) {
+      if (specifier.type === 'ImportDefaultSpecifier') {
+        typeSpecifier = j.importSpecifier(j.identifier("".concat(_constants.NEW_BUTTON_VARIANTS.default, "Props")), j.identifier(buttonPropsTypeSpecifier.get(0).node.local.name));
+      } else {
+        typeSpecifier = j.importSpecifier(j.identifier("".concat(specifier.imported.name, "Props")), j.identifier(buttonPropsTypeSpecifier.get(0).node.local.name));
+      }
+    });
+    if (typeSpecifier) {
+      // @ts-ignore
+      typeSpecifier.importKind = 'type';
+      specifiers.push(typeSpecifier);
+    }
+  }
+  var appearanceAndSpacingTypeSpecifier = fileSource.find(j.ImportDeclaration).filter(function (path) {
+    return path.node.source.value === '@atlaskit/button' || path.node.source.value === '@atlaskit/button/types';
+  }).find(j.ImportSpecifier).filter(function (path) {
+    return path.node.imported.name === 'Appearance' || path.node.imported.name === 'Spacing';
+  });
+  if (appearanceAndSpacingTypeSpecifier.length) {
+    appearanceAndSpacingTypeSpecifier.forEach(function (specifier) {
+      specifiers.push(specifier.node);
+      j(specifier).remove();
+    });
+  }
+  return specifiers;
+};

package/dist/cjs/presets/migrate-to-new-buttons/utils/migrate-fit-container-icon-button.js

@@ -23,7 +23,7 @@ var migrateFitContainerIconButton = exports.migrateFitContainerIconButton = func
     j(element).find(j.JSXAttribute).filter(function (path) {
       return path.node.name.name === 'iconBefore' || path.node.name.name === 'iconAfter';
     }).remove();
-    var newButton = j.jsxElement(j.jsxOpeningElement(j.jsxIdentifier(_constants.NEW_BUTTON_VARIANTS.default.as), attributes), j.jsxClosingElement(j.jsxIdentifier(_constants.NEW_BUTTON_VARIANTS.default.as)), [j.jsxText(formattedLabel)]);
+    var newButton = j.jsxElement(j.jsxOpeningElement(j.jsxIdentifier(_constants.NEW_BUTTON_VARIANTS.default), attributes), j.jsxClosingElement(j.jsxIdentifier(_constants.NEW_BUTTON_VARIANTS.default)), [j.jsxText(formattedLabel)]);
     j(element).replaceWith(newButton);
     (0, _codemodUtils.addCommentBefore)(j, j(newButton).find(j.JSXAttribute).filter(function (path) {
       return path.node.name.name === 'shouldFitContainer';

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

@@ -1,11 +1,12 @@
 import { addCommentBefore } from '@atlaskit/codemod-utils';
-import { PRINT_SETTINGS, NEW_BUTTON_VARIANTS, entryPointsMapping, NEW_BUTTON_ENTRY_POINT, eslintDisableComment, ButtonPropsTypeName, linkButtonMissingHrefComment, buttonPropsNoLongerSupportedComment, unsupportedProps } from '../utils/constants';
+import { PRINT_SETTINGS, NEW_BUTTON_VARIANTS, entryPointsMapping, NEW_BUTTON_ENTRY_POINT, linkButtonMissingHrefComment, buttonPropsNoLongerSupportedComment, unsupportedProps } from '../utils/constants';
 import { generateNewElement, moveSizeAndLabelAttributes } from '../utils/generate-new-button-element';
 import { ifHasUnsupportedProps } from '../utils/has-unsupported-props';
 import { checkIfVariantAlreadyImported } from '../utils/if-variant-already-imported';
 import { renameDefaultButtonToLegacyButtonImport } from '../utils/rename-default-button-to-legacy-button';
 import { migrateFitContainerIconButton } from '../utils/migrate-fit-container-icon-button';
-const transformer = (file, api, options) => {
+import { importTypesFromNewEntryPoint } from '../utils/import-types-from-new-entry-point';
+const transformer = (file, api) => {
   const j = api.jscodeshift;
   const fileSource = j(file.source);
   const buttonImports = fileSource.find(j.ImportDeclaration).filter(path => path.node.source.value === entryPointsMapping.Button || path.node.source.value === NEW_BUTTON_ENTRY_POINT);
@@ -17,9 +18,9 @@ const transformer = (file, api, options) => {
     return fileSource.toSource();
   }
   const specifierIdentifier = defaultButtonImport.get(0).node.local.name;
-  let hasLinkIconButton = checkIfVariantAlreadyImported(NEW_BUTTON_VARIANTS.linkIcon.import, fileSource, j);
-  let hasLinkButton = checkIfVariantAlreadyImported(NEW_BUTTON_VARIANTS.link.import, fileSource, j);
-  let hasIconButton = checkIfVariantAlreadyImported(NEW_BUTTON_VARIANTS.icon.import, fileSource, j);
+  let hasLinkIconButton = checkIfVariantAlreadyImported(NEW_BUTTON_VARIANTS.linkIcon, fileSource, j);
+  let hasLinkButton = checkIfVariantAlreadyImported(NEW_BUTTON_VARIANTS.link, fileSource, j);
+  let hasIconButton = checkIfVariantAlreadyImported(NEW_BUTTON_VARIANTS.icon, fileSource, j);
   const allButtons = fileSource.find(j.JSXElement).filter(path => path.value.openingElement.name.type === 'JSXIdentifier' && path.value.openingElement.name.name === specifierIdentifier);
   const buttonsWithoutUnsupportedProps = allButtons.filter(path => !ifHasUnsupportedProps(path.value.openingElement.attributes));
   buttonsWithoutUnsupportedProps.forEach(element => {
@@ -50,15 +51,15 @@ const transformer = (file, api, options) => {
     }
     if (isLinkIconButton) {
       hasLinkIconButton = true;
-      j(element).replaceWith(generateNewElement(NEW_BUTTON_VARIANTS.linkIcon.as, element.value, j));
+      j(element).replaceWith(generateNewElement(NEW_BUTTON_VARIANTS.linkIcon, element.value, j));
     }
     if (isIconButton) {
       hasIconButton = true;
-      j(element).replaceWith(generateNewElement(NEW_BUTTON_VARIANTS.icon.as, element.value, j));
+      j(element).replaceWith(generateNewElement(NEW_BUTTON_VARIANTS.icon, element.value, j));
     }
     if (isLinkButton) {
       hasLinkButton = true;
-      j(element).replaceWith(generateNewElement(NEW_BUTTON_VARIANTS.link.as, element.value, j));
+      j(element).replaceWith(generateNewElement(NEW_BUTTON_VARIANTS.link, element.value, j));
     }
     if (!hasHref && attributes.find(node => {
       var _node$value, _node$name, _node$value2, _node$value3;
@@ -68,17 +69,22 @@ const transformer = (file, api, options) => {
       addCommentBefore(j, [element], linkButtonMissingHrefComment);
     }
   });
-  const specifiers = [];
+
+  // modify import declarations
+  let specifiers = [];
   [hasLinkButton ? 'link' : null, hasIconButton ? 'icon' : null, hasLinkIconButton ? 'linkIcon' : null].forEach(variant => {
     if (variant) {
-      specifiers.push(j.importSpecifier(j.identifier(NEW_BUTTON_VARIANTS[variant].import), j.identifier(NEW_BUTTON_VARIANTS[variant].as)));
+      specifiers.push(j.importSpecifier(j.identifier(NEW_BUTTON_VARIANTS[variant])));
     }
   });
   const oldButtonImport = fileSource.find(j.ImportDeclaration).filter(path => path.node.source.value === NEW_BUTTON_ENTRY_POINT || path.node.source.value === entryPointsMapping.Button);
   const remainingDefaultButtons = fileSource.find(j.JSXElement).filter(path => path.value.openingElement.name.type === 'JSXIdentifier' && path.value.openingElement.name.name === specifierIdentifier && !ifHasUnsupportedProps(path.value.openingElement.attributes)).length > 0 || fileSource.find(j.CallExpression).filter(path => path.node.arguments.map(argument => argument.type === 'Identifier' && (argument === null || argument === void 0 ? void 0 : argument.name)).includes(specifierIdentifier)).length > 0;
   if (remainingDefaultButtons) {
-    specifiers.push(j.importSpecifier(j.identifier(NEW_BUTTON_VARIANTS.default.import), j.identifier(specifierIdentifier)));
+    specifiers.push(j.importDefaultSpecifier(j.identifier(NEW_BUTTON_VARIANTS.default)));
   }
+
+  // update import path for types imports
+  specifiers = importTypesFromNewEntryPoint(buttonImports, specifiers, j, fileSource);
   const buttonsWithUnsupportedProps = allButtons.filter(path => ifHasUnsupportedProps(path.value.openingElement.attributes));
   if (buttonsWithUnsupportedProps.length) {
     // add comment to all buttons with unsupported props: "component", "style", "css"
@@ -91,23 +97,16 @@ const transformer = (file, api, options) => {
     });
 
     // rename all buttons with unsupported props to LegacyButton if default new button is imported
-    if (specifiers.find(specifier => specifier.imported.name === NEW_BUTTON_VARIANTS.default.import)) {
+    if (specifiers.find(specifier => specifier.type === 'ImportDefaultSpecifier')) {
       renameDefaultButtonToLegacyButtonImport(oldButtonImport, buttonsWithUnsupportedProps, j);
     }
   }
-  if (specifiers.length || remainingDefaultButtons) {
-    // split the type imports into a separate import
-    const typeSpecifier = buttonImports.find(j.ImportSpecifier).filter(path => path.node.imported.name === ButtonPropsTypeName);
-    if (typeSpecifier.length > 0) {
-      oldButtonImport.insertBefore(j.importDeclaration([j.importSpecifier(j.identifier(ButtonPropsTypeName), j.identifier(typeSpecifier.get(0).node.local.name))], j.stringLiteral(entryPointsMapping.Button), 'type'));
-    }
+  if (specifiers.length) {
     oldButtonImport.replaceWith(j.importDeclaration(specifiers, j.stringLiteral(NEW_BUTTON_ENTRY_POINT)));
-
-    // add eslint-disable-next-line @atlaskit/design-system/no-banned-imports comment if unsafe import is allowed in custom options
-    if (NEW_BUTTON_ENTRY_POINT.includes('unsafe') && (options === null || options === void 0 ? void 0 : options.allowUnsafeImport) === true) {
-      addCommentBefore(j, fileSource.find(j.ImportDeclaration).filter(path => path.node.source.value === NEW_BUTTON_ENTRY_POINT), eslintDisableComment, 'line', '');
-    }
   }
+
+  // remove empty import declarations
+  fileSource.find(j.ImportDeclaration).filter(path => (path.node.source.value === '@atlaskit/button' || path.node.source.value === '@atlaskit/button/types') && !!path.node.specifiers && path.node.specifiers.length === 0).remove();
   return fileSource.toSource(PRINT_SETTINGS);
 };
 export default transformer;

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

@@ -22,13 +22,13 @@ const transformer = (file, api) => {
       const defaultButtonImport = j.importDeclaration([j.importDefaultSpecifier(j.identifier(defaultSpecifier.local.name))], j.stringLiteral(entryPointsMapping.Button));
       j(node).insertAfter(defaultButtonImport);
     }
-    const defaultTypeSpecifiers = specifiers === null || specifiers === void 0 ? void 0 : specifiers.filter(specifier => specifier.importKind === 'type');
-    if (defaultTypeSpecifiers !== null && defaultTypeSpecifiers !== void 0 && defaultTypeSpecifiers.length) {
-      const typeImport = j.importDeclaration(defaultTypeSpecifiers, j.stringLiteral('@atlaskit/button/types'));
-      j(node).insertAfter(typeImport);
-    }
     const valueSpecifiers = specifiers === null || specifiers === void 0 ? void 0 : specifiers.filter(specifier => specifier.type === 'ImportSpecifier');
+    const newTypeSpecifier = valueSpecifiers === null || valueSpecifiers === void 0 ? void 0 : valueSpecifiers.filter(specifier => specifier.type === 'ImportSpecifier' && (specifier.imported.name === 'Appearance' || specifier.imported.name === 'Spacing'));
     const otherTypeSpecifiers = valueSpecifiers === null || valueSpecifiers === void 0 ? void 0 : valueSpecifiers.filter(specifier => BUTTON_TYPES.includes(specifier.imported.name));
+    if (newTypeSpecifier !== null && newTypeSpecifier !== void 0 && newTypeSpecifier.length) {
+      const typeImport = j.importDeclaration(newTypeSpecifier, j.stringLiteral('@atlaskit/button/types'));
+      j(node).insertAfter(typeImport);
+    }
     if (otherTypeSpecifiers !== null && otherTypeSpecifiers !== void 0 && otherTypeSpecifiers.length) {
       const typeImport = j.importDeclaration(otherTypeSpecifiers, j.stringLiteral('@atlaskit/button'));
       j(node).insertAfter(typeImport);

package/dist/es2019/presets/migrate-to-new-buttons/migrate-to-new-buttons.js

@@ -1,6 +1,6 @@
 import splitImportsTransformer from './codemods/next-split-imports';
 import migrateToNewButtonVariantsTransformer from './codemods/next-migrate-to-new-button-variants';
-export default async function transformer(file, api, options) {
+export default async function transformer(file, api) {
   const transformers = [splitImportsTransformer, migrateToNewButtonVariantsTransformer];
   let src = file.source;
   transformers.forEach(transformer => {
@@ -10,7 +10,7 @@ export default async function transformer(file, api, options) {
     const nextSrc = transformer({
       ...file,
       source: src
-    }, api, options);
+    }, api);
     if (nextSrc) {
       src = nextSrc;
     }

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

@@ -2,33 +2,19 @@ export const PRINT_SETTINGS = {
   quote: 'single'
 };
 export const NEW_BUTTON_VARIANTS = {
-  default: {
-    import: 'UNSAFE_BUTTON',
-    as: 'Button'
-  },
-  link: {
-    import: 'UNSAFE_LINK_BUTTON',
-    as: 'LinkButton'
-  },
-  icon: {
-    import: 'UNSAFE_ICON_BUTTON',
-    as: 'IconButton'
-  },
-  linkIcon: {
-    import: 'UNSAFE_LINK_ICON_BUTTON',
-    as: 'LinkIconButton'
-  }
+  default: 'Button',
+  link: 'LinkButton',
+  icon: 'IconButton',
+  linkIcon: 'LinkIconButton'
 };
-export const NEW_BUTTON_ENTRY_POINT = '@atlaskit/button/unsafe';
+export const NEW_BUTTON_ENTRY_POINT = '@atlaskit/button/new';
 export const entryPointsMapping = {
   Button: '@atlaskit/button/standard-button',
   LoadingButton: '@atlaskit/button/loading-button',
   ButtonGroup: '@atlaskit/button/button-group',
   CustomThemeButton: '@atlaskit/button/custom-theme-button'
 };
-export const BUTTON_TYPES = ['Appearance', 'Spacing', 'BaseOwnProps', 'BaseProps', 'ButtonProps', 'LoadingButtonProps', 'LoadingButtonOwnProps', 'ThemeTokens', 'ThemeProps', 'InteractionState', 'CustomThemeButtonProps', 'CustomThemeButtonOwnProps'];
-export const eslintDisableComment = 'eslint-disable-next-line @atlaskit/design-system/no-banned-imports';
-export const ButtonPropsTypeName = 'ButtonProps';
+export const BUTTON_TYPES = ['BaseOwnProps', 'BaseProps', 'ButtonProps', 'LoadingButtonProps', 'LoadingButtonOwnProps', 'ThemeTokens', 'ThemeProps', 'InteractionState', 'CustomThemeButtonProps', 'CustomThemeButtonOwnProps'];
 export const unsupportedProps = ['component', 'css', 'style'];
 export const linkButtonMissingHrefComment = `"link" and "subtle-link" appearances are only available in LinkButton, please either provide a href prop then migrate to LinkButton, or remove the appearance from the default button.`;
 export const iconPropsNoLongerSupportedComment = `"glyph", "primaryColor", "secondaryColor" and "testId" are no longer supported in button icons, please refactor the code and/or revisit the UI.`;

package/dist/es2019/presets/migrate-to-new-buttons/utils/generate-new-button-element.js

@@ -28,7 +28,6 @@ export const moveSizeAndLabelAttributes = (element, j, iconRenamed = false) => {
     const iconJSXElementAttributes = iconElement.openingElement.attributes;
     // add inlined comment to the icon if it has any attributes other than label and size
     if (Array.isArray(iconJSXElementAttributes)) {
-      var _sizeAttribute$value;
       const ifIconAttributeEitherLabelOrSize = iconJSXElementAttributes === null || iconJSXElementAttributes === void 0 ? void 0 : iconJSXElementAttributes.every(attribute => attribute.type === 'JSXAttribute' && typeof attribute.name.name === 'string' && (attribute.name.name === 'size' || attribute.name.name === 'label'));
       if (!ifIconAttributeEitherLabelOrSize) {
         addCommentBefore(j, j(iconAttr), iconPropsNoLongerSupportedComment, 'line');
@@ -40,7 +39,7 @@ export const moveSizeAndLabelAttributes = (element, j, iconRenamed = false) => {
         attributes === null || attributes === void 0 ? void 0 : attributes.push(labelAttribute);
       }
       const sizeAttribute = iconJSXElementAttributes.find(attribute => attribute.type === 'JSXAttribute' && attribute.name.name === 'size');
-      if (sizeAttribute && sizeAttribute.type === 'JSXAttribute' && ((_sizeAttribute$value = sizeAttribute.value) === null || _sizeAttribute$value === void 0 ? void 0 : _sizeAttribute$value.type) === 'Literal' && sizeAttribute.value.value !== 'medium') {
+      if (sizeAttribute && sizeAttribute.type === 'JSXAttribute') {
         sizeAttribute.name.name = iconRenamed ? 'UNSAFE_size' : `UNSAFE_${iconAttr.name.name}_size`;
         attributes === null || attributes === void 0 ? void 0 : attributes.push(sizeAttribute);
       }
@@ -57,7 +56,7 @@ export const generateNewElement = (variant, element, j) => {
     attributes
   } = element.openingElement;
   const iconAttrs = attributes && getIconAttributes(attributes);
-  const isIconOrLinkIcon = variant === NEW_BUTTON_VARIANTS.icon.as || variant === NEW_BUTTON_VARIANTS.linkIcon.as;
+  const isIconOrLinkIcon = variant === NEW_BUTTON_VARIANTS.icon || variant === NEW_BUTTON_VARIANTS.linkIcon;
   if (isIconOrLinkIcon && iconAttrs !== null && iconAttrs !== void 0 && iconAttrs.length) {
     moveSizeAndLabelAttributes(element, j, true);
 

package/dist/es2019/presets/migrate-to-new-buttons/utils/import-types-from-new-entry-point.js

@@ -0,0 +1,27 @@
+import { NEW_BUTTON_VARIANTS } from './constants';
+export const importTypesFromNewEntryPoint = (buttonImports, specifiers, j, fileSource) => {
+  const buttonPropsTypeSpecifier = buttonImports.find(j.ImportSpecifier).filter(path => path.node.imported.name === 'ButtonProps');
+  if (buttonPropsTypeSpecifier.length > 0) {
+    let typeSpecifier;
+    specifiers.forEach(specifier => {
+      if (specifier.type === 'ImportDefaultSpecifier') {
+        typeSpecifier = j.importSpecifier(j.identifier(`${NEW_BUTTON_VARIANTS.default}Props`), j.identifier(buttonPropsTypeSpecifier.get(0).node.local.name));
+      } else {
+        typeSpecifier = j.importSpecifier(j.identifier(`${specifier.imported.name}Props`), j.identifier(buttonPropsTypeSpecifier.get(0).node.local.name));
+      }
+    });
+    if (typeSpecifier) {
+      // @ts-ignore
+      typeSpecifier.importKind = 'type';
+      specifiers.push(typeSpecifier);
+    }
+  }
+  const appearanceAndSpacingTypeSpecifier = fileSource.find(j.ImportDeclaration).filter(path => path.node.source.value === '@atlaskit/button' || path.node.source.value === '@atlaskit/button/types').find(j.ImportSpecifier).filter(path => path.node.imported.name === 'Appearance' || path.node.imported.name === 'Spacing');
+  if (appearanceAndSpacingTypeSpecifier.length) {
+    appearanceAndSpacingTypeSpecifier.forEach(specifier => {
+      specifiers.push(specifier.node);
+      j(specifier).remove();
+    });
+  }
+  return specifiers;
+};

package/dist/es2019/presets/migrate-to-new-buttons/utils/migrate-fit-container-icon-button.js

@@ -15,7 +15,7 @@ export const migrateFitContainerIconButton = (element, j) => {
     const label = labelAttribute.value.value;
     const formattedLabel = `${label.charAt(0).toUpperCase()}${label.slice(1)}`.split('-').join(' ');
     j(element).find(j.JSXAttribute).filter(path => path.node.name.name === 'iconBefore' || path.node.name.name === 'iconAfter').remove();
-    const newButton = j.jsxElement(j.jsxOpeningElement(j.jsxIdentifier(NEW_BUTTON_VARIANTS.default.as), attributes), j.jsxClosingElement(j.jsxIdentifier(NEW_BUTTON_VARIANTS.default.as)), [j.jsxText(formattedLabel)]);
+    const newButton = j.jsxElement(j.jsxOpeningElement(j.jsxIdentifier(NEW_BUTTON_VARIANTS.default), attributes), j.jsxClosingElement(j.jsxIdentifier(NEW_BUTTON_VARIANTS.default)), [j.jsxText(formattedLabel)]);
     j(element).replaceWith(newButton);
     addCommentBefore(j, j(newButton).find(j.JSXAttribute).filter(path => path.node.name.name === 'shouldFitContainer'), migrateFitContainerButtonToDefaultButtonComment, 'line');
   } else {

package/dist/esm/main.js

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

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

@@ -1,11 +1,12 @@
 import { addCommentBefore } from '@atlaskit/codemod-utils';
-import { PRINT_SETTINGS, NEW_BUTTON_VARIANTS, entryPointsMapping, NEW_BUTTON_ENTRY_POINT, eslintDisableComment, ButtonPropsTypeName, linkButtonMissingHrefComment, buttonPropsNoLongerSupportedComment, unsupportedProps } from '../utils/constants';
+import { PRINT_SETTINGS, NEW_BUTTON_VARIANTS, entryPointsMapping, NEW_BUTTON_ENTRY_POINT, linkButtonMissingHrefComment, buttonPropsNoLongerSupportedComment, unsupportedProps } from '../utils/constants';
 import { generateNewElement, moveSizeAndLabelAttributes } from '../utils/generate-new-button-element';
 import { ifHasUnsupportedProps } from '../utils/has-unsupported-props';
 import { checkIfVariantAlreadyImported } from '../utils/if-variant-already-imported';
 import { renameDefaultButtonToLegacyButtonImport } from '../utils/rename-default-button-to-legacy-button';
 import { migrateFitContainerIconButton } from '../utils/migrate-fit-container-icon-button';
-var transformer = function transformer(file, api, options) {
+import { importTypesFromNewEntryPoint } from '../utils/import-types-from-new-entry-point';
+var transformer = function transformer(file, api) {
   var j = api.jscodeshift;
   var fileSource = j(file.source);
   var buttonImports = fileSource.find(j.ImportDeclaration).filter(function (path) {
@@ -21,9 +22,9 @@ var transformer = function transformer(file, api, options) {
     return fileSource.toSource();
   }
   var specifierIdentifier = defaultButtonImport.get(0).node.local.name;
-  var hasLinkIconButton = checkIfVariantAlreadyImported(NEW_BUTTON_VARIANTS.linkIcon.import, fileSource, j);
-  var hasLinkButton = checkIfVariantAlreadyImported(NEW_BUTTON_VARIANTS.link.import, fileSource, j);
-  var hasIconButton = checkIfVariantAlreadyImported(NEW_BUTTON_VARIANTS.icon.import, fileSource, j);
+  var hasLinkIconButton = checkIfVariantAlreadyImported(NEW_BUTTON_VARIANTS.linkIcon, fileSource, j);
+  var hasLinkButton = checkIfVariantAlreadyImported(NEW_BUTTON_VARIANTS.link, fileSource, j);
+  var hasIconButton = checkIfVariantAlreadyImported(NEW_BUTTON_VARIANTS.icon, fileSource, j);
   var allButtons = fileSource.find(j.JSXElement).filter(function (path) {
     return path.value.openingElement.name.type === 'JSXIdentifier' && path.value.openingElement.name.name === specifierIdentifier;
   });
@@ -58,15 +59,15 @@ var transformer = function transformer(file, api, options) {
     }
     if (isLinkIconButton) {
       hasLinkIconButton = true;
-      j(element).replaceWith(generateNewElement(NEW_BUTTON_VARIANTS.linkIcon.as, element.value, j));
+      j(element).replaceWith(generateNewElement(NEW_BUTTON_VARIANTS.linkIcon, element.value, j));
     }
     if (isIconButton) {
       hasIconButton = true;
-      j(element).replaceWith(generateNewElement(NEW_BUTTON_VARIANTS.icon.as, element.value, j));
+      j(element).replaceWith(generateNewElement(NEW_BUTTON_VARIANTS.icon, element.value, j));
     }
     if (isLinkButton) {
       hasLinkButton = true;
-      j(element).replaceWith(generateNewElement(NEW_BUTTON_VARIANTS.link.as, element.value, j));
+      j(element).replaceWith(generateNewElement(NEW_BUTTON_VARIANTS.link, element.value, j));
     }
     if (!hasHref && attributes.find(function (node) {
       var _node$value, _node$name, _node$value2, _node$value3;
@@ -76,10 +77,12 @@ var transformer = function transformer(file, api, options) {
       addCommentBefore(j, [element], linkButtonMissingHrefComment);
     }
   });
+
+  // modify import declarations
   var specifiers = [];
   [hasLinkButton ? 'link' : null, hasIconButton ? 'icon' : null, hasLinkIconButton ? 'linkIcon' : null].forEach(function (variant) {
     if (variant) {
-      specifiers.push(j.importSpecifier(j.identifier(NEW_BUTTON_VARIANTS[variant].import), j.identifier(NEW_BUTTON_VARIANTS[variant].as)));
+      specifiers.push(j.importSpecifier(j.identifier(NEW_BUTTON_VARIANTS[variant])));
     }
   });
   var oldButtonImport = fileSource.find(j.ImportDeclaration).filter(function (path) {
@@ -93,8 +96,11 @@ var transformer = function transformer(file, api, options) {
     }).includes(specifierIdentifier);
   }).length > 0;
   if (remainingDefaultButtons) {
-    specifiers.push(j.importSpecifier(j.identifier(NEW_BUTTON_VARIANTS.default.import), j.identifier(specifierIdentifier)));
+    specifiers.push(j.importDefaultSpecifier(j.identifier(NEW_BUTTON_VARIANTS.default)));
   }
+
+  // update import path for types imports
+  specifiers = importTypesFromNewEntryPoint(buttonImports, specifiers, j, fileSource);
   var buttonsWithUnsupportedProps = allButtons.filter(function (path) {
     return ifHasUnsupportedProps(path.value.openingElement.attributes);
   });
@@ -112,28 +118,19 @@ var transformer = function transformer(file, api, options) {
 
     // rename all buttons with unsupported props to LegacyButton if default new button is imported
     if (specifiers.find(function (specifier) {
-      return specifier.imported.name === NEW_BUTTON_VARIANTS.default.import;
+      return specifier.type === 'ImportDefaultSpecifier';
     })) {
       renameDefaultButtonToLegacyButtonImport(oldButtonImport, buttonsWithUnsupportedProps, j);
     }
   }
-  if (specifiers.length || remainingDefaultButtons) {
-    // split the type imports into a separate import
-    var typeSpecifier = buttonImports.find(j.ImportSpecifier).filter(function (path) {
-      return path.node.imported.name === ButtonPropsTypeName;
-    });
-    if (typeSpecifier.length > 0) {
-      oldButtonImport.insertBefore(j.importDeclaration([j.importSpecifier(j.identifier(ButtonPropsTypeName), j.identifier(typeSpecifier.get(0).node.local.name))], j.stringLiteral(entryPointsMapping.Button), 'type'));
-    }
+  if (specifiers.length) {
     oldButtonImport.replaceWith(j.importDeclaration(specifiers, j.stringLiteral(NEW_BUTTON_ENTRY_POINT)));
-
-    // add eslint-disable-next-line @atlaskit/design-system/no-banned-imports comment if unsafe import is allowed in custom options
-    if (NEW_BUTTON_ENTRY_POINT.includes('unsafe') && (options === null || options === void 0 ? void 0 : options.allowUnsafeImport) === true) {
-      addCommentBefore(j, fileSource.find(j.ImportDeclaration).filter(function (path) {
-        return path.node.source.value === NEW_BUTTON_ENTRY_POINT;
-      }), eslintDisableComment, 'line', '');
-    }
   }
+
+  // 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();
   return fileSource.toSource(PRINT_SETTINGS);
 };
 export default transformer;

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

@@ -26,19 +26,19 @@ var transformer = function transformer(file, api) {
       var defaultButtonImport = j.importDeclaration([j.importDefaultSpecifier(j.identifier(defaultSpecifier.local.name))], j.stringLiteral(entryPointsMapping.Button));
       j(node).insertAfter(defaultButtonImport);
     }
-    var defaultTypeSpecifiers = specifiers === null || specifiers === void 0 ? void 0 : specifiers.filter(function (specifier) {
-      return specifier.importKind === 'type';
-    });
-    if (defaultTypeSpecifiers !== null && defaultTypeSpecifiers !== void 0 && defaultTypeSpecifiers.length) {
-      var typeImport = j.importDeclaration(defaultTypeSpecifiers, j.stringLiteral('@atlaskit/button/types'));
-      j(node).insertAfter(typeImport);
-    }
     var valueSpecifiers = specifiers === null || specifiers === void 0 ? void 0 : specifiers.filter(function (specifier) {
       return specifier.type === 'ImportSpecifier';
     });
+    var newTypeSpecifier = valueSpecifiers === null || valueSpecifiers === void 0 ? void 0 : valueSpecifiers.filter(function (specifier) {
+      return specifier.type === 'ImportSpecifier' && (specifier.imported.name === 'Appearance' || specifier.imported.name === 'Spacing');
+    });
     var otherTypeSpecifiers = valueSpecifiers === null || valueSpecifiers === void 0 ? void 0 : valueSpecifiers.filter(function (specifier) {
       return BUTTON_TYPES.includes(specifier.imported.name);
     });
+    if (newTypeSpecifier !== null && newTypeSpecifier !== void 0 && newTypeSpecifier.length) {
+      var typeImport = j.importDeclaration(newTypeSpecifier, j.stringLiteral('@atlaskit/button/types'));
+      j(node).insertAfter(typeImport);
+    }
     if (otherTypeSpecifiers !== null && otherTypeSpecifiers !== void 0 && otherTypeSpecifiers.length) {
       var _typeImport = j.importDeclaration(otherTypeSpecifiers, j.stringLiteral('@atlaskit/button'));
       j(node).insertAfter(_typeImport);

package/dist/esm/presets/migrate-to-new-buttons/migrate-to-new-buttons.js

@@ -5,11 +5,11 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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) { _defineProperty(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; }
 import splitImportsTransformer from './codemods/next-split-imports';
 import migrateToNewButtonVariantsTransformer from './codemods/next-migrate-to-new-button-variants';
-export default function transformer(_x, _x2, _x3) {
+export default function transformer(_x, _x2) {
   return _transformer.apply(this, arguments);
 }
 function _transformer() {
-  _transformer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(file, api, options) {
+  _transformer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(file, api) {
     var transformers, src;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -22,7 +22,7 @@ function _transformer() {
             }
             var nextSrc = transformer(_objectSpread(_objectSpread({}, file), {}, {
               source: src
-            }), api, options);
+            }), api);
             if (nextSrc) {
               src = nextSrc;
             }

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

@@ -2,33 +2,19 @@ export var PRINT_SETTINGS = {
   quote: 'single'
 };
 export var NEW_BUTTON_VARIANTS = {
-  default: {
-    import: 'UNSAFE_BUTTON',
-    as: 'Button'
-  },
-  link: {
-    import: 'UNSAFE_LINK_BUTTON',
-    as: 'LinkButton'
-  },
-  icon: {
-    import: 'UNSAFE_ICON_BUTTON',
-    as: 'IconButton'
-  },
-  linkIcon: {
-    import: 'UNSAFE_LINK_ICON_BUTTON',
-    as: 'LinkIconButton'
-  }
+  default: 'Button',
+  link: 'LinkButton',
+  icon: 'IconButton',
+  linkIcon: 'LinkIconButton'
 };
-export var NEW_BUTTON_ENTRY_POINT = '@atlaskit/button/unsafe';
+export var NEW_BUTTON_ENTRY_POINT = '@atlaskit/button/new';
 export var entryPointsMapping = {
   Button: '@atlaskit/button/standard-button',
   LoadingButton: '@atlaskit/button/loading-button',
   ButtonGroup: '@atlaskit/button/button-group',
   CustomThemeButton: '@atlaskit/button/custom-theme-button'
 };
-export var BUTTON_TYPES = ['Appearance', 'Spacing', 'BaseOwnProps', 'BaseProps', 'ButtonProps', 'LoadingButtonProps', 'LoadingButtonOwnProps', 'ThemeTokens', 'ThemeProps', 'InteractionState', 'CustomThemeButtonProps', 'CustomThemeButtonOwnProps'];
-export var eslintDisableComment = 'eslint-disable-next-line @atlaskit/design-system/no-banned-imports';
-export var ButtonPropsTypeName = 'ButtonProps';
+export var BUTTON_TYPES = ['BaseOwnProps', 'BaseProps', 'ButtonProps', 'LoadingButtonProps', 'LoadingButtonOwnProps', 'ThemeTokens', 'ThemeProps', 'InteractionState', 'CustomThemeButtonProps', 'CustomThemeButtonOwnProps'];
 export var unsupportedProps = ['component', 'css', 'style'];
 export var linkButtonMissingHrefComment = "\"link\" and \"subtle-link\" appearances are only available in LinkButton, please either provide a href prop then migrate to LinkButton, or remove the appearance from the default button.";
 export var iconPropsNoLongerSupportedComment = "\"glyph\", \"primaryColor\", \"secondaryColor\" and \"testId\" are no longer supported in button icons, please refactor the code and/or revisit the UI.";

package/dist/esm/presets/migrate-to-new-buttons/utils/generate-new-button-element.js

@@ -29,7 +29,6 @@ export var moveSizeAndLabelAttributes = function moveSizeAndLabelAttributes(elem
     var iconJSXElementAttributes = iconElement.openingElement.attributes;
     // add inlined comment to the icon if it has any attributes other than label and size
     if (Array.isArray(iconJSXElementAttributes)) {
-      var _sizeAttribute$value;
       var ifIconAttributeEitherLabelOrSize = iconJSXElementAttributes === null || iconJSXElementAttributes === void 0 ? void 0 : iconJSXElementAttributes.every(function (attribute) {
         return attribute.type === 'JSXAttribute' && typeof attribute.name.name === 'string' && (attribute.name.name === 'size' || attribute.name.name === 'label');
       });
@@ -47,7 +46,7 @@ export var moveSizeAndLabelAttributes = function moveSizeAndLabelAttributes(elem
       var sizeAttribute = iconJSXElementAttributes.find(function (attribute) {
         return attribute.type === 'JSXAttribute' && attribute.name.name === 'size';
       });
-      if (sizeAttribute && sizeAttribute.type === 'JSXAttribute' && ((_sizeAttribute$value = sizeAttribute.value) === null || _sizeAttribute$value === void 0 ? void 0 : _sizeAttribute$value.type) === 'Literal' && sizeAttribute.value.value !== 'medium') {
+      if (sizeAttribute && sizeAttribute.type === 'JSXAttribute') {
         sizeAttribute.name.name = iconRenamed ? 'UNSAFE_size' : "UNSAFE_".concat(iconAttr.name.name, "_size");
         attributes === null || attributes === void 0 || attributes.push(sizeAttribute);
       }
@@ -62,7 +61,7 @@ export var moveSizeAndLabelAttributes = function moveSizeAndLabelAttributes(elem
 export var generateNewElement = function generateNewElement(variant, element, j) {
   var attributes = element.openingElement.attributes;
   var iconAttrs = attributes && getIconAttributes(attributes);
-  var isIconOrLinkIcon = variant === NEW_BUTTON_VARIANTS.icon.as || variant === NEW_BUTTON_VARIANTS.linkIcon.as;
+  var isIconOrLinkIcon = variant === NEW_BUTTON_VARIANTS.icon || variant === NEW_BUTTON_VARIANTS.linkIcon;
   if (isIconOrLinkIcon && iconAttrs !== null && iconAttrs !== void 0 && iconAttrs.length) {
     moveSizeAndLabelAttributes(element, j, true);
 

package/dist/esm/presets/migrate-to-new-buttons/utils/import-types-from-new-entry-point.js

@@ -0,0 +1,33 @@
+import { NEW_BUTTON_VARIANTS } from './constants';
+export var importTypesFromNewEntryPoint = function importTypesFromNewEntryPoint(buttonImports, specifiers, j, fileSource) {
+  var buttonPropsTypeSpecifier = buttonImports.find(j.ImportSpecifier).filter(function (path) {
+    return path.node.imported.name === 'ButtonProps';
+  });
+  if (buttonPropsTypeSpecifier.length > 0) {
+    var typeSpecifier;
+    specifiers.forEach(function (specifier) {
+      if (specifier.type === 'ImportDefaultSpecifier') {
+        typeSpecifier = j.importSpecifier(j.identifier("".concat(NEW_BUTTON_VARIANTS.default, "Props")), j.identifier(buttonPropsTypeSpecifier.get(0).node.local.name));
+      } else {
+        typeSpecifier = j.importSpecifier(j.identifier("".concat(specifier.imported.name, "Props")), j.identifier(buttonPropsTypeSpecifier.get(0).node.local.name));
+      }
+    });
+    if (typeSpecifier) {
+      // @ts-ignore
+      typeSpecifier.importKind = 'type';
+      specifiers.push(typeSpecifier);
+    }
+  }
+  var appearanceAndSpacingTypeSpecifier = fileSource.find(j.ImportDeclaration).filter(function (path) {
+    return path.node.source.value === '@atlaskit/button' || path.node.source.value === '@atlaskit/button/types';
+  }).find(j.ImportSpecifier).filter(function (path) {
+    return path.node.imported.name === 'Appearance' || path.node.imported.name === 'Spacing';
+  });
+  if (appearanceAndSpacingTypeSpecifier.length) {
+    appearanceAndSpacingTypeSpecifier.forEach(function (specifier) {
+      specifiers.push(specifier.node);
+      j(specifier).remove();
+    });
+  }
+  return specifiers;
+};

package/dist/esm/presets/migrate-to-new-buttons/utils/migrate-fit-container-icon-button.js

@@ -17,7 +17,7 @@ export var migrateFitContainerIconButton = function migrateFitContainerIconButto
     j(element).find(j.JSXAttribute).filter(function (path) {
       return path.node.name.name === 'iconBefore' || path.node.name.name === 'iconAfter';
     }).remove();
-    var newButton = j.jsxElement(j.jsxOpeningElement(j.jsxIdentifier(NEW_BUTTON_VARIANTS.default.as), attributes), j.jsxClosingElement(j.jsxIdentifier(NEW_BUTTON_VARIANTS.default.as)), [j.jsxText(formattedLabel)]);
+    var newButton = j.jsxElement(j.jsxOpeningElement(j.jsxIdentifier(NEW_BUTTON_VARIANTS.default), attributes), j.jsxClosingElement(j.jsxIdentifier(NEW_BUTTON_VARIANTS.default)), [j.jsxText(formattedLabel)]);
     j(element).replaceWith(newButton);
     addCommentBefore(j, j(newButton).find(j.JSXAttribute).filter(function (path) {
       return path.node.name.name === 'shouldFitContainer';

package/dist/types/presets/migrate-to-new-buttons/codemods/next-migrate-to-new-button-variants.d.ts

@@ -1,3 +1,3 @@
-import type { API, FileInfo, Options } from 'jscodeshift';
-declare const transformer: (file: FileInfo, api: API, options: Options) => string;
+import type { API, FileInfo } from 'jscodeshift';
+declare const transformer: (file: FileInfo, api: API) => string;
 export default transformer;

package/dist/types/presets/migrate-to-new-buttons/migrate-to-new-buttons.d.ts

@@ -1,2 +1,2 @@
-import type { API, FileInfo, Options } from 'jscodeshift';
-export default function transformer(file: FileInfo, api: API, options: Options): Promise<string>;
+import type { API, FileInfo } from 'jscodeshift';
+export default function transformer(file: FileInfo, api: API): Promise<string>;

package/dist/types/presets/migrate-to-new-buttons/utils/constants.d.ts

@@ -2,18 +2,13 @@ export declare const PRINT_SETTINGS: {
     quote: "single";
 };
 export declare const NEW_BUTTON_VARIANTS: {
-    [key: string]: {
-        import: string;
-        as: string;
-    };
+    [key: string]: string;
 };
-export declare const NEW_BUTTON_ENTRY_POINT = "@atlaskit/button/unsafe";
+export declare const NEW_BUTTON_ENTRY_POINT = "@atlaskit/button/new";
 export declare const entryPointsMapping: {
     [key: string]: string;
 };
 export declare const BUTTON_TYPES: string[];
-export declare const eslintDisableComment = "eslint-disable-next-line @atlaskit/design-system/no-banned-imports";
-export declare const ButtonPropsTypeName = "ButtonProps";
 export declare const unsupportedProps: string[];
 export declare const linkButtonMissingHrefComment = "\"link\" and \"subtle-link\" appearances are only available in LinkButton, please either provide a href prop then migrate to LinkButton, or remove the appearance from the default button.";
 export declare const iconPropsNoLongerSupportedComment = "\"glyph\", \"primaryColor\", \"secondaryColor\" and \"testId\" are no longer supported in button icons, please refactor the code and/or revisit the UI.";

package/dist/types/presets/migrate-to-new-buttons/utils/generate-new-button-element.d.ts

@@ -3,4 +3,4 @@ import { NEW_BUTTON_VARIANTS } from '../utils/constants';
 export declare const getIconAttributes: (attributes: (JSXAttribute | JSXSpreadAttribute)[]) => JSXAttribute[] | null;
 export declare const getIconElement: (iconAttr: JSXAttribute) => JSXElement | null;
 export declare const moveSizeAndLabelAttributes: (element: JSXElement, j: API['jscodeshift'], iconRenamed?: boolean) => void;
-export declare const generateNewElement: (variant: (typeof NEW_BUTTON_VARIANTS)[keyof typeof NEW_BUTTON_VARIANTS]['as'], element: JSXElement, j: API['jscodeshift']) => JSXElement;
+export declare const generateNewElement: (variant: (typeof NEW_BUTTON_VARIANTS)[keyof typeof NEW_BUTTON_VARIANTS], element: JSXElement, j: API['jscodeshift']) => JSXElement;

package/dist/types/presets/migrate-to-new-buttons/utils/import-types-from-new-entry-point.d.ts

@@ -0,0 +1,2 @@
+import type { ImportDefaultSpecifier, ImportSpecifier, JSCodeshift, Collection, ImportDeclaration } from 'jscodeshift';
+export declare const importTypesFromNewEntryPoint: (buttonImports: Collection<ImportDeclaration>, specifiers: (ImportDefaultSpecifier | ImportSpecifier)[], j: JSCodeshift, fileSource: Collection<any>) => (ImportDefaultSpecifier | ImportSpecifier)[];

package/dist/types-ts4.5/presets/migrate-to-new-buttons/codemods/next-migrate-to-new-button-variants.d.ts

@@ -1,3 +1,3 @@
-import type { API, FileInfo, Options } from 'jscodeshift';
-declare const transformer: (file: FileInfo, api: API, options: Options) => string;
+import type { API, FileInfo } from 'jscodeshift';
+declare const transformer: (file: FileInfo, api: API) => string;
 export default transformer;

package/dist/types-ts4.5/presets/migrate-to-new-buttons/migrate-to-new-buttons.d.ts

@@ -1,2 +1,2 @@
-import type { API, FileInfo, Options } from 'jscodeshift';
-export default function transformer(file: FileInfo, api: API, options: Options): Promise<string>;
+import type { API, FileInfo } from 'jscodeshift';
+export default function transformer(file: FileInfo, api: API): Promise<string>;

package/dist/types-ts4.5/presets/migrate-to-new-buttons/utils/constants.d.ts

@@ -2,18 +2,13 @@ export declare const PRINT_SETTINGS: {
     quote: "single";
 };
 export declare const NEW_BUTTON_VARIANTS: {
-    [key: string]: {
-        import: string;
-        as: string;
-    };
+    [key: string]: string;
 };
-export declare const NEW_BUTTON_ENTRY_POINT = "@atlaskit/button/unsafe";
+export declare const NEW_BUTTON_ENTRY_POINT = "@atlaskit/button/new";
 export declare const entryPointsMapping: {
     [key: string]: string;
 };
 export declare const BUTTON_TYPES: string[];
-export declare const eslintDisableComment = "eslint-disable-next-line @atlaskit/design-system/no-banned-imports";
-export declare const ButtonPropsTypeName = "ButtonProps";
 export declare const unsupportedProps: string[];
 export declare const linkButtonMissingHrefComment = "\"link\" and \"subtle-link\" appearances are only available in LinkButton, please either provide a href prop then migrate to LinkButton, or remove the appearance from the default button.";
 export declare const iconPropsNoLongerSupportedComment = "\"glyph\", \"primaryColor\", \"secondaryColor\" and \"testId\" are no longer supported in button icons, please refactor the code and/or revisit the UI.";

package/dist/types-ts4.5/presets/migrate-to-new-buttons/utils/generate-new-button-element.d.ts

@@ -3,4 +3,4 @@ import { NEW_BUTTON_VARIANTS } from '../utils/constants';
 export declare const getIconAttributes: (attributes: (JSXAttribute | JSXSpreadAttribute)[]) => JSXAttribute[] | null;
 export declare const getIconElement: (iconAttr: JSXAttribute) => JSXElement | null;
 export declare const moveSizeAndLabelAttributes: (element: JSXElement, j: API['jscodeshift'], iconRenamed?: boolean) => void;
-export declare const generateNewElement: (variant: (typeof NEW_BUTTON_VARIANTS)[keyof typeof NEW_BUTTON_VARIANTS]['as'], element: JSXElement, j: API['jscodeshift']) => JSXElement;
+export declare const generateNewElement: (variant: (typeof NEW_BUTTON_VARIANTS)[keyof typeof NEW_BUTTON_VARIANTS], element: JSXElement, j: API['jscodeshift']) => JSXElement;

package/dist/types-ts4.5/presets/migrate-to-new-buttons/utils/import-types-from-new-entry-point.d.ts

@@ -0,0 +1,2 @@
+import type { ImportDefaultSpecifier, ImportSpecifier, JSCodeshift, Collection, ImportDeclaration } from 'jscodeshift';
+export declare const importTypesFromNewEntryPoint: (buttonImports: Collection<ImportDeclaration>, specifiers: (ImportDefaultSpecifier | ImportSpecifier)[], j: JSCodeshift, fileSource: Collection<any>) => (ImportDefaultSpecifier | ImportSpecifier)[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/codemod-cli",
-  "version": "0.17.4",
+  "version": "0.17.6",
   "description": "A cli for distributing codemods for atlassian-frontend components and services",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -25,7 +25,7 @@
     "releaseModel": "continuous"
   },
   "scripts": {
-    "prestart": "cd ../../ && yarn build @atlaskit/codemod-utils",
+    "prestart": "cd ../../ && yarn build @atlaskit/codemod-utils tokens",
     "start": "./bin/codemod-cli.js"
   },
   "bin": {
@@ -33,7 +33,7 @@
   },
   "dependencies": {
     "@atlaskit/codemod-utils": "^4.2.0",
-    "@atlaskit/tokens": "^1.29.0",
+    "@atlaskit/tokens": "^1.30.0",
     "@babel/runtime": "^7.0.0",
     "@codeshift/utils": "^0.2.4",
     "@types/jscodeshift": "^0.11.0",