From 0038b22b1fb740c48f378cc8c05362888a901b40 Mon Sep 17 00:00:00 2001 From: Patrick Kabwe Date: Wed, 10 Sep 2025 13:36:56 +0200 Subject: [PATCH 1/2] chore: update nitro dependencies and commands to use 'nitrogen' instead of 'nitro-codegen' --- .github/actions/run-codegen-build/action.yml | 2 +- .github/dependabot.yml | 2 +- assets/template/.github/dependabot.yml | 2 +- assets/template/package.json | 6 +++--- src/generate-nitro-package.ts | 22 ++++++++++---------- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/actions/run-codegen-build/action.yml b/.github/actions/run-codegen-build/action.yml index dad86b80..56203388 100644 --- a/.github/actions/run-codegen-build/action.yml +++ b/.github/actions/run-codegen-build/action.yml @@ -14,7 +14,7 @@ runs: run: | set -euo pipefail cd "${{ inputs.working-directory }}" - bunx nitro-codegen --logLevel="debug" + bunx nitrogen --logLevel="debug" ${{ inputs.pm }} run build if [ -f post-script.js ]; then node post-script.js diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 4c54749d..ce03eff7 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -29,5 +29,5 @@ updates: - 'react-native' nitro: patterns: - - 'nitro-codegen' + - 'nitrogen' - 'react-native-nitro-modules' diff --git a/assets/template/.github/dependabot.yml b/assets/template/.github/dependabot.yml index 0a1c94ad..3167a0d7 100644 --- a/assets/template/.github/dependabot.yml +++ b/assets/template/.github/dependabot.yml @@ -52,5 +52,5 @@ updates: - '@react-native/*' nitro: patterns: - - 'nitro-codegen' + - 'nitrogen' - 'react-native-nitro-modules' diff --git a/assets/template/package.json b/assets/template/package.json index 00cc53ca..419d05f4 100644 --- a/assets/template/package.json +++ b/assets/template/package.json @@ -54,14 +54,14 @@ "@semantic-release/git": "^10.0.1", "@types/jest": "^29.5.12", "@types/react": "19.1.0", - "nitro-codegen": "^0.29.2", + "nitrogen": "^0.29.4", "react": "19.1.0", "react-native": "0.81.1", "react-native-builder-bob": "^0.37.0", - "react-native-nitro-modules": "^0.29.2", + "react-native-nitro-modules": "^0.2942", "conventional-changelog-conventionalcommits": "^9.1.0", "semantic-release": "^24.2.6", - "typescript": "5.0.4" + "typescript": "^5.8.3" }, "peerDependencies": { "react": "*", diff --git a/src/generate-nitro-package.ts b/src/generate-nitro-package.ts index e5e9fb3a..caaa25a0 100644 --- a/src/generate-nitro-package.ts +++ b/src/generate-nitro-package.ts @@ -180,16 +180,16 @@ export class NitroModuleFactory { newWorkspacePackageJsonFile.scripts = { ...newWorkspacePackageJsonFile.scripts, build: `${this.config.pm} run typecheck && bob build`, - codegen: `nitro-codegen --logLevel="debug" && ${this.config.pm} run build${this.config.langs.includes(SupportedLang.KOTLIN) ? ' && node post-script.js' : ''}`, + codegen: `nitrogen --logLevel="debug" && ${this.config.pm} run build${this.config.langs.includes(SupportedLang.KOTLIN) ? ' && node post-script.js' : ''}`, postcodegen: this.getPostCodegenScript(), } // Resolve and pin latest Nitro tools to concrete versions - const nitroGen = 'nitro-codegen' + const nitrogen = 'nitrogen' const nitroModules = 'react-native-nitro-modules' - const [nitroModulesVersion, nitroCodegenVersion] = await Promise.all([ + const [nitroModulesVersion, nitrogenVersion] = await Promise.all([ this.getLatestVersion(nitroModules), - this.getLatestVersion(nitroGen), + this.getLatestVersion(nitrogen), ]) this.nitroModulesVersion = nitroModulesVersion newWorkspacePackageJsonFile.devDependencies = { @@ -198,10 +198,10 @@ export class NitroModuleFactory { nitroModulesVersion ?? newWorkspacePackageJsonFile.devDependencies?.[nitroModules] ?? templatePackageJson.devDependencies[nitroModules], - [nitroGen]: - nitroCodegenVersion ?? - newWorkspacePackageJsonFile.devDependencies?.[nitroGen] ?? - templatePackageJson.devDependencies[nitroGen], + [nitrogen]: + nitrogenVersion ?? + newWorkspacePackageJsonFile.devDependencies?.[nitrogen] ?? + templatePackageJson.devDependencies[nitrogen], } newWorkspacePackageJsonFile.keywords = [ @@ -310,8 +310,8 @@ export class NitroModuleFactory { this.config.pm === 'bun' ? 'bunx' : this.config.pm === 'pnpm' - ? 'pnpx' - : 'npx -y' + ? 'pnpx' + : 'npx -y' const reactNativeVersion = templatePackageJson.devDependencies['react-native'] @@ -497,7 +497,7 @@ export class NitroModuleFactory { await execAsync(`${this.config.pm} install`, { cwd: this.config.cwd }) let packageManager = this.config.pm === 'npm' ? 'npx --yes' : this.config.pm - let codegenCommand = `${packageManager} nitro-codegen --logLevel="debug" && ${this.config.pm} run build${this.config.langs.includes(SupportedLang.KOTLIN) ? ' && node post-script.js' : ''}` + let codegenCommand = `${packageManager} nitrogen --logLevel="debug" && ${this.config.pm} run build${this.config.langs.includes(SupportedLang.KOTLIN) ? ' && node post-script.js' : ''}` await execAsync(codegenCommand, { cwd: this.config.cwd }) } From 5b7b94c5f8faa4478d344227706b5e7637967d91 Mon Sep 17 00:00:00 2001 From: Patrick Kabwe Date: Wed, 10 Sep 2025 13:37:19 +0200 Subject: [PATCH 2/2] refactor: adjust indentation in generate-nitro-package.ts for improved readability --- src/generate-nitro-package.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/generate-nitro-package.ts b/src/generate-nitro-package.ts index caaa25a0..4b680568 100644 --- a/src/generate-nitro-package.ts +++ b/src/generate-nitro-package.ts @@ -310,8 +310,8 @@ export class NitroModuleFactory { this.config.pm === 'bun' ? 'bunx' : this.config.pm === 'pnpm' - ? 'pnpx' - : 'npx -y' + ? 'pnpx' + : 'npx -y' const reactNativeVersion = templatePackageJson.devDependencies['react-native']