@atlaskit/codemod-cli 0.21.0 → 0.21.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/codemod-cli
 
+## 0.21.1
+
+### Patch Changes
+
+- [#87918](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/87918) [`1de8dc826f8d`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/1de8dc826f8d) - Fixed the duplicated label issue and the missing JSX pragma comment.
+
 ## 0.21.0
 
 ### Minor 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.21.0", _PACKAGE_VERSION_ = _process$env$_PACKAGE === void 0 ? '0.0.0-dev' : _process$env$_PACKAGE;
+          _process$env$_PACKAGE = "0.21.1", _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

@@ -141,7 +141,12 @@ var transformer = function transformer(file, api) {
     }
   }
   if (specifiers.length) {
-    oldButtonImport.replaceWith(j.importDeclaration(specifiers, j.stringLiteral(_constants.NEW_BUTTON_ENTRY_POINT)));
+    var newButtonImport = j.importDeclaration(specifiers, j.stringLiteral(_constants.NEW_BUTTON_ENTRY_POINT));
+    oldButtonImport.forEach(function (path) {
+      var _path$node;
+      newButtonImport.comments = path !== null && path !== void 0 && (_path$node = path.node) !== null && _path$node !== void 0 && _path$node.comments ? path.node.comments : undefined;
+    });
+    oldButtonImport.replaceWith(newButtonImport);
   }
 
   // remove empty import declarations

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

@@ -43,11 +43,16 @@ var moveSizeAndLabelAttributes = exports.moveSizeAndLabelAttributes = function m
       }
 
       // move label and size attributes from icon to the root Button prop
-      var labelAttribute = iconJSXElementAttributes.find(function (attribute) {
+      var buttonAlreadyHasLabelProp = attributes === null || attributes === void 0 ? void 0 : attributes.find(function (attribute) {
         return attribute.type === 'JSXAttribute' && attribute.name.name === 'label';
       });
-      if (labelAttribute && labelAttribute.type === 'JSXAttribute' && iconRenamed) {
-        attributes === null || attributes === void 0 || attributes.push(labelAttribute);
+      if (!buttonAlreadyHasLabelProp) {
+        var labelAttribute = iconJSXElementAttributes.find(function (attribute) {
+          return attribute.type === 'JSXAttribute' && attribute.name.name === 'label';
+        });
+        if (labelAttribute && labelAttribute.type === 'JSXAttribute' && iconRenamed) {
+          attributes === null || attributes === void 0 || attributes.push(labelAttribute);
+        }
       }
       var sizeAttribute = iconJSXElementAttributes.find(function (attribute) {
         var _attribute$value, _attribute$value2;

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

@@ -113,7 +113,12 @@ const transformer = (file, api) => {
     }
   }
   if (specifiers.length) {
-    oldButtonImport.replaceWith(j.importDeclaration(specifiers, j.stringLiteral(NEW_BUTTON_ENTRY_POINT)));
+    const newButtonImport = j.importDeclaration(specifiers, j.stringLiteral(NEW_BUTTON_ENTRY_POINT));
+    oldButtonImport.forEach(path => {
+      var _path$node;
+      newButtonImport.comments = path !== null && path !== void 0 && (_path$node = path.node) !== null && _path$node !== void 0 && _path$node.comments ? path.node.comments : undefined;
+    });
+    oldButtonImport.replaceWith(newButtonImport);
   }
 
   // remove empty import declarations

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

@@ -34,9 +34,12 @@ export const moveSizeAndLabelAttributes = (element, j, iconRenamed = false) => {
       }
 
       // move label and size attributes from icon to the root Button prop
-      const labelAttribute = iconJSXElementAttributes.find(attribute => attribute.type === 'JSXAttribute' && attribute.name.name === 'label');
-      if (labelAttribute && labelAttribute.type === 'JSXAttribute' && iconRenamed) {
-        attributes === null || attributes === void 0 ? void 0 : attributes.push(labelAttribute);
+      const buttonAlreadyHasLabelProp = attributes === null || attributes === void 0 ? void 0 : attributes.find(attribute => attribute.type === 'JSXAttribute' && attribute.name.name === 'label');
+      if (!buttonAlreadyHasLabelProp) {
+        const labelAttribute = iconJSXElementAttributes.find(attribute => attribute.type === 'JSXAttribute' && attribute.name.name === 'label');
+        if (labelAttribute && labelAttribute.type === 'JSXAttribute' && iconRenamed) {
+          attributes === null || attributes === void 0 ? void 0 : attributes.push(labelAttribute);
+        }
       }
       const sizeAttribute = iconJSXElementAttributes.find(attribute => {
         var _attribute$value, _attribute$value2;

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

@@ -135,7 +135,12 @@ var transformer = function transformer(file, api) {
     }
   }
   if (specifiers.length) {
-    oldButtonImport.replaceWith(j.importDeclaration(specifiers, j.stringLiteral(NEW_BUTTON_ENTRY_POINT)));
+    var newButtonImport = j.importDeclaration(specifiers, j.stringLiteral(NEW_BUTTON_ENTRY_POINT));
+    oldButtonImport.forEach(function (path) {
+      var _path$node;
+      newButtonImport.comments = path !== null && path !== void 0 && (_path$node = path.node) !== null && _path$node !== void 0 && _path$node.comments ? path.node.comments : undefined;
+    });
+    oldButtonImport.replaceWith(newButtonImport);
   }
 
   // remove empty import declarations

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

@@ -37,11 +37,16 @@ export var moveSizeAndLabelAttributes = function moveSizeAndLabelAttributes(elem
       }
 
       // move label and size attributes from icon to the root Button prop
-      var labelAttribute = iconJSXElementAttributes.find(function (attribute) {
+      var buttonAlreadyHasLabelProp = attributes === null || attributes === void 0 ? void 0 : attributes.find(function (attribute) {
         return attribute.type === 'JSXAttribute' && attribute.name.name === 'label';
       });
-      if (labelAttribute && labelAttribute.type === 'JSXAttribute' && iconRenamed) {
-        attributes === null || attributes === void 0 || attributes.push(labelAttribute);
+      if (!buttonAlreadyHasLabelProp) {
+        var labelAttribute = iconJSXElementAttributes.find(function (attribute) {
+          return attribute.type === 'JSXAttribute' && attribute.name.name === 'label';
+        });
+        if (labelAttribute && labelAttribute.type === 'JSXAttribute' && iconRenamed) {
+          attributes === null || attributes === void 0 || attributes.push(labelAttribute);
+        }
       }
       var sizeAttribute = iconJSXElementAttributes.find(function (attribute) {
         var _attribute$value, _attribute$value2;

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 } from 'jscodeshift';
+import { 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/codemods/next-migrate-to-new-button-variants.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/codemod-cli",
-  "version": "0.21.0",
+  "version": "0.21.1",
   "description": "A cli for distributing codemods for atlassian-frontend components and services",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -40,7 +40,7 @@
   "bin": "./bin/codemod-cli.js",
   "dependencies": {
     "@atlaskit/codemod-utils": "^4.2.0",
-    "@atlaskit/tokens": "^1.42.0",
+    "@atlaskit/tokens": "^1.43.0",
     "@babel/runtime": "^7.0.0",
     "@codeshift/utils": "^0.2.4",
     "@hypermod/utils": "^0.4.2",