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

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 (111) hide show
  1. package/README.md +7 -5
  2. package/lib/apps/debug-pilet.js +2 -1
  3. package/lib/apps/debug-pilet.js.map +1 -1
  4. package/lib/apps/debug-piral.js +2 -1
  5. package/lib/apps/debug-piral.js.map +1 -1
  6. package/lib/apps/new-pilet.d.ts +2 -2
  7. package/lib/apps/new-pilet.js +3 -3
  8. package/lib/apps/new-pilet.js.map +1 -1
  9. package/lib/apps/new-piral.d.ts +2 -2
  10. package/lib/apps/new-piral.js +6 -5
  11. package/lib/apps/new-piral.js.map +1 -1
  12. package/lib/apps/publish-piral.d.ts +2 -2
  13. package/lib/apps/publish-piral.js +9 -8
  14. package/lib/apps/publish-piral.js.map +1 -1
  15. package/lib/apps/upgrade-pilet.js +3 -3
  16. package/lib/apps/upgrade-pilet.js.map +1 -1
  17. package/lib/apps/upgrade-piral.js +2 -2
  18. package/lib/apps/upgrade-piral.js.map +1 -1
  19. package/lib/commands.js +8 -8
  20. package/lib/commands.js.map +1 -1
  21. package/lib/common/clients/index.d.ts +3 -1
  22. package/lib/common/clients/index.js +3 -1
  23. package/lib/common/clients/index.js.map +1 -1
  24. package/lib/common/clients/npm.d.ts +1 -0
  25. package/lib/common/clients/npm.js +7 -1
  26. package/lib/common/clients/npm.js.map +1 -1
  27. package/lib/common/clients/pnp.d.ts +6 -0
  28. package/lib/common/clients/pnp.js +95 -0
  29. package/lib/common/clients/pnp.js.map +1 -0
  30. package/lib/common/clients/yarn.js +3 -3
  31. package/lib/common/clients/yarn.js.map +1 -1
  32. package/lib/common/config.d.ts +1 -2
  33. package/lib/common/config.js +1 -2
  34. package/lib/common/config.js.map +1 -1
  35. package/lib/common/emulator.js +1 -1
  36. package/lib/common/emulator.js.map +1 -1
  37. package/lib/common/enums.d.ts +0 -4
  38. package/lib/common/enums.js +1 -6
  39. package/lib/common/enums.js.map +1 -1
  40. package/lib/common/http.d.ts +4 -2
  41. package/lib/common/http.js +25 -11
  42. package/lib/common/http.js.map +1 -1
  43. package/lib/common/interactive.js +10 -5
  44. package/lib/common/interactive.js.map +1 -1
  45. package/lib/common/language.d.ts +3 -13
  46. package/lib/common/language.js +52 -12
  47. package/lib/common/language.js.map +1 -1
  48. package/lib/common/log.d.ts +1 -0
  49. package/lib/common/log.js +9 -2
  50. package/lib/common/log.js.map +1 -1
  51. package/lib/common/npm.d.ts +1 -1
  52. package/lib/common/npm.js +13 -5
  53. package/lib/common/npm.js.map +1 -1
  54. package/lib/common/package.d.ts +9 -3
  55. package/lib/common/package.js +11 -25
  56. package/lib/common/package.js.map +1 -1
  57. package/lib/common/port.d.ts +1 -0
  58. package/lib/common/port.js +11 -1
  59. package/lib/common/port.js.map +1 -1
  60. package/lib/common/scaffold.d.ts +12 -10
  61. package/lib/common/scaffold.js +6 -12
  62. package/lib/common/scaffold.js.map +1 -1
  63. package/lib/common/template.d.ts +1 -3
  64. package/lib/common/template.js +21 -47
  65. package/lib/common/template.js.map +1 -1
  66. package/lib/helpers.d.ts +3 -5
  67. package/lib/helpers.js +3 -21
  68. package/lib/helpers.js.map +1 -1
  69. package/lib/messages.d.ts +83 -5
  70. package/lib/messages.js +95 -8
  71. package/lib/messages.js.map +1 -1
  72. package/lib/release.d.ts +1 -1
  73. package/lib/release.js +32 -5
  74. package/lib/release.js.map +1 -1
  75. package/lib/types/common.d.ts +1 -2
  76. package/lib/types/public.d.ts +2 -1
  77. package/package.json +3 -5
  78. package/src/apps/debug-pilet.ts +3 -1
  79. package/src/apps/debug-piral.ts +3 -1
  80. package/src/apps/new-pilet.test.ts +1 -2
  81. package/src/apps/new-pilet.ts +4 -4
  82. package/src/apps/new-piral.test.ts +1 -2
  83. package/src/apps/new-piral.ts +8 -12
  84. package/src/apps/publish-piral.ts +21 -10
  85. package/src/apps/upgrade-pilet.ts +3 -3
  86. package/src/apps/upgrade-piral.ts +2 -1
  87. package/src/commands.ts +9 -10
  88. package/src/common/clients/index.ts +3 -1
  89. package/src/common/clients/npm.ts +4 -0
  90. package/src/common/clients/pnp.ts +77 -0
  91. package/src/common/clients/yarn.ts +3 -3
  92. package/src/common/config.ts +2 -3
  93. package/src/common/emulator.ts +2 -2
  94. package/src/common/enums.ts +0 -5
  95. package/src/common/http.ts +37 -14
  96. package/src/common/interactive.ts +12 -7
  97. package/src/common/language.ts +66 -11
  98. package/src/common/log.ts +9 -1
  99. package/src/common/npm.ts +21 -6
  100. package/src/common/package.test.ts +11 -3
  101. package/src/common/package.ts +20 -34
  102. package/src/common/port.ts +10 -0
  103. package/src/common/scaffold.ts +8 -16
  104. package/src/common/template.ts +19 -40
  105. package/src/helpers.test.ts +2 -22
  106. package/src/helpers.ts +4 -24
  107. package/src/messages.ts +93 -6
  108. package/src/release.ts +40 -6
  109. package/src/types/common.ts +1 -2
  110. package/src/types/public.ts +3 -1
  111. package/templates/piral-index.js.ejs +0 -16
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getTokenInteractively = exports.promptConfirm = exports.promptSelect = void 0;
4
4
  const browser_1 = require("./browser");
5
5
  const info_1 = require("./info");
6
+ const log_1 = require("./log");
6
7
  const external_1 = require("../external");
7
8
  function promptSelect(message, values, defaultValue) {
8
9
  const questions = [
@@ -32,6 +33,7 @@ exports.promptConfirm = promptConfirm;
32
33
  const tokenRetrievers = {};
33
34
  function getTokenInteractively(url, httpsAgent) {
34
35
  if (!(url in tokenRetrievers)) {
36
+ const logResume = (0, log_1.logSuspend)();
35
37
  tokenRetrievers[url] = external_1.axios.default
36
38
  .post(url, {
37
39
  clientId: 'piral-cli',
@@ -43,15 +45,18 @@ function getTokenInteractively(url, httpsAgent) {
43
45
  })
44
46
  .then((res) => {
45
47
  const { loginUrl, callbackUrl, expires } = res.data;
46
- console.log(`Use the URL below to complete the login. The link expires at ${new Date(expires)}.`);
48
+ const now = new Date();
49
+ const then = new Date(expires);
50
+ const diff = ~~((then.valueOf() - now.valueOf()) / (60 * 1000));
51
+ console.log(`Use the URL below to complete the login. The link expires in ${diff} minutes (${then}).`);
47
52
  console.log('===');
48
53
  console.log(loginUrl);
49
54
  console.log('===');
50
55
  (0, browser_1.openBrowserAt)(loginUrl);
51
- return external_1.axios.default.get(callbackUrl).then(({ data }) => {
52
- console.log('Logged in successfully.');
53
- return Object.assign({}, data);
54
- });
56
+ return external_1.axios.default
57
+ .get(callbackUrl)
58
+ .then(({ data }) => (Object.assign({}, data)))
59
+ .finally(logResume);
55
60
  });
56
61
  }
57
62
  return tokenRetrievers[url];
@@ -1 +1 @@
1
- {"version":3,"file":"interactive.js","sourceRoot":"","sources":["../../src/common/interactive.ts"],"names":[],"mappings":";;;AACA,uCAA0C;AAC1C,iCAAyC;AACzC,0CAA8C;AAG9C,SAAgB,YAAY,CAAC,OAAe,EAAE,MAAqB,EAAE,YAAoB;IACvF,MAAM,SAAS,GAAG;QAChB;YACE,IAAI,EAAE,GAAG;YACT,IAAI,EAAE,MAAe;YACrB,OAAO,EAAE,MAAM;YACf,OAAO;YACP,OAAO,EAAE,YAAY;SACtB;KACF,CAAC;IACF,OAAO,mBAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;AACtE,CAAC;AAXD,oCAWC;AAED,SAAgB,aAAa,CAAC,OAAe,EAAE,YAAqB;IAClE,MAAM,SAAS,GAAG;QAChB;YACE,IAAI,EAAE,GAAG;YACT,IAAI,EAAE,SAAkB;YACxB,OAAO;YACP,OAAO,EAAE,YAAY;SACtB;KACF,CAAC;IACF,OAAO,mBAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;AACtE,CAAC;AAVD,sCAUC;AAID,MAAM,eAAe,GAAgC,EAAE,CAAC;AAExD,SAAgB,qBAAqB,CAAC,GAAW,EAAE,UAAiB;IAClE,IAAI,CAAC,CAAC,GAAG,IAAI,eAAe,CAAC,EAAE;QAC7B,eAAe,CAAC,GAAG,CAAC,GAAG,gBAAK,CAAC,OAAO;aACjC,IAAI,CACH,GAAG,EACH;YACE,QAAQ,EAAE,WAAW;YACrB,UAAU,EAAE,WAAW;YACvB,WAAW,EAAE,sEAAsE;SACpF,EACD;YACE,OAAO,kCACF,sBAAe,KAClB,cAAc,EAAE,kBAAkB,GACnC;YACD,UAAU;SACX,CACF;aACA,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;YACZ,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;YACpD,OAAO,CAAC,GAAG,CAAC,gEAAgE,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAClG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACnB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACtB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAEnB,IAAA,uBAAa,EAAC,QAAQ,CAAC,CAAC;YAExB,OAAO,gBAAK,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;gBACtD,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;gBACvC,yBACK,IAAI,EACP;YACJ,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;KACN;IAED,OAAO,eAAe,CAAC,GAAG,CAAC,CAAC;AAC9B,CAAC;AArCD,sDAqCC"}
1
+ {"version":3,"file":"interactive.js","sourceRoot":"","sources":["../../src/common/interactive.ts"],"names":[],"mappings":";;;AACA,uCAA0C;AAC1C,iCAAyC;AACzC,+BAAmC;AACnC,0CAA8C;AAG9C,SAAgB,YAAY,CAAC,OAAe,EAAE,MAAqB,EAAE,YAAoB;IACvF,MAAM,SAAS,GAAG;QAChB;YACE,IAAI,EAAE,GAAG;YACT,IAAI,EAAE,MAAe;YACrB,OAAO,EAAE,MAAM;YACf,OAAO;YACP,OAAO,EAAE,YAAY;SACtB;KACF,CAAC;IACF,OAAO,mBAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;AACtE,CAAC;AAXD,oCAWC;AAED,SAAgB,aAAa,CAAC,OAAe,EAAE,YAAqB;IAClE,MAAM,SAAS,GAAG;QAChB;YACE,IAAI,EAAE,GAAG;YACT,IAAI,EAAE,SAAkB;YACxB,OAAO;YACP,OAAO,EAAE,YAAY;SACtB;KACF,CAAC;IACF,OAAO,mBAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;AACtE,CAAC;AAVD,sCAUC;AAID,MAAM,eAAe,GAAgC,EAAE,CAAC;AAExD,SAAgB,qBAAqB,CAAC,GAAW,EAAE,UAAiB;IAClE,IAAI,CAAC,CAAC,GAAG,IAAI,eAAe,CAAC,EAAE;QAC7B,MAAM,SAAS,GAAG,IAAA,gBAAU,GAAE,CAAC;QAE/B,eAAe,CAAC,GAAG,CAAC,GAAG,gBAAK,CAAC,OAAO;aACjC,IAAI,CACH,GAAG,EACH;YACE,QAAQ,EAAE,WAAW;YACrB,UAAU,EAAE,WAAW;YACvB,WAAW,EAAE,sEAAsE;SACpF,EACD;YACE,OAAO,kCACF,sBAAe,KAClB,cAAc,EAAE,kBAAkB,GACnC;YACD,UAAU;SACX,CACF;aACA,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;YACZ,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;YACpD,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC;YAC/B,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;YAEhE,OAAO,CAAC,GAAG,CAAC,gEAAgE,IAAI,aAAa,IAAI,IAAI,CAAC,CAAC;YACvG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACnB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACtB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAEnB,IAAA,uBAAa,EAAC,QAAQ,CAAC,CAAC;YAExB,OAAO,gBAAK,CAAC,OAAO;iBACjB,GAAG,CAAC,WAAW,CAAC;iBAChB,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,mBAAM,IAAI,EAAG,CAAC;iBACjC,OAAO,CAAC,SAAS,CAAC,CAAC;QACxB,CAAC,CAAC,CAAC;KACN;IAED,OAAO,eAAe,CAAC,GAAG,CAAC,CAAC;AAC9B,CAAC;AAzCD,sDAyCC"}
@@ -1,16 +1,6 @@
1
- import { SourceLanguage } from './enums';
2
- export declare const reactDeps: {
3
- react: string;
4
- 'react-dom': string;
5
- 'react-router': string;
6
- 'react-router-dom': string;
7
- };
8
- export declare const reactTypings: {
9
- '@types/react': string;
10
- '@types/react-dom': string;
11
- '@types/react-router': string;
12
- '@types/react-router-dom': string;
13
- };
1
+ import { Framework, SourceLanguage } from '../types';
2
+ export declare function getDependencyPackages(framework: Framework, reactVersion: number, reactRouterVersion: number): {};
3
+ export declare function getDevDependencyPackages(framework: Framework, reactVersion: number, reactRouterVersion: number): {};
14
4
  export declare function getDependencies(language: SourceLanguage, packages?: Record<string, string>): {
15
5
  [x: string]: string;
16
6
  };
@@ -1,39 +1,79 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.getDevDependencies = exports.getDependencies = exports.reactTypings = exports.reactDeps = void 0;
3
+ exports.getDevDependencies = exports.getDependencies = exports.getDevDependencyPackages = exports.getDependencyPackages = void 0;
4
4
  const log_1 = require("./log");
5
- const enums_1 = require("./enums");
6
- exports.reactDeps = {
5
+ const react17Deps = {
7
6
  react: '^17',
8
7
  'react-dom': '^17',
8
+ };
9
+ const react18Deps = {
10
+ react: '^18',
11
+ 'react-dom': '^18',
12
+ };
13
+ const reactRouter5Deps = {
9
14
  'react-router': '^5',
10
15
  'react-router-dom': '^5',
11
16
  };
12
- exports.reactTypings = {
17
+ const reactRouter6Deps = {
18
+ 'react-router': '^6',
19
+ 'react-router-dom': '^6',
20
+ };
21
+ const react17Typings = {
13
22
  '@types/react': '^17',
14
23
  '@types/react-dom': '^17',
24
+ };
25
+ const react18Typings = {
26
+ '@types/react': '^18',
27
+ '@types/react-dom': '^18',
28
+ };
29
+ const reactRouter5Typings = {
15
30
  '@types/react-router': '^5',
16
31
  '@types/react-router-dom': '^5',
17
32
  };
18
- function getDependencies(language, packages = exports.reactDeps) {
33
+ const reactRouter6Typings = {
34
+ '@types/react-router': '^6',
35
+ '@types/react-router-dom': '^6',
36
+ };
37
+ const defaultDeps = {};
38
+ const defaultTypings = {
39
+ '@types/react': '*',
40
+ '@types/react-dom': '*',
41
+ '@types/react-router': '*',
42
+ '@types/react-router-dom': '*',
43
+ };
44
+ function getDependencyPackages(framework, reactVersion, reactRouterVersion) {
45
+ // take default packages only if piral-core
46
+ return framework !== 'piral-core'
47
+ ? {}
48
+ : Object.assign(Object.assign({}, (reactVersion < 18 ? react17Deps : react18Deps)), (reactRouterVersion < 6 ? reactRouter5Deps : reactRouter6Deps));
49
+ }
50
+ exports.getDependencyPackages = getDependencyPackages;
51
+ function getDevDependencyPackages(framework, reactVersion, reactRouterVersion) {
52
+ // take default dev packages only if not piral-base
53
+ return framework === 'piral-base'
54
+ ? {}
55
+ : Object.assign(Object.assign({}, (reactVersion < 18 ? react17Typings : react18Typings)), (reactRouterVersion < 6 ? reactRouter5Typings : reactRouter6Typings));
56
+ }
57
+ exports.getDevDependencyPackages = getDevDependencyPackages;
58
+ function getDependencies(language, packages = defaultDeps) {
19
59
  switch (language) {
20
- case enums_1.SourceLanguage.js:
21
- case enums_1.SourceLanguage.ts:
60
+ case 'js':
61
+ case 'ts':
22
62
  return Object.assign({}, packages);
23
63
  default:
24
- (0, log_1.log)('generalDebug_0003', 'Did not find a valid language. Just skipping devDependencies.');
64
+ (0, log_1.log)('generalDebug_0003', 'Did not find a valid language. Skipping "dependencies".');
25
65
  return {};
26
66
  }
27
67
  }
28
68
  exports.getDependencies = getDependencies;
29
- function getDevDependencies(language, typings = exports.reactTypings) {
69
+ function getDevDependencies(language, typings = defaultTypings) {
30
70
  switch (language) {
31
- case enums_1.SourceLanguage.ts:
71
+ case 'ts':
32
72
  return Object.assign(Object.assign({}, typings), { '@types/node': 'latest', typescript: 'latest' });
33
- case enums_1.SourceLanguage.js:
73
+ case 'js':
34
74
  return {};
35
75
  default:
36
- (0, log_1.log)('generalDebug_0003', 'Did not find a valid language. Just skipping devDependencies.');
76
+ (0, log_1.log)('generalDebug_0003', 'Did not find a valid language. Skipping "devDependencies".');
37
77
  return {};
38
78
  }
39
79
  }
@@ -1 +1 @@
1
- {"version":3,"file":"language.js","sourceRoot":"","sources":["../../src/common/language.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAC5B,mCAAyC;AAE5B,QAAA,SAAS,GAAG;IACvB,KAAK,EAAE,KAAK;IACZ,WAAW,EAAE,KAAK;IAClB,cAAc,EAAE,IAAI;IACpB,kBAAkB,EAAE,IAAI;CACzB,CAAC;AAEW,QAAA,YAAY,GAAG;IAC1B,cAAc,EAAE,KAAK;IACrB,kBAAkB,EAAE,KAAK;IACzB,qBAAqB,EAAE,IAAI;IAC3B,yBAAyB,EAAE,IAAI;CAChC,CAAC;AAEF,SAAgB,eAAe,CAAC,QAAwB,EAAE,WAAmC,iBAAS;IACpG,QAAQ,QAAQ,EAAE;QAChB,KAAK,sBAAc,CAAC,EAAE,CAAC;QACvB,KAAK,sBAAc,CAAC,EAAE;YACpB,yBACK,QAAQ,EACX;QACJ;YACE,IAAA,SAAG,EAAC,mBAAmB,EAAE,+DAA+D,CAAC,CAAC;YAC1F,OAAO,EAAE,CAAC;KACb;AACH,CAAC;AAXD,0CAWC;AAED,SAAgB,kBAAkB,CAAC,QAAwB,EAAE,UAAkC,oBAAY;IACzG,QAAQ,QAAQ,EAAE;QAChB,KAAK,sBAAc,CAAC,EAAE;YACpB,uCACK,OAAO,KACV,aAAa,EAAE,QAAQ,EACvB,UAAU,EAAE,QAAQ,IACpB;QACJ,KAAK,sBAAc,CAAC,EAAE;YACpB,OAAO,EAAE,CAAC;QACZ;YACE,IAAA,SAAG,EAAC,mBAAmB,EAAE,+DAA+D,CAAC,CAAC;YAC1F,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,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"}
@@ -12,6 +12,7 @@ export declare function logWarn(message: string, ...args: Array<string | number
12
12
  export declare function logFail(message: string, ...args: Array<string | number | boolean>): string;
13
13
  export declare function progress(message: string, ...args: Array<string | number | boolean>): void;
14
14
  export declare function logReset(): void;
15
+ export declare function logSuspend(): () => any;
15
16
  export declare function fail<T extends MessageTypes>(type: T, ...args: Parameters<Messages[T]>): never;
16
17
  export declare function log<T extends MessageTypes>(type: T, ...args: Parameters<Messages[T]>): string;
17
18
  export {};
package/lib/common/log.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.log = exports.fail = exports.logReset = exports.progress = exports.logFail = exports.logWarn = exports.logDone = exports.logVerbose = exports.logDebug = exports.logInfo = exports.setLogLevel = exports.getLogLevel = void 0;
3
+ exports.log = exports.fail = exports.logSuspend = exports.logReset = exports.progress = exports.logFail = exports.logWarn = exports.logDone = exports.logVerbose = exports.logDebug = exports.logInfo = exports.setLogLevel = exports.getLogLevel = void 0;
4
4
  const messages = require("../messages");
5
5
  const path_1 = require("path");
6
6
  const util_1 = require("util");
@@ -8,6 +8,7 @@ const fs_1 = require("fs");
8
8
  const info_1 = require("./info");
9
9
  const external_1 = require("../external");
10
10
  const types_1 = require("../types");
11
+ let currentProgress = undefined;
11
12
  const logger = (() => {
12
13
  try {
13
14
  const logger = require('@parcel/logger');
@@ -84,7 +85,8 @@ function logFail(message, ...args) {
84
85
  }
85
86
  exports.logFail = logFail;
86
87
  function progress(message, ...args) {
87
- logger.progress((0, util_1.format)(message, ...args));
88
+ currentProgress = (0, util_1.format)(message, ...args);
89
+ logger.progress(currentProgress);
88
90
  }
89
91
  exports.progress = progress;
90
92
  function logReset() {
@@ -92,6 +94,11 @@ function logReset() {
92
94
  logger.stopSpinner();
93
95
  }
94
96
  exports.logReset = logReset;
97
+ function logSuspend() {
98
+ logReset();
99
+ return () => logger.progress(currentProgress);
100
+ }
101
+ exports.logSuspend = logSuspend;
95
102
  function fail(type, ...args) {
96
103
  const message = log(type, ...args);
97
104
  const error = new Error(message);
@@ -1 +1 @@
1
- {"version":3,"file":"log.js","sourceRoot":"","sources":["../../src/common/log.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"log.js","sourceRoot":"","sources":["../../src/common/log.ts"],"names":[],"mappings":"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"}
@@ -9,7 +9,7 @@ export declare function isMonorepoPackageRef(refName: string, root: string): Pro
9
9
  export declare function installNpmDependencies(client: NpmClientType, target?: string): Promise<string>;
10
10
  export declare function installNpmPackage(client: NpmClientType, packageRef: string, target?: string, ...flags: Array<string>): Promise<string>;
11
11
  export declare function initNpmProject(client: NpmClientType, projectName: string, target: string): Promise<void>;
12
- export declare function publishNpmPackage(target?: string, file?: string, flags?: Array<string>): Promise<string>;
12
+ export declare function publishNpmPackage(target?: string, file?: string, flags?: Array<string>, interactive?: boolean): Promise<string>;
13
13
  export declare function createNpmPackage(target?: string): Promise<string>;
14
14
  export declare function findNpmTarball(packageRef: string): Promise<string>;
15
15
  export declare function findSpecificVersion(packageName: string, version: string): Promise<string>;
package/lib/common/npm.js CHANGED
@@ -46,6 +46,9 @@ function detectMonorepoRoot(root) {
46
46
  }
47
47
  const packageJson = yield (0, io_1.readJson)(root, 'package.json');
48
48
  if (Array.isArray(packageJson === null || packageJson === void 0 ? void 0 : packageJson.workspaces)) {
49
+ if (yield (0, io_1.checkExists)((0, path_1.resolve)(root, '.pnp.cjs'))) {
50
+ return [root, 'pnp'];
51
+ }
49
52
  if (yield (0, io_1.checkExists)((0, path_1.resolve)(root, 'yarn.lock'))) {
50
53
  return [root, 'yarn'];
51
54
  }
@@ -69,7 +72,6 @@ function determineNpmClient(root, selected) {
69
72
  const searchedClients = yield (0, clients_1.detectClients)(root);
70
73
  const foundClients = searchedClients.filter((m) => m.result);
71
74
  (0, log_1.log)('generalDebug_0003', `Results of the lock file check: ${searchedClients.map((m) => `${m.client}=${m.result}`).join(', ')}`);
72
- const defaultClient = config_1.config.npmClient;
73
75
  if (foundClients.length > 1) {
74
76
  const wrapperClient = foundClients.find((m) => (0, clients_1.isWrapperClient)(m.client));
75
77
  if (wrapperClient) {
@@ -86,11 +88,12 @@ function determineNpmClient(root, selected) {
86
88
  (0, log_1.log)('generalDebug_0003', `Found valid direct client via lock or config file: "${client}".`);
87
89
  return client;
88
90
  }
91
+ const defaultClient = config_1.config.npmClient;
89
92
  if (helpers_1.clientTypeKeys.includes(defaultClient)) {
90
93
  (0, log_1.log)('generalDebug_0003', `Using the default client: "${defaultClient}".`);
91
94
  return defaultClient;
92
95
  }
93
- (0, log_1.log)('generalDebug_0003', 'Using the default "npm" client.');
96
+ (0, log_1.log)('generalDebug_0003', 'Using the fallback "npm" client.');
94
97
  return 'npm';
95
98
  }
96
99
  return selected;
@@ -131,9 +134,14 @@ function initNpmProject(client, projectName, target) {
131
134
  return initProject(projectName, target);
132
135
  }
133
136
  exports.initNpmProject = initNpmProject;
134
- function publishNpmPackage(target = '.', file = '*.tgz', flags = []) {
135
- const { publishPackage } = clients_1.clients.npm;
136
- return publishPackage(target, file, ...flags);
137
+ function publishNpmPackage(target = '.', file = '*.tgz', flags = [], interactive = false) {
138
+ const { publishPackage, loginUser } = clients_1.clients.npm;
139
+ return publishPackage(target, file, ...flags).catch(err => {
140
+ if (!interactive) {
141
+ throw err;
142
+ }
143
+ return loginUser().then(() => publishNpmPackage(target, file, flags, false));
144
+ });
137
145
  }
138
146
  exports.publishNpmPackage = publishNpmPackage;
139
147
  function createNpmPackage(target = '.') {
@@ -1 +1 @@
1
- {"version":3,"file":"npm.js","sourceRoot":"","sources":["../../src/common/npm.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"npm.js","sourceRoot":"","sources":["../../src/common/npm.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,14 @@
1
- import { SourceLanguage, ForceOverwrite } from './enums';
2
- import { Framework, FileInfo, PiletsInfo, TemplateFileLocation, PackageData } from '../types';
1
+ import { ForceOverwrite } from './enums';
2
+ import { SourceLanguage, Framework, FileInfo, PiletsInfo, TemplateFileLocation, PackageData } from '../types';
3
3
  export declare function getPiralPath(root: string, name: string): string;
4
4
  export declare function readPiralPackage(root: string, name: string): Promise<PackageData>;
5
- export declare function getPiralPackage(app: string, language: SourceLanguage, version: string, framework: Framework, bundler?: string): {
5
+ export interface PiralPackageData {
6
+ packageName: Framework;
7
+ language: SourceLanguage;
8
+ reactVersion: number;
9
+ reactRouterVersion: number;
10
+ }
11
+ export declare function getPiralPackage(app: string, data: PiralPackageData, version: string, bundler?: string): {
6
12
  app: string;
7
13
  scripts: {
8
14
  start: string;
@@ -29,7 +29,6 @@ const language_1 = require("./language");
29
29
  const enums_1 = require("./enums");
30
30
  const compatibility_1 = require("./compatibility");
31
31
  const merge_1 = require("./merge");
32
- const template_1 = require("./template");
33
32
  const importmap_1 = require("./importmap");
34
33
  const constants_1 = require("./constants");
35
34
  const io_1 = require("./io");
@@ -64,7 +63,7 @@ function getDependencyVersion(name, devDependencies, allDependencies) {
64
63
  const globPatternStartIndicators = ['*', '?', '[', '!(', '?(', '+(', '@('];
65
64
  function getMatchingFiles(source, target, file) {
66
65
  return __awaiter(this, void 0, void 0, function* () {
67
- const { from, to, deep = true, template = false, } = typeof file === 'string' ? { from: file, to: file, deep: true } : file;
66
+ const { from, to, deep = true } = typeof file === 'string' ? { from: file, to: file, deep: true } : file;
68
67
  const sourcePath = (0, path_1.resolve)(source, from);
69
68
  const targetPath = (0, path_1.resolve)(target, to);
70
69
  const isDirectory = yield (0, io_1.checkIsDirectory)(sourcePath);
@@ -75,7 +74,6 @@ function getMatchingFiles(source, target, file) {
75
74
  return files.map((file) => ({
76
75
  sourcePath: file,
77
76
  targetPath: (0, path_1.resolve)(targetPath, (0, path_1.relative)(sourcePath, file)),
78
- template,
79
77
  }));
80
78
  }
81
79
  else if (globPatternStartIndicators.some((m) => from.indexOf(m) !== -1)) {
@@ -94,7 +92,6 @@ function getMatchingFiles(source, target, file) {
94
92
  return files.map((file) => ({
95
93
  sourcePath: file,
96
94
  targetPath: (0, path_1.resolve)(tarRoot, (0, path_1.relative)(relRoot, file)),
97
- template,
98
95
  }));
99
96
  }
100
97
  (0, log_1.log)('generalDebug_0003', `Assume direct path source "${sourcePath}".`);
@@ -102,7 +99,6 @@ function getMatchingFiles(source, target, file) {
102
99
  {
103
100
  sourcePath,
104
101
  targetPath,
105
- template,
106
102
  },
107
103
  ];
108
104
  });
@@ -144,13 +140,10 @@ function readPiralPackage(root, name) {
144
140
  return (0, io_2.readJson)(path, 'package.json');
145
141
  }
146
142
  exports.readPiralPackage = readPiralPackage;
147
- function getPiralPackage(app, language, version, framework, bundler) {
148
- // take default packages only if piral-core
149
- const packages = framework !== 'piral-core' ? {} : undefined;
150
- // take default dev packages only if not piral-base
151
- const typings = framework === 'piral-base' ? {} : undefined;
152
- const devDependencies = Object.assign(Object.assign({}, (0, language_1.getDevDependencies)(language, typings)), { 'piral-cli': `${version}` });
153
- const dependencies = Object.assign({}, (0, language_1.getDependencies)(language, packages));
143
+ function getPiralPackage(app, data, version, bundler) {
144
+ const framework = data.packageName;
145
+ const devDependencies = Object.assign(Object.assign({}, (0, language_1.getDevDependencies)(data.language, (0, language_1.getDevDependencyPackages)(framework, data.reactVersion, data.reactRouterVersion))), { 'piral-cli': `${version}` });
146
+ const dependencies = Object.assign({}, (0, language_1.getDependencies)(data.language, (0, language_1.getDependencyPackages)(framework, data.reactVersion, data.reactRouterVersion)));
154
147
  appendBundler(devDependencies, bundler, version);
155
148
  return {
156
149
  app,
@@ -185,14 +178,10 @@ function getAvailableFiles(root, name, dirName, fileMap) {
185
178
  (0, log_1.log)('generalDebug_0003', `Get matching files from "${source}".`);
186
179
  const base = (0, path_1.resolve)(source, dirName);
187
180
  const files = yield (0, io_1.matchFiles)(base, '**/*');
188
- return files.map((file) => {
189
- var _a;
190
- return ({
191
- sourcePath: file,
192
- targetPath: (0, path_1.resolve)(root, (0, path_1.relative)(base, file)),
193
- template: ((_a = fileMap.find((m) => (0, path_1.resolve)(source, m.from) === file)) === null || _a === void 0 ? void 0 : _a.template) || false,
194
- });
195
- });
181
+ return files.map((file) => ({
182
+ sourcePath: file,
183
+ targetPath: (0, path_1.resolve)(root, (0, path_1.relative)(base, file)),
184
+ }));
196
185
  });
197
186
  }
198
187
  function getFileStats(root, name, fileMap = []) {
@@ -216,15 +205,12 @@ exports.getFileStats = getFileStats;
216
205
  function copyFiles(subfiles, forceOverwrite, originalFiles, variables) {
217
206
  return __awaiter(this, void 0, void 0, function* () {
218
207
  for (const subfile of subfiles) {
219
- const { sourcePath, targetPath, template } = subfile;
208
+ const { sourcePath, targetPath } = subfile;
220
209
  const exists = yield (0, io_2.checkExists)(sourcePath);
221
210
  if (exists) {
222
211
  const overwrite = originalFiles.some((m) => m.path === targetPath && !m.changed);
223
212
  const force = overwrite ? enums_1.ForceOverwrite.yes : forceOverwrite;
224
- const written = yield (0, io_2.copy)(sourcePath, targetPath, force);
225
- if (written && template && variables) {
226
- yield (0, template_1.applyTemplate)(targetPath, variables);
227
- }
213
+ yield (0, io_2.copy)(sourcePath, targetPath, force);
228
214
  }
229
215
  else {
230
216
  (0, log_1.fail)('cannotFindFile_0046', sourcePath);
@@ -1 +1 @@
1
- {"version":3,"file":"package.js","sourceRoot":"","sources":["../../src/common/package.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"package.js","sourceRoot":"","sources":["../../src/common/package.ts"],"names":[],"mappings":"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"}
@@ -1 +1,2 @@
1
+ export declare function getAvailablePort(defaultPort: number): Promise<number>;
1
2
  export declare function getFreePort(preferred?: number): Promise<number>;
@@ -9,9 +9,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
9
9
  });
10
10
  };
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
- exports.getFreePort = void 0;
12
+ exports.getFreePort = exports.getAvailablePort = void 0;
13
13
  const log_1 = require("./log");
14
14
  const external_1 = require("../external");
15
+ function getAvailablePort(defaultPort) {
16
+ return __awaiter(this, void 0, void 0, function* () {
17
+ const selectedPort = yield getFreePort(defaultPort);
18
+ if (selectedPort !== defaultPort) {
19
+ (0, log_1.log)('portNotFree_0047', selectedPort, defaultPort);
20
+ }
21
+ return selectedPort;
22
+ });
23
+ }
24
+ exports.getAvailablePort = getAvailablePort;
15
25
  function getFreePort(preferred) {
16
26
  return __awaiter(this, void 0, void 0, function* () {
17
27
  (0, log_1.log)('generalDebug_0003', `Looking for a free port. Preferred port: ${preferred}`);
@@ -1 +1 @@
1
- {"version":3,"file":"port.js","sourceRoot":"","sources":["../../src/common/port.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAA4B;AAC5B,0CAAsC;AAEtC,SAAsB,WAAW,CAAC,SAAkB;;QAClD,IAAA,SAAG,EAAC,mBAAmB,EAAE,4CAA4C,SAAS,EAAE,CAAC,CAAC;QAClF,MAAM,IAAI,GAAG,MAAM,IAAA,kBAAO,EAAC,SAAS,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;QAC7D,IAAA,SAAG,EAAC,mBAAmB,EAAE,cAAc,IAAI,kBAAkB,CAAC,CAAC;QAC/D,OAAO,IAAI,CAAC;IACd,CAAC;CAAA;AALD,kCAKC"}
1
+ {"version":3,"file":"port.js","sourceRoot":"","sources":["../../src/common/port.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAA4B;AAC5B,0CAAsC;AAEtC,SAAsB,gBAAgB,CAAC,WAAmB;;QACxD,MAAM,YAAY,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,CAAC;QAEpD,IAAI,YAAY,KAAK,WAAW,EAAE;YAChC,IAAA,SAAG,EAAC,kBAAkB,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC;SACpD;QAED,OAAO,YAAY,CAAC;IACtB,CAAC;CAAA;AARD,4CAQC;AAED,SAAsB,WAAW,CAAC,SAAkB;;QAClD,IAAA,SAAG,EAAC,mBAAmB,EAAE,4CAA4C,SAAS,EAAE,CAAC,CAAC;QAClF,MAAM,IAAI,GAAG,MAAM,IAAA,kBAAO,EAAC,SAAS,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;QAC7D,IAAA,SAAG,EAAC,mBAAmB,EAAE,cAAc,IAAI,kBAAkB,CAAC,CAAC;QAC/D,OAAO,IAAI,CAAC;IACd,CAAC;CAAA;AALD,kCAKC"}