From aab8aaa810e40e0c663af3d78cba594cd9771e6d Mon Sep 17 00:00:00 2001 From: Sebastian Klingler Date: Wed, 13 Mar 2024 13:45:22 -0500 Subject: [PATCH] [INF-668] Remove peerDeps from @audius/harmony (#7822) --- package-lock.json | 128 +++++++++++++++++------------ packages/harmony/README.md | 15 +--- packages/harmony/package.json | 23 +----- packages/harmony/rollup.config.mjs | 4 +- 4 files changed, 82 insertions(+), 88 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4934b19f5af..367c4817dc0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -140098,7 +140098,20 @@ "version": "0.0.28", "license": "ISC", "dependencies": { - "@juggle/resize-observer": "3.4.0" + "@emotion/css": "^11.11.2", + "@emotion/react": "^11.11.1", + "@emotion/styled": "^11.11.0", + "@juggle/resize-observer": "3.4.0", + "@radix-ui/react-slot": "^1.0.2", + "@react-spring/web": "^9.7.2", + "classnames": "^2.5.1", + "lodash": "^4.17.21", + "react-lottie": "^1.2.3", + "react-merge-refs": "^2.0.1", + "react-perfect-scrollbar": "^1.5.8", + "react-spring": "^8.0.27", + "react-use": "^17.5.0", + "react-use-measure": "^2.1.1" }, "devDependencies": { "@babel/preset-env": "7.22.15", @@ -140106,11 +140119,6 @@ "@babel/preset-typescript": "7.22.15", "@emotion/babel-plugin": "11.11.0", "@emotion/babel-preset-css-prop": "11.11.0", - "@emotion/css": "11.11.2", - "@emotion/react": "11.11.1", - "@emotion/styled": "11.11.0", - "@radix-ui/react-slot": "1.0.2", - "@react-spring/web": "9.7.2", "@rollup/plugin-alias": "5.0.1", "@storybook/addon-a11y": "7.4.0", "@storybook/addon-actions": "7.4.2", @@ -140136,23 +140144,15 @@ "babel-loader": "8.3.0", "babel-runtime": "6.26.0", "chromatic": "7.4.0", - "classnames": "2.5.1", "cross-env": "5.2.1", "css-loader": "6.8.1", "eslint": "8.56.0", "eslint-plugin-storybook": "0.6.13", "file-loader": "6.2.0", - "lodash": "4.17.21", "prettier": "2.8.8", "react": "18.2.0", "react-docgen-typescript-loader": "3.7.2", "react-dom": "18.2.0", - "react-lottie": "1.2.3", - "react-merge-refs": "2.0.1", - "react-perfect-scrollbar": "1.5.8", - "react-spring": "8.0.27", - "react-use": "15.3.8", - "react-use-measure": "2.1.1", "remark-gfm": "3.0.1", "rollup": "4.3.0", "rollup-plugin-json": "4.0.0", @@ -140166,21 +140166,6 @@ "typescript": "5.0.4", "typescript-transform-paths": "3.4.6", "webpack": "4.46.0" - }, - "peerDependencies": { - "@emotion/css": "^11.11.2", - "@emotion/react": "^11.11.1", - "@emotion/styled": "^11.11.0", - "@radix-ui/react-slot": "^1.0.2", - "@react-spring/web": "^9.7.2", - "classnames": "^2.5.1", - "lodash": "^4.17.21", - "react-lottie": "^1.2.3", - "react-merge-refs": "^2.0.1", - "react-perfect-scrollbar": "^1.5.8", - "react-spring": "^8.0.27", - "react-use": "^15.3.8", - "react-use-measure": "^2.1.1" } }, "packages/harmony/node_modules/@babel/plugin-transform-react-jsx": { @@ -140272,7 +140257,6 @@ }, "packages/harmony/node_modules/@types/js-cookie": { "version": "2.2.6", - "dev": true, "license": "MIT" }, "packages/harmony/node_modules/@webassemblyjs/ast": { @@ -140554,8 +140538,15 @@ "packages/harmony/node_modules/classnames": { "version": "2.5.1", "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz", - "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==", - "dev": true + "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==" + }, + "packages/harmony/node_modules/copy-to-clipboard": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz", + "integrity": "sha512-2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA==", + "dependencies": { + "toggle-selection": "^1.0.6" + } }, "packages/harmony/node_modules/cross-spawn": { "version": "7.0.3", @@ -140570,6 +140561,11 @@ "node": ">= 8" } }, + "packages/harmony/node_modules/csstype": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", + "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==" + }, "packages/harmony/node_modules/define-property": { "version": "2.0.2", "dev": true, @@ -140749,6 +140745,15 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "packages/harmony/node_modules/inline-style-prefixer": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/inline-style-prefixer/-/inline-style-prefixer-7.0.0.tgz", + "integrity": "sha512-I7GEdScunP1dQ6IM2mQWh6v0mOYdYmH3Bp31UecKdrcUgcURTcctSe1IECdUznSHKSmsHtjrT3CwCPI1pyxfUQ==", + "dependencies": { + "css-in-js-utils": "^3.1.0", + "fast-loops": "^1.1.3" + } + }, "packages/harmony/node_modules/is-binary-path": { "version": "2.1.0", "dev": true, @@ -140948,6 +140953,25 @@ "node": ">=0.10.0" } }, + "packages/harmony/node_modules/nano-css": { + "version": "5.6.1", + "resolved": "https://registry.npmjs.org/nano-css/-/nano-css-5.6.1.tgz", + "integrity": "sha512-T2Mhc//CepkTa3X4pUhKgbEheJHYAxD0VptuqFhDbGMUWVV2m+lkNiW/Ieuj35wrfC8Zm0l7HvssQh7zcEttSw==", + "dependencies": { + "@jridgewell/sourcemap-codec": "^1.4.15", + "css-tree": "^1.1.2", + "csstype": "^3.1.2", + "fastest-stable-stringify": "^2.0.2", + "inline-style-prefixer": "^7.0.0", + "rtl-css-js": "^1.16.1", + "stacktrace-js": "^2.0.2", + "stylis": "^4.3.0" + }, + "peerDependencies": { + "react": "*", + "react-dom": "*" + } + }, "packages/harmony/node_modules/p-limit": { "version": "2.3.0", "dev": true, @@ -141017,28 +141041,28 @@ } }, "packages/harmony/node_modules/react-use": { - "version": "15.3.8", - "dev": true, - "license": "Unlicense", + "version": "17.5.0", + "resolved": "https://registry.npmjs.org/react-use/-/react-use-17.5.0.tgz", + "integrity": "sha512-PbfwSPMwp/hoL847rLnm/qkjg3sTRCvn6YhUZiHaUa3FA6/aNoFX79ul5Xt70O1rK+9GxSVqkY0eTwMdsR/bWg==", "dependencies": { - "@types/js-cookie": "2.2.6", - "@xobotyi/scrollbar-width": "1.9.5", - "copy-to-clipboard": "^3.2.0", + "@types/js-cookie": "^2.2.6", + "@xobotyi/scrollbar-width": "^1.9.5", + "copy-to-clipboard": "^3.3.1", "fast-deep-equal": "^3.1.3", "fast-shallow-equal": "^1.0.0", "js-cookie": "^2.2.1", - "nano-css": "^5.2.1", + "nano-css": "^5.6.1", "react-universal-interface": "^0.6.2", "resize-observer-polyfill": "^1.5.1", - "screenfull": "^5.0.0", + "screenfull": "^5.1.0", "set-harmonic-interval": "^1.0.1", - "throttle-debounce": "^2.1.0", + "throttle-debounce": "^3.0.1", "ts-easing": "^0.2.0", - "tslib": "^2.0.0" + "tslib": "^2.1.0" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0", - "react-dom": "^16.8.0 || ^17.0.0" + "react": "*", + "react-dom": "*" } }, "packages/harmony/node_modules/readable-stream": { @@ -141217,6 +141241,11 @@ "safe-buffer": "~5.1.0" } }, + "packages/harmony/node_modules/stylis": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.3.1.tgz", + "integrity": "sha512-EQepAV+wMsIaGVGX1RECzgrcqRRU/0sYOHkeLsZ3fzHaHXZy4DaOOX0vOlGQdlsjkh3mFHAIlVimpwAs4dslyQ==" + }, "packages/harmony/node_modules/supports-color": { "version": "7.2.0", "dev": true, @@ -141313,14 +141342,6 @@ "semver": "bin/semver" } }, - "packages/harmony/node_modules/throttle-debounce": { - "version": "2.3.0", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, "packages/harmony/node_modules/to-regex-range": { "version": "5.0.1", "dev": true, @@ -141335,7 +141356,6 @@ }, "packages/harmony/node_modules/tslib": { "version": "2.6.2", - "dev": true, "license": "0BSD" }, "packages/harmony/node_modules/type-fest": { @@ -144233,7 +144253,7 @@ }, "packages/libs": { "name": "@audius/sdk", - "version": "3.0.38", + "version": "3.0.39", "license": "Apache-2.0", "dependencies": { "@audius/fixed-decimal": "^0.0.20", diff --git a/packages/harmony/README.md b/packages/harmony/README.md index 0d5a0b5f6c6..d1b93553cd3 100644 --- a/packages/harmony/README.md +++ b/packages/harmony/README.md @@ -22,13 +22,7 @@ Full documentation can be found here: [Harmony Docs](https://harmony.audius.co) ## Installation -Install `@audius/harmony` required peer dependencies: - -```bash -npm install --save @emotion/react @emotion/styled @radix-ui/react-slot @react-spring/web classnames lodash react-lottie react-merge-refs react-perfect-scrollbar react-use react-use-measure -``` - -Then install `@audius/harmony` +Install `@audius/harmony`: ```bash npm install --save @audius/harmony @@ -48,12 +42,7 @@ Setup the ThemeProvider exported by Harmony import { ThemeProvider as HarmonyThemeProvider } from '@audius/harmony' const App = () => { - - return ( - - ... - - ) + return ... } ``` diff --git a/packages/harmony/package.json b/packages/harmony/package.json index 60b804520cb..21c1b4b9f48 100644 --- a/packages/harmony/package.json +++ b/packages/harmony/package.json @@ -31,11 +31,6 @@ "@babel/preset-typescript": "7.22.15", "@emotion/babel-plugin": "11.11.0", "@emotion/babel-preset-css-prop": "11.11.0", - "@emotion/css": "11.11.2", - "@emotion/react": "11.11.1", - "@emotion/styled": "11.11.0", - "@radix-ui/react-slot": "1.0.2", - "@react-spring/web": "9.7.2", "@rollup/plugin-alias": "5.0.1", "@storybook/addon-a11y": "7.4.0", "@storybook/addon-actions": "7.4.2", @@ -61,23 +56,15 @@ "babel-loader": "8.3.0", "babel-runtime": "6.26.0", "chromatic": "7.4.0", - "classnames": "2.5.1", "cross-env": "5.2.1", "css-loader": "6.8.1", "eslint": "8.56.0", "eslint-plugin-storybook": "0.6.13", "file-loader": "6.2.0", - "lodash": "4.17.21", "prettier": "2.8.8", "react": "18.2.0", "react-docgen-typescript-loader": "3.7.2", "react-dom": "18.2.0", - "react-lottie": "1.2.3", - "react-merge-refs": "2.0.1", - "react-perfect-scrollbar": "1.5.8", - "react-spring": "8.0.27", - "react-use": "15.3.8", - "react-use-measure": "2.1.1", "remark-gfm": "3.0.1", "rollup": "4.3.0", "rollup-plugin-json": "4.0.0", @@ -92,10 +79,11 @@ "typescript-transform-paths": "3.4.6", "webpack": "4.46.0" }, - "peerDependencies": { + "dependencies": { "@emotion/css": "^11.11.2", "@emotion/react": "^11.11.1", "@emotion/styled": "^11.11.0", + "@juggle/resize-observer": "3.4.0", "@radix-ui/react-slot": "^1.0.2", "@react-spring/web": "^9.7.2", "classnames": "^2.5.1", @@ -104,10 +92,7 @@ "react-merge-refs": "^2.0.1", "react-perfect-scrollbar": "^1.5.8", "react-spring": "^8.0.27", - "react-use": "^15.3.8", - "react-use-measure": "^2.1.1" - }, - "dependencies": { - "@juggle/resize-observer": "3.4.0" + "react-use-measure": "^2.1.1", + "react-use": "^17.5.0" } } diff --git a/packages/harmony/rollup.config.mjs b/packages/harmony/rollup.config.mjs index c5d40ac492c..64b57b484ed 100644 --- a/packages/harmony/rollup.config.mjs +++ b/packages/harmony/rollup.config.mjs @@ -12,8 +12,8 @@ const cjsRequire = createRequire(import.meta.url) const tspCompiler = cjsRequire('ts-patch/compiler') const external = [ - ...Object.keys(pkg.devDependencies), - ...Object.keys(pkg.peerDependencies), + ...Object.keys(pkg.devDependencies ?? {}), + ...Object.keys(pkg.peerDependencies ?? {}), '@emotion/react/jsx-runtime', '@emotion/cache', '@emotion/is-prop-valid',