Skip to content

feat: replace {{ packageName }} in deps' configuration #871

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Mar 19, 2020
Merged

feat: replace {{ packageName }} in deps' configuration #871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6392b00
feat: replace {{ packageName }} in deps' packageImportPath
sjchmiela Nov 29, 2019
4ff2319
chore: extract interpolating to a separate function
sjchmiela Nov 29, 2019
2c64a99
feat: add support for templating in packageInstance too
sjchmiela Nov 29, 2019
5aa2c0c
docs: add paragraphs about interpolation
sjchmiela Nov 29, 2019
ba749c4
Update packages/platform-android/native_modules.gradle
sjchmiela Nov 29, 2019
7c85b64
Fix GH whitespace changes
sjchmiela Nov 29, 2019
d433e87
Make the change backwards-compatible
sjchmiela Feb 3, 2020
9553fd3
Update dependencies.md
grabbou Mar 19, 2020
b859432
Update native_modules.gradle
grabbou Mar 19, 2020
ef34d82
Update native_modules.gradle
grabbou Mar 19, 2020
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 changes: 1 addition & 1 deletion docs/dependencies.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ An array of iOS script phases to add to the project. Specifying a `path` propert
module.exports = {
dependency: {
platforms: {
ios: {
ios: {
scriptPhases: [
{
name: '[MY DEPENDENCY] My Script',
Expand Down
34 changes: 30 additions & 4 deletions packages/platform-android/native_modules.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,37 @@ class ReactNativeModules {
String packageClassInstances = ""

if (packages.size() > 0) {
packageImports = "import ${packageName}.BuildConfig;\nimport ${packageName}.R;\n\n"
packageImports = packageImports + packages.collect {
"// ${it.name}\n${it.packageImportPath}"
def interpolateDynamicValues = {
it
// Before adding the package replacement mechanism,
// BuildConfig and R classes were imported automatically
// into the scope of the file. We want to replace all
// non-FQDN references to those classes with the package name
// of the MainApplication.
//
// We want to match "R" or "BuildConfig":
// - new Package(R.string…),
// - Module.configure(BuildConfig);
// ^ hence including (BuildConfig|R)
// but we don't want to match "R":
// - new Package(getResources…),
// - new PackageR…,
// - new Royal…,
// ^ hence excluding \w before and after matches
// and "BuildConfig" that has FQDN reference:
// - Module.configure(com.acme.BuildConfig);
// ^ hence excluding . before the match.
.replaceAll(~/([^.\w])(BuildConfig|R)([^\w])/, {
wholeString, prefix, className, suffix ->
"${prefix}${packageName}.${className}${suffix}"
})
}
packageImports = packages.collect {
"// ${it.name}\n${interpolateDynamicValues(it.packageImportPath)}"
}.join('\n')
packageClassInstances = ",\n " + packages.collect { it.packageInstance }.join(",\n ")
packageClassInstances = ",\n " + packages.collect {
interpolateDynamicValues(it.packageInstance)
}.join(",\n ")
}

String generatedFileContents = generatedFileContentsTemplate
Expand Down