diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index 3359d1613b..44984a9835 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -77,6 +77,7 @@ const nodeTypeRegistry: NodeTypeRegistry = { - [releng] The frontend now depends on @ObeoNetwork/gantt-task-react v0.3.13 - [releng] The frontend now depends on react-trello 2.2.11 +- https://github.com/eclipse-sirius/sirius-web/issues/2842[#2842] Move to @ObeoNetwork/react-trello === Bug fixes diff --git a/package-lock.json b/package-lock.json index dfdcd03241..d6c177c4bd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1532,6 +1532,62 @@ "react-dom": "^17.0.2" } }, + "node_modules/@ObeoNetwork/react-trello": { + "version": "2.4.1", + "resolved": "https://npm.pkg.github.com/download/@ObeoNetwork/react-trello/2.4.1/ff673480252e27085afcc2d6f7ade97404e3c579", + "integrity": "sha512-Ni79jX2n1ioE5pucTDvtOMJqFy3cAutx9XEaUt3OPgSqIuQIDZCdjuVIp8/haqSDi915L4o0VBTOl/OBIpBUWQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "autosize": "^4.0.2", + "classnames": "^2.2.6", + "immutability-helper": "^2.8.1", + "lodash": "^4.17.11", + "prop-types": "^15.7.2", + "react-popopo": "^2.1.9", + "react-redux": "^5.0.7", + "redux": "^4.0.0", + "redux-actions": "^2.6.1", + "redux-logger": "^3.0.6", + "trello-smooth-dnd": "1.0.0", + "uuid": "^3.3.2" + }, + "peerDependencies": { + "lodash": ">= 4.17.11", + "react": "*", + "react-dom": "*", + "react-redux": ">= 5.0.7", + "redux": ">= 4.0.0", + "redux-actions": ">= 2.6.1", + "redux-logger": ">= 3.0.6", + "styled-components": ">= 4.0.3" + } + }, + "node_modules/@ObeoNetwork/react-trello/node_modules/react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", + "dev": true + }, + "node_modules/@ObeoNetwork/react-trello/node_modules/react-redux": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-5.1.2.tgz", + "integrity": "sha512-Ns1G0XXc8hDyH/OcBHOxNgQx9ayH3SPxBnFCOidGKSle8pKihysQw2rG/PmciUQRoclhVBO8HMhiRmGXnDja9Q==", + "dev": true, + "dependencies": { + "@babel/runtime": "^7.1.2", + "hoist-non-react-statics": "^3.3.0", + "invariant": "^2.2.4", + "loose-envify": "^1.1.0", + "prop-types": "^15.6.1", + "react-is": "^16.6.0", + "react-lifecycles-compat": "^3.0.0" + }, + "peerDependencies": { + "react": "^0.14.0 || ^15.0.0-0 || ^16.0.0-0", + "redux": "^2.0.0 || ^3.0.0 || ^4.0.0-0" + } + }, "node_modules/@reactflow/background": { "version": "11.3.6", "resolved": "https://registry.npmjs.org/@reactflow/background/-/background-11.3.6.tgz", @@ -5132,61 +5188,6 @@ "react-dom": ">=16.6.0" } }, - "node_modules/react-trello": { - "version": "2.2.11", - "resolved": "https://registry.npmjs.org/react-trello/-/react-trello-2.2.11.tgz", - "integrity": "sha512-Zm7qrPAcFTysUXK6wpa1KhTt7fTadIZgNGYj+blDWGnppFYW7GMi1p+S6J8P9quhzKnIJTSZXVzHA1f4sREIVQ==", - "dev": true, - "dependencies": { - "autosize": "^4.0.2", - "classnames": "^2.2.6", - "immutability-helper": "^2.8.1", - "lodash": "^4.17.11", - "prop-types": "^15.7.2", - "react-popopo": "^2.1.9", - "react-redux": "^5.0.7", - "redux": "^4.0.0", - "redux-actions": "^2.6.1", - "redux-logger": "^3.0.6", - "trello-smooth-dnd": "1.0.0", - "uuid": "^3.3.2" - }, - "peerDependencies": { - "lodash": ">= 4.17.11", - "react": "*", - "react-dom": "*", - "react-redux": ">= 5.0.7", - "redux": ">= 4.0.0", - "redux-actions": ">= 2.6.1", - "redux-logger": ">= 3.0.6", - "styled-components": ">= 4.0.3" - } - }, - "node_modules/react-trello/node_modules/react-is": { - "version": "16.13.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", - "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", - "dev": true - }, - "node_modules/react-trello/node_modules/react-redux": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-5.1.2.tgz", - "integrity": "sha512-Ns1G0XXc8hDyH/OcBHOxNgQx9ayH3SPxBnFCOidGKSle8pKihysQw2rG/PmciUQRoclhVBO8HMhiRmGXnDja9Q==", - "dev": true, - "dependencies": { - "@babel/runtime": "^7.1.2", - "hoist-non-react-statics": "^3.3.0", - "invariant": "^2.2.4", - "loose-envify": "^1.1.0", - "prop-types": "^15.6.1", - "react-is": "^16.6.0", - "react-lifecycles-compat": "^3.0.0" - }, - "peerDependencies": { - "react": "^0.14.0 || ^15.0.0-0 || ^16.0.0-0", - "redux": "^2.0.0 || ^3.0.0 || ^4.0.0-0" - } - }, "node_modules/reactflow": { "version": "11.10.1", "resolved": "https://registry.npmjs.org/reactflow/-/reactflow-11.10.1.tgz", @@ -6620,6 +6621,7 @@ "@eclipse-sirius/sirius-components-tsconfig": "*", "@material-ui/core": "4.12.4", "@material-ui/icons": "4.11.3", + "@ObeoNetwork/react-trello": "2.4.1", "@types/react": "17.0.37", "@vitejs/plugin-react": "4.0.4", "@xstate/react": "1.6.3", @@ -6627,7 +6629,6 @@ "prettier": "2.7.1", "react": "17.0.2", "react-dom": "17.0.2", - "react-trello": "2.2.11", "rollup-plugin-peer-deps-external": "2.2.4", "typescript": "5.1.6", "vite": "4.4.9", @@ -6639,11 +6640,11 @@ "@eclipse-sirius/sirius-components-core": "*", "@material-ui/core": "4.12.4", "@material-ui/icons": "4.11.3", + "@ObeoNetwork/react-trello": "2.4.1", "@xstate/react": "1.6.3", "graphql": "16.8.0", "react": "17.0.2", "react-dom": "17.0.2", - "react-trello": "2.2.11", "xstate": "4.32.1" } }, @@ -7811,6 +7812,7 @@ "@eclipse-sirius/sirius-components-tsconfig": "*", "@material-ui/core": "4.12.4", "@material-ui/icons": "4.11.3", + "@ObeoNetwork/react-trello": "2.4.1", "@types/react": "17.0.37", "@vitejs/plugin-react": "4.0.4", "@xstate/react": "1.6.3", @@ -7818,7 +7820,6 @@ "prettier": "2.7.1", "react": "17.0.2", "react-dom": "17.0.2", - "react-trello": "2.2.11", "rollup-plugin-peer-deps-external": "2.2.4", "typescript": "5.1.6", "vite": "4.4.9", @@ -8860,6 +8861,49 @@ "integrity": "sha512-OP7aVcv6s/DSPvgqyzyuZ5RERalGM/X32oOGRE0jYmkGvdWqORfuTagXXOYeAE8dGSJJzIJXsoYBXA62i5QnJw==", "requires": {} }, + "@ObeoNetwork/react-trello": { + "version": "2.4.1", + "resolved": "https://npm.pkg.github.com/download/@ObeoNetwork/react-trello/2.4.1/ff673480252e27085afcc2d6f7ade97404e3c579", + "integrity": "sha512-Ni79jX2n1ioE5pucTDvtOMJqFy3cAutx9XEaUt3OPgSqIuQIDZCdjuVIp8/haqSDi915L4o0VBTOl/OBIpBUWQ==", + "dev": true, + "requires": { + "autosize": "^4.0.2", + "classnames": "^2.2.6", + "immutability-helper": "^2.8.1", + "lodash": "^4.17.11", + "prop-types": "^15.7.2", + "react-popopo": "^2.1.9", + "react-redux": "^5.0.7", + "redux": "^4.0.0", + "redux-actions": "^2.6.1", + "redux-logger": "^3.0.6", + "trello-smooth-dnd": "1.0.0", + "uuid": "^3.3.2" + }, + "dependencies": { + "react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", + "dev": true + }, + "react-redux": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-5.1.2.tgz", + "integrity": "sha512-Ns1G0XXc8hDyH/OcBHOxNgQx9ayH3SPxBnFCOidGKSle8pKihysQw2rG/PmciUQRoclhVBO8HMhiRmGXnDja9Q==", + "dev": true, + "requires": { + "@babel/runtime": "^7.1.2", + "hoist-non-react-statics": "^3.3.0", + "invariant": "^2.2.4", + "loose-envify": "^1.1.0", + "prop-types": "^15.6.1", + "react-is": "^16.6.0", + "react-lifecycles-compat": "^3.0.0" + } + } + } + }, "@reactflow/background": { "version": "11.3.6", "resolved": "https://registry.npmjs.org/@reactflow/background/-/background-11.3.6.tgz", @@ -11653,49 +11697,6 @@ "prop-types": "^15.6.2" } }, - "react-trello": { - "version": "2.2.11", - "resolved": "https://registry.npmjs.org/react-trello/-/react-trello-2.2.11.tgz", - "integrity": "sha512-Zm7qrPAcFTysUXK6wpa1KhTt7fTadIZgNGYj+blDWGnppFYW7GMi1p+S6J8P9quhzKnIJTSZXVzHA1f4sREIVQ==", - "dev": true, - "requires": { - "autosize": "^4.0.2", - "classnames": "^2.2.6", - "immutability-helper": "^2.8.1", - "lodash": "^4.17.11", - "prop-types": "^15.7.2", - "react-popopo": "^2.1.9", - "react-redux": "^5.0.7", - "redux": "^4.0.0", - "redux-actions": "^2.6.1", - "redux-logger": "^3.0.6", - "trello-smooth-dnd": "1.0.0", - "uuid": "^3.3.2" - }, - "dependencies": { - "react-is": { - "version": "16.13.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", - "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", - "dev": true - }, - "react-redux": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-5.1.2.tgz", - "integrity": "sha512-Ns1G0XXc8hDyH/OcBHOxNgQx9ayH3SPxBnFCOidGKSle8pKihysQw2rG/PmciUQRoclhVBO8HMhiRmGXnDja9Q==", - "dev": true, - "requires": { - "@babel/runtime": "^7.1.2", - "hoist-non-react-statics": "^3.3.0", - "invariant": "^2.2.4", - "loose-envify": "^1.1.0", - "prop-types": "^15.6.1", - "react-is": "^16.6.0", - "react-lifecycles-compat": "^3.0.0" - } - } - } - }, "reactflow": { "version": "11.10.1", "resolved": "https://registry.npmjs.org/reactflow/-/reactflow-11.10.1.tgz", diff --git a/packages/deck/frontend/sirius-components-deck/package.json b/packages/deck/frontend/sirius-components-deck/package.json index 3f1a35b8b6..ecf8b5f7c2 100644 --- a/packages/deck/frontend/sirius-components-deck/package.json +++ b/packages/deck/frontend/sirius-components-deck/package.json @@ -32,7 +32,7 @@ "peerDependencies": { "@apollo/client": "3.8.1", "@eclipse-sirius/sirius-components-core": "*", - "react-trello": "2.2.11", + "@ObeoNetwork/react-trello": "2.4.1", "@material-ui/core": "4.12.4", "@material-ui/icons": "4.11.3", "@xstate/react": "1.6.3", @@ -49,7 +49,7 @@ "@material-ui/icons": "4.11.3", "@types/react": "17.0.37", "@vitejs/plugin-react": "4.0.4", - "react-trello": "2.2.11", + "@ObeoNetwork/react-trello": "2.4.1", "@xstate/react": "1.6.3", "graphql": "16.8.0", "prettier": "2.7.1", diff --git a/packages/deck/frontend/sirius-components-deck/src/Deck.tsx b/packages/deck/frontend/sirius-components-deck/src/Deck.tsx index 1e92ec8d0d..0c43abd090 100644 --- a/packages/deck/frontend/sirius-components-deck/src/Deck.tsx +++ b/packages/deck/frontend/sirius-components-deck/src/Deck.tsx @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2023 Obeo. + * Copyright (c) 2023, 2024 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -import Board from 'react-trello'; +import Board from '@ObeoNetwork/react-trello'; import { Toolbar } from './toolbar/Toolbar'; export const Deck = ({ data }) => {