expo-module-template 10.0.0 → 10.1.0

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 10.1.0 — 2021-12-03
+
+### 🐛 Bug fixes
+
+- Add missing import in `NativeView` template file. ([#15363](https://github.com/expo/expo/pull/15363) by [@Simek](https://github.com/Simek))
+
 ## 10.0.0 — 2021-09-28
 
 ### 🛠 Breaking changes

package/android/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'maven'
 
 group = 'host.exp.exponent'
-version = '10.0.0'
+version = '10.1.0'
 
 buildscript {
   // Simple helper that allows the root project to override versions declared by this library.
@@ -53,34 +53,27 @@ android {
     sourceCompatibility JavaVersion.VERSION_1_8
     targetCompatibility JavaVersion.VERSION_1_8
   }
+  
+  kotlinOptions {
+    jvmTarget = JavaVersion.VERSION_1_8
+  }
 
   defaultConfig {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 30)
     versionCode 28
-    versionName "10.0.0"
+    versionName "10.1.0"
   }
   lintOptions {
     abortOnError false
   }
 }
 
-if (new File(rootProject.projectDir.parentFile, 'package.json').exists()) {
-  apply from: project(":unimodules-core").file("../unimodules-core.gradle")
-} else {
-  throw new GradleException(
-      '\'unimodules-core.gradle\' was not found in the usual React Native dependency location. ' +
-          'This package can only be used in such projects. Are you sure you\'ve installed the dependencies properly?')
-}
-
 repositories {
   mavenCentral()
 }
 
 dependencies {
-  unimodule 'unimodules-core'
+  implementation project(':expo-modules-core')
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${safeExtGet('kotlinVersion', '1.4.21')}"
-
-  testImplementation project(':unimodules-test-core')
-  testImplementation 'org.robolectric:robolectric:4.3.1'
 }

package/android/src/main/java/expo/modules/template/ModuleTemplateModule.kt

@@ -1,30 +1,25 @@
 package expo.modules.template
 
-import android.content.Context
-
-import org.unimodules.core.ExportedModule
-import org.unimodules.core.ModuleRegistry
-import org.unimodules.core.Promise
-import org.unimodules.core.interfaces.ExpoMethod
-
-class ModuleTemplateModule(context: Context) : ExportedModule(context) {
-
-  private var mModuleRegistry: ModuleRegistry? = null
-
-  override fun getName(): String {
-    return NAME
-  }
-
-  override fun onCreate(moduleRegistry: ModuleRegistry) {
-    mModuleRegistry = moduleRegistry
-  }
-
-  @ExpoMethod
-  fun someGreatMethodAsync(options: Map<String, Any>, promise: Promise) {
-  }
-
-  companion object {
-    private val NAME = "ExpoModuleTemplate"
-    private val TAG = ModuleTemplateModule::class.qualifiedName
+import expo.modules.kotlin.modules.Module
+import expo.modules.kotlin.modules.ModuleDefinition
+
+class ModuleTemplateModule : Module() {
+  override fun definition() = ModuleDefinition {
+    name("ExpoModuleTemplate")
+
+    function("someGreatMethodAsync") { options: Map<String, String> ->
+      println("Hello 👋")
+      null as Any?
+    }
+
+    viewManager {
+      view { context -> 
+        ModuleTemplateView(context) 
+      }
+
+      prop("someGreatProp") { view: ModuleTemplateView, prop: Int ->
+        println(prop)
+      }
+    }
   }
 }

package/android/src/main/java/expo/modules/template/ModuleTemplateView.kt

@@ -3,6 +3,4 @@ package expo.modules.template
 import android.content.Context
 import android.view.View
 
-import org.unimodules.core.ModuleRegistry
-
-class ModuleTemplateView(context: Context, moduleRegistry: ModuleRegistry) : View(context)
+class ModuleTemplateView(context: Context) : View(context)

package/build/ExpoModuleTemplateNativeView.d.ts

@@ -1,3 +1,6 @@
-declare type NativeViewProps = object;
+import * as React from 'react';
+declare type NativeViewProps = {
+    someGreatProp: number;
+};
 declare const NativeView: React.ComponentType<NativeViewProps>;
 export default NativeView;

package/build/ExpoModuleTemplateNativeView.js

@@ -1,4 +1,4 @@
 import { requireNativeViewManager } from 'expo-modules-core';
-const NativeView = requireNativeViewManager('ExpoModuleTemplateView');
+const NativeView = requireNativeViewManager('ExpoModuleTemplate');
 export default NativeView;
 //# sourceMappingURL=ExpoModuleTemplateNativeView.js.map

package/build/ExpoModuleTemplateNativeView.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoModuleTemplateNativeView.js","sourceRoot":"","sources":["../src/ExpoModuleTemplateNativeView.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAI7D,MAAM,UAAU,GACd,wBAAwB,CAAC,wBAAwB,CAAC,CAAC;AAErD,eAAe,UAAU,CAAC","sourcesContent":["import { requireNativeViewManager } from 'expo-modules-core';\n\ntype NativeViewProps = object;\n\nconst NativeView: React.ComponentType<NativeViewProps> =\n  requireNativeViewManager('ExpoModuleTemplateView');\n\nexport default NativeView;\n"]}
+{"version":3,"file":"ExpoModuleTemplateNativeView.js","sourceRoot":"","sources":["../src/ExpoModuleTemplateNativeView.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAO7D,MAAM,UAAU,GACd,wBAAwB,CAAC,oBAAoB,CAAC,CAAC;AAEjD,eAAe,UAAU,CAAC","sourcesContent":["import { requireNativeViewManager } from 'expo-modules-core';\nimport * as React from 'react';\n\ntype NativeViewProps = {\n  someGreatProp: number;\n};\n\nconst NativeView: React.ComponentType<NativeViewProps> =\n  requireNativeViewManager('ExpoModuleTemplate');\n\nexport default NativeView;\n"]}

package/build/ExpoModuleTemplateView.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 export interface ExpoModuleTemplateViewProps {
-    greatProp: string;
+    someGreatProp: number;
 }
 interface ExpoModuleTemplateViewState {
 }

package/build/ExpoModuleTemplateView.js

@@ -12,7 +12,7 @@ import NativeView from './ExpoModuleTemplateNativeView';
  */
 export default class ExpoModuleTemplateView extends React.Component {
     render() {
-        return React.createElement(NativeView, null);
+        return React.createElement(NativeView, { someGreatProp: this.props.someGreatProp });
     }
 }
 //# sourceMappingURL=ExpoModuleTemplateView.js.map

package/build/ExpoModuleTemplateView.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoModuleTemplateView.js","sourceRoot":"","sources":["../src/ExpoModuleTemplateView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,UAAU,MAAM,gCAAgC,CAAC;AAQxD;;;;;;;;;GASG;AACH,MAAM,CAAC,OAAO,OAAO,sBAAuB,SAAQ,KAAK,CAAC,SAGzD;IACC,MAAM;QACJ,OAAO,oBAAC,UAAU,OAAG,CAAC;IACxB,CAAC;CACF","sourcesContent":["import * as React from 'react';\n\nimport NativeView from './ExpoModuleTemplateNativeView';\n\nexport interface ExpoModuleTemplateViewProps {\n  greatProp: string;\n}\n\ninterface ExpoModuleTemplateViewState {}\n\n/**\n * Great view that would suit your needs!\n *\n * @example\n * ```tsx\n * <ExpoModuleTemplateNativeView\n *   greatProp=\"great\"\n * />\n * ```\n */\nexport default class ExpoModuleTemplateView extends React.Component<\n  ExpoModuleTemplateViewProps,\n  ExpoModuleTemplateViewState\n> {\n  render() {\n    return <NativeView />;\n  }\n}\n"]}
+{"version":3,"file":"ExpoModuleTemplateView.js","sourceRoot":"","sources":["../src/ExpoModuleTemplateView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,UAAU,MAAM,gCAAgC,CAAC;AAQxD;;;;;;;;;GASG;AACH,MAAM,CAAC,OAAO,OAAO,sBAAuB,SAAQ,KAAK,CAAC,SAGzD;IACC,MAAM;QACJ,OAAO,oBAAC,UAAU,IAAC,aAAa,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa,GAAI,CAAC;IACjE,CAAC;CACF","sourcesContent":["import * as React from 'react';\n\nimport NativeView from './ExpoModuleTemplateNativeView';\n\nexport interface ExpoModuleTemplateViewProps {\n  someGreatProp: number;\n}\n\ninterface ExpoModuleTemplateViewState {}\n\n/**\n * Great view that would suit your needs!\n *\n * @example\n * ```tsx\n * <ExpoModuleTemplateNativeView\n *   greatProp=\"great\"\n * />\n * ```\n */\nexport default class ExpoModuleTemplateView extends React.Component<\n  ExpoModuleTemplateViewProps,\n  ExpoModuleTemplateViewState\n> {\n  render() {\n    return <NativeView someGreatProp={this.props.someGreatProp} />;\n  }\n}\n"]}

package/expo-module.config.json

@@ -0,0 +1,10 @@
+{
+  "name": "expo-module-template",
+  "platforms": ["ios", "android", "web"],
+  "ios": {
+    "modulesClassNames": ["ExpoModule"]
+  },
+  "android": {
+    "modulesClassNames": ["expo.modules.expomodule.ExpoModule"]
+  }
+}

package/ios/{EXModuleTemplate.podspec → ExpoModuleTemplate.podspec}

@@ -3,7 +3,7 @@ require 'json'
 package = JSON.parse(File.read(File.join(__dir__, '..', 'package.json')))
 
 Pod::Spec.new do |s|
-  s.name           = 'EXModuleTemplate'
+  s.name           = 'ExpoModuleTemplate'
   s.version        = package['version']
   s.summary        = package['description']
   s.description    = package['description']
@@ -13,8 +13,8 @@ Pod::Spec.new do |s|
   s.platform       = :ios, '12.0'
   s.source         = { git: 'https://github.com/expo/expo.git' }
   s.static_framework = true
-  s.source_files   = 'EXModuleTemplate/**/*.{h,m}'
-  s.preserve_paths = 'EXModuleTemplate/**/*.{h,m}'
+  s.source_files   = '**/*.{h,m,swift}'
+  s.preserve_paths = '**/*.{h,m,swift}'
   s.requires_arc   = true
 
   s.dependency 'ExpoModulesCore'

package/ios/ExpoModuleTemplateModule.swift

@@ -0,0 +1,21 @@
+import ExpoModulesCore
+
+public class ExpoModuleTemplateModule: Module {
+  public func definition() -> ModuleDefinition {
+    name("ExpoModuleTemplate")
+    
+    function("someGreatMethodAsync") { (options: [String: String]) in
+      print("Hello 👋")
+    }
+    
+    viewManager {
+      view {
+        ExpoModuleTemplateView()
+      }
+
+      prop("someGreatProp") { (view: ExpoModuleTemplateView, prop: Int) in
+        print("prop")
+      }
+    }
+  }
+}

package/ios/ExpoModuleTemplateView.swift

@@ -0,0 +1,3 @@
+import UIKit
+
+class ExpoModuleTemplateView: UIView {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-module-template",
-  "version": "10.0.0",
+  "version": "10.1.0",
   "description": "ExpoModuleTemplate standalone module",
   "main": "build/ModuleTemplate.js",
   "types": "build/ModuleTemplate.d.ts",
@@ -24,5 +24,12 @@
   "author": "650 Industries, Inc.",
   "license": "MIT",
   "homepage": "https://docs.expo.dev/versions/latest/sdk/module-template",
-  "gitHead": "1fffde73411ee7a642b98f1506a8de921805d52b"
+  "dependencies": {},
+  "devDependencies": {
+    "expo-module-scripts": "^2.0.0"
+  },
+  "peerDependencies": {
+    "expo": "*"
+  },
+  "gitHead": "2e5c6983b86d5ecfca028ba64002897d8adc2cc4"
 }

package/src/ExpoModuleTemplateNativeView.ts

@@ -1,8 +1,11 @@
 import { requireNativeViewManager } from 'expo-modules-core';
+import * as React from 'react';
 
-type NativeViewProps = object;
+type NativeViewProps = {
+  someGreatProp: number;
+};
 
 const NativeView: React.ComponentType<NativeViewProps> =
-  requireNativeViewManager('ExpoModuleTemplateView');
+  requireNativeViewManager('ExpoModuleTemplate');
 
 export default NativeView;

package/src/ExpoModuleTemplateView.tsx

@@ -3,7 +3,7 @@ import * as React from 'react';
 import NativeView from './ExpoModuleTemplateNativeView';
 
 export interface ExpoModuleTemplateViewProps {
-  greatProp: string;
+  someGreatProp: number;
 }
 
 interface ExpoModuleTemplateViewState {}
@@ -23,6 +23,6 @@ export default class ExpoModuleTemplateView extends React.Component<
   ExpoModuleTemplateViewState
 > {
   render() {
-    return <NativeView />;
+    return <NativeView someGreatProp={this.props.someGreatProp} />;
   }
 }

package/android/src/main/java/expo/modules/template/ModuleTemplatePackage.kt

@@ -1,17 +0,0 @@
-package expo.modules.template
-
-import android.content.Context
-
-import org.unimodules.core.BasePackage
-import org.unimodules.core.ExportedModule
-import org.unimodules.core.ViewManager
-
-class ModuleTemplatePackage : BasePackage() {
-  override fun createExportedModules(context: Context): List<ExportedModule> {
-    return listOf(ModuleTemplateModule(context) as ExportedModule)
-  }
-
-  override fun createViewManagers(context: Context): List<ViewManager<*>> {
-    return listOf(ModuleTemplateViewManager() as ViewManager<*>)
-  }
-}

package/android/src/main/java/expo/modules/template/ModuleTemplateViewManager.kt

@@ -1,37 +0,0 @@
-package expo.modules.template
-
-import android.content.Context
-
-import java.util.Arrays
-
-import org.unimodules.core.ModuleRegistry
-import org.unimodules.core.ViewManager
-
-class ModuleTemplateViewManager : ViewManager<ModuleTemplateView>() {
-
-  private var mModuleRegistry: ModuleRegistry? = null
-
-  override fun getName(): String {
-    return TAG
-  }
-
-  override fun createViewInstance(context: Context): ModuleTemplateView {
-    return ModuleTemplateView(context, mModuleRegistry!!)
-  }
-
-  override fun getViewManagerType(): ViewManager.ViewManagerType {
-    return ViewManager.ViewManagerType.SIMPLE
-  }
-
-  override fun getExportedEventNames(): List<String> {
-    return Arrays.asList("onSomethingHappened")
-  }
-
-  override fun onCreate(moduleRegistry: ModuleRegistry) {
-    mModuleRegistry = moduleRegistry
-  }
-
-  companion object {
-    private val TAG = "ExpoModuleTemplateView"
-  }
-}

package/android/src/test/java/expo/modules/template/ModuleTemplateModuleTest.kt

@@ -1,32 +0,0 @@
-package expo.modules.template
-
-import io.mockk.mockk
-import org.junit.Assert.assertTrue
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
-import org.unimodules.test.core.PromiseMock
-import org.unimodules.test.core.moduleRegistryMock
-
-@RunWith(RobolectricTestRunner::class)
-class ModuleTemplateModuleTest {
-
-  private var moduleRegistry = moduleRegistryMock()
-
-  private lateinit var promise: PromiseMock
-
-  private lateinit var module: ModuleTemplateModule
-
-  @Before
-  fun initializeMock() {
-    promise = PromiseMock()
-    module = ModuleTemplateModule(mockk())
-  }
-
-  @Test
-  fun testSomeGreatMethodAsync() {
-    assertTrue(true)
-  }
-
-}

package/ios/EXModuleTemplate/EXModuleTemplateModule.h

@@ -1,7 +0,0 @@
-//  Copyright © 2018 650 Industries. All rights reserved.
-
-#import <ExpoModulesCore/EXExportedModule.h>
-#import <ExpoModulesCore/EXModuleRegistryConsumer.h>
-
-@interface EXModuleTemplateModule : EXExportedModule <EXModuleRegistryConsumer>
-@end

package/ios/EXModuleTemplate/EXModuleTemplateModule.m

@@ -1,27 +0,0 @@
-// Copyright 2018-present 650 Industries. All rights reserved.
-
-#import <EXModuleTemplate/EXModuleTemplateModule.h>
-
-@interface EXModuleTemplateModule ()
-
-@property (nonatomic, weak) EXModuleRegistry *moduleRegistry;
-
-@end
-
-@implementation EXModuleTemplateModule
-
-EX_EXPORT_MODULE(ExpoModuleTemplate);
-
-- (void)setModuleRegistry:(EXModuleRegistry *)moduleRegistry
-{
-  _moduleRegistry = moduleRegistry;
-}
-
-EX_EXPORT_METHOD_AS(someGreatMethodAsync,
-                    options:(NSDictionary *)options
-                    resolve:(EXPromiseResolveBlock)resolve
-                    reject:(EXPromiseRejectBlock)reject)
-{
-}
-
-@end

package/ios/EXModuleTemplate/EXModuleTemplateView.h

@@ -1,9 +0,0 @@
-// Copyright 2016-present 650 Industries. All rights reserved.
-
-#import <ExpoModulesCore/EXModuleRegistry.h>
-
-@interface EXModuleTemplateView : UIView
-
-- (instancetype)initWithModuleRegistry:(EXModuleRegistry *)moduleRegistry;
-
-@end

package/ios/EXModuleTemplate/EXModuleTemplateView.m

@@ -1,19 +0,0 @@
-// Copyright 2016-present 650 Industries. All rights reserved.
-
-#import <EXModuleTemplate/EXModuleTemplateView.h>
-
-@interface EXModuleTemplateView ()
-
-@end
-
-@implementation EXModuleTemplateView
-
-- (instancetype)initWithModuleRegistry:(EXModuleRegistry *)moduleRegistry
-{
-  if ((self = [super init])) {
-    // some logic here
-  }
-  return self;
-}
-
-@end

package/ios/EXModuleTemplate/EXModuleTemplateViewManager.h

@@ -1,8 +0,0 @@
-// Copyright 2016-present 650 Industries. All rights reserved.
-
-#import <ExpoModulesCore/EXViewManager.h>
-#import <ExpoModulesCore/EXModuleRegistryConsumer.h>
-
-@interface EXModuleTemplateViewManager : EXViewManager <EXModuleRegistryConsumer>
-
-@end

package/ios/EXModuleTemplate/EXModuleTemplateViewManager.m

@@ -1,36 +0,0 @@
-// Copyright 2016-present 650 Industries. All rights reserved.
-
-#import <EXModuleTemplate/EXModuleTemplateView.h>
-#import <EXModuleTemplate/EXModuleTemplateViewManager.h>
-
-@interface EXModuleTemplateViewManager ()
-
-@property (nonatomic, weak) EXModuleRegistry *moduleRegistry;
-
-@end
-
-@implementation EXModuleTemplateViewManager
-
-EX_EXPORT_MODULE(ExpoModuleTemplateViewManager);
-
-- (UIView *)view
-{
-  return [[EXModuleTemplateView alloc] initWithModuleRegistry:_moduleRegistry];
-}
-
-- (NSString *)viewName
-{
-  return @"ExpoModuleTemplateView";
-}
-
-- (NSArray<NSString *> *)supportedEvents
-{
-  return @[@"onSomethingHappened"];
-}
-
-- (void)setModuleRegistry:(EXModuleRegistry *)moduleRegistry
-{
-  _moduleRegistry = moduleRegistry;
-}
-
-@end

package/unimodule.json

@@ -1,4 +0,0 @@
-{
-  "name": "expo-module-template",
-  "platforms": ["ios", "android", "web"]
-}