fix some lint + remove usage of talend-script when a circular deps is…

… identified
Talend · Oct 12, 2023 · ad68589 · ad68589
1 parent f8b7bde
commit ad68589
Show file tree

Hide file tree

Showing 54 changed files with 192 additions and 174 deletions.
diff --git a/fork/dynamic-cdn-webpack-plugin/src/find.js b/fork/dynamic-cdn-webpack-plugin/src/find.js
@@ -35,14 +35,13 @@ function findPackagesFromScopeFolder(scope, name, scopeFolderPath) {
 				return accu.concat(subFolderPath);
 			}
 			// 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, []),
-			// 	);
-			// }
+			// 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;
 		}, []);
 }
@@ -59,25 +58,15 @@ function findPackagesFromNonScopeFolder(scope, name, nonScopeFolderPath) {
 				// 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(
-					findPackagesFromScopeFolder(
-						scope,
-						name,
-						path.join(nonScopeFolderPath, subFolder.name),
-					),
+					findPackagesFromScopeFolder(scope, name, path.join(nonScopeFolderPath, subFolder.name)),
 				);
 			} else if (!scope && subFolder.name === name) {
 				// we want a NON scoped package, we are in a non scoped folder, and the names match
 				return accu.concat(path.join(nonScopeFolderPath, subFolder.name));
 			}
-			const nestedNodeModulesPath = path.join(
-				nonScopeFolderPath,
-				subFolder.name,
-				'node_modules',
-			);
+			const nestedNodeModulesPath = path.join(nonScopeFolderPath, subFolder.name, 'node_modules');
 			if (fs.existsSync(nestedNodeModulesPath)) {
-				return accu.concat(
-					findPackagesFromNonScopeFolder(scope, name, nestedNodeModulesPath),
-				);
+				return accu.concat(findPackagesFromNonScopeFolder(scope, name, nestedNodeModulesPath));
 			}
 			return accu;
 		}, []);

diff --git a/fork/module-to-cdn/.babelrc b/fork/module-to-cdn/.babelrc
@@ -1,3 +1 @@
-{
-    "extends": "@talend/scripts-config-babel/.babelrc.json"
-}
+{}
diff --git a/fork/module-to-cdn/.eslintrc.json b/fork/module-to-cdn/.eslintrc.json
@@ -1,4 +1,3 @@
 {
-  "root": true,
-  "extends": "@talend"
+  "root": true
 }
diff --git a/fork/module-to-cdn/package.json b/fork/module-to-cdn/package.json
@@ -20,7 +20,7 @@
   "scripts": {
     "test": "jest index.test.js",
     "test:cron": "jest modules.test.js",
-    "lint": "talend-scripts lint ./"
+    "lint": "echo \"Not possible to use talend-scripts here (risk of circular dependency)\" && exit 0"
   },
   "files": [
     "index.js",

diff --git a/packages/a11y/package.json b/packages/a11y/package.json
@@ -29,7 +29,6 @@
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@talend/eslint-plugin": "^1.0.1",
     "@talend/scripts-core": "^15.0.0",
     "@talend/scripts-config-prettier": "^12.0.0",
     "@talend/scripts-config-typescript": "^11.1.0",

diff --git a/packages/assets-api/package.json b/packages/assets-api/package.json
@@ -28,8 +28,12 @@
   },
   "dependencies": {},
   "devDependencies": {
+    "@talend/babel-plugin-import-from-index": "^1.5.1",
+    "@talend/icons": "^6.60.1",
     "@talend/scripts-core": "^15.0.0",
-    "@talend/scripts-config-react-webpack": "^16.1.0",
+    "@talend/scripts-config-babel": "^13.0.0",
+    "@talend/scripts-config-react-webpack": "^16.0.0",
+    "@talend/scripts-config-typescript": "^11.1.0",
     "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
@@ -29,8 +29,9 @@ describe('assets-api', () => {
 		it('should prevent // as start url', () => {
 			const original = window.Talend.CDN_URL;
 			window.Talend.CDN_URL = '/cdn';
-			const mockedBaseElement = { getAttribute: jest.fn().mockReturnValueOnce('/') };
-			// @ts-ignore
+			const mockedBaseElement = {
+				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}`);

diff --git a/packages/cmf-cqrs/package.json b/packages/cmf-cqrs/package.json
@@ -38,7 +38,6 @@
     "redux-saga": "^1.2.3"
   },
   "devDependencies": {
-    "@talend/eslint-plugin": "^1.0.1",
     "@talend/scripts-core": "^15.0.0",
     "@talend/scripts-config-react-webpack": "^16.1.0",
     "@talend/scripts-config-typescript": "^11.1.0",

diff --git a/packages/cmf-router/package.json b/packages/cmf-router/package.json
@@ -34,7 +34,6 @@
   },
   "devDependencies": {
     "@redux-saga/testing-utils": "^1.1.5",
-    "@talend/eslint-plugin": "^1.0.1",
     "@talend/scripts-core": "^15.0.0",
     "@talend/scripts-config-react-webpack": "^16.1.0",
     "react": "^17.0.2",

diff --git a/packages/cmf/package.json b/packages/cmf/package.json
@@ -55,7 +55,6 @@
   },
   "devDependencies": {
     "@redux-saga/testing-utils": "^1.1.5",
-    "@talend/eslint-plugin": "^1.0.1",
     "@talend/scripts-core": "^15.0.0",
     "@talend/scripts-config-jest": "^12.2.0",
     "@talend/scripts-config-react-webpack": "^16.1.0",

diff --git a/packages/cmf/src/reduxstorage/reduxLocalStorage.js b/packages/cmf/src/reduxstorage/reduxLocalStorage.js
@@ -3,7 +3,10 @@ import createEngine from 'redux-storage-engine-localstorage';
 import filter from 'redux-storage-decorator-filter';
 import immutablejs from './redux-storage-decorator-immutablejs';
 
-const CMF_IMMUTABLE_PATHS = [['cmf', 'components'], ['cmf', 'collections']];
+const CMF_IMMUTABLE_PATHS = [
+	['cmf', 'components'],
+	['cmf', 'collections'],
+];
 
 const CMF_MIDDLEWARE_BLACK_LIST = ['@@INIT', '@@router/LOCATION_CHANGE'];
 

diff --git a/packages/components/package.json b/packages/components/package.json
@@ -73,7 +73,6 @@
     "@talend/bootstrap-theme": "^8.2.0",
     "@talend/design-system": "^7.15.1",
     "@talend/icons": "^6.60.1",
-    "@talend/eslint-plugin": "^1.0.1",
     "@talend/locales-design-system": "^7.3.0",
     "@talend/locales-tui-components": "^9.5.0",
     "@talend/scripts-config-stylelint": "^4.0.0",

diff --git a/packages/containers/package.json b/packages/containers/package.json
@@ -52,7 +52,6 @@
   "devDependencies": {
     "@storybook/addon-actions": "^7.4.1",
     "@talend/bootstrap-theme": "^8.2.0",
-    "@talend/eslint-plugin": "^1.0.1",
     "@talend/icons": "^6.60.1",
     "@talend/locales-tui-containers": "^8.0.2",
     "@talend/react-storybook-cmf": "^7.2.0",

diff --git a/packages/dataviz/package.json b/packages/dataviz/package.json
@@ -51,7 +51,6 @@
     "@cypress/webpack-dev-server": "^3.6.1",
     "@talend/bootstrap-theme": "^8.2.0",
     "@talend/design-system": "^7.15.1",
-    "@talend/eslint-plugin": "^1.0.1",
     "@talend/icons": "^6.60.1",
     "@talend/locales-tui-components": "^9.5.0",
     "@talend/locales-tui-dataviz": "^0.4.6",

diff --git a/packages/design-docs/package.json b/packages/design-docs/package.json
@@ -50,7 +50,6 @@
     "@storybook/testing-library": "^0.2.0",
     "@storybook/testing-react": "^2.0.1",
     "@storybook/theming": "^7.4.1",
-    "@talend/eslint-plugin": "^1.0.1",
     "@talend/locales-design-system": "^7.3.0",
     "@talend/locales-tui-components": "^9.5.0",
     "@talend/locales-tui-containers": "^8.0.2",

diff --git a/packages/design-system/package.json b/packages/design-system/package.json
@@ -64,6 +64,7 @@
     "@talend/locales-design-system": "^7.3.0",
     "@talend/scripts-core": "^15.0.0",
     "@talend/scripts-config-react-webpack": "^16.1.0",
+    "@talend/scripts-config-typescript": "^11.1.0",
     "@talend/storybook-docs": "^1.2.0",
     "@testing-library/cypress": "^9.0.0",
     "@types/classnames": "^2.3.1",

diff --git a/packages/design-tokens/package.json b/packages/design-tokens/package.json
@@ -39,7 +39,6 @@
     "@talend/scripts-config-typescript": "^11.1.0",
     "@talend/babel-plugin-import-from-index": "^1.5.1",
     "@talend/babel-plugin-assets-api": "^1.1.0",
-    "@talend/eslint-plugin": "^1.0.1",
     "typeface-source-sans-pro": "^1.1.13"
   },
   "dependencies": {}

diff --git a/packages/flow-designer/package.json b/packages/flow-designer/package.json
@@ -20,7 +20,6 @@
   "devDependencies": {
     "@talend/babel-plugin-import-from-index": "^1.5.1",
     "@talend/babel-plugin-assets-api": "^1.1.0",
-    "@talend/eslint-plugin": "^1.0.1",
     "@talend/scripts-config-jest": "^12.2.0",
     "@talend/scripts-core": "^15.0.0",
     "@talend/scripts-config-react-webpack": "^16.1.0",

diff --git a/packages/forms/package.json b/packages/forms/package.json
@@ -59,7 +59,6 @@
     "@storybook/addon-actions": "^7.4.1",
     "@storybook/addon-controls": "^7.4.1",
     "@talend/bootstrap-theme": "^8.2.0",
-    "@talend/eslint-plugin": "^1.0.1",
     "@talend/icons": "^6.60.1",
     "@talend/locales-tui-forms": "^9.0.1",
     "@talend/react-components": "^11.4.0",

diff --git a/packages/http/package.json b/packages/http/package.json
@@ -27,7 +27,6 @@
     "lint": "talend-scripts lint"
   },
   "devDependencies": {
-    "@talend/eslint-plugin": "^1.0.1",
     "@talend/scripts-core": "^15.0.0",
     "@talend/scripts-config-babel": "^13.0.0",
     "@talend/scripts-config-react-webpack": "^16.1.0",

diff --git a/packages/local-libs-webpack-plugin/package.json b/packages/local-libs-webpack-plugin/package.json
@@ -27,7 +27,6 @@
     "access": "public"
   },
   "devDependencies": {
-    "@talend/eslint-plugin": "^1.0.1",
     "@talend/scripts-core": "^15.0.0",
     "jest-cli": "^29.7.0"
   }

diff --git a/packages/storybook-docs/src/components/FigmaContext.ts b/packages/storybook-docs/src/components/FigmaContext.ts
@@ -3,10 +3,16 @@ import * as Figma from 'figma-js';
 
 const token = process.env.STORYBOOK_FIGMA_ACCESS_TOKEN;
 
-export default createContext({
+interface FigmaClient extends ReturnType<typeof Figma.Client> {
+	isConfigured: boolean;
+}
+
+export const FigmaContext = createContext<FigmaClient>({
 	// eslint-disable-next-line new-cap
 	...Figma.Client({
 		personalAccessToken: token,
 	}),
 	isConfigured: !!token,
 });
+
+export default FigmaContext;
diff --git a/packages/storybook-docs/src/components/Trial/Trial.stories.tsx b/packages/storybook-docs/src/components/Trial/Trial.stories.tsx
@@ -2,9 +2,11 @@ import { Trial } from './Trial';
 
 import { Meta, StoryFn } from '@storybook/react';
 
-export default {
+const meta: Meta<typeof Trial> = {
 	component: Trial,
-} as Meta<typeof Trial>;
+};
+
+export default meta;
 
 export const Story: StoryFn<typeof Trial> = () => {
 	return <Trial>Trial component</Trial>;

diff --git a/packages/storybook-docs/tsconfig.json b/packages/storybook-docs/tsconfig.json
@@ -1,8 +1,8 @@
- {
+{
   "extends": "@talend/scripts-config-typescript/tsconfig.json",
   "include": ["src/**/*", "custom.d.ts"],
   "files": [],
   "compilerOptions": {
-    "declaration": true,
+    "declaration": true
   }
 }
diff --git a/tools/babel-plugin-assets-api/package.json b/tools/babel-plugin-assets-api/package.json
@@ -4,7 +4,7 @@
   "description": "",
   "main": "src/index.js",
   "scripts": {
-    "lint": "talend-scripts lint",
+    "lint": "echo \"Not possible to use talend-scripts here (risk of circular dependency)\" && exit 0",
     "test": "jest"
   },
   "dependencies": {

diff --git a/tools/babel-plugin-import-d3/package.json b/tools/babel-plugin-import-d3/package.json
@@ -18,6 +18,7 @@
     "test": "jest"
   },
   "devDependencies": {
+    "@talend/scripts-core": "^15.0.0",
     "@babel/core": "^7.22.20",
     "@babel/preset-env": "^7.22.20",
     "babel-jest": "^29.7.0",

diff --git a/tools/babel-plugin-import-d3/src/index.js b/tools/babel-plugin-import-d3/src/index.js
@@ -37,14 +37,6 @@ function findD3RelatedPackageName(importDeclarationPath) {
 	return found;
 }
 
-function getLastNameInPath(path) {
-	const splited = path.split('/');
-	if (splited.length === 1) {
-		return false;
-	}
-	return splited.pop();
-}
-
 function sortImports(a, b) {
 	if (a.type === 'ImportDefaultSpecifier') {
 		return -1;
@@ -62,35 +54,31 @@ module.exports = function transform({ types }) {
 				const d3Packages = [];
 				const requireCalls = [];
 				let lastImport;
-				let realLastImport;
 
 				path.traverse({
 					CallExpression: {
 						exit(callExpression) {
 							if (callExpression.node.callee.name === 'require') {
 								if (PACKAGES.indexOf(callExpression.node.arguments[0].value) !== -1) {
 									const mod = callExpression.node.arguments[0].value.replace('d3-', '');
+									// eslint-disable-next-line no-param-reassign
 									callExpression.node.arguments[0] = types.stringLiteral('d3');
 									// we must wrap callexpression into memberexpression
 									requireCalls.push({
 										callExpression,
-										replace: types.memberExpression(
-											callExpression.node,
-											types.identifier(mod),
-										)
+										replace: types.memberExpression(callExpression.node, types.identifier(mod)),
 									});
 									callExpression.remove();
 								}
 							}
-						}
+						},
 					},
 					ImportDeclaration: {
 						exit(importDeclarationPath) {
-							realLastImport = importDeclarationPath;
 							const packageName = findD3RelatedPackageName(importDeclarationPath);
 							if (packageName) {
 								d3Packages.push(
-									...importDeclarationPath.node.specifiers.map(({ local, imported, type }) => {
+									...importDeclarationPath.node.specifiers.map(({ local, imported }) => {
 										const localName = local.name;
 										let importedName = localName;
 										if (imported) {
@@ -112,13 +100,9 @@ module.exports = function transform({ types }) {
 				requireCalls.forEach(info => {
 					info.callExpression.insertAfter(info.replace);
 				});
-				const packageName = 'd3';
 				if (d3Packages.length > 0) {
 					const source = types.stringLiteral('d3');
-					const imp = types.importDeclaration(
-						d3Packages.filter(Boolean).sort(sortImports),
-						source,
-					);
+					const imp = types.importDeclaration(d3Packages.filter(Boolean).sort(sortImports), source);
 					if (lastImport) {
 						lastImport.insertAfter(imp);
 					}

diff --git a/tools/babel-plugin-import-from-index/package.json b/tools/babel-plugin-import-from-index/package.json
@@ -14,7 +14,7 @@
     "url": "https://github.com/Talend/ui.git"
   },
   "scripts": {
-    "lint": "talend-scripts lint",
+    "lint": "echo \"Not possible to use talend-scripts here (risk of circular dependency)\" && exit 0",
     "test": "jest"
   },
   "dependencies": {