From 930d566b86b550ee1e39d4ad5e0732e1d856ed6c Mon Sep 17 00:00:00 2001 From: smouillour Date: Thu, 12 Oct 2023 15:18:48 +0200 Subject: [PATCH] npmrc + remove @talend/scripts-config-babel --- .npmrc | 2 ++ package.json | 1 + packages/assets-api/package.json | 1 - packages/assets-api/tsconfig.json | 2 +- packages/cmf/package.json | 1 - packages/design-system/package.json | 1 - packages/flow-designer/package.json | 1 - packages/http/package.json | 1 - packages/icons/package.json | 2 -- pnpm-lock.yaml | 24 ------------------- .../scripts-config-react-webpack/package.json | 1 - 11 files changed, 4 insertions(+), 33 deletions(-) diff --git a/.npmrc b/.npmrc index c1d0f70fcf3..7e1bb271721 100644 --- a/.npmrc +++ b/.npmrc @@ -5,3 +5,5 @@ prefer-workspace-packages=true #link-workspace-packages=false #link-workspace-packages=deep #strict-peer-dependencies=true +public-hoist-pattern[]=*eslint* +public-hoist-pattern[]=*babel* diff --git a/package.json b/package.json index 07bea9fc7f3..6af7f97e971 100644 --- a/package.json +++ b/package.json @@ -49,6 +49,7 @@ }, "version": "0.0.0", "private": true, + "packageManager": "pnpm@8.8.0", "pnpm": { "overrides": { "@cypress/request@<=2.88.12": ">=3.0.0", diff --git a/packages/assets-api/package.json b/packages/assets-api/package.json index f48c2b498b9..a5695be1f16 100644 --- a/packages/assets-api/package.json +++ b/packages/assets-api/package.json @@ -31,7 +31,6 @@ "@talend/babel-plugin-import-from-index": "^1.5.1", "@talend/icons": "^6.60.1", "@talend/scripts-core": "^15.0.0", - "@talend/scripts-config-babel": "^13.0.0", "@talend/scripts-config-react-webpack": "^16.0.0", "read-pkg-up": "^7.0.1" }, diff --git a/packages/assets-api/tsconfig.json b/packages/assets-api/tsconfig.json index 1c67d95f423..fa4b365a693 100644 --- a/packages/assets-api/tsconfig.json +++ b/packages/assets-api/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "@talend/scripts-config-typescript/tsconfig.json", + "extends": "./node_modules/@talend/scripts-core/node_modules/@talend/scripts-config-typescript/tsconfig.json", "include": ["src/**/*"], "compilerOptions": { "declaration": true diff --git a/packages/cmf/package.json b/packages/cmf/package.json index c40a28db179..1a1a4ba865e 100644 --- a/packages/cmf/package.json +++ b/packages/cmf/package.json @@ -55,7 +55,6 @@ "devDependencies": { "@redux-saga/testing-utils": "^1.1.5", "@talend/scripts-core": "^15.0.0", - "@talend/scripts-config-jest": "^12.2.0", "@talend/scripts-config-react-webpack": "^16.0.0", "@testing-library/react": "^12.1.5", "jest-in-case": "^1.0.2", diff --git a/packages/design-system/package.json b/packages/design-system/package.json index 8890037b7f0..2c5de2f83c4 100644 --- a/packages/design-system/package.json +++ b/packages/design-system/package.json @@ -43,7 +43,6 @@ "typeface-source-sans-pro": "^1.1.13" }, "devDependencies": { - "@babel/core": "^7.22.20", "@cypress/react": "^7.0.3", "@cypress/webpack-dev-server": "^3.6.1", "@storybook/addon-a11y": "^7.4.1", diff --git a/packages/flow-designer/package.json b/packages/flow-designer/package.json index 8e3b4c5ea4a..11fc60fb912 100644 --- 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/scripts-config-jest": "^12.2.0", "@talend/scripts-core": "^15.0.0", "@talend/scripts-config-react-webpack": "^16.0.0", "@types/d3": "^7.4.0", diff --git a/packages/http/package.json b/packages/http/package.json index faec72768e8..2ee9a081e00 100644 --- a/packages/http/package.json +++ b/packages/http/package.json @@ -27,7 +27,6 @@ }, "devDependencies": { "@talend/scripts-core": "^15.0.0", - "@talend/scripts-config-babel": "^13.0.0", "@talend/scripts-config-react-webpack": "^16.0.0", "fetch-mock": "^9.11.0", "node-fetch": "^2.7.0", diff --git a/packages/icons/package.json b/packages/icons/package.json index 277472dd3f4..f15cd5c9fef 100644 --- a/packages/icons/package.json +++ b/packages/icons/package.json @@ -40,12 +40,10 @@ "url": "https://github.com/Talend/ui.git" }, "devDependencies": { - "@babel/core": "^7.22.20", "@babel/preset-env": "^7.22.20", "@babel/preset-react": "^7.22.15", "@svgr/webpack": "^5.5.0", "@talend/scripts-core": "^15.0.0", - "@talend/scripts-config-babel": "^13.0.0", "@talend/babel-plugin-assets-api": "^1.1.0", "@talend/babel-plugin-import-from-index": "^1.5.1", "@talend/design-tokens": "^2.9.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4d00eb79dba..0570aac76c3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -234,9 +234,6 @@ importers: '@talend/icons': specifier: ^6.60.1 version: link:../icons - '@talend/scripts-config-babel': - specifier: ^13.0.0 - version: link:../../tools/scripts-config-babel '@talend/scripts-config-react-webpack': specifier: ^16.0.0 version: link:../../tools/scripts-config-react-webpack @@ -313,9 +310,6 @@ importers: '@redux-saga/testing-utils': specifier: ^1.1.5 version: 1.1.5 - '@talend/scripts-config-jest': - specifier: ^12.2.0 - version: link:../../tools/scripts-config-jest '@talend/scripts-config-react-webpack': specifier: ^16.0.0 version: link:../../tools/scripts-config-react-webpack @@ -980,9 +974,6 @@ importers: specifier: ^1.1.13 version: 1.1.13 devDependencies: - '@babel/core': - specifier: ^7.22.20 - version: 7.22.20 '@cypress/react': specifier: ^7.0.3 version: 7.0.3(@types/react@17.0.65)(cypress@12.17.4)(react-dom@17.0.2)(react@17.0.2) @@ -1240,9 +1231,6 @@ importers: '@talend/babel-plugin-import-from-index': specifier: ^1.5.1 version: link:../../tools/babel-plugin-import-from-index - '@talend/scripts-config-jest': - specifier: ^12.2.0 - version: link:../../tools/scripts-config-jest '@talend/scripts-config-react-webpack': specifier: ^16.0.0 version: link:../../tools/scripts-config-react-webpack @@ -1436,9 +1424,6 @@ importers: packages/http: devDependencies: - '@talend/scripts-config-babel': - specifier: ^13.0.0 - version: link:../../tools/scripts-config-babel '@talend/scripts-config-react-webpack': specifier: ^16.0.0 version: link:../../tools/scripts-config-react-webpack @@ -1460,9 +1445,6 @@ importers: packages/icons: devDependencies: - '@babel/core': - specifier: ^7.22.20 - version: 7.22.20 '@babel/preset-env': specifier: ^7.22.20 version: 7.22.20(@babel/core@7.22.20) @@ -1481,9 +1463,6 @@ importers: '@talend/design-tokens': specifier: ^2.9.0 version: link:../design-tokens - '@talend/scripts-config-babel': - specifier: ^13.0.0 - version: link:../../tools/scripts-config-babel '@talend/scripts-core': specifier: ^15.0.0 version: link:../../tools/scripts-core @@ -2365,9 +2344,6 @@ importers: '@talend/react-cmf-webpack-plugin': specifier: ^6.37.0 version: link:../cmf-webpack-plugin - '@talend/scripts-config-babel': - specifier: ^13.0.0 - version: link:../scripts-config-babel '@talend/scripts-config-cdn': specifier: ^10.8.0 version: link:../scripts-config-cdn diff --git a/tools/scripts-config-react-webpack/package.json b/tools/scripts-config-react-webpack/package.json index 5999aa78d48..bbf5f52d771 100644 --- a/tools/scripts-config-react-webpack/package.json +++ b/tools/scripts-config-react-webpack/package.json @@ -20,7 +20,6 @@ "dependencies": { "@sentry/webpack-plugin": "^1.20.1", "@talend/react-cmf-webpack-plugin": "^6.37.0", - "@talend/scripts-config-babel": "^13.0.0", "@talend/scripts-config-cdn": "^10.8.0", "@talend/scripts-utils": "^2.0.2", "@welldone-software/why-did-you-render": "^7.0.1",