@rnx-kit/cli 0.12.2 → 0.12.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.
- package/CHANGELOG.md +19 -0
- package/coverage/clover.xml +224 -188
- package/coverage/coverage-final.json +3 -3
- package/coverage/lcov-report/index.html +27 -27
- package/coverage/lcov-report/src/bundle/index.html +1 -1
- package/coverage/lcov-report/src/bundle/kit-config.ts.html +1 -1
- package/coverage/lcov-report/src/bundle/metro.ts.html +1 -1
- package/coverage/lcov-report/src/bundle/overrides.ts.html +1 -1
- package/coverage/lcov-report/src/copy-assets.ts.html +480 -111
- package/coverage/lcov-report/src/index.html +30 -30
- package/coverage/lcov-report/src/metro-config.ts.html +40 -22
- package/coverage/lcov-report/src/typescript/index.html +13 -13
- package/coverage/lcov-report/src/typescript/project-cache.ts.html +97 -16
- package/coverage/lcov.info +399 -335
- package/lib/copy-assets.d.ts +10 -1
- package/lib/copy-assets.d.ts.map +1 -1
- package/lib/copy-assets.js +111 -32
- package/lib/copy-assets.js.map +1 -1
- package/lib/metro-config.d.ts.map +1 -1
- package/lib/metro-config.js +17 -8
- package/lib/metro-config.js.map +1 -1
- package/lib/start.d.ts.map +1 -1
- package/lib/start.js +27 -8
- package/lib/start.js.map +1 -1
- package/lib/test.js +3 -6
- package/lib/test.js.map +1 -1
- package/lib/typescript/project-cache.d.ts +1 -1
- package/lib/typescript/project-cache.d.ts.map +1 -1
- package/lib/typescript/project-cache.js +26 -4
- package/lib/typescript/project-cache.js.map +1 -1
- package/package.json +1 -1
- package/src/copy-assets.ts +169 -46
- package/src/metro-config.ts +17 -11
- package/src/start.ts +48 -8
- package/src/test.ts +3 -3
- package/src/typescript/project-cache.ts +35 -8
- package/test/__mocks__/child_process.js +5 -0
- package/test/__mocks__/fs-extra.js +2 -0
- package/test/__mocks__/fs.js +19 -0
- package/test/copy-assets/assembleAarBundle.test.ts +306 -0
- package/test/{copy-assets.test.ts → copy-assets/copyAssets.test.ts} +3 -13
- package/test/copy-assets/helpers.ts +13 -0
|
@@ -0,0 +1,306 @@
|
|
|
1
|
+
import { spawnSync } from "child_process";
|
|
2
|
+
import * as path from "path";
|
|
3
|
+
import { findFiles, mockFiles } from "./helpers";
|
|
4
|
+
import { assembleAarBundle } from "../../src/copy-assets";
|
|
5
|
+
|
|
6
|
+
jest.mock("child_process");
|
|
7
|
+
jest.mock("fs");
|
|
8
|
+
|
|
9
|
+
export const options = {
|
|
10
|
+
platform: "android" as const,
|
|
11
|
+
assetsDest: "dist",
|
|
12
|
+
bundleAar: true,
|
|
13
|
+
};
|
|
14
|
+
|
|
15
|
+
export const context = {
|
|
16
|
+
projectRoot: path.resolve(__dirname, "..", ".."),
|
|
17
|
+
manifest: {
|
|
18
|
+
name: "@rnx-kit/cli",
|
|
19
|
+
version: "0.0.0-dev",
|
|
20
|
+
},
|
|
21
|
+
options,
|
|
22
|
+
};
|
|
23
|
+
|
|
24
|
+
describe("assembleAarBundle", () => {
|
|
25
|
+
const consoleWarnSpy = jest.spyOn(global.console, "warn");
|
|
26
|
+
|
|
27
|
+
afterEach(() => {
|
|
28
|
+
mockFiles();
|
|
29
|
+
consoleWarnSpy.mockReset();
|
|
30
|
+
spawnSync.mockReset();
|
|
31
|
+
});
|
|
32
|
+
|
|
33
|
+
afterAll(() => {
|
|
34
|
+
jest.resetAllMocks();
|
|
35
|
+
});
|
|
36
|
+
|
|
37
|
+
test("returns early if there is nothing to assemble", async () => {
|
|
38
|
+
await assembleAarBundle(context, context.manifest.name, {});
|
|
39
|
+
|
|
40
|
+
expect(consoleWarnSpy).not.toHaveBeenCalled();
|
|
41
|
+
expect(findFiles()).toEqual([]);
|
|
42
|
+
});
|
|
43
|
+
|
|
44
|
+
test("returns early if Gradle wrapper cannot be found", async () => {
|
|
45
|
+
await assembleAarBundle(context, context.manifest.name, { aar: {} });
|
|
46
|
+
|
|
47
|
+
expect(consoleWarnSpy).toHaveBeenCalledWith(
|
|
48
|
+
expect.anything(),
|
|
49
|
+
expect.stringMatching(/cannot find `gradlew`$/)
|
|
50
|
+
);
|
|
51
|
+
expect(spawnSync).not.toHaveBeenCalled();
|
|
52
|
+
expect(findFiles()).toEqual([]);
|
|
53
|
+
});
|
|
54
|
+
|
|
55
|
+
test("throws if target package cannot be found", async () => {
|
|
56
|
+
mockFiles({
|
|
57
|
+
gradlew: "",
|
|
58
|
+
"gradlew.bat": "",
|
|
59
|
+
});
|
|
60
|
+
|
|
61
|
+
expect(
|
|
62
|
+
assembleAarBundle(context, context.manifest.name, { aar: {} })
|
|
63
|
+
).rejects.toThrow();
|
|
64
|
+
expect(findFiles()).toEqual([
|
|
65
|
+
[expect.stringMatching(/[/\\]gradlew$/), ""],
|
|
66
|
+
[expect.stringMatching(/[/\\]gradlew.bat$/), ""],
|
|
67
|
+
]);
|
|
68
|
+
});
|
|
69
|
+
|
|
70
|
+
test("returns early if Gradle project cannot be found", async () => {
|
|
71
|
+
mockFiles({
|
|
72
|
+
gradlew: "",
|
|
73
|
+
"gradlew.bat": "",
|
|
74
|
+
"node_modules/@rnx-kit/react-native-auth/package.json": JSON.stringify({
|
|
75
|
+
version: "0.0.0-dev",
|
|
76
|
+
}),
|
|
77
|
+
});
|
|
78
|
+
|
|
79
|
+
await assembleAarBundle(context, "@rnx-kit/react-native-auth", { aar: {} });
|
|
80
|
+
|
|
81
|
+
expect(consoleWarnSpy).toHaveBeenCalledWith(
|
|
82
|
+
expect.anything(),
|
|
83
|
+
expect.stringMatching(/cannot find `build.gradle`/)
|
|
84
|
+
);
|
|
85
|
+
expect(spawnSync).not.toHaveBeenCalled();
|
|
86
|
+
expect(findFiles()).toEqual([
|
|
87
|
+
[expect.stringMatching(/[/\\]gradlew$/), ""],
|
|
88
|
+
[expect.stringMatching(/[/\\]gradlew.bat$/), ""],
|
|
89
|
+
[
|
|
90
|
+
expect.stringMatching(
|
|
91
|
+
/[/\\]node_modules[/\\]@rnx-kit[/\\]react-native-auth[/\\]package.json$/
|
|
92
|
+
),
|
|
93
|
+
JSON.stringify({ version: "0.0.0-dev" }),
|
|
94
|
+
],
|
|
95
|
+
]);
|
|
96
|
+
});
|
|
97
|
+
|
|
98
|
+
test("generates Android project if necessary", async () => {
|
|
99
|
+
mockFiles({
|
|
100
|
+
gradlew: "",
|
|
101
|
+
"gradlew.bat": "",
|
|
102
|
+
"node_modules/@rnx-kit/react-native-auth/android/build.gradle":
|
|
103
|
+
"build.gradle",
|
|
104
|
+
"node_modules/@rnx-kit/react-native-auth/android/build/outputs/aar/rnx-kit_react-native-auth-release.aar":
|
|
105
|
+
"rnx-kit_react-native-auth-release.aar",
|
|
106
|
+
"node_modules/@rnx-kit/react-native-auth/package.json": JSON.stringify({
|
|
107
|
+
version: "0.0.0-dev",
|
|
108
|
+
}),
|
|
109
|
+
"node_modules/react-native/package.json": JSON.stringify({
|
|
110
|
+
version: "1000.0.0-dev",
|
|
111
|
+
}),
|
|
112
|
+
});
|
|
113
|
+
|
|
114
|
+
await assembleAarBundle(context, "@rnx-kit/react-native-auth", { aar: {} });
|
|
115
|
+
|
|
116
|
+
expect(consoleWarnSpy).not.toHaveBeenCalled();
|
|
117
|
+
expect(spawnSync).toHaveBeenCalledWith(
|
|
118
|
+
expect.stringMatching(/[/\\]gradlew(?:\.bat)?$/),
|
|
119
|
+
[":rnx-kit_react-native-auth:assembleRelease"],
|
|
120
|
+
expect.objectContaining({
|
|
121
|
+
cwd: expect.stringMatching(
|
|
122
|
+
/[/\\]node_modules[/\\].rnx-gradle-build[/\\]rnx-kit_react-native-auth$/
|
|
123
|
+
),
|
|
124
|
+
})
|
|
125
|
+
);
|
|
126
|
+
expect(findFiles()).toEqual([
|
|
127
|
+
[expect.stringMatching(/[/\\]gradlew$/), ""],
|
|
128
|
+
[expect.stringMatching(/[/\\]gradlew.bat$/), ""],
|
|
129
|
+
[
|
|
130
|
+
expect.stringMatching(
|
|
131
|
+
/[/\\]node_modules[/\\]@rnx-kit[/\\]react-native-auth[/\\]android[/\\]build.gradle$/
|
|
132
|
+
),
|
|
133
|
+
"build.gradle",
|
|
134
|
+
],
|
|
135
|
+
[
|
|
136
|
+
expect.stringMatching(
|
|
137
|
+
/[/\\]node_modules[/\\]@rnx-kit[/\\]react-native-auth[/\\]android[/\\]build[/\\]outputs[/\\]aar[/\\]rnx-kit_react-native-auth-release.aar$/
|
|
138
|
+
),
|
|
139
|
+
"rnx-kit_react-native-auth-release.aar",
|
|
140
|
+
],
|
|
141
|
+
[
|
|
142
|
+
expect.stringMatching(
|
|
143
|
+
/[/\\]node_modules[/\\]@rnx-kit[/\\]react-native-auth[/\\]package.json$/
|
|
144
|
+
),
|
|
145
|
+
JSON.stringify({ version: "0.0.0-dev" }),
|
|
146
|
+
],
|
|
147
|
+
[
|
|
148
|
+
expect.stringMatching(
|
|
149
|
+
/[/\\]node_modules[/\\]react-native[/\\]package.json$/
|
|
150
|
+
),
|
|
151
|
+
JSON.stringify({ version: "1000.0.0-dev" }),
|
|
152
|
+
],
|
|
153
|
+
[
|
|
154
|
+
expect.stringMatching(
|
|
155
|
+
/[/\\]node_modules[/\\].rnx-gradle-build[/\\]rnx-kit_react-native-auth[/\\]build.gradle$/
|
|
156
|
+
),
|
|
157
|
+
expect.stringMatching(/^buildscript/),
|
|
158
|
+
],
|
|
159
|
+
[
|
|
160
|
+
expect.stringMatching(
|
|
161
|
+
/[/\\]node_modules[/\\].rnx-gradle-build[/\\]rnx-kit_react-native-auth[/\\]gradle.properties/
|
|
162
|
+
),
|
|
163
|
+
expect.stringMatching(/^android.useAndroidX=true/),
|
|
164
|
+
],
|
|
165
|
+
[
|
|
166
|
+
expect.stringMatching(
|
|
167
|
+
/[/\\]node_modules[/\\].rnx-gradle-build[/\\]rnx-kit_react-native-auth[/\\]settings.gradle$/
|
|
168
|
+
),
|
|
169
|
+
expect.stringMatching(
|
|
170
|
+
/include\(":rnx-kit_react-native-auth"\)\nproject\(":rnx-kit_react-native-auth"\).projectDir = file\(".*?[/\\]node_modules[/\\]@rnx-kit[/\\]react-native-auth[/\\]android"\)/
|
|
171
|
+
),
|
|
172
|
+
],
|
|
173
|
+
[
|
|
174
|
+
expect.stringMatching(
|
|
175
|
+
/[/\\]dist[/\\]aar[/\\]rnx-kit_react-native-auth-0.0.0-dev.aar$/
|
|
176
|
+
),
|
|
177
|
+
"rnx-kit_react-native-auth-release.aar",
|
|
178
|
+
],
|
|
179
|
+
]);
|
|
180
|
+
});
|
|
181
|
+
|
|
182
|
+
test("assembles Android archive using existing project", async () => {
|
|
183
|
+
mockFiles({
|
|
184
|
+
gradlew: "",
|
|
185
|
+
"gradlew.bat": "",
|
|
186
|
+
"node_modules/@rnx-kit/react-native-auth/android/build.gradle":
|
|
187
|
+
"build.gradle",
|
|
188
|
+
"node_modules/@rnx-kit/react-native-auth/android/build/outputs/aar/rnx-kit_react-native-auth-release.aar":
|
|
189
|
+
"rnx-kit_react-native-auth-release.aar",
|
|
190
|
+
"node_modules/@rnx-kit/react-native-auth/android/settings.gradle":
|
|
191
|
+
"settings.gradle",
|
|
192
|
+
"node_modules/@rnx-kit/react-native-auth/package.json": JSON.stringify({
|
|
193
|
+
version: "0.0.0-dev",
|
|
194
|
+
}),
|
|
195
|
+
"node_modules/react-native/package.json": JSON.stringify({
|
|
196
|
+
version: "1000.0.0-dev",
|
|
197
|
+
}),
|
|
198
|
+
});
|
|
199
|
+
|
|
200
|
+
await assembleAarBundle(context, "@rnx-kit/react-native-auth", { aar: {} });
|
|
201
|
+
|
|
202
|
+
expect(consoleWarnSpy).not.toHaveBeenCalled();
|
|
203
|
+
expect(spawnSync).toHaveBeenCalledWith(
|
|
204
|
+
expect.stringMatching(/[/\\]gradlew(?:\.bat)?$/),
|
|
205
|
+
[":rnx-kit_react-native-auth:assembleRelease"],
|
|
206
|
+
expect.objectContaining({
|
|
207
|
+
cwd: expect.stringMatching(
|
|
208
|
+
/[/\\]node_modules[/\\]@rnx-kit[/\\]react-native-auth[/\\]android$/
|
|
209
|
+
),
|
|
210
|
+
})
|
|
211
|
+
);
|
|
212
|
+
expect(findFiles()).toEqual([
|
|
213
|
+
[expect.stringMatching(/[/\\]gradlew$/), ""],
|
|
214
|
+
[expect.stringMatching(/[/\\]gradlew.bat$/), ""],
|
|
215
|
+
[
|
|
216
|
+
expect.stringMatching(
|
|
217
|
+
/[/\\]node_modules[/\\]@rnx-kit[/\\]react-native-auth[/\\]android[/\\]build.gradle$/
|
|
218
|
+
),
|
|
219
|
+
"build.gradle",
|
|
220
|
+
],
|
|
221
|
+
[
|
|
222
|
+
expect.stringMatching(
|
|
223
|
+
/[/\\]node_modules[/\\]@rnx-kit[/\\]react-native-auth[/\\]android[/\\]build[/\\]outputs[/\\]aar[/\\]rnx-kit_react-native-auth-release.aar$/
|
|
224
|
+
),
|
|
225
|
+
"rnx-kit_react-native-auth-release.aar",
|
|
226
|
+
],
|
|
227
|
+
[
|
|
228
|
+
expect.stringMatching(
|
|
229
|
+
/[/\\]node_modules[/\\]@rnx-kit[/\\]react-native-auth[/\\]android[/\\]settings.gradle$/
|
|
230
|
+
),
|
|
231
|
+
"settings.gradle",
|
|
232
|
+
],
|
|
233
|
+
[
|
|
234
|
+
expect.stringMatching(
|
|
235
|
+
/[/\\]node_modules[/\\]@rnx-kit[/\\]react-native-auth[/\\]package.json$/
|
|
236
|
+
),
|
|
237
|
+
JSON.stringify({ version: "0.0.0-dev" }),
|
|
238
|
+
],
|
|
239
|
+
[
|
|
240
|
+
expect.stringMatching(
|
|
241
|
+
/[/\\]node_modules[/\\]react-native[/\\]package.json$/
|
|
242
|
+
),
|
|
243
|
+
JSON.stringify({ version: "1000.0.0-dev" }),
|
|
244
|
+
],
|
|
245
|
+
[
|
|
246
|
+
expect.stringMatching(
|
|
247
|
+
/[/\\]dist[/\\]aar[/\\]rnx-kit_react-native-auth-0.0.0-dev.aar$/
|
|
248
|
+
),
|
|
249
|
+
"rnx-kit_react-native-auth-release.aar",
|
|
250
|
+
],
|
|
251
|
+
]);
|
|
252
|
+
});
|
|
253
|
+
|
|
254
|
+
test("allows the generated Android project to be configured", async () => {
|
|
255
|
+
mockFiles({
|
|
256
|
+
gradlew: "",
|
|
257
|
+
"gradlew.bat": "",
|
|
258
|
+
"node_modules/@rnx-kit/react-native-auth/android/build.gradle":
|
|
259
|
+
"build.gradle",
|
|
260
|
+
"node_modules/@rnx-kit/react-native-auth/android/build/outputs/aar/rnx-kit_react-native-auth-release.aar":
|
|
261
|
+
"rnx-kit_react-native-auth-release.aar",
|
|
262
|
+
"node_modules/@rnx-kit/react-native-auth/package.json": JSON.stringify({
|
|
263
|
+
version: "0.0.0-dev",
|
|
264
|
+
}),
|
|
265
|
+
"node_modules/react-native/package.json": JSON.stringify({
|
|
266
|
+
version: "1000.0.0-dev",
|
|
267
|
+
}),
|
|
268
|
+
});
|
|
269
|
+
|
|
270
|
+
await assembleAarBundle(context, "@rnx-kit/react-native-auth", {
|
|
271
|
+
aar: {
|
|
272
|
+
android: {
|
|
273
|
+
androidPluginVersion: "7.1.3",
|
|
274
|
+
compileSdkVersion: 31,
|
|
275
|
+
defaultConfig: {
|
|
276
|
+
minSdkVersion: 26,
|
|
277
|
+
targetSdkVersion: 30,
|
|
278
|
+
},
|
|
279
|
+
},
|
|
280
|
+
},
|
|
281
|
+
});
|
|
282
|
+
|
|
283
|
+
expect(consoleWarnSpy).not.toHaveBeenCalled();
|
|
284
|
+
expect(spawnSync).toHaveBeenCalledWith(
|
|
285
|
+
expect.stringMatching(/[/\\]gradlew(?:\.bat)?$/),
|
|
286
|
+
[":rnx-kit_react-native-auth:assembleRelease"],
|
|
287
|
+
expect.objectContaining({
|
|
288
|
+
cwd: expect.stringMatching(
|
|
289
|
+
/[/\\]node_modules[/\\].rnx-gradle-build[/\\]rnx-kit_react-native-auth$/
|
|
290
|
+
),
|
|
291
|
+
})
|
|
292
|
+
);
|
|
293
|
+
expect(findFiles()).toEqual(
|
|
294
|
+
expect.arrayContaining([
|
|
295
|
+
[
|
|
296
|
+
expect.stringMatching(
|
|
297
|
+
/[/\\]node_modules[/\\].rnx-gradle-build[/\\]rnx-kit_react-native-auth[/\\]build.gradle$/
|
|
298
|
+
),
|
|
299
|
+
expect.stringMatching(
|
|
300
|
+
/compileSdkVersion = 31\s+minSdkVersion = 26\s+targetSdkVersion = 30\s+androidPluginVersion = "7\.1\.3"/
|
|
301
|
+
),
|
|
302
|
+
],
|
|
303
|
+
])
|
|
304
|
+
);
|
|
305
|
+
});
|
|
306
|
+
});
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import fs from "fs-extra";
|
|
2
1
|
import * as path from "path";
|
|
3
|
-
import {
|
|
2
|
+
import { findFiles, mockFiles } from "./helpers";
|
|
3
|
+
import { copyAssets, gatherConfigs, versionOf } from "../../src/copy-assets";
|
|
4
4
|
|
|
5
5
|
const options = {
|
|
6
6
|
platform: "ios" as const,
|
|
@@ -10,7 +10,7 @@ const options = {
|
|
|
10
10
|
};
|
|
11
11
|
|
|
12
12
|
const context = {
|
|
13
|
-
projectRoot: path.resolve(__dirname, ".."),
|
|
13
|
+
projectRoot: path.resolve(__dirname, "..", ".."),
|
|
14
14
|
manifest: {
|
|
15
15
|
name: "@rnx-kit/cli",
|
|
16
16
|
version: "0.0.0-dev",
|
|
@@ -18,16 +18,6 @@ const context = {
|
|
|
18
18
|
options,
|
|
19
19
|
};
|
|
20
20
|
|
|
21
|
-
function findFiles() {
|
|
22
|
-
// @ts-ignore `__toJSON`
|
|
23
|
-
return Object.entries(fs.__toJSON());
|
|
24
|
-
}
|
|
25
|
-
|
|
26
|
-
function mockFiles(files: Record<string, string> = {}) {
|
|
27
|
-
// @ts-ignore `__setMockFiles`
|
|
28
|
-
fs.__setMockFiles(files);
|
|
29
|
-
}
|
|
30
|
-
|
|
31
21
|
describe("copyAssets", () => {
|
|
32
22
|
afterEach(() => {
|
|
33
23
|
mockFiles();
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
// istanbul ignore file
|
|
2
|
+
|
|
3
|
+
import * as fs from "fs-extra";
|
|
4
|
+
|
|
5
|
+
export function findFiles() {
|
|
6
|
+
// @ts-ignore `__toJSON`
|
|
7
|
+
return Object.entries(fs.__toJSON());
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
export function mockFiles(files: Record<string, string> = {}) {
|
|
11
|
+
// @ts-ignore `__setMockFiles`
|
|
12
|
+
fs.__setMockFiles(files);
|
|
13
|
+
}
|