@atlaskit/codemod-cli 0.17.6 → 0.17.8

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/codemod-cli
 
+## 0.17.8
+
+### Patch Changes
+
+- [#62539](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/62539) [`4055341131ca`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/4055341131ca) - Update button codemod to add type keywork for type imports
+
+## 0.17.7
+
+### Patch Changes
+
+- [#61900](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/61900) [`101b5d5ef72a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/101b5d5ef72a) - Small changes in mixin migration - Use `token` instead of `theamed` to avoid migration to depricated code
+- [#62187](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/62187) [`03bb58064010`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/03bb58064010) - Added a small bug-fix in button codemods: add TODO comment on default buttons with "link" or "subtle-link" appearance but without `href`
+
 ## 0.17.6
 
 ### 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.6", _PACKAGE_VERSION_ = _process$env$_PACKAGE === void 0 ? '0.0.0-dev' : _process$env$_PACKAGE;
+          _process$env$_PACKAGE = "0.17.8", _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

@@ -75,12 +75,12 @@ var transformer = function transformer(file, api) {
       hasLinkButton = true;
       j(element).replaceWith((0, _generateNewButtonElement.generateNewElement)(_constants.NEW_BUTTON_VARIANTS.link, element.value, j));
     }
-    if (!hasHref && attributes.find(function (node) {
+    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) === 'Literal' && (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');
-    })) {
-      // @ts-ignore
-      (0, _codemodUtils.addCommentBefore)(j, [element], _constants.linkButtonMissingHrefComment);
+      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) {
+      (0, _codemodUtils.addCommentBefore)(j, j(linkAppearanceAttribute), _constants.linkButtonMissingHrefComment, 'line');
     }
   });
 

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

@@ -50,7 +50,8 @@ var moveSizeAndLabelAttributes = exports.moveSizeAndLabelAttributes = function m
         attributes === null || attributes === void 0 || attributes.push(labelAttribute);
       }
       var sizeAttribute = iconJSXElementAttributes.find(function (attribute) {
-        return attribute.type === 'JSXAttribute' && attribute.name.name === 'size';
+        var _attribute$value, _attribute$value2;
+        return attribute.type === 'JSXAttribute' && attribute.name.name === 'size' && ((_attribute$value = attribute.value) === null || _attribute$value === void 0 ? void 0 : _attribute$value.type) === 'StringLiteral' && ((_attribute$value2 = attribute.value) === null || _attribute$value2 === void 0 ? void 0 : _attribute$value2.value) !== 'medium';
       });
       if (sizeAttribute && sizeAttribute.type === 'JSXAttribute') {
         sizeAttribute.name.name = iconRenamed ? 'UNSAFE_size' : "UNSAFE_".concat(iconAttr.name.name, "_size");

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

@@ -31,9 +31,12 @@ var importTypesFromNewEntryPoint = exports.importTypesFromNewEntryPoint = functi
   });
   if (appearanceAndSpacingTypeSpecifier.length) {
     appearanceAndSpacingTypeSpecifier.forEach(function (specifier) {
-      specifiers.push(specifier.node);
-      j(specifier).remove();
+      // @ts-ignore
+      specifier.node.importKind = 'type'; // make sure all type imports are prefixed with the `type` keyword
+      specifiers.push(specifier.node); // add new Appearance and Spacing types to the new entrypoint
+      j(specifier).remove(); // remove old one
     });
   }
+
   return specifiers;
 };

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

@@ -16,7 +16,7 @@ var migrateFitContainerIconButton = exports.migrateFitContainerIconButton = func
     return path.type === 'JSXAttribute' && (path.name.name === 'label' || path.name.name === 'aria-label' || path.name.name === 'aria-labelledby');
   }));
   var migratedToIconButton;
-  if (labelAttribute && labelAttribute.type === 'JSXAttribute' && ((_labelAttribute$value = labelAttribute.value) === null || _labelAttribute$value === void 0 ? void 0 : _labelAttribute$value.type) === 'Literal' && typeof labelAttribute.value.value === 'string') {
+  if (labelAttribute && labelAttribute.type === 'JSXAttribute' && ((_labelAttribute$value = labelAttribute.value) === null || _labelAttribute$value === void 0 ? void 0 : _labelAttribute$value.type) === 'StringLiteral' && typeof labelAttribute.value.value === 'string') {
     migratedToIconButton = false;
     var label = labelAttribute.value.value;
     var formattedLabel = "".concat(label.charAt(0).toUpperCase()).concat(label.slice(1)).split('-').join(' ');

package/dist/cjs/presets/theme-remove-deprecated-mixins/theme-remove-deprecated-mixins.js

@@ -16,15 +16,10 @@ function insertTokenImport(j, source) {
   var newImport = j.importDeclaration([j.importSpecifier(j.identifier('token'))], j.stringLiteral('@atlaskit/tokens'));
   source.get().node.program.body.unshift(newImport);
 }
-function insertThemedImport(j, source) {
-  if ((0, _utils.hasImportSpecifier)(j, source, 'themed', '@atlaskit/theme/components')) {
-    return;
-  }
-  var newImport = j.importDeclaration([j.importSpecifier(j.identifier('themed'))], j.stringLiteral('@atlaskit/theme/components'));
-  source.get().node.program.body.unshift(newImport);
-}
-function buildToken(j, tokenId, node) {
-  var callExpr = j.callExpression(j.identifier('token'), [j.stringLiteral(tokenId), node].filter(Boolean));
+function buildToken(j) {
+  var tokenId = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+  var node = arguments.length > 2 ? arguments[2] : undefined;
+  var callExpr = tokenId ? j.callExpression(j.identifier('token'), [j.stringLiteral(tokenId), node].filter(Boolean)) : node;
   return callExpr;
 }
 function isDecendantOfTokenMethod(j, path) {
@@ -37,12 +32,6 @@ function isDecendantOfTokenMethod(j, path) {
 var isDeprecatedApi = function isDeprecatedApi(identifierName) {
   return Object.keys(_replacements.colorReplacements).includes(identifierName);
 };
-function buildThemedNode(j) {
-  var tokenId = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
-  var fallbackLight = arguments.length > 2 ? arguments[2] : undefined;
-  var fallbackDark = arguments.length > 3 ? arguments[3] : undefined;
-  return j.callExpression(j.identifier('themed'), [j.objectExpression([j.objectProperty(j.identifier('light'), tokenId ? buildToken(j, tokenId, fallbackLight) : fallbackLight), j.objectProperty(j.identifier('dark'), tokenId ? buildToken(j, tokenId, fallbackDark) : fallbackDark)])]);
-}
 function replaceIdentifiers(j, source, specifier) {
   var importSpecifierLocal = specifier.value.local.name;
   var importSpecifierImported = specifier.value.imported.name;
@@ -67,22 +56,13 @@ function replaceIdentifiers(j, source, specifier) {
     var tokenId = isDecendantOfToken ? tokenParentNode.value.arguments[0].value : replacement.tokenId;
     insertTokenImport(j, source);
     (0, _utils.insertImportSpecifier)(j, source, j.importSpecifier(j.identifier(replacement.importSpecifiers[0])), '@atlaskit/theme/colors');
-
-    // Requires themed function
     if (isDynamicReplacement) {
-      var themedNode = buildThemedNode(j, tokenId, j.identifier(replacement.importSpecifiers[0]), j.identifier(replacement.importSpecifiers[1]));
-      insertThemedImport(j, source);
-      (0, _utils.insertImportSpecifier)(j, source, j.importSpecifier(j.identifier(replacement.importSpecifiers[1])), '@atlaskit/theme/colors');
-      if (isDecendantOfToken && isDecendantOfCallExpression) {
-        var callExpression = identifier.parent;
-        tokenParentNode.replace(j.callExpression(themedNode, callExpression.value.arguments));
-        return;
-      }
+      var token = buildToken(j, tokenId, j.identifier(replacement.importSpecifiers[0]));
       if (isDecendantOfToken) {
-        tokenParentNode.replace(themedNode);
+        tokenParentNode.replace(token);
         return;
       }
-      identifier.replace(themedNode);
+      (isDecendantOfCallExpression ? identifier.parent : identifier).replace(token);
       return;
     }
     if (!isDecendantOfToken && replacement.tokenId) {
@@ -115,21 +95,13 @@ function replaceMemberExpressions(j, source, specifier) {
     }).get();
     var tokenId = isDecendantOfToken ? tokenParentNode.value.arguments[0].value : replacement.tokenId;
     insertTokenImport(j, source);
-
-    // Requires themed function
     if (isDynamicReplacement) {
-      var themedNode = buildThemedNode(j, tokenId, j.memberExpression(j.identifier(memberExpression.value.object.name), j.identifier(replacement.importSpecifiers[0])), j.memberExpression(j.identifier(memberExpression.value.object.name), j.identifier(replacement.importSpecifiers[1])));
-      insertThemedImport(j, source);
-      if (isDecendantOfToken && isDecendantOfCallExpression) {
-        var callExpression = identifier.parent.parent;
-        tokenParentNode.replace(j.callExpression(themedNode, callExpression.value.arguments));
-        return;
-      }
+      var token = buildToken(j, tokenId, j.memberExpression(j.identifier(memberExpression.value.object.name), j.identifier(replacement.importSpecifiers[0])));
       if (isDecendantOfToken) {
-        tokenParentNode.replace(themedNode);
+        tokenParentNode.replace(token);
         return;
       }
-      memberExpression.replace(themedNode);
+      (isDecendantOfCallExpression ? memberExpression.parent : memberExpression).replace(token);
       return;
     }
     if (!isDecendantOfToken && replacement.tokenId) {

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

@@ -61,12 +61,12 @@ const transformer = (file, api) => {
       hasLinkButton = true;
       j(element).replaceWith(generateNewElement(NEW_BUTTON_VARIANTS.link, element.value, j));
     }
-    if (!hasHref && attributes.find(node => {
+    const linkAppearanceAttribute = attributes.find(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) === 'Literal' && (node === null || node === void 0 ? void 0 : (_node$name = node.name) === null || _node$name === void 0 ? void 0 : _node$name.name) === 'appearance' && ((node === null || node === void 0 ? void 0 : (_node$value2 = node.value) === null || _node$value2 === void 0 ? void 0 : _node$value2.value) === 'link' || (node === null || node === void 0 ? void 0 : (_node$value3 = node.value) === null || _node$value3 === void 0 ? void 0 : _node$value3.value) === 'subtle-link');
-    })) {
-      // @ts-ignore
-      addCommentBefore(j, [element], linkButtonMissingHrefComment);
+      return node.type === 'JSXAttribute' && ((_node$value = node.value) === null || _node$value === void 0 ? void 0 : _node$value.type) === 'StringLiteral' && (node === null || node === void 0 ? void 0 : (_node$name = node.name) === null || _node$name === void 0 ? void 0 : _node$name.name) === 'appearance' && ((node === null || node === void 0 ? void 0 : (_node$value2 = node.value) === null || _node$value2 === void 0 ? void 0 : _node$value2.value) === 'link' || (node === null || node === void 0 ? void 0 : (_node$value3 = node.value) === null || _node$value3 === void 0 ? void 0 : _node$value3.value) === 'subtle-link');
+    });
+    if (!hasHref && linkAppearanceAttribute) {
+      addCommentBefore(j, j(linkAppearanceAttribute), linkButtonMissingHrefComment, 'line');
     }
   });
 

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

@@ -38,7 +38,10 @@ export const moveSizeAndLabelAttributes = (element, j, iconRenamed = false) => {
       if (labelAttribute && labelAttribute.type === 'JSXAttribute' && iconRenamed) {
         attributes === null || attributes === void 0 ? void 0 : attributes.push(labelAttribute);
       }
-      const sizeAttribute = iconJSXElementAttributes.find(attribute => attribute.type === 'JSXAttribute' && attribute.name.name === 'size');
+      const sizeAttribute = iconJSXElementAttributes.find(attribute => {
+        var _attribute$value, _attribute$value2;
+        return attribute.type === 'JSXAttribute' && attribute.name.name === 'size' && ((_attribute$value = attribute.value) === null || _attribute$value === void 0 ? void 0 : _attribute$value.type) === 'StringLiteral' && ((_attribute$value2 = attribute.value) === null || _attribute$value2 === void 0 ? void 0 : _attribute$value2.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);

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

@@ -19,9 +19,12 @@ export const importTypesFromNewEntryPoint = (buttonImports, specifiers, j, fileS
   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();
+      // @ts-ignore
+      specifier.node.importKind = 'type'; // make sure all type imports are prefixed with the `type` keyword
+      specifiers.push(specifier.node); // add new Appearance and Spacing types to the new entrypoint
+      j(specifier).remove(); // remove old one
     });
   }
+
   return specifiers;
 };

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

@@ -10,7 +10,7 @@ export const migrateFitContainerIconButton = (element, j) => {
   const iconElement = iconAttrs && iconAttrs[0] && getIconElement(iconAttrs[0]);
   const labelAttribute = iconElement && Array.isArray(iconElement.openingElement.attributes) && ((_iconElement$openingE = iconElement.openingElement) === null || _iconElement$openingE === void 0 ? void 0 : _iconElement$openingE.attributes.find(path => path.type === 'JSXAttribute' && (path.name.name === 'label' || path.name.name === 'aria-label' || path.name.name === 'aria-labelledby')));
   let migratedToIconButton;
-  if (labelAttribute && labelAttribute.type === 'JSXAttribute' && ((_labelAttribute$value = labelAttribute.value) === null || _labelAttribute$value === void 0 ? void 0 : _labelAttribute$value.type) === 'Literal' && typeof labelAttribute.value.value === 'string') {
+  if (labelAttribute && labelAttribute.type === 'JSXAttribute' && ((_labelAttribute$value = labelAttribute.value) === null || _labelAttribute$value === void 0 ? void 0 : _labelAttribute$value.type) === 'StringLiteral' && typeof labelAttribute.value.value === 'string') {
     migratedToIconButton = false;
     const label = labelAttribute.value.value;
     const formattedLabel = `${label.charAt(0).toUpperCase()}${label.slice(1)}`.split('-').join(' ');

package/dist/es2019/presets/theme-remove-deprecated-mixins/theme-remove-deprecated-mixins.js

@@ -1,4 +1,4 @@
-import { hasImportDeclaration, hasImportSpecifier, getImportDeclaration, insertImportSpecifier } from '@codeshift/utils';
+import { hasImportDeclaration, getImportDeclaration, insertImportSpecifier } from '@codeshift/utils';
 import { colorReplacements } from './utils/replacements';
 function isDecendantOfType(j, path, type) {
   return j(path).closest(type).length > 0;
@@ -10,15 +10,8 @@ function insertTokenImport(j, source) {
   const newImport = j.importDeclaration([j.importSpecifier(j.identifier('token'))], j.stringLiteral('@atlaskit/tokens'));
   source.get().node.program.body.unshift(newImport);
 }
-function insertThemedImport(j, source) {
-  if (hasImportSpecifier(j, source, 'themed', '@atlaskit/theme/components')) {
-    return;
-  }
-  const newImport = j.importDeclaration([j.importSpecifier(j.identifier('themed'))], j.stringLiteral('@atlaskit/theme/components'));
-  source.get().node.program.body.unshift(newImport);
-}
-function buildToken(j, tokenId, node) {
-  const callExpr = j.callExpression(j.identifier('token'), [j.stringLiteral(tokenId), node].filter(Boolean));
+function buildToken(j, tokenId = '', node) {
+  const callExpr = tokenId ? j.callExpression(j.identifier('token'), [j.stringLiteral(tokenId), node].filter(Boolean)) : node;
   return callExpr;
 }
 function isDecendantOfTokenMethod(j, path) {
@@ -29,9 +22,6 @@ function isDecendantOfTokenMethod(j, path) {
   }).length > 0;
 }
 const isDeprecatedApi = identifierName => Object.keys(colorReplacements).includes(identifierName);
-function buildThemedNode(j, tokenId = '', fallbackLight, fallbackDark) {
-  return j.callExpression(j.identifier('themed'), [j.objectExpression([j.objectProperty(j.identifier('light'), tokenId ? buildToken(j, tokenId, fallbackLight) : fallbackLight), j.objectProperty(j.identifier('dark'), tokenId ? buildToken(j, tokenId, fallbackDark) : fallbackDark)])]);
-}
 function replaceIdentifiers(j, source, specifier) {
   const importSpecifierLocal = specifier.value.local.name;
   const importSpecifierImported = specifier.value.imported.name;
@@ -50,22 +40,13 @@ function replaceIdentifiers(j, source, specifier) {
     const tokenId = isDecendantOfToken ? tokenParentNode.value.arguments[0].value : replacement.tokenId;
     insertTokenImport(j, source);
     insertImportSpecifier(j, source, j.importSpecifier(j.identifier(replacement.importSpecifiers[0])), '@atlaskit/theme/colors');
-
-    // Requires themed function
     if (isDynamicReplacement) {
-      const themedNode = buildThemedNode(j, tokenId, j.identifier(replacement.importSpecifiers[0]), j.identifier(replacement.importSpecifiers[1]));
-      insertThemedImport(j, source);
-      insertImportSpecifier(j, source, j.importSpecifier(j.identifier(replacement.importSpecifiers[1])), '@atlaskit/theme/colors');
-      if (isDecendantOfToken && isDecendantOfCallExpression) {
-        const callExpression = identifier.parent;
-        tokenParentNode.replace(j.callExpression(themedNode, callExpression.value.arguments));
-        return;
-      }
+      const token = buildToken(j, tokenId, j.identifier(replacement.importSpecifiers[0]));
       if (isDecendantOfToken) {
-        tokenParentNode.replace(themedNode);
+        tokenParentNode.replace(token);
         return;
       }
-      identifier.replace(themedNode);
+      (isDecendantOfCallExpression ? identifier.parent : identifier).replace(token);
       return;
     }
     if (!isDecendantOfToken && replacement.tokenId) {
@@ -96,21 +77,13 @@ function replaceMemberExpressions(j, source, specifier) {
     }).get();
     const tokenId = isDecendantOfToken ? tokenParentNode.value.arguments[0].value : replacement.tokenId;
     insertTokenImport(j, source);
-
-    // Requires themed function
     if (isDynamicReplacement) {
-      const themedNode = buildThemedNode(j, tokenId, j.memberExpression(j.identifier(memberExpression.value.object.name), j.identifier(replacement.importSpecifiers[0])), j.memberExpression(j.identifier(memberExpression.value.object.name), j.identifier(replacement.importSpecifiers[1])));
-      insertThemedImport(j, source);
-      if (isDecendantOfToken && isDecendantOfCallExpression) {
-        const callExpression = identifier.parent.parent;
-        tokenParentNode.replace(j.callExpression(themedNode, callExpression.value.arguments));
-        return;
-      }
+      const token = buildToken(j, tokenId, j.memberExpression(j.identifier(memberExpression.value.object.name), j.identifier(replacement.importSpecifiers[0])));
       if (isDecendantOfToken) {
-        tokenParentNode.replace(themedNode);
+        tokenParentNode.replace(token);
         return;
       }
-      memberExpression.replace(themedNode);
+      (isDecendantOfCallExpression ? memberExpression.parent : memberExpression).replace(token);
       return;
     }
     if (!isDecendantOfToken && replacement.tokenId) {

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

@@ -69,12 +69,12 @@ var transformer = function transformer(file, api) {
       hasLinkButton = true;
       j(element).replaceWith(generateNewElement(NEW_BUTTON_VARIANTS.link, element.value, j));
     }
-    if (!hasHref && attributes.find(function (node) {
+    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) === 'Literal' && (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');
-    })) {
-      // @ts-ignore
-      addCommentBefore(j, [element], linkButtonMissingHrefComment);
+      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) {
+      addCommentBefore(j, j(linkAppearanceAttribute), linkButtonMissingHrefComment, 'line');
     }
   });
 

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

@@ -44,7 +44,8 @@ export var moveSizeAndLabelAttributes = function moveSizeAndLabelAttributes(elem
         attributes === null || attributes === void 0 || attributes.push(labelAttribute);
       }
       var sizeAttribute = iconJSXElementAttributes.find(function (attribute) {
-        return attribute.type === 'JSXAttribute' && attribute.name.name === 'size';
+        var _attribute$value, _attribute$value2;
+        return attribute.type === 'JSXAttribute' && attribute.name.name === 'size' && ((_attribute$value = attribute.value) === null || _attribute$value === void 0 ? void 0 : _attribute$value.type) === 'StringLiteral' && ((_attribute$value2 = attribute.value) === null || _attribute$value2 === void 0 ? void 0 : _attribute$value2.value) !== 'medium';
       });
       if (sizeAttribute && sizeAttribute.type === 'JSXAttribute') {
         sizeAttribute.name.name = iconRenamed ? 'UNSAFE_size' : "UNSAFE_".concat(iconAttr.name.name, "_size");

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

@@ -25,9 +25,12 @@ export var importTypesFromNewEntryPoint = function importTypesFromNewEntryPoint(
   });
   if (appearanceAndSpacingTypeSpecifier.length) {
     appearanceAndSpacingTypeSpecifier.forEach(function (specifier) {
-      specifiers.push(specifier.node);
-      j(specifier).remove();
+      // @ts-ignore
+      specifier.node.importKind = 'type'; // make sure all type imports are prefixed with the `type` keyword
+      specifiers.push(specifier.node); // add new Appearance and Spacing types to the new entrypoint
+      j(specifier).remove(); // remove old one
     });
   }
+
   return specifiers;
 };

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

@@ -10,7 +10,7 @@ export var migrateFitContainerIconButton = function migrateFitContainerIconButto
     return path.type === 'JSXAttribute' && (path.name.name === 'label' || path.name.name === 'aria-label' || path.name.name === 'aria-labelledby');
   }));
   var migratedToIconButton;
-  if (labelAttribute && labelAttribute.type === 'JSXAttribute' && ((_labelAttribute$value = labelAttribute.value) === null || _labelAttribute$value === void 0 ? void 0 : _labelAttribute$value.type) === 'Literal' && typeof labelAttribute.value.value === 'string') {
+  if (labelAttribute && labelAttribute.type === 'JSXAttribute' && ((_labelAttribute$value = labelAttribute.value) === null || _labelAttribute$value === void 0 ? void 0 : _labelAttribute$value.type) === 'StringLiteral' && typeof labelAttribute.value.value === 'string') {
     migratedToIconButton = false;
     var label = labelAttribute.value.value;
     var formattedLabel = "".concat(label.charAt(0).toUpperCase()).concat(label.slice(1)).split('-').join(' ');

package/dist/esm/presets/theme-remove-deprecated-mixins/theme-remove-deprecated-mixins.js

@@ -1,4 +1,4 @@
-import { hasImportDeclaration, hasImportSpecifier, getImportDeclaration, insertImportSpecifier } from '@codeshift/utils';
+import { hasImportDeclaration, getImportDeclaration, insertImportSpecifier } from '@codeshift/utils';
 import { colorReplacements } from './utils/replacements';
 function isDecendantOfType(j, path, type) {
   return j(path).closest(type).length > 0;
@@ -10,15 +10,10 @@ function insertTokenImport(j, source) {
   var newImport = j.importDeclaration([j.importSpecifier(j.identifier('token'))], j.stringLiteral('@atlaskit/tokens'));
   source.get().node.program.body.unshift(newImport);
 }
-function insertThemedImport(j, source) {
-  if (hasImportSpecifier(j, source, 'themed', '@atlaskit/theme/components')) {
-    return;
-  }
-  var newImport = j.importDeclaration([j.importSpecifier(j.identifier('themed'))], j.stringLiteral('@atlaskit/theme/components'));
-  source.get().node.program.body.unshift(newImport);
-}
-function buildToken(j, tokenId, node) {
-  var callExpr = j.callExpression(j.identifier('token'), [j.stringLiteral(tokenId), node].filter(Boolean));
+function buildToken(j) {
+  var tokenId = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+  var node = arguments.length > 2 ? arguments[2] : undefined;
+  var callExpr = tokenId ? j.callExpression(j.identifier('token'), [j.stringLiteral(tokenId), node].filter(Boolean)) : node;
   return callExpr;
 }
 function isDecendantOfTokenMethod(j, path) {
@@ -31,12 +26,6 @@ function isDecendantOfTokenMethod(j, path) {
 var isDeprecatedApi = function isDeprecatedApi(identifierName) {
   return Object.keys(colorReplacements).includes(identifierName);
 };
-function buildThemedNode(j) {
-  var tokenId = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
-  var fallbackLight = arguments.length > 2 ? arguments[2] : undefined;
-  var fallbackDark = arguments.length > 3 ? arguments[3] : undefined;
-  return j.callExpression(j.identifier('themed'), [j.objectExpression([j.objectProperty(j.identifier('light'), tokenId ? buildToken(j, tokenId, fallbackLight) : fallbackLight), j.objectProperty(j.identifier('dark'), tokenId ? buildToken(j, tokenId, fallbackDark) : fallbackDark)])]);
-}
 function replaceIdentifiers(j, source, specifier) {
   var importSpecifierLocal = specifier.value.local.name;
   var importSpecifierImported = specifier.value.imported.name;
@@ -61,22 +50,13 @@ function replaceIdentifiers(j, source, specifier) {
     var tokenId = isDecendantOfToken ? tokenParentNode.value.arguments[0].value : replacement.tokenId;
     insertTokenImport(j, source);
     insertImportSpecifier(j, source, j.importSpecifier(j.identifier(replacement.importSpecifiers[0])), '@atlaskit/theme/colors');
-
-    // Requires themed function
     if (isDynamicReplacement) {
-      var themedNode = buildThemedNode(j, tokenId, j.identifier(replacement.importSpecifiers[0]), j.identifier(replacement.importSpecifiers[1]));
-      insertThemedImport(j, source);
-      insertImportSpecifier(j, source, j.importSpecifier(j.identifier(replacement.importSpecifiers[1])), '@atlaskit/theme/colors');
-      if (isDecendantOfToken && isDecendantOfCallExpression) {
-        var callExpression = identifier.parent;
-        tokenParentNode.replace(j.callExpression(themedNode, callExpression.value.arguments));
-        return;
-      }
+      var token = buildToken(j, tokenId, j.identifier(replacement.importSpecifiers[0]));
       if (isDecendantOfToken) {
-        tokenParentNode.replace(themedNode);
+        tokenParentNode.replace(token);
         return;
       }
-      identifier.replace(themedNode);
+      (isDecendantOfCallExpression ? identifier.parent : identifier).replace(token);
       return;
     }
     if (!isDecendantOfToken && replacement.tokenId) {
@@ -109,21 +89,13 @@ function replaceMemberExpressions(j, source, specifier) {
     }).get();
     var tokenId = isDecendantOfToken ? tokenParentNode.value.arguments[0].value : replacement.tokenId;
     insertTokenImport(j, source);
-
-    // Requires themed function
     if (isDynamicReplacement) {
-      var themedNode = buildThemedNode(j, tokenId, j.memberExpression(j.identifier(memberExpression.value.object.name), j.identifier(replacement.importSpecifiers[0])), j.memberExpression(j.identifier(memberExpression.value.object.name), j.identifier(replacement.importSpecifiers[1])));
-      insertThemedImport(j, source);
-      if (isDecendantOfToken && isDecendantOfCallExpression) {
-        var callExpression = identifier.parent.parent;
-        tokenParentNode.replace(j.callExpression(themedNode, callExpression.value.arguments));
-        return;
-      }
+      var token = buildToken(j, tokenId, j.memberExpression(j.identifier(memberExpression.value.object.name), j.identifier(replacement.importSpecifiers[0])));
       if (isDecendantOfToken) {
-        tokenParentNode.replace(themedNode);
+        tokenParentNode.replace(token);
         return;
       }
-      memberExpression.replace(themedNode);
+      (isDecendantOfCallExpression ? memberExpression.parent : memberExpression).replace(token);
       return;
     }
     if (!isDecendantOfToken && replacement.tokenId) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/codemod-cli",
-  "version": "0.17.6",
+  "version": "0.17.8",
   "description": "A cli for distributing codemods for atlassian-frontend components and services",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"