react-native-legal 1.0.0-next.1 → 1.1.0

package/README.md

@@ -4,7 +4,7 @@ Automagically generate license acknowledgements for your React Native app 🚀
 
 | Android | iOS | AndroidTV | tvOS |
 | - | - | - | - |
-| ![Android example](./static/android-expo.gif) | ![iOS example](./static/ios-expo.gif) | ![AndroidTV example](./static/android-tv.gif) | ![tvOS example](./static/tvos.gif) |
+| ![Android example](https://github.com/callstackincubator/react-native-legal/raw/main/static/android-expo.gif) | ![iOS example](https://github.com/callstackincubator/react-native-legal/raw/main/static/ios-expo.gif) | ![AndroidTV example](https://github.com/callstackincubator/react-native-legal/raw/main/static/android-tv.gif) | ![tvOS example](https://github.com/callstackincubator/react-native-legal/raw/main/static/tvos.gif) |
 
 ## Installation
 

package/android/build.gradle

@@ -55,14 +55,8 @@ repositories {
     google()
 }
 
-apply from: "$projectDir/react-native-helpers.gradle"
-
 dependencies {
-    if (project.ext.shouldConsumeReactNativeFromMavenCentral()) {
-        implementation "com.facebook.react:react-android" // Set by the React Native Gradle Plugin
-    } else {
-        implementation 'com.facebook.react:react-native:+' // From node_modules
-    }
+    implementation "com.facebook.react:react-android" // Set by the React Native Gradle Plugin
 
     def aboutLibrariesPluginVersion = "10.8.3"
     implementation("com.mikepenz:aboutlibraries-core-android:$aboutLibrariesPluginVersion")

package/ios/ReactNativeLegalModule.mm

@@ -1,6 +1,10 @@
 #import "ReactNativeLegalModule.h"
 
+#if __has_include(<ReactNativeLegal/ReactNativeLegal-Swift.h>)
+#import <ReactNativeLegal/ReactNativeLegal-Swift.h>
+#else
 #import "ReactNativeLegal-Swift.h"
+#endif
 
 #if RCT_NEW_ARCH_ENABLED
 #import "ReactNativeLegal.h"

package/ios/ReactNativeLegalTableViewController.swift

@@ -1,5 +1,5 @@
 class ReactNativeLegalTableViewController: UITableViewController {
-    private let CELL_IDENTIFIER = "OSSNoticeCell"
+    private let CELL_IDENTIFIER = "ReactNativeLegalCell"
     
     private var data: [ReactNativeLegalLicenseMetadata] = [] {
         didSet {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-legal",
-  "version": "1.0.0-next.1",
+  "version": "1.1.0",
   "description": "Acknowledge OSS libraries used in your React Native app",
   "keywords": [
     "react-native",
@@ -24,14 +24,13 @@
   "bugs": {
     "url": "https://github.com/callstackincubator/react-native-legal/issues"
   },
-  "homepage": "https://github.com/callstackincubator/react-native-legal#readme",
+  "homepage": "https://callstackincubator.github.io/react-native-legal/",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
   },
   "files": [
     "android/src",
     "android/build.gradle",
-    "android/react-native-helpers.gradle",
     "bare-plugin",
     "ios",
     "lib",
@@ -94,4 +93,4 @@
       "javaPackageName": "com.reactnativelegal"
     }
   }
-}
+}

package/plugin-utils/build/common.js

@@ -34,19 +34,23 @@ function arrayIncludesObject(array, object) {
 }
 exports.arrayIncludesObject = arrayIncludesObject;
 /**
- * Scans `package.json` and searches for all packages under `dependencies` field. Supports monorepo projects.
+ * Scans a single package and its dependencies for license information
  */
-function scanDependencies(appPackageJsonPath) {
-    const appPackageJson = require(path_1.default.resolve(appPackageJsonPath));
-    const dependencies = appPackageJson.dependencies;
-    return Object.keys(dependencies).reduce((acc, dependency) => {
-        try {
-            const localPackageJsonPath = getPackageJsonPath(dependency);
-            if (!localPackageJsonPath) {
-                console.warn(`[react-native-legal] skipping ${dependency} could not find package.json`);
-                return acc;
-            }
-            const localPackageJson = require(path_1.default.resolve(localPackageJsonPath));
+function scanPackage(packageName, version, processedPackages, result) {
+    const packageKey = `${packageName}@${version}`;
+    // Skip if already processed to avoid circular dependencies
+    if (processedPackages.has(packageKey)) {
+        return;
+    }
+    processedPackages.add(packageKey);
+    try {
+        const localPackageJsonPath = getPackageJsonPath(packageName);
+        if (!localPackageJsonPath) {
+            console.warn(`[react-native-legal] skipping ${packageName} could not find package.json`);
+            return;
+        }
+        const localPackageJson = require(path_1.default.resolve(localPackageJsonPath));
+        if (localPackageJson.private !== true) {
             const licenseFiles = glob.sync('LICEN{S,C}E{.md,}', {
                 cwd: path_1.default.dirname(localPackageJsonPath),
                 absolute: true,
@@ -54,7 +58,7 @@ function scanDependencies(appPackageJsonPath) {
                 nodir: true,
                 ignore: '**/{__tests__,__fixtures__,__mocks__}/**',
             });
-            acc[dependency] = {
+            result[packageName] = {
                 author: parseAuthorField(localPackageJson),
                 content: licenseFiles?.[0] ? fs_1.default.readFileSync(licenseFiles[0], { encoding: 'utf-8' }) : undefined,
                 description: localPackageJson.description,
@@ -63,11 +67,30 @@ function scanDependencies(appPackageJsonPath) {
                 version: localPackageJson.version,
             };
         }
-        catch (error) {
-            console.warn(`[react-native-legal] could not process package.json for ${dependency}`);
-        }
-        return acc;
-    }, {});
+        const dependencies = localPackageJson.dependencies || {};
+        const isWorkspacePackage = version.startsWith('workspace:');
+        if (!isWorkspacePackage)
+            return;
+        Object.entries(dependencies).forEach(([depName, depVersion]) => {
+            scanPackage(depName, depVersion, processedPackages, result);
+        });
+    }
+    catch (error) {
+        console.warn(`[react-native-legal] could not process package.json for ${packageName}`);
+    }
+}
+/**
+ * Scans `package.json` and searches for all packages under `dependencies` field. Supports monorepo projects.
+ */
+function scanDependencies(appPackageJsonPath) {
+    const appPackageJson = require(path_1.default.resolve(appPackageJsonPath));
+    const dependencies = appPackageJson.dependencies;
+    const result = {};
+    const processedPackages = new Set();
+    Object.entries(dependencies).forEach(([packageName, version]) => {
+        scanPackage(packageName, version, processedPackages, result);
+    });
+    return result;
 }
 exports.scanDependencies = scanDependencies;
 function needsQuoting(value) {

package/plugin-utils/src/common.ts

@@ -70,48 +70,81 @@ export function arrayIncludesObject(array?: unknown[], object?: unknown) {
   return array?.map((item) => compareObjects(item, object)).reduce((acc, curr) => acc || curr, false);
 }
 
+/**
+ * Scans a single package and its dependencies for license information
+ */
+function scanPackage(
+  packageName: string,
+  version: string,
+  processedPackages: Set<string>,
+  result: Record<string, LicenseObj>,
+) {
+  const packageKey = `${packageName}@${version}`;
+
+  // Skip if already processed to avoid circular dependencies
+  if (processedPackages.has(packageKey)) {
+    return;
+  }
+
+  processedPackages.add(packageKey);
+
+  try {
+    const localPackageJsonPath = getPackageJsonPath(packageName);
+
+    if (!localPackageJsonPath) {
+      console.warn(`[react-native-legal] skipping ${packageName} could not find package.json`);
+      return;
+    }
+
+    const localPackageJson = require(path.resolve(localPackageJsonPath));
+
+    if (localPackageJson.private !== true) {
+      const licenseFiles = glob.sync('LICEN{S,C}E{.md,}', {
+        cwd: path.dirname(localPackageJsonPath),
+        absolute: true,
+        nocase: true,
+        nodir: true,
+        ignore: '**/{__tests__,__fixtures__,__mocks__}/**',
+      });
+
+      result[packageName] = {
+        author: parseAuthorField(localPackageJson),
+        content: licenseFiles?.[0] ? fs.readFileSync(licenseFiles[0], { encoding: 'utf-8' }) : undefined,
+        description: localPackageJson.description,
+        type: parseLicenseField(localPackageJson),
+        url: parseRepositoryFieldToUrl(localPackageJson),
+        version: localPackageJson.version,
+      };
+    }
+
+    const dependencies = localPackageJson.dependencies || {};
+
+    const isWorkspacePackage = version.startsWith('workspace:');
+
+    if (!isWorkspacePackage) return;
+
+    Object.entries(dependencies).forEach(([depName, depVersion]) => {
+      scanPackage(depName, depVersion as string, processedPackages, result);
+    });
+  } catch (error) {
+    console.warn(`[react-native-legal] could not process package.json for ${packageName}`);
+  }
+}
+
 /**
  * Scans `package.json` and searches for all packages under `dependencies` field. Supports monorepo projects.
  */
 export function scanDependencies(appPackageJsonPath: string) {
   const appPackageJson = require(path.resolve(appPackageJsonPath));
   const dependencies: Record<string, string> = appPackageJson.dependencies;
+  const result: Record<string, LicenseObj> = {};
+  const processedPackages = new Set<string>();
 
-  return Object.keys(dependencies).reduce(
-    (acc, dependency) => {
-      try {
-        const localPackageJsonPath = getPackageJsonPath(dependency);
-
-        if (!localPackageJsonPath) {
-          console.warn(`[react-native-legal] skipping ${dependency} could not find package.json`);
-          return acc;
-        }
-
-        const localPackageJson = require(path.resolve(localPackageJsonPath));
-        const licenseFiles = glob.sync('LICEN{S,C}E{.md,}', {
-          cwd: path.dirname(localPackageJsonPath),
-          absolute: true,
-          nocase: true,
-          nodir: true,
-          ignore: '**/{__tests__,__fixtures__,__mocks__}/**',
-        });
-
-        acc[dependency] = {
-          author: parseAuthorField(localPackageJson),
-          content: licenseFiles?.[0] ? fs.readFileSync(licenseFiles[0], { encoding: 'utf-8' }) : undefined,
-          description: localPackageJson.description,
-          type: parseLicenseField(localPackageJson),
-          url: parseRepositoryFieldToUrl(localPackageJson),
-          version: localPackageJson.version,
-        };
-      } catch (error) {
-        console.warn(`[react-native-legal] could not process package.json for ${dependency}`);
-      }
+  Object.entries(dependencies).forEach(([packageName, version]) => {
+    scanPackage(packageName, version, processedPackages, result);
+  });
 
-      return acc;
-    },
-    {} as Record<string, LicenseObj>,
-  );
+  return result;
 }
 
 function needsQuoting(value: string) {

package/android/react-native-helpers.gradle

@@ -1,45 +0,0 @@
-def safeAppExtGet(prop, fallback) {
-    def appProject = rootProject.allprojects.find { it.plugins.hasPlugin('com.android.application') }
-    appProject?.ext?.has(prop) ? appProject.ext.get(prop) : fallback
-}
-
-// Let's detect react-native's directory, it will be used to determine RN's version
-// https://github.com/software-mansion/react-native-reanimated/blob/cda4627c3337c33674f05f755b7485165c6caca9/android/build.gradle#L88
-def resolveReactNativeDirectory() {
-    def reactNativeLocation = safeAppExtGet("REACT_NATIVE_NODE_MODULES_DIR", null)
-    if (reactNativeLocation != null) {
-        return file(reactNativeLocation)
-    }
-
-    // monorepo workaround
-    // react-native can be hoisted or in project's own node_modules
-    def reactNativeFromNodeModules = file("${projectDir}/../../react-native")
-    if (reactNativeFromNodeModules.exists()) {
-        return reactNativeFromNodeModules
-    }
-
-    def reactNativeFromProjectNodeModules = new File(["node", "--print", "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim()).getParentFile().getAbsoluteFile()
-    if (reactNativeFromProjectNodeModules.exists()) {
-        return reactNativeFromProjectNodeModules
-    }
-
-    throw new GradleException(
-        "[react-native-legal] Unable to resolve react-native location in " +
-        "node_modules. You should project extension property (in app/build.gradle) " +
-        "`REACT_NATIVE_NODE_MODULES_DIR` with path to react-native."
-    )
-}
-
-// https://github.com/software-mansion/react-native-reanimated/blob/cda4627c3337c33674f05f755b7485165c6caca9/android/build.gradle#L199#L205
-def reactNativeRootDir = resolveReactNativeDirectory()
-
-def reactProperties = new Properties()
-print("$reactNativeRootDir")
-file("$reactNativeRootDir/ReactAndroid/gradle.properties").withInputStream { reactProperties.load(it) }
-
-def REACT_NATIVE_VERSION = reactProperties.getProperty("VERSION_NAME")
-def REACT_NATIVE_MINOR_VERSION = REACT_NATIVE_VERSION.startsWith("0.0.0-") ? 1000 : REACT_NATIVE_VERSION.split("\\.")[1].toInteger()
-
-project.ext.shouldConsumeReactNativeFromMavenCentral = { ->
-    return REACT_NATIVE_MINOR_VERSION >= 71
-}