Skip to content

Commit b31ba29

Browse files
Nivaldo Bondançameta-codesync[bot]
Nivaldo Bondança
authored and
meta-codesync[bot]
committed
Update ktfmt component on FBS:master
Reviewed By: cortinico Differential Revision: D110624565 fbshipit-source-id: c18b2b2fc22a8b060a30ae9bd2bc18af862e08f2
1 parent 1790c61 commit b31ba29

79 files changed

Lines changed: 2006 additions & 2166 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build.gradle.kts‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -188,17 +188,16 @@ listOf("ktfmtCheck", "ktfmtFormat").forEach { taskName ->
188188

189189
allprojects {
190190
// Apply exclusions for specific files that should not be formatted
191-
val excludePatterns =
192-
listOf(
193-
"**/build/**",
194-
"**/hermes-engine/**",
195-
"**/internal/featureflags/**",
196-
"**/systeminfo/ReactNativeVersion.kt",
197-
)
191+
val excludePatterns = listOf(
192+
"**/build/**",
193+
"**/hermes-engine/**",
194+
"**/internal/featureflags/**",
195+
"**/systeminfo/ReactNativeVersion.kt",
196+
)
198197
listOf(
199-
com.ncorti.ktfmt.gradle.tasks.KtfmtCheckTask::class,
200-
com.ncorti.ktfmt.gradle.tasks.KtfmtFormatTask::class,
201-
)
198+
com.ncorti.ktfmt.gradle.tasks.KtfmtCheckTask::class,
199+
com.ncorti.ktfmt.gradle.tasks.KtfmtFormatTask::class,
200+
)
202201
.forEach { tasks.withType(it) { exclude(excludePatterns) } }
203202

204203
// Disable the problematic ktfmt script tasks due to symbolic link issues in subprojects

‎packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactPlugin.kt‎

Lines changed: 43 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -200,44 +200,42 @@ class ReactPlugin : Plugin<Project> {
200200
}
201201

202202
// We create the tasks to produce schema from JS files and generate artifacts from schema.
203-
val generateCodegenArtifactsTask =
204-
registerCodegenTasks(
205-
project = project,
206-
rootExtension = rootExtension,
207-
generatedSrcDir = generatedSrcDir,
208-
packageJsonFile = { findPackageJsonFile(project, rootExtension.root) },
209-
schemaTaskName = "generateCodegenSchemaFromJavaScript",
210-
artifactsTaskName = "generateCodegenArtifactsFromSchema",
211-
configureJsRoot = { task, packageJson ->
212-
// We're reading the package.json at configuration time to properly feed
213-
// the `jsRootDir` @Input property of this task & the onlyIf. Therefore, the
214-
// parsePackageJson should be invoked inside this lambda.
215-
val parsedPackageJson = packageJson?.let { JsonUtils.fromPackageJson(it) }
216-
val jsSrcsDirInPackageJson = parsedPackageJson?.codegenConfig?.jsSrcsDir
217-
218-
if (packageJson != null && jsSrcsDirInPackageJson != null) {
219-
task.jsRootDir.set(File(packageJson.parentFile, jsSrcsDirInPackageJson))
220-
} else {
221-
task.jsRootDir.set(localExtension.jsRootDir)
222-
}
223-
},
224-
configureCodegenArtifacts = { task, _ ->
225-
task.codegenJavaPackageName.set(localExtension.codegenJavaPackageName)
226-
task.libraryName.set(localExtension.libraryName)
227-
},
228-
onlyIf = { packageJson ->
229-
// Please note that needsCodegenFromPackageJson is triggering a read of the
230-
// package.json at configuration time as we need to feed the onlyIf condition of this
231-
// task. Therefore, needsCodegenFromPackageJson needs to be invoked inside this
232-
// lambda.
233-
val needsCodegenFromPackageJson =
234-
project.needsCodegenFromPackageJson(rootExtension.root)
235-
val parsedPackageJson = packageJson?.let { JsonUtils.fromPackageJson(it) }
236-
val includesGeneratedCode =
237-
parsedPackageJson?.codegenConfig?.includesGeneratedCode ?: false
238-
(isLibrary || needsCodegenFromPackageJson) && !includesGeneratedCode
239-
},
240-
)
203+
val generateCodegenArtifactsTask = registerCodegenTasks(
204+
project = project,
205+
rootExtension = rootExtension,
206+
generatedSrcDir = generatedSrcDir,
207+
packageJsonFile = { findPackageJsonFile(project, rootExtension.root) },
208+
schemaTaskName = "generateCodegenSchemaFromJavaScript",
209+
artifactsTaskName = "generateCodegenArtifactsFromSchema",
210+
configureJsRoot = { task, packageJson ->
211+
// We're reading the package.json at configuration time to properly feed
212+
// the `jsRootDir` @Input property of this task & the onlyIf. Therefore, the
213+
// parsePackageJson should be invoked inside this lambda.
214+
val parsedPackageJson = packageJson?.let { JsonUtils.fromPackageJson(it) }
215+
val jsSrcsDirInPackageJson = parsedPackageJson?.codegenConfig?.jsSrcsDir
216+
217+
if (packageJson != null && jsSrcsDirInPackageJson != null) {
218+
task.jsRootDir.set(File(packageJson.parentFile, jsSrcsDirInPackageJson))
219+
} else {
220+
task.jsRootDir.set(localExtension.jsRootDir)
221+
}
222+
},
223+
configureCodegenArtifacts = { task, _ ->
224+
task.codegenJavaPackageName.set(localExtension.codegenJavaPackageName)
225+
task.libraryName.set(localExtension.libraryName)
226+
},
227+
onlyIf = { packageJson ->
228+
// Please note that needsCodegenFromPackageJson is triggering a read of the
229+
// package.json at configuration time as we need to feed the onlyIf condition of this
230+
// task. Therefore, needsCodegenFromPackageJson needs to be invoked inside this
231+
// lambda.
232+
val needsCodegenFromPackageJson = project.needsCodegenFromPackageJson(rootExtension.root)
233+
val parsedPackageJson = packageJson?.let { JsonUtils.fromPackageJson(it) }
234+
val includesGeneratedCode =
235+
parsedPackageJson?.codegenConfig?.includesGeneratedCode ?: false
236+
(isLibrary || needsCodegenFromPackageJson) && !includesGeneratedCode
237+
},
238+
)
241239

242240
// We update the android configuration to include the generated sources.
243241
// This is equivalent to this DSL:
@@ -355,14 +353,13 @@ class ReactPlugin : Plugin<Project> {
355353
project.rootProject.layout.buildDirectory.file("generated/autolinking/autolinking.json")
356354
val pureCxxDependencies =
357355
getPureCxxCodegenDependencies(rootGeneratedAutolinkingFile.get().asFile)
358-
val pureCxxCodegenTasks =
359-
configurePureCxxDependenciesCodegen(
360-
project,
361-
extension,
362-
rootExtension,
363-
generatedPureCxxSourceDir,
364-
pureCxxDependencies,
365-
)
356+
val pureCxxCodegenTasks = configurePureCxxDependenciesCodegen(
357+
project,
358+
extension,
359+
rootExtension,
360+
generatedPureCxxSourceDir,
361+
pureCxxDependencies,
362+
)
366363

367364
// We add a task called generateAutolinkingPackageList to do not clash with the existing task
368365
// called generatePackageList. This can to be renamed once we unlink the rn <-> cli

‎packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/BundleHermesCTask.kt‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,12 @@ abstract class BundleHermesCTask : DefaultTask() {
109109

110110
val reactNativeDir = reactNativeDir.get().asFile
111111
val composeScriptFile = File(reactNativeDir, "scripts/compose-source-maps.js")
112-
val composeSourceMapsCommand =
113-
getComposeSourceMapsCommand(
114-
composeScriptFile,
115-
packagerSourceMap,
116-
compilerSourceMap,
117-
outputSourceMap,
118-
)
112+
val composeSourceMapsCommand = getComposeSourceMapsCommand(
113+
composeScriptFile,
114+
packagerSourceMap,
115+
compilerSourceMap,
116+
outputSourceMap,
117+
)
119118
runCommand(composeSourceMapsCommand)
120119
}
121120
}

‎packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/PathUtils.kt‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,14 @@ import org.gradle.api.file.DirectoryProperty
2525
*
2626
* @param config The [ReactExtension] configured for this project
2727
*/
28-
internal fun detectedEntryFile(config: ReactExtension, envVariableOverride: String? = null): File =
29-
detectEntryFile(
30-
entryFile = config.entryFile.orNull?.asFile,
31-
reactRoot = config.root.get().asFile,
32-
envVariableOverride = envVariableOverride,
33-
)
28+
internal fun detectedEntryFile(
29+
config: ReactExtension,
30+
envVariableOverride: String? = null,
31+
): File = detectEntryFile(
32+
entryFile = config.entryFile.orNull?.asFile,
33+
reactRoot = config.root.get().asFile,
34+
envVariableOverride = envVariableOverride,
35+
)
3436

3537
/**
3638
* Computes the CLI file for React Native. The Algo follows this order:
@@ -39,12 +41,11 @@ internal fun detectedEntryFile(config: ReactExtension, envVariableOverride: Stri
3941
* 3. The `node_modules/react-native/cli.js` file if exists
4042
* 4. Fails otherwise
4143
*/
42-
internal fun detectedCliFile(config: ReactExtension): File =
43-
detectCliFile(
44-
project = config.project,
45-
reactNativeRoot = config.root.get().asFile,
46-
preconfiguredCliFile = config.cliFile.asFile.orNull,
47-
)
44+
internal fun detectedCliFile(config: ReactExtension): File = detectCliFile(
45+
project = config.project,
46+
reactNativeRoot = config.root.get().asFile,
47+
preconfiguredCliFile = config.cliFile.asFile.orNull,
48+
)
4849

4950
/**
5051
* Computes the `hermesc` command location. The Algo follows this order:

‎packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/ReactPluginTest.kt‎

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,11 @@ class ReactPluginTest {
127127

128128
@Test
129129
fun taskNameSuffixForDependency_withNonAlphanumericCharacters_encodesThem() {
130-
val dependency =
131-
ModelAutolinkingDependenciesJson(
132-
root = "./node_modules/@foo/bar-baz",
133-
name = "@foo/bar-baz",
134-
platforms = null,
135-
)
130+
val dependency = ModelAutolinkingDependenciesJson(
131+
root = "./node_modules/@foo/bar-baz",
132+
name = "@foo/bar-baz",
133+
platforms = null,
134+
)
136135

137136
val result = ReactPlugin().taskNameSuffixForDependency(dependency)
138137

@@ -144,12 +143,11 @@ class ReactPluginTest {
144143
val plugin = ReactPlugin()
145144
val suffixes =
146145
listOf("@foo/bar", "foo.bar", "foo-bar", "foo_bar", "foo_45_bar").map { name ->
147-
val dependency =
148-
ModelAutolinkingDependenciesJson(
149-
root = "./node_modules/$name",
150-
name = name,
151-
platforms = null,
152-
)
146+
val dependency = ModelAutolinkingDependenciesJson(
147+
root = "./node_modules/$name",
148+
name = name,
149+
platforms = null,
150+
)
153151

154152
plugin.taskNameSuffixForDependency(dependency)
155153
}
@@ -159,12 +157,11 @@ class ReactPluginTest {
159157

160158
@Test
161159
fun taskNameSuffixForDependency_withLocalModuleRoot_usesPackageName() {
162-
val dependency =
163-
ModelAutolinkingDependenciesJson(
164-
root = "./modules/local-module",
165-
name = "local-module",
166-
platforms = null,
167-
)
160+
val dependency = ModelAutolinkingDependenciesJson(
161+
root = "./modules/local-module",
162+
name = "local-module",
163+
platforms = null,
164+
)
168165

169166
val result = ReactPlugin().taskNameSuffixForDependency(dependency)
170167

‎packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/model/ModelAutolinkingDependenciesJsonTest.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ class ModelAutolinkingDependenciesJsonTest {
3636
assertThat(ModelAutolinkingDependenciesJson("", "@react-native/package", null).nameCleansed)
3737
.isEqualTo("react-native_package")
3838
assertThat(
39-
ModelAutolinkingDependenciesJson(
40-
"",
41-
"@this*is~a(more)complicated/example!of~weird)packages",
42-
null,
43-
)
44-
.nameCleansed
39+
ModelAutolinkingDependenciesJson(
40+
"",
41+
"@this*is~a(more)complicated/example!of~weird)packages",
42+
null,
4543
)
44+
.nameCleansed
45+
)
4646
.isEqualTo("this_is_a_more_complicated_example_of_weird_packages")
4747
}
4848
}

0 commit comments

Comments
 (0)