cmf-router, dataviz, design-tokens and faceted-search

Talend · Apr 15, 2024 · 1e1a39c · 1e1a39c
1 parent 0093762
commit 1e1a39c
Show file tree

Hide file tree

Showing 11 changed files with 97 additions and 15 deletions.
diff --git a/packages/cmf-router/package.json b/packages/cmf-router/package.json
@@ -3,11 +3,26 @@
   "version": "6.1.2",
   "description": "",
   "main": "lib/index.js",
+  "module": "./lib/esm/index.js",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "import": {
+        "types": "./lib/esm/index.d.ts",
+        "default": "./lib/esm/index.js"
+      },
+      "require": {
+        "types": "./lib/index.d.ts",
+        "default": "./lib/index.js"
+      }
+    }
+  },
   "author": "Talend Frontend <[email protected]> (http://www.talend.com)",
   "license": "Apache-2.0",
   "scripts": {
     "build:dev": "talend-scripts build --umd --dev",
     "build:prod": "talend-scripts build --umd --prod",
+    "build:lib:esm": "tsc --project ./tsconfig.esm.json",
     "pre-release": "yarn build:dev && yarn build:prod",
     "build:lib": "talend-scripts build",
     "start": "echo nothing to start",
@@ -39,6 +54,7 @@
     "@talend/scripts-core": "^16.3.5",
     "@talend/scripts-config-babel": "^13.3.1",
     "@talend/scripts-config-react-webpack": "^16.5.1",
+    "@talend/scripts-config-typescript": "^11.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "redux-saga-tester": "^1.0.874"

diff --git a/packages/cmf-router/tsconfig.esm.json b/packages/cmf-router/tsconfig.esm.json
@@ -0,0 +1,7 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "lib/esm",
+    "module": "ESNext"
+  }
+}
diff --git a/packages/cmf-router/tsconfig.json b/packages/cmf-router/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "@talend/scripts-config-typescript/tsconfig.json",
+  "include": ["src/**/*"]
+}
diff --git a/packages/dataviz/package.json b/packages/dataviz/package.json
@@ -3,14 +3,28 @@
   "version": "6.1.3",
   "description": "Talend charts and visualization components",
   "main": "lib/index.js",
-  "mainSrc": "src/index.ts",
   "types": "./lib/index.d.ts",
+  "module": "./lib/esm/index.js",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "import": {
+        "types": "./lib/esm/index.d.ts",
+        "default": "./lib/esm/index.js"
+      },
+      "require": {
+        "types": "./lib/index.d.ts",
+        "default": "./lib/index.js"
+      }
+    }
+  },
   "license": "Apache-2.0",
   "scripts": {
     "pre-release": "yarn build:umd:dev && yarn build:umd:prod",
     "build:umd:dev": "talend-scripts build --umd --dev",
     "build:umd:prod": "talend-scripts build --umd",
     "build:lib": "talend-scripts build",
+    "build:lib:esm": "tsc --project ./tsconfig.esm.json && cpx 'src/**/*.{scss,json}' lib/esm --verbose",
     "build-storybook": "talend-scripts build-storybook",
     "extract-i18n": "i18next-scanner --config i18next-scanner.config.js",
     "lint": "talend-scripts lint",

diff --git a/packages/dataviz/tsconfig.esm.json b/packages/dataviz/tsconfig.esm.json
@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "lib/esm",
+    "module": "ESNext"
+  },
+  "exclude": ["src/**/*.test.*", "src/**/*.stories.*", "src/**/*.cy.*"]
+}
diff --git a/packages/design-tokens/package.json b/packages/design-tokens/package.json
@@ -7,14 +7,8 @@
   "module": "./lib/esm/index.js",
   "exports": {
     "./package.json": "./package.json",
-    "./lib/tokens": {
-      "import": "./lib/esm/_tokens.scss",
-      "require": "./lib/_tokens.scss"
-    },
-    "./lib/_tokens": {
-      "import": "./lib/esm/_tokens.scss",
-      "require": "./lib/_tokens.scss"
-    },
+    "./lib/tokens": "./lib/esm/_tokens.scss",
+    "./lib/_tokens": "./lib/esm/_tokens.scss",
     "./lib/*": {
       "import": "./lib/esm/*",
       "require": "./lib/*"

diff --git a/packages/faceted-search/package.json b/packages/faceted-search/package.json
@@ -3,13 +3,37 @@
   "version": "19.0.0",
   "description": "Faceted search",
   "main": "lib/index.js",
-  "mainSrc": "src/index.js",
+  "module": "./lib/esm/index.js",
+  "exports": {
+    "./package.json": "./package.json",
+    "./lib/*": {
+      "import": {
+        "types": "./lib/esm/*/index.d.ts",
+        "default": "./lib/esm/*/index.js"
+      },
+      "require": {
+        "types": "./lib/*/index.d.ts",
+        "default": "./lib/*/index.js"
+      }
+    },
+    ".": {
+      "import": {
+        "types": "./lib/esm/index.d.ts",
+        "default": "./lib/esm/index.js"
+      },
+      "require": {
+        "types": "./lib/index.d.ts",
+        "default": "./lib/index.js"
+      }
+    }
+  },
   "license": "Apache-2.0",
   "scripts": {
     "build:dev": "talend-scripts build --umd --dev",
     "build:prod": "talend-scripts build --umd --prod",
     "pre-release": "yarn build:dev && yarn build:prod",
     "build:lib": "talend-scripts build",
+    "build:lib:esm": "tsc --project ./tsconfig.esm.json && cpx 'src/**/*.{scss,json}' lib/esm --verbose",
     "test": "cross-env TZ=UTC talend-scripts test",
     "test:watch": "cross-env TZ=UTC talend-scripts test --watch",
     "test:cov": "cross-env TZ=UTC talend-scripts test --coverage",
@@ -55,6 +79,7 @@
     "@talend/scripts-config-jest": "^14.0.2",
     "@talend/scripts-config-react-webpack": "^16.5.1",
     "@talend/scripts-config-storybook-lib": "^5.3.1",
+    "@talend/scripts-config-typescript": "^11.2.1",
     "@testing-library/react": "^14.2.1",
     "@testing-library/user-event": "^14.5.2",
     "babel-plugin-angularjs-annotate": "^0.10.0",

diff --git a/packages/faceted-search/src/components/QuickSearchInput/QuickSearchInput.component.js b/packages/faceted-search/src/components/QuickSearchInput/QuickSearchInput.component.js
@@ -1,7 +1,10 @@
-import { useState, useMemo } from 'react';
-import PropTypes from 'prop-types';
+import { useMemo, useState } from 'react';
+
 import get from 'lodash/get';
-import { Typeahead } from '@talend/react-components/lib/Typeahead';
+import PropTypes from 'prop-types';
+
+import Typeahead from '@talend/react-components/lib/Typeahead';
+
 import { badgesFacetedPropTypes } from '../facetedSearch.propTypes';
 
 export const DEFAULT_QUICKSEARCH_OPERATOR = 'containsIgnoreCase';
@@ -62,7 +65,7 @@ export const QuickSearchInput = ({
 								}),
 								suggestions: filteredFacets.map(a => get(a, ['properties', 'label'], null)),
 							},
-					  ]
+						]
 					: undefined
 			}
 			value={value}

diff --git a/packages/faceted-search/tsconfig.esm.json b/packages/faceted-search/tsconfig.esm.json
@@ -0,0 +1,7 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "lib/esm",
+    "module": "ESNext"
+  }
+}
diff --git a/packages/faceted-search/tsconfig.json b/packages/faceted-search/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "@talend/scripts-config-typescript/tsconfig.json",
+  "include": ["src/**/*"]
+}
diff --git a/packages/forms/stories/CustomArrayTemplate.component.tsx b/packages/forms/stories/CustomArrayTemplate.component.tsx
@@ -71,7 +71,7 @@ export function CustomArrayTemplate({
 					return (
 						<li key={index}>
 							<Actions actions={actions} hideLabel />
-							{renderItem(index) ?? null}
+							{renderItem(index)}
 						</li>
 					);
 				})}