Merge branch 'main' into main

Author: riteshshukla04

.github/workflows/build-templates.yml

@@ -30,44 +30,30 @@ jobs:
           - ubuntu-latest
           - macos-14 # macos latest defaults to macos 12 at the moment.
         type:
-          - module-legacy
-          - module-new
-          - view-legacy
-          - view-new
+          - turbo-module
+          - fabric-view
+          - legacy-module
+          - legacy-view
         language:
           - kotlin-objc
           - kotlin-swift
-        arch:
-          - auto
+          - cpp
         exclude:
-          - type: module-new
+          - type: turbo-module
             language: kotlin-swift
-          - type: view-new
+          - type: fabric-view
             language: kotlin-swift
+          - type: fabric-view
+            language: cpp
+          - type: legacy-view
+            language: cpp
         include:
           - os: ubuntu-latest
             type: library
             language: js
-            arch: auto
-          - os: ubuntu-latest
-            type: module-legacy
-            language: cpp
-            arch: auto
-          - os: ubuntu-latest
-            type: module-new
-            language: cpp
-            arch: auto
-          - os: macos-14
-            type: module-legacy
-            language: cpp
-            arch: auto
-          - os: macos-14
-            type: module-new
-            language: cpp
-            arch: auto
 
     concurrency:
-      group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.os }}-${{ matrix.type }}-${{ matrix.language }}-${{ matrix.arch }}
+      group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.os }}-${{ matrix.type }}-${{ matrix.language }}
       cancel-in-progress: true
 
     runs-on: ${{ matrix.os }}
@@ -79,20 +65,13 @@ jobs:
       - name: Setup
         uses: ./.github/actions/setup
 
-      - name: Set environment variables
-        run: |
-          if [[ "${{ matrix.arch }}" == "new" ]]; then
-            echo "RCT_NEW_ARCH_ENABLED=1" >> $GITHUB_ENV
-            echo "ORG_GRADLE_PROJECT_newArchEnabled=true" >> $GITHUB_ENV
-          fi
-
       - name: Build package
         run: |
           yarn workspace create-react-native-library prepare
 
       - name: Get working directory
         run: |
-          echo "work_dir=${{ matrix.os }}-${{ matrix.type }}-${{ matrix.language }}-${{ matrix.arch }}" >> $GITHUB_ENV
+          echo "work_dir=${{ matrix.os }}-${{ matrix.type }}-${{ matrix.language }}" >> $GITHUB_ENV
 
       - name: Create library
         run: |
@@ -142,14 +121,14 @@ jobs:
         run: |
           # Build Android for only some matrices to skip redundant builds
           if [[ ${{ matrix.os }} == ubuntu-latest ]]; then
-            if [[ ${{ matrix.type }} == view-* && ${{ matrix.language }} == *-objc ]] || [[ ${{ matrix.type }} == module-* && ${{ matrix.language }} == *-objc ]] || [[ ${{ matrix.type }} == module-* && ${{ matrix.language }} == cpp ]]; then
+            if [[ ${{ matrix.type }} == *-view && ${{ matrix.language }} == *-objc ]] || [[ ${{ matrix.type }} == *-module && ${{ matrix.language }} == *-objc ]] || [[ ${{ matrix.type }} == *-module && ${{ matrix.language }} == cpp ]]; then
               echo "android_build=1" >> $GITHUB_ENV
             fi
           fi
 
           # Build iOS for only some matrices to skip redundant builds
           if [[ ${{ matrix.os }} == macos-14 ]]; then
-            if [[ ${{ matrix.type }} == view-* && ${{ matrix.language }} == kotlin-* ]] || [[ ${{ matrix.type }} == module-* && ${{ matrix.language }} == kotlin-* ]] || [[ ${{ matrix.type }} == module-* && ${{ matrix.language }} == cpp ]]; then
+            if [[ ${{ matrix.type }} == *-view && ${{ matrix.language }} == kotlin-* ]] || [[ ${{ matrix.type }} == *-module && ${{ matrix.language }} == kotlin-* ]] || [[ ${{ matrix.type }} == *-module && ${{ matrix.language }} == cpp ]]; then
               echo "ios_build=1" >> $GITHUB_ENV
             fi
           fi
@@ -160,9 +139,9 @@ jobs:
         with:
           path: |
             ${{ env.work_dir }}/.turbo
-          key: ${{ runner.os }}-library-turborepo-${{ matrix.type }}-${{ matrix.language }}-${{ matrix.arch }}-${{ hashFiles(format('{0}/yarn.lock', env.work_dir)) }}
+          key: ${{ runner.os }}-library-turborepo-${{ matrix.type }}-${{ matrix.language }}-${{ hashFiles(format('{0}/yarn.lock', env.work_dir)) }}
           restore-keys: |
-            ${{ runner.os }}-library-turborepo-${{ matrix.type }}-${{ matrix.language }}-${{ matrix.arch }}-
+            ${{ runner.os }}-library-turborepo-${{ matrix.type }}-${{ matrix.language }}-
 
       - name: Check turborepo cache
         if: env.android_build == 1 || env.ios_build == 1

packages/create-react-native-library/CHANGELOG.md

@@ -3,6 +3,36 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.45.5](https://github.com/callstack/react-native-builder-bob/compare/[email protected]@0.45.5) (2024-12-09)
+
+### Bug Fixes
+
+- don't crash if resolving version fails ([a403f14](https://github.com/callstack/react-native-builder-bob/commit/a403f149d2c578b5dcf524951f29b2aa0baa9619)) - by @satya164
+- don't create example app for local library ([4f64b22](https://github.com/callstack/react-native-builder-bob/commit/4f64b22d19fee8a28f4c6541b7413b6de14eba1a)) - by @satya164
+- improve example app descriptions ([b8c3293](https://github.com/callstack/react-native-builder-bob/commit/b8c32937b1a7dd98d6322c5b0377ad9fa2ed44d4)) - by @satya164
+- validate arguments correctly ([#724](https://github.com/callstack/react-native-builder-bob/issues/724)) ([a34d80f](https://github.com/callstack/react-native-builder-bob/commit/a34d80fcf76aff1e3797f1ca1fd586fce7900731)) - by @satya164
+
+## [0.45.4](https://github.com/callstack/react-native-builder-bob/compare/[email protected]@0.45.4) (2024-12-08)
+
+### Bug Fixes
+
+- don't crash if resolving version fails ([a403f14](https://github.com/callstack/react-native-builder-bob/commit/a403f149d2c578b5dcf524951f29b2aa0baa9619)) - by @satya164
+- validate arguments correctly ([#724](https://github.com/callstack/react-native-builder-bob/issues/724)) ([a34d80f](https://github.com/callstack/react-native-builder-bob/commit/a34d80fcf76aff1e3797f1ca1fd586fce7900731)) - by @satya164
+
+## [0.45.3](https://github.com/callstack/react-native-builder-bob/compare/[email protected]@0.45.3) (2024-12-06)
+
+### Bug Fixes
+
+- fix codegen script failing due to missing platforms ([86c5c67](https://github.com/callstack/react-native-builder-bob/commit/86c5c67656712a990f2dd1c9eda761c7082d52e6)) - by @satya164
+
+## [0.45.2](https://github.com/callstack/react-native-builder-bob/compare/[email protected]@0.45.2) (2024-12-06)
+
+**Note:** Version bump only for package create-react-native-library
+
+## [0.45.1](https://github.com/callstack/react-native-builder-bob/compare/[email protected]@0.45.1) (2024-12-06)
+
+**Note:** Version bump only for package create-react-native-library
+
 # [0.45.0](https://github.com/callstack/react-native-builder-bob/compare/[email protected]@0.45.0) (2024-12-04)
 
 ### Bug Fixes

packages/create-react-native-library/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-react-native-library",
-  "version": "0.45.0",
+  "version": "0.45.5",
   "description": "CLI to scaffold React Native libraries",
   "keywords": [
     "react-native",

packages/create-react-native-library/src/index.ts

@@ -3,12 +3,12 @@ import fs from 'fs-extra';
 import kleur from 'kleur';
 import yargs from 'yargs';
 import ora from 'ora';
-import prompts from './utils/prompts';
+import { prompt } from './utils/prompt';
 import generateExampleApp from './exampleApp/generateExampleApp';
 import { addCodegenBuildScript } from './exampleApp/addCodegenBuildScript';
 import { createInitialGitCommit } from './utils/initialCommit';
 import { assertUserInput, assertNpxExists } from './utils/assert';
-import { resolveBobVersionWithFallback } from './utils/promiseWithFallback';
+import { resolveNpmPackageVersion } from './utils/resolveNpmPackageVersion';
 import { applyTemplates, generateTemplateConfiguration } from './template';
 import {
   createQuestions,
@@ -44,7 +44,10 @@ async function create(_argv: yargs.Arguments<Args>) {
   const { _, $0, ...argv } = _argv;
 
   // Prefetch bob version in background while asking questions
-  const resolveBobVersion = resolveBobVersionWithFallback(FALLBACK_BOB_VERSION);
+  const bobVersionPromise = resolveNpmPackageVersion(
+    'react-native-builder-bob',
+    FALLBACK_BOB_VERSION
+  );
 
   const local = await promptLocalLibrary(argv);
   const folder = await promptPath(argv, local);
@@ -53,26 +56,19 @@ async function create(_argv: yargs.Arguments<Args>) {
 
   const basename = path.basename(folder);
 
-  const { questions, singleChoiceAnswers } = await createQuestions({
-    basename,
-    local,
-    argv,
-  });
+  const questions = await createQuestions({ basename, local });
 
   assertUserInput(questions, argv);
 
-  const promptAnswers = await prompts(questions);
-
-  const answers = {
-    ...argv,
-    local,
-    ...singleChoiceAnswers,
+  const promptAnswers = await prompt(questions, argv);
+  const answers: Answers = {
     ...promptAnswers,
-  } as Required<Answers>;
+    local,
+  };
 
   assertUserInput(questions, answers);
 
-  const bobVersion = await resolveBobVersion();
+  const bobVersion = await bobVersionPromise;
 
   const config = generateTemplateConfiguration({
     bobVersion,
@@ -121,7 +117,7 @@ async function create(_argv: yargs.Arguments<Args>) {
       : devDependencies;
   }
 
-  if (config.example === 'vanilla' && config.project.arch !== 'legacy') {
+  if (config.example === 'vanilla' && config.project.arch === 'new') {
     addCodegenBuildScript(folder);
   }
 
@@ -158,7 +154,7 @@ async function promptLocalLibrary(argv: Args) {
 
     if (hasPackageJson) {
       // If we're under a project with package.json, ask the user if they want to create a local library
-      const answers = await prompts({
+      const answers = await prompt({
         type: 'confirm',
         name: 'local',
         message: `Looks like you're under a project folder. Do you want to create a local library?`,
@@ -178,7 +174,7 @@ async function promptPath(argv: Args, local: boolean) {
   if (argv.name && !local) {
     folder = path.join(process.cwd(), argv.name);
   } else {
-    const answers = await prompts({
+    const answers = await prompt({
       type: 'text',
       name: 'folder',
       message: `Where do you want to create the library?`,

packages/create-react-native-library/src/inform.ts

@@ -54,7 +54,7 @@ export async function printNextSteps(
             )} to link the library\n`
           : `- Link the library at ${kleur.blue(
               path.relative(process.cwd(), folder)
-            )} based on your project setup'\n`) +
+            )} based on your project setup\n`) +
         `- Run ${kleur.blue(
           'pod install --project-directory=ios'
         )} to install dependencies with CocoaPods\n` +