@expo/fingerprint 0.21.6 → 0.21.7

package/build/ExpoConfig.d.ts

@@ -12,7 +12,9 @@ export declare function getExpoConfigAsync(projectRoot: string, options: Normali
  * Keep only the config-plugin modules attributable to applying plugins.
  *
  * Anything that also loads when plugins are skipped is the config-loading framework and is dropped.
- * In-repo files are always kept regardless of the diff, so a local plugin imported at the top of
- * `app.config` (which loads during config evaluation, not plugin application) is never lost.
+ * In-repo files and files of linked dependencies are always kept regardless of the diff, so a local
+ * or workspace plugin imported at the top of `app.config` (which loads during config evaluation,
+ * not plugin application) is never lost. `isLinkedDependencyFile` runs only for a file the diff
+ * would drop.
  */
-export declare function diffLoadedModules(withPlugins: LoadedModuleSource[], withoutPlugins: LoadedModuleSource[]): LoadedModuleSource[];
+export declare function diffLoadedModules(withPlugins: LoadedModuleSource[], withoutPlugins: LoadedModuleSource[], isLinkedDependencyFile?: (relativePosixPath: string) => boolean): LoadedModuleSource[];

package/build/ExpoConfig.js

@@ -56,6 +56,7 @@ function _resolvefrom() {
     return data;
 }
 const _ExpoConfigLoader = require("./ExpoConfigLoader");
+const _LinkedDependencies = require("./utils/LinkedDependencies");
 const _SpawnIPC = require("./utils/SpawnIPC");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
@@ -79,7 +80,7 @@ async function getExpoConfigAsync(projectRoot, options) {
             spawnConfigLoaderAsync(projectRoot, ignoredFile, /* skipPlugins */ true)
         ]);
         result.config = config;
-        result.loadedModules = diffLoadedModules(modulesWithPlugins ?? [], modulesWithoutPlugins ?? []);
+        result.loadedModules = diffLoadedModules(modulesWithPlugins ?? [], modulesWithoutPlugins ?? [], (0, _LinkedDependencies.createLinkedDependencyMatcher)(_path().default.resolve(projectRoot)));
     } catch (e) {
         if (e instanceof Error) {
             console.warn(`Cannot get Expo config from an Expo project - ${e.message}: `, e.stack);
@@ -114,9 +115,12 @@ async function spawnConfigLoaderAsync(projectRoot, ignoredFile, skipPlugins) {
     });
     return JSON.parse(message);
 }
-function diffLoadedModules(withPlugins, withoutPlugins) {
+function diffLoadedModules(withPlugins, withoutPlugins, isLinkedDependencyFile = ()=>false) {
     const skippedKeys = new Set(withoutPlugins.map(getLoadedModuleKey));
-    return withPlugins.filter((source)=>isInRepoLoadedModule(source) || !skippedKeys.has(getLoadedModuleKey(source)));
+    return withPlugins.filter((source)=>{
+        const key = getLoadedModuleKey(source);
+        return isInRepoLoadedModule(source) || !skippedKeys.has(key) || source.type === 'file' && isLinkedDependencyFile(key);
+    });
 }
 /** Stable identity of a loaded module: its file path, or its id for a virtual module. */ function getLoadedModuleKey(source) {
     return source.type === 'file' ? source.path : source.id;

package/build/ExpoConfig.js.map

@@ -1 +1 @@
-{"version":3,"sources":["ExpoConfig.ts"],"sourcesContent":[null],"names":["diffLoadedModules","getExpoConfigAsync","FINGERPRINT_ENV_MODE","projectRoot","options","result","config","loadedModules","resolveFrom","silent","path","resolve","tmpDir","fs","mkdtemp","join","os","tmpdir","ignoredFile","createTempIgnoredFileAsync","modulesWithPlugins","modulesWithoutPlugins","Promise","all","spawnConfigLoaderAsync","e","Error","console","warn","message","stack","rm","recursive","skipPlugins","args","getExpoConfigLoaderPath","push","childEnv","setNodeEnv","systemEnv","getOriginalEnv","__EXPO_CONFIG_MODE","spawnWithIpcAsync","cwd","env","JSON","parse","withPlugins","withoutPlugins","skippedKeys","Set","map","getLoadedModuleKey","filter","source","isInRepoLoadedModule","has","type","id","key","startsWith","includes","ignorePaths","ignorePathMatchObjects","match","pattern","writeFile"],"mappings":"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"}
+{"version":3,"sources":["ExpoConfig.ts"],"sourcesContent":[null],"names":["diffLoadedModules","getExpoConfigAsync","FINGERPRINT_ENV_MODE","projectRoot","options","result","config","loadedModules","resolveFrom","silent","path","resolve","tmpDir","fs","mkdtemp","join","os","tmpdir","ignoredFile","createTempIgnoredFileAsync","modulesWithPlugins","modulesWithoutPlugins","Promise","all","spawnConfigLoaderAsync","createLinkedDependencyMatcher","e","Error","console","warn","message","stack","rm","recursive","skipPlugins","args","getExpoConfigLoaderPath","push","childEnv","setNodeEnv","systemEnv","getOriginalEnv","__EXPO_CONFIG_MODE","spawnWithIpcAsync","cwd","env","JSON","parse","withPlugins","withoutPlugins","isLinkedDependencyFile","skippedKeys","Set","map","getLoadedModuleKey","filter","source","key","isInRepoLoadedModule","has","type","id","startsWith","includes","ignorePaths","ignorePathMatchObjects","match","pattern","writeFile"],"mappings":"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"}

package/build/utils/LinkedDependencies.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Create a test for a file of a dependency that the project declares and that lives outside
+ * `node_modules`, such as a linked workspace package in a monorepo. The nearest `package.json`
+ * above the file names its package. Lookups are cached per directory.
+ */
+export declare function createLinkedDependencyMatcher(projectRoot: string): (relativePosixPath: string) => boolean;

package/build/utils/LinkedDependencies.js

@@ -0,0 +1,76 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "createLinkedDependencyMatcher", {
+    enumerable: true,
+    get: function() {
+        return createLinkedDependencyMatcher;
+    }
+});
+function _fs() {
+    const data = /*#__PURE__*/ _interop_require_default(require("fs"));
+    _fs = function() {
+        return data;
+    };
+    return data;
+}
+function _path() {
+    const data = /*#__PURE__*/ _interop_require_default(require("path"));
+    _path = function() {
+        return data;
+    };
+    return data;
+}
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+const DEPENDENCY_FIELDS = [
+    'dependencies',
+    'devDependencies',
+    'peerDependencies',
+    'optionalDependencies'
+];
+function createLinkedDependencyMatcher(projectRoot) {
+    const dependencyNames = new Set(readDependencyNames(projectRoot));
+    const packageNameCache = new Map();
+    return (relativePosixPath)=>{
+        if (dependencyNames.size === 0 || relativePosixPath.split('/').includes('node_modules')) {
+            return false;
+        }
+        const dir = _path().default.dirname(_path().default.resolve(projectRoot, relativePosixPath));
+        const packageName = findPackageName(dir, packageNameCache);
+        return packageName !== null && dependencyNames.has(packageName);
+    };
+}
+function readDependencyNames(projectRoot) {
+    let packageJson;
+    try {
+        packageJson = JSON.parse(_fs().default.readFileSync(_path().default.join(projectRoot, 'package.json'), 'utf8'));
+    } catch  {
+        return [];
+    }
+    return DEPENDENCY_FIELDS.flatMap((field)=>Object.keys(packageJson[field] ?? {}));
+}
+function findPackageName(dir, cache) {
+    const cached = cache.get(dir);
+    if (cached !== undefined) {
+        return cached;
+    }
+    let packageName = null;
+    try {
+        // The sync read is fine: the result is cached per directory and few files reach this point.
+        const { name } = JSON.parse(_fs().default.readFileSync(_path().default.join(dir, 'package.json'), 'utf8'));
+        packageName = typeof name === 'string' ? name : null;
+    } catch  {}
+    const parentDir = _path().default.dirname(dir);
+    if (packageName === null && parentDir !== dir) {
+        packageName = findPackageName(parentDir, cache);
+    }
+    cache.set(dir, packageName);
+    return packageName;
+}
+
+//# sourceMappingURL=LinkedDependencies.js.map

package/build/utils/LinkedDependencies.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["utils/LinkedDependencies.ts"],"sourcesContent":[null],"names":["createLinkedDependencyMatcher","DEPENDENCY_FIELDS","projectRoot","dependencyNames","Set","readDependencyNames","packageNameCache","Map","relativePosixPath","size","split","includes","dir","path","dirname","resolve","packageName","findPackageName","has","packageJson","JSON","parse","fs","readFileSync","join","flatMap","field","Object","keys","cache","cached","get","undefined","name","parentDir","set"],"mappings":";;;;+BAegBA;;;eAAAA;;;;gEAfD;;;;;;;gEACE;;;;;;;;;;;AAEjB,MAAMC,oBAAoB;IACxB;IACA;IACA;IACA;CACD;AAOM,SAASD,8BACdE,WAAmB;IAEnB,MAAMC,kBAAkB,IAAIC,IAAIC,oBAAoBH;IACpD,MAAMI,mBAAmB,IAAIC;IAC7B,OAAO,CAACC;QACN,IAAIL,gBAAgBM,IAAI,KAAK,KAAKD,kBAAkBE,KAAK,CAAC,KAAKC,QAAQ,CAAC,iBAAiB;YACvF,OAAO;QACT;QACA,MAAMC,MAAMC,eAAI,CAACC,OAAO,CAACD,eAAI,CAACE,OAAO,CAACb,aAAaM;QACnD,MAAMQ,cAAcC,gBAAgBL,KAAKN;QACzC,OAAOU,gBAAgB,QAAQb,gBAAgBe,GAAG,CAACF;IACrD;AACF;AAEA,SAASX,oBAAoBH,WAAmB;IAC9C,IAAIiB;IACJ,IAAI;QACFA,cAAcC,KAAKC,KAAK,CAACC,aAAE,CAACC,YAAY,CAACV,eAAI,CAACW,IAAI,CAACtB,aAAa,iBAAiB;IACnF,EAAE,OAAM;QACN,OAAO,EAAE;IACX;IACA,OAAOD,kBAAkBwB,OAAO,CAAC,CAACC,QAAUC,OAAOC,IAAI,CAACT,WAAW,CAACO,MAAM,IAAI,CAAC;AACjF;AAEA,SAAST,gBAAgBL,GAAW,EAAEiB,KAAiC;IACrE,MAAMC,SAASD,MAAME,GAAG,CAACnB;IACzB,IAAIkB,WAAWE,WAAW;QACxB,OAAOF;IACT;IACA,IAAId,cAA6B;IACjC,IAAI;QACF,4FAA4F;QAC5F,MAAM,EAAEiB,IAAI,EAAE,GAAGb,KAAKC,KAAK,CAACC,aAAE,CAACC,YAAY,CAACV,eAAI,CAACW,IAAI,CAACZ,KAAK,iBAAiB;QAC5EI,cAAc,OAAOiB,SAAS,WAAWA,OAAO;IAClD,EAAE,OAAM,CAAC;IACT,MAAMC,YAAYrB,eAAI,CAACC,OAAO,CAACF;IAC/B,IAAII,gBAAgB,QAAQkB,cAActB,KAAK;QAC7CI,cAAcC,gBAAgBiB,WAAWL;IAC3C;IACAA,MAAMM,GAAG,CAACvB,KAAKI;IACf,OAAOA;AACT"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/fingerprint",
-  "version": "0.21.6",
+  "version": "0.21.7",
   "description": "A library to generate a fingerprint from a React Native project",
   "keywords": [
     "expo",
@@ -44,7 +44,7 @@
     "semver": "^7.7.4"
   },
   "devDependencies": {
-    "@expo/config": "~58.0.7",
+    "@expo/config": "~58.0.8",
     "@expo/internal-scripts": "58.0.4",
     "@expo/require-utils": "~58.0.4",
     "@types/debug": "^4.1.5",