expo-modules-autolinking 3.0.16 → 3.0.18

package/CHANGELOG.md

@@ -10,6 +10,18 @@
 
 ### 💡 Others
 
+## 3.0.18 — 2025-10-21
+
+### 🐛 Bug fixes
+
+- [Android] Fixed `library projects cannot set applicationIdSuffix`. ([#40477](https://github.com/expo/expo/pull/40477) by [@lukmccall](https://github.com/lukmccall))
+
+## 3.0.17 — 2025-10-21
+
+### 🐛 Bug fixes
+
+- fix globMatchFunctorAllAsync to check if globbed path is a file to prevent errors ([#40437](https://github.com/expo/expo/pull/40437) by [@artus9033](https://github.com/artus9033)) ([#40501](https://github.com/expo/expo/pull/40501) by [@kitten](https://github.com/kitten))
+
 ## 3.0.16 — 2025-10-20
 
 ### 🐛 Bug fixes

package/android/expo-gradle-plugin/expo-autolinking-plugin/src/main/kotlin/expo/modules/plugin/ExpoAutolinkingPlugin.kt

@@ -159,11 +159,6 @@ open class ExpoAutolinkingPlugin : Plugin<Project> {
 
         consumerFlavors.create(appFlavor.name).apply {
           this.dimension = dimension
-          appFlavor.applicationIdSuffix?.let { this.applicationIdSuffix = it }
-          appFlavor.versionNameSuffix?.let { this.versionNameSuffix = it }
-          if (appFlavor.manifestPlaceholders.isNotEmpty()) {
-            this.manifestPlaceholders.putAll(appFlavor.manifestPlaceholders)
-          }
         }
 
         project.logger.quiet("  -> Created flavor '${appFlavor.name}' (dimension='$dimension') in :${project.path}")

package/build/fileUtils.d.ts

@@ -1,4 +1,4 @@
-import { GlobOptions } from 'glob';
+import { type GlobOptions } from 'glob';
 /**
  * A matching function that takes a file path and its contents and returns a string if it matches, or null otherwise.
  */
@@ -10,9 +10,9 @@ export declare function fileExistsAsync(file: string): Promise<boolean>;
 /**
  * Search files that match the glob pattern and return all matches from the matchFunctor.
  */
-export declare function globMatchFunctorAllAsync(globPattern: string, matchFunctor: MatchFunctor, options?: GlobOptions): Promise<string[]>;
+export declare function globMatchFunctorAllAsync(globPattern: string, matchFunctor: MatchFunctor, options?: Omit<GlobOptions, 'withFileTypes'>): Promise<string[]>;
 /**
  * Search files that match the glob pattern and return the first match from the matchFunctor.
  */
-export declare function globMatchFunctorFirstAsync(globPattern: string, matchFunctor: MatchFunctor, options?: GlobOptions): Promise<string | null>;
+export declare function globMatchFunctorFirstAsync(globPattern: string, matchFunctor: MatchFunctor, options?: Omit<GlobOptions, 'withFileTypes'>): Promise<string | null>;
 export {};

package/build/fileUtils.js

@@ -19,7 +19,10 @@ async function fileExistsAsync(file) {
  * Search files that match the glob pattern and return all matches from the matchFunctor.
  */
 async function globMatchFunctorAllAsync(globPattern, matchFunctor, options) {
-    const globStream = glob_1.glob.stream(globPattern, { withFileTypes: true });
+    const globStream = glob_1.glob.stream(globPattern, {
+        ...options,
+        withFileTypes: true,
+    });
     const cwd = options?.cwd !== undefined ? `${options.cwd}` : process.cwd();
     const results = [];
     for await (const globPath of globStream) {
@@ -42,10 +45,16 @@ async function globMatchFunctorAllAsync(globPattern, matchFunctor, options) {
  * Search files that match the glob pattern and return the first match from the matchFunctor.
  */
 async function globMatchFunctorFirstAsync(globPattern, matchFunctor, options) {
-    const globStream = glob_1.glob.stream(globPattern, { ...options, withFileTypes: false });
+    const globStream = glob_1.glob.stream(globPattern, {
+        ...options,
+        withFileTypes: true,
+    });
     const cwd = options?.cwd !== undefined ? `${options.cwd}` : process.cwd();
-    for await (const file of globStream) {
-        let filePath = file.toString();
+    for await (const globPath of globStream) {
+        if (!globPath.isFile()) {
+            continue;
+        }
+        let filePath = globPath.fullpath();
         if (!path_1.default.isAbsolute(filePath)) {
             filePath = path_1.default.resolve(cwd, filePath);
         }

package/build/fileUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"fileUtils.js","sourceRoot":"","sources":["../src/fileUtils.ts"],"names":[],"mappings":";;;;;AAYA,0CAEC;AAKD,4DAuBC;AAKD,gEAmBC;AAlED,2DAA6B;AAC7B,+BAAyC;AACzC,gDAAwB;AAOxB;;GAEG;AACI,KAAK,UAAU,eAAe,CAAC,IAAY;IAChD,OAAO,CAAC,MAAM,kBAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,KAAK,CAAC;AACpE,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,wBAAwB,CAC5C,WAAmB,EACnB,YAA0B,EAC1B,OAAqB;IAErB,MAAM,UAAU,GAAG,WAAI,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IACrE,MAAM,GAAG,GAAG,OAAO,EAAE,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;IAC1E,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,IAAI,KAAK,EAAE,MAAM,QAAQ,IAAI,UAAU,EAAE,CAAC;QACxC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;YACvB,SAAS;QACX,CAAC;QACD,IAAI,QAAQ,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAC;QACnC,IAAI,CAAC,cAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC/B,QAAQ,GAAG,cAAI,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACzC,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,kBAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC7C,MAAM,OAAO,GAAG,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACjD,IAAI,OAAO,IAAI,IAAI,EAAE,CAAC;YACpB,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACxB,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,0BAA0B,CAC9C,WAAmB,EACnB,YAA0B,EAC1B,OAAqB;IAErB,MAAM,UAAU,GAAG,WAAI,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,GAAG,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC;IAClF,MAAM,GAAG,GAAG,OAAO,EAAE,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;IAC1E,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;QACpC,IAAI,QAAQ,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC/B,IAAI,CAAC,cAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC/B,QAAQ,GAAG,cAAI,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACzC,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,kBAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC7C,MAAM,OAAO,GAAG,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACjD,IAAI,OAAO,IAAI,IAAI,EAAE,CAAC;YACpB,OAAO,OAAO,CAAC;QACjB,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC","sourcesContent":["import fs from 'fs/promises';\nimport { glob, GlobOptions } from 'glob';\nimport path from 'path';\n\n/**\n * A matching function that takes a file path and its contents and returns a string if it matches, or null otherwise.\n */\ntype MatchFunctor = (filePath: string, contents: Buffer) => string | null;\n\n/**\n * Check if the file exists.\n */\nexport async function fileExistsAsync(file: string): Promise<boolean> {\n  return (await fs.stat(file).catch(() => null))?.isFile() ?? false;\n}\n\n/**\n * Search files that match the glob pattern and return all matches from the matchFunctor.\n */\nexport async function globMatchFunctorAllAsync(\n  globPattern: string,\n  matchFunctor: MatchFunctor,\n  options?: GlobOptions\n): Promise<string[]> {\n  const globStream = glob.stream(globPattern, { withFileTypes: true });\n  const cwd = options?.cwd !== undefined ? `${options.cwd}` : process.cwd();\n  const results: string[] = [];\n  for await (const globPath of globStream) {\n    if (!globPath.isFile()) {\n      continue;\n    }\n    let filePath = globPath.fullpath();\n    if (!path.isAbsolute(filePath)) {\n      filePath = path.resolve(cwd, filePath);\n    }\n    const contents = await fs.readFile(filePath);\n    const matched = matchFunctor(filePath, contents);\n    if (matched != null) {\n      results.push(matched);\n    }\n  }\n  return results;\n}\n\n/**\n * Search files that match the glob pattern and return the first match from the matchFunctor.\n */\nexport async function globMatchFunctorFirstAsync(\n  globPattern: string,\n  matchFunctor: MatchFunctor,\n  options?: GlobOptions\n): Promise<string | null> {\n  const globStream = glob.stream(globPattern, { ...options, withFileTypes: false });\n  const cwd = options?.cwd !== undefined ? `${options.cwd}` : process.cwd();\n  for await (const file of globStream) {\n    let filePath = file.toString();\n    if (!path.isAbsolute(filePath)) {\n      filePath = path.resolve(cwd, filePath);\n    }\n    const contents = await fs.readFile(filePath);\n    const matched = matchFunctor(filePath, contents);\n    if (matched != null) {\n      return matched;\n    }\n  }\n  return null;\n}\n"]}
+{"version":3,"file":"fileUtils.js","sourceRoot":"","sources":["../src/fileUtils.ts"],"names":[],"mappings":";;;;;AAYA,0CAEC;AAKD,4DA0BC;AAKD,gEAyBC;AA3ED,2DAA6B;AAC7B,+BAAiF;AACjF,gDAAwB;AAOxB;;GAEG;AACI,KAAK,UAAU,eAAe,CAAC,IAAY;IAChD,OAAO,CAAC,MAAM,kBAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,KAAK,CAAC;AACpE,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,wBAAwB,CAC5C,WAAmB,EACnB,YAA0B,EAC1B,OAA4C;IAE5C,MAAM,UAAU,GAAG,WAAI,CAAC,MAAM,CAAC,WAAW,EAAE;QAC1C,GAAG,OAAO;QACV,aAAa,EAAE,IAAI;KACY,CAAC,CAAC;IACnC,MAAM,GAAG,GAAG,OAAO,EAAE,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;IAC1E,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,IAAI,KAAK,EAAE,MAAM,QAAQ,IAAI,UAAU,EAAE,CAAC;QACxC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;YACvB,SAAS;QACX,CAAC;QACD,IAAI,QAAQ,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAC;QACnC,IAAI,CAAC,cAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC/B,QAAQ,GAAG,cAAI,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACzC,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,kBAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC7C,MAAM,OAAO,GAAG,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACjD,IAAI,OAAO,IAAI,IAAI,EAAE,CAAC;YACpB,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACxB,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,0BAA0B,CAC9C,WAAmB,EACnB,YAA0B,EAC1B,OAA4C;IAE5C,MAAM,UAAU,GAAG,WAAI,CAAC,MAAM,CAAC,WAAW,EAAE;QAC1C,GAAG,OAAO;QACV,aAAa,EAAE,IAAI;KACY,CAAC,CAAC;IACnC,MAAM,GAAG,GAAG,OAAO,EAAE,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;IAC1E,IAAI,KAAK,EAAE,MAAM,QAAQ,IAAI,UAAU,EAAE,CAAC;QACxC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;YACvB,SAAS;QACX,CAAC;QACD,IAAI,QAAQ,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAC;QACnC,IAAI,CAAC,cAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC/B,QAAQ,GAAG,cAAI,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACzC,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,kBAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC7C,MAAM,OAAO,GAAG,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACjD,IAAI,OAAO,IAAI,IAAI,EAAE,CAAC;YACpB,OAAO,OAAO,CAAC;QACjB,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC","sourcesContent":["import fs from 'fs/promises';\nimport { glob, type GlobOptions, type GlobOptionsWithFileTypesTrue } from 'glob';\nimport path from 'path';\n\n/**\n * A matching function that takes a file path and its contents and returns a string if it matches, or null otherwise.\n */\ntype MatchFunctor = (filePath: string, contents: Buffer) => string | null;\n\n/**\n * Check if the file exists.\n */\nexport async function fileExistsAsync(file: string): Promise<boolean> {\n  return (await fs.stat(file).catch(() => null))?.isFile() ?? false;\n}\n\n/**\n * Search files that match the glob pattern and return all matches from the matchFunctor.\n */\nexport async function globMatchFunctorAllAsync(\n  globPattern: string,\n  matchFunctor: MatchFunctor,\n  options?: Omit<GlobOptions, 'withFileTypes'>\n): Promise<string[]> {\n  const globStream = glob.stream(globPattern, {\n    ...options,\n    withFileTypes: true,\n  } as GlobOptionsWithFileTypesTrue);\n  const cwd = options?.cwd !== undefined ? `${options.cwd}` : process.cwd();\n  const results: string[] = [];\n  for await (const globPath of globStream) {\n    if (!globPath.isFile()) {\n      continue;\n    }\n    let filePath = globPath.fullpath();\n    if (!path.isAbsolute(filePath)) {\n      filePath = path.resolve(cwd, filePath);\n    }\n    const contents = await fs.readFile(filePath);\n    const matched = matchFunctor(filePath, contents);\n    if (matched != null) {\n      results.push(matched);\n    }\n  }\n  return results;\n}\n\n/**\n * Search files that match the glob pattern and return the first match from the matchFunctor.\n */\nexport async function globMatchFunctorFirstAsync(\n  globPattern: string,\n  matchFunctor: MatchFunctor,\n  options?: Omit<GlobOptions, 'withFileTypes'>\n): Promise<string | null> {\n  const globStream = glob.stream(globPattern, {\n    ...options,\n    withFileTypes: true,\n  } as GlobOptionsWithFileTypesTrue);\n  const cwd = options?.cwd !== undefined ? `${options.cwd}` : process.cwd();\n  for await (const globPath of globStream) {\n    if (!globPath.isFile()) {\n      continue;\n    }\n    let filePath = globPath.fullpath();\n    if (!path.isAbsolute(filePath)) {\n      filePath = path.resolve(cwd, filePath);\n    }\n    const contents = await fs.readFile(filePath);\n    const matched = matchFunctor(filePath, contents);\n    if (matched != null) {\n      return matched;\n    }\n  }\n  return null;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-autolinking",
-  "version": "3.0.16",
+  "version": "3.0.18",
   "description": "Scripts that autolink Expo modules.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -46,5 +46,5 @@
     "require-from-string": "^2.0.2",
     "resolve-from": "^5.0.0"
   },
-  "gitHead": "ea56136a4420322f46d00e4b1549595d8f85150e"
+  "gitHead": "931d2e741cb76062726e5a95a9ff1398bbf21242"
 }

package/src/fileUtils.ts

@@ -1,5 +1,5 @@
 import fs from 'fs/promises';
-import { glob, GlobOptions } from 'glob';
+import { glob, type GlobOptions, type GlobOptionsWithFileTypesTrue } from 'glob';
 import path from 'path';
 
 /**
@@ -20,9 +20,12 @@ export async function fileExistsAsync(file: string): Promise<boolean> {
 export async function globMatchFunctorAllAsync(
   globPattern: string,
   matchFunctor: MatchFunctor,
-  options?: GlobOptions
+  options?: Omit<GlobOptions, 'withFileTypes'>
 ): Promise<string[]> {
-  const globStream = glob.stream(globPattern, { withFileTypes: true });
+  const globStream = glob.stream(globPattern, {
+    ...options,
+    withFileTypes: true,
+  } as GlobOptionsWithFileTypesTrue);
   const cwd = options?.cwd !== undefined ? `${options.cwd}` : process.cwd();
   const results: string[] = [];
   for await (const globPath of globStream) {
@@ -48,12 +51,18 @@ export async function globMatchFunctorAllAsync(
 export async function globMatchFunctorFirstAsync(
   globPattern: string,
   matchFunctor: MatchFunctor,
-  options?: GlobOptions
+  options?: Omit<GlobOptions, 'withFileTypes'>
 ): Promise<string | null> {
-  const globStream = glob.stream(globPattern, { ...options, withFileTypes: false });
+  const globStream = glob.stream(globPattern, {
+    ...options,
+    withFileTypes: true,
+  } as GlobOptionsWithFileTypesTrue);
   const cwd = options?.cwd !== undefined ? `${options.cwd}` : process.cwd();
-  for await (const file of globStream) {
-    let filePath = file.toString();
+  for await (const globPath of globStream) {
+    if (!globPath.isFile()) {
+      continue;
+    }
+    let filePath = globPath.fullpath();
     if (!path.isAbsolute(filePath)) {
       filePath = path.resolve(cwd, filePath);
     }