@carbon/cli 11.41.0 → 11.42.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/cli",
   "description": "Task automation for working with the Carbon Design System",
-  "version": "11.41.0",
+  "version": "11.42.0",
   "license": "Apache-2.0",
   "type": "module",
   "bin": {
@@ -34,9 +34,6 @@
     "@octokit/plugin-retry": "^3.0.7",
     "@octokit/plugin-throttling": "^4.0.0",
     "@octokit/rest": "^22.0.0",
-    "@rollup/plugin-babel": "^6.0.0",
-    "@rollup/plugin-commonjs": "^28.0.3",
-    "@rollup/plugin-node-resolve": "^15.0.0",
     "chalk": "^5.4.1",
     "change-case-all": "^2.1.0",
     "child-process-promise": "^2.2.1",
@@ -52,10 +49,10 @@
     "progress-estimator": "^0.3.0",
     "remark": "^15.0.1",
     "replace-in-file": "^8.3.0",
-    "rollup": "^4.41.1",
     "sass": "^1.77.7",
-    "typescript-config-carbon": "^0.9.0",
+    "tsdown": "^0.20.3",
+    "typescript": "^5.7.3",
     "yargs": "^17.7.2"
   },
-  "gitHead": "4f48ac426be7302a57460b1c81d74dd5d6071ad6"
+  "gitHead": "aeaaa31889990fc76c7e0e8a29ec0bf96ce33f82"
 }

package/src/commands/bundle/javascript.js

@@ -5,94 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { babel } from '@rollup/plugin-babel';
-import commonjs from '@rollup/plugin-commonjs';
-import { nodeResolve } from '@rollup/plugin-node-resolve';
-import fs from 'fs-extra';
-import path from 'path';
-import { rollup } from 'rollup';
-import {
-  formatGlobals,
-  findPackageFolder,
-  formatDependenciesIntoGlobals,
-} from './utils.js';
+import bundleWithTsdown from './tsdown.js';
 
-export default async function bundle(entrypoint, options) {
-  const globals = options.globals ? formatGlobals(options.globals) : {};
-  const { name } = options;
-  const packageFolder = await findPackageFolder(entrypoint);
-
-  const outputFolders = [
-    {
-      format: 'esm',
-      directory: path.join(packageFolder, 'es'),
-    },
-    {
-      format: 'cjs',
-      directory: path.join(packageFolder, 'lib'),
-    },
-    {
-      format: 'umd',
-      directory: path.join(packageFolder, 'umd'),
-    },
-  ];
-
-  await Promise.all(outputFolders.map(({ directory }) => fs.remove(directory)));
-
-  const jsEntryPoints = outputFolders.map(({ directory, format }) => ({
-    file: path.join(directory, 'index.js'),
-    format,
-  }));
-
-  const packageJsonPath = path.join(packageFolder, 'package.json');
-  const packageJson = await fs.readJson(packageJsonPath);
-  const { dependencies = {} } = packageJson;
-
-  const bundle = await rollup({
-    input: entrypoint,
-    external: Object.keys(dependencies),
-    plugins: [
-      babel({
-        exclude: 'node_modules/**',
-        babelrc: false,
-        presets: [
-          [
-            '@babel/preset-env',
-            {
-              modules: false,
-              targets: {
-                browsers: ['last 1 version', 'ie >= 11', 'Firefox ESR'],
-              },
-            },
-          ],
-        ],
-        babelHelpers: 'bundled',
-      }),
-      nodeResolve(),
-      commonjs({
-        include: [/node_modules/],
-        extensions: ['.js'],
-      }),
-    ],
-  });
-
-  await Promise.all(
-    jsEntryPoints.map(({ format, file }) => {
-      const outputOptions = {
-        format,
-        file,
-        exports: 'auto',
-      };
-
-      if (format === 'umd') {
-        outputOptions.name = name;
-        outputOptions.globals = {
-          ...formatDependenciesIntoGlobals(dependencies),
-          ...globals,
-        };
-      }
-
-      return bundle.write(outputOptions);
-    })
-  );
-}
+export default bundleWithTsdown;

package/src/commands/bundle/tsdown.js

@@ -0,0 +1,171 @@
+/**
+ * Copyright IBM Corp. 2019, 2025
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import fs from 'fs-extra';
+import path from 'path';
+import { build } from 'tsdown';
+import ts from 'typescript';
+import {
+  findPackageFolder,
+  formatDependenciesIntoGlobals,
+  formatGlobals,
+} from './utils.js';
+
+export default async function bundle(entrypoint, options) {
+  const globals = options.globals ? formatGlobals(options.globals) : {};
+  const { name, dts } = options;
+  const packageFolder = await findPackageFolder(entrypoint);
+
+  const outputFolders = [
+    {
+      format: 'esm',
+      directory: path.join(packageFolder, 'es'),
+    },
+    {
+      format: 'cjs',
+      directory: path.join(packageFolder, 'lib'),
+    },
+    {
+      format: 'umd',
+      directory: path.join(packageFolder, 'umd'),
+    },
+  ];
+
+  await Promise.all(outputFolders.map(({ directory }) => fs.remove(directory)));
+
+  const packageJsonPath = path.join(packageFolder, 'package.json');
+  const packageJson = await fs.readJson(packageJsonPath);
+  const { dependencies = {} } = packageJson;
+  const umdGlobals = {
+    ...formatDependenciesIntoGlobals(dependencies),
+    ...globals,
+  };
+
+  for (const { format, directory } of outputFolders) {
+    await build({
+      clean: false,
+      // Emit declarations in a separate pass so we can mirror the same `.d.ts`
+      // tree to `es`, `lib`, and `umd`.
+      dts: false,
+      entry: [entrypoint],
+      external: Object.keys(dependencies),
+      failOnWarn: false,
+      format,
+      globalName: format === 'umd' ? name : undefined,
+      outDir: directory,
+      outputOptions(outputOptions) {
+        const options = {
+          ...outputOptions,
+          entryFileNames: 'index.js',
+        };
+
+        if (format === 'umd') {
+          return {
+            ...options,
+            globals: umdGlobals,
+            name,
+          };
+        }
+
+        return options;
+      },
+      platform: 'browser',
+      report: false,
+      target: 'es2022',
+    });
+  }
+
+  if (dts) {
+    await emitDeclarations(packageFolder);
+    await copyDeclarations(
+      path.join(packageFolder, 'es'),
+      path.join(packageFolder, 'lib')
+    );
+    await copyDeclarations(
+      path.join(packageFolder, 'es'),
+      path.join(packageFolder, 'umd')
+    );
+  }
+}
+
+async function copyDeclarations(fromDir, toDir) {
+  const entries = await fs.readdir(fromDir, { withFileTypes: true });
+
+  for (const entry of entries) {
+    const fromPath = path.join(fromDir, entry.name);
+    const toPath = path.join(toDir, entry.name);
+
+    if (entry.isDirectory()) {
+      await fs.ensureDir(toPath);
+      await copyDeclarations(fromPath, toPath);
+      continue;
+    }
+
+    if (entry.name.endsWith('.d.ts')) {
+      await fs.copy(fromPath, toPath);
+    }
+  }
+}
+
+async function emitDeclarations(packageFolder) {
+  const tsconfigPath = ts.findConfigFile(
+    packageFolder,
+    ts.sys.fileExists,
+    'tsconfig.json'
+  );
+
+  if (!tsconfigPath) {
+    throw new Error(`Unable to find tsconfig.json in ${packageFolder}`);
+  }
+
+  const configFile = ts.readConfigFile(tsconfigPath, ts.sys.readFile);
+
+  if (configFile.error) {
+    throw new Error(formatDiagnostics([configFile.error]));
+  }
+
+  const parsed = ts.parseJsonConfigFileContent(
+    configFile.config,
+    ts.sys,
+    path.dirname(tsconfigPath),
+    {
+      declaration: true,
+      emitDeclarationOnly: true,
+      noEmit: false,
+      outDir: path.join(packageFolder, 'es'),
+      skipLibCheck: true,
+      types: [],
+    },
+    tsconfigPath
+  );
+
+  const testsDirectoryPattern = `${path.sep}__tests__${path.sep}`;
+  const rootNames = parsed.fileNames.filter((filename) => {
+    return !filename.includes(testsDirectoryPattern);
+  });
+
+  const program = ts.createProgram({
+    rootNames,
+    options: parsed.options,
+  });
+  const emitResult = program.emit();
+  const diagnostics = ts
+    .getPreEmitDiagnostics(program)
+    .concat(emitResult.diagnostics || []);
+
+  if (diagnostics.length > 0) {
+    throw new Error(formatDiagnostics(diagnostics));
+  }
+}
+
+function formatDiagnostics(diagnostics) {
+  return ts.formatDiagnosticsWithColorAndContext(diagnostics, {
+    getCanonicalFileName: (filename) => filename,
+    getCurrentDirectory: () => process.cwd(),
+    getNewLine: () => ts.sys.newLine,
+  });
+}

package/src/commands/bundle/typescript.js

@@ -5,110 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { babel } from '@rollup/plugin-babel';
-import commonjs from '@rollup/plugin-commonjs';
-import { nodeResolve } from '@rollup/plugin-node-resolve';
-import typescript from '@rollup/plugin-typescript';
-import fs from 'fs-extra';
-import path from 'path';
-import { rollup } from 'rollup';
-import { loadBaseTsCompilerOpts } from 'typescript-config-carbon';
-import {
-  formatGlobals,
-  findPackageFolder,
-  formatDependenciesIntoGlobals,
-} from './utils.js';
+import bundleWithTsdown from './tsdown.js';
 
-export default async function bundle(entrypoint, options) {
-  const globals = options.globals ? formatGlobals(options.globals) : {};
-  const { name } = options;
-  const packageFolder = await findPackageFolder(entrypoint);
-
-  const outputFolders = [
-    {
-      format: 'esm',
-      directory: path.join(packageFolder, 'es'),
-    },
-    {
-      format: 'cjs',
-      directory: path.join(packageFolder, 'lib'),
-    },
-    {
-      format: 'umd',
-      directory: path.join(packageFolder, 'umd'),
-    },
-  ];
-
-  await Promise.all(outputFolders.map(({ directory }) => fs.remove(directory)));
-
-  const jsEntryPoints = outputFolders.map(({ directory, format }) => ({
-    outputDir: directory,
-    file: path.join(directory, 'index.js'),
-    format,
-  }));
-
-  const packageJsonPath = path.join(packageFolder, 'package.json');
-  const packageJson = await fs.readJson(packageJsonPath);
-  const { dependencies = {} } = packageJson;
-
-  const baseTsCompilerOpts = loadBaseTsCompilerOpts();
-
-  await Promise.all(
-    jsEntryPoints.map(async ({ outputDir, file, format }) => {
-      const bundle = await rollup({
-        input: entrypoint,
-        external: Object.keys(dependencies),
-        plugins: [
-          typescript({
-            noEmitOnError: true,
-            noForceEmit: true,
-            outputToFilesystem: false,
-            compilerOptions: {
-              ...baseTsCompilerOpts,
-              rootDir: 'src',
-              outDir: outputDir,
-            },
-          }),
-          babel({
-            exclude: 'node_modules/**',
-            babelrc: false,
-            presets: [
-              [
-                '@babel/preset-env',
-                {
-                  modules: false,
-                  targets: {
-                    browsers: ['last 1 version', 'ie >= 11', 'Firefox ESR'],
-                  },
-                },
-              ],
-              '@babel/preset-typescript',
-            ],
-            babelHelpers: 'bundled',
-            extensions: ['.ts', '.tsx', '.js', '.jsx'],
-          }),
-          nodeResolve(),
-          commonjs({
-            include: [/node_modules/],
-            extensions: ['.js'],
-          }),
-        ],
-      });
-      const outputOptions = {
-        exports: 'auto',
-        file,
-        format,
-      };
-
-      if (format === 'umd') {
-        outputOptions.name = name;
-        outputOptions.globals = {
-          ...formatDependenciesIntoGlobals(dependencies),
-          ...globals,
-        };
-      }
-
-      return bundle.write(outputOptions);
-    })
-  );
-}
+export default bundleWithTsdown;

package/src/commands/bundle.js

@@ -11,7 +11,7 @@ import bundlers from './bundle/bundlers.js';
 
 const logger = createLogger('bundle');
 
-async function bundle({ entrypoint, name, globals }) {
+async function bundle({ entrypoint, name, globals, dts }) {
   logger.start('bundle');
 
   const cwd = process.cwd();
@@ -29,6 +29,7 @@ async function bundle({ entrypoint, name, globals }) {
     await bundle(path.join(cwd, entrypoint), {
       name,
       globals,
+      dts,
     });
   } catch (error) {
     logger.info(`Unexpected error occurred while bundling ${entrypoint}:`);
@@ -56,6 +57,11 @@ export const builder = (yargs) => {
       describe: 'global module names',
       type: 'string',
     },
+    dts: {
+      describe: 'emit TypeScript declaration files',
+      type: 'boolean',
+      default: false,
+    },
   });
 };
 export const command = 'bundle <entrypoint>';

package/src/commands/ci-check.js

@@ -20,7 +20,6 @@ async function check(args, env) {
     `yarn carbon-cli check --ignore '**/@(node_modules|examples|components|react|fixtures|compat)/**' 'packages/**/*.scss'`,
     `cross-env BABEL_ENV=test yarn test --ci --maxWorkers 2 --reporters=default --reporters=jest-junit`,
     `cross-env BABEL_ENV=test yarn test:e2e --ci --maxWorkers 2 --reporters=default --reporters=jest-junit`,
-    `cross-env PERCY_TOKEN=dd3392142006a6483c8f524697f39f052755fa9dc087ff4437cac3d64227abdd yarn run percy exec -- yarn workspace @carbon/react test:e2e`,
   ];
 
   try {