Skip to content

fix(android): handle corrupted autolinking cache #2865

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

Open
tido64 wants to merge 1 commit into
base: trunk
Choose a base branch
from
+17 −8
Open

fix(android): handle corrupted autolinking cache #2865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 16 additions & 8 deletions packages/app/android/autolink.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ import { mkdir_p, writeJSONFile } from "../scripts/utils/filesystem.mjs";
*/

/**
* Converts a dependency's name to a Gradle-valid target name.
* @note This function varies slightly from upstream because it handles more edge cases.
* @see {@link https://github.com/react/react-native/blob/924fb3de9bc9328c3315316fbb796b933be5bcbe/packages/react-native-gradle-plugin/shared/src/main/kotlin/com/facebook/react/model/ModelAutolinkingDependenciesJson.kt#L17}
* @param {string} name
* @returns {string}
Expand Down Expand Up @@ -90,7 +92,11 @@ async function loadConfig(json, projectRoot) {
const state = getCurrentState(projectRoot);
const stateFile = json.substring(0, json.length - "json".length) + "sha256";
if (fs.existsSync(stateFile) && readTextFile(stateFile) === state) {
return readJSONFile(json);
try {
return readJSONFile(json);
} catch (_) {
// Ignore; regenerate cache
}
}

const config = await loadContextAsync(projectRoot);
Expand All @@ -108,13 +114,15 @@ async function loadConfig(json, projectRoot) {
* @returns {Promise<void>}
*/
async function main(projectRoot, output) {
const config = await loadConfig(
output.replace(
/[/\\]app[/\\]build[/\\]generated[/\\]rnta[/\\]/,
"/build/generated/autolinking/"
),
projectRoot
);
const config = output
? await loadConfig(
output.replace(
/[/\\]app[/\\]build[/\\]generated[/\\]rnta[/\\]/,
"/build/generated/autolinking/"
),
projectRoot
)
: pruneDependencies(await loadContextAsync(projectRoot));
const dependencies = pickAndroidDependencies(config);

if (!output) {
Expand Down
1 change: 1 addition & 0 deletions packages/app/test/android/autolink.test.mts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ describe("cleanDependencyName()", () => {
);
equal(cleanDependencyName("@!'()*/~"), "_");
equal(cleanDependencyName("@!'(x)*/~y"), "_x_y");
equal(cleanDependencyName("@!'(x)*/~y/z"), "_x_y_z");
});
});

Expand Down
Loading