Skip to content

Commit

Permalink
Merge branch 'smouillour/fix/TDOPS-5327-pnpm' of github.com:Talend/ui…
Browse files Browse the repository at this point in the history
… into smouillour/fix/TDOPS-5327-pnpm
  • Loading branch information
jmfrancois committed Oct 12, 2023
2 parents 32e236c + 930d566 commit 7ed6a6a
Show file tree
Hide file tree
Showing 11 changed files with 4 additions and 33 deletions.
2 changes: 2 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
Expand Up @@ -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*
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
},
"version": "0.0.0",
"private": true,
"packageManager": "[email protected]",
"pnpm": {
"overrides": {
"@cypress/request@<=2.88.12": ">=3.0.0",
Expand Down
1 change: 0 additions & 1 deletion packages/assets-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
"@talend/scripts-config-typescript": "^11.1.0",
"read-pkg-up": "^7.0.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/assets-api/tsconfig.json
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion packages/cmf/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion packages/design-system/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion packages/flow-designer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion packages/http/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 0 additions & 2 deletions packages/icons/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
24 changes: 0 additions & 24 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion tools/scripts-config-react-webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 7ed6a6a

Please sign in to comment.