@carbon/upgrade 11.34.0-rc.0 → 11.35.0-rc.0

package/cli.js

@@ -34340,7 +34340,6 @@ var require_react_is_production = __commonJS({
     var REACT_FRAGMENT_TYPE = Symbol.for("react.fragment");
     var REACT_STRICT_MODE_TYPE = Symbol.for("react.strict_mode");
     var REACT_PROFILER_TYPE = Symbol.for("react.profiler");
-    Symbol.for("react.provider");
     var REACT_CONSUMER_TYPE = Symbol.for("react.consumer");
     var REACT_CONTEXT_TYPE = Symbol.for("react.context");
     var REACT_FORWARD_REF_TYPE = Symbol.for("react.forward_ref");
@@ -34472,9 +34471,7 @@ var require_react_is_development = __commonJS({
           }
         }
       }
-      var REACT_ELEMENT_TYPE = Symbol.for("react.transitional.element"), REACT_PORTAL_TYPE = Symbol.for("react.portal"), REACT_FRAGMENT_TYPE = Symbol.for("react.fragment"), REACT_STRICT_MODE_TYPE = Symbol.for("react.strict_mode"), REACT_PROFILER_TYPE = Symbol.for("react.profiler");
-      Symbol.for("react.provider");
-      var REACT_CONSUMER_TYPE = Symbol.for("react.consumer"), REACT_CONTEXT_TYPE = Symbol.for("react.context"), REACT_FORWARD_REF_TYPE = Symbol.for("react.forward_ref"), REACT_SUSPENSE_TYPE = Symbol.for("react.suspense"), REACT_SUSPENSE_LIST_TYPE = Symbol.for("react.suspense_list"), REACT_MEMO_TYPE = Symbol.for("react.memo"), REACT_LAZY_TYPE = Symbol.for("react.lazy"), REACT_VIEW_TRANSITION_TYPE = Symbol.for("react.view_transition"), REACT_CLIENT_REFERENCE = Symbol.for("react.client.reference");
+      var REACT_ELEMENT_TYPE = Symbol.for("react.transitional.element"), REACT_PORTAL_TYPE = Symbol.for("react.portal"), REACT_FRAGMENT_TYPE = Symbol.for("react.fragment"), REACT_STRICT_MODE_TYPE = Symbol.for("react.strict_mode"), REACT_PROFILER_TYPE = Symbol.for("react.profiler"), REACT_CONSUMER_TYPE = Symbol.for("react.consumer"), REACT_CONTEXT_TYPE = Symbol.for("react.context"), REACT_FORWARD_REF_TYPE = Symbol.for("react.forward_ref"), REACT_SUSPENSE_TYPE = Symbol.for("react.suspense"), REACT_SUSPENSE_LIST_TYPE = Symbol.for("react.suspense_list"), REACT_MEMO_TYPE = Symbol.for("react.memo"), REACT_LAZY_TYPE = Symbol.for("react.lazy"), REACT_VIEW_TRANSITION_TYPE = Symbol.for("react.view_transition"), REACT_CLIENT_REFERENCE = Symbol.for("react.client.reference");
       exports2.ContextConsumer = REACT_CONSUMER_TYPE;
       exports2.ContextProvider = REACT_CONTEXT_TYPE;
       exports2.Element = REACT_ELEMENT_TYPE;
@@ -44386,7 +44383,7 @@ var upgrades = [
 var package_default = {
   name: "@carbon/upgrade",
   description: "A tool for upgrading Carbon versions",
-  version: "11.34.0-rc.0",
+  version: "11.35.0-rc.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.34.0-rc.0",
+  "version": "11.35.0-rc.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": "eae1402aa3c86b644feefc43bd3202915404e924"
+  "gitHead": "dff507858b43de91b300a98fa1bec24d38aaeb48"
 }

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

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

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

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

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

@@ -30,54 +30,63 @@ function transformer(file, api) {
       },
     })
     .forEach((path) => {
-      const uniqueSpecifiers = new Set();
+      const seen = 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 importedName = specifier.imported.name;
+          const localName = specifier.local
+            ? specifier.local.name
+            : importedName;
+
+          const isAlreadyUpdated = nonStableComponentKeys.some(
+            (key) => importedName === productsPreviewMap[key]
+          );
+
+          const needsUpdate = nonStableComponentKeys.includes(importedName);
+
+          if (isAlreadyUpdated) {
+            // Already has prefix, ensure it has an alias to the base component name
+            // Find the base component name by looking up which key maps to this prefixed name
+            const baseComponentName = nonStableComponentKeys.find(
+              (key) => productsPreviewMap[key] === importedName
+            );
+
+            if (baseComponentName && !seen.has(importedName)) {
+              seen.add(importedName);
               const importSpecifier = j.importSpecifier(
-                j.identifier(transformedImportedName),
-                // Use the already specified alias if there is one
+                j.identifier(importedName),
                 j.identifier(localName)
               );
-              j(path).replaceWith(
-                j.importDeclaration(
-                  [...path.node.specifiers, importSpecifier],
-                  path.node.source
-                )
-              );
+              newSpecifiers.push(importSpecifier);
+            } else if (!seen.has(importedName)) {
+              seen.add(importedName);
+              newSpecifiers.push(specifier);
+            }
+          } else if (needsUpdate) {
+            const transformedImportedName = productsPreviewMap[importedName];
 
-              if (specifier.type === 'ImportSpecifier') {
-                if (!uniqueSpecifiers.has(importedName)) {
-                  uniqueSpecifiers.add(importedName);
-                  newSpecifiers.push(importSpecifier);
-                }
-              } else {
-                newSpecifiers.push(specifier);
-              }
+            if (!seen.has(transformedImportedName)) {
+              seen.add(transformedImportedName);
+              const importSpecifier = j.importSpecifier(
+                j.identifier(transformedImportedName),
+                j.identifier(localName)
+              );
+              newSpecifiers.push(importSpecifier);
             }
-          });
-          // 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];
+          } else {
+            // Keep other imports unchanged
+            if (!seen.has(importedName)) {
+              seen.add(importedName);
+              newSpecifiers.push(specifier);
+            }
+          }
+        } else {
+          newSpecifiers.push(specifier);
         }
       });
+      path.node.specifiers = newSpecifiers;
     })
     .toSource();
 }

package/transforms/nonStableMapping.js

@@ -79,4 +79,5 @@ exports.productsPreviewMap = {
   ToolbarButton: 'previewCandidate__ToolbarButton',
   ToolbarGroup: 'previewCandidate__ToolbarGroup',
   TruncatedList: 'previewCandidate__TruncatedList',
+  TruncatedText: 'preview__TruncatedText',
 };

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

@@ -37,60 +37,49 @@ function transformer(file, api) {
         },
       })
       .forEach((path) => {
-        const uniqueSpecifiers = new Set();
         const newSpecifiers = [];
+        const seen = new Set();
+
         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;
+            const importedName = specifier.imported.name;
+            const localName = specifier.local
+              ? specifier.local.name
+              : importedName;
+
+            if (nonStableKeys.includes(importedName)) {
+              const transformedImportedName = allPreviews[importedName];
+
+              if (!seen.has(importedName)) {
+                seen.add(importedName);
+
                 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.
+                  // Create aliased import for products components
                   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);
-                  }
+                  newSpecifiers.push(importSpecifier);
+                } else {
+                  // For @carbon/react, just update the name
+                  specifier.imported.name = transformedImportedName;
+                  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];
+            } else {
+              // Keep non-transformed imports as-is
+              newSpecifiers.push(specifier);
             }
+          } else {
+            // Keep non-ImportSpecifier types (like ImportDefaultSpecifier)
+            newSpecifiers.push(specifier);
           }
         });
+
+        path.node.specifiers = newSpecifiers;
       });
   });
+
   return root.toSource();
 }