Skip to content
Draft
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
13 changes: 12 additions & 1 deletion .github/workflows/test-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -507,13 +507,24 @@ jobs:
run: yarn run lint-markdown
- name: ESLint
shell: bash
run: ./.github/workflow-scripts/exec_swallow_error.sh yarn lint --format junit -o ./reports/junit/eslint/results.xml
run: yarn lint
- name: Flow
shell: bash
run: yarn flow-check
- name: TypeScript (legacy deep imports / manual types)
shell: bash
run: yarn test-typescript-legacy
- name: clang-format (C/C++/Obj-C)
shell: bash
run: yarn run clang-format-check
- name: Set up JDK 17
uses: actions/setup-java@v5
with:
java-version: '17'
distribution: 'zulu'
- name: ktfmt (Kotlin)
shell: bash
run: yarn run lint-kotlin-check

test_js:
runs-on: ubuntu-latest
Expand Down
14 changes: 8 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,24 @@
"build-android": "./gradlew :packages:react-native:ReactAndroid:build",
"build": "node ./scripts/build/build.js",
"build-types": "node ./scripts/js-api/build-types",
"clang-format": "clang-format -i --glob=*/**/*.{h,cpp,m,mm}",
"clang-format": "./scripts/lint/clang-format.sh",
"clang-format-check": "./scripts/lint/clang-format.sh --check",
"clean": "node ./scripts/build/clean.js",
"cxx-api-build": "python -m scripts.cxx-api.parser",
"cxx-api-validate": "python -m scripts.cxx-api.parser --validate",
"flow-check": "flow full-check",
"flow": "flow",
"format-check": "prettier --list-different \"./**/*.{js,md,yml,ts,tsx}\"",
"format": "npm run prettier && npm run clang-format",
"f": "yarn prettier && yarn clang-format && yarn lint-kotlin",
"format-check": "prettier --list-different \"./**/*.{cjs,cts,flow,js,jsx,md,mjs,mts,ts,tsx,yaml,yml}\"",
"format": "yarn prettier && yarn clang-format && yarn lint-kotlin",
"featureflags": "yarn --cwd packages/react-native featureflags",
"js-api-diff": "node ./scripts/js-api/diff-api-snapshot",
"lint-kotlin-check": "./gradlew ktfmtCheck",
"lint-kotlin": "./gradlew ktfmtFormat",
"lint-kotlin-check": "./scripts/lint/ktfmt.sh --check",
"lint-kotlin": "./scripts/lint/ktfmt.sh",
"lint-markdown": "markdownlint-cli2 2>&1",
"lint": "eslint --max-warnings 0 .",
"preinstall": "node ./scripts/try-set-hermes-compiler-prebuilt.js",
"prettier": "prettier --write \"./**/*.{js,md,yml,ts,tsx}\"",
"prettier": "prettier --write \"./**/*.{cjs,cts,flow,js,jsx,md,mjs,mts,ts,tsx,yaml,yml}\"",
"shellcheck": "./.github/workflow-scripts/analyze_scripts.sh",
"start": "yarn --cwd packages/rn-tester start",
"set-version": "node ./scripts/releases/set-version.js",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,42 +200,44 @@ class ReactPlugin : Plugin<Project> {
}

// We create the tasks to produce schema from JS files and generate artifacts from schema.
val generateCodegenArtifactsTask = registerCodegenTasks(
project = project,
rootExtension = rootExtension,
generatedSrcDir = generatedSrcDir,
packageJsonFile = { findPackageJsonFile(project, rootExtension.root) },
schemaTaskName = "generateCodegenSchemaFromJavaScript",
artifactsTaskName = "generateCodegenArtifactsFromSchema",
configureJsRoot = { task, packageJson ->
// We're reading the package.json at configuration time to properly feed
// the `jsRootDir` @Input property of this task & the onlyIf. Therefore, the
// parsePackageJson should be invoked inside this lambda.
val parsedPackageJson = packageJson?.let { JsonUtils.fromPackageJson(it) }
val jsSrcsDirInPackageJson = parsedPackageJson?.codegenConfig?.jsSrcsDir

if (packageJson != null && jsSrcsDirInPackageJson != null) {
task.jsRootDir.set(File(packageJson.parentFile, jsSrcsDirInPackageJson))
} else {
task.jsRootDir.set(localExtension.jsRootDir)
}
},
configureCodegenArtifacts = { task, _ ->
task.codegenJavaPackageName.set(localExtension.codegenJavaPackageName)
task.libraryName.set(localExtension.libraryName)
},
onlyIf = { packageJson ->
// Please note that needsCodegenFromPackageJson is triggering a read of the
// package.json at configuration time as we need to feed the onlyIf condition of this
// task. Therefore, needsCodegenFromPackageJson needs to be invoked inside this
// lambda.
val needsCodegenFromPackageJson = project.needsCodegenFromPackageJson(rootExtension.root)
val parsedPackageJson = packageJson?.let { JsonUtils.fromPackageJson(it) }
val includesGeneratedCode =
parsedPackageJson?.codegenConfig?.includesGeneratedCode ?: false
(isLibrary || needsCodegenFromPackageJson) && !includesGeneratedCode
},
)
val generateCodegenArtifactsTask =
registerCodegenTasks(
project = project,
rootExtension = rootExtension,
generatedSrcDir = generatedSrcDir,
packageJsonFile = { findPackageJsonFile(project, rootExtension.root) },
schemaTaskName = "generateCodegenSchemaFromJavaScript",
artifactsTaskName = "generateCodegenArtifactsFromSchema",
configureJsRoot = { task, packageJson ->
// We're reading the package.json at configuration time to properly feed
// the `jsRootDir` @Input property of this task & the onlyIf. Therefore, the
// parsePackageJson should be invoked inside this lambda.
val parsedPackageJson = packageJson?.let { JsonUtils.fromPackageJson(it) }
val jsSrcsDirInPackageJson = parsedPackageJson?.codegenConfig?.jsSrcsDir

if (packageJson != null && jsSrcsDirInPackageJson != null) {
task.jsRootDir.set(File(packageJson.parentFile, jsSrcsDirInPackageJson))
} else {
task.jsRootDir.set(localExtension.jsRootDir)
}
},
configureCodegenArtifacts = { task, _ ->
task.codegenJavaPackageName.set(localExtension.codegenJavaPackageName)
task.libraryName.set(localExtension.libraryName)
},
onlyIf = { packageJson ->
// Please note that needsCodegenFromPackageJson is triggering a read of the
// package.json at configuration time as we need to feed the onlyIf condition of this
// task. Therefore, needsCodegenFromPackageJson needs to be invoked inside this
// lambda.
val needsCodegenFromPackageJson =
project.needsCodegenFromPackageJson(rootExtension.root)
val parsedPackageJson = packageJson?.let { JsonUtils.fromPackageJson(it) }
val includesGeneratedCode =
parsedPackageJson?.codegenConfig?.includesGeneratedCode ?: false
(isLibrary || needsCodegenFromPackageJson) && !includesGeneratedCode
},
)

// We update the android configuration to include the generated sources.
// This is equivalent to this DSL:
Expand Down Expand Up @@ -353,13 +355,14 @@ class ReactPlugin : Plugin<Project> {
project.rootProject.layout.buildDirectory.file("generated/autolinking/autolinking.json")
val pureCxxDependencies =
getPureCxxCodegenDependencies(rootGeneratedAutolinkingFile.get().asFile)
val pureCxxCodegenTasks = configurePureCxxDependenciesCodegen(
project,
extension,
rootExtension,
generatedPureCxxSourceDir,
pureCxxDependencies,
)
val pureCxxCodegenTasks =
configurePureCxxDependenciesCodegen(
project,
extension,
rootExtension,
generatedPureCxxSourceDir,
pureCxxDependencies,
)

// We add a task called generateAutolinkingPackageList to do not clash with the existing task
// called generatePackageList. This can to be renamed once we unlink the rn <-> cli
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,13 @@ abstract class BundleHermesCTask : DefaultTask() {

val reactNativeDir = reactNativeDir.get().asFile
val composeScriptFile = File(reactNativeDir, "scripts/compose-source-maps.js")
val composeSourceMapsCommand = getComposeSourceMapsCommand(
composeScriptFile,
packagerSourceMap,
compilerSourceMap,
outputSourceMap,
)
val composeSourceMapsCommand =
getComposeSourceMapsCommand(
composeScriptFile,
packagerSourceMap,
compilerSourceMap,
outputSourceMap,
)
runCommand(composeSourceMapsCommand)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,12 @@ import org.gradle.api.file.DirectoryProperty
internal fun detectedEntryFile(
config: ReactExtension,
envVariableOverride: String? = null,
): File = detectEntryFile(
entryFile = config.entryFile.orNull?.asFile,
reactRoot = config.root.get().asFile,
envVariableOverride = envVariableOverride,
)
): File =
detectEntryFile(
entryFile = config.entryFile.orNull?.asFile,
reactRoot = config.root.get().asFile,
envVariableOverride = envVariableOverride,
)

/**
* Computes the CLI file for React Native. The Algo follows this order:
Expand All @@ -41,11 +42,12 @@ internal fun detectedEntryFile(
* 3. The `node_modules/react-native/cli.js` file if exists
* 4. Fails otherwise
*/
internal fun detectedCliFile(config: ReactExtension): File = detectCliFile(
project = config.project,
reactNativeRoot = config.root.get().asFile,
preconfiguredCliFile = config.cliFile.asFile.orNull,
)
internal fun detectedCliFile(config: ReactExtension): File =
detectCliFile(
project = config.project,
reactNativeRoot = config.root.get().asFile,
preconfiguredCliFile = config.cliFile.asFile.orNull,
)

/**
* Computes the `hermesc` command location. The Algo follows this order:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,12 @@ class ReactPluginTest {

@Test
fun taskNameSuffixForDependency_withNonAlphanumericCharacters_encodesThem() {
val dependency = ModelAutolinkingDependenciesJson(
root = "./node_modules/@foo/bar-baz",
name = "@foo/bar-baz",
platforms = null,
)
val dependency =
ModelAutolinkingDependenciesJson(
root = "./node_modules/@foo/bar-baz",
name = "@foo/bar-baz",
platforms = null,
)

val result = ReactPlugin().taskNameSuffixForDependency(dependency)

Expand All @@ -143,11 +144,12 @@ class ReactPluginTest {
val plugin = ReactPlugin()
val suffixes =
listOf("@foo/bar", "foo.bar", "foo-bar", "foo_bar", "foo_45_bar").map { name ->
val dependency = ModelAutolinkingDependenciesJson(
root = "./node_modules/$name",
name = name,
platforms = null,
)
val dependency =
ModelAutolinkingDependenciesJson(
root = "./node_modules/$name",
name = name,
platforms = null,
)

plugin.taskNameSuffixForDependency(dependency)
}
Expand All @@ -157,11 +159,12 @@ class ReactPluginTest {

@Test
fun taskNameSuffixForDependency_withLocalModuleRoot_usesPackageName() {
val dependency = ModelAutolinkingDependenciesJson(
root = "./modules/local-module",
name = "local-module",
platforms = null,
)
val dependency =
ModelAutolinkingDependenciesJson(
root = "./modules/local-module",
name = "local-module",
platforms = null,
)

val result = ReactPlugin().taskNameSuffixForDependency(dependency)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ class ModelAutolinkingDependenciesJsonTest {
assertThat(ModelAutolinkingDependenciesJson("", "@react-native/package", null).nameCleansed)
.isEqualTo("react-native_package")
assertThat(
ModelAutolinkingDependenciesJson(
"",
"@this*is~a(more)complicated/example!of~weird)packages",
null,
ModelAutolinkingDependenciesJson(
"",
"@this*is~a(more)complicated/example!of~weird)packages",
null,
)
.nameCleansed
)
.nameCleansed
)
.isEqualTo("this_is_a_more_complicated_example_of_weird_packages")
}
}
Loading