Merge branch 'master' into dependabot/npm_and_yarn/babel/helpers-7.26.10

Author: jmfrancois

.changeset/calm-cats-care.md

@@ -0,0 +1,5 @@
+---
+'@talend/scripts-config-react-webpack': patch
+---
+
+add querystring to resolve.fallback

.changeset/stale-pumas-relate.md

@@ -0,0 +1,9 @@
+---
+'@talend/design-system': minor
+'@talend/icons': minor
+'@talend/http': minor
+'@talend/json-schema-form-core': patch
+'@talend/scripts-utils': patch
+---
+
+Fix remaining dependabot alerts

.github/actions/setup-node/action.yml

@@ -8,7 +8,7 @@ runs:
   using: 'composite'
   steps:
     - name: Set up Node.js
-      uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d #v3.8.1
+      uses: actions/setup-node@v4
       with:
         node-version-file: '.tool-versions'
         registry-url: 'https://registry.npmjs.org/'
@@ -23,7 +23,7 @@ runs:
       shell: bash
       run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
 
-    - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 #v3.3.2
+    - uses: actions/cache@v4
       id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
       with:
         path: ${{ steps.yarn-cache-dir-path.outputs.dir }}

fork/json-schema-form-core/webpack.config.js

@@ -6,5 +6,8 @@ module.exports = {
 		fallback: {
 			path: false,
 		},
+		alias: {
+			'json-refs': require.resolve('json-refs/dist/json-refs.js'),
+		},
 	},
 };

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": "^5.5.0",
+    "@svgr/webpack": "^8.1.0",
     "@talend/eslint-config": "^13.2.1",
     "@talend/eslint-plugin": "^1.3.1",
     "@talend/icons": "^7.10.3",

packages/http/package.json

@@ -35,7 +35,6 @@
     "@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"

packages/http/src/http.common.test.ts

@@ -1,14 +1,13 @@
-import fetchMock from 'fetch-mock';
-import { Response, Headers } from 'node-fetch';
+import { Headers, Response } from 'node-fetch';
 
 import {
-	HTTP,
+	addHttpResponseInterceptor,
 	getDefaultConfig,
-	setDefaultConfig,
+	HTTP,
 	HTTP_RESPONSE_INTERCEPTORS,
-	addHttpResponseInterceptor,
+	setDefaultConfig,
 } from './config';
-import { httpFetch, handleBody, encodePayload, handleHttpResponse } from './http.common';
+import { encodePayload, handleBody, handleHttpResponse, httpFetch } from './http.common';
 import { HTTP_METHODS, HTTP_STATUS } from './http.constants';
 import { TalendHttpError } from './http.types';
 
@@ -18,6 +17,10 @@ const defaultPayload = {
 	bar: 42,
 };
 
+interface FetchMock extends jest.Mock {
+	mockResponse?: Response;
+}
+
 beforeEach(() => {
 	jest.clearAllMocks();
 });
@@ -199,19 +202,24 @@ 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');
 
-		fetchMock.mock(url, { body: defaultBody, status: 200 });
+		(global.self.fetch as FetchMock).mockResponse = new Response(JSON.stringify(defaultBody), {
+			status: 200,
+			headers: {
+				'Content-Type': 'application/json',
+			},
+		});
+
 		const result = await httpFetch(url, {}, HTTP_METHODS.GET, defaultPayload);
 
 		expect(result.data).toEqual(defaultBody);
-		expect(fetchMock.calls()[0][1]).toEqual({
+		expect(global.self.fetch).toHaveBeenCalledWith(url, {
 			body: JSON.stringify(defaultPayload),
 			credentials: 'same-origin',
 			headers: {
@@ -239,7 +247,6 @@ 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`;
 	});
 
@@ -251,12 +258,17 @@ describe('#httpFetch with CSRF handling configuration', () => {
 		const headers = new Headers();
 		headers.append('Content-Type', 'application/json');
 
-		fetchMock.mock(url, { body: defaultBody, status: 200 });
+		(global.self.fetch as FetchMock).mockResponse = new Response(JSON.stringify(defaultBody), {
+			status: 200,
+			headers: {
+				'Content-Type': 'application/json',
+			},
+		});
 
 		const result = await httpFetch(url, {}, HTTP_METHODS.GET, defaultPayload);
 
 		expect(result.data).toEqual(defaultBody);
-		expect(fetchMock.calls()[0][1]).toEqual({
+		expect(global.self.fetch).toHaveBeenCalledWith(url, {
 			body: JSON.stringify(defaultPayload),
 			credentials: 'same-origin',
 			headers: {
@@ -276,19 +288,23 @@ 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');
-		fetchMock.mock(url, { body: defaultBody, status: 200 });
+		(global.self.fetch as FetchMock).mockResponse = new Response(JSON.stringify(defaultBody), {
+			status: 200,
+			headers: {
+				'Content-Type': 'application/json',
+			},
+		});
 
 		const result = await httpFetch(url, {}, HTTP_METHODS.GET, defaultPayload);
 
 		expect(result.data).toEqual(defaultBody);
-		expect(fetchMock.calls()[0][1]).toEqual({
+		expect(global.self.fetch).toHaveBeenCalledWith(url, {
 			body: JSON.stringify(defaultPayload),
 			credentials: 'same-origin',
 			headers: {
@@ -310,12 +326,17 @@ describe('#httpFetch', () => {
 			},
 		});
 
-		fetchMock.mock(url, { body: defaultBody, status: 200 });
+		(global.self.fetch as FetchMock).mockResponse = new Response(JSON.stringify(defaultBody), {
+			status: 200,
+			headers: {
+				'Content-Type': 'application/json',
+			},
+		});
 
 		const result = await httpFetch(url, {}, HTTP_METHODS.GET, defaultPayload);
 
 		expect(result.data).toEqual(defaultBody);
-		expect(fetchMock.calls()[0][1]).toEqual({
+		expect(global.self.fetch).toHaveBeenCalledWith(url, {
 			body: JSON.stringify(defaultPayload),
 			credentials: 'same-origin',
 			headers: {
@@ -333,14 +354,22 @@ describe('#httpFetch', () => {
 		headers.append('Content-Type', 'application/json');
 		const payload = new FormData();
 
-		fetchMock.mock(url, { body: '{"foo": 42}', status: 200 });
+		(global.self.fetch as FetchMock).mockResponse = new Response(JSON.stringify({ foo: 42 }), {
+			status: 200,
+			headers: {
+				'Content-Type': 'application/json',
+			},
+		});
 
 		const result = await httpFetch(url, {}, HTTP_METHODS.GET, payload);
-		expect(result.data).toEqual('{"foo": 42}');
+		expect(result.data).toEqual({ foo: 42 });
 
-		const mockCalls = fetchMock.calls();
-		expect(mockCalls[0][1]?.credentials).toEqual('same-origin');
-		expect(mockCalls[0][1]?.headers).toEqual({ Accept: 'application/json' });
+		expect(global.self.fetch).toHaveBeenCalledWith(url, {
+			body: payload,
+			credentials: 'same-origin',
+			headers: { Accept: 'application/json' },
+			method: 'GET',
+		});
 	});
 });
 
@@ -353,16 +382,17 @@ 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';
-		fetchMock.mock(url, { body: defaultBody, status: 200 });
+		(global.self.fetch as FetchMock).mockResponse = new Response(JSON.stringify(defaultBody), {
+			status: 200,
+			headers: {
+				'Content-Type': 'application/json',
+			},
+		});
 
 		await httpFetch(url, {}, HTTP_METHODS.GET, {});
 		expect(interceptor).toHaveBeenCalled();
@@ -374,8 +404,12 @@ describe('#httpFetch with interceptors', () => {
 
 		const url = '/foo';
 		const context = { async: true };
-		const response = { body: defaultBody, status: 200 };
-		fetchMock.mock(url, response);
+		(global.self.fetch as FetchMock).mockResponse = new Response(JSON.stringify(defaultBody), {
+			status: 200,
+			headers: {
+				'Content-Type': 'application/json',
+			},
+		});
 
 		await httpFetch(url, { context }, HTTP_METHODS.GET, {});
 		expect(interceptor).toHaveBeenCalledWith(

packages/icons/.svgo-filters.yml

@@ -35,7 +35,7 @@
     "build-storybook": "talend-scripts build-storybook",
     "start": "talend-scripts start-storybook -p 6010",
     "lint": "echo nothing to lint",
-    "svgo": "svgo -f src/svg --config=.svgo-icons.yml && svgo -f src/filters --config=.svgo-filters.yml"
+    "svgo": "svgo -rf src/svg --config svgo-icons.config.mjs && svgo -rf src/filters --config svgo-filters.config.mjs"
   },
   "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": "^5.5.0",
+    "@svgr/webpack": "^8.1.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": "^1.3.2",
+    "svgo": "^3.3.2",
     "webfonts-loader": "^8.0.1",
     "webpack": "^5.95.0",
     "webpack-cli": "^4.10.0"