react-native-asset 2.2.13 → 2.2.15

package/esm/clean-assets/ios.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ios.d.ts","sourceRoot":"","sources":["../../src/clean-assets/ios.ts"],"names":[],"mappings":"AASA,wBAA8B,cAAc,CAC1C,SAAS,EAAE,MAAM,EAAE,EACnB,cAAc,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,EACrD,OAAO,EAAE;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,iBAiC9B"}
+{"version":3,"file":"ios.d.ts","sourceRoot":"","sources":["../../src/clean-assets/ios.ts"],"names":[],"mappings":"AAaA,wBAA8B,cAAc,CAC1C,SAAS,EAAE,MAAM,EAAE,EACnB,cAAc,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,EACrD,OAAO,EAAE;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,iBAqC9B"}

package/esm/clean-assets/ios.js

@@ -1,13 +1,16 @@
 import * as dntShim from "../_dnt.shims.js";
 import * as path from "../deps/jsr.io/@std/path/1.1.4/mod.js";
-/// <reference types="../xcode.d.ts" />
 import * as xcode from "xcode";
+import * as xcodeParserUntyped from "xcode/lib/parser/pbxproj.js";
+const xcodeParser = xcodeParserUntyped;
 import createGroupWithMessage from "../react-native-lib/ios/createGroupWithMessage.js";
 import getPlist from "../react-native-lib/ios/getPlist.js";
 import writePlist from "../react-native-lib/ios/writePlist.js";
 import { getTargetUUIDs } from "../utils.js";
 export default async function cleanAssetsIos(filePaths, platformConfig, options) {
-    const project = xcode.project(platformConfig.pbxprojPath).parseSync();
+    const project = xcode.project(platformConfig.pbxprojPath);
+    const pbxprojContent = await dntShim.Deno.readFile(platformConfig.pbxprojPath).then((buf) => new TextDecoder("utf-8").decode(buf));
+    project.hash = xcodeParser.parse(pbxprojContent);
     createGroupWithMessage(project, "Resources");
     for (const targetUUID of getTargetUUIDs(project)) {
         // deno-lint-ignore no-await-in-loop -- sequential read/write to same plist file

package/esm/copy-assets/ios.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ios.d.ts","sourceRoot":"","sources":["../../src/copy-assets/ios.ts"],"names":[],"mappings":"AAWA,wBAA8B,aAAa,CACzC,SAAS,EAAE,MAAM,EAAE,EACnB,cAAc,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,EACrD,OAAO,EAAE;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,iBAyC9B"}
+{"version":3,"file":"ios.d.ts","sourceRoot":"","sources":["../../src/copy-assets/ios.ts"],"names":[],"mappings":"AAaA,wBAA8B,aAAa,CACzC,SAAS,EAAE,MAAM,EAAE,EACnB,cAAc,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,EACrD,OAAO,EAAE;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,iBAwD9B"}

package/esm/copy-assets/ios.js

@@ -1,28 +1,46 @@
 import * as dntShim from "../_dnt.shims.js";
 import * as path from "../deps/jsr.io/@std/path/1.1.4/mod.js";
-/// <reference types="../xcode.d.ts" />
 import * as xcode from "xcode";
-/// <reference types="../xcode.d.ts" />
-import * as xcodeParser from "xcode/lib/parser/pbxproj.js";
+import * as xcodeParserUntyped from "xcode/lib/parser/pbxproj.js";
+const xcodeParser = xcodeParserUntyped;
 import createGroupWithMessage from "../react-native-lib/ios/createGroupWithMessage.js";
 import getPlist from "../react-native-lib/ios/getPlist.js";
 import writePlist from "../react-native-lib/ios/writePlist.js";
 import { getTargetUUIDs } from "../utils.js";
 export default async function copyAssetsIos(filePaths, platformConfig, options) {
     const project = xcode.project(platformConfig.pbxprojPath);
-    const pbxprojContent = await dntShim.Deno.readFile(platformConfig.pbxprojPath).then((buf) => {
-        const decoder = new TextDecoder("utf-8");
-        return decoder.decode(buf);
-    });
+    const pbxprojContent = await dntShim.Deno.readFile(platformConfig.pbxprojPath).then((buf) => new TextDecoder("utf-8").decode(buf));
     project.hash = xcodeParser.parse(pbxprojContent);
     createGroupWithMessage(project, "Resources");
+    const targetUUIDs = getTargetUUIDs(project);
+    for (const filePath of filePaths) {
+        const relativeFilePath = path.relative(platformConfig.path, filePath);
+        let file = false;
+        for (const target of targetUUIDs) {
+            if (!file) {
+                file = project.addResourceFile(relativeFilePath, { target });
+                if (!file) {
+                    // We know the resource is already in the project but there's no obvious way to get the PBXFile reference
+                    // It's kinda sloppy but we can remove and re-add the resource to get the reference
+                    // This has the side effect of unlinking all other targets... not a problem because we're about to link them anyway
+                    project.removeResourceFile(relativeFilePath, { target });
+                    file = project.addResourceFile(relativeFilePath, { target });
+                    if (!file) {
+                        throw new Error(`Failed to add file to pbxproj "${filePath}"`);
+                    }
+                }
+            }
+            else {
+                file.target = target;
+                project.addToPbxResourcesBuildPhase(file);
+            }
+        }
+    }
+    await dntShim.Deno.writeTextFile(platformConfig.pbxprojPath, project.writeSync());
     const fileBasenames = filePaths.map((p) => path.basename(p));
-    for (const targetUUID of getTargetUUIDs(project)) {
+    for (const targetUUID of targetUUIDs) {
         // deno-lint-ignore no-await-in-loop -- sequential read/write to same plist file
         const plist = await getPlist(project, platformConfig.path, targetUUID);
-        for (const filePath of filePaths) {
-            project.addResourceFile(path.relative(platformConfig.path, filePath), { target: targetUUID });
-        }
         if (options.addFont && plist) {
             const existingFonts = plist.UIAppFonts || [];
             const allFonts = [...existingFonts, ...fileBasenames];
@@ -31,5 +49,4 @@ export default async function copyAssetsIos(filePaths, platformConfig, options)
         // deno-lint-ignore no-await-in-loop -- sequential read/write to same plist file
         await writePlist(project, platformConfig.path, plist, targetUUID);
     }
-    await dntShim.Deno.writeTextFile(platformConfig.pbxprojPath, project.writeSync());
 }

package/esm/utils.d.ts

@@ -1,10 +1,10 @@
-import type xcode from "xcode";
+import type { PBXProject } from "./xcode";
 /**
  * Get an array containing the UUID of each target in the project
  */
-export declare function getTargetUUIDs(project: xcode.Project): string[];
+export declare function getTargetUUIDs(project: PBXProject): string[];
 /**
  * Get a target by UUID
  */
-export declare function getTargetByUUID(project: xcode.Project, uuid: string): unknown;
+export declare function getTargetByUUID(project: PBXProject, uuid: string): unknown;
 //# sourceMappingURL=utils.d.ts.map

package/esm/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B;;GAEG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,GAAG,MAAM,EAAE,CAE/D;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,WAEnE"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAE1C;;GAEG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,UAAU,GAAG,MAAM,EAAE,CAE5D;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,WAEhE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-asset",
-  "version": "2.2.13",
+  "version": "2.2.15",
   "description": "Linking and unlinking of assets in your react-native app, works for fonts and sounds",
   "keywords": [
     "react-native",

package/script/clean-assets/ios.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ios.d.ts","sourceRoot":"","sources":["../../src/clean-assets/ios.ts"],"names":[],"mappings":"AASA,wBAA8B,cAAc,CAC1C,SAAS,EAAE,MAAM,EAAE,EACnB,cAAc,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,EACrD,OAAO,EAAE;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,iBAiC9B"}
+{"version":3,"file":"ios.d.ts","sourceRoot":"","sources":["../../src/clean-assets/ios.ts"],"names":[],"mappings":"AAaA,wBAA8B,cAAc,CAC1C,SAAS,EAAE,MAAM,EAAE,EACnB,cAAc,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,EACrD,OAAO,EAAE;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,iBAqC9B"}

package/script/clean-assets/ios.js

@@ -39,14 +39,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = cleanAssetsIos;
 const dntShim = __importStar(require("../_dnt.shims.js"));
 const path = __importStar(require("../deps/jsr.io/@std/path/1.1.4/mod.js"));
-/// <reference types="../xcode.d.ts" />
 const xcode = __importStar(require("xcode"));
+const xcodeParserUntyped = __importStar(require("xcode/lib/parser/pbxproj.js"));
+const xcodeParser = xcodeParserUntyped;
 const createGroupWithMessage_js_1 = __importDefault(require("../react-native-lib/ios/createGroupWithMessage.js"));
 const getPlist_js_1 = __importDefault(require("../react-native-lib/ios/getPlist.js"));
 const writePlist_js_1 = __importDefault(require("../react-native-lib/ios/writePlist.js"));
 const utils_js_1 = require("../utils.js");
 async function cleanAssetsIos(filePaths, platformConfig, options) {
-    const project = xcode.project(platformConfig.pbxprojPath).parseSync();
+    const project = xcode.project(platformConfig.pbxprojPath);
+    const pbxprojContent = await dntShim.Deno.readFile(platformConfig.pbxprojPath).then((buf) => new TextDecoder("utf-8").decode(buf));
+    project.hash = xcodeParser.parse(pbxprojContent);
     (0, createGroupWithMessage_js_1.default)(project, "Resources");
     for (const targetUUID of (0, utils_js_1.getTargetUUIDs)(project)) {
         // deno-lint-ignore no-await-in-loop -- sequential read/write to same plist file

package/script/copy-assets/ios.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ios.d.ts","sourceRoot":"","sources":["../../src/copy-assets/ios.ts"],"names":[],"mappings":"AAWA,wBAA8B,aAAa,CACzC,SAAS,EAAE,MAAM,EAAE,EACnB,cAAc,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,EACrD,OAAO,EAAE;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,iBAyC9B"}
+{"version":3,"file":"ios.d.ts","sourceRoot":"","sources":["../../src/copy-assets/ios.ts"],"names":[],"mappings":"AAaA,wBAA8B,aAAa,CACzC,SAAS,EAAE,MAAM,EAAE,EACnB,cAAc,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,EACrD,OAAO,EAAE;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,iBAwD9B"}

package/script/copy-assets/ios.js

@@ -39,29 +39,47 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = copyAssetsIos;
 const dntShim = __importStar(require("../_dnt.shims.js"));
 const path = __importStar(require("../deps/jsr.io/@std/path/1.1.4/mod.js"));
-/// <reference types="../xcode.d.ts" />
 const xcode = __importStar(require("xcode"));
-/// <reference types="../xcode.d.ts" />
-const xcodeParser = __importStar(require("xcode/lib/parser/pbxproj.js"));
+const xcodeParserUntyped = __importStar(require("xcode/lib/parser/pbxproj.js"));
+const xcodeParser = xcodeParserUntyped;
 const createGroupWithMessage_js_1 = __importDefault(require("../react-native-lib/ios/createGroupWithMessage.js"));
 const getPlist_js_1 = __importDefault(require("../react-native-lib/ios/getPlist.js"));
 const writePlist_js_1 = __importDefault(require("../react-native-lib/ios/writePlist.js"));
 const utils_js_1 = require("../utils.js");
 async function copyAssetsIos(filePaths, platformConfig, options) {
     const project = xcode.project(platformConfig.pbxprojPath);
-    const pbxprojContent = await dntShim.Deno.readFile(platformConfig.pbxprojPath).then((buf) => {
-        const decoder = new TextDecoder("utf-8");
-        return decoder.decode(buf);
-    });
+    const pbxprojContent = await dntShim.Deno.readFile(platformConfig.pbxprojPath).then((buf) => new TextDecoder("utf-8").decode(buf));
     project.hash = xcodeParser.parse(pbxprojContent);
     (0, createGroupWithMessage_js_1.default)(project, "Resources");
+    const targetUUIDs = (0, utils_js_1.getTargetUUIDs)(project);
+    for (const filePath of filePaths) {
+        const relativeFilePath = path.relative(platformConfig.path, filePath);
+        let file = false;
+        for (const target of targetUUIDs) {
+            if (!file) {
+                file = project.addResourceFile(relativeFilePath, { target });
+                if (!file) {
+                    // We know the resource is already in the project but there's no obvious way to get the PBXFile reference
+                    // It's kinda sloppy but we can remove and re-add the resource to get the reference
+                    // This has the side effect of unlinking all other targets... not a problem because we're about to link them anyway
+                    project.removeResourceFile(relativeFilePath, { target });
+                    file = project.addResourceFile(relativeFilePath, { target });
+                    if (!file) {
+                        throw new Error(`Failed to add file to pbxproj "${filePath}"`);
+                    }
+                }
+            }
+            else {
+                file.target = target;
+                project.addToPbxResourcesBuildPhase(file);
+            }
+        }
+    }
+    await dntShim.Deno.writeTextFile(platformConfig.pbxprojPath, project.writeSync());
     const fileBasenames = filePaths.map((p) => path.basename(p));
-    for (const targetUUID of (0, utils_js_1.getTargetUUIDs)(project)) {
+    for (const targetUUID of targetUUIDs) {
         // deno-lint-ignore no-await-in-loop -- sequential read/write to same plist file
         const plist = await (0, getPlist_js_1.default)(project, platformConfig.path, targetUUID);
-        for (const filePath of filePaths) {
-            project.addResourceFile(path.relative(platformConfig.path, filePath), { target: targetUUID });
-        }
         if (options.addFont && plist) {
             const existingFonts = plist.UIAppFonts || [];
             const allFonts = [...existingFonts, ...fileBasenames];
@@ -70,5 +88,4 @@ async function copyAssetsIos(filePaths, platformConfig, options) {
         // deno-lint-ignore no-await-in-loop -- sequential read/write to same plist file
         await (0, writePlist_js_1.default)(project, platformConfig.path, plist, targetUUID);
     }
-    await dntShim.Deno.writeTextFile(platformConfig.pbxprojPath, project.writeSync());
 }

package/script/utils.d.ts

@@ -1,10 +1,10 @@
-import type xcode from "xcode";
+import type { PBXProject } from "./xcode";
 /**
  * Get an array containing the UUID of each target in the project
  */
-export declare function getTargetUUIDs(project: xcode.Project): string[];
+export declare function getTargetUUIDs(project: PBXProject): string[];
 /**
  * Get a target by UUID
  */
-export declare function getTargetByUUID(project: xcode.Project, uuid: string): unknown;
+export declare function getTargetByUUID(project: PBXProject, uuid: string): unknown;
 //# sourceMappingURL=utils.d.ts.map

package/script/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B;;GAEG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,GAAG,MAAM,EAAE,CAE/D;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,WAEnE"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAE1C;;GAEG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,UAAU,GAAG,MAAM,EAAE,CAE5D;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,WAEhE"}