@rnx-kit/cli 0.12.7 → 0.14.2
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 +117 -0
- package/README.md +90 -65
- package/coverage/clover.xml +92 -104
- package/coverage/coverage-final.json +7 -6
- package/coverage/lcov-report/index.html +29 -29
- package/coverage/lcov-report/src/bundle/index.html +29 -29
- package/coverage/lcov-report/src/bundle/kit-config.ts.html +63 -117
- package/coverage/lcov-report/src/bundle/metro.ts.html +40 -163
- package/coverage/lcov-report/src/bundle/overrides.ts.html +28 -58
- package/coverage/lcov-report/src/bundler-plugin-defaults.ts.html +115 -0
- package/coverage/lcov-report/src/copy-assets.ts.html +1 -1
- package/coverage/lcov-report/src/index.html +26 -11
- package/coverage/lcov-report/src/metro-config.ts.html +49 -31
- package/coverage/lcov-report/src/typescript/index.html +1 -1
- package/coverage/lcov-report/src/typescript/project-cache.ts.html +5 -5
- package/coverage/lcov.info +173 -193
- package/lib/bundle/kit-config.d.ts +9 -15
- package/lib/bundle/kit-config.d.ts.map +1 -1
- package/lib/bundle/kit-config.js +34 -43
- package/lib/bundle/kit-config.js.map +1 -1
- package/lib/bundle/metro.d.ts +7 -11
- package/lib/bundle/metro.d.ts.map +1 -1
- package/lib/bundle/metro.js +21 -59
- package/lib/bundle/metro.js.map +1 -1
- package/lib/bundle/overrides.d.ts +11 -9
- package/lib/bundle/overrides.d.ts.map +1 -1
- package/lib/bundle/overrides.js +10 -18
- package/lib/bundle/overrides.js.map +1 -1
- package/lib/bundle/types.d.ts +4 -17
- package/lib/bundle/types.d.ts.map +1 -1
- package/lib/bundle.d.ts +8 -7
- package/lib/bundle.d.ts.map +1 -1
- package/lib/bundle.js +8 -35
- package/lib/bundle.js.map +1 -1
- package/lib/bundler-plugin-defaults.d.ts +3 -0
- package/lib/bundler-plugin-defaults.d.ts.map +1 -0
- package/lib/bundler-plugin-defaults.js +13 -0
- package/lib/bundler-plugin-defaults.js.map +1 -0
- package/lib/clean.js +106 -117
- package/lib/clean.js.map +1 -1
- package/lib/copy-assets.js +194 -210
- package/lib/copy-assets.js.map +1 -1
- package/lib/dep-check.js +12 -7
- package/lib/dep-check.js.map +1 -1
- package/lib/index.d.ts +1 -1
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +2 -1
- package/lib/index.js.map +1 -1
- package/lib/metro-config.d.ts +3 -2
- package/lib/metro-config.d.ts.map +1 -1
- package/lib/metro-config.js +7 -5
- package/lib/metro-config.js.map +1 -1
- package/lib/parsers.d.ts +2 -0
- package/lib/parsers.d.ts.map +1 -1
- package/lib/parsers.js +16 -1
- package/lib/parsers.js.map +1 -1
- package/lib/serve/kit-config.d.ts +6 -5
- package/lib/serve/kit-config.d.ts.map +1 -1
- package/lib/serve/kit-config.js +21 -6
- package/lib/serve/kit-config.js.map +1 -1
- package/lib/start.d.ts +2 -2
- package/lib/start.d.ts.map +1 -1
- package/lib/start.js +146 -158
- package/lib/start.js.map +1 -1
- package/package.json +9 -6
- package/react-native.config.js +65 -59
- package/src/bundle/kit-config.ts +42 -60
- package/src/bundle/metro.ts +15 -56
- package/src/bundle/overrides.ts +24 -34
- package/src/bundle/types.ts +17 -23
- package/src/bundle.ts +18 -36
- package/src/bundler-plugin-defaults.ts +10 -0
- package/src/index.ts +1 -1
- package/src/metro-config.ts +12 -6
- package/src/parsers.ts +19 -0
- package/src/serve/kit-config.ts +23 -11
- package/src/start.ts +23 -29
- package/test/bundle/__mocks__/@rnx-kit/config.js +2 -3
- package/test/bundle/__mocks__/@rnx-kit/console.js +1 -0
- package/test/bundle/__mocks__/@rnx-kit/metro-service.js +1 -0
- package/test/bundle/kit-config.test.ts +102 -100
- package/test/bundle/metro.test.ts +58 -98
- package/test/bundle/overrides.test.ts +29 -25
- package/test/copy-assets/assembleAarBundle.test.ts +1 -0
- package/lib/types.d.ts +0 -5
- package/lib/types.d.ts.map +0 -1
- package/lib/types.js +0 -3
- package/lib/types.js.map +0 -1
- package/src/types.ts +0 -4
package/lib/clean.js
CHANGED
|
@@ -22,15 +22,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
22
22
|
__setModuleDefault(result, mod);
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
28
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
29
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
30
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
31
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
32
|
-
});
|
|
33
|
-
};
|
|
34
25
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
35
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
36
27
|
};
|
|
@@ -41,117 +32,115 @@ const fs = __importStar(require("fs-extra"));
|
|
|
41
32
|
const ora_1 = __importDefault(require("ora"));
|
|
42
33
|
const os = __importStar(require("os"));
|
|
43
34
|
const path = __importStar(require("path"));
|
|
44
|
-
function rnxClean(_argv, _config, cliOptions) {
|
|
35
|
+
async function rnxClean(_argv, _config, cliOptions) {
|
|
45
36
|
var _a, _b, _c;
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
}
|
|
77
|
-
},
|
|
78
|
-
},
|
|
79
|
-
],
|
|
80
|
-
cocoapods: [
|
|
81
|
-
{
|
|
82
|
-
label: "Clean CocoaPods cache",
|
|
83
|
-
action: () => execute("pod", ["cache", "clean", "--all"], projectRoot),
|
|
84
|
-
},
|
|
85
|
-
],
|
|
86
|
-
metro: [
|
|
87
|
-
{
|
|
88
|
-
label: "Clean Metro cache",
|
|
89
|
-
action: () => cleanDir(`${os.tmpdir()}/metro-*`),
|
|
90
|
-
},
|
|
91
|
-
{
|
|
92
|
-
label: "Clean Haste cache",
|
|
93
|
-
action: () => cleanDir(`${os.tmpdir()}/haste-map-*`),
|
|
94
|
-
},
|
|
95
|
-
{
|
|
96
|
-
label: "Clean React Native cache",
|
|
97
|
-
action: () => cleanDir(`${os.tmpdir()}/react-*`),
|
|
98
|
-
},
|
|
99
|
-
],
|
|
100
|
-
npm: [
|
|
101
|
-
{
|
|
102
|
-
label: "Remove node_modules",
|
|
103
|
-
action: () => cleanDir(`${projectRoot}/node_modules`),
|
|
104
|
-
},
|
|
105
|
-
...(cliOptions.verify
|
|
106
|
-
? [
|
|
107
|
-
{
|
|
108
|
-
label: "Verify npm cache",
|
|
109
|
-
action: () => execute(npm, ["cache", "verify"], projectRoot),
|
|
110
|
-
},
|
|
111
|
-
]
|
|
112
|
-
: []),
|
|
113
|
-
],
|
|
114
|
-
watchman: [
|
|
115
|
-
{
|
|
116
|
-
label: "Stop Watchman",
|
|
117
|
-
action: () => execute(os.platform() === "win32" ? "tskill" : "killall", ["watchman"], projectRoot),
|
|
118
|
-
},
|
|
119
|
-
{
|
|
120
|
-
label: "Delete Watchman cache",
|
|
121
|
-
action: () => execute("watchman", ["watch-del-all"], projectRoot),
|
|
122
|
-
},
|
|
123
|
-
],
|
|
124
|
-
yarn: [
|
|
125
|
-
{
|
|
126
|
-
label: "Clean Yarn cache",
|
|
127
|
-
action: () => execute(yarn, ["cache", "clean"], projectRoot),
|
|
37
|
+
const projectRoot = (_a = cliOptions.projectRoot) !== null && _a !== void 0 ? _a : process.cwd();
|
|
38
|
+
if (!fs.existsSync(projectRoot)) {
|
|
39
|
+
throw new Error(`Invalid path provided! ${projectRoot}`);
|
|
40
|
+
}
|
|
41
|
+
const spinner = (0, ora_1.default)();
|
|
42
|
+
try {
|
|
43
|
+
require.resolve("@react-native-community/cli-clean");
|
|
44
|
+
spinner.warn("`rnx-clean` has been upstreamed to `@react-native-community/cli`. Please use `npx react-native clean` instead.");
|
|
45
|
+
}
|
|
46
|
+
catch (_) {
|
|
47
|
+
// Ignore
|
|
48
|
+
}
|
|
49
|
+
const npm = os.platform() === "win32" ? "npm.cmd" : "npm";
|
|
50
|
+
const yarn = os.platform() === "win32" ? "yarn.cmd" : "yarn";
|
|
51
|
+
const COMMANDS = {
|
|
52
|
+
android: [
|
|
53
|
+
{
|
|
54
|
+
label: "Clean Gradle cache",
|
|
55
|
+
action: () => {
|
|
56
|
+
const candidates = os.platform() === "win32"
|
|
57
|
+
? ["android/gradlew.bat", "gradlew.bat"]
|
|
58
|
+
: ["android/gradlew", "gradlew"];
|
|
59
|
+
const gradlew = findPath(projectRoot, candidates);
|
|
60
|
+
if (gradlew) {
|
|
61
|
+
const script = path.basename(gradlew);
|
|
62
|
+
return execute(os.platform() === "win32" ? script : `./${script}`, ["clean"], path.dirname(gradlew));
|
|
63
|
+
}
|
|
64
|
+
else {
|
|
65
|
+
return Promise.resolve();
|
|
66
|
+
}
|
|
128
67
|
},
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
]
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
})
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
68
|
+
},
|
|
69
|
+
],
|
|
70
|
+
cocoapods: [
|
|
71
|
+
{
|
|
72
|
+
label: "Clean CocoaPods cache",
|
|
73
|
+
action: () => execute("pod", ["cache", "clean", "--all"], projectRoot),
|
|
74
|
+
},
|
|
75
|
+
],
|
|
76
|
+
metro: [
|
|
77
|
+
{
|
|
78
|
+
label: "Clean Metro cache",
|
|
79
|
+
action: () => cleanDir(`${os.tmpdir()}/metro-*`),
|
|
80
|
+
},
|
|
81
|
+
{
|
|
82
|
+
label: "Clean Haste cache",
|
|
83
|
+
action: () => cleanDir(`${os.tmpdir()}/haste-map-*`),
|
|
84
|
+
},
|
|
85
|
+
{
|
|
86
|
+
label: "Clean React Native cache",
|
|
87
|
+
action: () => cleanDir(`${os.tmpdir()}/react-*`),
|
|
88
|
+
},
|
|
89
|
+
],
|
|
90
|
+
npm: [
|
|
91
|
+
{
|
|
92
|
+
label: "Remove node_modules",
|
|
93
|
+
action: () => cleanDir(`${projectRoot}/node_modules`),
|
|
94
|
+
},
|
|
95
|
+
...(cliOptions.verify
|
|
96
|
+
? [
|
|
97
|
+
{
|
|
98
|
+
label: "Verify npm cache",
|
|
99
|
+
action: () => execute(npm, ["cache", "verify"], projectRoot),
|
|
100
|
+
},
|
|
101
|
+
]
|
|
102
|
+
: []),
|
|
103
|
+
],
|
|
104
|
+
watchman: [
|
|
105
|
+
{
|
|
106
|
+
label: "Stop Watchman",
|
|
107
|
+
action: () => execute(os.platform() === "win32" ? "tskill" : "killall", ["watchman"], projectRoot),
|
|
108
|
+
},
|
|
109
|
+
{
|
|
110
|
+
label: "Delete Watchman cache",
|
|
111
|
+
action: () => execute("watchman", ["watch-del-all"], projectRoot),
|
|
112
|
+
},
|
|
113
|
+
],
|
|
114
|
+
yarn: [
|
|
115
|
+
{
|
|
116
|
+
label: "Clean Yarn cache",
|
|
117
|
+
action: () => execute(yarn, ["cache", "clean"], projectRoot),
|
|
118
|
+
},
|
|
119
|
+
],
|
|
120
|
+
};
|
|
121
|
+
const categories = (_c = (_b = cliOptions.include) === null || _b === void 0 ? void 0 : _b.split(",")) !== null && _c !== void 0 ? _c : [
|
|
122
|
+
"metro",
|
|
123
|
+
"npm",
|
|
124
|
+
"watchman",
|
|
125
|
+
"yarn",
|
|
126
|
+
];
|
|
127
|
+
for (const category of categories) {
|
|
128
|
+
const commands = COMMANDS[category];
|
|
129
|
+
if (!commands) {
|
|
130
|
+
spinner.warn(`Unknown category: ${category}`);
|
|
131
|
+
return;
|
|
153
132
|
}
|
|
154
|
-
|
|
133
|
+
for (const { action, label } of commands) {
|
|
134
|
+
spinner.start(label);
|
|
135
|
+
await action()
|
|
136
|
+
.then(() => {
|
|
137
|
+
spinner.succeed();
|
|
138
|
+
})
|
|
139
|
+
.catch((e) => {
|
|
140
|
+
spinner.fail(`${label} » ${e}`);
|
|
141
|
+
});
|
|
142
|
+
}
|
|
143
|
+
}
|
|
155
144
|
}
|
|
156
145
|
exports.rnxClean = rnxClean;
|
|
157
146
|
function cleanDir(path) {
|
package/lib/clean.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clean.js","sourceRoot":"","sources":["../src/clean.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"clean.js","sourceRoot":"","sources":["../src/clean.ts"],"names":[],"mappings":"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"}
|