Skip to content

Commit

Permalink
Add some files to tsconfig excludes, format files
Browse files Browse the repository at this point in the history
  • Loading branch information
MatiPl01 committed Jan 23, 2025
1 parent db85ead commit 4c74197
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 24 deletions.
10 changes: 5 additions & 5 deletions apps/common-app/scripts/dependencies.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const path = require('path');

/**
* @param {Object.<string, string>} dependencies
* @param {Object<string, string>} dependencies
* @param {string[]} exclude
*/
function resolveDependencies(dependencies = {}, exclude = []) {
Expand All @@ -16,10 +16,10 @@ function resolveDependencies(dependencies = {}, exclude = []) {
}

/**
* This function will return the dependencies from the common-app package
* that aren't listed in the current app's package.json
*
* @param {string} currentAppDir - the current app directory (e.g. __dirname)
* This function will return the dependencies from the common-app package that
* aren't listed in the current app's package.json
*
* @param {string} currentAppDir - The current app directory (e.g. __dirname)
*/
function getDependencies(currentAppDir = '.') {
const commonAppDir = path.resolve(__dirname, '..');
Expand Down
2 changes: 1 addition & 1 deletion apps/common-app/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
"@/*": ["src/*"]
}
},
"include": ["src", "index.ts"]
"include": ["src", ".eslintrc.js", "index.ts"]
}
3 changes: 2 additions & 1 deletion apps/fabric-example/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
"paths": {
"@/*": ["../common-app/src/*"]
}
}
},
"exclude": ["metro.config.js"]
}
4 changes: 1 addition & 3 deletions apps/macos-example/react-native.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
/**
* This file is required to properly resolve native dependencies
*/
/** This file is required to properly resolve native dependencies */
const { getDependencies } = require('../common-app/scripts/dependencies');

const dependencies = getDependencies(__dirname);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,9 @@ else()
endif()

if(${HAS_EXTERNAL_WORKLETS})
target_link_libraries(
reanimated
react-native-worklets::worklets
)
target_link_libraries(reanimated react-native-worklets::worklets)
else()
target_link_libraries(
reanimated
worklets
)
target_link_libraries(reanimated worklets)
endif()

if(ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
Expand Down Expand Up @@ -116,12 +110,9 @@ elseif(${JS_RUNTIME} STREQUAL "jsc")
elseif(${JS_RUNTIME} STREQUAL "v8")
# TODO: Refactor this when adding support for newest V8
target_include_directories(reanimated PRIVATE "${JS_RUNTIME_DIR}/src")
file(
GLOB
V8_SO_DIR
"${JS_RUNTIME_DIR}/android/build/intermediates/library_jni/**/\
jni/${ANDROID_ABI}"
)
file(GLOB V8_SO_DIR
"${JS_RUNTIME_DIR}/android/build/intermediates/library_jni/**/\
jni/${ANDROID_ABI}")
find_library(
V8EXECUTOR_LIB v8executor
PATHS ${V8_SO_DIR}
Expand Down

0 comments on commit 4c74197

Please sign in to comment.