@rnx-kit/cli 0.16.7 → 0.16.9
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.
- package/CHANGELOG.md +27 -0
- package/README.md +15 -6
- package/coverage/clover.xml +131 -135
- package/coverage/coverage-final.json +2 -2
- package/coverage/lcov-report/index.html +24 -24
- package/coverage/lcov-report/src/bundle/defaultPlugins.ts.html +1 -1
- package/coverage/lcov-report/src/bundle/index.html +11 -11
- package/coverage/lcov-report/src/bundle/kit-config.ts.html +1 -1
- package/coverage/lcov-report/src/bundle/metro.ts.html +33 -12
- package/coverage/lcov-report/src/bundle/overrides.ts.html +1 -1
- package/coverage/lcov-report/src/copy-assets.ts.html +44 -98
- package/coverage/lcov-report/src/index.html +19 -19
- package/coverage/lcov-report/src/metro-config.ts.html +1 -1
- package/coverage/lcov.info +246 -250
- package/lib/bundle/metro.d.ts.map +1 -1
- package/lib/bundle/metro.js +11 -5
- package/lib/bundle/metro.js.map +1 -1
- package/lib/copy-assets.d.ts +1 -0
- package/lib/copy-assets.d.ts.map +1 -1
- package/lib/copy-assets.js +24 -35
- package/lib/copy-assets.js.map +1 -1
- package/package.json +13 -13
- package/src/bundle/metro.ts +12 -5
- package/src/copy-assets.ts +25 -43
- package/test/__mocks__/fs-extra.js +2 -4
- package/test/__mocks__/fs.js +1 -0
- package/test/bundle/metro.test.ts +16 -12
|
@@ -25,28 +25,28 @@
|
|
|
25
25
|
<div class='fl pad1y space-right2'>
|
|
26
26
|
<span class="strong">100% </span>
|
|
27
27
|
<span class="quiet">Statements</span>
|
|
28
|
-
<span class='fraction'>
|
|
28
|
+
<span class='fraction'>10/10</span>
|
|
29
29
|
</div>
|
|
30
30
|
|
|
31
31
|
|
|
32
32
|
<div class='fl pad1y space-right2'>
|
|
33
|
-
<span class="strong">
|
|
33
|
+
<span class="strong">57.14% </span>
|
|
34
34
|
<span class="quiet">Branches</span>
|
|
35
|
-
<span class='fraction'>
|
|
35
|
+
<span class='fraction'>4/7</span>
|
|
36
36
|
</div>
|
|
37
37
|
|
|
38
38
|
|
|
39
39
|
<div class='fl pad1y space-right2'>
|
|
40
40
|
<span class="strong">100% </span>
|
|
41
41
|
<span class="quiet">Functions</span>
|
|
42
|
-
<span class='fraction'>
|
|
42
|
+
<span class='fraction'>2/2</span>
|
|
43
43
|
</div>
|
|
44
44
|
|
|
45
45
|
|
|
46
46
|
<div class='fl pad1y space-right2'>
|
|
47
47
|
<span class="strong">100% </span>
|
|
48
48
|
<span class="quiet">Lines</span>
|
|
49
|
-
<span class='fraction'>
|
|
49
|
+
<span class='fraction'>10/10</span>
|
|
50
50
|
</div>
|
|
51
51
|
|
|
52
52
|
|
|
@@ -113,7 +113,14 @@
|
|
|
113
113
|
<a name='L48'></a><a href='#L48'>48</a>
|
|
114
114
|
<a name='L49'></a><a href='#L49'>49</a>
|
|
115
115
|
<a name='L50'></a><a href='#L50'>50</a>
|
|
116
|
-
<a name='L51'></a><a href='#L51'>51</a
|
|
116
|
+
<a name='L51'></a><a href='#L51'>51</a>
|
|
117
|
+
<a name='L52'></a><a href='#L52'>52</a>
|
|
118
|
+
<a name='L53'></a><a href='#L53'>53</a>
|
|
119
|
+
<a name='L54'></a><a href='#L54'>54</a>
|
|
120
|
+
<a name='L55'></a><a href='#L55'>55</a>
|
|
121
|
+
<a name='L56'></a><a href='#L56'>56</a>
|
|
122
|
+
<a name='L57'></a><a href='#L57'>57</a>
|
|
123
|
+
<a name='L58'></a><a href='#L58'>58</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral"> </span>
|
|
117
124
|
<span class="cline-any cline-neutral"> </span>
|
|
118
125
|
<span class="cline-any cline-neutral"> </span>
|
|
119
126
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -123,6 +130,10 @@
|
|
|
123
130
|
<span class="cline-any cline-neutral"> </span>
|
|
124
131
|
<span class="cline-any cline-neutral"> </span>
|
|
125
132
|
<span class="cline-any cline-neutral"> </span>
|
|
133
|
+
<span class="cline-any cline-yes">12x</span>
|
|
134
|
+
<span class="cline-any cline-neutral"> </span>
|
|
135
|
+
<span class="cline-any cline-neutral"> </span>
|
|
136
|
+
<span class="cline-any cline-neutral"> </span>
|
|
126
137
|
<span class="cline-any cline-neutral"> </span>
|
|
127
138
|
<span class="cline-any cline-neutral"> </span>
|
|
128
139
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -157,8 +168,11 @@
|
|
|
157
168
|
<span class="cline-any cline-neutral"> </span>
|
|
158
169
|
<span class="cline-any cline-yes">4x</span>
|
|
159
170
|
<span class="cline-any cline-yes">4x</span>
|
|
171
|
+
<span class="cline-any cline-yes">4x</span>
|
|
160
172
|
<span class="cline-any cline-neutral"> </span>
|
|
161
173
|
<span class="cline-any cline-yes">4x</span>
|
|
174
|
+
<span class="cline-any cline-yes">4x</span>
|
|
175
|
+
<span class="cline-any cline-neutral"> </span>
|
|
162
176
|
<span class="cline-any cline-neutral"> </span>
|
|
163
177
|
<span class="cline-any cline-neutral"> </span>
|
|
164
178
|
<span class="cline-any cline-yes">4x</span>
|
|
@@ -166,12 +180,16 @@
|
|
|
166
180
|
<span class="cline-any cline-neutral"> </span></td><td class="text"><pre class="prettyprint lang-js">import { info } from "@rnx-kit/console";
|
|
167
181
|
import type { BundleArgs as MetroBundleArgs } from "@rnx-kit/metro-service";
|
|
168
182
|
import { bundle } from "@rnx-kit/metro-service";
|
|
169
|
-
import
|
|
183
|
+
import * as fs from "fs";
|
|
170
184
|
import type { ConfigT } from "metro-config";
|
|
171
185
|
import * as path from "path";
|
|
172
186
|
import { customizeMetroConfig } from "../metro-config";
|
|
173
187
|
import type { CliPlatformBundleConfig } from "./types";
|
|
174
188
|
|
|
189
|
+
function ensureDir(p: string): void {
|
|
190
|
+
fs.mkdirSync(p, { recursive: true, mode: 0o755 });
|
|
191
|
+
}
|
|
192
|
+
|
|
175
193
|
/**
|
|
176
194
|
* Run the Metro bundler.
|
|
177
195
|
*
|
|
@@ -205,10 +223,13 @@ export async function metroBundle(
|
|
|
205
223
|
};
|
|
206
224
|
|
|
207
225
|
// ensure all output directories exist
|
|
208
|
-
|
|
209
|
-
metroBundleArgs.sourcemapOutput
|
|
210
|
-
|
|
211
|
-
|
|
226
|
+
ensureDir(path.dirname(metroBundleArgs.bundleOutput));
|
|
227
|
+
if (metroBundleArgs.sourcemapOutput) {
|
|
228
|
+
ensureDir(path.dirname(metroBundleArgs.sourcemapOutput));
|
|
229
|
+
}
|
|
230
|
+
if (metroBundleArgs.assetsDest) {
|
|
231
|
+
ensureDir(metroBundleArgs.assetsDest);
|
|
232
|
+
}
|
|
212
233
|
|
|
213
234
|
// create the bundle
|
|
214
235
|
await output(metroBundleArgs, metroConfig);
|
|
@@ -220,7 +241,7 @@ export async function metroBundle(
|
|
|
220
241
|
<div class='footer quiet pad2 space-top1 center small'>
|
|
221
242
|
Code coverage generated by
|
|
222
243
|
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
|
|
223
|
-
at
|
|
244
|
+
at Tue May 09 2023 11:12:05 GMT+0000 (Coordinated Universal Time)
|
|
224
245
|
</div>
|
|
225
246
|
<script src="../../prettify.js"></script>
|
|
226
247
|
<script>
|
|
@@ -220,7 +220,7 @@ export function applyBundleConfigOverrides(
|
|
|
220
220
|
<div class='footer quiet pad2 space-top1 center small'>
|
|
221
221
|
Code coverage generated by
|
|
222
222
|
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
|
|
223
|
-
at
|
|
223
|
+
at Tue May 09 2023 11:12:05 GMT+0000 (Coordinated Universal Time)
|
|
224
224
|
</div>
|
|
225
225
|
<script src="../../prettify.js"></script>
|
|
226
226
|
<script>
|
|
@@ -23,30 +23,30 @@
|
|
|
23
23
|
<div class='clearfix'>
|
|
24
24
|
|
|
25
25
|
<div class='fl pad1y space-right2'>
|
|
26
|
-
<span class="strong">
|
|
26
|
+
<span class="strong">52.77% </span>
|
|
27
27
|
<span class="quiet">Statements</span>
|
|
28
|
-
<span class='fraction'>
|
|
28
|
+
<span class='fraction'>76/144</span>
|
|
29
29
|
</div>
|
|
30
30
|
|
|
31
31
|
|
|
32
32
|
<div class='fl pad1y space-right2'>
|
|
33
|
-
<span class="strong">
|
|
33
|
+
<span class="strong">47.47% </span>
|
|
34
34
|
<span class="quiet">Branches</span>
|
|
35
|
-
<span class='fraction'>
|
|
35
|
+
<span class='fraction'>47/99</span>
|
|
36
36
|
</div>
|
|
37
37
|
|
|
38
38
|
|
|
39
39
|
<div class='fl pad1y space-right2'>
|
|
40
|
-
<span class="strong">
|
|
40
|
+
<span class="strong">73.33% </span>
|
|
41
41
|
<span class="quiet">Functions</span>
|
|
42
|
-
<span class='fraction'>
|
|
42
|
+
<span class='fraction'>11/15</span>
|
|
43
43
|
</div>
|
|
44
44
|
|
|
45
45
|
|
|
46
46
|
<div class='fl pad1y space-right2'>
|
|
47
|
-
<span class="strong">
|
|
47
|
+
<span class="strong">52.44% </span>
|
|
48
48
|
<span class="quiet">Lines</span>
|
|
49
|
-
<span class='fraction'>
|
|
49
|
+
<span class='fraction'>75/143</span>
|
|
50
50
|
</div>
|
|
51
51
|
|
|
52
52
|
|
|
@@ -609,25 +609,7 @@
|
|
|
609
609
|
<a name='L544'></a><a href='#L544'>544</a>
|
|
610
610
|
<a name='L545'></a><a href='#L545'>545</a>
|
|
611
611
|
<a name='L546'></a><a href='#L546'>546</a>
|
|
612
|
-
<a name='L547'></a><a href='#L547'>547</a>
|
|
613
|
-
<a name='L548'></a><a href='#L548'>548</a>
|
|
614
|
-
<a name='L549'></a><a href='#L549'>549</a>
|
|
615
|
-
<a name='L550'></a><a href='#L550'>550</a>
|
|
616
|
-
<a name='L551'></a><a href='#L551'>551</a>
|
|
617
|
-
<a name='L552'></a><a href='#L552'>552</a>
|
|
618
|
-
<a name='L553'></a><a href='#L553'>553</a>
|
|
619
|
-
<a name='L554'></a><a href='#L554'>554</a>
|
|
620
|
-
<a name='L555'></a><a href='#L555'>555</a>
|
|
621
|
-
<a name='L556'></a><a href='#L556'>556</a>
|
|
622
|
-
<a name='L557'></a><a href='#L557'>557</a>
|
|
623
|
-
<a name='L558'></a><a href='#L558'>558</a>
|
|
624
|
-
<a name='L559'></a><a href='#L559'>559</a>
|
|
625
|
-
<a name='L560'></a><a href='#L560'>560</a>
|
|
626
|
-
<a name='L561'></a><a href='#L561'>561</a>
|
|
627
|
-
<a name='L562'></a><a href='#L562'>562</a>
|
|
628
|
-
<a name='L563'></a><a href='#L563'>563</a>
|
|
629
|
-
<a name='L564'></a><a href='#L564'>564</a>
|
|
630
|
-
<a name='L565'></a><a href='#L565'>565</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral"> </span>
|
|
612
|
+
<a name='L547'></a><a href='#L547'>547</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral"> </span>
|
|
631
613
|
<span class="cline-any cline-neutral"> </span>
|
|
632
614
|
<span class="cline-any cline-neutral"> </span>
|
|
633
615
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -697,6 +679,7 @@
|
|
|
697
679
|
<span class="cline-any cline-neutral"> </span>
|
|
698
680
|
<span class="cline-any cline-neutral"> </span>
|
|
699
681
|
<span class="cline-any cline-neutral"> </span>
|
|
682
|
+
<span class="cline-any cline-neutral"> </span>
|
|
700
683
|
<span class="cline-any cline-no"> </span>
|
|
701
684
|
<span class="cline-any cline-no"> </span>
|
|
702
685
|
<span class="cline-any cline-no"> </span>
|
|
@@ -897,6 +880,8 @@
|
|
|
897
880
|
<span class="cline-any cline-neutral"> </span>
|
|
898
881
|
<span class="cline-any cline-yes">2x</span>
|
|
899
882
|
<span class="cline-any cline-neutral"> </span>
|
|
883
|
+
<span class="cline-any cline-neutral"> </span>
|
|
884
|
+
<span class="cline-any cline-yes">2x</span>
|
|
900
885
|
<span class="cline-any cline-yes">2x</span>
|
|
901
886
|
<span class="cline-any cline-neutral"> </span>
|
|
902
887
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -934,6 +919,8 @@
|
|
|
934
919
|
<span class="cline-any cline-neutral"> </span>
|
|
935
920
|
<span class="cline-any cline-neutral"> </span>
|
|
936
921
|
<span class="cline-any cline-neutral"> </span>
|
|
922
|
+
<span class="cline-any cline-neutral"> </span>
|
|
923
|
+
<span class="cline-any cline-neutral"> </span>
|
|
937
924
|
<span class="cline-any cline-yes">2x</span>
|
|
938
925
|
<span class="cline-any cline-neutral"> </span>
|
|
939
926
|
<span class="cline-any cline-yes">2x</span>
|
|
@@ -960,33 +947,13 @@
|
|
|
960
947
|
<span class="cline-any cline-neutral"> </span>
|
|
961
948
|
<span class="cline-any cline-neutral"> </span>
|
|
962
949
|
<span class="cline-any cline-neutral"> </span>
|
|
963
|
-
<span class="cline-any cline-yes">
|
|
964
|
-
<span class="cline-any cline-yes">
|
|
965
|
-
<span class="cline-any cline-neutral"> </span>
|
|
966
|
-
<span class="cline-any cline-neutral"> </span>
|
|
967
|
-
<span class="cline-any cline-yes">2x</span>
|
|
968
|
-
<span class="cline-any cline-yes">2x</span>
|
|
969
|
-
<span class="cline-any cline-neutral"> </span>
|
|
970
|
-
<span class="cline-any cline-yes">2x</span>
|
|
971
|
-
<span class="cline-any cline-yes">2x</span>
|
|
972
|
-
<span class="cline-any cline-neutral"> </span>
|
|
973
|
-
<span class="cline-any cline-neutral"> </span>
|
|
974
|
-
<span class="cline-any cline-neutral"> </span>
|
|
975
|
-
<span class="cline-any cline-neutral"> </span>
|
|
950
|
+
<span class="cline-any cline-yes">14x</span>
|
|
951
|
+
<span class="cline-any cline-yes">11x</span>
|
|
976
952
|
<span class="cline-any cline-neutral"> </span>
|
|
977
953
|
<span class="cline-any cline-neutral"> </span>
|
|
978
|
-
<span class="cline-any cline-neutral"> </span>
|
|
979
|
-
<span class="cline-any cline-neutral"> </span>
|
|
980
|
-
<span class="cline-any cline-yes">4x</span>
|
|
981
954
|
<span class="cline-any cline-yes">3x</span>
|
|
982
|
-
<span class="cline-any cline-
|
|
983
|
-
<span class="cline-any cline-
|
|
984
|
-
<span class="cline-any cline-yes">1x</span>
|
|
985
|
-
<span class="cline-any cline-yes">1x</span>
|
|
986
|
-
<span class="cline-any cline-neutral"> </span>
|
|
987
|
-
<span class="cline-any cline-yes">1x</span>
|
|
988
|
-
<span class="cline-any cline-yes">1x</span>
|
|
989
|
-
<span class="cline-any cline-neutral"> </span>
|
|
955
|
+
<span class="cline-any cline-yes">3x</span>
|
|
956
|
+
<span class="cline-any cline-yes">3x</span>
|
|
990
957
|
<span class="cline-any cline-neutral"> </span>
|
|
991
958
|
<span class="cline-any cline-neutral"> </span>
|
|
992
959
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -1108,9 +1075,6 @@
|
|
|
1108
1075
|
<span class="cline-any cline-neutral"> </span>
|
|
1109
1076
|
<span class="cline-any cline-no"> </span>
|
|
1110
1077
|
<span class="cline-any cline-no"> </span>
|
|
1111
|
-
<span class="cline-any cline-neutral"> </span>
|
|
1112
|
-
<span class="cline-any cline-neutral"> </span>
|
|
1113
|
-
<span class="cline-any cline-no"> </span>
|
|
1114
1078
|
<span class="cline-any cline-no"> </span>
|
|
1115
1079
|
<span class="cline-any cline-no"> </span>
|
|
1116
1080
|
<span class="cline-any cline-no"> </span>
|
|
@@ -1193,7 +1157,6 @@
|
|
|
1193
1157
|
<span class="cline-any cline-neutral"> </span>
|
|
1194
1158
|
<span class="cline-any cline-neutral"> </span></td><td class="text"><pre class="prettyprint lang-js">import type { Config as CLIConfig } from "@react-native-community/cli-types";
|
|
1195
1159
|
import { error, info, warn } from "@rnx-kit/console";
|
|
1196
|
-
import { isNonEmptyArray } from "@rnx-kit/tools-language/array";
|
|
1197
1160
|
import { keysOf } from "@rnx-kit/tools-language/properties";
|
|
1198
1161
|
import type { PackageManifest } from "@rnx-kit/tools-node/package";
|
|
1199
1162
|
import {
|
|
@@ -1220,6 +1183,7 @@ export type AndroidArchive = {
|
|
|
1220
1183
|
minSdkVersion?: number;
|
|
1221
1184
|
targetSdkVersion?: number;
|
|
1222
1185
|
};
|
|
1186
|
+
kotlinVersion?: string;
|
|
1223
1187
|
};
|
|
1224
1188
|
};
|
|
1225
1189
|
|
|
@@ -1252,12 +1216,13 @@ export type AssetsConfig = {
|
|
|
1252
1216
|
};
|
|
1253
1217
|
|
|
1254
1218
|
const defaultAndroidConfig: Required<Required<AndroidArchive>["android"]> = {
|
|
1255
|
-
androidPluginVersion: "7.
|
|
1256
|
-
compileSdkVersion:
|
|
1219
|
+
androidPluginVersion: "7.2.2",
|
|
1220
|
+
compileSdkVersion: 33,
|
|
1257
1221
|
defaultConfig: {
|
|
1258
1222
|
minSdkVersion: 23,
|
|
1259
1223
|
targetSdkVersion: 29,
|
|
1260
1224
|
},
|
|
1225
|
+
kotlinVersion: "1.7.22",
|
|
1261
1226
|
};
|
|
1262
1227
|
|
|
1263
1228
|
function <span class="fstat-no" title="function not covered" >ensureOption(</span>options: Options, opt: string, flag = <span class="branch-0 cbranch-no" title="branch not covered" >opt)</span> {
|
|
@@ -1381,7 +1346,7 @@ export async function assembleAarBundle(
|
|
|
1381
1346
|
}
|
|
1382
1347
|
|
|
1383
1348
|
const findUp = require("find-up");
|
|
1384
|
-
const gradlew =
|
|
1349
|
+
const gradlew = findUp.sync(
|
|
1385
1350
|
os.platform() === "win32" ? <span class="branch-0 cbranch-no" title="branch not covered" >"gradlew.bat" </span>: "gradlew"
|
|
1386
1351
|
);
|
|
1387
1352
|
if (!gradlew) {
|
|
@@ -1408,7 +1373,7 @@ export async function assembleAarBundle(
|
|
|
1408
1373
|
};
|
|
1409
1374
|
|
|
1410
1375
|
const outputDir = path.join(context.options.assetsDest, "aar");
|
|
1411
|
-
|
|
1376
|
+
fs.ensureDirSync(outputDir);
|
|
1412
1377
|
|
|
1413
1378
|
const dest = path.join(outputDir, `${targetName}-${version}.aar`);
|
|
1414
1379
|
|
|
@@ -1461,6 +1426,8 @@ export async function assembleAarBundle(
|
|
|
1461
1426
|
const androidPluginVersion =
|
|
1462
1427
|
android?.androidPluginVersion ??
|
|
1463
1428
|
defaultAndroidConfig.androidPluginVersion;
|
|
1429
|
+
const kotlinVersion =
|
|
1430
|
+
android?.kotlinVersion ?? defaultAndroidConfig.kotlinVersion;
|
|
1464
1431
|
const buildRelativeReactNativePath = path.relative(
|
|
1465
1432
|
buildDir,
|
|
1466
1433
|
reactNativePath
|
|
@@ -1473,6 +1440,7 @@ export async function assembleAarBundle(
|
|
|
1473
1440
|
` minSdkVersion = ${minSdkVersion}`,
|
|
1474
1441
|
` targetSdkVersion = ${targetSdkVersion}`,
|
|
1475
1442
|
` androidPluginVersion = "${androidPluginVersion}"`,
|
|
1443
|
+
` kotlinVersion = "${kotlinVersion}"`,
|
|
1476
1444
|
" }",
|
|
1477
1445
|
"",
|
|
1478
1446
|
" repositories {",
|
|
@@ -1482,6 +1450,7 @@ export async function assembleAarBundle(
|
|
|
1482
1450
|
"",
|
|
1483
1451
|
" dependencies {",
|
|
1484
1452
|
' classpath("com.android.tools.build:gradle:${project.ext.androidPluginVersion}")',
|
|
1453
|
+
' classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.ext.kotlinVersion}")',
|
|
1485
1454
|
" }",
|
|
1486
1455
|
"}",
|
|
1487
1456
|
"",
|
|
@@ -1508,13 +1477,13 @@ export async function assembleAarBundle(
|
|
|
1508
1477
|
"",
|
|
1509
1478
|
].join("\n");
|
|
1510
1479
|
|
|
1511
|
-
|
|
1512
|
-
|
|
1513
|
-
|
|
1480
|
+
fs.ensureDirSync(buildDir);
|
|
1481
|
+
fs.writeFileSync(path.join(buildDir, "build.gradle"), buildGradle);
|
|
1482
|
+
fs.writeFileSync(
|
|
1514
1483
|
path.join(buildDir, "gradle.properties"),
|
|
1515
1484
|
gradleProperties
|
|
1516
1485
|
);
|
|
1517
|
-
|
|
1486
|
+
fs.writeFileSync(path.join(buildDir, "settings.gradle"), settingsGradle);
|
|
1518
1487
|
|
|
1519
1488
|
// Run only one Gradle task at a time
|
|
1520
1489
|
run(gradlew, targets, { cwd: buildDir, stdio: "inherit", env });
|
|
@@ -1523,35 +1492,15 @@ export async function assembleAarBundle(
|
|
|
1523
1492
|
await Promise.all(targetsToCopy.map(([src, dest]) => fs.copy(src, dest)));
|
|
1524
1493
|
}
|
|
1525
1494
|
|
|
1526
|
-
|
|
1527
|
-
if (!
|
|
1528
|
-
return;
|
|
1495
|
+
function copyFiles(files: unknown, destination: string): Promise<void>[] {
|
|
1496
|
+
if (!Array.isArray(files) || files.length === 0) {
|
|
1497
|
+
return [];
|
|
1529
1498
|
}
|
|
1530
1499
|
|
|
1531
|
-
|
|
1532
|
-
|
|
1533
|
-
|
|
1534
|
-
|
|
1535
|
-
return fs.copy(file, `${destination}/${basename}`);
|
|
1536
|
-
})
|
|
1537
|
-
);
|
|
1538
|
-
}
|
|
1539
|
-
|
|
1540
|
-
async function copyXcodeAssets(
|
|
1541
|
-
xcassets: unknown,
|
|
1542
|
-
destination: string
|
|
1543
|
-
): Promise<void> {
|
|
1544
|
-
if (!isNonEmptyArray<string>(xcassets)) {
|
|
1545
|
-
return;
|
|
1546
|
-
}
|
|
1547
|
-
|
|
1548
|
-
await fs.ensureDir(destination);
|
|
1549
|
-
await Promise.all(
|
|
1550
|
-
xcassets.map((catalog) => {
|
|
1551
|
-
const dest = `${destination}/${path.basename(catalog)}`;
|
|
1552
|
-
return fs.copy(catalog, dest);
|
|
1553
|
-
})
|
|
1554
|
-
);
|
|
1500
|
+
fs.ensureDirSync(destination);
|
|
1501
|
+
return files.map((file) => {
|
|
1502
|
+
return fs.copy(file, `${destination}/${path.basename(file)}`);
|
|
1503
|
+
});
|
|
1555
1504
|
}
|
|
1556
1505
|
|
|
1557
1506
|
export async function copyAssets(
|
|
@@ -1560,12 +1509,12 @@ export async function copyAssets(
|
|
|
1560
1509
|
{ assets, strings, xcassets }: NativeAssets
|
|
1561
1510
|
): Promise<void> {
|
|
1562
1511
|
const tasks = [
|
|
1563
|
-
copyFiles(assets, `${assetsDest}/assets/${packageName}`),
|
|
1564
|
-
copyFiles(strings, `${assetsDest}/strings/${packageName}`),
|
|
1512
|
+
...copyFiles(assets, `${assetsDest}/assets/${packageName}`),
|
|
1513
|
+
...copyFiles(strings, `${assetsDest}/strings/${packageName}`),
|
|
1565
1514
|
];
|
|
1566
1515
|
|
|
1567
1516
|
if (typeof xcassetsDest === "string") {
|
|
1568
|
-
tasks.push(
|
|
1517
|
+
tasks.push(...copyFiles(xcassets, xcassetsDest));
|
|
1569
1518
|
}
|
|
1570
1519
|
|
|
1571
1520
|
await Promise.all(tasks);
|
|
@@ -1671,10 +1620,7 @@ export async function gatherConfigs({
|
|
|
1671
1620
|
*/
|
|
1672
1621
|
export async function <span class="fstat-no" title="function not covered" >copyProjectAssets(</span>options: Options): Promise<void> {
|
|
1673
1622
|
const projectRoot = <span class="cstat-no" title="statement not covered" >findPackageDir() || process.cwd();</span>
|
|
1674
|
-
const
|
|
1675
|
-
encoding: "utf-8",
|
|
1676
|
-
});
|
|
1677
|
-
const manifest: PackageManifest = <span class="cstat-no" title="statement not covered" >JSON.parse(content);</span>
|
|
1623
|
+
const manifest = <span class="cstat-no" title="statement not covered" >readPackage(projectRoot);</span>
|
|
1678
1624
|
const context = <span class="cstat-no" title="statement not covered" >{ projectRoot, manifest, options };</span>
|
|
1679
1625
|
const assetConfigs = <span class="cstat-no" title="statement not covered" >await gatherConfigs(context);</span>
|
|
1680
1626
|
<span class="cstat-no" title="statement not covered" > if (!assetConfigs) {</span>
|
|
@@ -1762,7 +1708,7 @@ export const rnxCopyAssetsCommand = {
|
|
|
1762
1708
|
<div class='footer quiet pad2 space-top1 center small'>
|
|
1763
1709
|
Code coverage generated by
|
|
1764
1710
|
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
|
|
1765
|
-
at
|
|
1711
|
+
at Tue May 09 2023 11:12:05 GMT+0000 (Coordinated Universal Time)
|
|
1766
1712
|
</div>
|
|
1767
1713
|
<script src="../prettify.js"></script>
|
|
1768
1714
|
<script>
|
|
@@ -23,30 +23,30 @@
|
|
|
23
23
|
<div class='clearfix'>
|
|
24
24
|
|
|
25
25
|
<div class='fl pad1y space-right2'>
|
|
26
|
-
<span class="strong">
|
|
26
|
+
<span class="strong">53.3% </span>
|
|
27
27
|
<span class="quiet">Statements</span>
|
|
28
|
-
<span class='fraction'>
|
|
28
|
+
<span class='fraction'>113/212</span>
|
|
29
29
|
</div>
|
|
30
30
|
|
|
31
31
|
|
|
32
32
|
<div class='fl pad1y space-right2'>
|
|
33
|
-
<span class="strong">
|
|
33
|
+
<span class="strong">48.22% </span>
|
|
34
34
|
<span class="quiet">Branches</span>
|
|
35
|
-
<span class='fraction'>
|
|
35
|
+
<span class='fraction'>68/141</span>
|
|
36
36
|
</div>
|
|
37
37
|
|
|
38
38
|
|
|
39
39
|
<div class='fl pad1y space-right2'>
|
|
40
|
-
<span class="strong">
|
|
40
|
+
<span class="strong">71.42% </span>
|
|
41
41
|
<span class="quiet">Functions</span>
|
|
42
|
-
<span class='fraction'>
|
|
42
|
+
<span class='fraction'>15/21</span>
|
|
43
43
|
</div>
|
|
44
44
|
|
|
45
45
|
|
|
46
46
|
<div class='fl pad1y space-right2'>
|
|
47
|
-
<span class="strong">
|
|
47
|
+
<span class="strong">53.08% </span>
|
|
48
48
|
<span class="quiet">Lines</span>
|
|
49
|
-
<span class='fraction'>
|
|
49
|
+
<span class='fraction'>112/211</span>
|
|
50
50
|
</div>
|
|
51
51
|
|
|
52
52
|
|
|
@@ -80,17 +80,17 @@
|
|
|
80
80
|
</thead>
|
|
81
81
|
<tbody><tr>
|
|
82
82
|
<td class="file medium" data-value="copy-assets.ts"><a href="copy-assets.ts.html">copy-assets.ts</a></td>
|
|
83
|
-
<td data-value="
|
|
84
|
-
<div class="chart"><div class="cover-fill" style="width:
|
|
83
|
+
<td data-value="52.77" class="pic medium">
|
|
84
|
+
<div class="chart"><div class="cover-fill" style="width: 52%"></div><div class="cover-empty" style="width: 48%"></div></div>
|
|
85
85
|
</td>
|
|
86
|
-
<td data-value="
|
|
87
|
-
<td data-value="
|
|
88
|
-
<td data-value="
|
|
89
|
-
<td data-value="
|
|
90
|
-
<td data-value="
|
|
91
|
-
<td data-value="
|
|
92
|
-
<td data-value="
|
|
93
|
-
<td data-value="
|
|
86
|
+
<td data-value="52.77" class="pct medium">52.77%</td>
|
|
87
|
+
<td data-value="144" class="abs medium">76/144</td>
|
|
88
|
+
<td data-value="47.47" class="pct low">47.47%</td>
|
|
89
|
+
<td data-value="99" class="abs low">47/99</td>
|
|
90
|
+
<td data-value="73.33" class="pct medium">73.33%</td>
|
|
91
|
+
<td data-value="15" class="abs medium">11/15</td>
|
|
92
|
+
<td data-value="52.44" class="pct medium">52.44%</td>
|
|
93
|
+
<td data-value="143" class="abs medium">75/143</td>
|
|
94
94
|
</tr>
|
|
95
95
|
|
|
96
96
|
<tr>
|
|
@@ -116,7 +116,7 @@
|
|
|
116
116
|
<div class='footer quiet pad2 space-top1 center small'>
|
|
117
117
|
Code coverage generated by
|
|
118
118
|
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
|
|
119
|
-
at
|
|
119
|
+
at Tue May 09 2023 11:12:05 GMT+0000 (Coordinated Universal Time)
|
|
120
120
|
</div>
|
|
121
121
|
<script src="../prettify.js"></script>
|
|
122
122
|
<script>
|
|
@@ -694,7 +694,7 @@ export function customizeMetroConfig(
|
|
|
694
694
|
<div class='footer quiet pad2 space-top1 center small'>
|
|
695
695
|
Code coverage generated by
|
|
696
696
|
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
|
|
697
|
-
at
|
|
697
|
+
at Tue May 09 2023 11:12:05 GMT+0000 (Coordinated Universal Time)
|
|
698
698
|
</div>
|
|
699
699
|
<script src="../prettify.js"></script>
|
|
700
700
|
<script>
|