piral-cli 0.15.0-alpha.4314 → 0.15.0-alpha.4355

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 (20) hide show
  1. package/lib/cli.js +3 -2
  2. package/lib/cli.js.map +1 -1
  3. package/lib/common/emoji.d.ts +8 -0
  4. package/lib/common/emoji.js +10 -1
  5. package/lib/common/emoji.js.map +1 -1
  6. package/lib/common/language.js +1 -7
  7. package/lib/common/language.js.map +1 -1
  8. package/lib/common/scaffold.js +1 -1
  9. package/lib/common/scaffold.js.map +1 -1
  10. package/lib/external/index.js +79 -79
  11. package/lib/injectors/pilet-injector.d.ts +1 -0
  12. package/lib/injectors/piral-injector.d.ts +1 -0
  13. package/package.json +3 -3
  14. package/src/apps/new-pilet.test.ts +8 -4
  15. package/src/apps/new-piral.test.ts +2 -4
  16. package/src/cli.ts +3 -2
  17. package/src/common/emoji.ts +9 -0
  18. package/src/common/language.ts +1 -8
  19. package/src/common/npm.test.ts +14 -58
  20. package/src/common/scaffold.ts +2 -2
package/lib/cli.js CHANGED
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.setupCli = void 0;
4
4
  const yargs = require("yargs");
5
5
  const yargs_parser_1 = require("yargs-parser");
6
+ const common_1 = require("./common");
6
7
  const questionnaire_1 = require("./questionnaire");
7
8
  let argv = yargs;
8
9
  function buildCommand(command) {
@@ -37,12 +38,12 @@ function setupCli(commands) {
37
38
  };
38
39
  return runCommand().then(() => process.exit(0), (err) => {
39
40
  err && !err.logged && console.error(err.message);
40
- console.log('Codes Reference: https://docs.piral.io/code/search');
41
+ console.log(`${common_1.caterpillerIcon} Codes Reference: https://docs.piral.io/code/search`);
41
42
  process.exit(1);
42
43
  });
43
44
  });
44
45
  }
45
- argv.epilog('For more information, check out the documentation at https://docs.piral.io.').help().strict().argv;
46
+ argv.epilog(`${common_1.zapIcon} For more information, check out the documentation at https://docs.piral.io.`).help().strict().argv;
46
47
  }
47
48
  exports.setupCli = setupCli;
48
49
  //# sourceMappingURL=cli.js.map
package/lib/cli.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,+CAAwC;AACxC,mDAAsD;AAGtD,IAAI,IAAI,GAAG,KAAK,CAAC;AAEjB,SAAS,YAAY,CAAI,OAAuB;IAC9C,IAAI,OAAO,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;QAChC,OAAO,GAAG,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;KACzD;IAED,OAAO,OAAO,CAAC,IAAI,CAAC;AACtB,CAAC;AAED,SAAgB,QAAQ,CAAC,QAAiC;IACxD,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;QAC9B,IAAI,GAAG,IAAI,CAAC,OAAO,CACjB,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,EACzC,OAAO,CAAC,WAAW,EACnB,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,OAAO,CAAC,MAAM,EAAE;gBAClB,IAAI,GAAG,IAAI;qBACR,OAAO,CAAC,GAAG,CAAC;qBACZ,KAAK,CAAC,GAAG,EAAE,UAAU,CAAC;qBACtB,QAAQ,CAAC,GAAG,EAAE,yDAAyD,CAAC;qBACxE,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;aACxB;YAED,IAAI,OAAO,OAAO,CAAC,KAAK,KAAK,UAAU,EAAE;gBACvC,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aAC5B;YACD,OAAO,IAAI,CAAC;QACd,CAAC,EACD,CAAC,IAAI,EAAE,EAAE;YACP,MAAM,UAAU,GAAG,GAAG,EAAE;gBACtB,IAAI,OAAO,CAAC,MAAM,EAAE;oBAClB,MAAM,MAAM,GAAG,IAAA,uBAAQ,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC;oBAC3C,OAAO,IAAA,mCAAmB,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;iBAC7C;qBAAM;oBACL,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;iBAC3C;YACH,CAAC,CAAC;YAEF,OAAO,UAAU,EAAE,CAAC,IAAI,CACtB,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EACrB,CAAC,GAAG,EAAE,EAAE;gBACN,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBACjD,OAAO,CAAC,GAAG,CAAC,oDAAoD,CAAC,CAAC;gBAClE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC,CACF,CAAC;QACJ,CAAC,CACF,CAAC;KACH;IAED,IAAI,CAAC,MAAM,CAAC,6EAA6E,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC;AAClH,CAAC;AA1CD,4BA0CC"}
1
+ {"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,+CAAwC;AACxC,qCAAoD;AACpD,mDAAsD;AAGtD,IAAI,IAAI,GAAG,KAAK,CAAC;AAEjB,SAAS,YAAY,CAAI,OAAuB;IAC9C,IAAI,OAAO,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;QAChC,OAAO,GAAG,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;KACzD;IAED,OAAO,OAAO,CAAC,IAAI,CAAC;AACtB,CAAC;AAED,SAAgB,QAAQ,CAAC,QAAiC;IACxD,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;QAC9B,IAAI,GAAG,IAAI,CAAC,OAAO,CACjB,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,EACzC,OAAO,CAAC,WAAW,EACnB,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,OAAO,CAAC,MAAM,EAAE;gBAClB,IAAI,GAAG,IAAI;qBACR,OAAO,CAAC,GAAG,CAAC;qBACZ,KAAK,CAAC,GAAG,EAAE,UAAU,CAAC;qBACtB,QAAQ,CAAC,GAAG,EAAE,yDAAyD,CAAC;qBACxE,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;aACxB;YAED,IAAI,OAAO,OAAO,CAAC,KAAK,KAAK,UAAU,EAAE;gBACvC,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aAC5B;YACD,OAAO,IAAI,CAAC;QACd,CAAC,EACD,CAAC,IAAI,EAAE,EAAE;YACP,MAAM,UAAU,GAAG,GAAG,EAAE;gBACtB,IAAI,OAAO,CAAC,MAAM,EAAE;oBAClB,MAAM,MAAM,GAAG,IAAA,uBAAQ,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC;oBAC3C,OAAO,IAAA,mCAAmB,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;iBAC7C;qBAAM;oBACL,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;iBAC3C;YACH,CAAC,CAAC;YAEF,OAAO,UAAU,EAAE,CAAC,IAAI,CACtB,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EACrB,CAAC,GAAG,EAAE,EAAE;gBACN,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBACjD,OAAO,CAAC,GAAG,CAAC,GAAG,wBAAe,qDAAqD,CAAC,CAAC;gBACrF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC,CACF,CAAC;QACJ,CAAC,CACF,CAAC;KACH;IAED,IAAI,CAAC,MAAM,CAAC,GAAG,gBAAO,8EAA8E,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC;AAC7H,CAAC;AA1CD,4BA0CC"}
package/lib/common/emoji.d.ts CHANGED
@@ -1,2 +1,10 @@
1
1
  export declare const liveIcon: string;
2
2
  export declare const settingsIcon: string;
3
+ export declare const cactusIcon: string;
4
+ export declare const clapIcon: string;
5
+ export declare const sparklesIcon: string;
6
+ export declare const unicornIcon: string;
7
+ export declare const caterpillerIcon: string;
8
+ export declare const butterflyIcon: string;
9
+ export declare const zapIcon: string;
10
+ export declare const rainbowIcon: string;
package/lib/common/emoji.js CHANGED
@@ -1,8 +1,17 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.settingsIcon = exports.liveIcon = void 0;
3
+ exports.rainbowIcon = exports.zapIcon = exports.butterflyIcon = exports.caterpillerIcon = exports.unicornIcon = exports.sparklesIcon = exports.clapIcon = exports.cactusIcon = exports.settingsIcon = exports.liveIcon = void 0;
4
4
  const info_1 = require("./info");
5
5
  const supportsEmoji = !info_1.isWindows || process.env.TERM === 'xterm-256color';
6
+ // see https://unicode.org/emoji/charts/full-emoji-list.html
6
7
  exports.liveIcon = supportsEmoji ? '🚀 ' : '>';
7
8
  exports.settingsIcon = supportsEmoji ? '🔧 ' : '>';
9
+ exports.cactusIcon = supportsEmoji ? '👻' : '>';
10
+ exports.clapIcon = supportsEmoji ? '👏' : '^';
11
+ exports.sparklesIcon = supportsEmoji ? '✨' : '>';
12
+ exports.unicornIcon = supportsEmoji ? '🦄' : '>';
13
+ exports.caterpillerIcon = supportsEmoji ? '🐛' : '+';
14
+ exports.butterflyIcon = supportsEmoji ? '🦋' : '+';
15
+ exports.zapIcon = supportsEmoji ? '⚡' : '>';
16
+ exports.rainbowIcon = supportsEmoji ? '🌈' : '~';
8
17
  //# sourceMappingURL=emoji.js.map
package/lib/common/emoji.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"emoji.js","sourceRoot":"","sources":["../../src/common/emoji.ts"],"names":[],"mappings":";;;AAAA,iCAAmC;AAEnC,MAAM,aAAa,GAAG,CAAC,gBAAS,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,KAAK,gBAAgB,CAAC;AAE7D,QAAA,QAAQ,GAAG,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC;AACvC,QAAA,YAAY,GAAG,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC"}
1
+ {"version":3,"file":"emoji.js","sourceRoot":"","sources":["../../src/common/emoji.ts"],"names":[],"mappings":";;;AAAA,iCAAmC;AAEnC,MAAM,aAAa,GAAG,CAAC,gBAAS,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,KAAK,gBAAgB,CAAC;AAE1E,4DAA4D;AAC/C,QAAA,QAAQ,GAAG,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC;AACvC,QAAA,YAAY,GAAG,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC;AAC3C,QAAA,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC;AACxC,QAAA,QAAQ,GAAG,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC;AACtC,QAAA,YAAY,GAAG,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;AACzC,QAAA,WAAW,GAAG,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC;AACzC,QAAA,eAAe,GAAG,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC;AAC7C,QAAA,aAAa,GAAG,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC;AAC3C,QAAA,OAAO,GAAG,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;AACpC,QAAA,WAAW,GAAG,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC"}
package/lib/common/language.js CHANGED
@@ -30,16 +30,10 @@ const reactRouter5Typings = {
30
30
  '@types/react-router': '^5',
31
31
  '@types/react-router-dom': '^5',
32
32
  };
33
- const reactRouter6Typings = {
34
- '@types/react-router': '^6',
35
- '@types/react-router-dom': '^6',
36
- };
37
33
  const defaultDeps = {};
38
34
  const defaultTypings = {
39
35
  '@types/react': '*',
40
36
  '@types/react-dom': '*',
41
- '@types/react-router': '*',
42
- '@types/react-router-dom': '*',
43
37
  };
44
38
  function getDependencyPackages(framework, reactVersion, reactRouterVersion) {
45
39
  // take default packages only if piral-core
@@ -52,7 +46,7 @@ function getDevDependencyPackages(framework, reactVersion, reactRouterVersion) {
52
46
  // take default dev packages only if not piral-base
53
47
  return framework === 'piral-base'
54
48
  ? {}
55
- : Object.assign(Object.assign({}, (reactVersion < 18 ? react17Typings : react18Typings)), (reactRouterVersion < 6 ? reactRouter5Typings : reactRouter6Typings));
49
+ : Object.assign(Object.assign({}, (reactVersion < 18 ? react17Typings : react18Typings)), (reactRouterVersion < 6 ? reactRouter5Typings : {}));
56
50
  }
57
51
  exports.getDevDependencyPackages = getDevDependencyPackages;
58
52
  function getDependencies(language, packages = defaultDeps) {
package/lib/common/language.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"language.js","sourceRoot":"","sources":["../../src/common/language.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAG5B,MAAM,WAAW,GAAG;IAClB,KAAK,EAAE,KAAK;IACZ,WAAW,EAAE,KAAK;CACnB,CAAC;AAEF,MAAM,WAAW,GAAG;IAClB,KAAK,EAAE,KAAK;IACZ,WAAW,EAAE,KAAK;CACnB,CAAC;AAEF,MAAM,gBAAgB,GAAG;IACvB,cAAc,EAAE,IAAI;IACpB,kBAAkB,EAAE,IAAI;CACzB,CAAC;AAEF,MAAM,gBAAgB,GAAG;IACvB,cAAc,EAAE,IAAI;IACpB,kBAAkB,EAAE,IAAI;CACzB,CAAC;AAEF,MAAM,cAAc,GAAG;IACrB,cAAc,EAAE,KAAK;IACrB,kBAAkB,EAAE,KAAK;CAC1B,CAAC;AAEF,MAAM,cAAc,GAAG;IACrB,cAAc,EAAE,KAAK;IACrB,kBAAkB,EAAE,KAAK;CAC1B,CAAC;AAEF,MAAM,mBAAmB,GAAG;IAC1B,qBAAqB,EAAE,IAAI;IAC3B,yBAAyB,EAAE,IAAI;CAChC,CAAC;AAEF,MAAM,mBAAmB,GAAG;IAC1B,qBAAqB,EAAE,IAAI;IAC3B,yBAAyB,EAAE,IAAI;CAChC,CAAC;AAEF,MAAM,WAAW,GAAG,EAAE,CAAC;AAEvB,MAAM,cAAc,GAAG;IACrB,cAAc,EAAE,GAAG;IACnB,kBAAkB,EAAE,GAAG;IACvB,qBAAqB,EAAE,GAAG;IAC1B,yBAAyB,EAAE,GAAG;CAC/B,CAAC;AAEF,SAAgB,qBAAqB,CAAC,SAAoB,EAAE,YAAoB,EAAE,kBAA0B;IAC1G,2CAA2C;IAC3C,OAAO,SAAS,KAAK,YAAY;QAC/B,CAAC,CAAC,EAAE;QACJ,CAAC,iCACM,CAAC,YAAY,GAAG,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,GAC/C,CAAC,kBAAkB,GAAG,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAClE,CAAC;AACR,CAAC;AARD,sDAQC;AAED,SAAgB,wBAAwB,CAAC,SAAoB,EAAE,YAAoB,EAAE,kBAA0B;IAC7G,mDAAmD;IACnD,OAAO,SAAS,KAAK,YAAY;QAC/B,CAAC,CAAC,EAAE;QACJ,CAAC,iCACM,CAAC,YAAY,GAAG,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,GACrD,CAAC,kBAAkB,GAAG,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,mBAAmB,CAAC,CACxE,CAAC;AACR,CAAC;AARD,4DAQC;AAED,SAAgB,eAAe,CAAC,QAAwB,EAAE,WAAmC,WAAW;IACtG,QAAQ,QAAQ,EAAE;QAChB,KAAK,IAAI,CAAC;QACV,KAAK,IAAI;YACP,yBACK,QAAQ,EACX;QACJ;YACE,IAAA,SAAG,EAAC,mBAAmB,EAAE,yDAAyD,CAAC,CAAC;YACpF,OAAO,EAAE,CAAC;KACb;AACH,CAAC;AAXD,0CAWC;AAED,SAAgB,kBAAkB,CAAC,QAAwB,EAAE,UAAkC,cAAc;IAC3G,QAAQ,QAAQ,EAAE;QAChB,KAAK,IAAI;YACP,uCACK,OAAO,KACV,aAAa,EAAE,QAAQ,EACvB,UAAU,EAAE,QAAQ,IACpB;QACJ,KAAK,IAAI;YACP,OAAO,EAAE,CAAC;QACZ;YACE,IAAA,SAAG,EAAC,mBAAmB,EAAE,4DAA4D,CAAC,CAAC;YACvF,OAAO,EAAE,CAAC;KACb;AACH,CAAC;AAdD,gDAcC"}
1
+ {"version":3,"file":"language.js","sourceRoot":"","sources":["../../src/common/language.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAG5B,MAAM,WAAW,GAAG;IAClB,KAAK,EAAE,KAAK;IACZ,WAAW,EAAE,KAAK;CACnB,CAAC;AAEF,MAAM,WAAW,GAAG;IAClB,KAAK,EAAE,KAAK;IACZ,WAAW,EAAE,KAAK;CACnB,CAAC;AAEF,MAAM,gBAAgB,GAAG;IACvB,cAAc,EAAE,IAAI;IACpB,kBAAkB,EAAE,IAAI;CACzB,CAAC;AAEF,MAAM,gBAAgB,GAAG;IACvB,cAAc,EAAE,IAAI;IACpB,kBAAkB,EAAE,IAAI;CACzB,CAAC;AAEF,MAAM,cAAc,GAAG;IACrB,cAAc,EAAE,KAAK;IACrB,kBAAkB,EAAE,KAAK;CAC1B,CAAC;AAEF,MAAM,cAAc,GAAG;IACrB,cAAc,EAAE,KAAK;IACrB,kBAAkB,EAAE,KAAK;CAC1B,CAAC;AAEF,MAAM,mBAAmB,GAAG;IAC1B,qBAAqB,EAAE,IAAI;IAC3B,yBAAyB,EAAE,IAAI;CAChC,CAAC;AAEF,MAAM,WAAW,GAAG,EAAE,CAAC;AAEvB,MAAM,cAAc,GAAG;IACrB,cAAc,EAAE,GAAG;IACnB,kBAAkB,EAAE,GAAG;CACxB,CAAC;AAEF,SAAgB,qBAAqB,CAAC,SAAoB,EAAE,YAAoB,EAAE,kBAA0B;IAC1G,2CAA2C;IAC3C,OAAO,SAAS,KAAK,YAAY;QAC/B,CAAC,CAAC,EAAE;QACJ,CAAC,iCACM,CAAC,YAAY,GAAG,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,GAC/C,CAAC,kBAAkB,GAAG,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAClE,CAAC;AACR,CAAC;AARD,sDAQC;AAED,SAAgB,wBAAwB,CAAC,SAAoB,EAAE,YAAoB,EAAE,kBAA0B;IAC7G,mDAAmD;IACnD,OAAO,SAAS,KAAK,YAAY;QAC/B,CAAC,CAAC,EAAE;QACJ,CAAC,iCACM,CAAC,YAAY,GAAG,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,GACrD,CAAC,kBAAkB,GAAG,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,CAAC,CACvD,CAAC;AACR,CAAC;AARD,4DAQC;AAED,SAAgB,eAAe,CAAC,QAAwB,EAAE,WAAmC,WAAW;IACtG,QAAQ,QAAQ,EAAE;QAChB,KAAK,IAAI,CAAC;QACV,KAAK,IAAI;YACP,yBACK,QAAQ,EACX;QACJ;YACE,IAAA,SAAG,EAAC,mBAAmB,EAAE,yDAAyD,CAAC,CAAC;YACpF,OAAO,EAAE,CAAC;KACb;AACH,CAAC;AAXD,0CAWC;AAED,SAAgB,kBAAkB,CAAC,QAAwB,EAAE,UAAkC,cAAc;IAC3G,QAAQ,QAAQ,EAAE;QAChB,KAAK,IAAI;YACP,uCACK,OAAO,KACV,aAAa,EAAE,QAAQ,EACvB,UAAU,EAAE,QAAQ,IACpB;QACJ,KAAK,IAAI;YACP,OAAO,EAAE,CAAC;QACZ;YACE,IAAA,SAAG,EAAC,mBAAmB,EAAE,4DAA4D,CAAC,CAAC;YACvF,OAAO,EAAE,CAAC;KACb;AACH,CAAC;AAdD,gDAcC"}
package/lib/common/scaffold.js CHANGED
@@ -93,7 +93,7 @@ function getPiralScaffoldData(language, root, app, packageName, variables) {
93
93
  return Object.assign(Object.assign({}, variables), { root,
94
94
  src,
95
95
  language,
96
- packageName, reactVersion: parseInt(variables.reactVersion) || 17, reactRouterVersion: parseInt(variables.reactRouterVersion) || 17 });
96
+ packageName, reactVersion: parseInt(variables.reactVersion) || 18, reactRouterVersion: parseInt(variables.reactRouterVersion) || 5 });
97
97
  }
98
98
  exports.getPiralScaffoldData = getPiralScaffoldData;
99
99
  function scaffoldPiralSourceFiles(template, registry, data, forceOverwrite) {
package/lib/common/scaffold.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"scaffold.js","sourceRoot":"","sources":["../../src/common/scaffold.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"scaffold.js","sourceRoot":"","sources":["../../src/common/scaffold.ts"],"names":[],"mappings":"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"}
package/lib/external/index.js CHANGED
@@ -37064,7 +37064,83 @@ exports.schedulePromise = schedulePromise;
37064
37064
  //# sourceMappingURL=schedulePromise.js.map
37065
37065
 
37066
37066
  /***/ }),
37067
- /* 415 */,
37067
+ /* 415 */
37068
+ /***/ (function(module) {
37069
+
37070
+ "use strict";
37071
+
37072
+ var singleComment = 1;
37073
+ var multiComment = 2;
37074
+
37075
+ function stripWithoutWhitespace() {
37076
+ return '';
37077
+ }
37078
+
37079
+ function stripWithWhitespace(str, start, end) {
37080
+ return str.slice(start, end).replace(/\S/g, ' ');
37081
+ }
37082
+
37083
+ module.exports = function (str, opts) {
37084
+ opts = opts || {};
37085
+
37086
+ var currentChar;
37087
+ var nextChar;
37088
+ var insideString = false;
37089
+ var insideComment = false;
37090
+ var offset = 0;
37091
+ var ret = '';
37092
+ var strip = opts.whitespace === false ? stripWithoutWhitespace : stripWithWhitespace;
37093
+
37094
+ for (var i = 0; i < str.length; i++) {
37095
+ currentChar = str[i];
37096
+ nextChar = str[i + 1];
37097
+
37098
+ if (!insideComment && currentChar === '"') {
37099
+ var escaped = str[i - 1] === '\\' && str[i - 2] !== '\\';
37100
+ if (!escaped) {
37101
+ insideString = !insideString;
37102
+ }
37103
+ }
37104
+
37105
+ if (insideString) {
37106
+ continue;
37107
+ }
37108
+
37109
+ if (!insideComment && currentChar + nextChar === '//') {
37110
+ ret += str.slice(offset, i);
37111
+ offset = i;
37112
+ insideComment = singleComment;
37113
+ i++;
37114
+ } else if (insideComment === singleComment && currentChar + nextChar === '\r\n') {
37115
+ i++;
37116
+ insideComment = false;
37117
+ ret += strip(str, offset, i);
37118
+ offset = i;
37119
+ continue;
37120
+ } else if (insideComment === singleComment && currentChar === '\n') {
37121
+ insideComment = false;
37122
+ ret += strip(str, offset, i);
37123
+ offset = i;
37124
+ } else if (!insideComment && currentChar + nextChar === '/*') {
37125
+ ret += str.slice(offset, i);
37126
+ offset = i;
37127
+ insideComment = multiComment;
37128
+ i++;
37129
+ continue;
37130
+ } else if (insideComment === multiComment && currentChar + nextChar === '*/') {
37131
+ i++;
37132
+ insideComment = false;
37133
+ ret += strip(str, offset, i + 1);
37134
+ offset = i + 1;
37135
+ continue;
37136
+ }
37137
+ }
37138
+
37139
+ return ret + (insideComment ? strip(str.substr(offset)) : str.substr(offset));
37140
+ };
37141
+
37142
+
37143
+ /***/ }),
37068
37144
  /* 416 */
37069
37145
  /***/ (function(__unusedmodule, exports, __webpack_require__) {
37070
37146
 
@@ -45661,7 +45737,7 @@ function async(callback)
45661
45737
  var fs = __webpack_require__(747)
45662
45738
  var ini = __webpack_require__(807)
45663
45739
  var path = __webpack_require__(622)
45664
- var stripJsonComments = __webpack_require__(729)
45740
+ var stripJsonComments = __webpack_require__(415)
45665
45741
 
45666
45742
  var parse = exports.parse = function (content) {
45667
45743
 
@@ -53420,83 +53496,7 @@ try {
53420
53496
  /* 726 */,
53421
53497
  /* 727 */,
53422
53498
  /* 728 */,
53423
- /* 729 */
53424
- /***/ (function(module) {
53425
-
53426
- "use strict";
53427
-
53428
- var singleComment = 1;
53429
- var multiComment = 2;
53430
-
53431
- function stripWithoutWhitespace() {
53432
- return '';
53433
- }
53434
-
53435
- function stripWithWhitespace(str, start, end) {
53436
- return str.slice(start, end).replace(/\S/g, ' ');
53437
- }
53438
-
53439
- module.exports = function (str, opts) {
53440
- opts = opts || {};
53441
-
53442
- var currentChar;
53443
- var nextChar;
53444
- var insideString = false;
53445
- var insideComment = false;
53446
- var offset = 0;
53447
- var ret = '';
53448
- var strip = opts.whitespace === false ? stripWithoutWhitespace : stripWithWhitespace;
53449
-
53450
- for (var i = 0; i < str.length; i++) {
53451
- currentChar = str[i];
53452
- nextChar = str[i + 1];
53453
-
53454
- if (!insideComment && currentChar === '"') {
53455
- var escaped = str[i - 1] === '\\' && str[i - 2] !== '\\';
53456
- if (!escaped) {
53457
- insideString = !insideString;
53458
- }
53459
- }
53460
-
53461
- if (insideString) {
53462
- continue;
53463
- }
53464
-
53465
- if (!insideComment && currentChar + nextChar === '//') {
53466
- ret += str.slice(offset, i);
53467
- offset = i;
53468
- insideComment = singleComment;
53469
- i++;
53470
- } else if (insideComment === singleComment && currentChar + nextChar === '\r\n') {
53471
- i++;
53472
- insideComment = false;
53473
- ret += strip(str, offset, i);
53474
- offset = i;
53475
- continue;
53476
- } else if (insideComment === singleComment && currentChar === '\n') {
53477
- insideComment = false;
53478
- ret += strip(str, offset, i);
53479
- offset = i;
53480
- } else if (!insideComment && currentChar + nextChar === '/*') {
53481
- ret += str.slice(offset, i);
53482
- offset = i;
53483
- insideComment = multiComment;
53484
- i++;
53485
- continue;
53486
- } else if (insideComment === multiComment && currentChar + nextChar === '*/') {
53487
- i++;
53488
- insideComment = false;
53489
- ret += strip(str, offset, i + 1);
53490
- offset = i + 1;
53491
- continue;
53492
- }
53493
- }
53494
-
53495
- return ret + (insideComment ? strip(str.substr(offset)) : str.substr(offset));
53496
- };
53497
-
53498
-
53499
- /***/ }),
53499
+ /* 729 */,
53500
53500
  /* 730 */
53501
53501
  /***/ (function(__unusedmodule, exports, __webpack_require__) {
53502
53502
 
package/lib/injectors/pilet-injector.d.ts CHANGED
@@ -1,4 +1,5 @@
1
1
  /// <reference types="node" />
2
+ /// <reference types="node" />
2
3
  import { EventEmitter } from 'events';
3
4
  import { KrasInjector, KrasResponse, KrasRequest, KrasInjectorConfig, KrasConfiguration, KrasResult } from 'kras';
4
5
  import { Bundler } from '../types';
package/lib/injectors/piral-injector.d.ts CHANGED
@@ -1,4 +1,5 @@
1
1
  /// <reference types="node" />
2
+ /// <reference types="node" />
2
3
  import { EventEmitter } from 'events';
3
4
  import { KrasInjector, KrasResponse, KrasRequest, KrasInjectorConfig, KrasConfiguration } from 'kras';
4
5
  import { Bundler } from '../types';
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "piral-cli",
3
- "version": "0.15.0-alpha.4314",
3
+ "version": "0.15.0-alpha.4355",
4
4
  "description": "The standard CLI for creating and building a Piral instance or a Pilet.",
5
5
  "keywords": [
6
6
  "portal",
@@ -75,8 +75,8 @@
75
75
  "dets": "^0.11.1",
76
76
  "kras": "^0.14.1",
77
77
  "rimraf": "^3.0.0",
78
- "typescript": "^4.0.2",
78
+ "typescript": "^4.7.3",
79
79
  "yargs": "^15.4.1"
80
80
  },
81
- "gitHead": "8bd59debe22a0fed137458a5295eb2ea43d9e0d3"
81
+ "gitHead": "a4dda359fe03992cd06bfb808df916747beb065d"
82
82
  }
package/src/apps/new-pilet.test.ts CHANGED
@@ -13,14 +13,20 @@ jest.mock('../common/clients/npm', () => {
13
13
  return {
14
14
  ...original,
15
15
  installPackage: (...args) => {
16
- return original.installPackage(...args, '--no-package-lock', '--no-save', '--registry=https://registry.npmjs.org/');
16
+ return original.installPackage(
17
+ ...args,
18
+ '--no-package-lock',
19
+ '--no-save',
20
+ '--registry=https://registry.npmjs.org/',
21
+ );
17
22
  },
18
23
  };
19
24
  });
20
25
 
26
+ jest.setTimeout(60000);
27
+
21
28
  describe('New Pilet Command', () => {
22
29
  it('scaffolding in an empty directory works', async () => {
23
- jest.setTimeout(60000);
24
30
  const dir = createTempDir();
25
31
  await newPilet(dir, {
26
32
  install: false,
@@ -51,7 +57,6 @@ describe('New Pilet Command', () => {
51
57
  });
52
58
 
53
59
  it('should scaffold without creating npmrc file', async () => {
54
- jest.setTimeout(60000);
55
60
  const dir = createTempDir();
56
61
  await newPilet(dir, {
57
62
  install: false,
@@ -65,7 +70,6 @@ describe('New Pilet Command', () => {
65
70
  });
66
71
 
67
72
  it('scaffolding with language JS works', async () => {
68
- jest.setTimeout(60000);
69
73
  const dir = createTempDir();
70
74
  await newPilet(dir, {
71
75
  language: 'js',
package/src/apps/new-piral.test.ts CHANGED
@@ -18,9 +18,10 @@ jest.mock('../common/clients/npm', () => {
18
18
  };
19
19
  });
20
20
 
21
+ jest.setTimeout(60000);
22
+
21
23
  describe('New Piral Command', () => {
22
24
  it('scaffolding in an empty directory works', async () => {
23
- jest.setTimeout(60000);
24
25
  const dir = createTempDir();
25
26
  await newPiral(dir, { install: false });
26
27
  expect(existsSync(resolve(dir, 'node_modules/piral/package.json'))).toBeTruthy();
@@ -33,7 +34,6 @@ describe('New Piral Command', () => {
33
34
  });
34
35
 
35
36
  it('scaffolding with language JS works', async () => {
36
- jest.setTimeout(60000);
37
37
  const dir = createTempDir();
38
38
  await newPiral(dir, {
39
39
  language: 'js',
@@ -49,7 +49,6 @@ describe('New Piral Command', () => {
49
49
  });
50
50
 
51
51
  it('scaffolding for piral-core works', async () => {
52
- jest.setTimeout(60000);
53
52
  const dir = createTempDir();
54
53
  await newPiral(dir, {
55
54
  framework: 'piral-core',
@@ -67,7 +66,6 @@ describe('New Piral Command', () => {
67
66
  });
68
67
 
69
68
  it('scaffolding for piral-base works', async () => {
70
- jest.setTimeout(60000);
71
69
  const dir = createTempDir();
72
70
  await newPiral(dir, {
73
71
  framework: 'piral-base',
package/src/cli.ts CHANGED
@@ -1,5 +1,6 @@
1
1
  import * as yargs from 'yargs';
2
2
  import { detailed } from 'yargs-parser';
3
+ import { caterpillerIcon, zapIcon } from './common';
3
4
  import { runQuestionnaireFor } from './questionnaire';
4
5
  import { ToolCommand } from './types';
5
6
 
@@ -46,7 +47,7 @@ export function setupCli(commands: Array<ToolCommand<any>>) {
46
47
  () => process.exit(0),
47
48
  (err) => {
48
49
  err && !err.logged && console.error(err.message);
49
- console.log('Codes Reference: https://docs.piral.io/code/search');
50
+ console.log(`${caterpillerIcon} Codes Reference: https://docs.piral.io/code/search`);
50
51
  process.exit(1);
51
52
  },
52
53
  );
@@ -54,5 +55,5 @@ export function setupCli(commands: Array<ToolCommand<any>>) {
54
55
  );
55
56
  }
56
57
 
57
- argv.epilog('For more information, check out the documentation at https://docs.piral.io.').help().strict().argv;
58
+ argv.epilog(`${zapIcon} For more information, check out the documentation at https://docs.piral.io.`).help().strict().argv;
58
59
  }
package/src/common/emoji.ts CHANGED
@@ -2,5 +2,14 @@ import { isWindows } from './info';
2
2
 
3
3
  const supportsEmoji = !isWindows || process.env.TERM === 'xterm-256color';
4
4
 
5
+ // see https://unicode.org/emoji/charts/full-emoji-list.html
5
6
  export const liveIcon = supportsEmoji ? '🚀 ' : '>';
6
7
  export const settingsIcon = supportsEmoji ? '🔧 ' : '>';
8
+ export const cactusIcon = supportsEmoji ? '👻' : '>';
9
+ export const clapIcon = supportsEmoji ? '👏' : '^';
10
+ export const sparklesIcon = supportsEmoji ? '✨' : '>';
11
+ export const unicornIcon = supportsEmoji ? '🦄' : '>';
12
+ export const caterpillerIcon = supportsEmoji ? '🐛' : '+';
13
+ export const butterflyIcon = supportsEmoji ? '🦋' : '+';
14
+ export const zapIcon = supportsEmoji ? '⚡' : '>';
15
+ export const rainbowIcon = supportsEmoji ? '🌈' : '~';
package/src/common/language.ts CHANGED
@@ -36,18 +36,11 @@ const reactRouter5Typings = {
36
36
  '@types/react-router-dom': '^5',
37
37
  };
38
38
 
39
- const reactRouter6Typings = {
40
- '@types/react-router': '^6',
41
- '@types/react-router-dom': '^6',
42
- };
43
-
44
39
  const defaultDeps = {};
45
40
 
46
41
  const defaultTypings = {
47
42
  '@types/react': '*',
48
43
  '@types/react-dom': '*',
49
- '@types/react-router': '*',
50
- '@types/react-router-dom': '*',
51
44
  };
52
45
 
53
46
  export function getDependencyPackages(framework: Framework, reactVersion: number, reactRouterVersion: number) {
@@ -66,7 +59,7 @@ export function getDevDependencyPackages(framework: Framework, reactVersion: num
66
59
  ? {}
67
60
  : {
68
61
  ...(reactVersion < 18 ? react17Typings : react18Typings),
69
- ...(reactRouterVersion < 6 ? reactRouter5Typings : reactRouter6Typings),
62
+ ...(reactRouterVersion < 6 ? reactRouter5Typings : {}),
70
63
  };
71
64
  }
72
65
 
package/src/common/npm.test.ts CHANGED
@@ -66,7 +66,7 @@ jest.mock('fs', () => ({
66
66
  existsSync: (file: string) => {
67
67
  return true;
68
68
  },
69
- readFile: (file: string, type: string, callback: (err: NodeJS.ErrnoException, data: string) => void) => {
69
+ readFile: (file: string, type: string, callback: (err: NodeJS.ErrnoException | undefined, data: string) => void) => {
70
70
  return callback(undefined, '');
71
71
  },
72
72
  realpathSync: () => ({}),
@@ -320,7 +320,7 @@ describe('npm Module', () => {
320
320
  });
321
321
 
322
322
  it('check if package from nothing is not local', () => {
323
- const result = isLocalPackage('./', null);
323
+ const result = isLocalPackage('./', '');
324
324
  expect(result).toBeFalsy();
325
325
  });
326
326
 
@@ -364,7 +364,7 @@ describe('npm Module', () => {
364
364
  expect(result).toBeTruthy();
365
365
  result = isGitPackage('git+');
366
366
  expect(result).toBeTruthy();
367
- result = isGitPackage(null);
367
+ result = isGitPackage('');
368
368
  expect(result).toBeFalsy();
369
369
  });
370
370
 
@@ -395,11 +395,11 @@ describe('npm Module', () => {
395
395
  it('combine package refernce', () => {
396
396
  let result = combinePackageRef('foo', '1.0.0', 'registry');
397
397
  expect(result).toBe('foo@1.0.0');
398
- result = combinePackageRef('foo', null, 'registry');
398
+ result = combinePackageRef('foo', '', 'registry');
399
399
  expect(result).toBe('foo@latest');
400
- result = combinePackageRef('foo', null, 'file');
400
+ result = combinePackageRef('foo', '', 'file');
401
401
  expect(result).toBe('foo');
402
- result = combinePackageRef('foo', null, 'git');
402
+ result = combinePackageRef('foo', '', 'git');
403
403
  expect(result).toBe('foo');
404
404
  });
405
405
 
@@ -430,18 +430,18 @@ describe('npm Module', () => {
430
430
  expect(result).toEqual('1.0.0');
431
431
  result = getPackageVersion(false, 'foo', '1.0.0', 'registry', './');
432
432
  expect(result).toBeFalsy();
433
- result = getPackageVersion(true, './foo.tgz', null, 'file', './');
433
+ result = getPackageVersion(true, './foo.tgz', '', 'file', './');
434
434
  expect(result).toEqual('file:foo.tgz');
435
- result = getPackageVersion(true, 'git+https://.foo.git', null, 'git', null);
435
+ result = getPackageVersion(true, 'git+https://.foo.git', '', 'git', '');
436
436
  expect(result).toEqual('git+https://.foo.git');
437
437
  });
438
438
 
439
439
  it('gets path to git package', () => {
440
- const result = getCurrentPackageDetails('./', './foo.tgz', null, 'file://foo.tgz', './');
440
+ const result = getCurrentPackageDetails('./', './foo.tgz', '', 'file://foo.tgz', './');
441
441
  result.then(([path, version]) => {
442
442
  expect(path).not.toBeUndefined();
443
443
  });
444
- const result2 = getCurrentPackageDetails('./', './foo.tgz', null, 'git+https://.foo.git', './');
444
+ const result2 = getCurrentPackageDetails('./', './foo.tgz', '', 'git+https://.foo.git', './');
445
445
  result2.then(([path, version]) => {
446
446
  expect(path).not.toBeUndefined();
447
447
  });
@@ -454,32 +454,12 @@ describe('npm Module', () => {
454
454
 
455
455
  it('makeExternals without externals returns coreExternals', () => {
456
456
  const externals = makeExternals(process.cwd(), { piral: '*' });
457
- expect(externals).toEqual([
458
- 'react',
459
- 'react-dom',
460
- 'react-router',
461
- 'react-router-dom',
462
- 'history',
463
- 'tslib',
464
- 'path-to-regexp',
465
- '@libre/atom',
466
- '@dbeining/react-atom',
467
- ]);
457
+ expect(externals).toEqual(['react', 'react-dom', 'react-router', 'react-router-dom', 'history', 'tslib']);
468
458
  });
469
459
 
470
460
  it('makeExternals with no externals returns coreExternals', () => {
471
461
  const externals = makeExternals(process.cwd(), { piral: '*' }, []);
472
- expect(externals).toEqual([
473
- 'react',
474
- 'react-dom',
475
- 'react-router',
476
- 'react-router-dom',
477
- 'history',
478
- 'tslib',
479
- 'path-to-regexp',
480
- '@libre/atom',
481
- '@dbeining/react-atom',
482
- ]);
462
+ expect(externals).toEqual(['react', 'react-dom', 'react-router', 'react-router-dom', 'history', 'tslib']);
483
463
  });
484
464
 
485
465
  it('makeExternals with exclude coreExternals returns empty set', () => {
@@ -498,41 +478,17 @@ describe('npm Module', () => {
498
478
  'react-router-dom',
499
479
  'history',
500
480
  'tslib',
501
- 'path-to-regexp',
502
- '@libre/atom',
503
- '@dbeining/react-atom',
504
481
  ]);
505
482
  });
506
483
 
507
484
  it('makeExternals with external duplicate only reflects coreExternals', () => {
508
485
  const externals = makeExternals(process.cwd(), { piral: '*' }, ['react', 'foo']);
509
- expect(externals).toEqual([
510
- 'react',
511
- 'foo',
512
- 'react-dom',
513
- 'react-router',
514
- 'react-router-dom',
515
- 'history',
516
- 'tslib',
517
- 'path-to-regexp',
518
- '@libre/atom',
519
- '@dbeining/react-atom',
520
- ]);
486
+ expect(externals).toEqual(['react', 'foo', 'react-dom', 'react-router', 'react-router-dom', 'history', 'tslib']);
521
487
  });
522
488
 
523
489
  it('makeExternals with explicit include and exclude', () => {
524
490
  const externals = makeExternals(process.cwd(), { piral: '*' }, ['react', 'react-calendar', '!history']);
525
- expect(externals).toEqual([
526
- 'react',
527
- 'react-calendar',
528
- 'react-dom',
529
- 'react-router',
530
- 'react-router-dom',
531
- 'tslib',
532
- 'path-to-regexp',
533
- '@libre/atom',
534
- '@dbeining/react-atom',
535
- ]);
491
+ expect(externals).toEqual(['react', 'react-calendar', 'react-dom', 'react-router', 'react-router-dom', 'tslib']);
536
492
  });
537
493
 
538
494
  it('makeExternals with all exclude and explicit include', () => {
package/src/common/scaffold.ts CHANGED
@@ -117,8 +117,8 @@ export function getPiralScaffoldData(
117
117
  src,
118
118
  language,
119
119
  packageName,
120
- reactVersion: parseInt(variables.reactVersion) || 17,
121
- reactRouterVersion: parseInt(variables.reactRouterVersion) || 17,
120
+ reactVersion: parseInt(variables.reactVersion) || 18,
121
+ reactRouterVersion: parseInt(variables.reactRouterVersion) || 5,
122
122
  } as const;
123
123
  }
124
124