@carbon/upgrade 11.32.0 → 11.33.0

package/cli.js

@@ -44386,7 +44386,7 @@ var upgrades = [
 var package_default = {
   name: "@carbon/upgrade",
   description: "A tool for upgrading Carbon versions",
-  version: "11.32.0",
+  version: "11.33.0",
   license: "Apache-2.0",
   bin: {
     "carbon-upgrade": "./bin/carbon-upgrade.js"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/upgrade",
   "description": "A tool for upgrading Carbon versions",
-  "version": "11.32.0",
+  "version": "11.33.0",
   "license": "Apache-2.0",
   "bin": {
     "carbon-upgrade": "./bin/carbon-upgrade.js"
@@ -60,5 +60,5 @@
     "@ibm/telemetry-js": "^1.5.0",
     "jscodeshift": "^17.0.0"
   },
-  "gitHead": "7c8548ba752bea350cc1c6a4955b1b5184429015"
+  "gitHead": "c76188a59aad432ce28e79b1a8a6b95457ba2cce"
 }

package/transforms/__testfixtures__/ibm-products-update-pdlc-status.input.js

@@ -1,2 +1,2 @@
 // eslint-disable-next-line no-unused-vars
-import { Tearsheet, SearchBar } from '@carbon/ibm-products';
+import { Tearsheet, SearchBar, InlineTip } from '@carbon/ibm-products';

package/transforms/__testfixtures__/ibm-products-update-pdlc-status.output.js

@@ -1,2 +1,5 @@
-// eslint-disable-next-line no-unused-vars
-import { Tearsheet, previewCandidate__SearchBar } from '@carbon/ibm-products';
+import {
+  Tearsheet,
+  previewCandidate__SearchBar as SearchBar,
+  previewCandidate__InlineTip as InlineTip,
+} from '@carbon/ibm-products';

package/transforms/__testfixtures__/rename-imports-to-preview-core-and-products.input.js

@@ -1,4 +1,2 @@
-// eslint-disable-next-line no-unused-vars
-import { unstable__FluidTimePicker } from '@carbon/react';
-// eslint-disable-next-line no-unused-vars
+import { unstable__FluidTimePicker as FluidTimePicker } from '@carbon/react';
 import { Tearsheet, SearchBar } from '@carbon/ibm-products';

package/transforms/__testfixtures__/rename-imports-to-preview-core-and-products.output.js

@@ -1,4 +1,2 @@
-// eslint-disable-next-line no-unused-vars
-import { preview__FluidTimePicker } from '@carbon/react';
-// eslint-disable-next-line no-unused-vars
-import { Tearsheet, previewCandidate__SearchBar } from '@carbon/ibm-products';
+import { preview__FluidTimePicker as FluidTimePicker } from '@carbon/react';
+import { Tearsheet, previewCandidate__SearchBar as SearchBar } from '@carbon/ibm-products';

package/transforms/__testfixtures__/rename-imports-to-preview.input.js

@@ -1,2 +1,2 @@
-// eslint-disable-next-line no-unused-vars
+import { unstable__FluidTimePicker as FluidTimePicker } from '@carbon/react';
 import { unstable__FluidTimePicker } from '@carbon/react';

package/transforms/__testfixtures__/rename-imports-to-preview.output.js

@@ -1,2 +1,2 @@
-// eslint-disable-next-line no-unused-vars
-import { preview__FluidTimePicker } from '@carbon/react';
+import { preview__FluidTimePicker as FluidTimePicker } from '@carbon/react';
+import { preview__FluidTimePicker } from '@carbon/react';

package/transforms/ibm-products-update-pdlc-status.js

@@ -15,7 +15,7 @@ const { productsPreviewMap } = require('./nonStableMapping');
  * import { SearchBar, InlineTip } from '@carbon/ibm-products';
  *
  * After:
- * import { previewCandidate__SearchBar, previewCandidate__InlineTip } from "@carbon/ibm-products";
+ * import { previewCandidate__SearchBar as SearchBar, previewCandidate__InlineTip as InlineTip } from "@carbon/ibm-products";
  */
 
 const nonStableComponentKeys = Object.keys(productsPreviewMap);
@@ -29,15 +29,56 @@ function transformer(file, api) {
         value: '@carbon/ibm-products',
       },
     })
-    .find(j.ImportSpecifier)
-    .filter(
-      (path) => !!nonStableComponentKeys.includes(path.node.imported.name)
-    )
-    .replaceWith((path) =>
-      j.importSpecifier(
-        j.identifier(productsPreviewMap[path.node.imported.name])
-      )
-    )
+    .forEach((path) => {
+      const uniqueSpecifiers = new Set();
+      const newSpecifiers = [];
+      path.node.specifiers.forEach((specifier) => {
+        if (specifier.type === 'ImportSpecifier') {
+          nonStableComponentKeys.forEach((c) => {
+            const importedName = specifier.imported.name;
+            const localName = specifier.local
+              ? specifier.local.name
+              : importedName;
+            let transformedImportedName = importedName;
+            if (importedName === c) {
+              transformedImportedName = productsPreviewMap[c];
+              specifier.imported.name = transformedImportedName;
+              // Build new import specifier so that
+              // products components changing exports
+              // are aliased to their original name.
+              // This will help to avoid additional changes
+              // within jsx.
+              const importSpecifier = j.importSpecifier(
+                j.identifier(transformedImportedName),
+                // Use the already specified alias if there is one
+                j.identifier(localName)
+              );
+              j(path).replaceWith(
+                j.importDeclaration(
+                  [...path.node.specifiers, importSpecifier],
+                  path.node.source
+                )
+              );
+
+              if (specifier.type === 'ImportSpecifier') {
+                if (!uniqueSpecifiers.has(importedName)) {
+                  uniqueSpecifiers.add(importedName);
+                  newSpecifiers.push(importSpecifier);
+                }
+              } else {
+                newSpecifiers.push(specifier);
+              }
+            }
+          });
+          // Replace the original specifiers with the new aliased ones
+          // to prevent further changes needed in jsx for products components
+          const others = path.node.specifiers.filter(
+            (c) => !Object.values(productsPreviewMap).includes(c.imported.name)
+          );
+          path.node.specifiers = [...others, ...newSpecifiers];
+        }
+      });
+    })
     .toSource();
 }
 

package/transforms/nonStableMapping.js

@@ -13,6 +13,12 @@ exports.productsPreviewMap = {
   BigNumber: 'previewCandidate__BigNumber',
   BigNumbers: 'previewCandidate__BigNumber',
   Coachmark: 'previewCandidate__Coachmark',
+  CoachmarkBeacon: 'previewCandidate__CoachmarkBeacon',
+  CoachmarkButton: 'previewCandidate__CoachmarkButton',
+  CoachmarkFixed: 'previewCandidate__CoachmarkFixed',
+  CoachmarkOverlayElement: 'previewCandidate__CoachmarkOverlayElement',
+  CoachmarkOverlayElements: 'previewCandidate__CoachmarkOverlayElements',
+  CoachmarkStack: 'previewCandidate__CoachmarkStack',
   ConditionBuilder: 'previewCandidate__ConditionBuilder',
   DataSpreadsheet: 'previewCandidate__DataSpreadsheet',
   Decorator: 'previewCandidate__Decorator',

package/transforms/rename-imports-to-preview-core-and-products.js

@@ -17,7 +17,7 @@ const { reactPreviewMap, productsPreviewMap } = require('./nonStableMapping');
  *
  * After:
  * import { preview__FluidTimePicker } from "@carbon/react";
- * import { previewCandidate__SearchBar } from '@carbon/ibm-products';
+ * import { previewCandidate__SearchBar as SearchBar } from '@carbon/ibm-products';
  */
 
 const allPreviews = { ...reactPreviewMap, ...productsPreviewMap };
@@ -36,11 +36,60 @@ function transformer(file, api) {
           value: p,
         },
       })
-      .find(j.ImportSpecifier)
-      .filter((path) => !!nonStableKeys.includes(path.node.imported.name))
-      .replaceWith((path) =>
-        j.importSpecifier(j.identifier(allPreviews[path.node.imported.name]))
-      );
+      .forEach((path) => {
+        const uniqueSpecifiers = new Set();
+        const newSpecifiers = [];
+        path.node.specifiers.forEach((specifier) => {
+          if (specifier.type === 'ImportSpecifier') {
+            nonStableKeys.forEach((c) => {
+              const importedName = specifier.imported.name;
+              const localName = specifier.local
+                ? specifier.local.name
+                : importedName;
+              let transformedImportedName = importedName;
+              if (importedName === c) {
+                transformedImportedName = allPreviews[c];
+                specifier.imported.name = transformedImportedName;
+                if (p === '@carbon/ibm-products') {
+                  // Build new import specifier so that
+                  // products components changing exports
+                  // are aliased to their original name.
+                  // This will help to avoid additional changes
+                  // within jsx.
+                  const importSpecifier = j.importSpecifier(
+                    j.identifier(transformedImportedName),
+                    // Use the already specified alias if there is one
+                    j.identifier(localName)
+                  );
+                  j(path).replaceWith(
+                    j.importDeclaration(
+                      [...path.node.specifiers, importSpecifier],
+                      path.node.source
+                    )
+                  );
+                  if (specifier.type === 'ImportSpecifier') {
+                    if (!uniqueSpecifiers.has(importedName)) {
+                      uniqueSpecifiers.add(importedName);
+                      newSpecifiers.push(importSpecifier);
+                    }
+                  } else {
+                    newSpecifiers.push(specifier);
+                  }
+                }
+              }
+            });
+            // Replace the original specifiers with the new aliased ones
+            // to prevent further changes needed in jsx for products components
+            if (p === '@carbon/ibm-products') {
+              const others = path.node.specifiers.filter(
+                (c) =>
+                  !Object.values(productsPreviewMap).includes(c.imported.name)
+              );
+              path.node.specifiers = [...others, ...newSpecifiers];
+            }
+          }
+        });
+      });
   });
   return root.toSource();
 }

package/transforms/rename-imports-to-preview.js

@@ -12,9 +12,13 @@ const { reactPreviewMap } = require('./nonStableMapping');
  *
  * @example
  * Before:
+ * import { unstable__FluidTimePicker as FluidTimePicker } from '@carbon/react';
+ * or
  * import { unstable__FluidTimePicker } from '@carbon/react';
  *
  * After:
+ * import { preview__FluidTimePicker as FluidTimePicker } from "@carbon/react";
+ * or
  * import { preview__FluidTimePicker } from "@carbon/react";
  */
 
@@ -29,13 +33,20 @@ function transformer(file, api) {
         value: '@carbon/react',
       },
     })
-    .find(j.ImportSpecifier)
-    .filter(
-      (path) => !!nonStableComponentKeys.includes(path.node.imported.name)
-    )
-    .replaceWith((path) =>
-      j.importSpecifier(j.identifier(reactPreviewMap[path.node.imported.name]))
-    )
+    .forEach((path) => {
+      path.node.specifiers.forEach((specifier) => {
+        if (specifier.type === 'ImportSpecifier') {
+          nonStableComponentKeys.forEach((c) => {
+            let importedName = specifier.imported.name;
+            let transformedImportedName = importedName;
+            if (importedName === c) {
+              transformedImportedName = reactPreviewMap[c];
+              specifier.imported.name = transformedImportedName;
+            }
+          });
+        }
+      });
+    })
     .toSource();
 }