@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
package/lib/copy-assets.js
CHANGED
|
@@ -25,7 +25,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
26
|
exports.rnxCopyAssetsCommand = exports.copyProjectAssets = exports.gatherConfigs = exports.copyAssets = exports.assembleAarBundle = exports.versionOf = void 0;
|
|
27
27
|
const console_1 = require("@rnx-kit/console");
|
|
28
|
-
const array_1 = require("@rnx-kit/tools-language/array");
|
|
29
28
|
const properties_1 = require("@rnx-kit/tools-language/properties");
|
|
30
29
|
const package_1 = require("@rnx-kit/tools-node/package");
|
|
31
30
|
const tools_react_native_1 = require("@rnx-kit/tools-react-native");
|
|
@@ -34,12 +33,13 @@ const fs = __importStar(require("fs-extra"));
|
|
|
34
33
|
const os = __importStar(require("os"));
|
|
35
34
|
const path = __importStar(require("path"));
|
|
36
35
|
const defaultAndroidConfig = {
|
|
37
|
-
androidPluginVersion: "7.
|
|
38
|
-
compileSdkVersion:
|
|
36
|
+
androidPluginVersion: "7.2.2",
|
|
37
|
+
compileSdkVersion: 33,
|
|
39
38
|
defaultConfig: {
|
|
40
39
|
minSdkVersion: 23,
|
|
41
40
|
targetSdkVersion: 29,
|
|
42
41
|
},
|
|
42
|
+
kotlinVersion: "1.7.22",
|
|
43
43
|
};
|
|
44
44
|
function ensureOption(options, opt, flag = opt) {
|
|
45
45
|
if (options[opt] == null) {
|
|
@@ -117,12 +117,12 @@ function run(command, args, options) {
|
|
|
117
117
|
}
|
|
118
118
|
}
|
|
119
119
|
async function assembleAarBundle(context, packageName, { aar }) {
|
|
120
|
-
var _a, _b, _c, _d, _e, _f;
|
|
120
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
121
121
|
if (!aar) {
|
|
122
122
|
return;
|
|
123
123
|
}
|
|
124
124
|
const findUp = require("find-up");
|
|
125
|
-
const gradlew =
|
|
125
|
+
const gradlew = findUp.sync(os.platform() === "win32" ? "gradlew.bat" : "gradlew");
|
|
126
126
|
if (!gradlew) {
|
|
127
127
|
(0, console_1.warn)(`Skipped \`${packageName}\`: cannot find \`gradlew\``);
|
|
128
128
|
return;
|
|
@@ -140,7 +140,7 @@ async function assembleAarBundle(context, packageName, { aar }) {
|
|
|
140
140
|
...customEnv,
|
|
141
141
|
};
|
|
142
142
|
const outputDir = path.join(context.options.assetsDest, "aar");
|
|
143
|
-
|
|
143
|
+
fs.ensureDirSync(outputDir);
|
|
144
144
|
const dest = path.join(outputDir, `${targetName}-${version}.aar`);
|
|
145
145
|
const targets = [`:${targetName}:assembleRelease`];
|
|
146
146
|
const targetsToCopy = [[output, dest]];
|
|
@@ -173,6 +173,7 @@ async function assembleAarBundle(context, packageName, { aar }) {
|
|
|
173
173
|
const minSdkVersion = (_c = (_b = android === null || android === void 0 ? void 0 : android.defaultConfig) === null || _b === void 0 ? void 0 : _b.minSdkVersion) !== null && _c !== void 0 ? _c : defaultAndroidConfig.defaultConfig.minSdkVersion;
|
|
174
174
|
const targetSdkVersion = (_e = (_d = android === null || android === void 0 ? void 0 : android.defaultConfig) === null || _d === void 0 ? void 0 : _d.targetSdkVersion) !== null && _e !== void 0 ? _e : defaultAndroidConfig.defaultConfig.targetSdkVersion;
|
|
175
175
|
const androidPluginVersion = (_f = android === null || android === void 0 ? void 0 : android.androidPluginVersion) !== null && _f !== void 0 ? _f : defaultAndroidConfig.androidPluginVersion;
|
|
176
|
+
const kotlinVersion = (_g = android === null || android === void 0 ? void 0 : android.kotlinVersion) !== null && _g !== void 0 ? _g : defaultAndroidConfig.kotlinVersion;
|
|
176
177
|
const buildRelativeReactNativePath = path.relative(buildDir, reactNativePath);
|
|
177
178
|
const buildGradle = [
|
|
178
179
|
"buildscript {",
|
|
@@ -181,6 +182,7 @@ async function assembleAarBundle(context, packageName, { aar }) {
|
|
|
181
182
|
` minSdkVersion = ${minSdkVersion}`,
|
|
182
183
|
` targetSdkVersion = ${targetSdkVersion}`,
|
|
183
184
|
` androidPluginVersion = "${androidPluginVersion}"`,
|
|
185
|
+
` kotlinVersion = "${kotlinVersion}"`,
|
|
184
186
|
" }",
|
|
185
187
|
"",
|
|
186
188
|
" repositories {",
|
|
@@ -190,6 +192,7 @@ async function assembleAarBundle(context, packageName, { aar }) {
|
|
|
190
192
|
"",
|
|
191
193
|
" dependencies {",
|
|
192
194
|
' classpath("com.android.tools.build:gradle:${project.ext.androidPluginVersion}")',
|
|
195
|
+
' classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.ext.kotlinVersion}")',
|
|
193
196
|
" }",
|
|
194
197
|
"}",
|
|
195
198
|
"",
|
|
@@ -211,43 +214,32 @@ async function assembleAarBundle(context, packageName, { aar }) {
|
|
|
211
214
|
`project(":${targetName}").projectDir = file(${JSON.stringify(androidProject)})`,
|
|
212
215
|
"",
|
|
213
216
|
].join("\n");
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
217
|
+
fs.ensureDirSync(buildDir);
|
|
218
|
+
fs.writeFileSync(path.join(buildDir, "build.gradle"), buildGradle);
|
|
219
|
+
fs.writeFileSync(path.join(buildDir, "gradle.properties"), gradleProperties);
|
|
220
|
+
fs.writeFileSync(path.join(buildDir, "settings.gradle"), settingsGradle);
|
|
218
221
|
// Run only one Gradle task at a time
|
|
219
222
|
run(gradlew, targets, { cwd: buildDir, stdio: "inherit", env });
|
|
220
223
|
}
|
|
221
224
|
await Promise.all(targetsToCopy.map(([src, dest]) => fs.copy(src, dest)));
|
|
222
225
|
}
|
|
223
226
|
exports.assembleAarBundle = assembleAarBundle;
|
|
224
|
-
|
|
225
|
-
if (!
|
|
226
|
-
return;
|
|
227
|
-
}
|
|
228
|
-
await fs.ensureDir(destination);
|
|
229
|
-
await Promise.all(files.map((file) => {
|
|
230
|
-
const basename = path.basename(file);
|
|
231
|
-
return fs.copy(file, `${destination}/${basename}`);
|
|
232
|
-
}));
|
|
233
|
-
}
|
|
234
|
-
async function copyXcodeAssets(xcassets, destination) {
|
|
235
|
-
if (!(0, array_1.isNonEmptyArray)(xcassets)) {
|
|
236
|
-
return;
|
|
227
|
+
function copyFiles(files, destination) {
|
|
228
|
+
if (!Array.isArray(files) || files.length === 0) {
|
|
229
|
+
return [];
|
|
237
230
|
}
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
}));
|
|
231
|
+
fs.ensureDirSync(destination);
|
|
232
|
+
return files.map((file) => {
|
|
233
|
+
return fs.copy(file, `${destination}/${path.basename(file)}`);
|
|
234
|
+
});
|
|
243
235
|
}
|
|
244
236
|
async function copyAssets({ options: { assetsDest, xcassetsDest } }, packageName, { assets, strings, xcassets }) {
|
|
245
237
|
const tasks = [
|
|
246
|
-
copyFiles(assets, `${assetsDest}/assets/${packageName}`),
|
|
247
|
-
copyFiles(strings, `${assetsDest}/strings/${packageName}`),
|
|
238
|
+
...copyFiles(assets, `${assetsDest}/assets/${packageName}`),
|
|
239
|
+
...copyFiles(strings, `${assetsDest}/strings/${packageName}`),
|
|
248
240
|
];
|
|
249
241
|
if (typeof xcassetsDest === "string") {
|
|
250
|
-
tasks.push(
|
|
242
|
+
tasks.push(...copyFiles(xcassets, xcassetsDest));
|
|
251
243
|
}
|
|
252
244
|
await Promise.all(tasks);
|
|
253
245
|
}
|
|
@@ -344,10 +336,7 @@ exports.gatherConfigs = gatherConfigs;
|
|
|
344
336
|
*/
|
|
345
337
|
async function copyProjectAssets(options) {
|
|
346
338
|
const projectRoot = (0, package_1.findPackageDir)() || process.cwd();
|
|
347
|
-
const
|
|
348
|
-
encoding: "utf-8",
|
|
349
|
-
});
|
|
350
|
-
const manifest = JSON.parse(content);
|
|
339
|
+
const manifest = (0, package_1.readPackage)(projectRoot);
|
|
351
340
|
const context = { projectRoot, manifest, options };
|
|
352
341
|
const assetConfigs = await gatherConfigs(context);
|
|
353
342
|
if (!assetConfigs) {
|
package/lib/copy-assets.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copy-assets.js","sourceRoot":"","sources":["../src/copy-assets.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"copy-assets.js","sourceRoot":"","sources":["../src/copy-assets.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rnx-kit/cli",
|
|
3
|
-
"version": "0.16.
|
|
3
|
+
"version": "0.16.9",
|
|
4
4
|
"description": "Command-line interface for working with kit packages in your repo",
|
|
5
5
|
"homepage": "https://github.com/microsoft/rnx-kit/tree/main/packages/cli",
|
|
6
6
|
"license": "MIT",
|
|
@@ -19,19 +19,19 @@
|
|
|
19
19
|
"test": "rnx-kit-scripts test"
|
|
20
20
|
},
|
|
21
21
|
"dependencies": {
|
|
22
|
-
"@rnx-kit/align-deps": "^2.2.
|
|
23
|
-
"@rnx-kit/config": "^0.6.
|
|
22
|
+
"@rnx-kit/align-deps": "^2.2.2",
|
|
23
|
+
"@rnx-kit/config": "^0.6.2",
|
|
24
24
|
"@rnx-kit/console": "^1.0.11",
|
|
25
|
-
"@rnx-kit/metro-plugin-cyclic-dependencies-detector": "^1.1.
|
|
26
|
-
"@rnx-kit/metro-plugin-duplicates-checker": "^2.1.
|
|
27
|
-
"@rnx-kit/metro-plugin-typescript": "^0.4.
|
|
25
|
+
"@rnx-kit/metro-plugin-cyclic-dependencies-detector": "^1.1.1",
|
|
26
|
+
"@rnx-kit/metro-plugin-duplicates-checker": "^2.1.1",
|
|
27
|
+
"@rnx-kit/metro-plugin-typescript": "^0.4.1",
|
|
28
28
|
"@rnx-kit/metro-serializer": "^1.0.11",
|
|
29
|
-
"@rnx-kit/metro-serializer-esbuild": "^0.1.
|
|
30
|
-
"@rnx-kit/metro-service": "^3.0.
|
|
31
|
-
"@rnx-kit/third-party-notices": "^1.3.
|
|
32
|
-
"@rnx-kit/tools-language": "^
|
|
33
|
-
"@rnx-kit/tools-node": "^
|
|
34
|
-
"@rnx-kit/tools-react-native": "^1.
|
|
29
|
+
"@rnx-kit/metro-serializer-esbuild": "^0.1.22",
|
|
30
|
+
"@rnx-kit/metro-service": "^3.0.4",
|
|
31
|
+
"@rnx-kit/third-party-notices": "^1.3.3",
|
|
32
|
+
"@rnx-kit/tools-language": "^2.0.0",
|
|
33
|
+
"@rnx-kit/tools-node": "^2.0.0",
|
|
34
|
+
"@rnx-kit/tools-react-native": "^1.3.1",
|
|
35
35
|
"chalk": "^4.1.0",
|
|
36
36
|
"find-up": "^5.0.0",
|
|
37
37
|
"fs-extra": "^10.0.0",
|
|
@@ -60,7 +60,7 @@
|
|
|
60
60
|
}
|
|
61
61
|
},
|
|
62
62
|
"devDependencies": {
|
|
63
|
-
"@react-native-community/cli-types": "^
|
|
63
|
+
"@react-native-community/cli-types": "^10.0.0",
|
|
64
64
|
"@rnx-kit/scripts": "*",
|
|
65
65
|
"@types/metro": "^0.76.0",
|
|
66
66
|
"@types/metro-babel-transformer": "^0.76.0",
|
package/src/bundle/metro.ts
CHANGED
|
@@ -1,12 +1,16 @@
|
|
|
1
1
|
import { info } from "@rnx-kit/console";
|
|
2
2
|
import type { BundleArgs as MetroBundleArgs } from "@rnx-kit/metro-service";
|
|
3
3
|
import { bundle } from "@rnx-kit/metro-service";
|
|
4
|
-
import
|
|
4
|
+
import * as fs from "fs";
|
|
5
5
|
import type { ConfigT } from "metro-config";
|
|
6
6
|
import * as path from "path";
|
|
7
7
|
import { customizeMetroConfig } from "../metro-config";
|
|
8
8
|
import type { CliPlatformBundleConfig } from "./types";
|
|
9
9
|
|
|
10
|
+
function ensureDir(p: string): void {
|
|
11
|
+
fs.mkdirSync(p, { recursive: true, mode: 0o755 });
|
|
12
|
+
}
|
|
13
|
+
|
|
10
14
|
/**
|
|
11
15
|
* Run the Metro bundler.
|
|
12
16
|
*
|
|
@@ -40,10 +44,13 @@ export async function metroBundle(
|
|
|
40
44
|
};
|
|
41
45
|
|
|
42
46
|
// ensure all output directories exist
|
|
43
|
-
|
|
44
|
-
metroBundleArgs.sourcemapOutput
|
|
45
|
-
|
|
46
|
-
|
|
47
|
+
ensureDir(path.dirname(metroBundleArgs.bundleOutput));
|
|
48
|
+
if (metroBundleArgs.sourcemapOutput) {
|
|
49
|
+
ensureDir(path.dirname(metroBundleArgs.sourcemapOutput));
|
|
50
|
+
}
|
|
51
|
+
if (metroBundleArgs.assetsDest) {
|
|
52
|
+
ensureDir(metroBundleArgs.assetsDest);
|
|
53
|
+
}
|
|
47
54
|
|
|
48
55
|
// create the bundle
|
|
49
56
|
await output(metroBundleArgs, metroConfig);
|
package/src/copy-assets.ts
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import type { Config as CLIConfig } from "@react-native-community/cli-types";
|
|
2
2
|
import { error, info, warn } from "@rnx-kit/console";
|
|
3
|
-
import { isNonEmptyArray } from "@rnx-kit/tools-language/array";
|
|
4
3
|
import { keysOf } from "@rnx-kit/tools-language/properties";
|
|
5
4
|
import type { PackageManifest } from "@rnx-kit/tools-node/package";
|
|
6
5
|
import {
|
|
@@ -27,6 +26,7 @@ export type AndroidArchive = {
|
|
|
27
26
|
minSdkVersion?: number;
|
|
28
27
|
targetSdkVersion?: number;
|
|
29
28
|
};
|
|
29
|
+
kotlinVersion?: string;
|
|
30
30
|
};
|
|
31
31
|
};
|
|
32
32
|
|
|
@@ -59,12 +59,13 @@ export type AssetsConfig = {
|
|
|
59
59
|
};
|
|
60
60
|
|
|
61
61
|
const defaultAndroidConfig: Required<Required<AndroidArchive>["android"]> = {
|
|
62
|
-
androidPluginVersion: "7.
|
|
63
|
-
compileSdkVersion:
|
|
62
|
+
androidPluginVersion: "7.2.2",
|
|
63
|
+
compileSdkVersion: 33,
|
|
64
64
|
defaultConfig: {
|
|
65
65
|
minSdkVersion: 23,
|
|
66
66
|
targetSdkVersion: 29,
|
|
67
67
|
},
|
|
68
|
+
kotlinVersion: "1.7.22",
|
|
68
69
|
};
|
|
69
70
|
|
|
70
71
|
function ensureOption(options: Options, opt: string, flag = opt) {
|
|
@@ -188,7 +189,7 @@ export async function assembleAarBundle(
|
|
|
188
189
|
}
|
|
189
190
|
|
|
190
191
|
const findUp = require("find-up");
|
|
191
|
-
const gradlew =
|
|
192
|
+
const gradlew = findUp.sync(
|
|
192
193
|
os.platform() === "win32" ? "gradlew.bat" : "gradlew"
|
|
193
194
|
);
|
|
194
195
|
if (!gradlew) {
|
|
@@ -215,7 +216,7 @@ export async function assembleAarBundle(
|
|
|
215
216
|
};
|
|
216
217
|
|
|
217
218
|
const outputDir = path.join(context.options.assetsDest, "aar");
|
|
218
|
-
|
|
219
|
+
fs.ensureDirSync(outputDir);
|
|
219
220
|
|
|
220
221
|
const dest = path.join(outputDir, `${targetName}-${version}.aar`);
|
|
221
222
|
|
|
@@ -268,6 +269,8 @@ export async function assembleAarBundle(
|
|
|
268
269
|
const androidPluginVersion =
|
|
269
270
|
android?.androidPluginVersion ??
|
|
270
271
|
defaultAndroidConfig.androidPluginVersion;
|
|
272
|
+
const kotlinVersion =
|
|
273
|
+
android?.kotlinVersion ?? defaultAndroidConfig.kotlinVersion;
|
|
271
274
|
const buildRelativeReactNativePath = path.relative(
|
|
272
275
|
buildDir,
|
|
273
276
|
reactNativePath
|
|
@@ -280,6 +283,7 @@ export async function assembleAarBundle(
|
|
|
280
283
|
` minSdkVersion = ${minSdkVersion}`,
|
|
281
284
|
` targetSdkVersion = ${targetSdkVersion}`,
|
|
282
285
|
` androidPluginVersion = "${androidPluginVersion}"`,
|
|
286
|
+
` kotlinVersion = "${kotlinVersion}"`,
|
|
283
287
|
" }",
|
|
284
288
|
"",
|
|
285
289
|
" repositories {",
|
|
@@ -289,6 +293,7 @@ export async function assembleAarBundle(
|
|
|
289
293
|
"",
|
|
290
294
|
" dependencies {",
|
|
291
295
|
' classpath("com.android.tools.build:gradle:${project.ext.androidPluginVersion}")',
|
|
296
|
+
' classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.ext.kotlinVersion}")',
|
|
292
297
|
" }",
|
|
293
298
|
"}",
|
|
294
299
|
"",
|
|
@@ -315,13 +320,13 @@ export async function assembleAarBundle(
|
|
|
315
320
|
"",
|
|
316
321
|
].join("\n");
|
|
317
322
|
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
323
|
+
fs.ensureDirSync(buildDir);
|
|
324
|
+
fs.writeFileSync(path.join(buildDir, "build.gradle"), buildGradle);
|
|
325
|
+
fs.writeFileSync(
|
|
321
326
|
path.join(buildDir, "gradle.properties"),
|
|
322
327
|
gradleProperties
|
|
323
328
|
);
|
|
324
|
-
|
|
329
|
+
fs.writeFileSync(path.join(buildDir, "settings.gradle"), settingsGradle);
|
|
325
330
|
|
|
326
331
|
// Run only one Gradle task at a time
|
|
327
332
|
run(gradlew, targets, { cwd: buildDir, stdio: "inherit", env });
|
|
@@ -330,35 +335,15 @@ export async function assembleAarBundle(
|
|
|
330
335
|
await Promise.all(targetsToCopy.map(([src, dest]) => fs.copy(src, dest)));
|
|
331
336
|
}
|
|
332
337
|
|
|
333
|
-
|
|
334
|
-
if (!
|
|
335
|
-
return;
|
|
338
|
+
function copyFiles(files: unknown, destination: string): Promise<void>[] {
|
|
339
|
+
if (!Array.isArray(files) || files.length === 0) {
|
|
340
|
+
return [];
|
|
336
341
|
}
|
|
337
342
|
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
return fs.copy(file, `${destination}/${basename}`);
|
|
343
|
-
})
|
|
344
|
-
);
|
|
345
|
-
}
|
|
346
|
-
|
|
347
|
-
async function copyXcodeAssets(
|
|
348
|
-
xcassets: unknown,
|
|
349
|
-
destination: string
|
|
350
|
-
): Promise<void> {
|
|
351
|
-
if (!isNonEmptyArray<string>(xcassets)) {
|
|
352
|
-
return;
|
|
353
|
-
}
|
|
354
|
-
|
|
355
|
-
await fs.ensureDir(destination);
|
|
356
|
-
await Promise.all(
|
|
357
|
-
xcassets.map((catalog) => {
|
|
358
|
-
const dest = `${destination}/${path.basename(catalog)}`;
|
|
359
|
-
return fs.copy(catalog, dest);
|
|
360
|
-
})
|
|
361
|
-
);
|
|
343
|
+
fs.ensureDirSync(destination);
|
|
344
|
+
return files.map((file) => {
|
|
345
|
+
return fs.copy(file, `${destination}/${path.basename(file)}`);
|
|
346
|
+
});
|
|
362
347
|
}
|
|
363
348
|
|
|
364
349
|
export async function copyAssets(
|
|
@@ -367,12 +352,12 @@ export async function copyAssets(
|
|
|
367
352
|
{ assets, strings, xcassets }: NativeAssets
|
|
368
353
|
): Promise<void> {
|
|
369
354
|
const tasks = [
|
|
370
|
-
copyFiles(assets, `${assetsDest}/assets/${packageName}`),
|
|
371
|
-
copyFiles(strings, `${assetsDest}/strings/${packageName}`),
|
|
355
|
+
...copyFiles(assets, `${assetsDest}/assets/${packageName}`),
|
|
356
|
+
...copyFiles(strings, `${assetsDest}/strings/${packageName}`),
|
|
372
357
|
];
|
|
373
358
|
|
|
374
359
|
if (typeof xcassetsDest === "string") {
|
|
375
|
-
tasks.push(
|
|
360
|
+
tasks.push(...copyFiles(xcassets, xcassetsDest));
|
|
376
361
|
}
|
|
377
362
|
|
|
378
363
|
await Promise.all(tasks);
|
|
@@ -478,10 +463,7 @@ export async function gatherConfigs({
|
|
|
478
463
|
*/
|
|
479
464
|
export async function copyProjectAssets(options: Options): Promise<void> {
|
|
480
465
|
const projectRoot = findPackageDir() || process.cwd();
|
|
481
|
-
const
|
|
482
|
-
encoding: "utf-8",
|
|
483
|
-
});
|
|
484
|
-
const manifest: PackageManifest = JSON.parse(content);
|
|
466
|
+
const manifest = readPackage(projectRoot);
|
|
485
467
|
const context = { projectRoot, manifest, options };
|
|
486
468
|
const assetConfigs = await gatherConfigs(context);
|
|
487
469
|
if (!assetConfigs) {
|
|
@@ -13,10 +13,8 @@ fs.__setMockFiles = (files) => {
|
|
|
13
13
|
fs.__toJSON = () => vol.toJSON();
|
|
14
14
|
|
|
15
15
|
fs.copy = (...args) => vol.promises.copyFile(...args);
|
|
16
|
-
fs.
|
|
16
|
+
fs.ensureDirSync = (dir) => vol.mkdirSync(dir, { recursive: true });
|
|
17
17
|
fs.existsSync = (...args) => vol.existsSync(...args);
|
|
18
|
-
fs.
|
|
19
|
-
fs.readFile = (...args) => vol.promises.readFile(...args);
|
|
20
|
-
fs.writeFile = (...args) => vol.promises.writeFile(...args);
|
|
18
|
+
fs.writeFileSync = (...args) => vol.writeFileSync(...args);
|
|
21
19
|
|
|
22
20
|
module.exports = fs;
|
package/test/__mocks__/fs.js
CHANGED
|
@@ -12,6 +12,7 @@ fs.__toJSON = () => vol.toJSON();
|
|
|
12
12
|
|
|
13
13
|
fs.lstat = (...args) => Promise.resolve(vol.lstat(...args));
|
|
14
14
|
fs.lstatSync = (...args) => vol.lstatSync(...args);
|
|
15
|
+
fs.mkdirSync = (...args) => vol.mkdirSync(...args);
|
|
15
16
|
fs.readFileSync = (...args) => vol.readFileSync(...args);
|
|
16
17
|
fs.stat = (...args) => Promise.resolve(vol.stat(...args));
|
|
17
18
|
fs.statSync = (...args) => vol.statSync(...args);
|
|
@@ -1,16 +1,11 @@
|
|
|
1
1
|
import { metroBundle } from "../../src/bundle/metro";
|
|
2
2
|
import type { CliPlatformBundleConfig } from "../../src/bundle/types";
|
|
3
3
|
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
const mockCreateDirectory = jest.fn();
|
|
7
|
-
const toolsNodeFS = require("@rnx-kit/tools-node/fs");
|
|
8
|
-
toolsNodeFS.createDirectory = mockCreateDirectory;
|
|
9
|
-
|
|
10
|
-
const metroService = require("@rnx-kit/metro-service");
|
|
11
|
-
const mockBundle = metroService.bundle;
|
|
4
|
+
jest.mock("fs");
|
|
12
5
|
|
|
13
6
|
describe("CLI > Bundle > Metro > metroBundle", () => {
|
|
7
|
+
const { getDefaultConfig } = require("metro-config");
|
|
8
|
+
|
|
14
9
|
afterEach(() => {
|
|
15
10
|
jest.resetAllMocks();
|
|
16
11
|
});
|
|
@@ -56,14 +51,23 @@ describe("CLI > Bundle > Metro > metroBundle", () => {
|
|
|
56
51
|
|
|
57
52
|
it("creates directories for the bundle, the source map, and assets", async () => {
|
|
58
53
|
await metroBundle(await getDefaultConfig(), bundleConfig, dev, minify);
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
expect(
|
|
62
|
-
|
|
54
|
+
|
|
55
|
+
const fs = require("fs");
|
|
56
|
+
expect(Object.keys(fs.__toJSON())).toEqual(
|
|
57
|
+
expect.arrayContaining([
|
|
58
|
+
expect.stringContaining("/packages/cli/dist"),
|
|
59
|
+
expect.stringContaining("/packages/cli/map"),
|
|
60
|
+
expect.stringContaining("/packages/cli/src"),
|
|
61
|
+
])
|
|
62
|
+
);
|
|
63
63
|
});
|
|
64
64
|
|
|
65
65
|
it("invokes the Metro bundler using all input parameters", async () => {
|
|
66
|
+
const metroService = require("@rnx-kit/metro-service");
|
|
67
|
+
const mockBundle = metroService.bundle;
|
|
68
|
+
|
|
66
69
|
await metroBundle(await getDefaultConfig(), bundleConfig, dev, minify);
|
|
70
|
+
|
|
67
71
|
expect(mockBundle).toHaveBeenCalledTimes(1);
|
|
68
72
|
expect(mockBundle.mock.calls[0][0]).toEqual({
|
|
69
73
|
...bundleConfig,
|