Merge pull request #1694 from finos/fdc3-commonjs-dts-fix

Fix fdc3-commonjs build by including d.ts files

Author: kriswest

.gitignore

@@ -26,4 +26,6 @@ website/.yarn
 toolbox/fdc3-for-web/fdc3-web-impl/generated/
 cucumber-report.html
 nyc-coverage-report/
-.history/
+.history/
+.rollup.cache
+tsconfig.tsbuildinfo

CHANGELOG.md

@@ -30,6 +30,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 * Revert schema of `fdc3.interaction` context type back to use anyOf in place of oneOf for the `interactionType` property.  Since it could be a string enum or a string, validation could not differentiate. ([#1598](https://github.com/finos/FDC3/issues/1598))
 * Fix `fdc3.timeRange` context example to use correctly formatted dateTime. ([#1599](https://github.com/finos/FDC3/issues/1599))
 * Removes broken sourcemaps from npm package output ([#1589](https://github.com/finos/FDC3/issues/1589))
+* Fixed the `fdc3-commonjs` build to include `d.ts` files and corrects the config for easier consumption in different environments. ([#1694](https://github.com/finos/FDC3/issues/1694))
 
 ## [FDC3 Standard 2.2](https://github.com/finos/FDC3/compare/v2.1..v2.2) - 2025-03-12
 

package-lock.json

@@ -1,34 +1,35 @@
 {
-  "name": "@finos/fdc3-commonjs",
-  "version": "2.2.0",
-  "author": "Fintech Open Source Foundation (FINOS)",
-  "homepage": "https://fdc3.finos.org",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/finos/FDC3.git"
-  },
-  "publishConfig": {
-    "tag": "latest"
-  },
-  "exports": {
-    "require": "./dist/index.cjs"
-  },
-  "license": "Apache-2.0",
-  "files": [
-    "dist"
-  ],
-  "scripts": {
-    "clean": "npx rimraf dist",
-    "build": "npx rollup -c rollup.config.mjs"
-  },
-  "dependencies": {
-    "@finos/fdc3": "2.2.0"
-  },
-  "devDependencies": {
-    "@rollup/plugin-commonjs": "^28.0.1",
-    "@rollup/plugin-json": "^6.1.0",
-    "@rollup/plugin-node-resolve": "^15.3.0",
-    "@rollup/plugin-typescript": "^12.1.1",
-    "rollup": "^4.27.4"
-  }
+    "name": "@finos/fdc3-commonjs",
+    "version": "2.2.0",
+    "author": "Fintech Open Source Foundation (FINOS)",
+    "homepage": "https://fdc3.finos.org",
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/finos/FDC3.git"
+    },
+    "publishConfig": {
+        "tag": "latest"
+    },
+    "main": "./dist/index.cjs",
+    "types": "./dist/index.d.ts",
+    "exports": {
+        "types": "./dist/index.d.ts",
+        "require": "./dist/index.cjs",
+        "import": "./dist/index.cjs"
+    },
+    "license": "Apache-2.0",
+    "files": [
+        "dist"
+    ],
+    "scripts": {
+        "clean": "npx rimraf dist .rollup.cache",
+        "build": "npx rollup -c rollup.config.mjs"
+    },
+    "devDependencies": {
+        "@rollup/plugin-commonjs": "^28.0.1",
+        "@rollup/plugin-json": "^6.1.0",
+        "@rollup/plugin-node-resolve": "^15.3.0",
+        "rollup": "^4.27.4",
+        "rollup-plugin-dts": "^6.2.3"
+    }
 }

packages/fdc3-commonjs/package.json

@@ -1,7 +1,7 @@
-import typescript from '@rollup/plugin-typescript';
 import { nodeResolve } from '@rollup/plugin-node-resolve';
 import commonjs from '@rollup/plugin-commonjs';
 import json from '@rollup/plugin-json';
+import { dts } from 'rollup-plugin-dts';
 
 export default [
   {
@@ -29,7 +29,11 @@ export default [
         include: /\/regenerator-runtime\//,
       }),
       json(),
-      typescript(),
     ],
   },
+  {
+    input: './src/index.ts',
+    output: [{ file: 'dist/index.d.ts', format: 'es' }],
+    plugins: [dts({ respectExternal: true })],
+  },
 ];