Merge branch '@atlj/unify-view-templates' into @atlj/diff-commentor

Author: atlj

docs/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.0.3](https://github.com/callstack/react-native-builder-bob/compare/[email protected]@0.0.3) (2023-10-19)
+
+**Note:** Version bump only for package docs
+
 ## 0.0.2 (2023-10-04)
 
 **Note:** Version bump only for package docs

docs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "docs",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "private": true,
   "description": "Documentation for react-native-builder-bob",
   "scripts": {

package.json

@@ -27,10 +27,10 @@
     "@lerna-lite/run": "^1.13.0",
     "commitlint": "^17.0.2",
     "concurrently": "^7.2.2",
-    "eslint": "^8.18.0",
-    "eslint-config-satya164": "^3.1.11",
-    "prettier": "^2.7.1",
-    "typescript": "^5.0.2"
+    "eslint": "^8.52.0",
+    "eslint-config-satya164": "^3.2.0",
+    "prettier": "^3.0.3",
+    "typescript": "^5.2.2"
   },
   "commitlint": {
     "extends": [

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

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.34.2](https://github.com/callstack/react-native-builder-bob/compare/[email protected]@0.34.2) (2023-10-19)
+
+**Note:** Version bump only for package create-react-native-library
+
 ## [0.34.1](https://github.com/callstack/react-native-builder-bob/compare/[email protected]@0.34.1) (2023-10-04)
 
 ### Bug Fixes

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

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

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

@@ -76,12 +76,6 @@ const SWIFT_FILES = {
   view_legacy: path.resolve(__dirname, '../templates/swift-view-legacy'),
 } as const;
 
-const CPP_VIEW_FILES = {
-  // view_legacy does NOT need component registration
-  view_mixed: path.resolve(__dirname, '../templates/cpp-view-mixed'),
-  view_new: path.resolve(__dirname, '../templates/cpp-view-new'),
-} as const;
-
 type ArgName =
   | 'slug'
   | 'description'
@@ -131,8 +125,8 @@ const LANGUAGE_CHOICES: {
   types: ProjectType[];
 }[] = [
   {
-    title: 'Java & Objective-C',
-    value: 'java-objc',
+    title: 'Kotlin & Objective-C',
+    value: 'kotlin-objc',
     types: [
       'module-legacy',
       'module-new',
@@ -143,8 +137,8 @@ const LANGUAGE_CHOICES: {
     ],
   },
   {
-    title: 'Kotlin & Objective-C',
-    value: 'kotlin-objc',
+    title: 'Java & Objective-C',
+    value: 'java-objc',
     types: [
       'module-legacy',
       'module-new',
@@ -155,13 +149,13 @@ const LANGUAGE_CHOICES: {
     ],
   },
   {
-    title: 'Java & Swift',
-    value: 'java-swift',
+    title: 'Kotlin & Swift',
+    value: 'kotlin-swift',
     types: ['module-legacy', 'view-legacy'],
   },
   {
-    title: 'Kotlin & Swift',
-    value: 'kotlin-swift',
+    title: 'Java & Swift',
+    value: 'java-swift',
     types: ['module-legacy', 'view-legacy'],
   },
   {
@@ -269,13 +263,15 @@ const args: Record<ArgName, yargs.Options> = {
   },
 };
 
+// FIXME: fix the type
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 async function create(argv: yargs.Arguments<any>) {
   let local = false;
 
   if (typeof argv.local === 'boolean') {
     local = argv.local;
   } else {
-    let hasPackageJson = await fs.pathExists(
+    const hasPackageJson = await fs.pathExists(
       path.join(process.cwd(), 'package.json')
     );
 
@@ -403,7 +399,7 @@ async function create(argv: yargs.Arguments<any>) {
       type: local ? null : 'text',
       name: 'authorUrl',
       message: 'What is the URL for the package author?',
-      // @ts-ignore: this is supported, but types are wrong
+      // @ts-expect-error this is supported, but types are wrong
       initial: async (previous: string) => {
         try {
           const username = await githubUsername(previous);
@@ -421,7 +417,6 @@ async function create(argv: yargs.Arguments<any>) {
       type: local ? null : 'text',
       name: 'repoUrl',
       message: 'What is the URL for the repository?',
-      // @ts-ignore: this is supported, but types are wrong
       initial: (_: string, answers: Answers) => {
         if (/^https?:\/\/github.com\/[^/]+/.test(answers.authorUrl)) {
           return `${answers.authorUrl}/${answers.slug
@@ -556,9 +551,9 @@ async function create(argv: yargs.Arguments<any>) {
 
   try {
     version = await Promise.race([
-      new Promise<string>((resolve) =>
-        setTimeout(() => resolve(FALLBACK_BOB_VERSION), 1000)
-      ),
+      new Promise<string>((resolve) => {
+        setTimeout(() => resolve(FALLBACK_BOB_VERSION), 1000);
+      }),
       spawn('npm', ['view', 'react-native-builder-bob', 'dist-tags.latest']),
     ]);
   } catch (e) {
@@ -747,12 +742,6 @@ async function create(argv: yargs.Arguments<any>) {
       await copyDir(CPP_FILES, folder);
       await fs.remove(path.join(folder, 'ios', `${options.project.name}.m`));
     }
-
-    if (moduleType === 'view') {
-      if (arch === 'new' || arch === 'mixed') {
-        await copyDir(CPP_VIEW_FILES[`${moduleType}_${arch}`], folder);
-      }
-    }
   }
 
   if (example !== 'none') {
@@ -882,8 +871,8 @@ async function create(argv: yargs.Arguments<any>) {
         .map(
           ([script, { name, color }]) => `
       ${kleur[color](`Run the example app on ${kleur.bold(name)}`)}${kleur.gray(
-            ':'
-          )}
+        ':'
+      )}
 
         ${kleur.gray('$')} yarn example ${script}`
         )
@@ -896,7 +885,7 @@ async function create(argv: yargs.Arguments<any>) {
     );
   }
 }
-// eslint-disable-next-line babel/no-unused-expressions
+
 yargs
   .command('$0 [name]', 'create a react native library', args, create)
   .demandCommand()

packages/create-react-native-library/templates/cpp-view-mixed/android/Android.mk

@@ -8,15 +8,8 @@
 import com.facebook.react.uimanager.ViewManagerDelegate;
 import com.facebook.react.viewmanagers.<%- project.name -%>ViewManagerDelegate;
 import com.facebook.react.viewmanagers.<%- project.name -%>ViewManagerInterface;
-import com.facebook.soloader.SoLoader;
 
 public abstract class <%- project.name -%>ViewManagerSpec<T extends View> extends SimpleViewManager<T> implements <%- project.name -%>ViewManagerInterface<T> {
-  static {
-    if (BuildConfig.CODEGEN_MODULE_REGISTRATION != null) {
-      SoLoader.loadLibrary(BuildConfig.CODEGEN_MODULE_REGISTRATION);
-    }
-  }
-
   private final ViewManagerDelegate<T> mDelegate;
 
   public <%- project.name -%>ViewManagerSpec() {

packages/create-react-native-library/templates/cpp-view-mixed/android/registration.cpp

@@ -11,19 +11,12 @@
 import com.facebook.react.uimanager.annotations.ReactProp;
 import com.facebook.react.viewmanagers.<%- project.name -%>ViewManagerDelegate;
 import com.facebook.react.viewmanagers.<%- project.name -%>ViewManagerInterface;
-import com.facebook.soloader.SoLoader;
 
 @ReactModule(name = <%- project.name -%>ViewManager.NAME)
 public class <%- project.name -%>ViewManager extends SimpleViewManager<<%- project.name -%>View> implements <%- project.name -%>ViewManagerInterface<<%- project.name -%>View> {
 
   public static final String NAME = "<%- project.name -%>View";
 
-  static {
-    if (BuildConfig.CODEGEN_MODULE_REGISTRATION != null) {
-      SoLoader.loadLibrary(BuildConfig.CODEGEN_MODULE_REGISTRATION);
-    }
-  }
-
   private final ViewManagerDelegate<<%- project.name -%>View> mDelegate;
 
   public <%- project.name -%>ViewManager() {

packages/create-react-native-library/templates/cpp-view-new/android/Android.mk

@@ -7,7 +7,6 @@ import com.facebook.react.uimanager.SimpleViewManager
 import com.facebook.react.uimanager.ViewManagerDelegate
 import com.facebook.react.viewmanagers.<%- project.name -%>ViewManagerDelegate
 import com.facebook.react.viewmanagers.<%- project.name -%>ViewManagerInterface
-import com.facebook.soloader.SoLoader
 
 abstract class <%- project.name -%>ViewManagerSpec<T : View> : SimpleViewManager<T>(), <%- project.name -%>ViewManagerInterface<T> {
   private val mDelegate: ViewManagerDelegate<T>
@@ -19,12 +18,4 @@ abstract class <%- project.name -%>ViewManagerSpec<T : View> : SimpleViewManager
   override fun getDelegate(): ViewManagerDelegate<T>? {
     return mDelegate
   }
-
-  companion object {
-    init {
-      if (BuildConfig.CODEGEN_MODULE_REGISTRATION != null) {
-        SoLoader.loadLibrary(BuildConfig.CODEGEN_MODULE_REGISTRATION)
-      }
-    }
-  }
 }

packages/create-react-native-library/templates/cpp-view-new/android/registration.cpp

@@ -8,7 +8,6 @@ import com.facebook.react.uimanager.ViewManagerDelegate
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.viewmanagers.<%- project.name -%>ViewManagerInterface
 import com.facebook.react.viewmanagers.<%- project.name -%>ViewManagerDelegate
-import com.facebook.soloader.SoLoader
 
 @ReactModule(name = <%- project.name -%>ViewManager.NAME)
 class <%- project.name -%>ViewManager : SimpleViewManager<<%- project.name -%>View>(),
@@ -38,11 +37,5 @@ class <%- project.name -%>ViewManager : SimpleViewManager<<%- project.name -%>Vi
 
   companion object {
     const val NAME = "<%- project.name -%>View"
-
-    init {
-      if (BuildConfig.CODEGEN_MODULE_REGISTRATION != null) {
-        SoLoader.loadLibrary(BuildConfig.CODEGEN_MODULE_REGISTRATION)
-      }
-    }
   }
 }