piral-cli 0.15.0-alpha.4029 → 0.15.0-alpha.4041
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.
- package/lib/apps/build-pilet.d.ts +4 -0
- package/lib/apps/build-pilet.js +8 -6
- package/lib/apps/build-pilet.js.map +1 -1
- package/lib/apps/debug-pilet.d.ts +5 -0
- package/lib/apps/debug-pilet.js +10 -7
- package/lib/apps/debug-pilet.js.map +1 -1
- package/lib/apps/new-pilet.js +4 -3
- package/lib/apps/new-pilet.js.map +1 -1
- package/lib/build/run-debug-mono-piral.js +4 -4
- package/lib/build/run-debug-mono-piral.js.map +1 -1
- package/lib/commands.js +8 -0
- package/lib/commands.js.map +1 -1
- package/lib/common/importmap.js +20 -1
- package/lib/common/importmap.js.map +1 -1
- package/lib/common/package.d.ts +7 -0
- package/lib/common/package.js +30 -9
- package/lib/common/package.js.map +1 -1
- package/lib/injectors/pilet.d.ts +1 -0
- package/lib/injectors/pilet.js +17 -13
- package/lib/injectors/pilet.js.map +1 -1
- package/lib/rules/pilet-has-externals-as-peers.js +1 -1
- package/lib/rules/pilet-has-externals-as-peers.js.map +1 -1
- package/lib/types/common.d.ts +3 -1
- package/lib/types/public.d.ts +1 -0
- package/package.json +2 -2
- package/src/apps/build-pilet.ts +16 -7
- package/src/apps/debug-pilet.ts +18 -5
- package/src/apps/new-pilet.ts +4 -3
- package/src/build/run-debug-mono-piral.ts +4 -2
- package/src/commands.ts +8 -0
- package/src/common/importmap.ts +25 -1
- package/src/common/package.test.ts +2 -2
- package/src/common/package.ts +31 -11
- package/src/injectors/pilet.test.ts +6 -0
- package/src/injectors/pilet.ts +20 -14
- package/src/rules/pilet-has-externals-as-peers.ts +2 -2
- package/src/types/common.ts +3 -1
- package/src/types/public.ts +1 -0
package/lib/common/package.js
CHANGED
|
@@ -20,7 +20,7 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
20
20
|
return t;
|
|
21
21
|
};
|
|
22
22
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
23
|
-
exports.retrievePiletData = exports.checkAppShellPackage = exports.patchPiletPackage = exports.isValidDependency = exports.retrievePiletsInfo = exports.findPackageVersion = exports.findDependencyVersion = exports.retrievePiralRoot = exports.getPiletsInfo = exports.copyPiralFiles = exports.copyScaffoldingFiles = exports.getFileStats = exports.getPiralPackage = exports.readPiralPackage = exports.findPackageRoot = exports.getPiralPath = void 0;
|
|
23
|
+
exports.retrievePiletData = exports.checkAppShellPackage = exports.patchPiletPackage = exports.isValidDependency = exports.retrievePiletsInfo = exports.retrieveExternals = exports.findPackageVersion = exports.findDependencyVersion = exports.retrievePiralRoot = exports.getPiletsInfo = exports.copyPiralFiles = exports.copyScaffoldingFiles = exports.getFileStats = exports.getPiralPackage = exports.readPiralPackage = exports.findPackageRoot = exports.getPiralPath = void 0;
|
|
24
24
|
const path_1 = require("path");
|
|
25
25
|
const log_1 = require("./log");
|
|
26
26
|
const info_1 = require("./info");
|
|
@@ -145,8 +145,10 @@ function findPackage(pck, baseDir) {
|
|
|
145
145
|
if (path) {
|
|
146
146
|
(0, log_1.log)('generalDebug_0003', `Following the app package in "${path}" ...`);
|
|
147
147
|
const appPackage = require(path);
|
|
148
|
+
const root = (0, path_1.dirname)(path);
|
|
148
149
|
const relPath = appPackage && appPackage.app;
|
|
149
|
-
appPackage.app = relPath && (0, path_1.resolve)(
|
|
150
|
+
appPackage.app = relPath && (0, path_1.resolve)(root, relPath);
|
|
151
|
+
appPackage.root = root;
|
|
150
152
|
return appPackage;
|
|
151
153
|
}
|
|
152
154
|
}
|
|
@@ -172,6 +174,10 @@ function getPiralPackage(app, language, version, framework, bundler) {
|
|
|
172
174
|
start: 'piral debug',
|
|
173
175
|
build: 'piral build',
|
|
174
176
|
},
|
|
177
|
+
importmap: {
|
|
178
|
+
imports: {},
|
|
179
|
+
inherit: ['piral-base', framework !== 'piral-base' && 'piral-core'].filter(Boolean),
|
|
180
|
+
},
|
|
175
181
|
pilets: getPiletsInfo({}),
|
|
176
182
|
dependencies,
|
|
177
183
|
devDependencies,
|
|
@@ -291,11 +297,11 @@ function copyPiralFiles(root, name, piralInfo, forceOverwrite, variables, origin
|
|
|
291
297
|
}
|
|
292
298
|
exports.copyPiralFiles = copyPiralFiles;
|
|
293
299
|
function getPiletsInfo(piralInfo) {
|
|
294
|
-
const { files = [],
|
|
300
|
+
const { files = [], scripts = {}, template = 'default', validators = {}, devDependencies = {}, preScaffold = '', postScaffold = '', preUpgrade = '', postUpgrade = '', packageOverrides = {}, } = piralInfo.pilets || {};
|
|
295
301
|
return {
|
|
296
302
|
files,
|
|
297
|
-
externals,
|
|
298
303
|
scripts,
|
|
304
|
+
template,
|
|
299
305
|
validators,
|
|
300
306
|
devDependencies,
|
|
301
307
|
preScaffold,
|
|
@@ -371,6 +377,19 @@ function findPackageVersion(rootPath, packageName) {
|
|
|
371
377
|
});
|
|
372
378
|
}
|
|
373
379
|
exports.findPackageVersion = findPackageVersion;
|
|
380
|
+
function retrieveExternals(root, packageInfo) {
|
|
381
|
+
var _a;
|
|
382
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
383
|
+
const sharedDependencies = yield (0, importmap_1.readImportmap)(root, packageInfo);
|
|
384
|
+
if (sharedDependencies.length === 0) {
|
|
385
|
+
const allDeps = Object.assign(Object.assign({}, packageInfo.devDependencies), packageInfo.dependencies);
|
|
386
|
+
const deps = (_a = packageInfo.pilets) === null || _a === void 0 ? void 0 : _a.externals;
|
|
387
|
+
return (0, npm_1.makeExternals)(allDeps, deps);
|
|
388
|
+
}
|
|
389
|
+
return sharedDependencies.map((m) => m.name);
|
|
390
|
+
});
|
|
391
|
+
}
|
|
392
|
+
exports.retrieveExternals = retrieveExternals;
|
|
374
393
|
function retrievePiletsInfo(entryFile) {
|
|
375
394
|
return __awaiter(this, void 0, void 0, function* () {
|
|
376
395
|
const exists = yield (0, io_2.checkExists)(entryFile);
|
|
@@ -382,14 +401,14 @@ function retrievePiletsInfo(entryFile) {
|
|
|
382
401
|
(0, log_1.fail)('packageJsonMissing_0074');
|
|
383
402
|
}
|
|
384
403
|
const packageInfo = require(packageJson);
|
|
385
|
-
const allDeps = Object.assign(Object.assign({}, packageInfo.devDependencies), packageInfo.dependencies);
|
|
386
404
|
const info = getPiletsInfo(packageInfo);
|
|
387
|
-
const
|
|
405
|
+
const root = (0, path_1.dirname)(packageJson);
|
|
406
|
+
const externals = yield retrieveExternals(root, packageInfo);
|
|
388
407
|
return Object.assign(Object.assign({}, info), { externals, name: packageInfo.name, version: packageInfo.version, dependencies: {
|
|
389
408
|
std: packageInfo.dependencies || {},
|
|
390
409
|
dev: packageInfo.devDependencies || {},
|
|
391
410
|
peer: packageInfo.peerDependencies || {},
|
|
392
|
-
}, scripts: packageInfo.scripts, ignored: checkArrayOrUndefined(packageInfo, 'preservedDependencies'), root
|
|
411
|
+
}, scripts: packageInfo.scripts, ignored: checkArrayOrUndefined(packageInfo, 'preservedDependencies'), root });
|
|
393
412
|
});
|
|
394
413
|
}
|
|
395
414
|
exports.retrievePiletsInfo = retrievePiletsInfo;
|
|
@@ -478,8 +497,9 @@ function retrievePiletData(target, app) {
|
|
|
478
497
|
const root = (0, path_1.dirname)(packageJson);
|
|
479
498
|
const piletPackage = require(packageJson);
|
|
480
499
|
const appPackage = findPackage(app || (piletPackage.piral && piletPackage.piral.name) || Object.keys(piletPackage.devDependencies), target);
|
|
481
|
-
const appFile = appPackage
|
|
482
|
-
|
|
500
|
+
const appFile = appPackage === null || appPackage === void 0 ? void 0 : appPackage.app;
|
|
501
|
+
const appRoot = appPackage === null || appPackage === void 0 ? void 0 : appPackage.root;
|
|
502
|
+
if (!appFile || !appRoot) {
|
|
483
503
|
(0, log_1.fail)('appInstanceInvalid_0011');
|
|
484
504
|
}
|
|
485
505
|
const emulator = checkAppShellPackage(appPackage);
|
|
@@ -492,6 +512,7 @@ function retrievePiletData(target, app) {
|
|
|
492
512
|
ignored: checkArrayOrUndefined(piletPackage, 'preservedDependencies'),
|
|
493
513
|
importmap,
|
|
494
514
|
appFile,
|
|
515
|
+
appRoot,
|
|
495
516
|
piletPackage,
|
|
496
517
|
appPackage,
|
|
497
518
|
emulator,
|
|
@@ -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/injectors/pilet.d.ts
CHANGED
package/lib/injectors/pilet.js
CHANGED
|
@@ -17,6 +17,7 @@ const spec_1 = require("../common/spec");
|
|
|
17
17
|
const config_1 = require("../common/config");
|
|
18
18
|
const external_1 = require("../external");
|
|
19
19
|
const { host } = config_1.config;
|
|
20
|
+
const indexPath = '/index.html';
|
|
20
21
|
function fillPiletMeta(pilet, basePath, metaFile) {
|
|
21
22
|
const { root, bundler } = pilet;
|
|
22
23
|
const metaPath = (0, path_1.join)(root, metaFile);
|
|
@@ -168,24 +169,27 @@ class PiletInjector {
|
|
|
168
169
|
return this.sendContent(content, external_1.mime.getType(target), url);
|
|
169
170
|
}
|
|
170
171
|
handle(req) {
|
|
171
|
-
const { app, api } = this.config;
|
|
172
|
-
const path = req.url.substring(1).split('?')[0];
|
|
172
|
+
const { app, api, publicUrl } = this.config;
|
|
173
173
|
if (!req.target) {
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
174
|
+
if (req.url.startsWith(publicUrl)) {
|
|
175
|
+
const path = req.url.substring(publicUrl.length).split('?')[0];
|
|
176
|
+
const target = (0, path_1.join)(app, path);
|
|
177
|
+
if ((0, fs_1.existsSync)(target) && (0, fs_1.statSync)(target).isFile()) {
|
|
178
|
+
if (req.url === indexPath) {
|
|
179
|
+
return this.sendIndexFile(target, req.url);
|
|
180
|
+
}
|
|
181
|
+
else {
|
|
182
|
+
return this.sendFile(target, req.url);
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
else if (req.url !== indexPath) {
|
|
186
|
+
return this.handle(Object.assign(Object.assign({}, req), { url: indexPath }));
|
|
178
187
|
}
|
|
179
|
-
return this.sendFile(target, req.url);
|
|
180
|
-
}
|
|
181
|
-
else if (req.url !== '/index.html') {
|
|
182
|
-
return this.handle(Object.assign(Object.assign({}, req), { url: '/index.html' }));
|
|
183
|
-
}
|
|
184
|
-
else {
|
|
185
|
-
return undefined;
|
|
186
188
|
}
|
|
189
|
+
return undefined;
|
|
187
190
|
}
|
|
188
191
|
else if (req.target === api) {
|
|
192
|
+
const path = req.url.substring(1).split('?')[0];
|
|
189
193
|
return this.sendResponse(path, req.url);
|
|
190
194
|
}
|
|
191
195
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pilet.js","sourceRoot":"","sources":["../../src/injectors/pilet.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,6BAA0B;AAC1B,+BAA4B;AAE5B,2BAAwD;AAExD,uCAAoC;AACpC,yCAAkD;AAClD,6CAA0C;AAC1C,0CAA0C;AAG1C,MAAM,EAAE,IAAI,EAAE,GAAG,eAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"pilet.js","sourceRoot":"","sources":["../../src/injectors/pilet.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,7 +26,7 @@ Received: Missing "${missingNames.join('", "')}".
|
|
|
26
26
|
function default_1(context, options = 'ignore') {
|
|
27
27
|
return __awaiter(this, void 0, void 0, function* () {
|
|
28
28
|
if (options !== 'ignore') {
|
|
29
|
-
const
|
|
29
|
+
const externals = yield (0, common_1.retrieveExternals)(context.data.appRoot, context.data.appPackage);
|
|
30
30
|
const markedPeerDependencies = Object.keys(context.peerDependencies);
|
|
31
31
|
const markedPeerModules = context.peerModules;
|
|
32
32
|
const missingExternals = externals
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pilet-has-externals-as-peers.js","sourceRoot":"","sources":["../../src/rules/pilet-has-externals-as-peers.ts"],"names":[],"mappings":";;;;;;;;;;;AACA,
|
|
1
|
+
{"version":3,"file":"pilet-has-externals-as-peers.js","sourceRoot":"","sources":["../../src/rules/pilet-has-externals-as-peers.ts"],"names":[],"mappings":"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"}
|
package/lib/types/common.d.ts
CHANGED
|
@@ -50,7 +50,8 @@ export interface TemplateFileLocation {
|
|
|
50
50
|
}
|
|
51
51
|
export interface PiletsInfo {
|
|
52
52
|
files: Array<string | TemplateFileLocation>;
|
|
53
|
-
|
|
53
|
+
template: string;
|
|
54
|
+
externals?: Array<string>;
|
|
54
55
|
devDependencies: Record<string, string | true>;
|
|
55
56
|
scripts: Record<string, string>;
|
|
56
57
|
validators: Record<string, any>;
|
|
@@ -94,6 +95,7 @@ export interface PiletRuleContext extends RuleContext {
|
|
|
94
95
|
importmap: Array<SharedDependency>;
|
|
95
96
|
}
|
|
96
97
|
export interface PiralData {
|
|
98
|
+
appRoot: string;
|
|
97
99
|
appFile: string;
|
|
98
100
|
appPackage: any;
|
|
99
101
|
piletPackage: any;
|
package/lib/types/public.d.ts
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "piral-cli",
|
|
3
|
-
"version": "0.15.0-alpha.
|
|
3
|
+
"version": "0.15.0-alpha.4041",
|
|
4
4
|
"description": "The standard CLI for creating and building a Piral instance or a Pilet.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"portal",
|
|
@@ -78,5 +78,5 @@
|
|
|
78
78
|
"typescript": "^4.0.2",
|
|
79
79
|
"yargs": "^15.4.1"
|
|
80
80
|
},
|
|
81
|
-
"gitHead": "
|
|
81
|
+
"gitHead": "3d305d88c72e3e05a44acbf240a38f6ad7b03959"
|
|
82
82
|
}
|
package/src/apps/build-pilet.ts
CHANGED
|
@@ -21,6 +21,7 @@ import {
|
|
|
21
21
|
checkAppShellPackage,
|
|
22
22
|
cpuCount,
|
|
23
23
|
concurrentWorkers,
|
|
24
|
+
normalizePublicUrl,
|
|
24
25
|
} from '../common';
|
|
25
26
|
|
|
26
27
|
interface PiletData {
|
|
@@ -31,15 +32,15 @@ interface PiletData {
|
|
|
31
32
|
outDir: string;
|
|
32
33
|
}
|
|
33
34
|
|
|
34
|
-
function createMetadata(outDir: string, outFile: string, pilets: Array<PiletData
|
|
35
|
+
function createMetadata(outDir: string, outFile: string, pilets: Array<PiletData>, publicPath: string) {
|
|
35
36
|
return writeJson(
|
|
36
37
|
outDir,
|
|
37
38
|
outFile,
|
|
38
39
|
pilets.map((p) => ({
|
|
39
40
|
name: p.package.name,
|
|
40
41
|
version: p.package.version,
|
|
41
|
-
link:
|
|
42
|
-
...getPiletSpecMeta(p.path,
|
|
42
|
+
link: `${publicPath}${p.id}/${p.outFile}`,
|
|
43
|
+
...getPiletSpecMeta(p.path, `${publicPath}${p.id}/`),
|
|
43
44
|
})),
|
|
44
45
|
);
|
|
45
46
|
}
|
|
@@ -74,6 +75,11 @@ export interface BuildPiletOptions {
|
|
|
74
75
|
*/
|
|
75
76
|
target?: string;
|
|
76
77
|
|
|
78
|
+
/**
|
|
79
|
+
* Sets the public URL (path) of the bundle. Only for release output.
|
|
80
|
+
*/
|
|
81
|
+
publicUrl?: string;
|
|
82
|
+
|
|
77
83
|
/**
|
|
78
84
|
* States if minifaction or other post-bundle transformations should be performed.
|
|
79
85
|
*/
|
|
@@ -151,6 +157,7 @@ export interface BuildPiletOptions {
|
|
|
151
157
|
export const buildPiletDefaults: BuildPiletOptions = {
|
|
152
158
|
entry: './src/index',
|
|
153
159
|
target: './dist/index.js',
|
|
160
|
+
publicUrl: '/',
|
|
154
161
|
minify: true,
|
|
155
162
|
logLevel: LogLevels.info,
|
|
156
163
|
type: 'default',
|
|
@@ -167,10 +174,11 @@ export async function buildPilet(baseDir = process.cwd(), options: BuildPiletOpt
|
|
|
167
174
|
const {
|
|
168
175
|
entry = buildPiletDefaults.entry,
|
|
169
176
|
target = buildPiletDefaults.target,
|
|
177
|
+
publicUrl: originalPublicUrl = buildPiletDefaults.publicUrl,
|
|
178
|
+
logLevel = buildPiletDefaults.logLevel,
|
|
170
179
|
minify = buildPiletDefaults.minify,
|
|
171
180
|
sourceMaps = buildPiletDefaults.sourceMaps,
|
|
172
181
|
contentHash = buildPiletDefaults.contentHash,
|
|
173
|
-
logLevel = buildPiletDefaults.logLevel,
|
|
174
182
|
fresh = buildPiletDefaults.fresh,
|
|
175
183
|
concurrency = buildPiletDefaults.concurrency,
|
|
176
184
|
optimizeModules = buildPiletDefaults.optimizeModules,
|
|
@@ -182,6 +190,7 @@ export async function buildPilet(baseDir = process.cwd(), options: BuildPiletOpt
|
|
|
182
190
|
bundlerName,
|
|
183
191
|
app,
|
|
184
192
|
} = options;
|
|
193
|
+
const publicUrl = normalizePublicUrl(originalPublicUrl);
|
|
185
194
|
const fullBase = resolve(process.cwd(), baseDir);
|
|
186
195
|
const entryList = Array.isArray(entry) ? entry : [entry];
|
|
187
196
|
setLogLevel(logLevel);
|
|
@@ -279,7 +288,7 @@ export async function buildPilet(baseDir = process.cwd(), options: BuildPiletOpt
|
|
|
279
288
|
|
|
280
289
|
await copyPilets(outDir, pilets);
|
|
281
290
|
|
|
282
|
-
await createMetadata(outDir, '$pilet-api', pilets);
|
|
291
|
+
await createMetadata(outDir, '$pilet-api', pilets, publicUrl);
|
|
283
292
|
|
|
284
293
|
if (isEmulator) {
|
|
285
294
|
// in case of an emulator assets are not "seen" by the bundler, so we
|
|
@@ -300,7 +309,7 @@ export async function buildPilet(baseDir = process.cwd(), options: BuildPiletOpt
|
|
|
300
309
|
contentHash,
|
|
301
310
|
minify,
|
|
302
311
|
externals: [],
|
|
303
|
-
publicUrl
|
|
312
|
+
publicUrl,
|
|
304
313
|
outFile: 'index.html',
|
|
305
314
|
outDir,
|
|
306
315
|
entryFiles: appFile,
|
|
@@ -322,7 +331,7 @@ export async function buildPilet(baseDir = process.cwd(), options: BuildPiletOpt
|
|
|
322
331
|
|
|
323
332
|
await copyPilets(outDir, pilets);
|
|
324
333
|
|
|
325
|
-
await createMetadata(outDir, manifest, pilets);
|
|
334
|
+
await createMetadata(outDir, manifest, pilets, publicUrl);
|
|
326
335
|
|
|
327
336
|
logDone(`Manifest available at "${outDir}/${manifest}"!`);
|
|
328
337
|
}
|
package/src/apps/debug-pilet.ts
CHANGED
|
@@ -18,6 +18,7 @@ import {
|
|
|
18
18
|
logDone,
|
|
19
19
|
cpuCount,
|
|
20
20
|
concurrentWorkers,
|
|
21
|
+
normalizePublicUrl,
|
|
21
22
|
} from '../common';
|
|
22
23
|
|
|
23
24
|
export interface DebugPiletOptions {
|
|
@@ -59,6 +60,12 @@ export interface DebugPiletOptions {
|
|
|
59
60
|
*/
|
|
60
61
|
port?: number;
|
|
61
62
|
|
|
63
|
+
/**
|
|
64
|
+
* Sets the publicUrl to use.
|
|
65
|
+
* By default, the server is assumed to be at root "/".
|
|
66
|
+
*/
|
|
67
|
+
publicUrl?: string;
|
|
68
|
+
|
|
62
69
|
/**
|
|
63
70
|
* Sets the maximum number of parallel build processes.
|
|
64
71
|
*/
|
|
@@ -116,6 +123,7 @@ export const debugPiletDefaults: DebugPiletOptions = {
|
|
|
116
123
|
entry: './src/index',
|
|
117
124
|
open: config.openBrowser,
|
|
118
125
|
port: config.port,
|
|
126
|
+
publicUrl: '/',
|
|
119
127
|
hmr: true,
|
|
120
128
|
optimizeModules: false,
|
|
121
129
|
schemaVersion: config.schemaVersion,
|
|
@@ -127,17 +135,19 @@ const injectorName = resolve(__dirname, '../injectors/pilet.js');
|
|
|
127
135
|
interface AppInfo {
|
|
128
136
|
emulator: boolean;
|
|
129
137
|
appFile: string;
|
|
138
|
+
publicUrl: string;
|
|
130
139
|
appVersion: string;
|
|
131
140
|
externals: Array<string>;
|
|
132
141
|
piral: string;
|
|
133
142
|
}
|
|
134
143
|
|
|
135
|
-
async function getOrMakeAppDir({ emulator, piral, appFile }: AppInfo, logLevel: LogLevels) {
|
|
144
|
+
async function getOrMakeAppDir({ emulator, piral, appFile, publicUrl }: AppInfo, logLevel: LogLevels) {
|
|
136
145
|
if (!emulator) {
|
|
137
146
|
const { externals, root, ignored } = await retrievePiletsInfo(appFile);
|
|
138
147
|
const { dir } = await callDebugPiralFromMonoRepo({
|
|
139
148
|
root,
|
|
140
149
|
optimizeModules: false,
|
|
150
|
+
publicUrl,
|
|
141
151
|
ignored,
|
|
142
152
|
externals,
|
|
143
153
|
piral,
|
|
@@ -175,6 +185,7 @@ export async function debugPilet(baseDir = process.cwd(), options: DebugPiletOpt
|
|
|
175
185
|
port = debugPiletDefaults.port,
|
|
176
186
|
open = debugPiletDefaults.open,
|
|
177
187
|
hmr = debugPiletDefaults.hmr,
|
|
188
|
+
publicUrl: originalPublicUrl = debugPiletDefaults.publicUrl,
|
|
178
189
|
logLevel = debugPiletDefaults.logLevel,
|
|
179
190
|
concurrency = debugPiletDefaults.concurrency,
|
|
180
191
|
optimizeModules = debugPiletDefaults.optimizeModules,
|
|
@@ -186,13 +197,14 @@ export async function debugPilet(baseDir = process.cwd(), options: DebugPiletOpt
|
|
|
186
197
|
appInstanceDir,
|
|
187
198
|
feed,
|
|
188
199
|
} = options;
|
|
200
|
+
const publicUrl = normalizePublicUrl(originalPublicUrl);
|
|
189
201
|
const fullBase = resolve(process.cwd(), baseDir);
|
|
190
202
|
setLogLevel(logLevel);
|
|
191
203
|
|
|
192
204
|
await hooks.onBegin?.({ options, fullBase });
|
|
193
205
|
progress('Reading configuration ...');
|
|
194
206
|
const krasConfig = readKrasConfig({ port }, krasrc);
|
|
195
|
-
const api = config.piletApi
|
|
207
|
+
const api = `${publicUrl}${config.piletApi.replace(/^\/+/, '')}`;
|
|
196
208
|
const entryList = Array.isArray(entry) ? entry : [entry];
|
|
197
209
|
const multi = entryList.length > 1 || entryList[0].indexOf('*') !== -1;
|
|
198
210
|
log('generalDebug_0003', `Looking for (${multi ? 'multi' : 'single'}) "${entryList.join('", "')}" in "${fullBase}".`);
|
|
@@ -232,7 +244,7 @@ export async function debugPilet(baseDir = process.cwd(), options: DebugPiletOpt
|
|
|
232
244
|
krasConfig.sources.push(mocks);
|
|
233
245
|
}
|
|
234
246
|
|
|
235
|
-
await hooks.beforeBuild?.({ root, importmap, entryModule, schemaVersion });
|
|
247
|
+
await hooks.beforeBuild?.({ root, publicUrl, importmap, entryModule, schemaVersion });
|
|
236
248
|
|
|
237
249
|
const bundler = await callPiletDebug(
|
|
238
250
|
{
|
|
@@ -255,12 +267,13 @@ export async function debugPilet(baseDir = process.cwd(), options: DebugPiletOpt
|
|
|
255
267
|
);
|
|
256
268
|
|
|
257
269
|
bundler.on((args) => {
|
|
258
|
-
hooks.afterBuild?.({ ...args, root, importmap, entryModule, schemaVersion, bundler, outFile, outDir });
|
|
270
|
+
hooks.afterBuild?.({ ...args, root, publicUrl, importmap, entryModule, schemaVersion, bundler, outFile, outDir });
|
|
259
271
|
});
|
|
260
272
|
|
|
261
273
|
return {
|
|
262
274
|
emulator,
|
|
263
275
|
appFile,
|
|
276
|
+
publicUrl,
|
|
264
277
|
appVersion: appPackage.version,
|
|
265
278
|
externals,
|
|
266
279
|
piral: appPackage.name,
|
|
@@ -294,7 +307,6 @@ export async function debugPilet(baseDir = process.cwd(), options: DebugPiletOpt
|
|
|
294
307
|
krasConfig.injectors = defaultConfig.injectors;
|
|
295
308
|
}
|
|
296
309
|
|
|
297
|
-
const publicUrl = '/';
|
|
298
310
|
const { pilet: piletInjector, ...otherInjectors } = krasConfig.injectors;
|
|
299
311
|
const injectorConfig = {
|
|
300
312
|
meta: 'debug-meta.json',
|
|
@@ -303,6 +315,7 @@ export async function debugPilet(baseDir = process.cwd(), options: DebugPiletOpt
|
|
|
303
315
|
active: true,
|
|
304
316
|
pilets,
|
|
305
317
|
app: appDir,
|
|
318
|
+
publicUrl,
|
|
306
319
|
handle: ['/', api],
|
|
307
320
|
api,
|
|
308
321
|
};
|
package/src/apps/new-pilet.ts
CHANGED
|
@@ -101,7 +101,7 @@ export const newPiletDefaults: NewPiletOptions = {
|
|
|
101
101
|
forceOverwrite: ForceOverwrite.no,
|
|
102
102
|
language: config.language,
|
|
103
103
|
install: true,
|
|
104
|
-
template:
|
|
104
|
+
template: undefined,
|
|
105
105
|
logLevel: LogLevels.info,
|
|
106
106
|
npmClient: config.npmClient,
|
|
107
107
|
bundlerName: 'none',
|
|
@@ -184,7 +184,7 @@ always-auth=true`,
|
|
|
184
184
|
|
|
185
185
|
const isEmulator = checkAppShellPackage(piralInfo);
|
|
186
186
|
|
|
187
|
-
const { preScaffold, postScaffold, files } = getPiletsInfo(piralInfo);
|
|
187
|
+
const { preScaffold, postScaffold, files, template: preSelectedTemplate } = getPiletsInfo(piralInfo);
|
|
188
188
|
|
|
189
189
|
if (preScaffold) {
|
|
190
190
|
progress(`Running preScaffold script ...`);
|
|
@@ -195,7 +195,8 @@ always-auth=true`,
|
|
|
195
195
|
progress(`Taking care of templating ...`);
|
|
196
196
|
|
|
197
197
|
const data = getPiletScaffoldData(language, root, packageName, variables);
|
|
198
|
-
|
|
198
|
+
const chosenTemplate = template || preSelectedTemplate || 'default';
|
|
199
|
+
await scaffoldPiletSourceFiles(chosenTemplate, registry, data, forceOverwrite);
|
|
199
200
|
|
|
200
201
|
if (isEmulator) {
|
|
201
202
|
// in the emulator case we get the files (and files_once) from the contained tarballs
|
|
@@ -11,6 +11,7 @@ function run(
|
|
|
11
11
|
piral: string,
|
|
12
12
|
hmr: boolean,
|
|
13
13
|
externals: Array<string>,
|
|
14
|
+
publicUrl: string,
|
|
14
15
|
entryFiles: string,
|
|
15
16
|
logLevel: LogLevels,
|
|
16
17
|
args: any,
|
|
@@ -20,7 +21,7 @@ function run(
|
|
|
20
21
|
setStandardEnvs({
|
|
21
22
|
piral,
|
|
22
23
|
dependencies: externals,
|
|
23
|
-
publicPath:
|
|
24
|
+
publicPath: publicUrl,
|
|
24
25
|
production: false,
|
|
25
26
|
debugPiral: true,
|
|
26
27
|
debugPilet: true,
|
|
@@ -37,7 +38,7 @@ function run(
|
|
|
37
38
|
sourceMaps: true,
|
|
38
39
|
contentHash: false,
|
|
39
40
|
minify: false,
|
|
40
|
-
publicUrl
|
|
41
|
+
publicUrl,
|
|
41
42
|
hmr,
|
|
42
43
|
logLevel,
|
|
43
44
|
watch: true,
|
|
@@ -61,6 +62,7 @@ process.on('message', async (msg) => {
|
|
|
61
62
|
msg.piral,
|
|
62
63
|
true,
|
|
63
64
|
msg.externals,
|
|
65
|
+
msg.publicUrl,
|
|
64
66
|
msg.entryFiles,
|
|
65
67
|
msg.logLevel,
|
|
66
68
|
msg,
|