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
@@ -1,13 +1,8 @@
1
1
  /// <reference types="node" />
2
2
  /// <reference types="node" />
3
3
  import { EventEmitter } from 'events';
4
- import { KrasInjector, KrasResponse, KrasRequest, KrasInjectorConfig, KrasConfiguration, KrasResult } from 'kras';
4
+ import { KrasInjector, KrasRequest, KrasInjectorConfig, KrasConfiguration, KrasResult } from 'kras';
5
5
  import { Bundler } from '../types';
6
- interface Pilet {
7
- bundler: Bundler;
8
- root: string;
9
- getMeta(basePath: string): PiletMetadata;
10
- }
11
6
  export interface PiletInjectorConfig extends KrasInjectorConfig {
12
7
  /**
13
8
  * The pilets to serve.
@@ -46,6 +41,11 @@ export interface PiletInjectorConfig extends KrasInjectorConfig {
46
41
  */
47
42
  headers?: Record<string, string>;
48
43
  }
44
+ interface Pilet {
45
+ bundler: Bundler;
46
+ root: string;
47
+ getMeta(basePath: string): PiletMetadata;
48
+ }
49
49
  interface PiletMetadata {
50
50
  name?: string;
51
51
  config?: Record<string, any>;
@@ -55,6 +55,7 @@ export default class PiletInjector implements KrasInjector {
55
55
  config: PiletInjectorConfig;
56
56
  private serverConfig;
57
57
  private indexPath;
58
+ private proxyInfo?;
58
59
  constructor(config: PiletInjectorConfig, serverConfig: KrasConfiguration, core: EventEmitter);
59
60
  get active(): boolean;
60
61
  set active(value: boolean);
@@ -66,10 +67,11 @@ export default class PiletInjector implements KrasInjector {
66
67
  getIndexMeta(baseUrl: string): Promise<string>;
67
68
  loadRemoteFeed(feed?: string | Array<string>): Promise<Array<Array<PiletMetadata>>>;
68
69
  mergePilets(localPilets: Array<PiletMetadata>, remoteFeeds: Array<Array<PiletMetadata>>): PiletMetadata[];
69
- sendContent(content: Buffer | string, type: string, url: string): KrasResponse;
70
- sendFile(target: string, url: string): KrasResponse;
70
+ sendContent(content: Buffer | string, type: string, url: string): KrasResult;
71
+ sendFile(target: string, url: string): Promise<KrasResult>;
71
72
  sendResponse(path: string, url: string, baseUrl: string): Promise<KrasResult>;
72
- sendIndexFile(target: string, url: string, baseUrl: string): KrasResponse;
73
- handle(req: KrasRequest): KrasResponse;
73
+ sendIndexFile(target: string, url: string, baseUrl: string): Promise<KrasResult>;
74
+ private shouldLoad;
75
+ handle(req: KrasRequest): Promise<KrasResult>;
74
76
  }
75
77
  export {};
@@ -11,32 +11,39 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
12
  const url_1 = require("url");
13
13
  const path_1 = require("path");
14
- const fs_1 = require("fs");
14
+ const promises_1 = require("fs/promises");
15
15
  const log_1 = require("../common/log");
16
16
  const spec_1 = require("../common/spec");
17
17
  const config_1 = require("../common/config");
18
18
  const external_1 = require("../external");
19
19
  function getMetaOverride(root, metaFile) {
20
- if (metaFile) {
21
- const metaPath = (0, path_1.join)(root, metaFile);
22
- if ((0, fs_1.existsSync)(metaPath)) {
23
- return external_1.jju.parse((0, fs_1.readFileSync)(metaPath, 'utf8'));
20
+ return __awaiter(this, void 0, void 0, function* () {
21
+ if (metaFile) {
22
+ const metaPath = (0, path_1.join)(root, metaFile);
23
+ const exists = yield (0, promises_1.stat)(metaPath).then(() => true, () => false);
24
+ if (exists) {
25
+ const metaContent = yield (0, promises_1.readFile)(metaPath, 'utf8');
26
+ return external_1.jju.parse(metaContent);
27
+ }
24
28
  }
25
- }
26
- return undefined;
29
+ return undefined;
30
+ });
27
31
  }
28
32
  function fillPiletMeta(pilet, metaFile, subPath) {
29
- const { root, bundler } = pilet;
30
- const packagePath = (0, path_1.join)(root, 'package.json');
31
- const def = external_1.jju.parse((0, fs_1.readFileSync)(packagePath, 'utf8'));
32
- const file = bundler.bundle.name.replace(/^[\/\\]/, '');
33
- const target = (0, path_1.join)(bundler.bundle.dir, file);
34
- const metaOverride = getMetaOverride(root, metaFile);
35
- pilet.getMeta = (parentPath) => {
36
- const basePath = `${parentPath}${subPath}`;
37
- const url = new url_1.URL(file, basePath);
38
- return Object.assign(Object.assign(Object.assign({ custom: def.custom, config: def.piletConfig }, metaOverride), { name: def.name, version: def.version, link: `${url.href}?updated=${Date.now()}` }), (0, spec_1.getPiletSpecMeta)(target, basePath));
39
- };
33
+ return __awaiter(this, void 0, void 0, function* () {
34
+ const { root, bundler } = pilet;
35
+ const packagePath = (0, path_1.join)(root, 'package.json');
36
+ const jsonContent = yield (0, promises_1.readFile)(packagePath, 'utf8');
37
+ const def = external_1.jju.parse(jsonContent);
38
+ const file = bundler.bundle.name.replace(/^[\/\\]/, '');
39
+ const target = (0, path_1.join)(bundler.bundle.dir, file);
40
+ const metaOverride = yield getMetaOverride(root, metaFile);
41
+ pilet.getMeta = (parentPath) => {
42
+ const basePath = `${parentPath}${subPath}`;
43
+ const url = new url_1.URL(file, basePath);
44
+ return Object.assign(Object.assign(Object.assign({ custom: def.custom, config: def.piletConfig }, metaOverride), { name: def.name, version: def.version, link: `${url.href}?updated=${Date.now()}` }), (0, spec_1.getPiletSpecMeta)(target, basePath));
45
+ };
46
+ });
40
47
  }
41
48
  function loadFeed(feed) {
42
49
  var _a;
@@ -63,9 +70,19 @@ class PiletInjector {
63
70
  this.config = config;
64
71
  this.serverConfig = serverConfig;
65
72
  if (this.config.active) {
66
- const { pilets, api, publicUrl, assetUrl } = config;
73
+ const { pilets, api, app, publicUrl, assetUrl } = config;
67
74
  this.indexPath = `${publicUrl}index.html`;
68
75
  const cbs = {};
76
+ if (app.endsWith('/app')) {
77
+ const packageJson = require(`${app}/../package.json`);
78
+ if (typeof packageJson.piralCLI.source === 'string') {
79
+ this.proxyInfo = {
80
+ source: packageJson.piralCLI.source,
81
+ files: packageJson.files,
82
+ date: new Date(packageJson.piralCLI.timestamp),
83
+ };
84
+ }
85
+ }
69
86
  core.on('user-connected', (e) => {
70
87
  const baseUrl = assetUrl || e.req.headers.origin;
71
88
  if (e.target === '*' && e.url === api.substring(1)) {
@@ -78,14 +95,14 @@ class PiletInjector {
78
95
  core.on('user-disconnected', (e) => {
79
96
  delete cbs[e.id];
80
97
  });
81
- pilets.forEach((p, i) => p.bundler.on(() => {
82
- fillPiletMeta(p, config.meta, `/${i}/`);
98
+ pilets.forEach((p, i) => p.bundler.on(() => __awaiter(this, void 0, void 0, function* () {
99
+ yield fillPiletMeta(p, config.meta, `/${i}/`);
83
100
  for (const id of Object.keys(cbs)) {
84
101
  const { baseUrl, notify } = cbs[id];
85
102
  const meta = this.getPiletMeta(baseUrl, p);
86
103
  notify(meta);
87
104
  }
88
- }));
105
+ })));
89
106
  }
90
107
  }
91
108
  get active() {
@@ -181,9 +198,11 @@ class PiletInjector {
181
198
  }
182
199
  sendFile(target, url) {
183
200
  var _a;
184
- const content = (0, fs_1.readFileSync)(target);
185
- const type = (_a = external_1.mime.getType(target)) !== null && _a !== void 0 ? _a : 'application/octet-stream';
186
- return this.sendContent(content, type, url);
201
+ return __awaiter(this, void 0, void 0, function* () {
202
+ const content = yield (0, promises_1.readFile)(target);
203
+ const type = (_a = external_1.mime.getType(target)) !== null && _a !== void 0 ? _a : 'application/octet-stream';
204
+ return this.sendContent(content, type, url);
205
+ });
187
206
  }
188
207
  sendResponse(path, url, baseUrl) {
189
208
  return __awaiter(this, void 0, void 0, function* () {
@@ -191,55 +210,79 @@ class PiletInjector {
191
210
  const [index, ...rest] = path.split('/');
192
211
  const pilet = pilets[+index];
193
212
  const bundler = pilet === null || pilet === void 0 ? void 0 : pilet.bundler;
213
+ yield (bundler === null || bundler === void 0 ? void 0 : bundler.ready());
194
214
  if (!path) {
195
- yield (bundler === null || bundler === void 0 ? void 0 : bundler.ready());
196
215
  const content = yield this.getIndexMeta(baseUrl);
197
216
  return this.sendContent(content, 'application/json', url);
198
217
  }
199
- else {
200
- return bundler === null || bundler === void 0 ? void 0 : bundler.ready().then(() => {
201
- const target = (0, path_1.join)(bundler.bundle.dir, rest.join('/'));
202
- if ((0, fs_1.existsSync)(target) && (0, fs_1.statSync)(target).isFile()) {
203
- return this.sendFile(target, url);
204
- }
205
- });
218
+ else if (bundler === null || bundler === void 0 ? void 0 : bundler.bundle) {
219
+ const target = (0, path_1.join)(bundler.bundle.dir, rest.join('/'));
220
+ const info = yield (0, promises_1.stat)(target).catch(() => undefined);
221
+ if (info && info.isFile()) {
222
+ return yield this.sendFile(target, url);
223
+ }
206
224
  }
225
+ return undefined;
207
226
  });
208
227
  }
209
228
  sendIndexFile(target, url, baseUrl) {
210
- const indexHtml = (0, fs_1.readFileSync)(target, 'utf8');
211
- // mechanism to inject server side debug piletApi config into piral emulator
212
- const windowInjectionScript = `window['dbg:pilet-api'] = '${this.getPiletApi(baseUrl)}';`;
213
- const findStr = `<script`;
214
- const replaceStr = `<script>/* Pilet Debugging Emulator Config Injection */${windowInjectionScript}</script><script`;
215
- const content = indexHtml.replace(`${findStr}`, `${replaceStr}`);
216
- return this.sendContent(content, external_1.mime.getType(target), url);
229
+ return __awaiter(this, void 0, void 0, function* () {
230
+ const indexHtml = yield (0, promises_1.readFile)(target, 'utf8');
231
+ // mechanism to inject server side debug piletApi config into piral emulator
232
+ const windowInjectionScript = `window['dbg:pilet-api'] = '${this.getPiletApi(baseUrl)}';`;
233
+ const findStr = `<script`;
234
+ const replaceStr = `<script>/* Pilet Debugging Emulator Config Injection */${windowInjectionScript}</script><script`;
235
+ const content = indexHtml.replace(`${findStr}`, `${replaceStr}`);
236
+ return this.sendContent(content, external_1.mime.getType(target), url);
237
+ });
238
+ }
239
+ shouldLoad(target, path) {
240
+ return __awaiter(this, void 0, void 0, function* () {
241
+ if (this.proxyInfo) {
242
+ if (!this.proxyInfo.files.includes(path)) {
243
+ return false;
244
+ }
245
+ const fileInfo = yield (0, promises_1.stat)(target).catch(() => undefined);
246
+ if (!fileInfo || fileInfo.mtime < this.proxyInfo.date) {
247
+ const url = new url_1.URL(path, this.proxyInfo.source);
248
+ const response = yield external_1.axios.default.get(url.href, { responseType: 'arraybuffer' });
249
+ yield (0, promises_1.writeFile)(target, response.data);
250
+ }
251
+ return true;
252
+ }
253
+ else {
254
+ const fileInfo = yield (0, promises_1.stat)(target).catch(() => undefined);
255
+ return fileInfo && fileInfo.isFile();
256
+ }
257
+ });
217
258
  }
218
259
  handle(req) {
219
- const { app, api, publicUrl, assetUrl } = this.config;
220
- const baseUrl = assetUrl || (req.headers.host ? `${req.encrypted ? 'https' : 'http'}://${req.headers.host}` : undefined);
221
- if (!req.target) {
222
- if (req.url.startsWith(publicUrl)) {
223
- const path = req.url.substring(publicUrl.length).split('?')[0];
224
- if (app) {
225
- const target = (0, path_1.join)(app, path);
226
- if ((0, fs_1.existsSync)(target) && (0, fs_1.statSync)(target).isFile()) {
227
- if (req.url === this.indexPath) {
228
- return this.sendIndexFile(target, req.url, baseUrl);
260
+ return __awaiter(this, void 0, void 0, function* () {
261
+ const { app, api, publicUrl, assetUrl } = this.config;
262
+ const baseUrl = assetUrl || (req.headers.host ? `${req.encrypted ? 'https' : 'http'}://${req.headers.host}` : undefined);
263
+ if (!req.target) {
264
+ if (req.url.startsWith(publicUrl)) {
265
+ const path = req.url.substring(publicUrl.length).split('?').shift();
266
+ if (app) {
267
+ const target = (0, path_1.join)(app, path);
268
+ if (yield this.shouldLoad(target, path)) {
269
+ if (req.url === this.indexPath) {
270
+ return yield this.sendIndexFile(target, req.url, baseUrl);
271
+ }
272
+ return yield this.sendFile(target, req.url);
229
273
  }
230
- return this.sendFile(target, req.url);
274
+ }
275
+ if (req.url !== this.indexPath) {
276
+ return yield this.handle(Object.assign(Object.assign({}, req), { url: this.indexPath }));
231
277
  }
232
278
  }
233
- if (req.url !== this.indexPath) {
234
- return this.handle(Object.assign(Object.assign({}, req), { url: this.indexPath }));
235
- }
279
+ return undefined;
236
280
  }
237
- return undefined;
238
- }
239
- else if (req.target === api) {
240
- const path = req.url.substring(1).split('?')[0];
241
- return this.sendResponse(path, req.url, baseUrl);
242
- }
281
+ else if (req.target === api) {
282
+ const path = req.url.substring(1).split('?').shift();
283
+ return yield this.sendResponse(path, req.url, baseUrl);
284
+ }
285
+ });
243
286
  }
244
287
  }
245
288
  exports.default = PiletInjector;
@@ -1 +1 @@
1
- {"version":3,"file":"pilet-injector.js","sourceRoot":"","sources":["../../src/injectors/pilet-injector.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"pilet-injector.js","sourceRoot":"","sources":["../../src/injectors/pilet-injector.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,7 @@
1
1
  /// <reference types="node" />
2
2
  /// <reference types="node" />
3
3
  import { EventEmitter } from 'events';
4
- import { KrasInjector, KrasResponse, KrasRequest, KrasInjectorConfig, KrasConfiguration } from 'kras';
4
+ import { KrasInjector, KrasRequest, KrasInjectorConfig, KrasConfiguration, KrasResult } from 'kras';
5
5
  import { Bundler } from '../types';
6
6
  export interface PiralInjectorConfig extends KrasInjectorConfig {
7
7
  bundler: Bundler;
@@ -17,8 +17,8 @@ export default class PiralInjector implements KrasInjector {
17
17
  get name(): string;
18
18
  getOptions(): {};
19
19
  setOptions(): void;
20
- sendContent(content: Buffer | string, type: string, url: string): KrasResponse;
21
- sendIndexFile(target: string, url: string): KrasResponse;
22
- sendResponse(path: string, target: string, dir: string, url: string, recursionDepth?: number): KrasResponse;
23
- handle(req: KrasRequest): KrasResponse;
20
+ sendContent(content: Buffer | string, type: string, url: string): KrasResult;
21
+ sendIndexFile(target: string, url: string): Promise<KrasResult>;
22
+ sendResponse(path: string, target: string, dir: string, url: string, recursionDepth?: number): Promise<KrasResult>;
23
+ handle(req: KrasRequest): Promise<KrasResult>;
24
24
  }
@@ -1,12 +1,32 @@
1
1
  "use strict";
2
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
+ return new (P || (P = Promise))(function (resolve, reject) {
5
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
9
+ });
10
+ };
2
11
  Object.defineProperty(exports, "__esModule", { value: true });
3
12
  const path_1 = require("path");
4
- const fs_1 = require("fs");
13
+ const promises_1 = require("fs/promises");
5
14
  const external_1 = require("../external");
6
15
  /**
7
16
  * The maximum amount of retries when sending a response
8
17
  */
9
18
  const maxRetrySendResponse = 4;
19
+ function isNoFile(target) {
20
+ return __awaiter(this, void 0, void 0, function* () {
21
+ try {
22
+ const info = yield (0, promises_1.stat)(target);
23
+ return !info.isFile();
24
+ }
25
+ catch (_a) {
26
+ return true;
27
+ }
28
+ });
29
+ }
10
30
  class PiralInjector {
11
31
  constructor(options, _config, core) {
12
32
  this.config = options;
@@ -52,45 +72,55 @@ class PiralInjector {
52
72
  };
53
73
  }
54
74
  sendIndexFile(target, url) {
55
- const indexHtml = (0, fs_1.readFileSync)(target, 'utf8');
56
- const { feed } = this.config;
57
- if (feed) {
58
- // mechanism to inject server side debug piletApi config into piral emulator
59
- const windowInjectionScript = `window['dbg:pilet-api'] = '${feed}';`;
60
- const findStr = `<script`;
61
- const replaceStr = `<script>/* Pilet Debugging Emulator Config Injection */${windowInjectionScript}</script><script`;
62
- const content = indexHtml.replace(`${findStr}`, `${replaceStr}`);
63
- return this.sendContent(content, external_1.mime.getType(target), url);
64
- }
65
- return this.sendContent(indexHtml, external_1.mime.getType(target), url);
75
+ return __awaiter(this, void 0, void 0, function* () {
76
+ const indexHtml = yield (0, promises_1.readFile)(target, 'utf8');
77
+ const { feed } = this.config;
78
+ if (feed) {
79
+ // mechanism to inject server side debug piletApi config into piral emulator
80
+ const windowInjectionScript = `window['dbg:pilet-api'] = '${feed}';`;
81
+ const findStr = `<script`;
82
+ const replaceStr = `<script>/* Pilet Debugging Emulator Config Injection */${windowInjectionScript}</script><script`;
83
+ const content = indexHtml.replace(`${findStr}`, `${replaceStr}`);
84
+ return this.sendContent(content, external_1.mime.getType(target), url);
85
+ }
86
+ return this.sendContent(indexHtml, external_1.mime.getType(target), url);
87
+ });
66
88
  }
67
89
  sendResponse(path, target, dir, url, recursionDepth = 0) {
68
90
  var _a;
69
- if (recursionDepth > maxRetrySendResponse) {
70
- return undefined;
71
- }
72
- const { bundler } = this.config;
73
- const newTarget = (0, path_1.join)(bundler.bundle.dir, bundler.bundle.name);
74
- if (!path || !(0, fs_1.existsSync)(target) || !(0, fs_1.statSync)(target).isFile()) {
75
- return this.sendResponse(bundler.bundle.name, newTarget, dir, url, recursionDepth + 1);
76
- }
77
- else if (target === newTarget) {
78
- return this.sendIndexFile(target, url);
79
- }
80
- const type = (_a = external_1.mime.getType(target)) !== null && _a !== void 0 ? _a : 'application/octet-stream';
81
- return this.sendContent((0, fs_1.readFileSync)(target), type, url);
91
+ return __awaiter(this, void 0, void 0, function* () {
92
+ if (recursionDepth > maxRetrySendResponse) {
93
+ return undefined;
94
+ }
95
+ const { bundler } = this.config;
96
+ const newTarget = (0, path_1.join)(bundler.bundle.dir, bundler.bundle.name);
97
+ if (!path || (yield isNoFile(target))) {
98
+ return yield this.sendResponse(bundler.bundle.name, newTarget, dir, url, recursionDepth + 1);
99
+ }
100
+ else if (target === newTarget) {
101
+ return yield this.sendIndexFile(target, url);
102
+ }
103
+ else {
104
+ const type = (_a = external_1.mime.getType(target)) !== null && _a !== void 0 ? _a : 'application/octet-stream';
105
+ const content = yield (0, promises_1.readFile)(target);
106
+ return this.sendContent(content, type, url);
107
+ }
108
+ });
82
109
  }
83
110
  handle(req) {
84
- if (!req.target) {
85
- const { bundler, publicUrl } = this.config;
86
- if (req.url.startsWith(publicUrl) || `${req.url}/` === publicUrl) {
87
- const pathLength = publicUrl.length || 1;
88
- const path = req.url.substring(pathLength);
89
- const dir = bundler.bundle.dir;
90
- const target = (0, path_1.join)(dir, path.split('?')[0]);
91
- return bundler.ready().then(() => this.sendResponse(path, target, dir, req.url));
111
+ return __awaiter(this, void 0, void 0, function* () {
112
+ if (!req.target) {
113
+ const { bundler, publicUrl } = this.config;
114
+ if (req.url.startsWith(publicUrl) || `${req.url}/` === publicUrl) {
115
+ const pathLength = publicUrl.length || 1;
116
+ const path = req.url.substring(pathLength);
117
+ const dir = bundler.bundle.dir;
118
+ const target = (0, path_1.join)(dir, path.split('?').shift());
119
+ yield bundler.ready();
120
+ return yield this.sendResponse(path, target, dir, req.url);
121
+ }
92
122
  }
93
- }
123
+ });
94
124
  }
95
125
  }
96
126
  exports.default = PiralInjector;
@@ -1 +1 @@
1
- {"version":3,"file":"piral-injector.js","sourceRoot":"","sources":["../../src/injectors/piral-injector.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"piral-injector.js","sourceRoot":"","sources":["../../src/injectors/piral-injector.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "piral-cli",
3
- "version": "1.4.0-beta.6247",
3
+ "version": "1.4.0-beta.6250",
4
4
  "description": "The standard CLI for creating and building a Piral instance or a Pilet.",
5
5
  "keywords": [
6
6
  "portal",
@@ -81,5 +81,5 @@
81
81
  "typescript": "^5.0.0",
82
82
  "yargs": "^15.0.0"
83
83
  },
84
- "gitHead": "31188a71482165dea7606cfafd7f9b77ce919331"
84
+ "gitHead": "7c95a8922d0cfb80e02b32bcded0256825e00c09"
85
85
  }
@@ -73,27 +73,12 @@ export async function addPiralInstancePilet(baseDir = process.cwd(), options: Ad
73
73
  if (piletJsonPath) {
74
74
  const piletJsonDir = dirname(piletJsonPath);
75
75
  const root = await findPiletRoot(piletJsonDir);
76
- const oldContent = await readJson(piletJsonDir, piletJson);
77
- const [appName, _, appDetails] = await installPiralInstance(app, fullBase, root, npmClient);
78
-
79
- const newContent = {
80
- ...oldContent,
81
- piralInstances: {
82
- ...oldContent.piralInstances,
83
- [appName]: {
84
- ...appDetails,
85
- selected,
86
- },
87
- },
88
- };
89
-
90
- await writeJson(piletJsonDir, piletJson, newContent, true);
76
+ await installPiralInstance(app, fullBase, root, npmClient, selected);
91
77
  } else {
92
78
  log('piletJsonNotAvailable_0180', targetDir);
93
79
  }
94
80
  });
95
81
 
96
82
  await Promise.all(tasks);
97
-
98
83
  logDone(`Added the Piral instance!`);
99
84
  }
@@ -178,22 +178,17 @@ always-auth=true`,
178
178
  JSON.stringify(
179
179
  {
180
180
  schemaVersion: defaultSchemaVersion,
181
+ piralInstances: {},
181
182
  },
182
183
  undefined,
183
184
  2,
184
185
  ),
185
186
  );
186
187
 
187
- const [packageName, packageVersion, packageDetails] = await installPiralInstance(
188
- source || `empty-piral@${cliVersion}`,
189
- fullBase,
190
- root,
191
- npmClient,
192
- );
188
+ const sourceName = source || `empty-piral@${cliVersion}`;
189
+ const packageName = await installPiralInstance(sourceName, fullBase, root, npmClient, true);
193
190
  const piralInfo = await readPiralPackage(root, packageName);
194
-
195
191
  const isEmulator = checkAppShellPackage(piralInfo);
196
-
197
192
  const { preScaffold, postScaffold, files, template: preSelectedTemplate } = getPiletsInfo(piralInfo);
198
193
 
199
194
  if (preScaffold) {
@@ -206,10 +201,9 @@ always-auth=true`,
206
201
 
207
202
  const data = getPiletScaffoldData(language, root, packageName, variables);
208
203
 
209
- await patchPiletPackage(root, packageName, packageVersion, piralInfo, isEmulator, {
204
+ await patchPiletPackage(root, piralInfo, isEmulator, {
210
205
  language,
211
206
  bundler: bundlerName,
212
- details: packageDetails,
213
207
  });
214
208
 
215
209
  const chosenTemplate = template || preSelectedTemplate || 'default';
@@ -116,7 +116,7 @@ always-auth=true`,
116
116
  }
117
117
 
118
118
  const npmClient = await determineNpmClient(appRoot, defaultNpmClient);
119
- const [packageName] = await installPiralInstance(app, fullBase, appRoot, npmClient);
119
+ const packageName = await installPiralInstance(app, fullBase, appRoot, npmClient);
120
120
  const piral = await findPiralInstance(packageName, appRoot, {
121
121
  port: originalPort,
122
122
  });
@@ -107,6 +107,7 @@ export async function upgradePilet(baseDir = process.cwd(), options: UpgradePile
107
107
  }
108
108
 
109
109
  for (const { appPackage } of apps) {
110
+ //TODO distinguish if it's a website / remote emulator or an npm package
110
111
  const sourceName = appPackage.name;
111
112
  const language = /\.jsx?$/.test(source) ? 'js' : 'ts';
112
113
 
@@ -121,7 +122,7 @@ export async function upgradePilet(baseDir = process.cwd(), options: UpgradePile
121
122
  }
122
123
 
123
124
  const monorepoRef = await isMonorepoPackageRef(sourceName, fullBase);
124
- const [packageRef, packageVersion] = await getCurrentPackageDetails(
125
+ const [packageRef] = await getCurrentPackageDetails(
125
126
  fullBase,
126
127
  sourceName,
127
128
  currentVersion,
@@ -162,7 +163,7 @@ export async function upgradePilet(baseDir = process.cwd(), options: UpgradePile
162
163
  await copyScaffoldingFiles(packageRoot, root, notOnceFiles, piralInfo, data);
163
164
  }
164
165
 
165
- await patchPiletPackage(root, sourceName, packageVersion, piralInfo, isEmulator);
166
+ await patchPiletPackage(root, piralInfo, isEmulator);
166
167
 
167
168
  if (install) {
168
169
  progress(`Updating dependencies ...`);