refactor: minor tweaks

Author: satya164

src/create.ts

@@ -14,6 +14,7 @@ const BINARIES = /(gradlew|\.(jar|keystore|png|jpg|gif))$/;
 
 const COMMON_FILES = path.resolve(__dirname, '../templates/common');
 const NATIVE_FILES = path.resolve(__dirname, '../templates/native-library');
+const JS_FILES = path.resolve(__dirname, '../templates/js-library');
 const EXPO_FILES = path.resolve(__dirname, '../templates/expo-library');
 const CPP_FILES = path.resolve(__dirname, '../templates/cpp-library');
 const OBJC_FILES = path.resolve(__dirname, '../templates/objc-library');
@@ -170,12 +171,12 @@ export default async function create(argv: yargs.Arguments<any>) {
         { name: 'Native module in Kotlin and Swift', value: 'native-swift' },
         { name: 'Native module with C++ code', value: 'cpp' },
         {
-          name: 'JavaScript module with Web support using Expo',
-          value: 'expo',
+          name: 'JavaScript module with native example',
+          value: 'js',
         },
         {
-          name: 'JavaScript module',
-          value: 'js',
+          name: 'JavaScript module with Web support using Expo',
+          value: 'expo',
         },
       ],
       default: 'native',
@@ -227,7 +228,7 @@ export default async function create(argv: yargs.Arguments<any>) {
       native: type === 'native' || type === 'cpp' || 'native-swift',
       cpp: type === 'cpp',
       swift: type === 'native-swift',
-      type,
+      module: type !== 'js',
     },
     author: {
       name: authorName,
@@ -263,19 +264,18 @@ export default async function create(argv: yargs.Arguments<any>) {
   await copyDir(COMMON_FILES, folder);
 
   if (type === 'expo') {
+    await copyDir(JS_FILES, folder);
     await copyDir(EXPO_FILES, folder);
+  } else if (type === 'js') {
+    await copyDir(JS_FILES, folder);
+    await copyDir(
+      path.join(EXPO_FILES, 'example'),
+      path.join(folder, 'example')
+    );
   } else {
     await copyDir(NATIVE_FILES, folder);
 
-    if (type === 'js') {
-      await Promise.all(
-        [
-          `android`,
-          `ios`,
-          `${options.project.podspec}.podspec`,
-        ].map((file) => fs.remove(path.join(folder, file)))
-      );
-    } else if (type === 'cpp') {
+    if (type === 'cpp') {
       await copyDir(CPP_FILES, folder);
     } else if (type === 'native-swift') {
       await copyDir(SWIFT_FILES, folder);

templates/expo-library/src/index.tsx renamed to templates/js-library/src/index.tsx

@@ -209,7 +209,7 @@ dependencies {
         implementation jscFlavor
     }
 
-<% if (project.type !== 'js') { -%>
+<% if (project.module) { -%>
     implementation project(':<%= project.package %>')
 <% } -%>
 }

templates/native-library/example/android/app/build.gradle

@@ -2,7 +2,7 @@ rootProject.name = '<%= project.name %>Example'
 apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':app'
 
-<% if (project.type !== 'js') { -%>
+<% if (project.module) { -%>
 include ':<%= project.package %>'
 project(':<%= project.package %>').projectDir = new File(rootProject.projectDir, '../../android')
-<% } -%>
+<% } -%>

templates/native-library/example/android/settings.gradle

@@ -53,12 +53,12 @@ target '<%= project.name %>Example' do
   pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
   pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
 
-<% if (project.type !== 'js') { -%>
+<% if (project.module) { -%>
   pod '<%= project.podspec %>', :path => '../..'
 <% } -%>
 
   use_native_modules!
-  
+
   # Enables Flipper.
   #
   # Note that if you have use_frameworks! enabled, Flipper will not work and

templates/native-library/example/ios/Podfile

@@ -1,20 +1,9 @@
-<% if (project.type !== 'js') { -%>
 import { NativeModules } from 'react-native';
-<% } -%>
+
 type <%= project.name %>Type = {
   multiply(a: number, b: number): Promise<number>;
 };
 
-<% if (project.type === 'js') { -%>
-const multiply = (a: number, b: number) => {
-  return Promise.resolve(a * b);
-}
-
-export default {
-  multiply
-} as <%= project.name %>Type;
-<% } else { -%>
 const { <%= project.name %> } = NativeModules;
 
 export default <%= project.name %> as <%= project.name %>Type;
-<% } -%>