Skip to content
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
2,982 changes: 808 additions & 2,174 deletions package-lock.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
},
"devDependencies": {
"@emotion/eslint-plugin": "11.12.0",
"@react-native/metro-babel-transformer": "0.79.5",
"@tsconfig/strictest": "2.0.2",
"@types/keyv": "4.2.0",
"@types/react": "19.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/harmony/src/components/scrollbar/Scrollbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export const Scrollbar = forwardRef(
// useMeasure ref is required for infinite scrolling to work
const [ref] = useMeasure({ polyfill: ResizeObserver })
const containerRef = useRef<HTMLElement | null>(null)
const timerRef = useRef<NodeJS.Timeout | null>(null)
const timerRef = useRef<ReturnType<typeof setTimeout> | null>(null)
const reactId = useId()
const elementId = id || reactId

Expand Down
4 changes: 2 additions & 2 deletions packages/harmony/src/components/tooltip/Tooltip.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,8 @@ export const Tooltip = ({

const triggerRef = useRef<HTMLElement>(null)
const tooltipRef = useRef<HTMLDivElement>(null)
const enterDelayTimerRef = useRef<NodeJS.Timeout | null>(null)
const leaveDelayTimerRef = useRef<NodeJS.Timeout | null>(null)
const enterDelayTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null)
const leaveDelayTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null)
const mousedOverRef = useRef(false)

// Handle mouse enter with delay
Expand Down
2 changes: 1 addition & 1 deletion packages/harmony/src/hooks/useHoverDelay.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export const useHoverDelay = (
) => {
const [isHovered, setIsHovered] = useState(false)
const [isClicked, setIsClicked] = useState(false)
const timerRef = useRef<NodeJS.Timeout | null>(null)
const timerRef = useRef<ReturnType<typeof setTimeout> | null>(null)

// Clean up the timer when component unmounts
useEffect(() => {
Expand Down
10 changes: 5 additions & 5 deletions packages/mobile/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ apply plugin: "com.facebook.react"
react {
/* Folders */
// The root of your project, i.e. where "package.json" lives. Default is '../..'
// root = file("../../")
// In monorepo setup, react-native and @react-native/* are hoisted to the root node_modules
root = file("../../../../")
// The folder where the react-native NPM package is. Default is ../../node_modules/react-native
// reactNativeDir = file("../../node_modules/react-native")
reactNativeDir = file("../../../../node_modules/react-native")
// The folder where the react-native Codegen package is. Default is ../../node_modules/@react-native/codegen
// In monorepo setup, codegen is hoisted to root node_modules
codegenDir = file("../../../../node_modules/@react-native/codegen")
// The cli.js file which is the React Native CLI entrypoint. Default is ../../node_modules/react-native/cli.js
// cliFile = file("../../node_modules/react-native/cli.js")
cliFile = file("../../../../node_modules/react-native/cli.js")
/* Variants */
// The list of variants to that are debuggable. For those we're going to
// skip the bundling of the JS bundle and the assets. By default is just 'debug'.
Expand Down Expand Up @@ -128,7 +128,7 @@ android {
// versionCode is automatically incremented in CI
versionCode 1
// Make sure this is above the currently released Android version in the play store if your changes touch native code:
versionName "1.1.528"
versionName "1.1.529"
resValue "string", "build_config_package", "co.audius.app"
resConfigs "en"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "export NODE_BINARY=node\nWITH_ENVIRONMENT=\"${SRCROOT}/../node_modules/react-native/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"${SRCROOT}/../node_modules/react-native/scripts/react-native-xcode.sh\"\n/bin/sh -c \"$WITH_ENVIRONMENT $REACT_NATIVE_XCODE\"\n";
shellScript = "export NODE_BINARY=node\nset -e\nWITH_ENVIRONMENT=\"$REACT_NATIVE_PATH/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"$REACT_NATIVE_PATH/scripts/react-native-xcode.sh\"\n/bin/sh -c \"$WITH_ENVIRONMENT $REACT_NATIVE_XCODE\"\n";
showEnvVarsInLog = 0;
};
B73C21C532E1201FEFBAECDA /* [CP] Copy Pods Resources */ = {
Expand Down Expand Up @@ -746,7 +746,7 @@
OTHER_CFLAGS = "$(inherited)";
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
OTHER_LDFLAGS = "$(inherited)";
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
REACT_NATIVE_PATH = "${PODS_ROOT}/../../../../node_modules/react-native";
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
USE_HERMES = true;
Expand Down Expand Up @@ -804,7 +804,7 @@
OTHER_CFLAGS = "$(inherited)";
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
OTHER_LDFLAGS = "$(inherited)";
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
REACT_NATIVE_PATH = "${PODS_ROOT}/../../../../node_modules/react-native";
SDKROOT = iphoneos;
USE_HERMES = true;
VALIDATE_PRODUCT = YES;
Expand Down Expand Up @@ -862,7 +862,7 @@
OTHER_CFLAGS = "$(inherited)";
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
OTHER_LDFLAGS = "$(inherited)";
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
REACT_NATIVE_PATH = "${PODS_ROOT}/../../../../node_modules/react-native";
SDKROOT = iphoneos;
USE_HERMES = true;
VALIDATE_PRODUCT = YES;
Expand Down
2 changes: 1 addition & 1 deletion packages/mobile/ios/AudiusReactNative/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.1.192</string>
<string>1.1.193</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
Expand Down
Loading
Loading