Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PACKAGE] : Updates ⤴️ project dependencies 📦 #189

Merged
merged 1 commit into from
Mar 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/components/AssetTree/AssetNode/AssetNode.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ const StyledTreeNode = styled.div`
flex-direction: row;
align-items: center;
padding: 5px 8px;
padding-left: ${props => getPaddingLeft(props.level)}px;
padding-left: ${props => getPaddingLeft(props.$level)}px;
${props => (props.selected ? 'background-color: #eee;' : null)}
`;

const NodeIcon = styled.div`
font-size: 12px;
margin-right: ${props => (props.marginRight ? props.marginRight : 5)}px;
margin-right: ${props => (props.$marginright ? props.$marginright : 5)}px;
`;

const StyledInput = styled.input`
Comment on lines 26 to 38
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changes in file app/components/AssetTree/AssetNode/AssetNode.js can be reverted as we are not using style-components version 6

Copy link
Contributor Author

@AdiAkhileshSingh15 AdiAkhileshSingh15 Mar 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, actually this transient props thing came with v5 only. That is why I kept these changes.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, thank you for the information. We can keep it then, I have yet to test it with version 5, but I believe it might not be causing any errors as you might have already tested these changes.

Expand Down Expand Up @@ -79,7 +79,7 @@ const AssetNode = props => {
return (
<>
<StyledTreeNode
level={level}
$level={level}
type={node.type}
selected={node && selectedAsset && node.uri === selectedAsset.uri}
onContextMenu={e => {
Expand All @@ -99,7 +99,7 @@ const AssetNode = props => {
(isOpen ? <FaChevronDown /> : <FaChevronRight />)}
</NodeIcon>
{checkbox}
<NodeIcon marginRight={10}>
<NodeIcon $marginright={10}>
{node.type === Constants.AssetType.FILE && <FaFile />}
{node.type === Constants.AssetType.DIRECTORY && isOpen === true && <FaFolderOpen />}
{node.type === Constants.AssetType.DIRECTORY && !isOpen && <FaFolder />}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import Draggable from 'react-draggable';
import { Dialog, DialogActions, DialogTitle, Button, Paper, TextField } from '@mui/material';
import Autocomplete from '@mui/lab/Autocomplete';
import { Autocomplete, Dialog, DialogActions, DialogTitle, Button, Paper, TextField } from '@mui/material';
import { ipcRenderer } from 'electron';
import Messages from '../../constants/messages';
import GeneralUtil from '../../utils/general';
Expand Down
60 changes: 30 additions & 30 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -164,30 +164,30 @@
]
},
"devDependencies": {
"@babel/core": "^7.24.0",
"@babel/core": "^7.24.3",
"@babel/plugin-proposal-class-properties": "^7.7.4",
"@babel/plugin-proposal-decorators": "^7.24.0",
"@babel/plugin-proposal-do-expressions": "^7.23.3",
"@babel/plugin-proposal-export-default-from": "^7.23.3",
"@babel/plugin-proposal-decorators": "^7.24.1",
"@babel/plugin-proposal-do-expressions": "^7.24.1",
"@babel/plugin-proposal-export-default-from": "^7.24.1",
"@babel/plugin-proposal-export-namespace-from": "^7.7.4",
"@babel/plugin-proposal-function-bind": "^7.23.3",
"@babel/plugin-proposal-function-sent": "^7.23.3",
"@babel/plugin-proposal-function-bind": "^7.24.1",
"@babel/plugin-proposal-function-sent": "^7.24.1",
"@babel/plugin-proposal-json-strings": "^7.7.4",
"@babel/plugin-proposal-logical-assignment-operators": "^7.7.4",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.7.4",
"@babel/plugin-proposal-numeric-separator": "^7.7.4",
"@babel/plugin-proposal-pipeline-operator": "^7.23.3",
"@babel/plugin-proposal-pipeline-operator": "^7.24.1",
"@babel/plugin-proposal-private-methods": "^7.18.6",
"@babel/plugin-proposal-throw-expressions": "^7.23.3",
"@babel/plugin-proposal-throw-expressions": "^7.24.1",
"@babel/plugin-syntax-dynamic-import": "^7.7.4",
"@babel/plugin-syntax-import-meta": "^7.7.4",
"@babel/plugin-transform-optional-chaining": "^7.23.4",
"@babel/plugin-transform-private-property-in-object": "^7.23.4",
"@babel/plugin-transform-react-constant-elements": "^7.23.3",
"@babel/plugin-transform-react-inline-elements": "^7.23.3",
"@babel/preset-env": "7.24.0",
"@babel/preset-flow": "^7.24.0",
"@babel/preset-react": "^7.23.3",
"@babel/plugin-transform-optional-chaining": "^7.24.1",
"@babel/plugin-transform-private-property-in-object": "^7.24.1",
"@babel/plugin-transform-react-constant-elements": "^7.24.1",
"@babel/plugin-transform-react-inline-elements": "^7.24.1",
"@babel/preset-env": "7.24.3",
"@babel/preset-flow": "^7.24.1",
"@babel/preset-react": "^7.24.1",
"@babel/register": "^7.23.7",
"@webpack-cli/serve": "^2.0.5",
"babel-eslint": "^10.0.3",
Expand All @@ -201,7 +201,7 @@
"cross-spawn": "^7.0.1",
"css-loader": "^6.10.0",
"detect-port": "^1.3.0",
"electron": "29.1.1",
"electron": "29.1.5",
"electron-builder": "^24.13.3",
"electron-builder-notarize": "^1.5.1",
"electron-devtools-installer": "^3.2.0",
Expand All @@ -221,7 +221,7 @@
"eslint-plugin-jsx-a11y": "6.8.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-react": "^7.34.0",
"eslint-plugin-react": "^7.34.1",
"eslint-plugin-testcafe": "^0.2.1",
"fbjs-scripts": "^3.0.1",
"file-loader": "6.2.0",
Expand All @@ -239,18 +239,18 @@
"sass-loader": "^14.1.1",
"sinon": "^17.0.1",
"style-loader": "^3.3.4",
"stylelint": "^16.2.1",
"stylelint": "^16.3.0",
"stylelint-config-prettier": "^9.0.5",
"stylelint-config-standard": "^36.0.0",
"terser-webpack-plugin": "^5.3.10",
"testcafe": "^15.1.317922",
"testcafe-browser-provider-electron": "^0.0.20",
"testcafe-react-selectors": "^5.0.3",
"url-loader": "^4.1.1",
"webpack": "^5.90.3",
"webpack": "^5.91.0",
"webpack-bundle-analyzer": "^4.10.1",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^5.0.3",
"webpack-dev-server": "^5.0.4",
"webpack-merge": "^5.10.0",
"yarn": "^1.22.22"
},
Expand All @@ -264,15 +264,15 @@
"@fortawesome/free-solid-svg-icons": "^6.5.1",
"@fortawesome/react-fontawesome": "^0.2.0",
"@hot-loader/react-dom": "^16.11.0",
"@mui/icons-material": "^5.15.12",
"@mui/lab": "^5.0.0-alpha.167",
"@mui/material": "^5.15.12",
"@mui/styles": "^5.15.12",
"@mui/icons-material": "^5.15.14",
"@mui/lab": "^5.0.0-alpha.169",
"@mui/material": "^5.15.14",
"@mui/styles": "^5.15.14",
"ansi-regex": "^6.0.1",
"axios": "^1.6.7",
"axios": "^1.6.8",
"connected-react-router": "^6.6.1",
"core-js": "^3.36.0",
"d3": "7.8.5",
"core-js": "^3.36.1",
"d3": "7.9.0",
"devtron": "^1.4.0",
"dt-python-parser": "^0.9.2-beta",
"easymde": "2.18.0",
Expand All @@ -289,7 +289,7 @@
"lodash": "^4.17.21",
"object-hash": "^3.0.0",
"pluralize": "^8.0.0",
"postcss": "8.4.35",
"postcss": "8.4.38",
"postcss-less": "^6.0.0",
"prop-types": "^15.7.2",
"proper-lockfile": "^4.1.2",
Expand All @@ -315,12 +315,12 @@
"resizable-panels-react": "^2.0.8",
"set-value": "^4.0.1",
"source-map-support": "^0.5.16",
"styled-components": "^5.2.1",
"styled-components": "^5.3.11",
"stylelint-config-standard-scss": "^13.0.0",
"url-parse": "^1.5.9",
"username": "^5.1.0",
"uuid": "^9.0.1",
"winston": "^3.12.0",
"winston": "^3.13.0",
"y18n": "^5.0.8"
},
"devEngines": {
Expand Down
Loading