@atlaskit/codemod-cli 0.24.3 → 0.24.4

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/codemod-cli
 
+## 0.24.4
+
+### Patch Changes
+
+- [#108929](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/108929)
+  [`a25122bc3dc8f`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a25122bc3dc8f) -
+  Fixed the duplicated "Button" imports after migrating loading buttons to default buttons.
+
 ## 0.24.3
 
 ### 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.24.3", _PACKAGE_VERSION_ = _process$env$_PACKAGE === void 0 ? '0.0.0-dev' : _process$env$_PACKAGE;
+          _process$env$_PACKAGE = "0.24.4", _PACKAGE_VERSION_ = _process$env$_PACKAGE === void 0 ? '0.0.0-dev' : _process$env$_PACKAGE;
           logger.log(_chalk.default.bgBlue(_chalk.default.black("\uD83D\uDCDA Atlassian-Frontend codemod library @ ".concat(_PACKAGE_VERSION_, " \uD83D\uDCDA"))));
           if (packages && packages.length > 0) {
             logger.log(_chalk.default.gray("Searching for codemods for newer versions of the following packages: ".concat(packages.map(function (pkg) {

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

@@ -115,6 +115,33 @@ var transformer = function transformer(file, api) {
         hasVariant.iconButton = true;
       } else {
         hasVariant.defaultButton = true;
+
+        // rename existing Button to LegacyButton
+        var existingDefaultButtonSpecifier = fileSource.find(j.ImportDefaultSpecifier).filter(function (path) {
+          var _path$value$local;
+          return ((_path$value$local = path.value.local) === null || _path$value$local === void 0 ? void 0 : _path$value$local.name) === _constants.NEW_BUTTON_VARIANTS.default;
+        });
+        if (existingDefaultButtonSpecifier.length > 0) {
+          fileSource.find(j.JSXElement).filter(function (path) {
+            return path.value.openingElement.name.type === 'JSXIdentifier' && path.value.openingElement.name.name === _constants.NEW_BUTTON_VARIANTS.default;
+          }).forEach(function (element) {
+            var _element$value$childr2, _element$value$childr3;
+            // find all default <Button> JSX elements and replace with <LegacyButton>
+            j(element).replaceWith(j.jsxElement(j.jsxOpeningElement(j.jsxIdentifier('LegacyButton'), element.value.openingElement.attributes, ((_element$value$childr2 = element.value.children) === null || _element$value$childr2 === void 0 ? void 0 : _element$value$childr2.length) === 0), ((_element$value$childr3 = element.value.children) === null || _element$value$childr3 === void 0 ? void 0 : _element$value$childr3.length) === 0 ? null : j.jsxClosingElement(j.jsxIdentifier('LegacyButton')), element.value.children));
+          });
+
+          // rename Button to LegacyButton in all call expressions i.e. render(Button), find(Button)
+          fileSource.find(j.CallExpression).find(j.Identifier).forEach(function (path) {
+            if (path.node.name === _constants.NEW_BUTTON_VARIANTS.default) {
+              path.node.name = 'LegacyButton';
+            }
+          });
+
+          // rename Button to LegacyButton in import declaration
+          existingDefaultButtonSpecifier.forEach(function (specifier) {
+            return j(specifier).replaceWith(j.importDefaultSpecifier(j.identifier('LegacyButton')));
+          });
+        }
       }
       j(element).replaceWith(newElement);
       if (hasHref || linkAppearanceAttribute) {
@@ -240,6 +267,7 @@ var transformer = function transformer(file, api) {
   fileSource.find(j.ImportDeclaration).filter(function (path) {
     return (path.node.source.value === '@atlaskit/button' || path.node.source.value === '@atlaskit/button/types') && !!path.node.specifiers && path.node.specifiers.length === 0;
   }).remove();
+  (0, _addCommentForCustomThemeButtons.addCommentForCustomThemeButtons)(fileSource, j);
   return fileSource.toSource(_constants.PRINT_SETTINGS);
 };
 var _default = exports.default = transformer;

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

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

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

@@ -101,6 +101,29 @@ const transformer = (file, api) => {
         hasVariant.iconButton = true;
       } else {
         hasVariant.defaultButton = true;
+
+        // rename existing Button to LegacyButton
+        const existingDefaultButtonSpecifier = fileSource.find(j.ImportDefaultSpecifier).filter(path => {
+          var _path$value$local;
+          return ((_path$value$local = path.value.local) === null || _path$value$local === void 0 ? void 0 : _path$value$local.name) === NEW_BUTTON_VARIANTS.default;
+        });
+        if (existingDefaultButtonSpecifier.length > 0) {
+          fileSource.find(j.JSXElement).filter(path => path.value.openingElement.name.type === 'JSXIdentifier' && path.value.openingElement.name.name === NEW_BUTTON_VARIANTS.default).forEach(element => {
+            var _element$value$childr2, _element$value$childr3;
+            // find all default <Button> JSX elements and replace with <LegacyButton>
+            j(element).replaceWith(j.jsxElement(j.jsxOpeningElement(j.jsxIdentifier('LegacyButton'), element.value.openingElement.attributes, ((_element$value$childr2 = element.value.children) === null || _element$value$childr2 === void 0 ? void 0 : _element$value$childr2.length) === 0), ((_element$value$childr3 = element.value.children) === null || _element$value$childr3 === void 0 ? void 0 : _element$value$childr3.length) === 0 ? null : j.jsxClosingElement(j.jsxIdentifier('LegacyButton')), element.value.children));
+          });
+
+          // rename Button to LegacyButton in all call expressions i.e. render(Button), find(Button)
+          fileSource.find(j.CallExpression).find(j.Identifier).forEach(path => {
+            if (path.node.name === NEW_BUTTON_VARIANTS.default) {
+              path.node.name = 'LegacyButton';
+            }
+          });
+
+          // rename Button to LegacyButton in import declaration
+          existingDefaultButtonSpecifier.forEach(specifier => j(specifier).replaceWith(j.importDefaultSpecifier(j.identifier('LegacyButton'))));
+        }
       }
       j(element).replaceWith(newElement);
       if (hasHref || linkAppearanceAttribute) {
@@ -205,6 +228,7 @@ const transformer = (file, api) => {
 
   // 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();
+  addCommentForCustomThemeButtons(fileSource, j);
   return fileSource.toSource(PRINT_SETTINGS);
 };
 export default transformer;

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

@@ -19,5 +19,5 @@ export const addCommentForCustomThemeButtons = (fileSource, j) => {
   if (!customThemeButtonElement.length) {
     return;
   }
-  addCommentBefore(j, j(customThemeButtonElement.get(0).node.openingElement), customThemeButtonComment, 'line');
+  addCommentBefore(j, j(customThemeButtonElement.get(0).node.openingElement), customThemeButtonComment, 'block');
 };

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.24.3", _PACKAGE_VERSION_ = _process$env$_PACKAGE === void 0 ? '0.0.0-dev' : _process$env$_PACKAGE;
+          _process$env$_PACKAGE = "0.24.4", _PACKAGE_VERSION_ = _process$env$_PACKAGE === void 0 ? '0.0.0-dev' : _process$env$_PACKAGE;
           logger.log(chalk.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

@@ -108,6 +108,33 @@ var transformer = function transformer(file, api) {
         hasVariant.iconButton = true;
       } else {
         hasVariant.defaultButton = true;
+
+        // rename existing Button to LegacyButton
+        var existingDefaultButtonSpecifier = fileSource.find(j.ImportDefaultSpecifier).filter(function (path) {
+          var _path$value$local;
+          return ((_path$value$local = path.value.local) === null || _path$value$local === void 0 ? void 0 : _path$value$local.name) === NEW_BUTTON_VARIANTS.default;
+        });
+        if (existingDefaultButtonSpecifier.length > 0) {
+          fileSource.find(j.JSXElement).filter(function (path) {
+            return path.value.openingElement.name.type === 'JSXIdentifier' && path.value.openingElement.name.name === NEW_BUTTON_VARIANTS.default;
+          }).forEach(function (element) {
+            var _element$value$childr2, _element$value$childr3;
+            // find all default <Button> JSX elements and replace with <LegacyButton>
+            j(element).replaceWith(j.jsxElement(j.jsxOpeningElement(j.jsxIdentifier('LegacyButton'), element.value.openingElement.attributes, ((_element$value$childr2 = element.value.children) === null || _element$value$childr2 === void 0 ? void 0 : _element$value$childr2.length) === 0), ((_element$value$childr3 = element.value.children) === null || _element$value$childr3 === void 0 ? void 0 : _element$value$childr3.length) === 0 ? null : j.jsxClosingElement(j.jsxIdentifier('LegacyButton')), element.value.children));
+          });
+
+          // rename Button to LegacyButton in all call expressions i.e. render(Button), find(Button)
+          fileSource.find(j.CallExpression).find(j.Identifier).forEach(function (path) {
+            if (path.node.name === NEW_BUTTON_VARIANTS.default) {
+              path.node.name = 'LegacyButton';
+            }
+          });
+
+          // rename Button to LegacyButton in import declaration
+          existingDefaultButtonSpecifier.forEach(function (specifier) {
+            return j(specifier).replaceWith(j.importDefaultSpecifier(j.identifier('LegacyButton')));
+          });
+        }
       }
       j(element).replaceWith(newElement);
       if (hasHref || linkAppearanceAttribute) {
@@ -233,6 +260,7 @@ var transformer = function transformer(file, api) {
   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();
+  addCommentForCustomThemeButtons(fileSource, j);
   return fileSource.toSource(PRINT_SETTINGS);
 };
 export default transformer;

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

@@ -23,5 +23,5 @@ export var addCommentForCustomThemeButtons = function addCommentForCustomThemeBu
   if (!customThemeButtonElement.length) {
     return;
   }
-  addCommentBefore(j, j(customThemeButtonElement.get(0).node.openingElement), customThemeButtonComment, 'line');
+  addCommentBefore(j, j(customThemeButtonElement.get(0).node.openingElement), customThemeButtonComment, 'block');
 };

package/package.json

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