react-native-timezone 3.0.1 → 3.2.0

package/package.json

@@ -1,19 +1,38 @@
 {
   "name": "react-native-timezone",
-  "version": "3.0.1",
+  "version": "3.2.0",
   "description": "A Simple react native module to get Timezone and Region of the Android/iOS devices.",
-  "main": "lib/commonjs/index",
-  "module": "lib/module/index",
-  "types": "lib/typescript/src/index.d.ts",
-  "react-native": "src/index",
-  "source": "src/index",
+  "source": "./src/index.tsx",
+  "main": "./lib/commonjs/index.js",
+  "module": "./lib/module/index.js",
+  "scripts": {
+    "example": "pnpm --filter react-native-timezone-example",
+    "test": "jest",
+    "typecheck": "tsc",
+    "lint": "eslint \"**/*.{js,ts,tsx}\"",
+    "clean": "del-cli android/build example/android/build example/android/app/build example/ios/build lib",
+    "prepare": "bob build",
+    "release": "release-it"
+  },
+  "exports": {
+    ".": {
+      "import": {
+        "types": "./lib/typescript/module/src/index.d.ts",
+        "default": "./lib/module/index.js"
+      },
+      "require": {
+        "types": "./lib/typescript/commonjs/src/index.d.ts",
+        "default": "./lib/commonjs/index.js"
+      }
+    }
+  },
   "files": [
     "src",
     "lib",
     "android",
     "ios",
-    "cpp",
     "*.podspec",
+    "react-native.config.js",
     "!ios/build",
     "!android/build",
     "!android/gradle",
@@ -25,20 +44,6 @@
     "!**/__mocks__",
     "!**/.*"
   ],
-  "scripts": {
-    "example": "yarn workspace react-native-timezone-example",
-    "test": "jest",
-    "typecheck": "tsc --noEmit",
-    "lint": "eslint \"**/*.{js,ts,tsx}\"",
-    "clean": "del-cli android/build example/android/build example/android/app/build example/ios/build lib",
-    "prepare": "bob build",
-    "release": "release-it"
-  },
-  "keywords": [
-    "react-native",
-    "ios",
-    "android"
-  ],
   "repository": {
     "type": "git",
     "url": "git+https://github.com/samitha9125/react-native-timezone.git"
@@ -55,109 +60,55 @@
   "devDependencies": {
     "@commitlint/config-conventional": "^17.0.2",
     "@evilmartians/lefthook": "^1.5.0",
-    "@react-native/eslint-config": "^0.72.2",
-    "@release-it/conventional-changelog": "^5.0.0",
-    "@types/jest": "^28.1.2",
-    "@types/react": "~17.0.21",
-    "@types/react-native": "0.70.0",
+    "@react-native-community/cli": "15.0.1",
+    "@react-native/eslint-config": "^0.73.1",
+    "@release-it/conventional-changelog": "^9.0.2",
+    "@types/jest": "^29.5.5",
+    "@types/react": "^18.2.44",
     "commitlint": "^17.0.2",
-    "del-cli": "^5.0.0",
-    "eslint": "^8.4.1",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "jest": "^28.1.1",
-    "pod-install": "^0.1.0",
-    "prettier": "^2.0.5",
-    "react": "18.2.0",
-    "react-native": "0.73.0",
-    "react-native-builder-bob": "^0.20.0",
-    "release-it": "^15.0.0",
+    "del-cli": "^5.1.0",
+    "eslint": "^8.51.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-plugin-prettier": "^5.0.1",
+    "jest": "^29.7.0",
+    "prettier": "^3.0.3",
+    "react": "18.3.1",
+    "react-native": "0.76.5",
+    "react-native-builder-bob": "^0.35.2",
+    "release-it": "^17.10.0",
     "turbo": "^1.10.7",
-    "typescript": "^5.0.2"
+    "typescript": "^5.2.2"
   },
   "resolutions": {
-    "@types/react": "17.0.21"
+    "@types/react": "^18.2.44"
   },
   "peerDependencies": {
-    "react": "*",
-    "react-native": "*"
-  },
-  "workspaces": [
-    "example"
-  ],
-  "packageManager": "yarn@3.6.1",
-  "engines": {
-    "node": ">= 18.0.0"
-  },
-  "jest": {
-    "preset": "react-native",
-    "modulePathIgnorePatterns": [
-      "<rootDir>/example/node_modules",
-      "<rootDir>/lib/"
-    ]
-  },
-  "commitlint": {
-    "extends": [
-      "@commitlint/config-conventional"
-    ]
-  },
-  "release-it": {
-    "git": {
-      "commitMessage": "chore: release ${version}",
-      "tagName": "v${version}"
-    },
-    "npm": {
-      "publish": true
-    },
-    "github": {
-      "release": true
-    },
-    "plugins": {
-      "@release-it/conventional-changelog": {
-        "preset": "angular"
-      }
-    }
-  },
-  "eslintConfig": {
-    "root": true,
-    "extends": [
-      "@react-native",
-      "prettier"
-    ],
-    "rules": {
-      "prettier/prettier": [
-        "error",
-        {
-          "quoteProps": "consistent",
-          "singleQuote": true,
-          "tabWidth": 2,
-          "trailingComma": "es5",
-          "useTabs": false
-        }
-      ]
-    }
-  },
-  "eslintIgnore": [
-    "node_modules/",
-    "lib/"
-  ],
-  "prettier": {
-    "quoteProps": "consistent",
-    "singleQuote": true,
-    "tabWidth": 2,
-    "trailingComma": "es5",
-    "useTabs": false
+    "react": ">=18.0.0",
+    "react-native": ">=0.71.0"
   },
+  "packageManager": "pnpm@9.15.4",
   "react-native-builder-bob": {
     "source": "src",
     "output": "lib",
     "targets": [
-      "commonjs",
-      "module",
+      "codegen",
+      [
+        "commonjs",
+        {
+          "esm": true
+        }
+      ],
+      [
+        "module",
+        {
+          "esm": true
+        }
+      ],
       [
         "typescript",
         {
-          "project": "tsconfig.build.json"
+          "project": "tsconfig.build.json",
+          "esm": true
         }
       ]
     ]
@@ -165,6 +116,19 @@
   "codegenConfig": {
     "name": "RNTimezoneSpec",
     "type": "modules",
-    "jsSrcsDir": "src"
+    "jsSrcsDir": "src",
+    "outputDir": {
+      "ios": "ios/generated",
+      "android": "android/generated"
+    },
+    "android": {
+      "javaPackageName": "com.samitha.timezone"
+    },
+    "includesGeneratedCode": true
+  },
+  "create-react-native-library": {
+    "type": "turbo-module",
+    "languages": "kotlin-objc",
+    "version": "0.45.5"
   }
 }

package/react-native-timezone.podspec

@@ -11,34 +11,32 @@ Pod::Spec.new do |s|
   s.license      = package["license"]
   s.authors      = package["author"]
 
-  s.platforms    = { :ios => "11.0" }
+  s.platforms    = { :ios => min_ios_version_supported }
   s.source       = { :git => "https://github.com/samitha9125/react-native-timezone.git", :tag => "#{s.version}" }
 
-  # Frameworks to include in the project.
-  s.frameworks   = 'CoreTelephony'
-
-  s.source_files = "ios/**/*.{h,m,mm}"
+  s.source_files = "ios/**/*.{h,m,mm,cpp}"
+  s.ios.frameworks = ['CoreTelephony']
 
   # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
   # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.
   if respond_to?(:install_modules_dependencies, true)
     install_modules_dependencies(s)
   else
-  s.dependency "React-Core"
+    s.dependency "React-Core"
 
-  # Don't install the dependencies when we run `pod install` in the old architecture.
-  if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
-    s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
-    s.pod_target_xcconfig    = {
-        "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
-        "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
-        "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
-    }
-    s.dependency "React-Codegen"
-    s.dependency "RCT-Folly"
-    s.dependency "RCTRequired"
-    s.dependency "RCTTypeSafety"
-    s.dependency "ReactCommon/turbomodule/core"
-   end
-  end    
+    # Don't install the dependencies when we run `pod install` in the old architecture.
+    if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
+      s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
+      s.pod_target_xcconfig    = {
+          "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
+          "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
+          "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
+      }
+      s.dependency "React-Codegen"
+      s.dependency "RCT-Folly"
+      s.dependency "RCTRequired"
+      s.dependency "RCTTypeSafety"
+      s.dependency "ReactCommon/turbomodule/core"
+    end
+  end
 end

package/react-native.config.js

@@ -0,0 +1,12 @@
+/**
+ * @type {import('@react-native-community/cli-types').UserDependencyConfig}
+ */
+module.exports = {
+  dependency: {
+    platforms: {
+      android: {
+        cmakeListsPath: 'generated/jni/CMakeLists.txt',
+      },
+    },
+  },
+};

package/src/NativeTimezone.ts

@@ -2,9 +2,10 @@ import type { TurboModule } from 'react-native';
 import { TurboModuleRegistry } from 'react-native';
 
 export interface Spec extends TurboModule {
-  getTimeZone(): string;
-  getRegionByLocale(): string;
-  getRegionByTelephony(): string;
+  getTimeZone(): string | null;
+  getRegionByLocale(): string | null;
+  getRegionByTelephony(): string | null;
+  isAutoTimeZoneEnabled(): boolean | null;
 }
 
 export default TurboModuleRegistry.getEnforcing<Spec>('Timezone');

package/src/index.tsx

@@ -1,36 +1,15 @@
-import { NativeModules, Platform } from 'react-native';
+import { Platform } from 'react-native';
 
-const LINKING_ERROR =
-  `The package 'react-native-timezone' doesn't seem to be linked. Make sure: \n\n` +
-  Platform.select({ ios: "- You have run 'pod install'\n", default: '' }) +
-  '- You rebuilt the app after installing the package\n' +
-  '- You are not using Expo Go\n';
-
-// @ts-expect-error
-const isTurboModuleEnabled = global.__turboModuleProxy != null;
-const TimezoneModule = isTurboModuleEnabled
-  ? require('./NativeTimezone').default
-  : NativeModules.Timezone;
-
-const Timezone = TimezoneModule
-  ? TimezoneModule
-  : new Proxy(
-      {},
-      {
-        get() {
-          throw new Error(LINKING_ERROR);
-        },
-      }
-    );
+import Timezone from './NativeTimezone';
 
 export default {
   getTimeZone: () => Timezone.getTimeZone(),
   getRegionByLocale: () => Timezone.getRegionByLocale(),
-  getRegionByTelephony: () => Timezone.getRegionByTelephony() ?? undefined,
+  getRegionByTelephony: () => Timezone.getRegionByTelephony(),
   isAutoTimeZoneEnabled: () => {
     if (Platform.OS === 'android') {
       return Timezone.isAutoTimeZoneEnabled();
     }
-    return undefined;
+    return null;
   },
 };

package/android/src/main/java/com/samitha/rn/timezone/TimezoneModuleImpl.java

@@ -1,60 +0,0 @@
-package com.samitha.rn.timezone;
-
-import androidx.annotation.NonNull;
-import android.os.Build;
-
-import com.facebook.react.bridge.Promise;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactMethod;
-
-import java.util.TimeZone;
-import java.util.Calendar;
-import android.telephony.TelephonyManager;
-
-import android.provider.Settings;
-import android.content.ContentResolver;
-import android.util.Log;
-
-public class TimezoneModuleImpl {
-  public static final String NAME = "Timezone";
-
-  // Whether the device is set to automatically detect the time zone.
-  @ReactMethod
-  public static boolean isAutoTimeZoneEnabled(ReactApplicationContext reactContext) {
-    ContentResolver resolver = reactContext.getContentResolver();
-    return (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1
-        ? Settings.Global.getInt(resolver, Settings.Global.AUTO_TIME_ZONE, 0)
-        : Settings.System.getInt(resolver, Settings.System.AUTO_TIME_ZONE, 0)) != 0;
-  }
-
-  @ReactMethod
-  public static String getTimeZone() {
-    try {
-      Calendar calendar = Calendar.getInstance(TimeZone.getDefault());
-      TimeZone zone = calendar.getTimeZone();
-      return zone.getID();
-    }catch (Exception e){
-      return null;
-    }
-  }
-
-  @ReactMethod
-  public static String getRegionByTelephony(ReactApplicationContext reactContext) {
-    try {
-      TelephonyManager tm = (TelephonyManager)reactContext.getSystemService(reactContext.TELEPHONY_SERVICE);
-      return tm.getNetworkCountryIso();
-    }catch (Exception e){
-      return null;
-    }
-    
-  }
-
-  @ReactMethod
-  public static String getRegionByLocale(ReactApplicationContext reactContext) {
-    try {
-      return reactContext.getResources().getConfiguration().locale.getCountry();
-    }catch (Exception e){
-      return null;
-    }
-  }
-}

package/android/src/main/java/com/samitha/rn/timezone/TimezonePackage.java

@@ -1,45 +0,0 @@
-package com.samitha.rn.timezone;
-
-import androidx.annotation.Nullable;
-
-import com.facebook.react.bridge.NativeModule;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.module.model.ReactModuleInfo;
-import com.facebook.react.module.model.ReactModuleInfoProvider;
-import com.facebook.react.TurboReactPackage;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class TimezonePackage extends TurboReactPackage {
-
-  @Nullable
-  @Override
-  public NativeModule getModule(String name, ReactApplicationContext reactContext) {
-    if (name.equals(TimezoneModule.NAME)) {
-      return new TimezoneModule(reactContext);
-    } else {
-      return null;
-    }
-  }
-
-  @Override
-  public ReactModuleInfoProvider getReactModuleInfoProvider() {
-    return () -> {
-      final Map<String, ReactModuleInfo> moduleInfos = new HashMap<>();
-      boolean isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
-      moduleInfos.put(
-              TimezoneModule.NAME,
-              new ReactModuleInfo(
-                      TimezoneModule.NAME,
-                      TimezoneModule.NAME,
-                      false, // canOverrideExistingModule
-                      false, // needsEagerInit
-                      true, // hasConstants
-                      false, // isCxxModule
-                      isTurboModule // isTurboModule
-      ));
-      return moduleInfos;
-    };
-  }
-}

package/android/src/newarch/TimezoneModule.java

@@ -1,9 +0,0 @@
-package com.samitha.rn.timezone;
-
-import com.facebook.react.bridge.ReactApplicationContext;
-
-abstract class TimezoneSpec extends NativeTimezoneSpec {
-  TimezoneSpec(ReactApplicationContext context) {
-    super(context);
-  }
-}

package/android/src/oldarch/TimezoneModule.java

@@ -1,39 +0,0 @@
-package com.samitha.rn.timezone;
-
-import androidx.annotation.NonNull;
-
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.module.annotations.ReactModule;
-
-public class TimezoneModule extends ReactContextBaseJavaModule {
-  public static final String NAME = TimezoneModuleImpl.NAME;
-
-  TimezoneModule(ReactApplicationContext context) {
-    super(context);
-  }
-
-  @Override
-  @NonNull
-  public String getName() {
-    return TimezoneModuleImpl.NAME;
-  }
-
-  @ReactMethod(isBlockingSynchronousMethod = true)
-  public boolean isAutoTimeZoneEnabled() {
-    return TimezoneModuleImpl.isAutoTimeZoneEnabled(getReactApplicationContext());
-  }
-  @ReactMethod(isBlockingSynchronousMethod = true)
-  public String getTimeZone() {
-    return TimezoneModuleImpl.getTimeZone();
-  }
-  @ReactMethod(isBlockingSynchronousMethod = true)
-  public String getRegionByTelephony() {
-    return TimezoneModuleImpl.getRegionByTelephony(getReactApplicationContext());
-  }
-  @ReactMethod(isBlockingSynchronousMethod = true)
-  public String getRegionByLocale() {
-    return TimezoneModuleImpl.getRegionByLocale(getReactApplicationContext());
-  }
-}

package/lib/commonjs/index.d.js

@@ -1,6 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-//# sourceMappingURL=index.d.js.map

package/lib/commonjs/index.d.js.map

@@ -1 +0,0 @@
-{"version":3,"names":[],"sourceRoot":"../../src","sources":["index.d.ts"],"mappings":""}

package/lib/module/index.d.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=index.d.js.map

package/lib/module/index.d.js.map

@@ -1 +0,0 @@
-{"version":3,"names":[],"sourceRoot":"../../src","sources":["index.d.ts"],"mappings":""}

package/lib/typescript/src/NativeTimezone.d.ts

@@ -1,9 +0,0 @@
-import type { TurboModule } from 'react-native';
-export interface Spec extends TurboModule {
-    getTimeZone(): string;
-    getRegionByLocale(): string;
-    getRegionByTelephony(): string;
-}
-declare const _default: Spec;
-export default _default;
-//# sourceMappingURL=NativeTimezone.d.ts.map

package/lib/typescript/src/NativeTimezone.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"NativeTimezone.d.ts","sourceRoot":"","sources":["../../../src/NativeTimezone.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAGhD,MAAM,WAAW,IAAK,SAAQ,WAAW;IACvC,WAAW,IAAI,MAAM,CAAC;IACtB,iBAAiB,IAAI,MAAM,CAAC;IAC5B,oBAAoB,IAAI,MAAM,CAAC;CAChC;;AAED,wBAAkE"}

package/lib/typescript/src/index.d.ts

@@ -1,8 +0,0 @@
-declare const _default: {
-    getTimeZone: () => any;
-    getRegionByLocale: () => any;
-    getRegionByTelephony: () => any;
-    isAutoTimeZoneEnabled: () => any;
-};
-export default _default;
-//# sourceMappingURL=index.d.ts.map

package/lib/typescript/src/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.tsx"],"names":[],"mappings":";;;;;;AAyBA,wBAUE"}

package/src/index.d.ts

@@ -1,8 +0,0 @@
-declare const _default: {
-  getTimeZone(): string | null;
-  getRegionByLocale(): string | null;
-  getRegionByTelephony(): string | null;
-  isAutoTimeZoneEnabled(): string | undefined;
-};
-
-export default _default;