From de7b87ee3d1a22293047c35843bf088630574faf Mon Sep 17 00:00:00 2001 From: Yasser Nascimento Date: Wed, 15 Jun 2022 15:55:02 -0300 Subject: [PATCH 01/10] update react version to 16 --- package.json | 26 ++++++++++++++-------- yarn.lock | 61 +++++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 66 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index b47e0dc..705fb27 100644 --- a/package.json +++ b/package.json @@ -10,10 +10,8 @@ "build": "NODE_ENV=development webpack --progress", "build:watch": "yarn run build -- --watch", "start": "electron index.js", - "pack:osx": - "rm -rf Destroyer-darwin-x64 && NODE_ENV=production webpack --progress -p && electron-packager ./ Destroyer --platform=darwin --arch=x64 --icon=icons.icns --prune", - "pack:win": - "NODE_ENV=production webpack --progress -p && electron-packager ./ Destroyer --out=dist/windows --platform=win32 --arch=x64 --overwrite --icon=icons.ico --prune" + "pack:osx": "rm -rf Destroyer-darwin-x64 && NODE_ENV=production webpack --progress -p && electron-packager ./ Destroyer --platform=darwin --arch=x64 --icon=icons.icns --prune", + "pack:win": "NODE_ENV=production webpack --progress -p && electron-packager ./ Destroyer --out=dist/windows --platform=win32 --arch=x64 --overwrite --icon=icons.ico --prune" }, "author": "omar mashaal", "license": "ISC", @@ -27,9 +25,9 @@ "leftpad": "0.0.0", "musicmetadata": "^2.0.5", "radium": "^0.18.2", - "react": "^15.4.2", + "react": "^16.14.0", "react-addons-shallow-compare": "^15.4.2", - "react-dom": "^15.4.2", + "react-dom": "^16.14.0", "redux": "^3.6.0", "scroll-animator": "^1.1.0", "walk": "^2.3.9" @@ -58,11 +56,21 @@ "webpack": "^2.3.2" }, "babel": { - "presets": ["es2015", "stage-0", "react"], - "plugins": ["transform-runtime", "transform-decorators-legacy"] + "presets": [ + "es2015", + "stage-0", + "react" + ], + "plugins": [ + "transform-runtime", + "transform-decorators-legacy" + ] }, "eslintConfig": { "parser": "babel-eslint", - "extends": ["standard", "standard-react"] + "extends": [ + "standard", + "standard-react" + ] } } diff --git a/yarn.lock b/yarn.lock index 75ef336..6ab96cf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1814,7 +1814,7 @@ fast-levenshtein@~2.0.4: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" -fbjs@^0.8.1, fbjs@^0.8.4: +fbjs@^0.8.4: version "0.8.12" resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.12.tgz#10b5d92f76d45575fd63a217d4ea02bea2f8ed04" dependencies: @@ -2474,6 +2474,11 @@ js-tokens@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7" +"js-tokens@^3.0.0 || ^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== + js-yaml@^3.5.1: version "3.8.2" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.2.tgz#02d3e2c0f6beab20248d412c352203827d786721" @@ -2650,6 +2655,13 @@ loose-envify@^1.0.0, loose-envify@^1.1.0: dependencies: js-tokens "^3.0.0" +loose-envify@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" + integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== + dependencies: + js-tokens "^3.0.0 || ^4.0.0" + loud-rejection@^1.0.0: version "1.6.0" resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f" @@ -2906,7 +2918,7 @@ oauth-sign@~0.8.1: version "0.8.2" resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43" -object-assign@^4.0.1, object-assign@^4.1.0: +object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" @@ -3148,6 +3160,15 @@ promise@^7.1.1: dependencies: asap "~2.0.3" +prop-types@^15.6.2: + version "15.8.1" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" + integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== + dependencies: + loose-envify "^1.4.0" + object-assign "^4.1.1" + react-is "^16.13.1" + prr@~0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a" @@ -3226,21 +3247,29 @@ react-addons-shallow-compare@^15.4.2: fbjs "^0.8.4" object-assign "^4.1.0" -react-dom@^15.4.2: - version "15.4.2" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.4.2.tgz#015363f05b0a1fd52ae9efdd3a0060d90695208f" +react-dom@^16.14.0: + version "16.14.0" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz#7ad838ec29a777fb3c75c3a190f661cf92ab8b89" + integrity sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw== dependencies: - fbjs "^0.8.1" loose-envify "^1.1.0" - object-assign "^4.1.0" + object-assign "^4.1.1" + prop-types "^15.6.2" + scheduler "^0.19.1" + +react-is@^16.13.1: + version "16.13.1" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" + integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== -react@^15.4.2: - version "15.4.2" - resolved "https://registry.yarnpkg.com/react/-/react-15.4.2.tgz#41f7991b26185392ba9bae96c8889e7e018397ef" +react@^16.14.0: + version "16.14.0" + resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d" + integrity sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g== dependencies: - fbjs "^0.8.4" loose-envify "^1.1.0" - object-assign "^4.1.0" + object-assign "^4.1.1" + prop-types "^15.6.2" read-pkg-up@^1.0.1: version "1.0.1" @@ -3501,6 +3530,14 @@ sanitize-filename@^1.6.0: dependencies: truncate-utf8-bytes "^1.0.0" +scheduler@^0.19.1: + version "0.19.1" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196" + integrity sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + scroll-animator@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/scroll-animator/-/scroll-animator-1.1.0.tgz#10df1e0420534ff147c409495e4e46825c23aa0b" From e65ba315398aff817d57caa85739c859055c2bf3 Mon Sep 17 00:00:00 2001 From: Yasser Nascimento Date: Fri, 17 Jun 2022 09:57:29 -0300 Subject: [PATCH 02/10] remove radium --- components/admin/index.jsx | 2 -- components/app/index.jsx | 8 +++----- components/bar/index.jsx | 3 +-- components/button/index.jsx | 3 +-- components/close-button/index.jsx | 3 +-- components/input/index.jsx | 3 +-- components/library/album.jsx | 2 -- components/library/index.jsx | 2 -- components/loading/index.jsx | 3 +-- components/playbar/index.jsx | 2 -- components/search/index.jsx | 2 -- components/showcase/index.jsx | 6 ++---- components/showcase/track.jsx | 2 -- components/status/index.jsx | 3 +-- package.json | 1 - yarn.lock | 32 ------------------------------- 16 files changed, 11 insertions(+), 66 deletions(-) diff --git a/components/admin/index.jsx b/components/admin/index.jsx index 6fb1562..b59beb9 100644 --- a/components/admin/index.jsx +++ b/components/admin/index.jsx @@ -1,9 +1,7 @@ import React, { Component } from 'react' import { store } from '../../client.js' import Local from '../connection/local.js' -import Radium from 'radium' -@Radium export default class Admin extends Component { constructor() { super() diff --git a/components/app/index.jsx b/components/app/index.jsx index 433ca8c..51c8654 100644 --- a/components/app/index.jsx +++ b/components/app/index.jsx @@ -7,11 +7,9 @@ import Status from '../status' import Library from '../library' import Showcase from '../showcase' import Playbar from '../playbar' -import Radium, { StyleRoot, Style } from 'radium' const App = props => ( - -