More fixes (#4934)

* fix babel-loader using resolve * fix all loaders * fix test:umd for design-tokens * fix jest script * add jest-cli to scripts-core * add types to assets-api, add babel-core to icons * fix babel config * fix babel config using resolve + fix all extends * try to fix babel for angularjs-annotate * remove @types/enzyme, add @types/jest to flow-designer + more missign deps * add missing deps * fix flow-designer test * fix test-setup * add tsconfig.build.json to components and flow-designer * fix components * fix package stepper * fix jest mock * chore: pnpm-deduplicate * fix test in dynamic-cdn and scripts-core * Remove ref to icons in assets-api remove ref to config-jest in design-token * chore: pnpm-deduplicate * fix pnpm version * fix design-tokens * stream tests * add missing jest + reduce usage of cache in GHA * remove stream and --frozen-lockfile for test * add console.log * try to fix test in dynamic-cdn-webpack-plugin * revert change in dynamic-cdn-plugin --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Talend · Oct 17, 2023 · f305cfb · f305cfb
1 parent 9bc0d00
commit f305cfb
Show file tree

Hide file tree

Showing 81 changed files with 481 additions and 327 deletions.
diff --git a/.github/actions/setup-node/action.yml b/.github/actions/setup-node/action.yml
@@ -10,7 +10,6 @@ runs:
     - uses: pnpm/action-setup@v2
       with:
         version: 8
-
     - name: Set up Node.js
       uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d #v3.8.1
       with:
@@ -19,15 +18,15 @@ runs:
         scope: '@talend'
         cache: 'pnpm'
 
-    - name: Get pnpm cache directory path
-      id: pnpm-cache-dir-path
-      shell: bash
-      run: echo "dir=$(pnpm store path)" >> $GITHUB_OUTPUT
+    # - name: Get pnpm cache directory path
+    #   id: pnpm-cache-dir-path
+    #   shell: bash
+    #   run: echo "dir=$(pnpm store path)" >> $GITHUB_OUTPUT
 
-    - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 #v3.3.2
-      id: pnpm-cache # use this to check for `cache-hit` (`steps.pnpm-cache.outputs.cache-hit != 'true'`)
-      with:
-        path: ${{ steps.pnpm-cache-dir-path.outputs.dir }}
-        key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
-        restore-keys: |
-          ${{ runner.os }}-pnpm-
+    # - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 #v3.3.2
+    #   id: pnpm-cache # use this to check for `cache-hit` (`steps.pnpm-cache.outputs.cache-hit != 'true'`)
+    #   with:
+    #     path: ${{ steps.pnpm-cache-dir-path.outputs.dir }}
+    #     key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
+    #     restore-keys: |
+    #       ${{ runner.os }}-pnpm-
diff --git a/.github/workflows/README.md b/.github/workflows/README.md
@@ -0,0 +1,13 @@
+# How to run github action locally
+
+Use the cli ACT: https://github.com/nektos/act
+
+# How to run PR-TEST
+
+```bash
+act pull_request -j build -W .github/workflows/pr-test.yml
+```
+
+```bash
+act --container-architecture linux/amd64 pull_request -j build -W .github/workflows/pr-test.yml
+```
diff --git a/fork/dynamic-cdn-webpack-plugin/package.json b/fork/dynamic-cdn-webpack-plugin/package.json
@@ -38,6 +38,7 @@
   "dependencies": {
     "@talend/module-to-cdn": "^9.9.1",
     "read-pkg-up": "^7.0.1",
+    "semver": "^7.5.4",
     "webpack-sources": "^3.2.3"
   },
   "peerDependencies": {

diff --git a/fork/dynamic-cdn-webpack-plugin/src/find.js b/fork/dynamic-cdn-webpack-plugin/src/find.js
@@ -9,6 +9,7 @@ function findPackage(info) {
 	if (name.startsWith('@')) {
 		[scope, name] = info.name.split('/');
 	}
+	// eslint-disable-next-line no-use-before-define
 	return findPackages(scope, name).find(cwd => {
 		const {
 			packageJson: { version },
@@ -21,13 +22,9 @@ function findPackage(info) {
 		return semver.satisfies(version, range);
 	});
 }
-let warnPNPMonce = true;
-let pnpmMaxSubLevel = 0;
 
 function findPackagesFromScopeFolder(scope, name, scopeFolderPath) {
 	const isWantedScope = scopeFolderPath.endsWith(`${path.sep}${scope}`);
-	const isPNPMProcess =
-		process.env.npm_config_user_agent && process.env.npm_config_user_agent.includes('pnpm');
 	return fs
 		.readdirSync(scopeFolderPath, { withFileTypes: true })
 		.filter(f => f.isDirectory() || f.isSymbolicLink())
@@ -39,24 +36,12 @@ function findPackagesFromScopeFolder(scope, name, scopeFolderPath) {
 				return accu.concat(subFolderPath);
 			}
 
-			if ((isPNPMProcess && pnpmMaxSubLevel < 4) || !isPNPMProcess) {
-				if (isPNPMProcess) {
-					pnpmMaxSubLevel++;
-					console.warn('Executed with PNPM: !!');
-				}
-				// TODO NOT COMPATIBLE WITH PNPM
-				// the scope or package name is not the one we look for
-				// if there is a nested node modules folder, we dive into it for the search
-				const nestedNodeModulesPath = path.join(subFolderPath, 'node_modules');
-				if (fs.existsSync(nestedNodeModulesPath)) {
-					return accu.concat(
-						findPackagesFromNonScopeFolder(scope, name, nestedNodeModulesPath, []),
-					);
-				}
-			} else if (warnPNPMonce) {
-				warnPNPMonce = false;
-				console.warn('Executed with PNPM: Not compatible with deep search of dependencies!!');
-				console.warn('Executed with PNPM: Certainly due to circular dependencies');
+			// the scope or package name is not the one we look for
+			// if there is a nested node modules folder, we dive into it for the search
+			const nestedNodeModulesPath = path.join(subFolderPath, 'node_modules');
+			if (fs.existsSync(nestedNodeModulesPath)) {
+				// eslint-disable-next-line no-use-before-define
+				return accu.concat(findPackagesFromNonScopeFolder(scope, name, nestedNodeModulesPath, []));
 			}
 			return accu;
 		}, []);
@@ -70,7 +55,11 @@ function findPackagesFromNonScopeFolder(scope, name, nonScopeFolderPath) {
 			if (subFolder.name === '.bin') {
 				return accu;
 			}
-			if (subFolder.name.startsWith('@')) {
+			// TODO NOT COMPATIBLE WITH PNPM WHEN deps is @talend/scripts-...
+			if (
+				subFolder.name.startsWith('@') &&
+				!subFolder?.path?.endsWith('tools/scripts-core/node_modules')
+			) {
 				// for scope folders, we need a special treatment to avoid getting scoped packages when we don't want a scoped one.
 				// ex: search for `classnames`, we don't want to find `@types/classnames` in the result
 				return accu.concat(
@@ -94,7 +83,10 @@ function findPackages(scope, name, buff = []) {
 	if (roots === null) {
 		return buff;
 	}
-	return buff.concat(...roots.map(root => findPackagesFromNonScopeFolder(scope, name, root)));
+	const result = buff.concat(
+		...roots.map(root => findPackagesFromNonScopeFolder(scope, name, root)),
+	);
+	return [...new Set(result)];
 }
 
 module.exports = {

diff --git a/fork/dynamic-cdn-webpack-plugin/src/find.test.js b/fork/dynamic-cdn-webpack-plugin/src/find.test.js
@@ -17,24 +17,22 @@ describe('findPackages', () => {
 		'/node_modules/react/index.js': 'console.log("react");',
 		'/node_modules/react/package.json': '{"name": "react", "version": "16.14.0"}',
 		'/node_modules/@types/classnames/index.js': 'console.log("@types/classnames");',
-		'/node_modules/@talend/react-components/index.js':
-			'console.log("@talend/react-components");',
-		'/node_modules/@talend/react-components/node_modules/react/index.js':
-			'console.log("react");',
-		'/node_modules/@talend/react-containers/index.js':
-			'console.log("@talend/react-containers");',
+		'/node_modules/@talend/react-components/index.js': 'console.log("@talend/react-components");',
+		'/node_modules/@talend/react-components/node_modules/react/index.js': 'console.log("react");',
+		'/node_modules/@talend/react-containers/index.js': 'console.log("@talend/react-containers");',
 	};
 
 	beforeEach(() => {
 		// Set up some mocked out file info before each test
 		require('fs').__setMockFiles(MOCK_FILE_INFO);
 	});
 
-	test('should find root and nested package', () => {
+	test.only('should find root and nested package', () => {
 		// when
 		const result = findPackages(undefined, 'react');
 
 		// then
+		console.log('LIST OF RESULT: ', result);
 		expect(result.length).toBe(2);
 		expect(result[0]).toBe('/node_modules/react');
 		expect(result[1]).toBe('/node_modules/@talend/react-components/node_modules/react');

diff --git a/fork/react-bootstrap/.babelrc b/fork/react-bootstrap/.babelrc
@@ -1,3 +1,3 @@
 {
-  "extends": "@talend/scripts-config-babel/.babelrc.json"
+  "extends": "@talend/scripts-config-babel/babel.config.js"
 }
diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
     "lint-staged": "lint-staged",
     "lint": "pnpm -r --no-bail run lint",
     "lint-merge-report": "pnpm -r lint-merge-report",
-    "test": "cross-env TZ=Europe/Paris pnpm -r --no-bail run test --silent",
+    "test": "cross-env TZ=Europe/Paris pnpm -r --no-bail run test",
     "test:update": "cross-env TZ=Europe/Paris pnpm -r --no-bail run test --silent -u",
     "test:cov": "cross-env TZ=Europe/Paris pnpm -r --no-bail run test:cov",
     "test:demo": "pnpm -r --no-bail run test:demo",
@@ -37,10 +37,11 @@
     "start-forms": "pnpm --filter  @talend/react-forms run start",
     "start-theme": "pnpm --filter @talend/bootstrap-theme run start",
     "changelog": "git log --pretty=\"format:%C(bold green)%ad%C(reset) %s\" --date=short --color",
-    "clean": "pnpm -r exec npx rimraf node_modules && npx rimraf node_modules",
+    "clean": "pnpm run clean:node_modules && pnpm run clean:dist && pnpm run clean:lib && pnpm run clean:cache ",
     "clean:dist": "pnpm -r exec npx rimraf dist && npx rimraf dist",
     "clean:lib": "pnpm -r exec npx rimraf lib && npx rimraf lib",
     "clean:cache": "pnpm store prune",
+    "clean:node_modules": "pnpm -r exec npx rimraf node_modules && npx rimraf node_modules",
     "prepare": "husky install",
     "preinstall": "npx only-allow pnpm"
   },
@@ -50,7 +51,7 @@
   },
   "version": "0.0.0",
   "private": true,
-  "packageManager": "pnpm@8.8.0",
+  "packageManager": "pnpm@8.9.2",
   "pnpm": {
     "overrides": {
       "@cypress/request@<=2.88.12": ">=3.0.0",

diff --git a/packages/a11y/package.json b/packages/a11y/package.json
@@ -33,6 +33,7 @@
     "@talend/scripts-config-typescript": "^11.1.0",
     "@testing-library/react": "^12.1.5",
     "@testing-library/user-event": "^13.5.0",
+    "@types/jest": "^29.5.5",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   },

diff --git a/packages/assets-api/package.json b/packages/assets-api/package.json
@@ -32,6 +32,8 @@
     "@talend/scripts-core": "^15.0.0",
     "@talend/scripts-config-react-webpack": "^16.0.0",
     "@talend/scripts-config-typescript": "^11.1.0",
+    "@types/node": "^6.14.13",
+    "@types/jest": "^29.5.5",
     "read-pkg-up": "^7.0.1"
   },
   "publishConfig": {

diff --git a/packages/assets-api/src/index.test.ts b/packages/assets-api/src/index.test.ts
@@ -1,7 +1,6 @@
 import readPackageUp from 'read-pkg-up';
 import assetsApi, { Asset } from '.';
 
-const iconsInfo = readPackageUp.sync({ cwd: require.resolve('@talend/icons') });
 const currentInfo = readPackageUp.sync({ cwd: __dirname });
 const bundlePath = '/dist/svg-bundles/all.svg';
 
@@ -12,17 +11,15 @@ describe('assets-api', () => {
 		});
 
 		it('should return unpkg url', () => {
-			const url = assetsApi.getURL(bundlePath, '@talend/icons', iconsInfo?.packageJson.version);
-			expect(url).toBe(
-				`https://unpkg.com/@talend/icons@${iconsInfo?.packageJson.version}${bundlePath}`,
-			);
+			const url = assetsApi.getURL(bundlePath, '@talend/icons', '6.60.1');
+			expect(url).toBe(`https://unpkg.com/@talend/[email protected]${bundlePath}`);
 		});
 
 		it('should return /cdn url', () => {
 			const original = window.Talend.CDN_URL;
 			window.Talend.CDN_URL = '/cdn';
-			const url = assetsApi.getURL(bundlePath, '@talend/icons', iconsInfo?.packageJson.version);
-			expect(url).toBe(`/cdn/@talend/icons/${iconsInfo?.packageJson.version}${bundlePath}`);
+			const url = assetsApi.getURL(bundlePath, '@talend/icons', '6.60.1');
+			expect(url).toBe(`/cdn/@talend/icons/6.60.1${bundlePath}`);
 			window.Talend.CDN_URL = original;
 		});
 
@@ -33,8 +30,8 @@ describe('assets-api', () => {
 				getAttribute: jest.fn().mockReturnValueOnce('/'),
 			} as unknown as Element;
 			jest.spyOn(document, 'querySelector').mockImplementation(() => mockedBaseElement);
-			const url = assetsApi.getURL(bundlePath, '@talend/icons', iconsInfo?.packageJson.version);
-			expect(url).toBe(`/cdn/@talend/icons/${iconsInfo?.packageJson.version}${bundlePath}`);
+			const url = assetsApi.getURL(bundlePath, '@talend/icons', '6.60.1');
+			expect(url).toBe(`/cdn/@talend/icons/6.60.1${bundlePath}`);
 			window.Talend.CDN_URL = original;
 		});
 

diff --git a/packages/cmf-cqrs/.babelrc.json b/packages/cmf-cqrs/.babelrc.json
@@ -1,3 +1,3 @@
 {
-  "extends": "@talend/scripts-config-babel/.babelrc.json"
+  "extends": "@talend/scripts-config-babel/babel.config.js"
 }
diff --git a/packages/cmf-router/.babelrc.json b/packages/cmf-router/.babelrc.json
@@ -1,3 +1,3 @@
 {
-  "extends": "@talend/scripts-config-babel/.babelrc.json"
+  "extends": "@talend/scripts-config-babel/babel.config.js"
 }
diff --git a/packages/cmf/.babelrc.json b/packages/cmf/.babelrc.json
@@ -1,3 +1,3 @@
 {
-  "extends": "@talend/scripts-config-babel/.babelrc.json"
+  "extends": "@talend/scripts-config-babel/babel.config.js"
 }
diff --git a/packages/components/.babelrc.json b/packages/components/.babelrc.json
@@ -1,3 +1,3 @@
 {
-  "extends": "@talend/scripts-config-babel/.babelrc.json"
+  "extends": "@talend/scripts-config-babel/babel.config.js"
 }
diff --git a/packages/components/package.json b/packages/components/package.json
@@ -9,7 +9,7 @@
     "build:prod": "talend-scripts build --umd --prod",
     "pre-release": "pnpm build:dev && pnpm build:prod",
     "build:lib": "talend-scripts build && pnpm run tsc",
-    "tsc": "tsc --emitDeclarationOnly --project ./tsconfig.json --outDir ./types",
+    "tsc": "tsc --emitDeclarationOnly --project ./tsconfig.build.json --outDir ./types",
     "test": "cross-env TZ=Europe/Paris talend-scripts test",
     "test:watch": "cross-env TZ=Europe/Paris talend-scripts test --watch",
     "test:cov": "cross-env TZ=Europe/Paris talend-scripts test --coverage",
@@ -37,8 +37,9 @@
     "@talend/assets-api": "^1.2.2",
     "@talend/bootstrap-theme": "^8.2.0",
     "@talend/design-tokens": "^2.9.0",
-    "@talend/react-a11y": "^1.1.0",
     "@talend/icons": "^6.60.1",
+    "@talend/react-a11y": "^1.1.0",
+    "@talend/react-bootstrap": "^1.35.2",
     "@talend/utils": "^2.6.0",
     "ally.js": "^1.4.1",
     "classnames": "^2.3.2",
@@ -52,7 +53,6 @@
     "memoize-one": "^6.0.0",
     "rc-slider": "^10.2.1",
     "react-autowhatever": "10.2.0",
-    "@talend/react-bootstrap": "^1.35.2",
     "react-debounce-input": "^3.3.0",
     "react-draggable": "^4.4.5",
     "react-grid-layout": "^1.4.1",
@@ -85,7 +85,7 @@
     "@types/classnames": "^2.3.1",
     "@types/d3": "^7.4.0",
     "@types/date-fns": "^0.0.2",
-    "@types/enzyme": "^3.10.13",
+    "@types/jest": "^29.5.5",
     "@types/lodash": "^4.14.198",
     "@types/prop-types": "^15.7.5",
     "@types/react": "^17.0.65",
@@ -103,7 +103,7 @@
     "react-test-renderer": "^17.0.2"
   },
   "peerDependencies": {
-    "@talend/design-system": "^7.5.0",
+    "@talend/design-system": "^7.15.1",
     "i18next": "^20.1.0",
     "prop-types": "^15.5.10",
     "react": ">= 16.14.0",

diff --git a/packages/components/tsconfig.build.json b/packages/components/tsconfig.build.json
@@ -0,0 +1,4 @@
+{
+  "extends": "./tsconfig.json",
+  "exclude": ["src/**/*.test.*", "src/**/*.stories.*", "stories"]
+}
diff --git a/packages/containers/.babelrc.json b/packages/containers/.babelrc.json
@@ -1,3 +1,3 @@
 {
-  "extends": "@talend/scripts-config-babel/.babelrc.json"
+  "extends": "@talend/scripts-config-babel/babel.config.js"
 }
diff --git a/packages/dataviz/.babelrc.json b/packages/dataviz/.babelrc.json
@@ -1,3 +1,3 @@
 {
-  "extends": "@talend/scripts-config-babel/.babelrc.json"
+  "extends": "@talend/scripts-config-babel/babel.config.js"
 }
diff --git a/packages/dataviz/package.json b/packages/dataviz/package.json
@@ -65,7 +65,7 @@
     "@testing-library/user-event": "^13.5.0",
     "@types/classnames": "^2.3.1",
     "@types/d3": "^7.4.0",
-    "@types/enzyme": "^3.10.13",
+    "@types/cypress": "^1.1.3",
     "@types/geojson": "^7946.0.10",
     "@types/lodash": "^4.14.198",
     "@types/react": "^17.0.65",

diff --git a/packages/design-docs/.babelrc.json b/packages/design-docs/.babelrc.json
@@ -1,3 +1,3 @@
 {
-  "extends": "@talend/scripts-config-babel/.babelrc.json"
+  "extends": "@talend/scripts-config-babel/babel.config.js"
 }
diff --git a/packages/design-docs/.storybook/.babelrc b/packages/design-docs/.storybook/.babelrc
@@ -1,3 +1,3 @@
 {
-  "extends": "@talend/scripts-config-babel/.babelrc.json"
+  "extends": "@talend/scripts-config-babel/babel.config.js"
 }
diff --git a/packages/design-system/.babelrc b/packages/design-system/.babelrc
@@ -1,3 +1,3 @@
 {
-	"extends": "@talend/scripts-config-babel/.babelrc.json"
+	"extends": "@talend/scripts-config-babel/babel.config.js"
 }
diff --git a/packages/design-tokens/jest.config.js b/packages/design-tokens/jest.config.js
@@ -0,0 +1,3 @@
+module.exports = {
+	testRegex: '(/__tests__/.*|src/|scripts/).*\\.test.(js|ts|tsx)$',
+};
diff --git a/packages/design-tokens/package.json b/packages/design-tokens/package.json
@@ -39,6 +39,7 @@
     "@talend/scripts-config-typescript": "^11.1.0",
     "@talend/babel-plugin-import-from-index": "^1.5.1",
     "@talend/babel-plugin-assets-api": "^1.1.0",
+    "jest": "^29.7.0",
     "typeface-source-sans-pro": "^1.1.13"
   },
   "dependencies": {}

diff --git a/packages/faceted-search/.babelrc b/packages/faceted-search/.babelrc
@@ -1,3 +1,3 @@
 {
-	"extends": "@talend/scripts-config-babel/.babelrc.json"
+	"extends": "@talend/scripts-config-babel/babel.config.js"
 }
diff --git a/packages/faceted-search/package.json b/packages/faceted-search/package.json
@@ -67,7 +67,7 @@
     "react-i18next": "^11.18.6"
   },
   "peerDependencies": {
-    "@talend/design-system": "^7.5.1",
+    "@talend/design-system": "^7.15.1",
     "@talend/react-components": "^11.0.0",
     "i18next": "^20.6.1",
     "prop-types": "^15.5.10",