Merge remote-tracking branch 'origin' into smouillour/fix/TDOPS-5327-…

…pnpm-7
Talend · Nov 24, 2023 · b7ccea6 · b7ccea6
2 parents 4719211 + 039b362
commit b7ccea6
Show file tree

Hide file tree

Showing 13 changed files with 62 additions and 20 deletions.
diff --git a/.changeset/mighty-shoes-jam.md b/.changeset/mighty-shoes-jam.md
diff --git a/packages/design-system/CHANGELOG.md b/packages/design-system/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @talend/design-system
 
+## 8.4.0
+
+### Minor Changes
+
+- 4dc277f42: feat: allow token override with theme provider
+
 ## 8.3.1
 
 ### Patch Changes

diff --git a/packages/design-system/package.json b/packages/design-system/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@talend/design-system",
-  "version": "8.3.1",
+  "version": "8.4.0",
   "description": "Talend Design System",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

diff --git a/packages/design-system/src/components/ThemeProvider/ThemeProvider.tsx b/packages/design-system/src/components/ThemeProvider/ThemeProvider.tsx
@@ -1,18 +1,26 @@
-import ThemeContext from './ThemeContext';
-import './ThemeProvider.scss';
+import { PropsWithChildren, useContext, useEffect, useState } from 'react';
+
+import 'modern-css-reset/dist/reset.min.css';
+import 'typeface-inconsolata/index.css';
+import 'typeface-source-sans-pro/index.css';
+
 // eslint-disable-next-line @talend/import-depth
 import '@talend/design-tokens/dist/TalendDesignTokens.css';
-import { useEffect, PropsWithChildren, useContext, useState } from 'react';
 
-import 'typeface-source-sans-pro/index.css';
-import 'typeface-inconsolata/index.css';
-import 'modern-css-reset/dist/reset.min.css';
+import ThemeContext from './ThemeContext';
+
+import './ThemeProvider.scss';
 
 export type ThemeProviderProps = PropsWithChildren<{
 	theme?: string;
+	tokensOverride?: React.CSSProperties;
 }>;
 
-export const ThemeProvider = ({ theme = 'light', children }: ThemeProviderProps) => {
+export const ThemeProvider = ({
+	theme = 'light',
+	children,
+	tokensOverride,
+}: ThemeProviderProps) => {
 	const [selectedTheme, setSelectedTheme] = useState(theme);
 	// Handle nested Providers: parent Provider doesn't have context, child does
 	const context = useContext(ThemeContext);
@@ -28,7 +36,7 @@ export const ThemeProvider = ({ theme = 'light', children }: ThemeProviderProps)
 	const switchTheme = (newTheme: string) => setSelectedTheme(newTheme);
 	return (
 		<ThemeContext.Provider value={context.theme ? context : { switchTheme, theme: selectedTheme }}>
-			{children}
+			{tokensOverride ? <div style={tokensOverride}>{children}</div> : children}
 		</ThemeContext.Provider>
 	);
 };
diff --git a/tools/scripts-config-cdn/CHANGELOG.md b/tools/scripts-config-cdn/CHANGELOG.md
@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 10.9.1
+
+### Patch Changes
+
+- 06598a0c0: fix(TDP-12694): require valid package-lock file path
+
 ## 10.9.0
 
 ### Minor Changes

diff --git a/tools/scripts-config-cdn/cdn.js b/tools/scripts-config-cdn/cdn.js
@@ -140,7 +140,7 @@ function getModulesFromLockFile(dir) {
 
 	let infos = [];
 	if (fs.existsSync(lockTypeMap.npm.path)) {
-		const packagelock = require(lockTypeMap.npm.lockfile);
+		const packagelock = require(lockTypeMap.npm.path);
 		infos = getAllFlattenDependencies(packagelock)
 			.map(({ name, version }) => moduleToCdn(name, version, { env: 'development' }))
 			.map(addLocal);

diff --git a/tools/scripts-config-cdn/package.json b/tools/scripts-config-cdn/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@talend/scripts-config-cdn",
-  "version": "10.9.0",
+  "version": "10.9.1",
   "description": "Provide a simple API to inject CDN config into existing webpack configuration",
   "main": "cdn.js",
   "scripts": {

diff --git a/tools/scripts-config-jest/CHANGELOG.md b/tools/scripts-config-jest/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @talend/scripts-config-jest
 
+## 13.1.1
+
+### Patch Changes
+
+- 06598a0c0: fix(TDP-12694): broken applyBabelTransformOn after pnpm use-case
+
 ## 13.1.0
 
 ### Minor Changes

diff --git a/tools/scripts-config-jest/__tests__/utils.test.js b/tools/scripts-config-jest/__tests__/utils.test.js
@@ -0,0 +1,15 @@
+import { applyBabelTransformOn } from '../utils';
+
+describe('utilities', () => {
+	describe('applyBabelTransformOn', () => {
+		it('should add babel transform directive', () => {
+			const config = {
+				transformIgnorePatterns: ['node_modules/(?!(?:.pnpm/)?(d3|internmap))'],
+			};
+			applyBabelTransformOn(config, ['dexie']);
+			expect(config.transformIgnorePatterns[0]).toBe(
+				'node_modules/(?!(?:.pnpm/)?(d3|internmap|dexie))',
+			);
+		});
+	});
+});
diff --git a/tools/scripts-config-jest/package.json b/tools/scripts-config-jest/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@talend/scripts-config-jest",
   "description": "Jest configuration for @talend/scripts-core",
-  "version": "13.1.0",
+  "version": "13.1.1",
   "license": "Apache-2.0",
   "main": "index.js",
   "author": "Talend Frontend <[email protected]>",

diff --git a/tools/scripts-config-jest/utils.js b/tools/scripts-config-jest/utils.js
@@ -1,7 +1,7 @@
 function applyBabelTransformOn(config, pkgs) {
 	config.transformIgnorePatterns[0] = config.transformIgnorePatterns[0].replace(
-		')',
-		`|${pkgs.join('|')})`,
+		/(\)\)$)/,
+		`|${pkgs.join('|')}$1`,
 	);
 }
 

diff --git a/tools/scripts-config-prettier/CHANGELOG.md b/tools/scripts-config-prettier/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @talend/scripts-config-prettier
 
+## 12.1.2
+
+### Patch Changes
+
+- 5455b6517: fix: prettier configuration for sort imports
+
 ## 12.1.1
 
 ### Patch Changes

diff --git a/tools/scripts-config-prettier/package.json b/tools/scripts-config-prettier/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@talend/scripts-config-prettier",
-  "version": "12.1.1",
+  "version": "12.1.2",
   "description": "Shared Prettier config",
   "main": ".prettierrc.js",
   "homepage": "https://github.com/Talend/ui/tree/master/packages/ui-scripts#readme",