Merge e0c2e82 into 48865e5

Talend · Apr 15, 2024 · 728ba83 · 728ba83
2 parents 48865e5 + e0c2e82
commit 728ba83
Show file tree

Hide file tree

Showing 82 changed files with 1,013 additions and 155 deletions.
diff --git a/fork/json-schema-form-core/package.json b/fork/json-schema-form-core/package.json
@@ -3,9 +3,23 @@
   "version": "1.2.4",
   "description": "JSON-Schema and JSON-UI-Schema utilities for form generation.",
   "main": "dist/index.js",
-  "mainSrc": "src/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"
+      }
+    }
+  },
   "scripts": {
     "build:lib": "rimraf dist && talend-scripts build --umd",
+    "build:lib:esm": "tsc --project ./tsconfig.esm.json",
     "watch": "webpack --watch",
     "dist-untested": "webpack --config webpack.config.dist.js",
     "test:cov": "npm run test",

diff --git a/fork/json-schema-form-core/src/schema-defaults.ts b/fork/json-schema-form-core/src/schema-defaults.ts
@@ -262,7 +262,7 @@ export function defaultForm(
 	ignore?: any,
 	globalOptions?: any,
 ) {
-	const form = [];
+	const form: any[] = [];
 	const lookup = {}; // Map path => form obj for fast lookup in merging
 	ignore = ignore || {};
 	globalOptions = globalOptions || {};
@@ -272,7 +272,7 @@ export function defaultForm(
 		Object.keys(schema.properties).forEach(key => {
 			if (ignore[key] !== true) {
 				const required = schema.required && schema.required.indexOf(key) !== -1;
-				const def = defaultFormDefinition(defaultSchemaTypes, key, schema.properties[key], {
+				const def: any = defaultFormDefinition(defaultSchemaTypes, key, schema.properties[key], {
 					path: [key], // Path to this property in bracket notation.
 					lookup: lookup, // Extra map to register with. Optimization for merger.
 					ignore: ignore, // The ignore list of paths (sans root level name)

diff --git a/fork/json-schema-form-core/tsconfig.esm.json b/fork/json-schema-form-core/tsconfig.esm.json
@@ -0,0 +1,7 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "lib/esm",
+    "module": "ESNext"
+  }
+}
diff --git a/fork/react-bootstrap/package.json b/fork/react-bootstrap/package.json
@@ -9,9 +9,24 @@
   "homepage": "https://react-bootstrap.github.io/",
   "sideEffects": false,
   "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"
+      }
+    }
+  },
   "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",
     "lint": "talend-scripts lint",
@@ -40,6 +55,7 @@
   "devDependencies": {
     "@talend/eslint-config": "^13.0.3",
     "@talend/eslint-plugin": "^1.1.1",
+    "@talend/scripts-config-typescript": "^11.2.1",
     "@talend/scripts-core": "^16.3.5",
     "@talend/scripts-config-babel": "^13.3.1",
     "@talend/scripts-config-react-webpack": "^16.5.1",

diff --git a/fork/react-bootstrap/tsconfig.esm.json b/fork/react-bootstrap/tsconfig.esm.json
@@ -0,0 +1,7 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "lib/esm",
+    "module": "ESNext"
+  }
+}
diff --git a/fork/react-bootstrap/tsconfig.json b/fork/react-bootstrap/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "@talend/scripts-config-typescript/tsconfig.json",
+  "include": ["src/**/*"]
+}
diff --git a/package.json b/package.json
@@ -17,6 +17,7 @@
   },
   "scripts": {
     "postinstall": "talend-yarn-workspace run build:lib",
+    "postinstall:esm": "talend-yarn-workspace run build:lib:esm",
     "pre-release": "talend-yarn-workspace run pre-release",
     "start": "yarn workspace @talend/ui-playground run start",
     "start-storybook": "yarn workspace @talend/ui-storybook-one run start",

diff --git a/packages/a11y/package.json b/packages/a11y/package.json
@@ -5,8 +5,23 @@
   "mainSrc": "src/index.js",
   "license": "Apache-2.0",
   "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"
+      }
+    }
+  },
   "scripts": {
     "build:lib": "talend-scripts build",
+    "build:lib:esm": "tsc --project ./tsconfig.esm.json",
     "test": "talend-scripts test",
     "lint": "talend-scripts lint"
   },

diff --git a/packages/a11y/tsconfig.esm.json b/packages/a11y/tsconfig.esm.json
@@ -0,0 +1,7 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "lib/esm",
+    "module": "ESNext"
+  }
+}
diff --git a/packages/assets-api/package.json b/packages/assets-api/package.json
@@ -3,11 +3,25 @@
   "description": "A set of API designed to access assets using CDN",
   "types": "lib/index.d.ts",
   "main": "lib/index.js",
-  "mainSrc": "src/index.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": "talend-scripts build --umd && talend-scripts build --umd --dev",
     "build:lib": "talend-scripts build",
+    "build:lib:esm": "tsc --project ./tsconfig.esm.json",
     "start": "echo nothing to start",
     "test": "talend-scripts test",
     "test:watch": "talend-scripts test --watch",

diff --git a/packages/assets-api/tsconfig.esm.json b/packages/assets-api/tsconfig.esm.json
@@ -0,0 +1,9 @@
+{
+  "extends": "./tsconfig.json",
+  "exclude": ["src/**/*.test.ts"],
+  "compilerOptions": {
+    "declaration": true,
+    "outDir": "lib/esm",
+    "module": "ESNext"
+  }
+}
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/cmf/package.json b/packages/cmf/package.json
@@ -4,9 +4,24 @@
   "main": "lib/index.js",
   "mainSrc": "src/index.js",
   "license": "Apache-2.0",
+  "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"
+      }
+    }
+  },
   "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",
@@ -58,6 +73,7 @@
     "@redux-saga/testing-utils": "^1.1.5",
     "@talend/eslint-config": "^13.0.3",
     "@talend/eslint-plugin": "^1.1.1",
+    "@talend/scripts-config-typescript": "^11.2.1",
     "@talend/scripts-core": "^16.3.5",
     "@talend/scripts-config-babel": "^13.3.1",
     "@talend/scripts-config-jest": "^14.0.2",

diff --git a/packages/cmf/tsconfig.esm.json b/packages/cmf/tsconfig.esm.json
@@ -0,0 +1,7 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "lib/esm",
+    "module": "ESNext"
+  }
+}
diff --git a/packages/cmf/tsconfig.json b/packages/cmf/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "@talend/scripts-config-typescript/tsconfig.json",
+  "include": ["src/**/*"]
+}
diff --git a/packages/components/package.json b/packages/components/package.json
@@ -2,13 +2,37 @@
   "name": "@talend/react-components",
   "description": "Set of react components.",
   "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 && yarn run tsc",
+    "build:lib:esm": "tsc --project ./tsconfig.esm.json && cpx 'src/**/*.{scss,json}' lib/esm --verbose",
     "watch": "talend-scripts build --watch",
     "tsc": "tsc --emitDeclarationOnly --project ./tsconfig.json --outDir ./types",
     "test": "cross-env TZ=UTC talend-scripts test",
@@ -78,22 +102,23 @@
     "@talend/eslint-plugin": "^1.1.1",
     "@talend/locales-design-system": "^7.15.1",
     "@talend/locales-tui-components": "^11.4.5",
-    "@talend/scripts-core": "^16.3.5",
     "@talend/scripts-config-babel": "^13.3.1",
     "@talend/scripts-config-react-webpack": "^16.5.1",
     "@talend/scripts-config-storybook-lib": "^5.3.1",
     "@talend/scripts-config-typescript": "^11.2.1",
+    "@talend/scripts-core": "^16.3.5",
     "@testing-library/jest-dom": "^6.4.2",
     "@testing-library/react": "^14.2.1",
-    "@testing-library/user-event": "^14.5.2",
     "@testing-library/react-hooks": "^8.0.1",
+    "@testing-library/user-event": "^14.5.2",
     "@types/classnames": "^2.3.1",
     "@types/d3": "^7.4.3",
     "@types/jest": "^29.5.12",
     "@types/lodash": "^4.14.202",
     "@types/prop-types": "^15.7.11",
     "@types/react": "^18.2.60",
     "@types/react-dom": "^18.2.19",
+    "cpx2": "^7.0.1",
     "cross-env": "^7.0.3",
     "i18next": "^23.10.0",
     "jest-in-case": "^1.0.2",
@@ -102,8 +127,8 @@
     "react": "^18.2.0",
     "react-a11y": "^0.3.4",
     "react-dom": "^18.2.0",
-    "react-router-dom": "~6.3.0",
     "react-i18next": "^13.5.0",
+    "react-router-dom": "~6.3.0",
     "react-test-renderer": "^18.2.0"
   },
   "peerDependencies": {

diff --git a/packages/components/tsconfig.esm.json b/packages/components/tsconfig.esm.json
@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.json",
+  "exclude": ["node_modules", "src/**/*.stories.*", "src/**/*.test.*"],
+  "compilerOptions": {
+    "outDir": "lib/esm",
+    "module": "ESNext"
+  }
+}
diff --git a/packages/components/tsconfig.json b/packages/components/tsconfig.json
@@ -1,7 +1,6 @@
 {
   "extends": "@talend/scripts-config-typescript/tsconfig.json",
   "include": ["custom.d.ts", "src/**/*"],
-  "exclude": ["node_modules"],
   "compilerOptions": {
     "types": ["jest", "@testing-library/jest-dom"],
     "allowJs": true,

diff --git a/packages/containers/package.json b/packages/containers/package.json
@@ -2,13 +2,38 @@
   "name": "@talend/react-containers",
   "description": "Provide connected components aka containers for @talend/react-cmf based on @talend/react-components.",
   "main": "lib/index.js",
-  "mainSrc": "src/index.js",
+  "types": "lib/index.d.ts",
+  "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",
     "start": "talend-scripts start-storybook -p 6007",
     "test": "talend-scripts test",
     "test:watch": "talend-scripts test --watch",