feat: add kotlin support to the fabric template

Author: satya164

.github/workflows/build-templates.yml

@@ -33,14 +33,10 @@ jobs:
             language: java-swift
           - type: module-mixed
             language: kotlin-swift
-          - type: view-new
-            language: kotlin-objc
           - type: view-new
             language: java-swift
           - type: view-new
             language: kotlin-swift
-          - type: view-mixed
-            language: kotlin-objc
           - type: view-mixed
             language: java-swift
           - type: view-mixed
@@ -90,7 +86,7 @@ jobs:
         run: |
           WORK_DIR=tmp-${{ matrix.type }}-${{ matrix.language }}
 
-          EXPERIMENTAL_FABRIC_ENABLED=1 ./packages/create-react-native-library/bin/create-react-native-library "$WORK_DIR" \
+          ./packages/create-react-native-library/bin/create-react-native-library "$WORK_DIR" \
             --slug @bob/react-native-test \
             --description test \
             --author-name test \

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

@@ -55,6 +55,8 @@ const KOTLIN_FILES = {
   module_new: path.resolve(__dirname, '../templates/kotlin-library-new'),
   module_mixed: path.resolve(__dirname, '../templates/kotlin-library-mixed'),
   view_legacy: path.resolve(__dirname, '../templates/kotlin-view-legacy'),
+  view_mixed: path.resolve(__dirname, '../templates/kotlin-view-mixed'),
+  view_new: path.resolve(__dirname, '../templates/kotlin-view-new'),
 } as const;
 
 const SWIFT_FILES = {
@@ -108,11 +110,7 @@ const LANGUAGE_CHOICES: {
   types?: ProjectType[];
 }[] = [
   { title: 'Java & Objective-C', value: 'java-objc' },
-  {
-    title: 'Kotlin & Objective-C',
-    value: 'kotlin-objc',
-    types: ['module-legacy', 'module-mixed', 'module-new', 'view-legacy'],
-  },
+  { title: 'Kotlin & Objective-C', value: 'kotlin-objc' },
   {
     title: 'Java & Swift',
     value: 'java-swift',
@@ -168,20 +166,16 @@ const TYPE_CHOICES: {
     value: 'module-new',
     description: NEWARCH_DESCRIPTION,
   },
-  ...(process.env.EXPERIMENTAL_FABRIC_ENABLED === '1'
-    ? ([
-        {
-          title: 'Fabric view with backward compat',
-          value: 'view-mixed',
-          description: BACKCOMPAT_DESCRIPTION,
-        },
-        {
-          title: 'Fabric view',
-          value: 'view-new',
-          description: NEWARCH_DESCRIPTION,
-        },
-      ] as const)
-    : []),
+  {
+    title: 'Fabric view with backward compat',
+    value: 'view-mixed',
+    description: BACKCOMPAT_DESCRIPTION,
+  },
+  {
+    title: 'Fabric view',
+    value: 'view-new',
+    description: NEWARCH_DESCRIPTION,
+  },
 ];
 
 const args: Record<ArgName, yargs.Options> = {
@@ -585,18 +579,7 @@ async function create(argv: yargs.Arguments<any>) {
     const templateType = `${moduleType}_${architecture}` as const;
 
     if (options.project.kotlin) {
-      switch (templateType) {
-        case 'module_legacy':
-        case 'module_mixed':
-        case 'module_new':
-        case 'view_legacy':
-          await copyDir(KOTLIN_FILES[templateType], folder);
-          break;
-        default:
-          throw new Error(
-            `Kotlin template for ${templateType} has not been implemented`
-          );
-      }
+      await copyDir(KOTLIN_FILES[templateType], folder);
     } else {
       await copyDir(JAVA_FILES[templateType], folder);
     }

packages/create-react-native-library/templates/java-library-legacy/android/src/main/java/com/{%- project.package_dir %}/{%- project.name %}Module.java

@@ -1,4 +1,4 @@
-package com.<%- project.package -%>;
+package com.<%- project.package %>;
 
 import androidx.annotation.NonNull;
 

packages/create-react-native-library/templates/java-library-legacy/android/src/main/java/com/{%- project.package_dir %}/{%- project.name %}Package.java

@@ -1,4 +1,4 @@
-package com.<%- project.package -%>;
+package com.<%- project.package %>;
 
 import androidx.annotation.NonNull;
 

packages/create-react-native-library/templates/java-library-mixed/android/src/main/java/com/{%- project.package_dir %}/{%- project.name %}Module.java

@@ -1,6 +1,7 @@
-package com.<%- project.package -%>;
+package com.<%- project.package %>;
 
 import androidx.annotation.NonNull;
+
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactMethod;

packages/create-react-native-library/templates/java-library-mixed/android/src/main/java/com/{%- project.package_dir %}/{%- project.name %}Package.java

@@ -1,6 +1,7 @@
-package com.<%- project.package -%>;
+package com.<%- project.package %>;
 
 import androidx.annotation.Nullable;
+
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.module.model.ReactModuleInfo;

packages/create-react-native-library/templates/java-library-mixed/android/src/turbo/{%- project.name %}Spec.java renamed to packages/create-react-native-library/templates/java-library-mixed/android/src/newarch/{%- project.name %}Spec.java

@@ -1,4 +1,4 @@
-package com.<%- project.package -%>;
+package com.<%- project.package %>;
 
 import com.facebook.react.bridge.ReactApplicationContext;
 

packages/create-react-native-library/templates/java-library-mixed/android/src/legacy/{%- project.name %}Spec.java renamed to packages/create-react-native-library/templates/java-library-mixed/android/src/oldarch/{%- project.name %}Spec.java

@@ -1,4 +1,4 @@
-package com.<%- project.package -%>;
+package com.<%- project.package %>;
 
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;

packages/create-react-native-library/templates/java-library-new/android/src/main/java/com/{%- project.package_dir %}/{%- project.name %}Module.java

@@ -1,4 +1,4 @@
-package com.<%- project.package -%>;
+package com.<%- project.package %>;
 
 import androidx.annotation.NonNull;
 

packages/create-react-native-library/templates/java-library-new/android/src/main/java/com/{%- project.package_dir %}/{%- project.name %}Package.java

@@ -1,6 +1,7 @@
-package com.<%- project.package -%>;
+package com.<%- project.package %>;
 
 import androidx.annotation.Nullable;
+
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.module.model.ReactModuleInfo;

packages/create-react-native-library/templates/java-view-legacy/android/src/main/java/com/{%- project.package_dir %}/{%- project.name %}Package.java

@@ -1,4 +1,4 @@
-package com.<%- project.package -%>;
+package com.<%- project.package %>;
 
 import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.NativeModule;

packages/create-react-native-library/templates/java-view-legacy/android/src/main/java/com/{%- project.package_dir %}/{%- project.name %}ViewManager.java

@@ -1,4 +1,4 @@
-package com.<%- project.package -%>;
+package com.<%- project.package %>;
 
 import android.graphics.Color;
 import android.view.View;

packages/create-react-native-library/templates/java-view-mixed/android/src/main/java/com/{%- project.package_dir %}/{%- project.name %}View.java

@@ -1,6 +1,7 @@
-package com.<%- project.package -%>;
+package com.<%- project.package %>;
 
 import androidx.annotation.Nullable;
+
 import android.content.Context;
 import android.util.AttributeSet;
 

packages/create-react-native-library/templates/java-view-mixed/android/src/main/java/com/{%- project.package_dir %}/{%- project.name %}ViewManager.java

@@ -1,10 +1,9 @@
-package com.<%- project.package -%>;
+package com.<%- project.package %>;
 
 import android.graphics.Color;
 
 import androidx.annotation.Nullable;
 
-import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.annotations.ReactProp;
@@ -14,10 +13,6 @@ public class <%- project.name -%>ViewManager extends <%- project.name -%>ViewMan
 
   public static final String NAME = "<%- project.name -%>View";
 
-  public <%- project.name -%>ViewManager(ReactApplicationContext reactContext) {
-    super(reactContext);
-  }
-
   @Override
   public String getName() {
     return NAME;

packages/create-react-native-library/templates/java-view-mixed/android/src/main/java/com/{%- project.package_dir %}/{%- project.name %}ViewPackage.java

@@ -1,5 +1,5 @@
 <% /* TODO: try to migrate it to TurboReactPackage */ %>
-package com.<%- project.package -%>;
+package com.<%- project.package %>;
 
 import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.NativeModule;
@@ -14,7 +14,7 @@ public class <%- project.name -%>ViewPackage implements ReactPackage {
   @Override
   public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
     List<ViewManager> viewManagers = new ArrayList<>();
-    viewManagers.add(new <%- project.name -%>ViewManager(reactContext));
+    viewManagers.add(new <%- project.name -%>ViewManager());
     return viewManagers;
   }
 

packages/create-react-native-library/templates/java-view-mixed/android/src/turbo/{%- project.name %}ViewManagerSpec.java renamed to packages/create-react-native-library/templates/java-view-mixed/android/src/newarch/{%- project.name %}ViewManagerSpec.java

@@ -1,8 +1,9 @@
-package com.<%- project.package -%>;
+package com.<%- project.package %>;
 
 import android.view.View;
 
-import com.facebook.react.bridge.ReactApplicationContext;
+import androidx.annotation.Nullable;
+
 import com.facebook.react.uimanager.SimpleViewManager;
 import com.facebook.react.uimanager.ViewManagerDelegate;
 import com.facebook.react.viewmanagers.<%- project.name -%>ViewManagerDelegate;
@@ -11,10 +12,11 @@
 public abstract class <%- project.name -%>ViewManagerSpec<T extends View> extends SimpleViewManager<T> implements <%- project.name -%>ViewManagerInterface<T> {
   private final ViewManagerDelegate<T> mDelegate;
 
-  public <%- project.name -%>ViewManagerSpec(ReactApplicationContext context) {
+  public <%- project.name -%>ViewManagerSpec() {
     mDelegate = new <%- project.name -%>ViewManagerDelegate(this);
   }
 
+  @Nullable
   @Override
   protected ViewManagerDelegate<T> getDelegate() {
     return mDelegate;

packages/create-react-native-library/templates/java-view-mixed/android/src/legacy/{%- project.name %}ViewManagerSpec.java renamed to packages/create-react-native-library/templates/java-view-mixed/android/src/oldarch/{%- project.name %}ViewManagerSpec.java

@@ -1,4 +1,4 @@
-package com.<%- project.package -%>;
+package com.<%- project.package %>;
 
 import android.view.View;
 
@@ -8,9 +8,5 @@
 import com.facebook.react.uimanager.SimpleViewManager;
 
 public abstract class <%- project.name -%>ViewManagerSpec<T extends View> extends SimpleViewManager<T> {
-  public <%- project.name -%>ViewManagerSpec(ReactApplicationContext context) {
-    super();
-  }
-
   public abstract void setColor(T view, @Nullable String value);
 }

packages/create-react-native-library/templates/java-view-new/android/src/main/java/com/{%- project.package_dir %}/{%- project.name %}View.java

@@ -1,6 +1,7 @@
-package com.<%- project.package -%>;
+package com.<%- project.package %>;
 
 import androidx.annotation.Nullable;
+
 import android.content.Context;
 import android.util.AttributeSet;
 

packages/create-react-native-library/templates/java-view-new/android/src/main/java/com/{%- project.package_dir %}/{%- project.name %}ViewManager.java

@@ -1,13 +1,14 @@
-package com.<%- project.package -%>;
+package com.<%- project.package %>;
 
 import android.graphics.Color;
 
+import androidx.annotation.Nullable;
+
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.uimanager.SimpleViewManager;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.ViewManagerDelegate;
 import com.facebook.react.uimanager.annotations.ReactProp;
-import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.viewmanagers.<%- project.name -%>ViewManagerDelegate;
 import com.facebook.react.viewmanagers.<%- project.name -%>ViewManagerInterface;
 
@@ -18,10 +19,11 @@ public class <%- project.name -%>ViewManager extends SimpleViewManager<<%- proje
 
   private final ViewManagerDelegate<<%- project.name -%>View> mDelegate;
 
-  public <%- project.name -%>ViewManager(ReactApplicationContext context) {
+  public <%- project.name -%>ViewManager() {
     mDelegate = new <%- project.name -%>ViewManagerDelegate(this);
   }
 
+  @Nullable
   @Override
   protected ViewManagerDelegate<<%- project.name -%>View> getDelegate() {
     return mDelegate;

packages/create-react-native-library/templates/java-view-new/android/src/main/java/com/{%- project.package_dir %}/{%- project.name %}ViewPackage.java

@@ -1,5 +1,5 @@
 <% /* TODO: try to migrate it to TurboReactPackage */ %>
-package com.<%- project.package -%>;
+package com.<%- project.package %>;
 
 import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.NativeModule;
@@ -14,7 +14,7 @@ public class <%- project.name -%>ViewPackage implements ReactPackage {
   @Override
   public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
     List<ViewManager> viewManagers = new ArrayList<>();
-    viewManagers.add(new <%- project.name -%>ViewManager(reactContext));
+    viewManagers.add(new <%- project.name -%>ViewManager());
     return viewManagers;
   }
 

packages/create-react-native-library/templates/kotlin-library-legacy/android/src/main/java/com/{%- project.package_dir %}/{%- project.name %}Module.kt

@@ -1,4 +1,4 @@
-package com.<%- project.package -%>
+package com.<%- project.package %>
 
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule

packages/create-react-native-library/templates/kotlin-library-legacy/android/src/main/java/com/{%- project.package_dir %}/{%- project.name %}Package.kt

@@ -1,4 +1,4 @@
-package com.<%- project.package -%>
+package com.<%- project.package %>
 
 import com.facebook.react.ReactPackage
 import com.facebook.react.bridge.NativeModule

packages/create-react-native-library/templates/kotlin-library-mixed/android/src/main/java/com/{%- project.package_dir %}/{%- project.name %}Module.kt

@@ -1,4 +1,4 @@
-package com.<%- project.package -%>
+package com.<%- project.package %>
 
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactMethod

packages/create-react-native-library/templates/kotlin-library-mixed/android/src/main/java/com/{%- project.package_dir %}/{%- project.name %}Package.kt

@@ -1,4 +1,4 @@
-package com.<%- project.package -%>
+package com.<%- project.package %>
 
 import com.facebook.react.TurboReactPackage
 import com.facebook.react.bridge.ReactApplicationContext

packages/create-react-native-library/templates/kotlin-library-mixed/android/src/turbo/{%- project.name %}Spec.kt renamed to packages/create-react-native-library/templates/kotlin-library-mixed/android/src/newarch/{%- project.name %}Spec.kt

@@ -1,4 +1,4 @@
-package com.<%- project.package -%>
+package com.<%- project.package %>
 
 import com.facebook.react.bridge.ReactApplicationContext
 

packages/create-react-native-library/templates/kotlin-library-mixed/android/src/legacy/{%- project.name %}Spec.kt renamed to packages/create-react-native-library/templates/kotlin-library-mixed/android/src/oldarch/{%- project.name %}Spec.kt

@@ -1,4 +1,4 @@
-package com.<%- project.package -%>
+package com.<%- project.package %>
 
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule

packages/create-react-native-library/templates/kotlin-library-new/android/src/main/java/com/{%- project.package_dir %}/{%- project.name %}Module.kt

@@ -1,4 +1,4 @@
-package com.<%- project.package -%>
+package com.<%- project.package %>
 
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.module.annotations.ReactModule

packages/create-react-native-library/templates/kotlin-library-new/android/src/main/java/com/{%- project.package_dir %}/{%- project.name %}Package.kt

@@ -1,4 +1,4 @@
-package com.<%- project.package -%>
+package com.<%- project.package %>
 
 import com.facebook.react.TurboReactPackage
 import com.facebook.react.bridge.NativeModule

packages/create-react-native-library/templates/kotlin-view-legacy/android/src/main/java/com/{%- project.package_dir %}/{%- project.name %}Package.kt

@@ -1,4 +1,4 @@
-package com.<%- project.package -%>
+package com.<%- project.package %>
 
 import com.facebook.react.ReactPackage
 import com.facebook.react.bridge.NativeModule

packages/create-react-native-library/templates/kotlin-view-legacy/android/src/main/java/com/{%- project.package_dir %}/{%- project.name %}ViewManager.kt

@@ -1,4 +1,4 @@
-package com.<%- project.package -%>
+package com.<%- project.package %>
 
 import android.graphics.Color
 import android.view.View

packages/create-react-native-library/templates/kotlin-view-mixed/android/src/main/java/com/{%- project.package_dir %}/{%- project.name %}Package.kt

@@ -0,0 +1,19 @@
+package com.<%- project.package %>
+
+import com.facebook.react.ReactPackage
+import com.facebook.react.bridge.NativeModule
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.uimanager.ViewManager
+import java.util.ArrayList
+
+class <%- project.name -%>ViewPackage : ReactPackage {
+  override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
+    val viewManagers: MutableList<ViewManager<*, *>> = ArrayList()
+    viewManagers.add(<%- project.name -%>ViewManager())
+    return viewManagers
+  }
+
+  override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
+    return emptyList()
+  }
+}