@rnx-kit/cli 0.16.8 → 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.
@@ -33,12 +33,13 @@ const fs = __importStar(require("fs-extra"));
33
33
  const os = __importStar(require("os"));
34
34
  const path = __importStar(require("path"));
35
35
  const defaultAndroidConfig = {
36
- androidPluginVersion: "7.1.3",
37
- compileSdkVersion: 31,
36
+ androidPluginVersion: "7.2.2",
37
+ compileSdkVersion: 33,
38
38
  defaultConfig: {
39
39
  minSdkVersion: 23,
40
40
  targetSdkVersion: 29,
41
41
  },
42
+ kotlinVersion: "1.7.22",
42
43
  };
43
44
  function ensureOption(options, opt, flag = opt) {
44
45
  if (options[opt] == null) {
@@ -116,12 +117,12 @@ function run(command, args, options) {
116
117
  }
117
118
  }
118
119
  async function assembleAarBundle(context, packageName, { aar }) {
119
- var _a, _b, _c, _d, _e, _f;
120
+ var _a, _b, _c, _d, _e, _f, _g;
120
121
  if (!aar) {
121
122
  return;
122
123
  }
123
124
  const findUp = require("find-up");
124
- const gradlew = await findUp(os.platform() === "win32" ? "gradlew.bat" : "gradlew");
125
+ const gradlew = findUp.sync(os.platform() === "win32" ? "gradlew.bat" : "gradlew");
125
126
  if (!gradlew) {
126
127
  (0, console_1.warn)(`Skipped \`${packageName}\`: cannot find \`gradlew\``);
127
128
  return;
@@ -139,7 +140,7 @@ async function assembleAarBundle(context, packageName, { aar }) {
139
140
  ...customEnv,
140
141
  };
141
142
  const outputDir = path.join(context.options.assetsDest, "aar");
142
- await fs.ensureDir(outputDir);
143
+ fs.ensureDirSync(outputDir);
143
144
  const dest = path.join(outputDir, `${targetName}-${version}.aar`);
144
145
  const targets = [`:${targetName}:assembleRelease`];
145
146
  const targetsToCopy = [[output, dest]];
@@ -172,6 +173,7 @@ async function assembleAarBundle(context, packageName, { aar }) {
172
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;
173
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;
174
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;
175
177
  const buildRelativeReactNativePath = path.relative(buildDir, reactNativePath);
176
178
  const buildGradle = [
177
179
  "buildscript {",
@@ -180,6 +182,7 @@ async function assembleAarBundle(context, packageName, { aar }) {
180
182
  ` minSdkVersion = ${minSdkVersion}`,
181
183
  ` targetSdkVersion = ${targetSdkVersion}`,
182
184
  ` androidPluginVersion = "${androidPluginVersion}"`,
185
+ ` kotlinVersion = "${kotlinVersion}"`,
183
186
  " }",
184
187
  "",
185
188
  " repositories {",
@@ -189,6 +192,7 @@ async function assembleAarBundle(context, packageName, { aar }) {
189
192
  "",
190
193
  " dependencies {",
191
194
  ' classpath("com.android.tools.build:gradle:${project.ext.androidPluginVersion}")',
195
+ ' classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.ext.kotlinVersion}")',
192
196
  " }",
193
197
  "}",
194
198
  "",
@@ -210,43 +214,32 @@ async function assembleAarBundle(context, packageName, { aar }) {
210
214
  `project(":${targetName}").projectDir = file(${JSON.stringify(androidProject)})`,
211
215
  "",
212
216
  ].join("\n");
213
- await fs.ensureDir(buildDir);
214
- await fs.writeFile(path.join(buildDir, "build.gradle"), buildGradle);
215
- await fs.writeFile(path.join(buildDir, "gradle.properties"), gradleProperties);
216
- await fs.writeFile(path.join(buildDir, "settings.gradle"), settingsGradle);
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);
217
221
  // Run only one Gradle task at a time
218
222
  run(gradlew, targets, { cwd: buildDir, stdio: "inherit", env });
219
223
  }
220
224
  await Promise.all(targetsToCopy.map(([src, dest]) => fs.copy(src, dest)));
221
225
  }
222
226
  exports.assembleAarBundle = assembleAarBundle;
223
- async function copyFiles(files, destination) {
227
+ function copyFiles(files, destination) {
224
228
  if (!Array.isArray(files) || files.length === 0) {
225
- return;
226
- }
227
- await fs.ensureDir(destination);
228
- await Promise.all(files.map((file) => {
229
- const basename = path.basename(file);
230
- return fs.copy(file, `${destination}/${basename}`);
231
- }));
232
- }
233
- async function copyXcodeAssets(xcassets, destination) {
234
- if (!Array.isArray(xcassets) || xcassets.length === 0) {
235
- return;
229
+ return [];
236
230
  }
237
- await fs.ensureDir(destination);
238
- await Promise.all(xcassets.map((catalog) => {
239
- const dest = `${destination}/${path.basename(catalog)}`;
240
- return fs.copy(catalog, dest);
241
- }));
231
+ fs.ensureDirSync(destination);
232
+ return files.map((file) => {
233
+ return fs.copy(file, `${destination}/${path.basename(file)}`);
234
+ });
242
235
  }
243
236
  async function copyAssets({ options: { assetsDest, xcassetsDest } }, packageName, { assets, strings, xcassets }) {
244
237
  const tasks = [
245
- copyFiles(assets, `${assetsDest}/assets/${packageName}`),
246
- copyFiles(strings, `${assetsDest}/strings/${packageName}`),
238
+ ...copyFiles(assets, `${assetsDest}/assets/${packageName}`),
239
+ ...copyFiles(strings, `${assetsDest}/strings/${packageName}`),
247
240
  ];
248
241
  if (typeof xcassetsDest === "string") {
249
- tasks.push(copyXcodeAssets(xcassets, xcassetsDest));
242
+ tasks.push(...copyFiles(xcassets, xcassetsDest));
250
243
  }
251
244
  await Promise.all(tasks);
252
245
  }
@@ -343,10 +336,7 @@ exports.gatherConfigs = gatherConfigs;
343
336
  */
344
337
  async function copyProjectAssets(options) {
345
338
  const projectRoot = (0, package_1.findPackageDir)() || process.cwd();
346
- const content = await fs.readFile(`${projectRoot}/package.json`, {
347
- encoding: "utf-8",
348
- });
349
- const manifest = JSON.parse(content);
339
+ const manifest = (0, package_1.readPackage)(projectRoot);
350
340
  const context = { projectRoot, manifest, options };
351
341
  const assetConfigs = await gatherConfigs(context);
352
342
  if (!assetConfigs) {
@@ -1 +1 @@
1
- {"version":3,"file":"copy-assets.js","sourceRoot":"","sources":["../src/copy-assets.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,8CAAqD;AACrD,mEAA4D;AAE5D,yDAIqC;AAErC,oEAA4D;AAE5D,iDAA0C;AAC1C,6CAA+B;AAC/B,uCAAyB;AACzB,2CAA6B;AA4C7B,MAAM,oBAAoB,GAAkD;IAC1E,oBAAoB,EAAE,OAAO;IAC7B,iBAAiB,EAAE,EAAE;IACrB,aAAa,EAAE;QACb,aAAa,EAAE,EAAE;QACjB,gBAAgB,EAAE,EAAE;KACrB;CACF,CAAC;AAEF,SAAS,YAAY,CAAC,OAAgB,EAAE,GAAW,EAAE,IAAI,GAAG,GAAG;IAC7D,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE;QACxB,IAAA,eAAK,EAAC,8BAA8B,IAAI,EAAE,CAAC,CAAC;QAC5C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;AACH,CAAC;AAED,SAAS,iBAAiB,CAAC,WAAmB;IAC5C,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC,EAAE;QACpE,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;KAC1C;IACD,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC,EAAE;QACzD,OAAO,WAAW,CAAC;KACpB;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,gBAAgB,CAAC,WAAmB;IAC3C,OAAO,CACL,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CACjE,CAAC,OAAO,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;AAC/B,CAAC;AAED,SAAS,cAAc,CAAC,MAAe;IACrC,OAAO,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,IAAI,WAAW,IAAI,MAAM,CAAC;AAChF,CAAC;AAED,SAAgB,SAAS,CAAC,OAAe;IACvC,MAAM,UAAU,GAAG,IAAA,kCAAwB,EAAC,OAAO,CAAC,CAAC;IACrD,IAAI,CAAC,UAAU,EAAE;QACf,MAAM,IAAI,KAAK,CAAC,0BAA0B,OAAO,GAAG,CAAC,CAAC;KACvD;IAED,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,qBAAW,EAAC,UAAU,CAAC,CAAC;IAC5C,OAAO,OAAO,CAAC;AACjB,CAAC;AARD,8BAQC;AAED,SAAS,eAAe,CACtB,OAAgB,EAChB,WAAmB,EACnB,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,EAAkB;IAE/C,MAAM,WAAW,GAAG,IAAA,kCAAwB,EAAC,WAAW,CAAC,CAAC;IAC1D,IAAI,CAAC,WAAW,EAAE;QAChB,MAAM,IAAI,KAAK,CAAC,0BAA0B,WAAW,GAAG,CAAC,CAAC;KAC3D;IAED,MAAM,kBAAkB,GAAG,UAAU,IAAI,gBAAgB,CAAC,WAAW,CAAC,CAAC;IACvE,MAAM,UAAU,GAAG,OAAO,IAAI,SAAS,CAAC,WAAW,CAAC,CAAC;IAErD,QAAQ,WAAW,EAAE;QACnB,KAAK,eAAe;YAClB,OAAO;gBACL,UAAU,EAAE,kBAAkB;gBAC9B,OAAO,EAAE,UAAU;gBACnB,WAAW;gBACX,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,SAAS,EAAE,oBAAoB,CAAC;gBAC/D,WAAW,EAAE,IAAI,CAAC,IAAI,CACpB,OAAO,CAAC,OAAO,CAAC,UAAU,EAC1B,KAAK,EACL,kBAAkB,SAAS,CAAC,WAAW,CAAC,MAAM,CAC/C;aACF,CAAC;QAEJ,KAAK,cAAc;YACjB,OAAO;gBACL,UAAU,EAAE,kBAAkB;gBAC9B,OAAO,EAAE,UAAU;gBACnB,WAAW;gBACX,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC;gBACzC,WAAW,EAAE,IAAI,CAAC,IAAI,CACpB,OAAO,CAAC,OAAO,CAAC,UAAU,EAC1B,KAAK,EACL,cAAc,CACf;aACF,CAAC;QAEJ,OAAO,CAAC,CAAC;YACP,MAAM,cAAc,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;YACtD,OAAO;gBACL,UAAU,EAAE,kBAAkB;gBAC9B,OAAO,EAAE,UAAU;gBACnB,WAAW;gBACX,cAAc;gBACd,MAAM,EACJ,MAAM;oBACN,CAAC,cAAc;wBACb,IAAI,CAAC,IAAI,CACP,cAAc,EACd,OAAO,EACP,SAAS,EACT,KAAK,EACL,GAAG,kBAAkB,cAAc,CACpC,CAAC;gBACN,WAAW,EAAE,IAAI,CAAC,IAAI,CACpB,OAAO,CAAC,OAAO,CAAC,UAAU,EAC1B,KAAK,EACL,GAAG,kBAAkB,IAAI,UAAU,MAAM,CAC1C;aACF,CAAC;SACH;KACF;AACH,CAAC;AAED,SAAS,GAAG,CAAC,OAAe,EAAE,IAAc,EAAE,OAAyB;IACrE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAA,yBAAS,EAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IACrD,IAAI,MAAM,KAAK,CAAC,EAAE;QAChB,OAAO,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC;KAC3B;AACH,CAAC;AAEM,KAAK,UAAU,iBAAiB,CACrC,OAAgB,EAChB,WAAmB,EACnB,EAAE,GAAG,EAAgB;;IAErB,IAAI,CAAC,GAAG,EAAE;QACR,OAAO;KACR;IAED,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IAClC,MAAM,OAAO,GAAG,MAAM,MAAM,CAC1B,EAAE,CAAC,QAAQ,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CACtD,CAAC;IACF,IAAI,CAAC,OAAO,EAAE;QACZ,IAAA,cAAI,EAAC,aAAa,WAAW,6BAA6B,CAAC,CAAC;QAC5D,OAAO;KACR;IAED,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,eAAe,CACrE,OAAO,EACP,WAAW,EACX,GAAG,CACJ,CAAC;IACF,IAAI,CAAC,cAAc,IAAI,CAAC,MAAM,EAAE;QAC9B,IAAA,cAAI,EAAC,aAAa,WAAW,kCAAkC,CAAC,CAAC;QACjE,OAAO;KACR;IAED,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC;IACtD,MAAM,GAAG,GAAG;QACV,iBAAiB,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,CAAC;QAC3D,oBAAoB,EAAE,SAAS,CAAC,cAAc,CAAC;QAC/C,GAAG,OAAO,CAAC,GAAG;QACd,GAAG,SAAS;KACb,CAAC;IAEF,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IAC/D,MAAM,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IAE9B,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,UAAU,IAAI,OAAO,MAAM,CAAC,CAAC;IAElE,MAAM,OAAO,GAAG,CAAC,IAAI,UAAU,kBAAkB,CAAC,CAAC;IACnD,MAAM,aAAa,GAAuB,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;IAE3D,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC;IAC9D,IAAI,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;QAC3B,IAAI,YAAY,EAAE;YAChB,KAAK,MAAM,CAAC,cAAc,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;gBAChE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,eAAe,CACzD,OAAO,EACP,cAAc,EACd,GAAG,CACJ,CAAC;gBACF,IAAI,MAAM,EAAE;oBACV,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;wBAC1B,OAAO,CAAC,IAAI,CAAC,IAAI,UAAU,kBAAkB,CAAC,CAAC;wBAC/C,aAAa,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;qBAC3C;yBAAM,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE;wBACtC,aAAa,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;qBAC3C;iBACF;aACF;SACF;QAED,qCAAqC;QACrC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC;KACvE;SAAM;QACL,MAAM,eAAe,GAAG,IAAA,kCAAwB,EAAC,cAAc,CAAC,CAAC;QACjE,IAAI,CAAC,eAAe,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;SAClD;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CACxB,OAAO,CAAC,GAAG,EAAE,EACb,cAAc,EACd,mBAAmB,EACnB,UAAU,CACX,CAAC;QAEF,MAAM,iBAAiB,GACrB,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,iBAAiB,mCAAI,oBAAoB,CAAC,iBAAiB,CAAC;QACvE,MAAM,aAAa,GACjB,MAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,aAAa,0CAAE,aAAa,mCACrC,oBAAoB,CAAC,aAAa,CAAC,aAAa,CAAC;QACnD,MAAM,gBAAgB,GACpB,MAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,aAAa,0CAAE,gBAAgB,mCACxC,oBAAoB,CAAC,aAAa,CAAC,gBAAgB,CAAC;QACtD,MAAM,oBAAoB,GACxB,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,oBAAoB,mCAC7B,oBAAoB,CAAC,oBAAoB,CAAC;QAC5C,MAAM,4BAA4B,GAAG,IAAI,CAAC,QAAQ,CAChD,QAAQ,EACR,eAAe,CAChB,CAAC;QAEF,MAAM,WAAW,GAAG;YAClB,eAAe;YACf,SAAS;YACT,6BAA6B,iBAAiB,EAAE;YAChD,yBAAyB,aAAa,EAAE;YACxC,4BAA4B,gBAAgB,EAAE;YAC9C,iCAAiC,oBAAoB,GAAG;YACxD,KAAK;YACL,EAAE;YACF,kBAAkB;YAClB,sBAAsB;YACtB,gBAAgB;YAChB,KAAK;YACL,EAAE;YACF,kBAAkB;YAClB,uFAAuF;YACvF,KAAK;YACL,GAAG;YACH,EAAE;YACF,eAAe;YACf,kBAAkB;YAClB,eAAe;YACf,8FAA8F;YAC9F,8BAA8B,4BAA4B,YAAY;YACtE,SAAS;YACT,sBAAsB;YACtB,gBAAgB;YAChB,KAAK;YACL,GAAG;YACH,EAAE;SACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEb,MAAM,gBAAgB,GAAG,4BAA4B,CAAC;QAEtD,MAAM,cAAc,GAAG;YACrB,aAAa,UAAU,IAAI;YAC3B,aAAa,UAAU,wBAAwB,IAAI,CAAC,SAAS,CAC3D,cAAc,CACf,GAAG;YACJ,EAAE;SACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEb,MAAM,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC7B,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,cAAc,CAAC,EAAE,WAAW,CAAC,CAAC;QACrE,MAAM,EAAE,CAAC,SAAS,CAChB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,mBAAmB,CAAC,EACxC,gBAAgB,CACjB,CAAC;QACF,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,iBAAiB,CAAC,EAAE,cAAc,CAAC,CAAC;QAE3E,qCAAqC;QACrC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC;KACjE;IAED,MAAM,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;AAC5E,CAAC;AAtJD,8CAsJC;AAED,KAAK,UAAU,SAAS,CAAC,KAAc,EAAE,WAAmB;IAC1D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;QAC/C,OAAO;KACR;IAED,MAAM,EAAE,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IAChC,MAAM,OAAO,CAAC,GAAG,CACf,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACjB,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACrC,OAAO,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,WAAW,IAAI,QAAQ,EAAE,CAAC,CAAC;IACrD,CAAC,CAAC,CACH,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,eAAe,CAC5B,QAAiB,EACjB,WAAmB;IAEnB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;QACrD,OAAO;KACR;IAED,MAAM,EAAE,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IAChC,MAAM,OAAO,CAAC,GAAG,CACf,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QACvB,MAAM,IAAI,GAAG,GAAG,WAAW,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QACxD,OAAO,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAChC,CAAC,CAAC,CACH,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,UAAU,CAC9B,EAAE,OAAO,EAAE,EAAE,UAAU,EAAE,YAAY,EAAE,EAAW,EAClD,WAAmB,EACnB,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAgB;IAE3C,MAAM,KAAK,GAAG;QACZ,SAAS,CAAC,MAAM,EAAE,GAAG,UAAU,WAAW,WAAW,EAAE,CAAC;QACxD,SAAS,CAAC,OAAO,EAAE,GAAG,UAAU,YAAY,WAAW,EAAE,CAAC;KAC3D,CAAC;IAEF,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE;QACpC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC;KACrD;IAED,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AAC3B,CAAC;AAfD,gCAeC;AAEM,KAAK,UAAU,aAAa,CAAC,EAClC,WAAW,EACX,QAAQ,GACA;IACR,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,GAAG,QAAQ,CAAC;IACnD,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAA,mBAAM,EAAC,YAAY,CAAC,EAAE,GAAG,IAAA,mBAAM,EAAC,eAAe,CAAC,CAAC,CAAC;IACvE,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;QACzB,OAAO;KACR;IAED,MAAM,cAAc,GAAG,EAAE,KAAK,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC;IAChD,MAAM,aAAa,GAAwC,EAAE,CAAC;IAE9D,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE;QAC1B,IAAI;YACF,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAC1B,OAAO,CAAC,OAAO,CAAC,GAAG,GAAG,eAAe,EAAE,cAAc,CAAC,CACvD,CAAC;YACF,MAAM,iBAAiB,GAAG,GAAG,OAAO,yBAAyB,CAAC;YAC9D,IAAI,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE;gBACpC,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;gBACpD,IAAI,YAAY,EAAE;oBAChB,aAAa,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC;iBACnC;aACF;SACF;QAAC,OAAO,GAAG,EAAE;YACZ,IAAA,cAAI,EAAC,GAAG,CAAC,CAAC;SACX;KACF;IAED,gCAAgC;IAChC,MAAM,iBAAiB,GAAG,GAAG,WAAW,yBAAyB,CAAC;IAClE,IAAI,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE;QACpC,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;QACpD,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAC/C,KAAK,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,SAAS,EAAE;YACzC,IAAI,MAAM,KAAK,IAAI,IAAI,cAAc,CAAC,MAAM,CAAC,EAAE;gBAC7C,aAAa,CAAC,OAAO,CAAC,GAAG,MAAM,CAAC;aACjC;SACF;KACF;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AA3CD,sCA2CC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoDG;AACI,KAAK,UAAU,iBAAiB,CAAC,OAAgB;IACtD,MAAM,WAAW,GAAG,IAAA,wBAAc,GAAE,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IACtD,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,GAAG,WAAW,eAAe,EAAE;QAC/D,QAAQ,EAAE,OAAO;KAClB,CAAC,CAAC;IACH,MAAM,QAAQ,GAAoB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACtD,MAAM,OAAO,GAAG,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;IACnD,MAAM,YAAY,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,CAAC;IAClD,IAAI,CAAC,YAAY,EAAE;QACjB,OAAO;KACR;IAED,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAClD,KAAK,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,IAAI,YAAY,EAAE;QAChD,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE;YAC3B,SAAS;SACV;QAED,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;QAC7B,IAAI,OAAO,SAAS,KAAK,UAAU,EAAE;YACnC,IAAA,cAAI,EAAC,aAAa,WAAW,iCAAiC,CAAC,CAAC;YAChE,SAAS;SACV;QAED,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,CAAC;QACxC,IAAI,OAAO,CAAC,SAAS,IAAI,MAAM,CAAC,GAAG,EAAE;YACnC,IAAA,cAAI,EAAC,eAAe,WAAW,GAAG,CAAC,CAAC;YACpC,MAAM,iBAAiB,CAAC,OAAO,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;SACvD;aAAM;YACL,IAAA,cAAI,EAAC,uBAAuB,WAAW,GAAG,CAAC,CAAC;YAC5C,MAAM,UAAU,CAAC,OAAO,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;SAChD;KACF;IAED,IAAI,OAAO,CAAC,SAAS,EAAE;QACrB,MAAM,QAAQ,GAAG,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC;QACzC,MAAM,SAAS,GAAG,EAAE,CAAC;QACrB,KAAK,MAAM,cAAc,IAAI,CAAC,eAAe,EAAE,cAAc,CAAC,EAAE;YAC9D,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,eAAe,CAC7C,OAAO,EACP,cAAc,EACd,QAAQ,CACT,CAAC;YACF,IACE,MAAM;gBACN,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,WAAW,EAAE,CAAC,EACvE;gBACA,IAAA,cAAI,EAAC,+BAA+B,cAAc,GAAG,CAAC,CAAC;gBACvD,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;aAC9C;SACF;QACD,MAAM,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;KAC9B;AACH,CAAC;AArDD,8CAqDC;AAEY,QAAA,oBAAoB,GAAG;IAClC,IAAI,EAAE,iBAAiB;IACvB,WAAW,EACT,yEAAyE;IAC3E,IAAI,EAAE,CAAC,KAAe,EAAE,OAAkB,EAAE,OAAgB,EAAE,EAAE;QAC9D,YAAY,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAClC,YAAY,CAAC,OAAO,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC;QACnD,OAAO,iBAAiB,CAAC,OAAO,CAAC,CAAC;IACpC,CAAC;IACD,OAAO,EAAE;QACP;YACE,IAAI,EAAE,qBAAqB;YAC3B,WAAW,EAAE,oBAAoB;YACjC,KAAK,EAAE,kCAAa;SACrB;QACD;YACE,IAAI,EAAE,wBAAwB;YAC9B,WAAW,EAAE,2CAA2C;SACzD;QACD;YACE,IAAI,EAAE,wBAAwB;YAC9B,WAAW,EAAE,wCAAwC;YACrD,OAAO,EAAE,KAAK;SACf;QACD;YACE,IAAI,EAAE,0BAA0B;YAChC,WAAW,EACT,iIAAiI;SACpI;KACF;CACF,CAAC"}
1
+ {"version":3,"file":"copy-assets.js","sourceRoot":"","sources":["../src/copy-assets.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,8CAAqD;AACrD,mEAA4D;AAE5D,yDAIqC;AAErC,oEAA4D;AAE5D,iDAA0C;AAC1C,6CAA+B;AAC/B,uCAAyB;AACzB,2CAA6B;AA6C7B,MAAM,oBAAoB,GAAkD;IAC1E,oBAAoB,EAAE,OAAO;IAC7B,iBAAiB,EAAE,EAAE;IACrB,aAAa,EAAE;QACb,aAAa,EAAE,EAAE;QACjB,gBAAgB,EAAE,EAAE;KACrB;IACD,aAAa,EAAE,QAAQ;CACxB,CAAC;AAEF,SAAS,YAAY,CAAC,OAAgB,EAAE,GAAW,EAAE,IAAI,GAAG,GAAG;IAC7D,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE;QACxB,IAAA,eAAK,EAAC,8BAA8B,IAAI,EAAE,CAAC,CAAC;QAC5C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;AACH,CAAC;AAED,SAAS,iBAAiB,CAAC,WAAmB;IAC5C,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC,EAAE;QACpE,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;KAC1C;IACD,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC,EAAE;QACzD,OAAO,WAAW,CAAC;KACpB;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,gBAAgB,CAAC,WAAmB;IAC3C,OAAO,CACL,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CACjE,CAAC,OAAO,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;AAC/B,CAAC;AAED,SAAS,cAAc,CAAC,MAAe;IACrC,OAAO,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,IAAI,WAAW,IAAI,MAAM,CAAC;AAChF,CAAC;AAED,SAAgB,SAAS,CAAC,OAAe;IACvC,MAAM,UAAU,GAAG,IAAA,kCAAwB,EAAC,OAAO,CAAC,CAAC;IACrD,IAAI,CAAC,UAAU,EAAE;QACf,MAAM,IAAI,KAAK,CAAC,0BAA0B,OAAO,GAAG,CAAC,CAAC;KACvD;IAED,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,qBAAW,EAAC,UAAU,CAAC,CAAC;IAC5C,OAAO,OAAO,CAAC;AACjB,CAAC;AARD,8BAQC;AAED,SAAS,eAAe,CACtB,OAAgB,EAChB,WAAmB,EACnB,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,EAAkB;IAE/C,MAAM,WAAW,GAAG,IAAA,kCAAwB,EAAC,WAAW,CAAC,CAAC;IAC1D,IAAI,CAAC,WAAW,EAAE;QAChB,MAAM,IAAI,KAAK,CAAC,0BAA0B,WAAW,GAAG,CAAC,CAAC;KAC3D;IAED,MAAM,kBAAkB,GAAG,UAAU,IAAI,gBAAgB,CAAC,WAAW,CAAC,CAAC;IACvE,MAAM,UAAU,GAAG,OAAO,IAAI,SAAS,CAAC,WAAW,CAAC,CAAC;IAErD,QAAQ,WAAW,EAAE;QACnB,KAAK,eAAe;YAClB,OAAO;gBACL,UAAU,EAAE,kBAAkB;gBAC9B,OAAO,EAAE,UAAU;gBACnB,WAAW;gBACX,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,SAAS,EAAE,oBAAoB,CAAC;gBAC/D,WAAW,EAAE,IAAI,CAAC,IAAI,CACpB,OAAO,CAAC,OAAO,CAAC,UAAU,EAC1B,KAAK,EACL,kBAAkB,SAAS,CAAC,WAAW,CAAC,MAAM,CAC/C;aACF,CAAC;QAEJ,KAAK,cAAc;YACjB,OAAO;gBACL,UAAU,EAAE,kBAAkB;gBAC9B,OAAO,EAAE,UAAU;gBACnB,WAAW;gBACX,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC;gBACzC,WAAW,EAAE,IAAI,CAAC,IAAI,CACpB,OAAO,CAAC,OAAO,CAAC,UAAU,EAC1B,KAAK,EACL,cAAc,CACf;aACF,CAAC;QAEJ,OAAO,CAAC,CAAC;YACP,MAAM,cAAc,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;YACtD,OAAO;gBACL,UAAU,EAAE,kBAAkB;gBAC9B,OAAO,EAAE,UAAU;gBACnB,WAAW;gBACX,cAAc;gBACd,MAAM,EACJ,MAAM;oBACN,CAAC,cAAc;wBACb,IAAI,CAAC,IAAI,CACP,cAAc,EACd,OAAO,EACP,SAAS,EACT,KAAK,EACL,GAAG,kBAAkB,cAAc,CACpC,CAAC;gBACN,WAAW,EAAE,IAAI,CAAC,IAAI,CACpB,OAAO,CAAC,OAAO,CAAC,UAAU,EAC1B,KAAK,EACL,GAAG,kBAAkB,IAAI,UAAU,MAAM,CAC1C;aACF,CAAC;SACH;KACF;AACH,CAAC;AAED,SAAS,GAAG,CAAC,OAAe,EAAE,IAAc,EAAE,OAAyB;IACrE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAA,yBAAS,EAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IACrD,IAAI,MAAM,KAAK,CAAC,EAAE;QAChB,OAAO,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC;KAC3B;AACH,CAAC;AAEM,KAAK,UAAU,iBAAiB,CACrC,OAAgB,EAChB,WAAmB,EACnB,EAAE,GAAG,EAAgB;;IAErB,IAAI,CAAC,GAAG,EAAE;QACR,OAAO;KACR;IAED,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IAClC,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CACzB,EAAE,CAAC,QAAQ,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CACtD,CAAC;IACF,IAAI,CAAC,OAAO,EAAE;QACZ,IAAA,cAAI,EAAC,aAAa,WAAW,6BAA6B,CAAC,CAAC;QAC5D,OAAO;KACR;IAED,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,eAAe,CACrE,OAAO,EACP,WAAW,EACX,GAAG,CACJ,CAAC;IACF,IAAI,CAAC,cAAc,IAAI,CAAC,MAAM,EAAE;QAC9B,IAAA,cAAI,EAAC,aAAa,WAAW,kCAAkC,CAAC,CAAC;QACjE,OAAO;KACR;IAED,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC;IACtD,MAAM,GAAG,GAAG;QACV,iBAAiB,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,CAAC;QAC3D,oBAAoB,EAAE,SAAS,CAAC,cAAc,CAAC;QAC/C,GAAG,OAAO,CAAC,GAAG;QACd,GAAG,SAAS;KACb,CAAC;IAEF,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IAC/D,EAAE,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAE5B,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,UAAU,IAAI,OAAO,MAAM,CAAC,CAAC;IAElE,MAAM,OAAO,GAAG,CAAC,IAAI,UAAU,kBAAkB,CAAC,CAAC;IACnD,MAAM,aAAa,GAAuB,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;IAE3D,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC;IAC9D,IAAI,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;QAC3B,IAAI,YAAY,EAAE;YAChB,KAAK,MAAM,CAAC,cAAc,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;gBAChE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,eAAe,CACzD,OAAO,EACP,cAAc,EACd,GAAG,CACJ,CAAC;gBACF,IAAI,MAAM,EAAE;oBACV,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;wBAC1B,OAAO,CAAC,IAAI,CAAC,IAAI,UAAU,kBAAkB,CAAC,CAAC;wBAC/C,aAAa,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;qBAC3C;yBAAM,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE;wBACtC,aAAa,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;qBAC3C;iBACF;aACF;SACF;QAED,qCAAqC;QACrC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC;KACvE;SAAM;QACL,MAAM,eAAe,GAAG,IAAA,kCAAwB,EAAC,cAAc,CAAC,CAAC;QACjE,IAAI,CAAC,eAAe,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;SAClD;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CACxB,OAAO,CAAC,GAAG,EAAE,EACb,cAAc,EACd,mBAAmB,EACnB,UAAU,CACX,CAAC;QAEF,MAAM,iBAAiB,GACrB,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,iBAAiB,mCAAI,oBAAoB,CAAC,iBAAiB,CAAC;QACvE,MAAM,aAAa,GACjB,MAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,aAAa,0CAAE,aAAa,mCACrC,oBAAoB,CAAC,aAAa,CAAC,aAAa,CAAC;QACnD,MAAM,gBAAgB,GACpB,MAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,aAAa,0CAAE,gBAAgB,mCACxC,oBAAoB,CAAC,aAAa,CAAC,gBAAgB,CAAC;QACtD,MAAM,oBAAoB,GACxB,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,oBAAoB,mCAC7B,oBAAoB,CAAC,oBAAoB,CAAC;QAC5C,MAAM,aAAa,GACjB,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,aAAa,mCAAI,oBAAoB,CAAC,aAAa,CAAC;QAC/D,MAAM,4BAA4B,GAAG,IAAI,CAAC,QAAQ,CAChD,QAAQ,EACR,eAAe,CAChB,CAAC;QAEF,MAAM,WAAW,GAAG;YAClB,eAAe;YACf,SAAS;YACT,6BAA6B,iBAAiB,EAAE;YAChD,yBAAyB,aAAa,EAAE;YACxC,4BAA4B,gBAAgB,EAAE;YAC9C,iCAAiC,oBAAoB,GAAG;YACxD,0BAA0B,aAAa,GAAG;YAC1C,KAAK;YACL,EAAE;YACF,kBAAkB;YAClB,sBAAsB;YACtB,gBAAgB;YAChB,KAAK;YACL,EAAE;YACF,kBAAkB;YAClB,uFAAuF;YACvF,2FAA2F;YAC3F,KAAK;YACL,GAAG;YACH,EAAE;YACF,eAAe;YACf,kBAAkB;YAClB,eAAe;YACf,8FAA8F;YAC9F,8BAA8B,4BAA4B,YAAY;YACtE,SAAS;YACT,sBAAsB;YACtB,gBAAgB;YAChB,KAAK;YACL,GAAG;YACH,EAAE;SACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEb,MAAM,gBAAgB,GAAG,4BAA4B,CAAC;QAEtD,MAAM,cAAc,GAAG;YACrB,aAAa,UAAU,IAAI;YAC3B,aAAa,UAAU,wBAAwB,IAAI,CAAC,SAAS,CAC3D,cAAc,CACf,GAAG;YACJ,EAAE;SACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEb,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAC3B,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,cAAc,CAAC,EAAE,WAAW,CAAC,CAAC;QACnE,EAAE,CAAC,aAAa,CACd,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,mBAAmB,CAAC,EACxC,gBAAgB,CACjB,CAAC;QACF,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,iBAAiB,CAAC,EAAE,cAAc,CAAC,CAAC;QAEzE,qCAAqC;QACrC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC;KACjE;IAED,MAAM,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;AAC5E,CAAC;AA1JD,8CA0JC;AAED,SAAS,SAAS,CAAC,KAAc,EAAE,WAAmB;IACpD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;QAC/C,OAAO,EAAE,CAAC;KACX;IAED,EAAE,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAC9B,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACxB,OAAO,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,WAAW,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAChE,CAAC,CAAC,CAAC;AACL,CAAC;AAEM,KAAK,UAAU,UAAU,CAC9B,EAAE,OAAO,EAAE,EAAE,UAAU,EAAE,YAAY,EAAE,EAAW,EAClD,WAAmB,EACnB,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAgB;IAE3C,MAAM,KAAK,GAAG;QACZ,GAAG,SAAS,CAAC,MAAM,EAAE,GAAG,UAAU,WAAW,WAAW,EAAE,CAAC;QAC3D,GAAG,SAAS,CAAC,OAAO,EAAE,GAAG,UAAU,YAAY,WAAW,EAAE,CAAC;KAC9D,CAAC;IAEF,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE;QACpC,KAAK,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC;KAClD;IAED,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AAC3B,CAAC;AAfD,gCAeC;AAEM,KAAK,UAAU,aAAa,CAAC,EAClC,WAAW,EACX,QAAQ,GACA;IACR,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,GAAG,QAAQ,CAAC;IACnD,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAA,mBAAM,EAAC,YAAY,CAAC,EAAE,GAAG,IAAA,mBAAM,EAAC,eAAe,CAAC,CAAC,CAAC;IACvE,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;QACzB,OAAO;KACR;IAED,MAAM,cAAc,GAAG,EAAE,KAAK,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC;IAChD,MAAM,aAAa,GAAwC,EAAE,CAAC;IAE9D,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE;QAC1B,IAAI;YACF,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAC1B,OAAO,CAAC,OAAO,CAAC,GAAG,GAAG,eAAe,EAAE,cAAc,CAAC,CACvD,CAAC;YACF,MAAM,iBAAiB,GAAG,GAAG,OAAO,yBAAyB,CAAC;YAC9D,IAAI,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE;gBACpC,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;gBACpD,IAAI,YAAY,EAAE;oBAChB,aAAa,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC;iBACnC;aACF;SACF;QAAC,OAAO,GAAG,EAAE;YACZ,IAAA,cAAI,EAAC,GAAG,CAAC,CAAC;SACX;KACF;IAED,gCAAgC;IAChC,MAAM,iBAAiB,GAAG,GAAG,WAAW,yBAAyB,CAAC;IAClE,IAAI,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE;QACpC,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;QACpD,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAC/C,KAAK,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,SAAS,EAAE;YACzC,IAAI,MAAM,KAAK,IAAI,IAAI,cAAc,CAAC,MAAM,CAAC,EAAE;gBAC7C,aAAa,CAAC,OAAO,CAAC,GAAG,MAAM,CAAC;aACjC;SACF;KACF;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AA3CD,sCA2CC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoDG;AACI,KAAK,UAAU,iBAAiB,CAAC,OAAgB;IACtD,MAAM,WAAW,GAAG,IAAA,wBAAc,GAAE,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IACtD,MAAM,QAAQ,GAAG,IAAA,qBAAW,EAAC,WAAW,CAAC,CAAC;IAC1C,MAAM,OAAO,GAAG,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;IACnD,MAAM,YAAY,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,CAAC;IAClD,IAAI,CAAC,YAAY,EAAE;QACjB,OAAO;KACR;IAED,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAClD,KAAK,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,IAAI,YAAY,EAAE;QAChD,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE;YAC3B,SAAS;SACV;QAED,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;QAC7B,IAAI,OAAO,SAAS,KAAK,UAAU,EAAE;YACnC,IAAA,cAAI,EAAC,aAAa,WAAW,iCAAiC,CAAC,CAAC;YAChE,SAAS;SACV;QAED,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,CAAC;QACxC,IAAI,OAAO,CAAC,SAAS,IAAI,MAAM,CAAC,GAAG,EAAE;YACnC,IAAA,cAAI,EAAC,eAAe,WAAW,GAAG,CAAC,CAAC;YACpC,MAAM,iBAAiB,CAAC,OAAO,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;SACvD;aAAM;YACL,IAAA,cAAI,EAAC,uBAAuB,WAAW,GAAG,CAAC,CAAC;YAC5C,MAAM,UAAU,CAAC,OAAO,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;SAChD;KACF;IAED,IAAI,OAAO,CAAC,SAAS,EAAE;QACrB,MAAM,QAAQ,GAAG,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC;QACzC,MAAM,SAAS,GAAG,EAAE,CAAC;QACrB,KAAK,MAAM,cAAc,IAAI,CAAC,eAAe,EAAE,cAAc,CAAC,EAAE;YAC9D,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,eAAe,CAC7C,OAAO,EACP,cAAc,EACd,QAAQ,CACT,CAAC;YACF,IACE,MAAM;gBACN,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,WAAW,EAAE,CAAC,EACvE;gBACA,IAAA,cAAI,EAAC,+BAA+B,cAAc,GAAG,CAAC,CAAC;gBACvD,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;aAC9C;SACF;QACD,MAAM,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;KAC9B;AACH,CAAC;AAlDD,8CAkDC;AAEY,QAAA,oBAAoB,GAAG;IAClC,IAAI,EAAE,iBAAiB;IACvB,WAAW,EACT,yEAAyE;IAC3E,IAAI,EAAE,CAAC,KAAe,EAAE,OAAkB,EAAE,OAAgB,EAAE,EAAE;QAC9D,YAAY,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAClC,YAAY,CAAC,OAAO,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC;QACnD,OAAO,iBAAiB,CAAC,OAAO,CAAC,CAAC;IACpC,CAAC;IACD,OAAO,EAAE;QACP;YACE,IAAI,EAAE,qBAAqB;YAC3B,WAAW,EAAE,oBAAoB;YACjC,KAAK,EAAE,kCAAa;SACrB;QACD;YACE,IAAI,EAAE,wBAAwB;YAC9B,WAAW,EAAE,2CAA2C;SACzD;QACD;YACE,IAAI,EAAE,wBAAwB;YAC9B,WAAW,EAAE,wCAAwC;YACrD,OAAO,EAAE,KAAK;SACf;QACD;YACE,IAAI,EAAE,0BAA0B;YAChC,WAAW,EACT,iIAAiI;SACpI;KACF;CACF,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rnx-kit/cli",
3
- "version": "0.16.8",
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",
@@ -26,6 +26,7 @@ export type AndroidArchive = {
26
26
  minSdkVersion?: number;
27
27
  targetSdkVersion?: number;
28
28
  };
29
+ kotlinVersion?: string;
29
30
  };
30
31
  };
31
32
 
@@ -58,12 +59,13 @@ export type AssetsConfig = {
58
59
  };
59
60
 
60
61
  const defaultAndroidConfig: Required<Required<AndroidArchive>["android"]> = {
61
- androidPluginVersion: "7.1.3",
62
- compileSdkVersion: 31,
62
+ androidPluginVersion: "7.2.2",
63
+ compileSdkVersion: 33,
63
64
  defaultConfig: {
64
65
  minSdkVersion: 23,
65
66
  targetSdkVersion: 29,
66
67
  },
68
+ kotlinVersion: "1.7.22",
67
69
  };
68
70
 
69
71
  function ensureOption(options: Options, opt: string, flag = opt) {
@@ -187,7 +189,7 @@ export async function assembleAarBundle(
187
189
  }
188
190
 
189
191
  const findUp = require("find-up");
190
- const gradlew = await findUp(
192
+ const gradlew = findUp.sync(
191
193
  os.platform() === "win32" ? "gradlew.bat" : "gradlew"
192
194
  );
193
195
  if (!gradlew) {
@@ -214,7 +216,7 @@ export async function assembleAarBundle(
214
216
  };
215
217
 
216
218
  const outputDir = path.join(context.options.assetsDest, "aar");
217
- await fs.ensureDir(outputDir);
219
+ fs.ensureDirSync(outputDir);
218
220
 
219
221
  const dest = path.join(outputDir, `${targetName}-${version}.aar`);
220
222
 
@@ -267,6 +269,8 @@ export async function assembleAarBundle(
267
269
  const androidPluginVersion =
268
270
  android?.androidPluginVersion ??
269
271
  defaultAndroidConfig.androidPluginVersion;
272
+ const kotlinVersion =
273
+ android?.kotlinVersion ?? defaultAndroidConfig.kotlinVersion;
270
274
  const buildRelativeReactNativePath = path.relative(
271
275
  buildDir,
272
276
  reactNativePath
@@ -279,6 +283,7 @@ export async function assembleAarBundle(
279
283
  ` minSdkVersion = ${minSdkVersion}`,
280
284
  ` targetSdkVersion = ${targetSdkVersion}`,
281
285
  ` androidPluginVersion = "${androidPluginVersion}"`,
286
+ ` kotlinVersion = "${kotlinVersion}"`,
282
287
  " }",
283
288
  "",
284
289
  " repositories {",
@@ -288,6 +293,7 @@ export async function assembleAarBundle(
288
293
  "",
289
294
  " dependencies {",
290
295
  ' classpath("com.android.tools.build:gradle:${project.ext.androidPluginVersion}")',
296
+ ' classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.ext.kotlinVersion}")',
291
297
  " }",
292
298
  "}",
293
299
  "",
@@ -314,13 +320,13 @@ export async function assembleAarBundle(
314
320
  "",
315
321
  ].join("\n");
316
322
 
317
- await fs.ensureDir(buildDir);
318
- await fs.writeFile(path.join(buildDir, "build.gradle"), buildGradle);
319
- await fs.writeFile(
323
+ fs.ensureDirSync(buildDir);
324
+ fs.writeFileSync(path.join(buildDir, "build.gradle"), buildGradle);
325
+ fs.writeFileSync(
320
326
  path.join(buildDir, "gradle.properties"),
321
327
  gradleProperties
322
328
  );
323
- await fs.writeFile(path.join(buildDir, "settings.gradle"), settingsGradle);
329
+ fs.writeFileSync(path.join(buildDir, "settings.gradle"), settingsGradle);
324
330
 
325
331
  // Run only one Gradle task at a time
326
332
  run(gradlew, targets, { cwd: buildDir, stdio: "inherit", env });
@@ -329,35 +335,15 @@ export async function assembleAarBundle(
329
335
  await Promise.all(targetsToCopy.map(([src, dest]) => fs.copy(src, dest)));
330
336
  }
331
337
 
332
- async function copyFiles(files: unknown, destination: string): Promise<void> {
338
+ function copyFiles(files: unknown, destination: string): Promise<void>[] {
333
339
  if (!Array.isArray(files) || files.length === 0) {
334
- return;
340
+ return [];
335
341
  }
336
342
 
337
- await fs.ensureDir(destination);
338
- await Promise.all(
339
- files.map((file) => {
340
- const basename = path.basename(file);
341
- return fs.copy(file, `${destination}/${basename}`);
342
- })
343
- );
344
- }
345
-
346
- async function copyXcodeAssets(
347
- xcassets: unknown,
348
- destination: string
349
- ): Promise<void> {
350
- if (!Array.isArray(xcassets) || xcassets.length === 0) {
351
- return;
352
- }
353
-
354
- await fs.ensureDir(destination);
355
- await Promise.all(
356
- xcassets.map((catalog) => {
357
- const dest = `${destination}/${path.basename(catalog)}`;
358
- return fs.copy(catalog, dest);
359
- })
360
- );
343
+ fs.ensureDirSync(destination);
344
+ return files.map((file) => {
345
+ return fs.copy(file, `${destination}/${path.basename(file)}`);
346
+ });
361
347
  }
362
348
 
363
349
  export async function copyAssets(
@@ -366,12 +352,12 @@ export async function copyAssets(
366
352
  { assets, strings, xcassets }: NativeAssets
367
353
  ): Promise<void> {
368
354
  const tasks = [
369
- copyFiles(assets, `${assetsDest}/assets/${packageName}`),
370
- copyFiles(strings, `${assetsDest}/strings/${packageName}`),
355
+ ...copyFiles(assets, `${assetsDest}/assets/${packageName}`),
356
+ ...copyFiles(strings, `${assetsDest}/strings/${packageName}`),
371
357
  ];
372
358
 
373
359
  if (typeof xcassetsDest === "string") {
374
- tasks.push(copyXcodeAssets(xcassets, xcassetsDest));
360
+ tasks.push(...copyFiles(xcassets, xcassetsDest));
375
361
  }
376
362
 
377
363
  await Promise.all(tasks);
@@ -477,10 +463,7 @@ export async function gatherConfigs({
477
463
  */
478
464
  export async function copyProjectAssets(options: Options): Promise<void> {
479
465
  const projectRoot = findPackageDir() || process.cwd();
480
- const content = await fs.readFile(`${projectRoot}/package.json`, {
481
- encoding: "utf-8",
482
- });
483
- const manifest: PackageManifest = JSON.parse(content);
466
+ const manifest = readPackage(projectRoot);
484
467
  const context = { projectRoot, manifest, options };
485
468
  const assetConfigs = await gatherConfigs(context);
486
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.ensureDir = (dir) => vol.promises.mkdir(dir, { recursive: true });
16
+ fs.ensureDirSync = (dir) => vol.mkdirSync(dir, { recursive: true });
17
17
  fs.existsSync = (...args) => vol.existsSync(...args);
18
- fs.pathExists = (...args) => Promise.resolve(vol.existsSync(...args));
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;