Revert "chore(DGHT-287): Fix dependabot alerts (2) (#5469)"

This reverts commit fc2e30f.
Talend · Dec 10, 2024 · bd580a8 · bd580a8
1 parent 4d47bbe
commit bd580a8
Show file tree

Hide file tree

Showing 16 changed files with 401 additions and 303 deletions.
diff --git a/.changeset/calm-cats-care.md b/.changeset/calm-cats-care.md
diff --git a/.changeset/stale-pumas-relate.md b/.changeset/stale-pumas-relate.md
diff --git a/fork/json-schema-form-core/webpack.config.js b/fork/json-schema-form-core/webpack.config.js
@@ -6,8 +6,5 @@ module.exports = {
 		fallback: {
 			path: false,
 		},
-		alias: {
-			'json-refs': require.resolve('json-refs/dist/json-refs.js'),
-		},
 	},
 };
diff --git a/packages/design-system/package.json b/packages/design-system/package.json
@@ -73,7 +73,7 @@
     "@storybook/react": "^7.6.20",
     "@storybook/testing-library": "^0.2.2",
     "@storybook/theming": "^7.6.20",
-    "@svgr/webpack": "^8.1.0",
+    "@svgr/webpack": "^5.5.0",
     "@talend/eslint-config": "^13.2.1",
     "@talend/eslint-plugin": "^1.3.1",
     "@talend/icons": "^7.10.3",

diff --git a/packages/http/package.json b/packages/http/package.json
@@ -35,6 +35,7 @@
     "@talend/scripts-config-typescript": "^11.3.0",
     "@types/jest": "^29.5.14",
     "@types/node-fetch": "^2.6.11",
+    "fetch-mock": "^9.11.0",
     "node-fetch": "^2.7.0",
     "react-dom": "^18.3.1",
     "react": "^18.3.1"

diff --git a/packages/http/src/http.common.test.ts b/packages/http/src/http.common.test.ts
@@ -1,13 +1,14 @@
-import { Headers, Response } from 'node-fetch';
+import fetchMock from 'fetch-mock';
+import { Response, Headers } from 'node-fetch';
 
 import {
-	addHttpResponseInterceptor,
-	getDefaultConfig,
 	HTTP,
-	HTTP_RESPONSE_INTERCEPTORS,
+	getDefaultConfig,
 	setDefaultConfig,
+	HTTP_RESPONSE_INTERCEPTORS,
+	addHttpResponseInterceptor,
 } from './config';
-import { encodePayload, handleBody, handleHttpResponse, httpFetch } from './http.common';
+import { httpFetch, handleBody, encodePayload, handleHttpResponse } from './http.common';
 import { HTTP_METHODS, HTTP_STATUS } from './http.constants';
 import { TalendHttpError } from './http.types';
 
@@ -17,10 +18,6 @@ const defaultPayload = {
 	bar: 42,
 };
 
-interface FetchMock extends jest.Mock {
-	mockResponse?: Response;
-}
-
 beforeEach(() => {
 	jest.clearAllMocks();
 });
@@ -202,24 +199,19 @@ describe('#httpFetch with `CSRF` token', () => {
 	});
 
 	afterAll(() => {
+		fetchMock.restore();
 		document.cookie = `csrfToken=${CSRFToken}; dwf_section_edit=True; Max-Age=0`;
 	});
 	it('should get the CRFS token', async () => {
 		const url = '/foo';
 		const headers = new Headers();
 		headers.append('Content-Type', 'application/json');
 
-		(global.self.fetch as FetchMock).mockResponse = new Response(JSON.stringify(defaultBody), {
-			status: 200,
-			headers: {
-				'Content-Type': 'application/json',
-			},
-		});
-
+		fetchMock.mock(url, { body: defaultBody, status: 200 });
 		const result = await httpFetch(url, {}, HTTP_METHODS.GET, defaultPayload);
 
 		expect(result.data).toEqual(defaultBody);
-		expect(global.self.fetch).toHaveBeenCalledWith(url, {
+		expect(fetchMock.calls()[0][1]).toEqual({
 			body: JSON.stringify(defaultPayload),
 			credentials: 'same-origin',
 			headers: {
@@ -247,6 +239,7 @@ describe('#httpFetch with CSRF handling configuration', () => {
 
 	afterAll(() => {
 		HTTP.defaultConfig = null;
+		fetchMock.restore();
 		document.cookie = `${defaultHttpConfiguration.security.CSRFTokenCookieKey}=${CSRFToken}; dwf_section_edit=True; Max-Age=0`;
 	});
 
@@ -258,17 +251,12 @@ describe('#httpFetch with CSRF handling configuration', () => {
 		const headers = new Headers();
 		headers.append('Content-Type', 'application/json');
 
-		(global.self.fetch as FetchMock).mockResponse = new Response(JSON.stringify(defaultBody), {
-			status: 200,
-			headers: {
-				'Content-Type': 'application/json',
-			},
-		});
+		fetchMock.mock(url, { body: defaultBody, status: 200 });
 
 		const result = await httpFetch(url, {}, HTTP_METHODS.GET, defaultPayload);
 
 		expect(result.data).toEqual(defaultBody);
-		expect(global.self.fetch).toHaveBeenCalledWith(url, {
+		expect(fetchMock.calls()[0][1]).toEqual({
 			body: JSON.stringify(defaultPayload),
 			credentials: 'same-origin',
 			headers: {
@@ -288,23 +276,19 @@ describe('#httpFetch with CSRF handling configuration', () => {
 describe('#httpFetch', () => {
 	afterEach(() => {
 		HTTP.defaultConfig = null;
+		fetchMock.restore();
 	});
 
 	it('should fetch the request', async () => {
 		const url = '/foo';
 		const headers = new Headers();
 		headers.append('Content-Type', 'application/json');
-		(global.self.fetch as FetchMock).mockResponse = new Response(JSON.stringify(defaultBody), {
-			status: 200,
-			headers: {
-				'Content-Type': 'application/json',
-			},
-		});
+		fetchMock.mock(url, { body: defaultBody, status: 200 });
 
 		const result = await httpFetch(url, {}, HTTP_METHODS.GET, defaultPayload);
 
 		expect(result.data).toEqual(defaultBody);
-		expect(global.self.fetch).toHaveBeenCalledWith(url, {
+		expect(fetchMock.calls()[0][1]).toEqual({
 			body: JSON.stringify(defaultPayload),
 			credentials: 'same-origin',
 			headers: {
@@ -326,17 +310,12 @@ describe('#httpFetch', () => {
 			},
 		});
 
-		(global.self.fetch as FetchMock).mockResponse = new Response(JSON.stringify(defaultBody), {
-			status: 200,
-			headers: {
-				'Content-Type': 'application/json',
-			},
-		});
+		fetchMock.mock(url, { body: defaultBody, status: 200 });
 
 		const result = await httpFetch(url, {}, HTTP_METHODS.GET, defaultPayload);
 
 		expect(result.data).toEqual(defaultBody);
-		expect(global.self.fetch).toHaveBeenCalledWith(url, {
+		expect(fetchMock.calls()[0][1]).toEqual({
 			body: JSON.stringify(defaultPayload),
 			credentials: 'same-origin',
 			headers: {
@@ -354,22 +333,14 @@ describe('#httpFetch', () => {
 		headers.append('Content-Type', 'application/json');
 		const payload = new FormData();
 
-		(global.self.fetch as FetchMock).mockResponse = new Response(JSON.stringify({ foo: 42 }), {
-			status: 200,
-			headers: {
-				'Content-Type': 'application/json',
-			},
-		});
+		fetchMock.mock(url, { body: '{"foo": 42}', status: 200 });
 
 		const result = await httpFetch(url, {}, HTTP_METHODS.GET, payload);
-		expect(result.data).toEqual({ foo: 42 });
+		expect(result.data).toEqual('{"foo": 42}');
 
-		expect(global.self.fetch).toHaveBeenCalledWith(url, {
-			body: payload,
-			credentials: 'same-origin',
-			headers: { Accept: 'application/json' },
-			method: 'GET',
-		});
+		const mockCalls = fetchMock.calls();
+		expect(mockCalls[0][1]?.credentials).toEqual('same-origin');
+		expect(mockCalls[0][1]?.headers).toEqual({ Accept: 'application/json' });
 	});
 });
 
@@ -382,17 +353,16 @@ describe('#httpFetch with interceptors', () => {
 		}
 	});
 
+	afterEach(() => {
+		fetchMock.restore();
+	});
+
 	it('should call interceptor', async () => {
 		const interceptor = jest.fn().mockImplementation((res, _) => res);
 		addHttpResponseInterceptor('interceptor', interceptor);
 
 		const url = '/foo';
-		(global.self.fetch as FetchMock).mockResponse = new Response(JSON.stringify(defaultBody), {
-			status: 200,
-			headers: {
-				'Content-Type': 'application/json',
-			},
-		});
+		fetchMock.mock(url, { body: defaultBody, status: 200 });
 
 		await httpFetch(url, {}, HTTP_METHODS.GET, {});
 		expect(interceptor).toHaveBeenCalled();
@@ -404,12 +374,8 @@ describe('#httpFetch with interceptors', () => {
 
 		const url = '/foo';
 		const context = { async: true };
-		(global.self.fetch as FetchMock).mockResponse = new Response(JSON.stringify(defaultBody), {
-			status: 200,
-			headers: {
-				'Content-Type': 'application/json',
-			},
-		});
+		const response = { body: defaultBody, status: 200 };
+		fetchMock.mock(url, response);
 
 		await httpFetch(url, { context }, HTTP_METHODS.GET, {});
 		expect(interceptor).toHaveBeenCalledWith(

diff --git a/packages/icons/.svgo-filters.yml b/packages/icons/.svgo-filters.yml
@@ -0,0 +1,45 @@
+multipass: true
+full: true
+js2svg:
+  pretty: true
+  indent: '	'
+
+plugins:
+  - removeDoctype
+  - removeXMLProcInst
+  - removeComments
+  - removeMetadata
+  - removeEditorsNSData
+  - cleanupAttrs
+  - minifyStyles
+  - convertStyleToAttrs
+  - removeRasterImages
+  - cleanupNumericValues
+  - cleanupListOfValues
+  - convertColors
+  - removeUnknownsAndDefaults
+  - removeNonInheritableGroupAttrs
+  - removeUselessStrokeAndFill
+  - removeViewBox
+  - cleanupEnableBackground
+  - removeHiddenElems
+  - removeEmptyText
+  - convertShapeToPath
+  - moveElemsAttrsToGroup
+  - moveGroupAttrsToElems
+  - collapseGroups
+  - convertTransform
+  - removeEmptyAttrs
+  - removeEmptyContainers
+  - mergePaths
+  - removeUnusedNS
+  - transformsWithOnePath
+  - sortAttrs
+  - removeTitle
+  - removeDesc
+  - removeDimensions: true
+  - removeAttrs
+  - removeElementsByAttr
+  - addClassesToSVGElement
+  - removeStyleElement
+  - addAttributesToSVGElement
diff --git a/packages/icons/.svgo-icons.yml b/packages/icons/.svgo-icons.yml
@@ -0,0 +1,46 @@
+multipass: true
+full: true
+js2svg:
+  pretty: true
+  indent: '	'
+
+plugins:
+  - removeDoctype
+  - removeXMLProcInst
+  - removeComments
+  - removeMetadata
+  - removeEditorsNSData
+  - cleanupAttrs
+  - minifyStyles
+  - convertStyleToAttrs
+  - cleanupIDs
+  - removeRasterImages
+  - removeUselessDefs
+  - cleanupNumericValues
+  - cleanupListOfValues
+  - convertColors
+  - removeUnknownsAndDefaults
+  - removeNonInheritableGroupAttrs
+  - removeUselessStrokeAndFill
+  - removeViewBox
+  - cleanupEnableBackground
+  - removeHiddenElems
+  - removeEmptyText
+  - convertShapeToPath
+  - moveElemsAttrsToGroup
+  - moveGroupAttrsToElems
+  - convertTransform
+  - removeEmptyAttrs
+  - removeEmptyContainers
+  - mergePaths
+  - removeUnusedNS
+  - transformsWithOnePath
+  - sortAttrs
+  - removeTitle
+  - removeDesc
+  - removeDimensions: true
+  - removeAttrs
+  - removeElementsByAttr
+  - addClassesToSVGElement
+  - removeStyleElement
+  - addAttributesToSVGElement
diff --git a/packages/icons/package.json b/packages/icons/package.json
@@ -35,7 +35,7 @@
     "build-storybook": "talend-scripts build-storybook",
     "start": "talend-scripts start-storybook -p 6010",
     "lint": "echo nothing to lint",
-    "svgo": "svgo -rf src/svg --config svgo-icons.config.mjs && svgo -rf src/filters --config svgo-filters.config.mjs"
+    "svgo": "svgo -f src/svg --config=.svgo-icons.yml && svgo -f src/filters --config=.svgo-filters.yml"
   },
   "files": [
     "index.js",
@@ -61,7 +61,7 @@
     "@babel/core": "^7.26.0",
     "@babel/preset-env": "^7.26.0",
     "@babel/preset-react": "^7.25.9",
-    "@svgr/webpack": "^8.1.0",
+    "@svgr/webpack": "^5.5.0",
     "@talend/eslint-config": "^13.2.1",
     "@talend/eslint-plugin": "^1.3.1",
     "@talend/scripts-core": "^16.5.1",
@@ -81,7 +81,7 @@
     "react-use": "^17.5.1",
     "string-replace-loader": "^2.3.0",
     "style-loader": "^1.3.0",
-    "svgo": "^3.3.2",
+    "svgo": "^1.3.2",
     "webfonts-loader": "^8.0.1",
     "webpack": "^5.95.0",
     "webpack-cli": "^4.10.0"