@codeleap/cli 7.0.1 → 7.1.1

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.
Files changed (55) hide show
  1. package/dist/commands/configure.js +3 -12
  2. package/dist/commands/configure.js.map +1 -1
  3. package/dist/commands/configureSplash/index.js +4 -13
  4. package/dist/commands/configureSplash/index.js.map +1 -1
  5. package/dist/commands/configureSplash/utils.js +43 -57
  6. package/dist/commands/configureSplash/utils.js.map +1 -1
  7. package/dist/commands/configureTheme/index.js +2 -11
  8. package/dist/commands/configureTheme/index.js.map +1 -1
  9. package/dist/commands/configureTheme/utils.js +2 -3
  10. package/dist/commands/configureTheme/utils.js.map +1 -1
  11. package/dist/commands/convertorWebp.js +9 -19
  12. package/dist/commands/convertorWebp.js.map +1 -1
  13. package/dist/commands/createApp.js +4 -13
  14. package/dist/commands/createApp.js.map +1 -1
  15. package/dist/commands/createComponent/index.js +5 -15
  16. package/dist/commands/createComponent/index.js.map +1 -1
  17. package/dist/commands/downloadKeystores.js +3 -12
  18. package/dist/commands/downloadKeystores.js.map +1 -1
  19. package/dist/commands/keystoresAndroid.js +3 -12
  20. package/dist/commands/keystoresAndroid.js.map +1 -1
  21. package/dist/commands/linguiTranslate.js +20 -31
  22. package/dist/commands/linguiTranslate.js.map +1 -1
  23. package/dist/commands/rename.js +13 -19
  24. package/dist/commands/rename.js.map +1 -1
  25. package/dist/commands/syncIcons.js +2 -11
  26. package/dist/commands/syncIcons.js.map +1 -1
  27. package/dist/constants.js +4 -1
  28. package/dist/constants.js.map +1 -1
  29. package/dist/lib/Command.js +3 -12
  30. package/dist/lib/Command.js.map +1 -1
  31. package/dist/lib/android/keystore.js +46 -56
  32. package/dist/lib/android/keystore.js.map +1 -1
  33. package/dist/lib/android/rename.js +105 -113
  34. package/dist/lib/android/rename.js.map +1 -1
  35. package/dist/lib/android/utils.js +4 -1
  36. package/dist/lib/android/utils.js.map +1 -1
  37. package/dist/lib/createApp/common.js +4 -15
  38. package/dist/lib/createApp/common.js.map +1 -1
  39. package/dist/lib/createApp/mobile.js +98 -109
  40. package/dist/lib/createApp/mobile.js.map +1 -1
  41. package/dist/lib/firebase.js +3 -14
  42. package/dist/lib/firebase.js.map +1 -1
  43. package/dist/lib/index.js +1 -1
  44. package/dist/lib/index.js.map +1 -1
  45. package/dist/lib/ios/rename.js +73 -81
  46. package/dist/lib/ios/rename.js.map +1 -1
  47. package/dist/lib/spinner.js +13 -35
  48. package/dist/lib/spinner.js.map +1 -1
  49. package/dist/lib/utils.js +2 -3
  50. package/dist/lib/utils.js.map +1 -1
  51. package/dist/lib/walk.js +36 -43
  52. package/dist/lib/walk.js.map +1 -1
  53. package/dist/utils/misc.js +5 -5
  54. package/dist/utils/misc.js.map +1 -1
  55. package/package.json +3 -3
@@ -1,13 +1,4 @@
1
1
  "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
2
  var __importDefault = (this && this.__importDefault) || function (mod) {
12
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
13
4
  };
@@ -19,30 +10,28 @@ const utils_1 = require("../utils");
19
10
  const constants_1 = require("../constants");
20
11
  const cli_progress_1 = __importDefault(require("cli-progress"));
21
12
  const testEnabled = false;
22
- function translate(text, options) {
23
- return __awaiter(this, void 0, void 0, function* () {
24
- if (testEnabled) {
25
- return new Promise((resolve, reject) => {
26
- return setTimeout(() => {
27
- resolve("Test");
28
- }, 1000);
29
- });
30
- }
31
- const base = "https://translate.googleapis.com/translate_a/single";
32
- let response = yield axios_1.default.post(`${base}?client=gtx&sl=${options === null || options === void 0 ? void 0 : options.from}&tl=${options === null || options === void 0 ? void 0 : options.to}&dt=t&q=${encodeURIComponent(text)}`);
33
- let result = response.data;
34
- result = result && result[0] && result[0][0] && result[0].map((s) => s[0]).join("");
35
- if (!result)
36
- return null;
37
- return new Promise((resolve, reject) => setTimeout(() => resolve(result), 1000));
38
- });
13
+ async function translate(text, options) {
14
+ if (testEnabled) {
15
+ return new Promise((resolve, reject) => {
16
+ return setTimeout(() => {
17
+ resolve("Test");
18
+ }, 1000);
19
+ });
20
+ }
21
+ const base = "https://translate.googleapis.com/translate_a/single";
22
+ let response = await axios_1.default.post(`${base}?client=gtx&sl=${options?.from}&tl=${options?.to}&dt=t&q=${encodeURIComponent(text)}`);
23
+ let result = response.data;
24
+ result = result && result[0] && result[0][0] && result[0].map((s) => s[0]).join("");
25
+ if (!result)
26
+ return null;
27
+ return new Promise((resolve, reject) => setTimeout(() => resolve(result), 1000));
39
28
  }
40
29
  exports.linguiTranslateCommand = (0, Command_1.codeleapCommand)({
41
30
  name: 'lingui-translate',
42
31
  help: {
43
32
  description: 'Translate app locales',
44
33
  },
45
- }, (_a) => __awaiter(void 0, [_a], void 0, function* ({ _ }) {
34
+ }, async ({ _ }) => {
46
35
  console.log(`Starting translation process, this may take some time`);
47
36
  const bar = new cli_progress_1.default.SingleBar({}, cli_progress_1.default.Presets.shades_classic);
48
37
  const quotesRegex = /msgstr\s+"(.*?)"/;
@@ -50,7 +39,7 @@ exports.linguiTranslateCommand = (0, Command_1.codeleapCommand)({
50
39
  const locales = (0, utils_1.resolveDir)(config => config.translate.localesDir).filter(l => l.endsWith('.po'));
51
40
  const basePoContent = (0, utils_1.resolveFile)(config => [config.translate.localesDir, baseLanguage + '.po']).split('\n');
52
41
  bar.start(basePoContent.length, 0);
53
- const finished = yield new Promise((resolve, reject) => __awaiter(void 0, void 0, void 0, function* () {
42
+ const finished = await new Promise(async (resolve, reject) => {
54
43
  for (const po of locales) {
55
44
  bar.update(0);
56
45
  const language = po.split('.')[0];
@@ -67,7 +56,7 @@ exports.linguiTranslateCommand = (0, Command_1.codeleapCommand)({
67
56
  if (isNotTextLine || hadTranslated)
68
57
  continue;
69
58
  const text = baseLanguageLine.match(quotesRegex)[1];
70
- const translatedText = yield translate(text, { from: baseLanguage, to: language });
59
+ const translatedText = await translate(text, { from: baseLanguage, to: language });
71
60
  if (translatedText) {
72
61
  updatedPoContent[i] = currentLanguageLine.replace(quotesRegex, `msgstr "${translatedText}"`);
73
62
  }
@@ -80,10 +69,10 @@ exports.linguiTranslateCommand = (0, Command_1.codeleapCommand)({
80
69
  console.log(`\nCompleted translation locale: ${language}`);
81
70
  }
82
71
  setTimeout(() => resolve(true), 1000);
83
- }));
72
+ });
84
73
  if (finished) {
85
74
  console.log(`\nAll translations completed successfully`);
86
75
  process.exit(0);
87
76
  }
88
- }));
77
+ });
89
78
  //# sourceMappingURL=linguiTranslate.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"linguiTranslate.js","sourceRoot":"","sources":["../../src/commands/linguiTranslate.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"linguiTranslate.js","sourceRoot":"","sources":["../../src/commands/linguiTranslate.ts"],"names":[],"mappings":"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"}
@@ -1,13 +1,4 @@
1
1
  "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
2
  var __importDefault = (this && this.__importDefault) || function (mod) {
12
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
13
4
  };
@@ -54,11 +45,11 @@ exports.renameMobileCommand = (0, Command_1.codeleapCommand)({
54
45
  description: 'Will not alter the bundle identifier',
55
46
  },
56
47
  },
57
- }, (argv) => __awaiter(void 0, void 0, void 0, function* () {
48
+ }, async (argv) => {
58
49
  const { flags, _ } = argv;
59
50
  let name = _.newName;
60
51
  if (!name) {
61
- const answers = yield lib_1.inquirer.prompt([
52
+ const answers = await lib_1.inquirer.prompt([
62
53
  {
63
54
  message: `Please insert the new name.`,
64
55
  name: 'name',
@@ -68,26 +59,29 @@ exports.renameMobileCommand = (0, Command_1.codeleapCommand)({
68
59
  }
69
60
  if (flags.android) {
70
61
  const androidFolder = path_1.default.join(constants_1.cwd, 'android');
71
- (0, spinner_1.spinWhileNotCompleted)(() => __awaiter(void 0, void 0, void 0, function* () {
72
- yield (0, lib_1.renameAndroid)(androidFolder, name, {
62
+ (0, spinner_1.spinWhileNotCompleted)(async () => {
63
+ await (0, lib_1.renameAndroid)(androidFolder, name, {
73
64
  changeBundle: !flags.displayOnly,
74
65
  });
75
- }), {
66
+ }, {
76
67
  name: 'Renaming android...',
77
68
  });
78
69
  }
79
70
  if (flags.ios) {
80
71
  const iosFolder = path_1.default.join(constants_1.cwd, 'ios');
81
- (0, spinner_1.spinWhileNotCompleted)(() => __awaiter(void 0, void 0, void 0, function* () {
82
- yield (0, ios_1.renameIos)(iosFolder, name, {
72
+ (0, spinner_1.spinWhileNotCompleted)(async () => {
73
+ await (0, ios_1.renameIos)(iosFolder, name, {
83
74
  changeBundle: !flags.displayOnly,
84
75
  });
85
- }), {
76
+ }, {
86
77
  name: 'Renaming iOS...',
87
78
  });
88
79
  }
89
80
  const appJsonPath = path_1.default.join(constants_1.cwd, 'app.json');
90
81
  const appJson = JSON.parse(fs_1.default.readFileSync(appJsonPath).toString());
91
- fs_1.default.writeFileSync(appJsonPath, JSON.stringify(Object.assign(Object.assign({}, appJson), { name })));
92
- }));
82
+ fs_1.default.writeFileSync(appJsonPath, JSON.stringify({
83
+ ...appJson,
84
+ name,
85
+ }));
86
+ });
93
87
  //# sourceMappingURL=rename.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"rename.js","sourceRoot":"","sources":["../../src/commands/rename.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,4CAAgD;AAEhD,4CAAsD;AACtD,4CAAmB;AACnB,gDAAuB;AAEvB,gCAA+G;AAC/G,oCAAsC;AACtC,2BAAwB;AACxB,4CAAkC;AAClC,MAAM,WAAW,GAAG,eAAe,CAAA;AAEtB,QAAA,mBAAmB,GAAG,IAAA,yBAAe,EAChD;IACE,IAAI,EAAE,WAAW;IACjB,UAAU,EAAE;QACV,YAAY;KACb;IACD,IAAI,EAAE;QACJ,WAAW,EAAE,uEAAuE;QACpF,QAAQ,EAAE;YACR,YAAY,WAAW,4CAA4C;YACnE,YAAY,WAAW,oDAAoD;YAC3E,YAAY,WAAW,mDAAmD;YAC1E,YAAY,WAAW,6EAA6E;SACrG;KACF;IAED,KAAK,EAAE;QACL,GAAG,EAAE;YACH,IAAI,EAAE,OAAO;YACb,WAAW,EAAE,yCAAyC;SAEvD;QACD,OAAO,EAAE;YACP,IAAI,EAAE,OAAO;YACb,WAAW,EAAE,6CAA6C;SAE3D;QACD,GAAG,EAAE;YACH,IAAI,EAAE,OAAO;YACb,WAAW,EAAE,mDAAmD;SACjE;QACD,WAAW,EAAE;YACX,IAAI,EAAE,OAAO;YACb,WAAW,EAAE,sCAAsC;SACpD;KACF;CAEF,EACD,CAAO,IAAI,EAAE,EAAE;IACb,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,IAAI,CAAA;IACzB,IAAI,IAAI,GAAG,CAAC,CAAC,OAAO,CAAA;IACpB,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,OAAO,GAAG,MAAM,cAAQ,CAAC,MAAM,CAAC;YACpC;gBACE,OAAO,EAAE,6BAA6B;gBACtC,IAAI,EAAE,MAAM;aACb;SACF,CAAC,CAAA;QACF,IAAI,GAAG,OAAO,CAAC,IAAI,CAAA;IACrB,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QAClB,MAAM,aAAa,GAAG,cAAI,CAAC,IAAI,CAAC,eAAG,EAAE,SAAS,CAAC,CAAA;QAC/C,IAAA,+BAAqB,EACnB,GAAS,EAAE;YACT,MAAM,IAAA,mBAAa,EACjB,aAAa,EACb,IAAI,EACJ;gBACE,YAAY,EAAE,CAAC,KAAK,CAAC,WAAW;aACjC,CACF,CAAA;QACH,CAAC,CAAA,EACD;YACE,IAAI,EAAE,qBAAqB;SAC5B,CACF,CAAA;IAEH,CAAC;IAED,IAAI,KAAK,CAAC,GAAG,EAAE,CAAC;QACd,MAAM,SAAS,GAAG,cAAI,CAAC,IAAI,CAAC,eAAG,EAAE,KAAK,CAAC,CAAA;QACvC,IAAA,+BAAqB,EACnB,GAAS,EAAE;YACT,MAAM,IAAA,eAAS,EACb,SAAS,EACT,IAAI,EACJ;gBACE,YAAY,EAAE,CAAC,KAAK,CAAC,WAAW;aACjC,CACF,CAAA;QACH,CAAC,CAAA,EACD;YACE,IAAI,EAAE,iBAAiB;SACxB,CACF,CAAA;IACH,CAAC;IACD,MAAM,WAAW,GAAG,cAAI,CAAC,IAAI,CAAC,eAAG,EAAE,UAAU,CAAC,CAAA;IAC9C,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;IACnE,YAAE,CAAC,aAAa,CACd,WAAW,EACX,IAAI,CAAC,SAAS,iCACT,OAAO,KACV,IAAI,IACJ,CACH,CAAA;AACH,CAAC,CAAA,CACF,CAAA"}
1
+ {"version":3,"file":"rename.js","sourceRoot":"","sources":["../../src/commands/rename.ts"],"names":[],"mappings":";;;;;;AACA,4CAAgD;AAEhD,4CAAsD;AACtD,4CAAmB;AACnB,gDAAuB;AAEvB,gCAA+G;AAC/G,oCAAsC;AACtC,2BAAwB;AACxB,4CAAkC;AAClC,MAAM,WAAW,GAAG,eAAe,CAAA;AAEtB,QAAA,mBAAmB,GAAG,IAAA,yBAAe,EAChD;IACE,IAAI,EAAE,WAAW;IACjB,UAAU,EAAE;QACV,YAAY;KACb;IACD,IAAI,EAAE;QACJ,WAAW,EAAE,uEAAuE;QACpF,QAAQ,EAAE;YACR,YAAY,WAAW,4CAA4C;YACnE,YAAY,WAAW,oDAAoD;YAC3E,YAAY,WAAW,mDAAmD;YAC1E,YAAY,WAAW,6EAA6E;SACrG;KACF;IAED,KAAK,EAAE;QACL,GAAG,EAAE;YACH,IAAI,EAAE,OAAO;YACb,WAAW,EAAE,yCAAyC;SAEvD;QACD,OAAO,EAAE;YACP,IAAI,EAAE,OAAO;YACb,WAAW,EAAE,6CAA6C;SAE3D;QACD,GAAG,EAAE;YACH,IAAI,EAAE,OAAO;YACb,WAAW,EAAE,mDAAmD;SACjE;QACD,WAAW,EAAE;YACX,IAAI,EAAE,OAAO;YACb,WAAW,EAAE,sCAAsC;SACpD;KACF;CAEF,EACD,KAAK,EAAE,IAAI,EAAE,EAAE;IACb,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,IAAI,CAAA;IACzB,IAAI,IAAI,GAAG,CAAC,CAAC,OAAO,CAAA;IACpB,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,OAAO,GAAG,MAAM,cAAQ,CAAC,MAAM,CAAC;YACpC;gBACE,OAAO,EAAE,6BAA6B;gBACtC,IAAI,EAAE,MAAM;aACb;SACF,CAAC,CAAA;QACF,IAAI,GAAG,OAAO,CAAC,IAAI,CAAA;IACrB,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QAClB,MAAM,aAAa,GAAG,cAAI,CAAC,IAAI,CAAC,eAAG,EAAE,SAAS,CAAC,CAAA;QAC/C,IAAA,+BAAqB,EACnB,KAAK,IAAI,EAAE;YACT,MAAM,IAAA,mBAAa,EACjB,aAAa,EACb,IAAI,EACJ;gBACE,YAAY,EAAE,CAAC,KAAK,CAAC,WAAW;aACjC,CACF,CAAA;QACH,CAAC,EACD;YACE,IAAI,EAAE,qBAAqB;SAC5B,CACF,CAAA;IAEH,CAAC;IAED,IAAI,KAAK,CAAC,GAAG,EAAE,CAAC;QACd,MAAM,SAAS,GAAG,cAAI,CAAC,IAAI,CAAC,eAAG,EAAE,KAAK,CAAC,CAAA;QACvC,IAAA,+BAAqB,EACnB,KAAK,IAAI,EAAE;YACT,MAAM,IAAA,eAAS,EACb,SAAS,EACT,IAAI,EACJ;gBACE,YAAY,EAAE,CAAC,KAAK,CAAC,WAAW;aACjC,CACF,CAAA;QACH,CAAC,EACD;YACE,IAAI,EAAE,iBAAiB;SACxB,CACF,CAAA;IACH,CAAC;IACD,MAAM,WAAW,GAAG,cAAI,CAAC,IAAI,CAAC,eAAG,EAAE,UAAU,CAAC,CAAA;IAC9C,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;IACnE,YAAE,CAAC,aAAa,CACd,WAAW,EACX,IAAI,CAAC,SAAS,CAAC;QACb,GAAG,OAAO;QACV,IAAI;KACL,CAAC,CACH,CAAA;AACH,CAAC,CACF,CAAA"}
@@ -1,13 +1,4 @@
1
1
  "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
2
  Object.defineProperty(exports, "__esModule", { value: true });
12
3
  exports.syncIconsCommand = void 0;
13
4
  const Command_1 = require("../lib/Command");
@@ -29,7 +20,7 @@ exports.syncIconsCommand = (0, Command_1.codeleapCommand)({
29
20
  default: true,
30
21
  },
31
22
  },
32
- }, (argv) => __awaiter(void 0, void 0, void 0, function* () {
23
+ }, async (argv) => {
33
24
  const { flags, _ } = argv;
34
25
  const iconFiles = lib_1.fs.readdirSync('./src/app/assets/icons', {
35
26
  withFileTypes: true,
@@ -52,5 +43,5 @@ ${iconEntriesString}
52
43
  if (flags.logdiff) {
53
44
  console.log(iconEntriesFile);
54
45
  }
55
- }));
46
+ });
56
47
  //# sourceMappingURL=syncIcons.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"syncIcons.js","sourceRoot":"","sources":["../../src/commands/syncIcons.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAAgD;AAChD,gCAAsD;AACtD,2BAAwB;AACxB,MAAM,WAAW,GAAG,WAAW,CAAA;AAE/B,MAAM,mBAAmB,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,CAAA;AAE5C,QAAA,gBAAgB,GAAG,IAAA,yBAAe,EAC7C;IACE,IAAI,EAAE,WAAW;IAEjB,IAAI,EAAE;QACJ,WAAW,EAAE,sFAAsF;QACnG,QAAQ,EAAE;YACR,YAAY,WAAW,EAAE;SAC1B;KACF;IACD,KAAK,EAAE;QACL,OAAO,EAAE;YACP,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,IAAI;SACd;KACF;CAEF,EACD,CAAO,IAAI,EAAE,EAAE;IACb,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,IAAI,CAAA;IAEzB,MAAM,SAAS,GAAG,QAAE,CAAC,WAAW,CAAC,wBAAwB,EAAE;QACzD,aAAa,EAAE,IAAI;KACpB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;QACZ,MAAM,SAAS,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAA;QACzC,OAAO,CAAC,CAAC,MAAM,EAAE,IAAI,mBAAmB,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;IAC9D,CAAC,CAAC,CAAA;IAEF,MAAM,WAAW,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;QAC7C,MAAM,SAAS,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAA;QAE9D,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,SAAS,EAAE,EAAE,EAAE,CAAC,CAAA;QAE3D,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAA;IAClC,CAAC,CAAC,CAAA;IAEF,MAAM,iBAAiB,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QACzD,OAAO,MAAM,GAAG,iBAAiB,KAAK,KAAK,CAAA;IAC7C,CAAC,CACA,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAEZ,MAAM,eAAe,GAAG;EAC1B,iBAAiB;EACjB,CAAA;IACE,QAAE,CAAC,aAAa,CAAC,mCAAmC,EAAE,eAAe,CAAC,CAAA;IAEtE,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QAClB,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;IAC9B,CAAC;AACH,CAAC,CAAA,CACF,CAAA"}
1
+ {"version":3,"file":"syncIcons.js","sourceRoot":"","sources":["../../src/commands/syncIcons.ts"],"names":[],"mappings":";;;AAAA,4CAAgD;AAChD,gCAAsD;AACtD,2BAAwB;AACxB,MAAM,WAAW,GAAG,WAAW,CAAA;AAE/B,MAAM,mBAAmB,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,CAAA;AAE5C,QAAA,gBAAgB,GAAG,IAAA,yBAAe,EAC7C;IACE,IAAI,EAAE,WAAW;IAEjB,IAAI,EAAE;QACJ,WAAW,EAAE,sFAAsF;QACnG,QAAQ,EAAE;YACR,YAAY,WAAW,EAAE;SAC1B;KACF;IACD,KAAK,EAAE;QACL,OAAO,EAAE;YACP,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,IAAI;SACd;KACF;CAEF,EACD,KAAK,EAAE,IAAI,EAAE,EAAE;IACb,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,IAAI,CAAA;IAEzB,MAAM,SAAS,GAAG,QAAE,CAAC,WAAW,CAAC,wBAAwB,EAAE;QACzD,aAAa,EAAE,IAAI;KACpB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;QACZ,MAAM,SAAS,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAA;QACzC,OAAO,CAAC,CAAC,MAAM,EAAE,IAAI,mBAAmB,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;IAC9D,CAAC,CAAC,CAAA;IAEF,MAAM,WAAW,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;QAC7C,MAAM,SAAS,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAA;QAE9D,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,SAAS,EAAE,EAAE,EAAE,CAAC,CAAA;QAE3D,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAA;IAClC,CAAC,CAAC,CAAA;IAEF,MAAM,iBAAiB,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QACzD,OAAO,MAAM,GAAG,iBAAiB,KAAK,KAAK,CAAA;IAC7C,CAAC,CACA,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAEZ,MAAM,eAAe,GAAG;EAC1B,iBAAiB;EACjB,CAAA;IACE,QAAE,CAAC,aAAa,CAAC,mCAAmC,EAAE,eAAe,CAAC,CAAA;IAEtE,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QAClB,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;IAC9B,CAAC;AACH,CAAC,CACF,CAAA"}
package/dist/constants.js CHANGED
@@ -51,7 +51,10 @@ exports.orgName = 'codeleap-uk';
51
51
  * missing or malformed. Keys from `codeleapcli.config.json` override the
52
52
  * defaults.
53
53
  */
54
- exports.USER_CONFIG = Object.assign({ SHELL: true }, userConfig);
54
+ exports.USER_CONFIG = {
55
+ SHELL: true,
56
+ ...userConfig,
57
+ };
55
58
  console.log('Current config ->', exports.USER_CONFIG);
56
59
  /**
57
60
  * SSH clone URL for the canonical CodeLeap mobile template repository.
@@ -1 +1 @@
1
- {"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAuB;AACvB,4CAAmB;AAInB,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,EAAE,CAAA;AAE1B;;;;GAIG;AACU,QAAA,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,MAAM,CAAA;AAEhE;;;;;;;;GAQG;AACU,QAAA,GAAG,GAAG,cAAI,CAAC,OAAO,CAAC,aAAK,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,cAAI,CAAC,IAAI,CACrE,IAAI,EACJ,aAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CACrB,CAAC,CAAA;AAEF,OAAO,CAAC,GAAG,CAAC,8BAA8B,GAAG,cAAI,CAAC,IAAI,CAAC,WAAG,EAAE,qBAAqB,CAAC,CAAA;AAElF,MAAM,UAAU,GAAG,YAAE,CAAC,UAAU,CAAC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC,CAAA;AAE1E,MAAM,WAAW,GAAG,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,WAAW,CAAC,CAAA;AAExD;;;GAGG;AACU,QAAA,MAAM,GAAG,IAAI,CAAA;AAE1B;;;GAGG;AACU,QAAA,aAAa,GAAG,cAAI,CAAC,OAAO,CAAC,cAAM,EAAE,yBAAyB,CAAC,CAAA;AAE5E,IAAI,UAAU,GAAG,EAA2B,CAAA;AAE5C,IAAI,CAAC;IACH,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,UAAU,EAAE,UAAU,CAAC,CAAA;IAErD,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CACrC,qBAAa,CACd,CAAC,QAAQ,EAAE,CAA0B,CAAA;AACxC,CAAC;AAAC,OAAO,CAAC,EAAE,CAAC;IACX,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;AAClB,CAAC;AAEY,QAAA,OAAO,GAAG,aAAa,CAAA;AAEpC;;;;;GAKG;AACU,QAAA,WAAW,mBACtB,KAAK,EAAE,IAAI,IACR,UAAU,EACd;AAED,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,mBAAW,CAAC,CAAA;AAE7C;;;GAGG;AACU,QAAA,mBAAmB,GAAG,kBAAkB,eAAO,sBAAsB,CAAA"}
1
+ {"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAuB;AACvB,4CAAmB;AAInB,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,EAAE,CAAA;AAE1B;;;;GAIG;AACU,QAAA,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,MAAM,CAAA;AAEhE;;;;;;;;GAQG;AACU,QAAA,GAAG,GAAG,cAAI,CAAC,OAAO,CAAC,aAAK,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,cAAI,CAAC,IAAI,CACrE,IAAI,EACJ,aAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CACrB,CAAC,CAAA;AAEF,OAAO,CAAC,GAAG,CAAC,8BAA8B,GAAG,cAAI,CAAC,IAAI,CAAC,WAAG,EAAE,qBAAqB,CAAC,CAAA;AAElF,MAAM,UAAU,GAAG,YAAE,CAAC,UAAU,CAAC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC,CAAA;AAE1E,MAAM,WAAW,GAAG,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,WAAW,CAAC,CAAA;AAExD;;;GAGG;AACU,QAAA,MAAM,GAAG,IAAI,CAAA;AAE1B;;;GAGG;AACU,QAAA,aAAa,GAAG,cAAI,CAAC,OAAO,CAAC,cAAM,EAAE,yBAAyB,CAAC,CAAA;AAE5E,IAAI,UAAU,GAAG,EAA2B,CAAA;AAE5C,IAAI,CAAC;IACH,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,UAAU,EAAE,UAAU,CAAC,CAAA;IAErD,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CACrC,qBAAa,CACd,CAAC,QAAQ,EAAE,CAA0B,CAAA;AACxC,CAAC;AAAC,OAAO,CAAC,EAAE,CAAC;IACX,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;AAClB,CAAC;AAEY,QAAA,OAAO,GAAG,aAAa,CAAA;AAEpC;;;;;GAKG;AACU,QAAA,WAAW,GAAG;IACzB,KAAK,EAAE,IAAI;IACX,GAAG,UAAU;CACd,CAAA;AAED,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,mBAAW,CAAC,CAAA;AAE7C;;;GAGG;AACU,QAAA,mBAAmB,GAAG,kBAAkB,eAAO,sBAAsB,CAAA"}
@@ -1,13 +1,4 @@
1
1
  "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
2
  var __importDefault = (this && this.__importDefault) || function (mod) {
12
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
13
4
  };
@@ -29,13 +20,13 @@ const constants_1 = require("../constants");
29
20
  * responsible for creating the file in the first place.
30
21
  */
31
22
  const codeleapCommand = (opts, callback) => {
32
- return (0, cleye_1.command)(opts, (...args) => __awaiter(void 0, void 0, void 0, function* () {
23
+ return (0, cleye_1.command)(opts, async (...args) => {
33
24
  console.log(chalk_1.default.blue(figlet_1.default.textSync('Codeleap')));
34
25
  if (opts.name !== 'configure' && !utils_1.fs.existsSync(constants_1.cliConfigPath)) {
35
26
  throw new Error(`Could not find a configuration file at ${constants_1.cliConfigPath}. Please run 'codeleap configure' to start setup`);
36
27
  }
37
- return yield callback(...args);
38
- }));
28
+ return await callback(...args);
29
+ });
39
30
  };
40
31
  exports.codeleapCommand = codeleapCommand;
41
32
  //# sourceMappingURL=Command.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"Command.js","sourceRoot":"","sources":["../../src/lib/Command.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,iCAA+B;AAC/B,oDAA2B;AAC3B,kDAAyB;AACzB,mCAA4B;AAC5B,4CAA4C;AAE5C;;;;;;;;;GASG;AACI,MAAM,eAAe,GAAmB,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE;IAChE,OAAO,IAAA,eAAO,EAAC,IAAI,EAAE,CAAO,GAAG,IAAI,EAAE,EAAE;QACrC,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,gBAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;QAEpD,IAAI,IAAI,CAAC,IAAI,KAAK,WAAW,IAAI,CAAC,UAAE,CAAC,UAAU,CAAC,yBAAa,CAAC,EAAE,CAAC;YAC/D,MAAM,IAAI,KAAK,CAAC,0CAA0C,yBAAa,kDAAkD,CAAC,CAAA;QAC5H,CAAC;QAED,OAAO,MAAM,QAAQ,CAAC,GAAG,IAAI,CAAC,CAAA;IAChC,CAAC,CAAA,CAAC,CAAA;AACJ,CAAC,CAAA;AAVY,QAAA,eAAe,mBAU3B"}
1
+ {"version":3,"file":"Command.js","sourceRoot":"","sources":["../../src/lib/Command.ts"],"names":[],"mappings":";;;;;;AAAA,iCAA+B;AAC/B,oDAA2B;AAC3B,kDAAyB;AACzB,mCAA4B;AAC5B,4CAA4C;AAE5C;;;;;;;;;GASG;AACI,MAAM,eAAe,GAAmB,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE;IAChE,OAAO,IAAA,eAAO,EAAC,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE;QACrC,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,gBAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;QAEpD,IAAI,IAAI,CAAC,IAAI,KAAK,WAAW,IAAI,CAAC,UAAE,CAAC,UAAU,CAAC,yBAAa,CAAC,EAAE,CAAC;YAC/D,MAAM,IAAI,KAAK,CAAC,0CAA0C,yBAAa,kDAAkD,CAAC,CAAA;QAC5H,CAAC;QAED,OAAO,MAAM,QAAQ,CAAC,GAAG,IAAI,CAAC,CAAA;IAChC,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAVY,QAAA,eAAe,mBAU3B"}
@@ -1,13 +1,4 @@
1
1
  "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
2
  var __importDefault = (this && this.__importDefault) || function (mod) {
12
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
13
4
  };
@@ -23,9 +14,10 @@ const constants_1 = require("../../constants");
23
14
  * back to disk immediately.
24
15
  */
25
16
  class AndroidConfigFile {
17
+ path;
18
+ data = {};
26
19
  constructor(path) {
27
20
  this.path = path;
28
- this.data = {};
29
21
  if (utils_1.fs.existsSync(path)) {
30
22
  this.data = JSON.parse(utils_1.fs.readFileSync(path).toString());
31
23
  }
@@ -50,50 +42,48 @@ exports.AndroidConfigFile = AndroidConfigFile;
50
42
  * @sideeffect Writes `<type>.keystore` to `_cwd`.
51
43
  * @returns Credentials object including the generated password and keystore filename.
52
44
  */
53
- function genKeystore(type_1) {
54
- return __awaiter(this, arguments, void 0, function* (type, _cwd = constants_1.cwd) {
55
- const pass = generate_password_1.default.generate({
56
- length: 26,
57
- lowercase: true,
58
- numbers: true,
59
- strict: true,
60
- symbols: true,
61
- uppercase: true,
62
- });
63
- console.log(_cwd);
64
- const alias = type;
65
- const fileName = `${type}.keystore`;
66
- yield (0, lib_1.subprocess)('Generating keystore', (0, utils_1.findExecutable)('keytool'), [
67
- '-genkeypair ',
68
- '-v',
69
- '-storetype',
70
- 'PKCS12',
71
- '-keystore',
72
- fileName,
73
- '-alias',
74
- alias,
75
- '-keyalg',
76
- 'RSA',
77
- '-keysize',
78
- '2048',
79
- '-storepass',
80
- `"${pass}"`,
81
- '-keypass',
82
- `"${pass}"`,
83
- '-validity',
84
- '11000',
85
- '-dname',
86
- 'CN=Victor Rothberg, OU=Development, O=Codeleap, L=London, ST=Greater London, C=GB',
87
- ], {
88
- cwd: _cwd
89
- });
90
- return {
91
- 'storePassword': pass,
92
- 'keyAlias': alias,
93
- 'keyPassword': pass,
94
- 'keyname': fileName,
95
- };
45
+ async function genKeystore(type, _cwd = constants_1.cwd) {
46
+ const pass = generate_password_1.default.generate({
47
+ length: 26,
48
+ lowercase: true,
49
+ numbers: true,
50
+ strict: true,
51
+ symbols: true,
52
+ uppercase: true,
96
53
  });
54
+ console.log(_cwd);
55
+ const alias = type;
56
+ const fileName = `${type}.keystore`;
57
+ await (0, lib_1.subprocess)('Generating keystore', (0, utils_1.findExecutable)('keytool'), [
58
+ '-genkeypair ',
59
+ '-v',
60
+ '-storetype',
61
+ 'PKCS12',
62
+ '-keystore',
63
+ fileName,
64
+ '-alias',
65
+ alias,
66
+ '-keyalg',
67
+ 'RSA',
68
+ '-keysize',
69
+ '2048',
70
+ '-storepass',
71
+ `"${pass}"`,
72
+ '-keypass',
73
+ `"${pass}"`,
74
+ '-validity',
75
+ '11000',
76
+ '-dname',
77
+ 'CN=Victor Rothberg, OU=Development, O=Codeleap, L=London, ST=Greater London, C=GB',
78
+ ], {
79
+ cwd: _cwd
80
+ });
81
+ return {
82
+ 'storePassword': pass,
83
+ 'keyAlias': alias,
84
+ 'keyPassword': pass,
85
+ 'keyname': fileName,
86
+ };
97
87
  }
98
88
  /**
99
89
  * Generates a release keystore for an Android project, then writes its
@@ -103,12 +93,12 @@ function genKeystore(type_1) {
103
93
  * exists. The caller is instructed (via stdout) to upload the keystore file
104
94
  * to 1Password with the JSON credentials in the notes field.
105
95
  */
106
- const generateReleaseKeystore = (androidFolder) => __awaiter(void 0, void 0, void 0, function* () {
96
+ const generateReleaseKeystore = async (androidFolder) => {
107
97
  const keystoresDir = lib_1.path.join(androidFolder || constants_1.cwd, 'app', 'keystores');
108
98
  if (utils_1.fs.existsSync(lib_1.path.join(keystoresDir, 'release.keystore'))) {
109
99
  return;
110
100
  }
111
- const releaseCredentials = yield genKeystore('release', keystoresDir);
101
+ const releaseCredentials = await genKeystore('release', keystoresDir);
112
102
  const configFile = new AndroidConfigFile(lib_1.path.join(keystoresDir, 'config.json'));
113
103
  configFile.setKey(releaseCredentials.keyname, releaseCredentials);
114
104
  const log = [
@@ -117,6 +107,6 @@ const generateReleaseKeystore = (androidFolder) => __awaiter(void 0, void 0, voi
117
107
  JSON.stringify(configFile.data, null, 1),
118
108
  ].join('\n');
119
109
  console.log(log);
120
- });
110
+ };
121
111
  exports.generateReleaseKeystore = generateReleaseKeystore;
122
112
  //# sourceMappingURL=keystore.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"keystore.js","sourceRoot":"","sources":["../../../src/lib/android/keystore.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"keystore.js","sourceRoot":"","sources":["../../../src/lib/android/keystore.ts"],"names":[],"mappings":"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"}