piral-cli 1.4.0-beta.6247 → 1.4.0-beta.6250

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 (35) hide show
  1. package/lib/apps/add-piral-instance-pilet.js +1 -4
  2. package/lib/apps/add-piral-instance-pilet.js.map +1 -1
  3. package/lib/apps/new-pilet.js +4 -3
  4. package/lib/apps/new-pilet.js.map +1 -1
  5. package/lib/apps/run-emulator-piral.js +1 -1
  6. package/lib/apps/run-emulator-piral.js.map +1 -1
  7. package/lib/apps/upgrade-pilet.js +3 -2
  8. package/lib/apps/upgrade-pilet.js.map +1 -1
  9. package/lib/common/package.d.ts +1 -2
  10. package/lib/common/package.js +25 -33
  11. package/lib/common/package.js.map +1 -1
  12. package/lib/common/shell.d.ts +2 -2
  13. package/lib/common/shell.js +45 -14
  14. package/lib/common/shell.js.map +1 -1
  15. package/lib/common/website.d.ts +1 -2
  16. package/lib/common/website.js +6 -4
  17. package/lib/common/website.js.map +1 -1
  18. package/lib/injectors/pilet-injector.d.ts +12 -10
  19. package/lib/injectors/pilet-injector.js +103 -60
  20. package/lib/injectors/pilet-injector.js.map +1 -1
  21. package/lib/injectors/piral-injector.d.ts +5 -5
  22. package/lib/injectors/piral-injector.js +64 -34
  23. package/lib/injectors/piral-injector.js.map +1 -1
  24. package/package.json +2 -2
  25. package/src/apps/add-piral-instance-pilet.ts +1 -16
  26. package/src/apps/new-pilet.ts +4 -10
  27. package/src/apps/run-emulator-piral.ts +1 -1
  28. package/src/apps/upgrade-pilet.ts +3 -2
  29. package/src/common/package.ts +20 -35
  30. package/src/common/shell.ts +59 -18
  31. package/src/common/website.ts +6 -4
  32. package/src/injectors/pilet-injector.test.ts +4 -4
  33. package/src/injectors/pilet-injector.ts +87 -41
  34. package/src/injectors/piral-injector.test.ts +2 -2
  35. package/src/injectors/piral-injector.ts +31 -20
package/lib/apps/add-piral-instance-pilet.js CHANGED
@@ -34,10 +34,7 @@ function addPiralInstancePilet(baseDir = process.cwd(), options = {}) {
34
34
  if (piletJsonPath) {
35
35
  const piletJsonDir = (0, path_1.dirname)(piletJsonPath);
36
36
  const root = yield (0, common_1.findPiletRoot)(piletJsonDir);
37
- const oldContent = yield (0, common_1.readJson)(piletJsonDir, common_1.piletJson);
38
- const [appName, _, appDetails] = yield (0, common_1.installPiralInstance)(app, fullBase, root, npmClient);
39
- const newContent = Object.assign(Object.assign({}, oldContent), { piralInstances: Object.assign(Object.assign({}, oldContent.piralInstances), { [appName]: Object.assign(Object.assign({}, appDetails), { selected }) }) });
40
- yield (0, common_1.writeJson)(piletJsonDir, common_1.piletJson, newContent, true);
37
+ yield (0, common_1.installPiralInstance)(app, fullBase, root, npmClient, selected);
41
38
  }
42
39
  else {
43
40
  (0, common_1.log)('piletJsonNotAvailable_0180', targetDir);
package/lib/apps/add-piral-instance-pilet.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"add-piral-instance-pilet.js","sourceRoot":"","sources":["../../src/apps/add-piral-instance-pilet.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAAwC;AACxC,oCAAoD;AACpD,sCAamB;AA8BN,QAAA,6BAA6B,GAAiC;IACzE,QAAQ,EAAE,iBAAS,CAAC,IAAI;IACxB,GAAG,EAAE,SAAS;IACd,MAAM,EAAE,GAAG;IACX,QAAQ,EAAE,KAAK;IACf,SAAS,EAAE,SAAS;CACrB,CAAC;AAEF,SAAsB,qBAAqB,CAAC,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,EAAE,UAAwC,EAAE;;QAC7G,MAAM,EACJ,SAAS,EAAE,gBAAgB,GAAG,qCAA6B,CAAC,SAAS,EACrE,QAAQ,GAAG,qCAA6B,CAAC,QAAQ,EACjD,MAAM,GAAG,qCAA6B,CAAC,MAAM,EAC7C,QAAQ,GAAG,qCAA6B,CAAC,QAAQ,EACjD,GAAG,GAAG,qCAA6B,CAAC,GAAG,GACxC,GAAG,OAAO,CAAC;QACZ,MAAM,QAAQ,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC;QACjD,IAAA,oBAAW,EAAC,QAAQ,CAAC,CAAC;QACtB,IAAA,iBAAQ,EAAC,2BAA2B,CAAC,CAAC;QAEtC,MAAM,SAAS,GAAG,MAAM,IAAA,2BAAkB,EAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;QACvE,MAAM,UAAU,GAAG,MAAM,IAAA,sBAAa,EAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;QAE3D,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,CAAC,CAAO,WAAW,EAAE,EAAE;YACjD,MAAM,SAAS,GAAG,IAAA,cAAO,EAAC,WAAW,CAAC,CAAC;YACvC,MAAM,aAAa,GAAG,MAAM,IAAA,iBAAQ,EAAC,SAAS,EAAE,kBAAS,CAAC,CAAC;YAE3D,IAAI,aAAa,EAAE;gBACjB,MAAM,YAAY,GAAG,IAAA,cAAO,EAAC,aAAa,CAAC,CAAC;gBAC5C,MAAM,IAAI,GAAG,MAAM,IAAA,sBAAa,EAAC,YAAY,CAAC,CAAC;gBAC/C,MAAM,UAAU,GAAG,MAAM,IAAA,iBAAQ,EAAC,YAAY,EAAE,kBAAS,CAAC,CAAC;gBAC3D,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,UAAU,CAAC,GAAG,MAAM,IAAA,6BAAoB,EAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;gBAE5F,MAAM,UAAU,mCACX,UAAU,KACb,cAAc,kCACT,UAAU,CAAC,cAAc,KAC5B,CAAC,OAAO,CAAC,kCACJ,UAAU,KACb,QAAQ,SAGb,CAAC;gBAEF,MAAM,IAAA,kBAAS,EAAC,YAAY,EAAE,kBAAS,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;aAC5D;iBAAM;gBACL,IAAA,YAAG,EAAC,4BAA4B,EAAE,SAAS,CAAC,CAAC;aAC9C;QACH,CAAC,CAAA,CAAC,CAAC;QAEH,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAEzB,IAAA,gBAAO,EAAC,2BAA2B,CAAC,CAAC;IACvC,CAAC;CAAA;AA7CD,sDA6CC"}
1
+ {"version":3,"file":"add-piral-instance-pilet.js","sourceRoot":"","sources":["../../src/apps/add-piral-instance-pilet.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAAwC;AACxC,oCAAoD;AACpD,sCAamB;AA8BN,QAAA,6BAA6B,GAAiC;IACzE,QAAQ,EAAE,iBAAS,CAAC,IAAI;IACxB,GAAG,EAAE,SAAS;IACd,MAAM,EAAE,GAAG;IACX,QAAQ,EAAE,KAAK;IACf,SAAS,EAAE,SAAS;CACrB,CAAC;AAEF,SAAsB,qBAAqB,CAAC,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,EAAE,UAAwC,EAAE;;QAC7G,MAAM,EACJ,SAAS,EAAE,gBAAgB,GAAG,qCAA6B,CAAC,SAAS,EACrE,QAAQ,GAAG,qCAA6B,CAAC,QAAQ,EACjD,MAAM,GAAG,qCAA6B,CAAC,MAAM,EAC7C,QAAQ,GAAG,qCAA6B,CAAC,QAAQ,EACjD,GAAG,GAAG,qCAA6B,CAAC,GAAG,GACxC,GAAG,OAAO,CAAC;QACZ,MAAM,QAAQ,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC;QACjD,IAAA,oBAAW,EAAC,QAAQ,CAAC,CAAC;QACtB,IAAA,iBAAQ,EAAC,2BAA2B,CAAC,CAAC;QAEtC,MAAM,SAAS,GAAG,MAAM,IAAA,2BAAkB,EAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;QACvE,MAAM,UAAU,GAAG,MAAM,IAAA,sBAAa,EAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;QAE3D,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,CAAC,CAAO,WAAW,EAAE,EAAE;YACjD,MAAM,SAAS,GAAG,IAAA,cAAO,EAAC,WAAW,CAAC,CAAC;YACvC,MAAM,aAAa,GAAG,MAAM,IAAA,iBAAQ,EAAC,SAAS,EAAE,kBAAS,CAAC,CAAC;YAE3D,IAAI,aAAa,EAAE;gBACjB,MAAM,YAAY,GAAG,IAAA,cAAO,EAAC,aAAa,CAAC,CAAC;gBAC5C,MAAM,IAAI,GAAG,MAAM,IAAA,sBAAa,EAAC,YAAY,CAAC,CAAC;gBAC/C,MAAM,IAAA,6BAAoB,EAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;aACtE;iBAAM;gBACL,IAAA,YAAG,EAAC,4BAA4B,EAAE,SAAS,CAAC,CAAC;aAC9C;QACH,CAAC,CAAA,CAAC,CAAC;QAEH,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACzB,IAAA,gBAAO,EAAC,2BAA2B,CAAC,CAAC;IACvC,CAAC;CAAA;AA9BD,sDA8BC"}
package/lib/apps/new-pilet.js CHANGED
@@ -59,8 +59,10 @@ always-auth=true`, forceOverwrite);
59
59
  }
60
60
  yield (0, common_1.createFileIfNotExists)(root, common_1.piletJson, JSON.stringify({
61
61
  schemaVersion: common_1.defaultSchemaVersion,
62
+ piralInstances: {},
62
63
  }, undefined, 2));
63
- const [packageName, packageVersion, packageDetails] = yield (0, common_1.installPiralInstance)(source || `empty-piral@${common_1.cliVersion}`, fullBase, root, npmClient);
64
+ const sourceName = source || `empty-piral@${common_1.cliVersion}`;
65
+ const packageName = yield (0, common_1.installPiralInstance)(sourceName, fullBase, root, npmClient, true);
64
66
  const piralInfo = yield (0, common_1.readPiralPackage)(root, packageName);
65
67
  const isEmulator = (0, common_1.checkAppShellPackage)(piralInfo);
66
68
  const { preScaffold, postScaffold, files, template: preSelectedTemplate } = (0, common_1.getPiletsInfo)(piralInfo);
@@ -71,10 +73,9 @@ always-auth=true`, forceOverwrite);
71
73
  }
72
74
  (0, common_1.progress)(`Taking care of templating ...`);
73
75
  const data = (0, common_1.getPiletScaffoldData)(language, root, packageName, variables);
74
- yield (0, common_1.patchPiletPackage)(root, packageName, packageVersion, piralInfo, isEmulator, {
76
+ yield (0, common_1.patchPiletPackage)(root, piralInfo, isEmulator, {
75
77
  language,
76
78
  bundler: bundlerName,
77
- details: packageDetails,
78
79
  });
79
80
  const chosenTemplate = template || preSelectedTemplate || 'default';
80
81
  yield (0, common_1.scaffoldPiletSourceFiles)(chosenTemplate, registry, data, forceOverwrite);
package/lib/apps/new-pilet.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"new-pilet.js","sourceRoot":"","sources":["../../src/apps/new-pilet.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"new-pilet.js","sourceRoot":"","sources":["../../src/apps/new-pilet.ts"],"names":[],"mappings":"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"}
package/lib/apps/run-emulator-piral.js CHANGED
@@ -54,7 +54,7 @@ function runEmulatorPiral(baseDir = process.cwd(), options = {}) {
54
54
  always-auth=true`, common_1.ForceOverwrite.yes);
55
55
  }
56
56
  const npmClient = yield (0, common_1.determineNpmClient)(appRoot, defaultNpmClient);
57
- const [packageName] = yield (0, common_1.installPiralInstance)(app, fullBase, appRoot, npmClient);
57
+ const packageName = yield (0, common_1.installPiralInstance)(app, fullBase, appRoot, npmClient);
58
58
  const piral = yield (0, common_1.findPiralInstance)(packageName, appRoot, {
59
59
  port: originalPort,
60
60
  });
package/lib/apps/run-emulator-piral.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"run-emulator-piral.js","sourceRoot":"","sources":["../../src/apps/run-emulator-piral.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"run-emulator-piral.js","sourceRoot":"","sources":["../../src/apps/run-emulator-piral.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2BAA4B;AAC5B,2BAA6B;AAC7B,+BAA8C;AAC9C,+BAAgE;AAChE,oCAAoD;AACpD,sCAcmB;AAwCN,QAAA,wBAAwB,GAA4B;IAC/D,QAAQ,EAAE,iBAAS,CAAC,IAAI;IACxB,IAAI,EAAE,eAAM,CAAC,WAAW;IACxB,IAAI,EAAE,eAAM,CAAC,IAAI;IACjB,QAAQ,EAAE,eAAM,CAAC,QAAQ;IACzB,SAAS,EAAE,SAAS;CACrB,CAAC;AAEF,SAAS,aAAa;IACpB,MAAM,IAAI,GAAG,IAAA,WAAI,EAAC,IAAA,WAAM,GAAE,EAAE,YAAY,CAAC,CAAC;IAE1C,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAC7C,IAAA,YAAO,EAAC,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QACzB,IAAI,GAAG,EAAE;YACP,MAAM,CAAC,GAAG,CAAC,CAAC;SACb;aAAM;YACL,OAAO,CAAC,GAAG,CAAC,CAAC;SACd;IACH,CAAC,CAAC,CACH,CAAC;AACJ,CAAC;AAED,SAAsB,gBAAgB,CAAC,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,EAAE,UAAmC,EAAE;;;QACnG,MAAM,EACJ,IAAI,GAAG,gCAAwB,CAAC,IAAI,EACpC,IAAI,EAAE,YAAY,GAAG,gCAAwB,CAAC,IAAI,EAClD,QAAQ,GAAG,gCAAwB,CAAC,QAAQ,EAC5C,SAAS,EAAE,gBAAgB,GAAG,gCAAwB,CAAC,SAAS,EAChE,QAAQ,GAAG,gCAAwB,CAAC,QAAQ,EAC5C,GAAG,EACH,IAAI,GACL,GAAG,OAAO,CAAC;QACZ,MAAM,SAAS,GAAG,GAAG,CAAC;QACtB,MAAM,GAAG,GAAG,eAAM,CAAC,QAAQ,CAAC;QAC5B,MAAM,QAAQ,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC;QACjD,MAAM,SAAS,GAAG,IAAA,cAAO,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAA,oBAAW,EAAC,QAAQ,CAAC,CAAC;QAEtB,IAAA,iBAAQ,EAAC,2BAA2B,CAAC,CAAC;QAEtC,MAAA,OAAO,CAAC,MAAM,0CAAE,eAAe,CAAC,EAAE,CAAC,CAAC;QACpC,MAAA,OAAO,CAAC,MAAM,0CAAE,eAAe,CAAC,EAAE,CAAC,CAAC;QACpC,MAAA,OAAO,CAAC,KAAK,0CAAE,eAAe,CAAC,EAAE,CAAC,CAAC;QAEnC,MAAM,OAAO,GAAG,MAAM,aAAa,EAAE,CAAC;QAEtC,IAAI,QAAQ,KAAK,gCAAwB,CAAC,QAAQ,EAAE;YAClD,IAAA,iBAAQ,EAAC,kCAAkC,EAAE,QAAQ,CAAC,CAAC;YAEvD,MAAM,IAAA,8BAAqB,EACzB,OAAO,EACP,QAAQ,EACR,YAAY,QAAQ;iBACT,EACX,uBAAc,CAAC,GAAG,CACnB,CAAC;SACH;QAED,MAAM,SAAS,GAAG,MAAM,IAAA,2BAAkB,EAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;QACtE,MAAM,WAAW,GAAG,MAAM,IAAA,6BAAoB,EAAC,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;QAClF,MAAM,KAAK,GAAG,MAAM,IAAA,0BAAiB,EAAC,WAAW,EAAE,OAAO,EAAE;YAC1D,IAAI,EAAE,YAAY;SACnB,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,IAAA,yBAAgB,EAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAEhD,MAAM,cAAc,GAAG,IAAA,cAAO,EAAC,QAAQ,EAAE,aAAM,CAAC,CAAC;QACjD,MAAM,cAAc,GAAG,IAAA,cAAO,EAAC,OAAO,EAAE,aAAM,CAAC,CAAC;QAChD,MAAM,OAAO,GAAG,IAAA,gCAAuB,EAAC,SAAS,EAAE,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;QAC5E,MAAM,QAAQ,GAAG;YACf,SAAS,EAAE;gBACT,KAAK,EAAE;oBACL,MAAM,EAAE,KAAK;iBACd;gBACD,KAAK,EAAE;oBACL,MAAM,EAAE,IAAI;oBACZ,MAAM,EAAE,EAAE;oBACV,GAAG,EAAE,IAAA,cAAO,EAAC,KAAK,CAAC,GAAG,CAAC;oBACvB,SAAS;oBACT,MAAM,EAAE,CAAC,SAAS,EAAE,GAAG,CAAC;oBACxB,GAAG;iBACJ;aACF;SACF,CAAC;QACF,MAAM,OAAO,GAAG,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;QACjD,MAAM,UAAU,GAAG,IAAA,qBAAc,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,GAAG,OAAO,CAAC,CAAC;QAE3E,IAAA,YAAG,EAAC,qBAAqB,EAAE,kCAAkC,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QAEzG,MAAM,UAAU,GAAG,IAAA,uBAAgB,EAAC,UAAU,CAAC,CAAC;QAChD,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;QAC/B,UAAU,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;QACtC,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,IAAA,2BAAkB,EAAC,SAAS,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;QAErE,MAAM,UAAU,CAAC,KAAK,EAAE,CAAC;QACzB,IAAA,oBAAW,EAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACrD,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;;CACjE;AA1ED,4CA0EC"}
package/lib/apps/upgrade-pilet.js CHANGED
@@ -40,6 +40,7 @@ function upgradePilet(baseDir = process.cwd(), options = {}) {
40
40
  (0, common_1.fail)('appInstancesNotGiven_0012');
41
41
  }
42
42
  for (const { appPackage } of apps) {
43
+ //TODO distinguish if it's a website / remote emulator or an npm package
43
44
  const sourceName = appPackage.name;
44
45
  const language = /\.jsx?$/.test(source) ? 'js' : 'ts';
45
46
  if (!sourceName || typeof sourceName !== 'string') {
@@ -50,7 +51,7 @@ function upgradePilet(baseDir = process.cwd(), options = {}) {
50
51
  (0, common_1.fail)('invalidPiralReference_0043');
51
52
  }
52
53
  const monorepoRef = yield (0, common_1.isMonorepoPackageRef)(sourceName, fullBase);
53
- const [packageRef, packageVersion] = yield (0, common_1.getCurrentPackageDetails)(fullBase, sourceName, currentVersion, version, root);
54
+ const [packageRef] = yield (0, common_1.getCurrentPackageDetails)(fullBase, sourceName, currentVersion, version, root);
54
55
  const originalFiles = yield (0, common_1.getFileStats)(root, sourceName);
55
56
  if (!monorepoRef) {
56
57
  // only install the latest if the shell does come from remote
@@ -78,7 +79,7 @@ function upgradePilet(baseDir = process.cwd(), options = {}) {
78
79
  const notOnceFiles = files.filter((m) => typeof m === 'string' || !m.once);
79
80
  yield (0, common_1.copyScaffoldingFiles)(packageRoot, root, notOnceFiles, piralInfo, data);
80
81
  }
81
- yield (0, common_1.patchPiletPackage)(root, sourceName, packageVersion, piralInfo, isEmulator);
82
+ yield (0, common_1.patchPiletPackage)(root, piralInfo, isEmulator);
82
83
  if (install) {
83
84
  (0, common_1.progress)(`Updating dependencies ...`);
84
85
  yield (0, common_1.installNpmDependencies)(npmClient, root);
package/lib/apps/upgrade-pilet.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"upgrade-pilet.js","sourceRoot":"","sources":["../../src/apps/upgrade-pilet.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAA+B;AAC/B,oCAAoD;AACpD,sCAwBmB;AA6CN,QAAA,oBAAoB,GAAwB;IACvD,OAAO,EAAE,SAAS;IAClB,MAAM,EAAE,GAAG;IACX,cAAc,EAAE,uBAAc,CAAC,EAAE;IACjC,QAAQ,EAAE,iBAAS,CAAC,IAAI;IACxB,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,SAAS;IACpB,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,SAAsB,YAAY,CAAC,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,EAAE,UAA+B,EAAE;;;QAC3F,MAAM,EACJ,OAAO,GAAG,4BAAoB,CAAC,OAAO,EACtC,MAAM,GAAG,4BAAoB,CAAC,MAAM,EACpC,cAAc,GAAG,4BAAoB,CAAC,cAAc,EACpD,QAAQ,GAAG,4BAAoB,CAAC,QAAQ,EACxC,OAAO,GAAG,4BAAoB,CAAC,OAAO,EACtC,SAAS,GAAG,4BAAoB,CAAC,SAAS,EAC1C,SAAS,EAAE,gBAAgB,GAAG,4BAAoB,CAAC,SAAS,GAC7D,GAAG,OAAO,CAAC;QACZ,MAAM,QAAQ,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC;QACjD,MAAM,IAAI,GAAG,IAAA,cAAO,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACvC,IAAA,oBAAW,EAAC,QAAQ,CAAC,CAAC;QACtB,MAAM,KAAK,GAAG,MAAM,IAAA,+BAAsB,EAAC,IAAI,CAAC,CAAC;QAEjD,IAAI,CAAC,KAAK,EAAE;YACV,IAAA,aAAI,EAAC,yBAAyB,CAAC,CAAC;SACjC;QAED,MAAM,SAAS,GAAG,MAAM,IAAA,2BAAkB,EAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QACnE,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,MAAM,IAAA,0BAAiB,EAAC,IAAI,CAAC,CAAC;QAC7D,MAAM,EAAE,eAAe,GAAG,EAAE,EAAE,YAAY,GAAG,EAAE,EAAE,MAAM,EAAE,GAAG,YAAY,CAAC;QAEzE,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YACrB,IAAA,aAAI,EAAC,2BAA2B,CAAC,CAAC;SACnC;QAED,KAAK,MAAM,EAAE,UAAU,EAAE,IAAI,IAAI,EAAE;YACjC,MAAM,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC;YACnC,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;YAEtD,IAAI,CAAC,UAAU,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;gBACjD,IAAA,aAAI,EAAC,0BAA0B,CAAC,CAAC;aAClC;YAED,MAAM,cAAc,GAAG,MAAA,eAAe,CAAC,UAAU,CAAC,mCAAI,YAAY,CAAC,UAAU,CAAC,CAAC;YAE/E,IAAI,CAAC,cAAc,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE;gBACzD,IAAA,aAAI,EAAC,4BAA4B,CAAC,CAAC;aACpC;YAED,MAAM,WAAW,GAAG,MAAM,IAAA,6BAAoB,EAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;YACrE,MAAM,CAAC,UAAU,EAAE,cAAc,CAAC,GAAG,MAAM,IAAA,iCAAwB,EACjE,QAAQ,EACR,UAAU,EACV,cAAc,EACd,OAAO,EACP,IAAI,CACL,CAAC;YACF,MAAM,aAAa,GAAG,MAAM,IAAA,qBAAY,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YAE3D,IAAI,CAAC,WAAW,EAAE;gBAChB,6DAA6D;gBAC7D,IAAA,iBAAQ,EAAC,gCAAgC,EAAE,UAAU,CAAC,CAAC;gBACvD,MAAM,IAAA,0BAAiB,EAAC,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;aACnE;YAED,MAAM,SAAS,GAAG,MAAM,IAAA,yBAAgB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YAE3D,MAAM,UAAU,GAAG,IAAA,6BAAoB,EAAC,SAAS,CAAC,CAAC;YAEnD,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,IAAA,sBAAa,EAAC,SAAS,CAAC,CAAC;YAEpE,IAAI,UAAU,EAAE;gBACd,IAAA,iBAAQ,EAAC,+BAA+B,CAAC,CAAC;gBAC1C,IAAA,YAAG,EAAC,mBAAmB,EAAE,QAAQ,UAAU,EAAE,CAAC,CAAC;gBAC/C,MAAM,IAAA,kBAAS,EAAC,UAAU,EAAE,IAAI,CAAC,CAAC;aACnC;YAED,IAAA,iBAAQ,EAAC,+BAA+B,CAAC,CAAC;YAC1C,MAAM,IAAI,GAAG,IAAA,6BAAoB,EAAC,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;YAEzE,IAAI,UAAU,EAAE;gBACd,mEAAmE;gBACnE,MAAM,IAAA,uBAAc,EAAC,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,cAAc,EAAE,IAAI,EAAE,aAAa,CAAC,CAAC;aACxF;iBAAM;gBACL,oEAAoE;gBACpE,sEAAsE;gBACtE,MAAM,WAAW,GAAG,IAAA,qBAAY,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;gBACnD,MAAM,YAAY,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;gBAC3E,MAAM,IAAA,6BAAoB,EAAC,WAAW,EAAE,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;aAC9E;YAED,MAAM,IAAA,0BAAiB,EAAC,IAAI,EAAE,UAAU,EAAE,cAAc,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;YAEjF,IAAI,OAAO,EAAE;gBACX,IAAA,iBAAQ,EAAC,2BAA2B,CAAC,CAAC;gBACtC,MAAM,IAAA,+BAAsB,EAAC,SAAS,EAAE,IAAI,CAAC,CAAC;aAC/C;YAED,IAAI,WAAW,EAAE;gBACf,IAAA,iBAAQ,EAAC,gCAAgC,CAAC,CAAC;gBAC3C,IAAA,YAAG,EAAC,mBAAmB,EAAE,QAAQ,WAAW,EAAE,CAAC,CAAC;gBAChD,MAAM,IAAA,kBAAS,EAAC,WAAW,EAAE,IAAI,CAAC,CAAC;aACpC;SACF;QAED,IAAA,gBAAO,EAAC,8BAA8B,CAAC,CAAC;;CACzC;AAlGD,oCAkGC"}
1
+ {"version":3,"file":"upgrade-pilet.js","sourceRoot":"","sources":["../../src/apps/upgrade-pilet.ts"],"names":[],"mappings":"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"}
package/lib/common/package.d.ts CHANGED
@@ -71,10 +71,9 @@ export declare function retrievePiletsInfo(entryFile: string): Promise<{
71
71
  }>;
72
72
  export declare function validateSharedDependencies(externals: Array<SharedDependency>): void;
73
73
  export declare function isValidDependency(name: string): boolean;
74
- export declare function patchPiletPackage(root: string, name: string, version: string, piralInfo: PiralPackageData, fromEmulator: boolean, newInfo?: {
74
+ export declare function patchPiletPackage(root: string, piralInfo: PiralPackageData, fromEmulator: boolean, newInfo?: {
75
75
  language: SourceLanguage;
76
76
  bundler: string;
77
- details: PiralInstanceDetails;
78
77
  }): Promise<void>;
79
78
  /**
80
79
  * Returns true if its an emulator package, otherwise it has to be a "raw" app shell.
package/lib/common/package.js CHANGED
@@ -183,15 +183,15 @@ exports.findPiralInstances = findPiralInstances;
183
183
  function readPiralPackage(root, name) {
184
184
  (0, log_1.log)('generalDebug_0003', `Reading the piral package in "${root}" ...`);
185
185
  const path = getPiralPath(root, name);
186
- return (0, io_2.readJson)(path, constants_2.packageJson);
186
+ return (0, io_2.readJson)(path, constants_1.packageJson);
187
187
  }
188
188
  exports.readPiralPackage = readPiralPackage;
189
189
  function patchPiralPackage(root, app, data, version, bundler) {
190
190
  return __awaiter(this, void 0, void 0, function* () {
191
- (0, log_1.log)('generalDebug_0003', `Patching the package.json in "${root}" ...`);
191
+ (0, log_1.log)('generalDebug_0003', `Patching the ${constants_1.packageJson} in "${root}" ...`);
192
192
  const pkg = yield getPiralPackage(app, data, version, bundler);
193
- yield (0, io_2.updateExistingJson)(root, 'package.json', pkg);
194
- (0, log_1.log)('generalDebug_0003', `Succesfully patched the package.json.`);
193
+ yield (0, io_2.updateExistingJson)(root, constants_1.packageJson, pkg);
194
+ (0, log_1.log)('generalDebug_0003', `Succesfully patched the ${constants_1.packageJson}.`);
195
195
  yield (0, io_2.updateExistingJson)(root, constants_2.piralJson, {
196
196
  $schema: constants_1.piralJsonSchemaUrl,
197
197
  pilets: getPiletsInfo({}),
@@ -297,7 +297,7 @@ function copyScaffoldingFiles(source, target, files, piralInfo, variables) {
297
297
  exports.copyScaffoldingFiles = copyScaffoldingFiles;
298
298
  function extendPackageOverridesFromTemplateFragment(root, piralInfo, files) {
299
299
  return __awaiter(this, void 0, void 0, function* () {
300
- const packageTarget = (0, path_1.resolve)(root, 'package.json');
300
+ const packageTarget = (0, path_1.resolve)(root, constants_1.packageJson);
301
301
  for (let i = files.length; i--;) {
302
302
  const file = files[i];
303
303
  if (file.targetPath === packageTarget) {
@@ -319,7 +319,7 @@ function isTemplateFileLocation(item) {
319
319
  }
320
320
  function tryFindPackageVersion(packageName) {
321
321
  try {
322
- const { version } = require(`${packageName}/package.json`);
322
+ const { version } = require(`${packageName}/${constants_1.packageJson}`);
323
323
  return version;
324
324
  }
325
325
  catch (_a) {
@@ -363,7 +363,7 @@ function retrievePiralRoot(baseDir, entry) {
363
363
  const rootDir = (0, path_1.join)(baseDir, entry);
364
364
  (0, log_1.log)('generalDebug_0003', `Retrieving Piral root from "${rootDir}" ...`);
365
365
  if (!constants_2.declarationEntryExtensions.includes((0, path_1.extname)(rootDir).toLowerCase())) {
366
- const packageName = (0, path_1.basename)(rootDir) === 'package.json' ? rootDir : (0, path_1.join)(rootDir, 'package.json');
366
+ const packageName = (0, path_1.basename)(rootDir) === constants_1.packageJson ? rootDir : (0, path_1.join)(rootDir, constants_1.packageJson);
367
367
  (0, log_1.log)('generalDebug_0003', `Trying to get entry point from "${packageName}".`);
368
368
  const exists = yield (0, io_2.checkExists)(packageName);
369
369
  if (!exists) {
@@ -432,9 +432,9 @@ function findPackageVersion(rootPath, packageName) {
432
432
  try {
433
433
  (0, log_1.log)('generalDebug_0003', `Finding the version of "${packageName}" in "${rootPath}".`);
434
434
  const moduleName = (0, external_1.getModulePath)(rootPath, pckg);
435
- const packageJson = yield (0, io_2.findFile)(moduleName, 'package.json');
436
- const root = (0, path_1.dirname)(packageJson);
437
- const { version } = yield (0, io_2.readJson)(root, 'package.json');
435
+ const packageJsonPath = yield (0, io_2.findFile)(moduleName, constants_1.packageJson);
436
+ const root = (0, path_1.dirname)(packageJsonPath);
437
+ const { version } = yield (0, io_2.readJson)(root, constants_1.packageJson);
438
438
  return version;
439
439
  }
440
440
  catch (_a) { }
@@ -476,12 +476,12 @@ function retrievePiletsInfo(entryFile) {
476
476
  if (!exists) {
477
477
  (0, log_1.fail)('entryPointDoesNotExist_0073', entryFile);
478
478
  }
479
- const packageJsonPath = yield (0, io_2.findFile)(entryFile, constants_2.packageJson);
479
+ const packageJsonPath = yield (0, io_2.findFile)(entryFile, constants_1.packageJson);
480
480
  if (!packageJsonPath) {
481
481
  (0, log_1.fail)('packageJsonMissing_0074');
482
482
  }
483
483
  const root = (0, path_1.dirname)(packageJsonPath);
484
- const packageInfo = yield (0, io_2.readJson)(root, constants_2.packageJson);
484
+ const packageInfo = yield (0, io_2.readJson)(root, constants_1.packageJson);
485
485
  const piralJsonPkg = yield (0, io_2.readJson)(root, constants_2.piralJson);
486
486
  const pilets = Object.assign(Object.assign({}, getPiletsInfo(packageInfo)), piralJsonPkg.pilets);
487
487
  const externals = yield retrieveExternals(root, packageInfo);
@@ -518,27 +518,20 @@ function isValidDependency(name) {
518
518
  return name.indexOf('/') === -1 || (name.indexOf('@') === 0 && name.split('/').length < 3);
519
519
  }
520
520
  exports.isValidDependency = isValidDependency;
521
- function patchPiletPackage(root, name, version, piralInfo, fromEmulator, newInfo) {
521
+ function patchPiletPackage(root, piralInfo, fromEmulator, newInfo) {
522
522
  return __awaiter(this, void 0, void 0, function* () {
523
- (0, log_1.log)('generalDebug_0003', `Patching the package.json in "${root}" ...`);
524
- const pkg = yield getPiletPackage(root, name, version, piralInfo, fromEmulator, newInfo);
525
- yield (0, io_2.updateExistingJson)(root, constants_2.packageJson, pkg);
526
- (0, log_1.log)('generalDebug_0003', `Succesfully patched the package.json.`);
527
- yield (0, io_2.updateExistingJson)(root, constants_2.piletJson, {
528
- $schema: constants_1.piletJsonSchemaUrl,
529
- piralInstances: {
530
- [name]: (newInfo === null || newInfo === void 0 ? void 0 : newInfo.details) || {},
531
- },
532
- });
533
- (0, log_1.log)('generalDebug_0003', `Succesfully patched the pilet.json.`);
523
+ (0, log_1.log)('generalDebug_0003', `Patching the ${constants_1.packageJson} in "${root}" ...`);
524
+ const pkg = yield getPiletPackage(root, piralInfo, fromEmulator, newInfo);
525
+ yield (0, io_2.updateExistingJson)(root, constants_1.packageJson, pkg);
526
+ (0, log_1.log)('generalDebug_0003', `Succesfully patched the ${constants_1.packageJson}.`);
534
527
  });
535
528
  }
536
529
  exports.patchPiletPackage = patchPiletPackage;
537
- function getPiletPackage(root, name, version, piralInfo, fromEmulator, newInfo) {
530
+ function getPiletPackage(root, piralInfo, fromEmulator, newInfo) {
538
531
  return __awaiter(this, void 0, void 0, function* () {
539
532
  const { piralCLI = { version: info_1.cliVersion } } = piralInfo;
540
533
  const _a = getPiletsInfo(piralInfo), { packageOverrides } = _a, info = __rest(_a, ["packageOverrides"]);
541
- const existingData = newInfo ? {} : yield (0, io_2.readJson)(root, constants_2.packageJson);
534
+ const existingData = newInfo ? {} : yield (0, io_2.readJson)(root, constants_1.packageJson);
542
535
  const piralDependencies = Object.assign(Object.assign({}, piralInfo.devDependencies), piralInfo.dependencies);
543
536
  const toolVersion = piralCLI.version;
544
537
  const typeDependencies = newInfo ? (0, language_1.getDevDependencies)(newInfo.language) : {};
@@ -558,9 +551,8 @@ function getPiletPackage(root, name, version, piralInfo, fromEmulator, newInfo)
558
551
  deps[name] = piralDependencies[name] || tryFindPackageVersion(name) || 'latest';
559
552
  }
560
553
  return deps;
561
- }, {})), { [name]: `${version || piralInfo.version}`, ['piral-cli']: toolVersion });
554
+ }, {})), { ['piral-cli']: toolVersion });
562
555
  const dependencies = {
563
- [name]: undefined,
564
556
  ['piral-cli']: undefined,
565
557
  };
566
558
  if (newInfo) {
@@ -569,7 +561,7 @@ function getPiletPackage(root, name, version, piralInfo, fromEmulator, newInfo)
569
561
  return (0, merge_1.deepMerge)(packageOverrides, {
570
562
  importmap: {
571
563
  imports: {},
572
- inherit: [name],
564
+ inherit: [],
573
565
  },
574
566
  devDependencies,
575
567
  dependencies,
@@ -612,11 +604,11 @@ function combinePiletExternals(appShells, peerDependencies, peerModules, importm
612
604
  exports.combinePiletExternals = combinePiletExternals;
613
605
  function findPiletRoot(proposedRoot) {
614
606
  return __awaiter(this, void 0, void 0, function* () {
615
- const packageJson = yield (0, io_2.findFile)(proposedRoot, 'package.json');
616
- if (!packageJson) {
607
+ const packageJsonPath = yield (0, io_2.findFile)(proposedRoot, constants_1.packageJson);
608
+ if (!packageJsonPath) {
617
609
  (0, log_1.fail)('packageJsonMissing_0075');
618
610
  }
619
- return (0, path_1.dirname)(packageJson);
611
+ return (0, path_1.dirname)(packageJsonPath);
620
612
  });
621
613
  }
622
614
  exports.findPiletRoot = findPiletRoot;
@@ -625,7 +617,7 @@ function retrievePiletData(target, app) {
625
617
  const piletJsonPath = yield (0, io_2.findFile)(target, constants_2.piletJson);
626
618
  const proposedRoot = piletJsonPath ? (0, path_1.dirname)(piletJsonPath) : target;
627
619
  const root = yield findPiletRoot(proposedRoot);
628
- const piletPackage = yield (0, io_2.readJson)(root, 'package.json');
620
+ const piletPackage = yield (0, io_2.readJson)(root, constants_1.packageJson);
629
621
  const piletDefinition = piletJsonPath && (yield (0, io_2.readJson)(proposedRoot, constants_2.piletJson));
630
622
  const appPackages = yield findPiralInstances(app && [app], piletPackage, piletDefinition, root);
631
623
  const apps = [];
package/lib/common/package.js.map CHANGED
@@ -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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"}
package/lib/common/shell.d.ts CHANGED
@@ -1,2 +1,2 @@
1
- import { NpmClientType, PiralInstanceDetails } from '../types';
2
- export declare function installPiralInstance(usedSource: string, baseDir: string, rootDir: string, npmClient: NpmClientType): Promise<[name: string, version: string, details: PiralInstanceDetails]>;
1
+ import { NpmClientType } from '../types';
2
+ export declare function installPiralInstance(usedSource: string, baseDir: string, rootDir: string, npmClient: NpmClientType, selected?: boolean): Promise<string>;
package/lib/common/shell.js CHANGED
@@ -11,31 +11,62 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.installPiralInstance = void 0;
13
13
  const log_1 = require("./log");
14
+ const constants_1 = require("./constants");
15
+ const io_1 = require("./io");
14
16
  const website_1 = require("./website");
15
17
  const npm_1 = require("./npm");
16
18
  const npm_2 = require("./npm");
17
- function installPiralInstance(usedSource, baseDir, rootDir, npmClient) {
19
+ function updatePiletJson(target, appName, appDetails) {
18
20
  return __awaiter(this, void 0, void 0, function* () {
19
- const [sourceName, sourceVersion, hadVersion, type] = yield (0, npm_2.dissectPackageName)(baseDir, usedSource);
20
- if (type === 'remote') {
21
- (0, log_1.progress)(`Downloading emulator from %s ...`, sourceName);
22
- const emulatorJson = yield (0, website_1.scaffoldFromEmulatorWebsite)(rootDir, sourceName);
23
- const details = {
24
- url: sourceName,
25
- };
26
- return [emulatorJson.name, emulatorJson.version, details];
27
- }
28
- else if (!(0, npm_2.isLinkedPackage)(sourceName, type, hadVersion, rootDir)) {
21
+ const oldContent = yield (0, io_1.readJson)(target, constants_1.piletJson);
22
+ const newContent = Object.assign(Object.assign({}, oldContent), { piralInstances: Object.assign(Object.assign({}, oldContent.piralInstances), { [appName]: appDetails }) });
23
+ yield (0, io_1.writeJson)(target, constants_1.piletJson, newContent, true);
24
+ yield (0, io_1.updateExistingJson)(target, constants_1.packageJson, {
25
+ importmap: {
26
+ inherit: [appName],
27
+ },
28
+ });
29
+ });
30
+ }
31
+ function setupPiralInstance(sourceName, type, hadVersion, rootDir, sourceVersion, npmClient) {
32
+ return __awaiter(this, void 0, void 0, function* () {
33
+ if (!(0, npm_2.isLinkedPackage)(sourceName, type, hadVersion, rootDir)) {
29
34
  const packageRef = (0, npm_1.combinePackageRef)(sourceName, sourceVersion, type);
30
35
  (0, log_1.progress)(`Installing npm package %s ...`, packageRef);
31
36
  yield (0, npm_2.installNpmPackage)(npmClient, packageRef, rootDir, '--save-dev', '--save-exact');
37
+ return yield (0, npm_1.getPackageName)(rootDir, sourceName, type);
32
38
  }
33
39
  else {
34
40
  (0, log_1.progress)(`Using locally available npm package %s ...`, sourceName);
41
+ const packageName = yield (0, npm_1.getPackageName)(rootDir, sourceName, type);
42
+ const packageVersion = (0, npm_1.getPackageVersion)(hadVersion, sourceName, sourceVersion, type, rootDir);
43
+ yield (0, io_1.updateExistingJson)(rootDir, constants_1.packageJson, {
44
+ devDependencies: {
45
+ [packageName]: packageVersion,
46
+ },
47
+ });
48
+ return packageName;
49
+ }
50
+ });
51
+ }
52
+ function installPiralInstance(usedSource, baseDir, rootDir, npmClient, selected) {
53
+ return __awaiter(this, void 0, void 0, function* () {
54
+ const [sourceName, sourceVersion, hadVersion, type] = yield (0, npm_2.dissectPackageName)(baseDir, usedSource);
55
+ if (type === 'remote') {
56
+ const packageName = yield (0, website_1.scaffoldFromEmulatorWebsite)(rootDir, sourceName);
57
+ yield updatePiletJson(rootDir, packageName, {
58
+ selected,
59
+ url: sourceName,
60
+ });
61
+ return packageName;
62
+ }
63
+ else {
64
+ const packageName = yield setupPiralInstance(sourceName, type, hadVersion, rootDir, sourceVersion, npmClient);
65
+ yield updatePiletJson(rootDir, packageName, {
66
+ selected,
67
+ });
68
+ return packageName;
35
69
  }
36
- const packageName = yield (0, npm_1.getPackageName)(rootDir, sourceName, type);
37
- const packageVersion = (0, npm_1.getPackageVersion)(hadVersion, sourceName, sourceVersion, type, rootDir);
38
- return [packageName, packageVersion, {}];
39
70
  });
40
71
  }
41
72
  exports.installPiralInstance = installPiralInstance;
package/lib/common/shell.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"shell.js","sourceRoot":"","sources":["../../src/common/shell.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAAiC;AACjC,uCAAwD;AACxD,+BAA6E;AAC7E,+BAA+E;AAG/E,SAAsB,oBAAoB,CACxC,UAAkB,EAClB,OAAe,EACf,OAAe,EACf,SAAwB;;QAExB,MAAM,CAAC,UAAU,EAAE,aAAa,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,MAAM,IAAA,wBAAkB,EAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAEpG,IAAI,IAAI,KAAK,QAAQ,EAAE;YACrB,IAAA,cAAQ,EAAC,kCAAkC,EAAE,UAAU,CAAC,CAAC;YACzD,MAAM,YAAY,GAAG,MAAM,IAAA,qCAA2B,EAAC,OAAO,EAAE,UAAU,CAAC,CAAC;YAC5E,MAAM,OAAO,GAAG;gBACd,GAAG,EAAE,UAAU;aAChB,CAAC;YAEF,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;SAC3D;aAAM,IAAI,CAAC,IAAA,qBAAe,EAAC,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE;YAClE,MAAM,UAAU,GAAG,IAAA,uBAAiB,EAAC,UAAU,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;YAEtE,IAAA,cAAQ,EAAC,+BAA+B,EAAE,UAAU,CAAC,CAAC;YACtD,MAAM,IAAA,uBAAiB,EAAC,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,EAAE,cAAc,CAAC,CAAC;SACvF;aAAM;YACL,IAAA,cAAQ,EAAC,4CAA4C,EAAE,UAAU,CAAC,CAAC;SACpE;QAED,MAAM,WAAW,GAAG,MAAM,IAAA,oBAAc,EAAC,OAAO,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;QACpE,MAAM,cAAc,GAAG,IAAA,uBAAiB,EAAC,UAAU,EAAE,UAAU,EAAE,aAAa,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QAC/F,OAAO,CAAC,WAAW,EAAE,cAAc,EAAE,EAAE,CAAC,CAAC;IAC3C,CAAC;CAAA;AA5BD,oDA4BC"}
1
+ {"version":3,"file":"shell.js","sourceRoot":"","sources":["../../src/common/shell.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAAiC;AACjC,2CAAqD;AACrD,6BAA+D;AAC/D,uCAAwD;AACxD,+BAA6E;AAC7E,+BAA+E;AAG/E,SAAe,eAAe,CAAC,MAAc,EAAE,OAAe,EAAE,UAAgC;;QAC9F,MAAM,UAAU,GAAG,MAAM,IAAA,aAAQ,EAAC,MAAM,EAAE,qBAAS,CAAC,CAAC;QACrD,MAAM,UAAU,mCACX,UAAU,KACb,cAAc,kCACT,UAAU,CAAC,cAAc,KAC5B,CAAC,OAAO,CAAC,EAAE,UAAU,MAExB,CAAC;QACF,MAAM,IAAA,cAAS,EAAC,MAAM,EAAE,qBAAS,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;QACrD,MAAM,IAAA,uBAAkB,EAAC,MAAM,EAAE,uBAAW,EAAE;YAC5C,SAAS,EAAE;gBACT,OAAO,EAAE,CAAC,OAAO,CAAC;aACnB;SACF,CAAC,CAAC;IACL,CAAC;CAAA;AAED,SAAe,kBAAkB,CAC/B,UAAkB,EAClB,IAAiB,EACjB,UAAmB,EACnB,OAAe,EACf,aAAqB,EACrB,SAAwB;;QAExB,IAAI,CAAC,IAAA,qBAAe,EAAC,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE;YAC3D,MAAM,UAAU,GAAG,IAAA,uBAAiB,EAAC,UAAU,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;YAEtE,IAAA,cAAQ,EAAC,+BAA+B,EAAE,UAAU,CAAC,CAAC;YACtD,MAAM,IAAA,uBAAiB,EAAC,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,EAAE,cAAc,CAAC,CAAC;YACtF,OAAO,MAAM,IAAA,oBAAc,EAAC,OAAO,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;SACxD;aAAM;YACL,IAAA,cAAQ,EAAC,4CAA4C,EAAE,UAAU,CAAC,CAAC;YACnE,MAAM,WAAW,GAAG,MAAM,IAAA,oBAAc,EAAC,OAAO,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;YACpE,MAAM,cAAc,GAAG,IAAA,uBAAiB,EAAC,UAAU,EAAE,UAAU,EAAE,aAAa,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;YAC/F,MAAM,IAAA,uBAAkB,EAAC,OAAO,EAAE,uBAAW,EAAE;gBAC7C,eAAe,EAAE;oBACf,CAAC,WAAW,CAAC,EAAE,cAAc;iBAC9B;aACF,CAAC,CAAC;YACH,OAAO,WAAW,CAAC;SACpB;IACH,CAAC;CAAA;AAED,SAAsB,oBAAoB,CACxC,UAAkB,EAClB,OAAe,EACf,OAAe,EACf,SAAwB,EACxB,QAAkB;;QAElB,MAAM,CAAC,UAAU,EAAE,aAAa,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,MAAM,IAAA,wBAAkB,EAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAEpG,IAAI,IAAI,KAAK,QAAQ,EAAE;YACrB,MAAM,WAAW,GAAG,MAAM,IAAA,qCAA2B,EAAC,OAAO,EAAE,UAAU,CAAC,CAAC;YAC3E,MAAM,eAAe,CAAC,OAAO,EAAE,WAAW,EAAE;gBAC1C,QAAQ;gBACR,GAAG,EAAE,UAAU;aAChB,CAAC,CAAC;YACH,OAAO,WAAW,CAAC;SACpB;aAAM;YACL,MAAM,WAAW,GAAG,MAAM,kBAAkB,CAAC,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC;YAC9G,MAAM,eAAe,CAAC,OAAO,EAAE,WAAW,EAAE;gBAC1C,QAAQ;aACT,CAAC,CAAC;YACH,OAAO,WAAW,CAAC;SACpB;IACH,CAAC;CAAA;AAvBD,oDAuBC"}
package/lib/common/website.d.ts CHANGED
@@ -1,2 +1 @@
1
- import { EmulatorWebsiteManifest } from '../types';
2
- export declare function scaffoldFromEmulatorWebsite(rootDir: string, manifestUrl: string): Promise<EmulatorWebsiteManifest>;
1
+ export declare function scaffoldFromEmulatorWebsite(rootDir: string, manifestUrl: string): Promise<string>;
package/lib/common/website.js CHANGED
@@ -10,19 +10,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
10
10
  };
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.scaffoldFromEmulatorWebsite = void 0;
13
- const url_1 = require("url");
14
13
  const path_1 = require("path");
15
14
  const template_1 = require("./template");
16
15
  const constants_1 = require("./constants");
17
16
  const enums_1 = require("./enums");
18
17
  const io_1 = require("./io");
19
18
  const io_2 = require("./io");
19
+ const log_1 = require("./log");
20
20
  const external_1 = require("../external");
21
21
  function downloadEmulatorFiles(manifestUrl, target, files) {
22
22
  return __awaiter(this, void 0, void 0, function* () {
23
23
  const requiredFiles = [files.typings, files.main, files.app];
24
24
  yield Promise.all(requiredFiles.map((file) => __awaiter(this, void 0, void 0, function* () {
25
- const res = yield external_1.axios.default.get((0, url_1.resolve)(manifestUrl, file), { responseType: 'arraybuffer' });
25
+ const url = new URL(file, manifestUrl);
26
+ const res = yield external_1.axios.default.get(url.href, { responseType: 'arraybuffer' });
26
27
  const data = res.data;
27
28
  yield (0, io_1.writeBinary)(target, file, data);
28
29
  })));
@@ -30,6 +31,7 @@ function downloadEmulatorFiles(manifestUrl, target, files) {
30
31
  }
31
32
  function scaffoldFromEmulatorWebsite(rootDir, manifestUrl) {
32
33
  return __awaiter(this, void 0, void 0, function* () {
34
+ (0, log_1.progress)(`Downloading emulator from %s ...`, manifestUrl);
33
35
  const response = yield external_1.axios.default.get(manifestUrl);
34
36
  const emulatorJson = response.data;
35
37
  const targetDir = (0, path_1.resolve)(rootDir, 'node_modules', emulatorJson.name);
@@ -49,7 +51,7 @@ function scaffoldFromEmulatorWebsite(rootDir, manifestUrl) {
49
51
  source: manifestUrl,
50
52
  generated: true,
51
53
  },
52
- files: emulatorJson.files,
54
+ files: emulatorJson.files.assets,
53
55
  main: `./${(0, path_1.join)(appDirName, mainFile)}`,
54
56
  typings: `./${(0, path_1.join)(appDirName, emulatorJson.files.typings)}`,
55
57
  app: `./${(0, path_1.join)(appDirName, emulatorJson.files.app)}`,
@@ -63,7 +65,7 @@ function scaffoldFromEmulatorWebsite(rootDir, manifestUrl) {
63
65
  outFile: emulatorJson.files.main,
64
66
  });
65
67
  yield downloadEmulatorFiles(manifestUrl, appDir, emulatorJson.files);
66
- return emulatorJson;
68
+ return emulatorJson.name;
67
69
  });
68
70
  }
69
71
  exports.scaffoldFromEmulatorWebsite = scaffoldFromEmulatorWebsite;
package/lib/common/website.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"website.js","sourceRoot":"","sources":["../../src/common/website.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"website.js","sourceRoot":"","sources":["../../src/common/website.ts"],"names":[],"mappings":"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"}