react-native-asset 2.2.3 → 2.2.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,6 @@
1
- export default function cleanAssetsAndroid(filePaths: string[], platformConfig: {
1
+ export default function cleanAssetsAndroid(filePaths: string[], _platformConfig: {
2
2
  path?: string;
3
- }, _options: {
3
+ }, options: {
4
4
  path: string;
5
5
  }): Promise<void>;
6
6
  //# sourceMappingURL=android.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"android.d.ts","sourceRoot":"","sources":["../../src/clean-assets/android.ts"],"names":[],"mappings":"AAGA,wBAA8B,kBAAkB,CAC9C,SAAS,EAAE,MAAM,EAAE,EACnB,cAAc,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,EACjC,QAAQ,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,iBAoB3B"}
1
+ {"version":3,"file":"android.d.ts","sourceRoot":"","sources":["../../src/clean-assets/android.ts"],"names":[],"mappings":"AAGA,wBAA8B,kBAAkB,CAC9C,SAAS,EAAE,MAAM,EAAE,EACnB,eAAe,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,EAClC,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,iBAW1B"}
@@ -1,24 +1,12 @@
1
1
  import * as dntShim from "../_dnt.shims.js";
2
2
  import * as path from "../deps/jsr.io/@std/path/1.1.3/mod.js";
3
- export default async function cleanAssetsAndroid(filePaths, platformConfig, _options) {
3
+ export default async function cleanAssetsAndroid(filePaths, _platformConfig, options) {
4
+ console.log(`options path in cleanAssetsAndroid: ${options.path}`);
4
5
  for (const p of filePaths) {
5
- try {
6
- // If absolute path was provided, remove directly, otherwise resolve relative to platform root
7
- const target = path.isAbsolute(p)
8
- ? p
9
- : (platformConfig?.path ? path.resolve(platformConfig.path, p) : p);
10
- try {
11
- const st = dntShim.Deno.lstatSync(target);
12
- if (st.isFile) {
13
- await dntShim.Deno.remove(target);
14
- }
15
- }
16
- catch (_e) {
17
- // ignore missing files
18
- }
19
- }
20
- catch (e) {
21
- console.error("Failed cleaning android asset", p, e);
6
+ const target = path.join(options.path, path.basename(p));
7
+ const st = await dntShim.Deno.lstat(target);
8
+ if (st.isFile) {
9
+ await dntShim.Deno.remove(target);
22
10
  }
23
11
  }
24
12
  }
package/esm/cli.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,MAAM,qBAsElB,CAAC"}
1
+ {"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,MAAM,qBAsElB,CAAC"}
package/esm/cli.js CHANGED
@@ -2,6 +2,7 @@ import * as dntShim from "./_dnt.shims.js";
2
2
  import * as path from "./deps/jsr.io/@std/path/1.1.3/mod.js";
3
3
  import { parseArgs } from "./deps/jsr.io/@std/cli/1.0.24/parse_args.js";
4
4
  import { linkAssets } from "./main.js";
5
+ import { pathToFileURL } from "node:url";
5
6
  export const runCli = async () => {
6
7
  const args = await parseArgs(dntShim.Deno.args, {
7
8
  alias: {
@@ -31,7 +32,7 @@ export const runCli = async () => {
31
32
  }
32
33
  }
33
34
  const reactNativeConfig = reactNativeConfigExists
34
- ? (await import(reactNativeConfigPath)).default
35
+ ? (await import(pathToFileURL(reactNativeConfigPath).href)).default
35
36
  : {};
36
37
  const merged = {
37
38
  assets: args.assets.length !== 0
package/esm/main.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"AASA,KAAK,YAAY,GAAG,KAAK,GAAG,SAAS,CAAC;AAEtC,eAAO,MAAM,UAAU,GACrB,wCAIG;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,SAAS,EAAE,GACR,CAAC,IAAI,YAAY,GAAG;QACnB,OAAO,EAAE,OAAO,CAAC;QACjB,MAAM,EAAE,MAAM,EAAE,CAAC;KAClB,GACF,CAAC;CACH,KACA,OAAO,CAAC,IAAI,CAiXd,CAAC"}
1
+ {"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"AASA,KAAK,YAAY,GAAG,KAAK,GAAG,SAAS,CAAC;AAEtC,eAAO,MAAM,UAAU,GACrB,wCAIG;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,SAAS,EAAE,GACR,CAAC,IAAI,YAAY,GAAG;QACnB,OAAO,EAAE,OAAO,CAAC;QACjB,MAAM,EAAE,MAAM,EAAE,CAAC;KAClB,GACF,CAAC;CACH,KACA,OAAO,CAAC,IAAI,CA2Wd,CAAC"}
package/esm/main.js CHANGED
@@ -118,16 +118,7 @@ export const linkAssets = async ({ rootPath, platforms, shouldUnlink = true, })
118
118
  },
119
119
  };
120
120
  const linkPlatform = ({ rootPath: rp, shouldUnlink: su }) => async ({ name, manifest, config: platformConfig, linkOptionsPerExt: lopExt, otherLinkOptions: otherOptions, cleanAssets, copyAssets, assets: assetsPaths, }) => {
121
- let prevRelativeAssets = [];
122
- try {
123
- prevRelativeAssets = (await manifest.read()).map((asset) => ({
124
- ...asset,
125
- path: asset.path.split("/").join(path.SEPARATOR),
126
- }));
127
- }
128
- catch (_) {
129
- // manifest not found -> ok
130
- }
121
+ const prevRelativeAssets = await manifest.read();
131
122
  let assets = [];
132
123
  const loadAsset = async (assetMightNotAbsolute) => {
133
124
  const asset = getAbsolute({
@@ -179,7 +170,7 @@ export const linkAssets = async ({ rootPath, platforms, shouldUnlink = true, })
179
170
  }))
180
171
  .filter(filterFilesToIgnore);
181
172
  if (su && prevRelativeAssetsWithExt.length > 0) {
182
- console.info(`Cleaning previously linked ${fileConfigName} assets from ${name} project`);
173
+ console.info(`Cleaning previously linked ${fileConfigName} assets from ${name} project, prevRelativeAssetsWithExt: ${prevRelativeAssetsWithExt.map((x) => x.path)}`);
183
174
  await cleanAssets(prevRelativeAssetsWithExt.map(({ path: filePath }) => getAbsolute({ filePath, dirPath: rp })), platformConfig, options);
184
175
  }
185
176
  if (assetsWithExt.length > 0) {
@@ -1,11 +1,11 @@
1
1
  export default function getManifest(projectPath: string): {
2
2
  read: () => Promise<{
3
3
  path: string;
4
- sha1?: string;
4
+ sha1: string;
5
5
  }[]>;
6
6
  write: (files: Array<{
7
7
  path: string;
8
- sha1?: string;
8
+ sha1: string;
9
9
  }>) => Promise<void>;
10
10
  };
11
11
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/manifest/index.ts"],"names":[],"mappings":"AAKA,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,WAAW,EAAE,MAAM;;cAON,MAAM;eAAS,MAAM;;mBAK7C,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;EAc9D"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/manifest/index.ts"],"names":[],"mappings":"AAUA,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,WAAW,EAAE,MAAM;;cAHjC,MAAM;cAAQ,MAAM;;mBAkBjB,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;EAiB7D"}
@@ -1,15 +1,18 @@
1
1
  import * as dntShim from "../_dnt.shims.js";
2
2
  import * as path from "../deps/jsr.io/@std/path/1.1.3/mod.js";
3
- const manifestFileName = "react-native-assets-manifest.json";
3
+ const manifestFileName = "link-assets-manifest.json";
4
4
  export default function getManifest(projectPath) {
5
5
  const manifestPath = path.resolve(projectPath, manifestFileName);
6
6
  return {
7
7
  read: async () => {
8
8
  try {
9
- const data = await dntShim.Deno.readTextFile(manifestPath);
10
- return JSON.parse(data);
9
+ const data = await dntShim.Deno.readFile(manifestPath);
10
+ return JSON.parse(new TextDecoder().decode(data)).data;
11
11
  }
12
- catch (_) {
12
+ catch (e) {
13
+ if (!(e instanceof dntShim.Deno.errors.NotFound)) {
14
+ throw e;
15
+ }
13
16
  return [];
14
17
  }
15
18
  },
@@ -22,7 +25,7 @@ export default function getManifest(projectPath) {
22
25
  catch (_) {
23
26
  await dntShim.Deno.mkdir(dir, { recursive: true });
24
27
  }
25
- await dntShim.Deno.writeTextFile(manifestPath, JSON.stringify(files, null, 2));
28
+ await dntShim.Deno.writeTextFile(manifestPath, JSON.stringify({ migIndex: 1, data: files }, null, 2));
26
29
  }
27
30
  catch (e) {
28
31
  throw e;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "react-native-asset",
3
- "version": "2.2.3",
3
+ "version": "2.2.5",
4
4
  "description": "Linking and unlinking of assets in your react-native app, works for fonts and sounds",
5
5
  "keywords": [
6
6
  "react-native",
@@ -1,6 +1,6 @@
1
- export default function cleanAssetsAndroid(filePaths: string[], platformConfig: {
1
+ export default function cleanAssetsAndroid(filePaths: string[], _platformConfig: {
2
2
  path?: string;
3
- }, _options: {
3
+ }, options: {
4
4
  path: string;
5
5
  }): Promise<void>;
6
6
  //# sourceMappingURL=android.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"android.d.ts","sourceRoot":"","sources":["../../src/clean-assets/android.ts"],"names":[],"mappings":"AAGA,wBAA8B,kBAAkB,CAC9C,SAAS,EAAE,MAAM,EAAE,EACnB,cAAc,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,EACjC,QAAQ,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,iBAoB3B"}
1
+ {"version":3,"file":"android.d.ts","sourceRoot":"","sources":["../../src/clean-assets/android.ts"],"names":[],"mappings":"AAGA,wBAA8B,kBAAkB,CAC9C,SAAS,EAAE,MAAM,EAAE,EACnB,eAAe,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,EAClC,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,iBAW1B"}
@@ -36,25 +36,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
36
36
  exports.default = cleanAssetsAndroid;
37
37
  const dntShim = __importStar(require("../_dnt.shims.js"));
38
38
  const path = __importStar(require("../deps/jsr.io/@std/path/1.1.3/mod.js"));
39
- async function cleanAssetsAndroid(filePaths, platformConfig, _options) {
39
+ async function cleanAssetsAndroid(filePaths, _platformConfig, options) {
40
+ console.log(`options path in cleanAssetsAndroid: ${options.path}`);
40
41
  for (const p of filePaths) {
41
- try {
42
- // If absolute path was provided, remove directly, otherwise resolve relative to platform root
43
- const target = path.isAbsolute(p)
44
- ? p
45
- : (platformConfig?.path ? path.resolve(platformConfig.path, p) : p);
46
- try {
47
- const st = dntShim.Deno.lstatSync(target);
48
- if (st.isFile) {
49
- await dntShim.Deno.remove(target);
50
- }
51
- }
52
- catch (_e) {
53
- // ignore missing files
54
- }
55
- }
56
- catch (e) {
57
- console.error("Failed cleaning android asset", p, e);
42
+ const target = path.join(options.path, path.basename(p));
43
+ const st = await dntShim.Deno.lstat(target);
44
+ if (st.isFile) {
45
+ await dntShim.Deno.remove(target);
58
46
  }
59
47
  }
60
48
  }
@@ -1 +1 @@
1
- {"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,MAAM,qBAsElB,CAAC"}
1
+ {"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,MAAM,qBAsElB,CAAC"}
package/script/cli.js CHANGED
@@ -38,6 +38,7 @@ const dntShim = __importStar(require("./_dnt.shims.js"));
38
38
  const path = __importStar(require("./deps/jsr.io/@std/path/1.1.3/mod.js"));
39
39
  const parse_args_js_1 = require("./deps/jsr.io/@std/cli/1.0.24/parse_args.js");
40
40
  const main_js_1 = require("./main.js");
41
+ const node_url_1 = require("node:url");
41
42
  const runCli = async () => {
42
43
  const args = await (0, parse_args_js_1.parseArgs)(dntShim.Deno.args, {
43
44
  alias: {
@@ -67,7 +68,7 @@ const runCli = async () => {
67
68
  }
68
69
  }
69
70
  const reactNativeConfig = reactNativeConfigExists
70
- ? (await Promise.resolve(`${reactNativeConfigPath}`).then(s => __importStar(require(s)))).default
71
+ ? (await Promise.resolve(`${(0, node_url_1.pathToFileURL)(reactNativeConfigPath).href}`).then(s => __importStar(require(s)))).default
71
72
  : {};
72
73
  const merged = {
73
74
  assets: args.assets.length !== 0
@@ -1 +1 @@
1
- {"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"AASA,KAAK,YAAY,GAAG,KAAK,GAAG,SAAS,CAAC;AAEtC,eAAO,MAAM,UAAU,GACrB,wCAIG;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,SAAS,EAAE,GACR,CAAC,IAAI,YAAY,GAAG;QACnB,OAAO,EAAE,OAAO,CAAC;QACjB,MAAM,EAAE,MAAM,EAAE,CAAC;KAClB,GACF,CAAC;CACH,KACA,OAAO,CAAC,IAAI,CAiXd,CAAC"}
1
+ {"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"AASA,KAAK,YAAY,GAAG,KAAK,GAAG,SAAS,CAAC;AAEtC,eAAO,MAAM,UAAU,GACrB,wCAIG;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,SAAS,EAAE,GACR,CAAC,IAAI,YAAY,GAAG;QACnB,OAAO,EAAE,OAAO,CAAC;QACjB,MAAM,EAAE,MAAM,EAAE,CAAC;KAClB,GACF,CAAC;CACH,KACA,OAAO,CAAC,IAAI,CA2Wd,CAAC"}
package/script/main.js CHANGED
@@ -157,16 +157,7 @@ const linkAssets = async ({ rootPath, platforms, shouldUnlink = true, }) => {
157
157
  },
158
158
  };
159
159
  const linkPlatform = ({ rootPath: rp, shouldUnlink: su }) => async ({ name, manifest, config: platformConfig, linkOptionsPerExt: lopExt, otherLinkOptions: otherOptions, cleanAssets, copyAssets, assets: assetsPaths, }) => {
160
- let prevRelativeAssets = [];
161
- try {
162
- prevRelativeAssets = (await manifest.read()).map((asset) => ({
163
- ...asset,
164
- path: asset.path.split("/").join(path.SEPARATOR),
165
- }));
166
- }
167
- catch (_) {
168
- // manifest not found -> ok
169
- }
160
+ const prevRelativeAssets = await manifest.read();
170
161
  let assets = [];
171
162
  const loadAsset = async (assetMightNotAbsolute) => {
172
163
  const asset = getAbsolute({
@@ -218,7 +209,7 @@ const linkAssets = async ({ rootPath, platforms, shouldUnlink = true, }) => {
218
209
  }))
219
210
  .filter(filterFilesToIgnore);
220
211
  if (su && prevRelativeAssetsWithExt.length > 0) {
221
- console.info(`Cleaning previously linked ${fileConfigName} assets from ${name} project`);
212
+ console.info(`Cleaning previously linked ${fileConfigName} assets from ${name} project, prevRelativeAssetsWithExt: ${prevRelativeAssetsWithExt.map((x) => x.path)}`);
222
213
  await cleanAssets(prevRelativeAssetsWithExt.map(({ path: filePath }) => getAbsolute({ filePath, dirPath: rp })), platformConfig, options);
223
214
  }
224
215
  if (assetsWithExt.length > 0) {
@@ -1,11 +1,11 @@
1
1
  export default function getManifest(projectPath: string): {
2
2
  read: () => Promise<{
3
3
  path: string;
4
- sha1?: string;
4
+ sha1: string;
5
5
  }[]>;
6
6
  write: (files: Array<{
7
7
  path: string;
8
- sha1?: string;
8
+ sha1: string;
9
9
  }>) => Promise<void>;
10
10
  };
11
11
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/manifest/index.ts"],"names":[],"mappings":"AAKA,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,WAAW,EAAE,MAAM;;cAON,MAAM;eAAS,MAAM;;mBAK7C,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;EAc9D"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/manifest/index.ts"],"names":[],"mappings":"AAUA,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,WAAW,EAAE,MAAM;;cAHjC,MAAM;cAAQ,MAAM;;mBAkBjB,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;EAiB7D"}
@@ -36,16 +36,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
36
36
  exports.default = getManifest;
37
37
  const dntShim = __importStar(require("../_dnt.shims.js"));
38
38
  const path = __importStar(require("../deps/jsr.io/@std/path/1.1.3/mod.js"));
39
- const manifestFileName = "react-native-assets-manifest.json";
39
+ const manifestFileName = "link-assets-manifest.json";
40
40
  function getManifest(projectPath) {
41
41
  const manifestPath = path.resolve(projectPath, manifestFileName);
42
42
  return {
43
43
  read: async () => {
44
44
  try {
45
- const data = await dntShim.Deno.readTextFile(manifestPath);
46
- return JSON.parse(data);
45
+ const data = await dntShim.Deno.readFile(manifestPath);
46
+ return JSON.parse(new TextDecoder().decode(data)).data;
47
47
  }
48
- catch (_) {
48
+ catch (e) {
49
+ if (!(e instanceof dntShim.Deno.errors.NotFound)) {
50
+ throw e;
51
+ }
49
52
  return [];
50
53
  }
51
54
  },
@@ -58,7 +61,7 @@ function getManifest(projectPath) {
58
61
  catch (_) {
59
62
  await dntShim.Deno.mkdir(dir, { recursive: true });
60
63
  }
61
- await dntShim.Deno.writeTextFile(manifestPath, JSON.stringify(files, null, 2));
64
+ await dntShim.Deno.writeTextFile(manifestPath, JSON.stringify({ migIndex: 1, data: files }, null, 2));
62
65
  }
63
66
  catch (e) {
64
67
  throw e;