piral-cli 0.15.0-alpha.3589 → 0.15.0-alpha.3592
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/debug-pilet.js +16 -11
- package/lib/apps/debug-pilet.js.map +1 -1
- package/lib/apps/debug-piral.js +15 -7
- package/lib/apps/debug-piral.js.map +1 -1
- package/lib/common/spec.js +1 -0
- package/lib/common/spec.js.map +1 -1
- package/lib/injectors/pilet.d.ts +1 -0
- package/lib/injectors/pilet.js +7 -4
- package/lib/injectors/pilet.js.map +1 -1
- package/package.json +2 -2
- package/src/apps/debug-pilet.ts +6 -2
- package/src/apps/debug-piral.ts +3 -1
- package/src/common/spec.ts +1 -0
- package/src/injectors/pilet.ts +10 -4
package/lib/apps/debug-pilet.js
CHANGED
|
@@ -8,6 +8,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
|
+
var __rest = (this && this.__rest) || function (s, e) {
|
|
12
|
+
var t = {};
|
|
13
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
14
|
+
t[p] = s[p];
|
|
15
|
+
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
16
|
+
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
|
|
17
|
+
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
|
|
18
|
+
t[p[i]] = s[p[i]];
|
|
19
|
+
}
|
|
20
|
+
return t;
|
|
21
|
+
};
|
|
11
22
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
23
|
exports.debugPilet = exports.debugPiletDefaults = void 0;
|
|
13
24
|
const path_1 = require("path");
|
|
@@ -88,7 +99,7 @@ function debugPilet(baseDir = process.cwd(), options = {}) {
|
|
|
88
99
|
process.stdout.setMaxListeners(maxListeners);
|
|
89
100
|
process.stdin.setMaxListeners(maxListeners);
|
|
90
101
|
const pilets = yield Promise.all(allEntries.map((entryModule) => __awaiter(this, void 0, void 0, function* () {
|
|
91
|
-
var
|
|
102
|
+
var _h;
|
|
92
103
|
const targetDir = (0, path_1.dirname)(entryModule);
|
|
93
104
|
const { peerDependencies, peerModules, root, appPackage, appFile, ignored, emulator, importmap } = yield (0, common_1.retrievePiletData)(targetDir, app);
|
|
94
105
|
const externals = [...Object.keys(peerDependencies), ...peerModules];
|
|
@@ -100,7 +111,7 @@ function debugPilet(baseDir = process.cwd(), options = {}) {
|
|
|
100
111
|
}
|
|
101
112
|
krasConfig.sources.push(mocks);
|
|
102
113
|
}
|
|
103
|
-
yield ((
|
|
114
|
+
yield ((_h = hooks.beforeBuild) === null || _h === void 0 ? void 0 : _h.call(hooks, { root, importmap, entryModule, schemaVersion }));
|
|
104
115
|
const bundler = yield (0, bundler_1.callPiletDebug)({
|
|
105
116
|
root,
|
|
106
117
|
piral: appPackage.name,
|
|
@@ -147,17 +158,11 @@ function debugPilet(baseDir = process.cwd(), options = {}) {
|
|
|
147
158
|
krasConfig.injectors = kras_1.defaultConfig.injectors;
|
|
148
159
|
}
|
|
149
160
|
const publicUrl = '/';
|
|
150
|
-
const
|
|
151
|
-
|
|
152
|
-
pilets,
|
|
153
|
-
app: appDir,
|
|
154
|
-
handle: ['/', api],
|
|
155
|
-
api,
|
|
156
|
-
feed,
|
|
157
|
-
};
|
|
161
|
+
const _g = krasConfig.injectors, { pilet: piletInjector } = _g, otherInjectors = __rest(_g, ["pilet"]);
|
|
162
|
+
const injectorConfig = Object.assign(Object.assign({ meta: 'debug-meta.json', feed }, piletInjector), { active: true, pilets, app: appDir, handle: ['/', api], api });
|
|
158
163
|
krasConfig.map['/'] = '';
|
|
159
164
|
krasConfig.map[api] = '';
|
|
160
|
-
krasConfig.injectors = (0, common_1.reorderInjectors)(injectorName, injectorConfig,
|
|
165
|
+
krasConfig.injectors = (0, common_1.reorderInjectors)(injectorName, injectorConfig, otherInjectors);
|
|
161
166
|
(0, common_1.log)('generalVerbose_0004', `Using kras with configuration: ${JSON.stringify(krasConfig, undefined, 2)}`);
|
|
162
167
|
const krasServer = (0, kras_1.buildKrasWithCli)(krasConfig);
|
|
163
168
|
krasServer.setMaxListeners(maxListeners);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-pilet.js","sourceRoot":"","sources":["../../src/apps/debug-pilet.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"debug-pilet.js","sourceRoot":"","sources":["../../src/apps/debug-pilet.ts"],"names":[],"mappings":"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"}
|
package/lib/apps/debug-piral.js
CHANGED
|
@@ -8,6 +8,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
|
+
var __rest = (this && this.__rest) || function (s, e) {
|
|
12
|
+
var t = {};
|
|
13
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
14
|
+
t[p] = s[p];
|
|
15
|
+
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
16
|
+
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
|
|
17
|
+
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
|
|
18
|
+
t[p[i]] = s[p[i]];
|
|
19
|
+
}
|
|
20
|
+
return t;
|
|
21
|
+
};
|
|
11
22
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
23
|
exports.debugPiral = exports.debugPiralDefaults = void 0;
|
|
13
24
|
const path_1 = require("path");
|
|
@@ -70,14 +81,11 @@ function debugPiral(baseDir = process.cwd(), options = {}) {
|
|
|
70
81
|
var _a;
|
|
71
82
|
(_a = hooks.afterBuild) === null || _a === void 0 ? void 0 : _a.call(hooks, Object.assign(Object.assign({}, args), { root, publicUrl, externals, entryFiles, name, bundler }));
|
|
72
83
|
});
|
|
73
|
-
const
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
publicUrl,
|
|
77
|
-
bundler,
|
|
78
|
-
};
|
|
84
|
+
const _f = krasConfig.injectors, { piral: piralInjector } = _f, otherInjectors = __rest(_f, ["piral"]);
|
|
85
|
+
const injectorConfig = Object.assign(Object.assign({}, piralInjector), { active: true, handle: ['/'], publicUrl,
|
|
86
|
+
bundler });
|
|
79
87
|
krasConfig.map['/'] = '';
|
|
80
|
-
krasConfig.injectors = (0, common_1.reorderInjectors)(injectorName, injectorConfig,
|
|
88
|
+
krasConfig.injectors = (0, common_1.reorderInjectors)(injectorName, injectorConfig, otherInjectors);
|
|
81
89
|
(0, common_1.log)('generalVerbose_0004', `Using kras with configuration: ${JSON.stringify(krasConfig, undefined, 2)}`);
|
|
82
90
|
const krasServer = (0, kras_1.buildKrasWithCli)(krasConfig);
|
|
83
91
|
krasServer.removeAllListeners('open');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-piral.js","sourceRoot":"","sources":["../../src/apps/debug-piral.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"debug-piral.js","sourceRoot":"","sources":["../../src/apps/debug-piral.ts"],"names":[],"mappings":"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"}
|
package/lib/common/spec.js
CHANGED
package/lib/common/spec.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spec.js","sourceRoot":"","sources":["../../src/common/spec.ts"],"names":[],"mappings":";;;AAAA,2BAAwD;AACxD,iCAAuD;AAEvD,MAAM,OAAO,GAAG,iDAAiD,CAAC;AAClE,MAAM,OAAO,GAAG,8DAA8D,CAAC;AAE/E,SAAS,eAAe,CAAC,IAAY,EAAE,QAAgB;IACrD,IAAI;QACF,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAEhC,IAAI,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;YACxC,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE;gBACjD,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;gBAE/B,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;oBAC9B,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;oBACtC,GAAG,CAAC,OAAO,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC;iBACzB;gBAED,OAAO,GAAG,CAAC;YACb,CAAC,EAAE,EAAE,CAAC,CAAC;SACR;KACF;IAAC,WAAM,GAAE;IAEV,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAgB,gBAAgB,CAAC,MAAc,EAAE,QAAgB;IAC/D,IAAI,IAAA,eAAU,EAAC,MAAM,CAAC,IAAI,IAAA,aAAQ,EAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE;QACnD,MAAM,OAAO,GAAG,IAAA,iBAAY,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAE7C,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YACzB,8CAA8C;YAC9C,MAAM,CAAC,EAAE,UAAU,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC7C,OAAO;gBACL,IAAI,EAAE,IAAI;gBACV,UAAU;gBACV,SAAS,EAAE,IAAA,uBAAgB,EAAC,OAAO,CAAC;aACrC,CAAC;SACH;aAAM,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YAChC,qEAAqE;YACrE,MAAM,CAAC,EAAE,UAAU,EAAE,iBAAiB,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAChE,OAAO;gBACL,IAAI,EAAE,IAAI;gBACV,UAAU;gBACV,YAAY,EAAE,eAAe,CAAC,iBAAiB,EAAE,QAAQ,CAAC;aAC3D,CAAC;SACH;aAAM;YACL,OAAO;gBACL,IAAI,EAAE,IAAI;gBACV,IAAI,EAAE,IAAA,kBAAW,EAAC,OAAO,CAAC;gBAC1B,OAAO,EAAE,IAAI;aACd,CAAC;SACH;KACF;IAED,OAAO,EAAE,CAAC;AACZ,CAAC;
|
|
1
|
+
{"version":3,"file":"spec.js","sourceRoot":"","sources":["../../src/common/spec.ts"],"names":[],"mappings":";;;AAAA,2BAAwD;AACxD,iCAAuD;AAEvD,MAAM,OAAO,GAAG,iDAAiD,CAAC;AAClE,MAAM,OAAO,GAAG,8DAA8D,CAAC;AAE/E,SAAS,eAAe,CAAC,IAAY,EAAE,QAAgB;IACrD,IAAI;QACF,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAEhC,IAAI,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;YACxC,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE;gBACjD,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;gBAE/B,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;oBAC9B,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;oBACtC,GAAG,CAAC,OAAO,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC;iBACzB;gBAED,OAAO,GAAG,CAAC;YACb,CAAC,EAAE,EAAE,CAAC,CAAC;SACR;KACF;IAAC,WAAM,GAAE;IAEV,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAgB,gBAAgB,CAAC,MAAc,EAAE,QAAgB;IAC/D,IAAI,IAAA,eAAU,EAAC,MAAM,CAAC,IAAI,IAAA,aAAQ,EAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE;QACnD,MAAM,OAAO,GAAG,IAAA,iBAAY,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAE7C,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YACzB,8CAA8C;YAC9C,MAAM,CAAC,EAAE,UAAU,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC7C,OAAO;gBACL,IAAI,EAAE,IAAI;gBACV,UAAU;gBACV,SAAS,EAAE,IAAA,uBAAgB,EAAC,OAAO,CAAC;aACrC,CAAC;SACH;aAAM,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YAChC,qEAAqE;YACrE,MAAM,CAAC,EAAE,UAAU,EAAE,iBAAiB,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAChE,OAAO;gBACL,IAAI,EAAE,IAAI;gBACV,UAAU;gBACV,YAAY,EAAE,eAAe,CAAC,iBAAiB,EAAE,QAAQ,CAAC;aAC3D,CAAC;SACH;aAAM;YACL,oBAAoB;YACpB,OAAO;gBACL,IAAI,EAAE,IAAI;gBACV,IAAI,EAAE,IAAA,kBAAW,EAAC,OAAO,CAAC;gBAC1B,OAAO,EAAE,IAAI;aACd,CAAC;SACH;KACF;IAED,OAAO,EAAE,CAAC;AACZ,CAAC;AA/BD,4CA+BC"}
|
package/lib/injectors/pilet.d.ts
CHANGED
package/lib/injectors/pilet.js
CHANGED
|
@@ -17,13 +17,16 @@ 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
|
-
function fillPiletMeta(pilet, basePath) {
|
|
20
|
+
function fillPiletMeta(pilet, basePath, metaFile) {
|
|
21
21
|
const { root, bundler } = pilet;
|
|
22
|
-
const
|
|
22
|
+
const metaPath = (0, path_1.join)(root, metaFile);
|
|
23
|
+
const packagePath = (0, path_1.join)(root, 'package.json');
|
|
24
|
+
const def = JSON.parse((0, fs_1.readFileSync)(packagePath, 'utf8'));
|
|
25
|
+
const metaOverride = (0, fs_1.existsSync)(metaPath) ? JSON.parse((0, fs_1.readFileSync)(metaPath, 'utf8')) : undefined;
|
|
23
26
|
const file = bundler.bundle.name.replace(/^[\/\\]/, '');
|
|
24
27
|
const target = (0, path_1.join)(bundler.bundle.dir, file);
|
|
25
28
|
const url = new url_1.URL(file, basePath);
|
|
26
|
-
const meta = Object.assign({ name: def.name, version: def.version, link: `${url.href}?updated=${Date.now()}
|
|
29
|
+
const meta = 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));
|
|
27
30
|
pilet.meta = meta;
|
|
28
31
|
return JSON.stringify(meta);
|
|
29
32
|
}
|
|
@@ -66,7 +69,7 @@ class PiletInjector {
|
|
|
66
69
|
});
|
|
67
70
|
pilets.forEach((p, i) => p.bundler.on(() => {
|
|
68
71
|
const basePath = `${this.piletApi}/${i}/`;
|
|
69
|
-
const meta = fillPiletMeta(p, basePath);
|
|
72
|
+
const meta = fillPiletMeta(p, basePath, options.meta);
|
|
70
73
|
for (const id of Object.keys(cbs)) {
|
|
71
74
|
cbs[id](meta);
|
|
72
75
|
}
|
|
@@ -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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"}
|
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.3592",
|
|
4
4
|
"description": "The standard CLI for creating and building a Piral instance or a Pilet.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"portal",
|
|
@@ -77,5 +77,5 @@
|
|
|
77
77
|
"typescript": "^4.0.2",
|
|
78
78
|
"yargs": "^15.4.1"
|
|
79
79
|
},
|
|
80
|
-
"gitHead": "
|
|
80
|
+
"gitHead": "5537ccd39d275afdc53845ab8cb4868a8dbc8903"
|
|
81
81
|
}
|
package/src/apps/debug-pilet.ts
CHANGED
|
@@ -272,18 +272,22 @@ export async function debugPilet(baseDir = process.cwd(), options: DebugPiletOpt
|
|
|
272
272
|
}
|
|
273
273
|
|
|
274
274
|
const publicUrl = '/';
|
|
275
|
+
const { pilet: piletInjector, ...otherInjectors } = krasConfig.injectors;
|
|
275
276
|
const injectorConfig = {
|
|
277
|
+
meta: 'debug-meta.json',
|
|
278
|
+
feed,
|
|
279
|
+
...piletInjector,
|
|
276
280
|
active: true,
|
|
277
281
|
pilets,
|
|
278
282
|
app: appDir,
|
|
279
283
|
handle: ['/', api],
|
|
280
284
|
api,
|
|
281
|
-
feed,
|
|
282
285
|
};
|
|
283
286
|
|
|
284
287
|
krasConfig.map['/'] = '';
|
|
285
288
|
krasConfig.map[api] = '';
|
|
286
|
-
|
|
289
|
+
|
|
290
|
+
krasConfig.injectors = reorderInjectors(injectorName, injectorConfig, otherInjectors);
|
|
287
291
|
|
|
288
292
|
log('generalVerbose_0004', `Using kras with configuration: ${JSON.stringify(krasConfig, undefined, 2)}`);
|
|
289
293
|
|
package/src/apps/debug-piral.ts
CHANGED
|
@@ -155,7 +155,9 @@ export async function debugPiral(baseDir = process.cwd(), options: DebugPiralOpt
|
|
|
155
155
|
hooks.afterBuild?.({ ...args, root, publicUrl, externals, entryFiles, name, bundler });
|
|
156
156
|
});
|
|
157
157
|
|
|
158
|
+
const { piral: piralInjector, ...otherInjectors } = krasConfig.injectors;
|
|
158
159
|
const injectorConfig = {
|
|
160
|
+
...piralInjector,
|
|
159
161
|
active: true,
|
|
160
162
|
handle: ['/'],
|
|
161
163
|
publicUrl,
|
|
@@ -163,7 +165,7 @@ export async function debugPiral(baseDir = process.cwd(), options: DebugPiralOpt
|
|
|
163
165
|
};
|
|
164
166
|
|
|
165
167
|
krasConfig.map['/'] = '';
|
|
166
|
-
krasConfig.injectors = reorderInjectors(injectorName, injectorConfig,
|
|
168
|
+
krasConfig.injectors = reorderInjectors(injectorName, injectorConfig, otherInjectors);
|
|
167
169
|
|
|
168
170
|
log('generalVerbose_0004', `Using kras with configuration: ${JSON.stringify(krasConfig, undefined, 2)}`);
|
|
169
171
|
|
package/src/common/spec.ts
CHANGED
package/src/injectors/pilet.ts
CHANGED
|
@@ -19,6 +19,7 @@ interface Pilet {
|
|
|
19
19
|
|
|
20
20
|
export interface PiletInjectorConfig extends KrasInjectorConfig {
|
|
21
21
|
pilets: Array<Pilet>;
|
|
22
|
+
meta: string;
|
|
22
23
|
api: string;
|
|
23
24
|
app: string;
|
|
24
25
|
feed?: string;
|
|
@@ -29,17 +30,22 @@ interface PiletMetadata {
|
|
|
29
30
|
[key: string]: unknown;
|
|
30
31
|
}
|
|
31
32
|
|
|
32
|
-
function fillPiletMeta(pilet: Pilet, basePath: string) {
|
|
33
|
+
function fillPiletMeta(pilet: Pilet, basePath: string, metaFile: string) {
|
|
33
34
|
const { root, bundler } = pilet;
|
|
34
|
-
const
|
|
35
|
+
const metaPath = join(root, metaFile);
|
|
36
|
+
const packagePath = join(root, 'package.json');
|
|
37
|
+
const def = JSON.parse(readFileSync(packagePath, 'utf8'));
|
|
38
|
+
const metaOverride = existsSync(metaPath) ? JSON.parse(readFileSync(metaPath, 'utf8')) : undefined;
|
|
35
39
|
const file = bundler.bundle.name.replace(/^[\/\\]/, '');
|
|
36
40
|
const target = join(bundler.bundle.dir, file);
|
|
37
41
|
const url = new URL(file, basePath);
|
|
38
42
|
const meta = {
|
|
43
|
+
custom: def.custom,
|
|
44
|
+
config: def.piletConfig,
|
|
45
|
+
...metaOverride,
|
|
39
46
|
name: def.name,
|
|
40
47
|
version: def.version,
|
|
41
48
|
link: `${url.href}?updated=${Date.now()}`,
|
|
42
|
-
custom: def.custom,
|
|
43
49
|
...getPiletSpecMeta(target, basePath),
|
|
44
50
|
};
|
|
45
51
|
|
|
@@ -92,7 +98,7 @@ export default class PiletInjector implements KrasInjector {
|
|
|
92
98
|
pilets.forEach((p, i) =>
|
|
93
99
|
p.bundler.on(() => {
|
|
94
100
|
const basePath = `${this.piletApi}/${i}/`;
|
|
95
|
-
const meta = fillPiletMeta(p, basePath);
|
|
101
|
+
const meta = fillPiletMeta(p, basePath, options.meta);
|
|
96
102
|
|
|
97
103
|
for (const id of Object.keys(cbs)) {
|
|
98
104
|
cbs[id](meta);
|