piral-cli 1.8.4 → 1.8.5-beta.7993
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/declaration-pilet.d.ts +1 -1
- package/lib/apps/declaration-pilet.js +3 -3
- package/lib/apps/declaration-pilet.js.map +1 -1
- package/lib/common/declaration.d.ts +1 -1
- package/lib/common/declaration.js +2 -2
- package/lib/common/declaration.js.map +1 -1
- package/lib/common/pilet.js +3 -3
- package/lib/common/pilet.js.map +1 -1
- package/package.json +3 -3
- package/src/apps/declaration-pilet.ts +3 -14
- package/src/common/declaration.ts +1 -2
- package/src/common/pilet.ts +2 -3
|
@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.declarationPiletDefaults = void 0;
|
|
4
4
|
exports.declarationPilet = declarationPilet;
|
|
5
5
|
const path_1 = require("path");
|
|
6
|
-
const common_1 = require("../common");
|
|
7
6
|
const types_1 = require("../types");
|
|
7
|
+
const common_1 = require("../common");
|
|
8
8
|
exports.declarationPiletDefaults = {
|
|
9
9
|
entry: './',
|
|
10
10
|
target: './dist',
|
|
@@ -23,11 +23,11 @@ async function declarationPilet(baseDir = process.cwd(), options = {}) {
|
|
|
23
23
|
const results = [];
|
|
24
24
|
for (const item of allEntries) {
|
|
25
25
|
const targetDir = (0, path_1.dirname)(item);
|
|
26
|
-
const { peerDependencies, peerModules, root, apps,
|
|
26
|
+
const { peerDependencies, peerModules, root, apps, importmap } = await (0, common_1.retrievePiletData)(targetDir);
|
|
27
27
|
const piralInstances = apps.map((m) => m.appPackage.name);
|
|
28
28
|
const externals = (0, common_1.combinePiletExternals)(piralInstances, peerDependencies, peerModules, importmap);
|
|
29
29
|
const dest = (0, path_1.resolve)(root, target);
|
|
30
|
-
results.push(await (0, common_1.createPiletDeclaration)(
|
|
30
|
+
results.push(await (0, common_1.createPiletDeclaration)(piralInstances, root, item, externals, dest, forceOverwrite, logLevel));
|
|
31
31
|
}
|
|
32
32
|
if (results.every(Boolean)) {
|
|
33
33
|
(0, common_1.logDone)(`Declaration created successfully in "${target}"!`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"declaration-pilet.js","sourceRoot":"","sources":["../../src/apps/declaration-pilet.ts"],"names":[],"mappings":";;;AA2CA,
|
|
1
|
+
{"version":3,"file":"declaration-pilet.js","sourceRoot":"","sources":["../../src/apps/declaration-pilet.ts"],"names":[],"mappings":";;;AA2CA,4CA+BC;AA1ED,+BAAwC;AACxC,oCAAqC;AACrC,sCASmB;AAyBN,QAAA,wBAAwB,GAA4B;IAC/D,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,QAAQ;IAChB,cAAc,EAAE,uBAAc,CAAC,GAAG;IAClC,QAAQ,EAAE,iBAAS,CAAC,IAAI;CACzB,CAAC;AAEK,KAAK,UAAU,gBAAgB,CAAC,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,EAAE,UAAmC,EAAE;IACnG,MAAM,EACJ,KAAK,GAAG,gCAAwB,CAAC,KAAK,EACtC,MAAM,GAAG,gCAAwB,CAAC,MAAM,EACxC,cAAc,GAAG,gCAAwB,CAAC,cAAc,EACxD,QAAQ,GAAG,gCAAwB,CAAC,QAAQ,GAC7C,GAAG,OAAO,CAAC;IAEZ,IAAA,eAAM,EAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IACrC,IAAA,eAAM,EAAC,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;IACjC,IAAA,eAAM,EAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IAEnC,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IACzD,MAAM,QAAQ,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC;IACjD,IAAA,oBAAW,EAAC,QAAQ,CAAC,CAAC;IAEtB,MAAM,UAAU,GAAG,MAAM,IAAA,sBAAa,EAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IAC5D,MAAM,OAAO,GAAmB,EAAE,CAAC;IAEnC,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;QAC9B,MAAM,SAAS,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC;QAChC,MAAM,EAAE,gBAAgB,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,MAAM,IAAA,0BAAiB,EAAC,SAAS,CAAC,CAAC;QACpG,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAC1D,MAAM,SAAS,GAAG,IAAA,8BAAqB,EAAC,cAAc,EAAE,gBAAgB,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;QAClG,MAAM,IAAI,GAAG,IAAA,cAAO,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACnC,OAAO,CAAC,IAAI,CAAC,MAAM,IAAA,+BAAsB,EAAC,cAAc,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,cAAc,EAAE,QAAQ,CAAC,CAAC,CAAC;IACpH,CAAC;IAED,IAAI,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;QAC3B,IAAA,gBAAO,EAAC,wCAAwC,MAAM,IAAI,CAAC,CAAC;IAC9D,CAAC;AACH,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { ForceOverwrite } from './enums';
|
|
2
2
|
import { LogLevels } from '../types';
|
|
3
|
-
export declare function createPiletDeclaration(
|
|
3
|
+
export declare function createPiletDeclaration(piralInstances: Array<string>, root: string, entry: string, allowedImports: Array<string>, target: string, forceOverwrite: ForceOverwrite, logLevel: LogLevels): Promise<boolean>;
|
|
4
4
|
export declare function createPiralDeclaration(baseDir: string, entry: string, target: string, forceOverwrite: ForceOverwrite, logLevel: LogLevels): Promise<boolean>;
|
|
@@ -124,7 +124,7 @@ async function createDeclarationFile(options, target, forceOverwrite) {
|
|
|
124
124
|
(0, log_1.progress)('Writing declaration file ...');
|
|
125
125
|
await (0, io_1.createFileIfNotExists)(target, 'index.d.ts', result, forceOverwrite);
|
|
126
126
|
}
|
|
127
|
-
async function createPiletDeclaration(
|
|
127
|
+
async function createPiletDeclaration(piralInstances, root, entry, allowedImports, target, forceOverwrite, logLevel) {
|
|
128
128
|
const piralInstance = piralInstances[0];
|
|
129
129
|
const apis = await findPiralInstanceApi(root, piralInstance);
|
|
130
130
|
const file = apis.map((m) => m.file)[0];
|
|
@@ -139,7 +139,7 @@ async function createPiletDeclaration(name, piralInstances, root, entry, allowed
|
|
|
139
139
|
plugins: [(0, dets_1.createDiffPlugin)(file)],
|
|
140
140
|
apis,
|
|
141
141
|
noModuleDeclaration: true,
|
|
142
|
-
imports: allowedImports,
|
|
142
|
+
imports: allowedImports.filter((m) => m !== piralInstance),
|
|
143
143
|
logLevel,
|
|
144
144
|
logger: createLogger(),
|
|
145
145
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"declaration.js","sourceRoot":"","sources":["../../src/common/declaration.ts"],"names":[],"mappings":";;AAiJA,
|
|
1
|
+
{"version":3,"file":"declaration.js","sourceRoot":"","sources":["../../src/common/declaration.ts"],"names":[],"mappings":";;AAiJA,wDAsCC;AAED,wDAsCC;AA/ND,+BAAkF;AAClF,+BAAiE;AACjE,+BAAoE;AAEpE,uCAAgH;AAChH,2CAAgF;AAChF,6BAA4F;AAC5F,0CAA4C;AAG5C,MAAM,YAAY,GAAG,UAAU,CAAC;AAEhC,SAAS,iBAAiB,CAAC,IAAY,EAAE,SAAiB;IACxD,MAAM,SAAS,GAAG,GAAG,SAAS,eAAe,CAAC;IAE9C,IAAI,SAAS,KAAK,yBAAa,EAAE,CAAC;QAChC,IAAI,CAAC;YACH,MAAM,eAAe,GAAG,IAAA,wBAAa,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;YACvD,OAAO,IAAA,cAAO,EAAC,eAAe,CAAC,CAAC;QAClC,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;IACZ,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,KAAK,UAAU,oBAAoB,CAAC,IAAY,EAAE,aAAqB;IACrE,IAAI,aAAa,EAAE,CAAC;QAClB,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,aAAa,IAAI,uBAAW,EAAE,EAAE;YAC9D,KAAK,EAAE,CAAC,IAAA,WAAI,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;SACpC,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC;QAC9B,MAAM,IAAI,GAAG,MAAM,IAAA,aAAQ,EAAC,OAAO,EAAE,uBAAW,CAAC,CAAC;QAClD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC;QAE3C,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO;gBACL;oBACE,IAAI,EAAE,IAAA,cAAO,EAAC,OAAO,EAAE,OAAO,CAAC;oBAC/B,IAAI,EAAE,YAAY;iBACnB;aACF,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAY,EAAE,SAAiB;IACvD,iEAAiE;IACjE,4DAA4D;IAC5D,MAAM,QAAQ,GAAG,iBAAiB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAEpD,IAAI,CAAC;QACH,MAAM,eAAe,GAAG,IAAA,wBAAa,EAAC,QAAQ,EAAE,yBAAa,CAAC,CAAC;QAC/D,MAAM,UAAU,GAAG,IAAA,cAAO,EAAC,eAAe,CAAC,CAAC;QAC5C,MAAM,OAAO,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;QACzC,2CAA2C;QAC3C,MAAM,EAAE,eAAe,GAAG,gBAAgB,EAAE,GAAG,OAAO,CAAC;QAEvD,OAAO;YACL;gBACE,IAAI,EAAE,IAAA,cAAO,EAAC,UAAU,EAAE,eAAe,CAAC;gBAC1C,IAAI,EAAE,YAAY;aACnB;SACF,CAAC;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAA,SAAG,EAAC,mBAAmB,EAAE,qDAAqD,IAAI,MAAM,GAAG,EAAE,CAAC,CAAC;QAC/F,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,SAAS,QAAQ,CAAC,CAAM;IACtB,OAAO,OAAO,CAAC,KAAK,QAAQ,CAAC;AAC/B,CAAC;AAED,SAAS,mBAAmB,CAAC,IAAY,EAAE,SAAwB,EAAE;IACnE,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,cAAO,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IAEzE,IAAI,CAAC;QACH,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,IAAA,cAAO,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC;QAEvE,IAAI,UAAU,EAAE,CAAC;YACf,IAAI,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;gBACzB,OAAO,CAAC,IAAA,cAAO,EAAC,IAAI,EAAE,UAAU,CAAC,EAAE,GAAG,KAAK,CAAC,CAAC;YAC/C,CAAC;iBAAM,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;gBACrC,MAAM,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,cAAO,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;gBAC7E,OAAO,CAAC,GAAG,KAAK,EAAE,GAAG,KAAK,CAAC,CAAC;YAC9B,CAAC;QACH,CAAC;QAED,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,CAAC,IAAA,cAAO,EAAC,IAAI,EAAE,OAAO,CAAC,EAAE,GAAG,KAAK,CAAC,CAAC;QAC5C,CAAC;IACH,CAAC;IAAC,MAAM,CAAC,CAAA,CAAC;IAEV,OAAO,KAAK,CAAC;AACf,CAAC;AAED,KAAK,UAAU,WAAW,CAAC,YAA2B;IACpD,MAAM,KAAK,GAAkB,EAAE,CAAC;IAChC,MAAM,OAAO,GAAG,6BAA6B,CAAC;IAC9C,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,eAAU,EAAC,IAAA,cAAO,EAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IAE7F,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;QAC7B,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC/D,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,KAAK,UAAU,eAAe,CAAC,UAAkB;IAC/C,IAAI,CAAC,iCAAqB,CAAC,QAAQ,CAAC,IAAA,cAAO,EAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC;QACvE,MAAM,OAAO,GAAG,MAAM,IAAA,aAAQ,EAAC,IAAA,cAAO,EAAC,UAAU,CAAC,EAAE,IAAA,eAAQ,EAAC,UAAU,CAAC,CAAC,CAAC;QAC1E,MAAM,YAAY,GAAG,MAAM,IAAA,kBAAa,EAAC,OAAO,EAAE,IAAA,cAAO,EAAC,UAAU,CAAC,CAAC,CAAC;QACvE,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,OAAO,CAAC,UAAU,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,YAAY;IACnB,OAAO;QACL,KAAK,CAAC,OAAO;YACX,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;QAC3B,CAAC;QACD,IAAI,CAAC,OAAO;YACV,IAAA,aAAO,EAAC,OAAO,CAAC,CAAC;QACnB,CAAC;QACD,OAAO,CAAC,OAAO;YACb,IAAA,gBAAU,EAAC,OAAO,CAAC,CAAC;QACtB,CAAC;QACD,IAAI,CAAC,OAAO;YACV,IAAA,aAAO,EAAC,OAAO,CAAC,CAAC;QACnB,CAAC;KACF,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,qBAAqB,CAAC,OAAoB,EAAE,MAAc,EAAE,cAA8B;IACvG,IAAA,cAAQ,EAAC,+BAA+B,CAAC,CAAC;IAC1C,MAAM,MAAM,GAAG,MAAM,IAAA,0BAAmB,EAAC,OAAO,CAAC,CAAC;IAElD,IAAA,cAAQ,EAAC,8BAA8B,CAAC,CAAC;IACzC,MAAM,IAAA,0BAAqB,EAAC,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;AAC5E,CAAC;AAEM,KAAK,UAAU,sBAAsB,CAC1C,cAA6B,EAC7B,IAAY,EACZ,KAAa,EACb,cAA6B,EAC7B,MAAc,EACd,cAA8B,EAC9B,QAAmB;IAEnB,MAAM,aAAa,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;IACxC,MAAM,IAAI,GAAG,MAAM,oBAAoB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IAC7D,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAExC,IAAI,IAAI,EAAE,CAAC;QACT,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QACzC,MAAM,KAAK,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;QACxC,MAAM,OAAO,GAAgB;YAC3B,IAAI,EAAE,aAAa;YACnB,IAAI;YACJ,KAAK;YACL,KAAK;YACL,OAAO,EAAE,CAAC,IAAA,uBAAgB,EAAC,IAAI,CAAC,CAAC;YACjC,IAAI;YACJ,mBAAmB,EAAE,IAAI;YACzB,OAAO,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,aAAa,CAAC;YAC1D,QAAQ;YACR,MAAM,EAAE,YAAY,EAAE;SACvB,CAAC;QAEF,IAAI,CAAC;YACH,MAAM,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;YAC7D,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,EAAE,EAAE,CAAC;YACZ,IAAA,SAAG,EAAC,qCAAqC,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QACvD,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,sBAAsB,CAC1C,OAAe,EACf,KAAa,EACb,MAAc,EACd,cAA8B,EAC9B,QAAmB;IAEnB,IAAA,cAAQ,EAAC,2BAA2B,CAAC,CAAC;IACtC,MAAM,UAAU,GAAG,MAAM,IAAA,2BAAiB,EAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC3D,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,4BAAkB,EAAC,UAAU,CAAC,CAAC;IAC1F,MAAM,YAAY,GAAG,MAAM,eAAe,CAAC,UAAU,CAAC,CAAC;IACvD,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,CAAC;IAC9C,MAAM,OAAO,GAAgB;QAC3B,IAAI;QACJ,IAAI;QACJ,KAAK;QACL,KAAK,EAAE,mBAAmB,CAAC,IAAI,EAAE,MAAM,CAAC;QACxC,IAAI,EAAE,gBAAgB,CAAC,IAAI,EAAE,SAAS,CAAC;QACvC,mBAAmB,EAAE,IAAI;QACzB,OAAO,EAAE,IAAA,0BAAgB,EAAC,SAAS,EAAE,IAAI,CAAC;QAC1C,QAAQ;QACR,MAAM,EAAE,YAAY,EAAE;KACvB,CAAC;IAEF,IAAA,oCAA0B,EAAC,SAAS,CAAC,CAAC;IAEtC,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACxB,IAAI,CAAC;YACH,MAAM,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;YAC7D,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,EAAE,EAAE,CAAC;YACZ,IAAA,SAAG,EAAC,qCAAqC,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC;SAAM,CAAC;QACN,IAAA,SAAG,EAAC,qCAAqC,EAAE,OAAO,EAAE,kDAAkD,CAAC,CAAC;IAC1G,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}
|
package/lib/common/pilet.js
CHANGED
|
@@ -6,10 +6,10 @@ const config_1 = require("./config");
|
|
|
6
6
|
const io_1 = require("./io");
|
|
7
7
|
const enums_1 = require("./enums");
|
|
8
8
|
const log_1 = require("./log");
|
|
9
|
-
const bundler_1 = require("../bundler");
|
|
10
9
|
const constants_1 = require("./constants");
|
|
11
10
|
const declaration_1 = require("./declaration");
|
|
12
11
|
const package_1 = require("./package");
|
|
12
|
+
const bundler_1 = require("../bundler");
|
|
13
13
|
const defaultOutput = 'dist/index.js';
|
|
14
14
|
function isSubDir(parent, dir) {
|
|
15
15
|
const rel = (0, path_1.relative)(parent, dir);
|
|
@@ -30,7 +30,7 @@ async function triggerBuildPilet({ target, app, originalSchemaVersion, fresh, en
|
|
|
30
30
|
const schemaVersion = originalSchemaVersion || schema || config_1.config.schemaVersion || constants_1.defaultSchemaVersion;
|
|
31
31
|
const piralInstances = apps.map((m) => m.appPackage.name);
|
|
32
32
|
const externals = (0, package_1.combinePiletExternals)(piralInstances, peerDependencies, peerModules, importmap);
|
|
33
|
-
const { main = defaultOutput
|
|
33
|
+
const { main = defaultOutput } = piletPackage;
|
|
34
34
|
const dest = getTarget(root, main, targetDir, target);
|
|
35
35
|
const outDir = (0, path_1.dirname)(dest);
|
|
36
36
|
const outFile = (0, path_1.basename)(dest);
|
|
@@ -63,7 +63,7 @@ async function triggerBuildPilet({ target, app, originalSchemaVersion, fresh, en
|
|
|
63
63
|
await hooks.afterBuild?.({ root, outDir, importmap, entryModule, schemaVersion, piletPackage });
|
|
64
64
|
if (declaration) {
|
|
65
65
|
await hooks.beforeDeclaration?.({ root, outDir, entryModule, piletPackage });
|
|
66
|
-
await (0, declaration_1.createPiletDeclaration)(
|
|
66
|
+
await (0, declaration_1.createPiletDeclaration)(piralInstances, root, entryModule, externals, outDir, enums_1.ForceOverwrite.yes, logLevel);
|
|
67
67
|
await hooks.afterDeclaration?.({ root, outDir, entryModule, piletPackage });
|
|
68
68
|
}
|
|
69
69
|
return {
|
package/lib/common/pilet.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pilet.js","sourceRoot":"","sources":["../../src/common/pilet.ts"],"names":[],"mappings":";;AAoDA,
|
|
1
|
+
{"version":3,"file":"pilet.js","sourceRoot":"","sources":["../../src/common/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": "1.8.
|
|
3
|
+
"version": "1.8.5-beta.7993",
|
|
4
4
|
"description": "The standard CLI for creating and building a Piral instance or a Pilet.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"portal",
|
|
@@ -73,10 +73,10 @@
|
|
|
73
73
|
},
|
|
74
74
|
"dependencies": {
|
|
75
75
|
"css-conflict-inspector": "^0.2",
|
|
76
|
-
"dets": "^0.16.
|
|
76
|
+
"dets": "^0.16.8",
|
|
77
77
|
"kras": "^1",
|
|
78
78
|
"open": "^10",
|
|
79
79
|
"typescript": "^5"
|
|
80
80
|
},
|
|
81
|
-
"gitHead": "
|
|
81
|
+
"gitHead": "cfc64976917fd10a255e5d02aad04de65b676631"
|
|
82
82
|
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { dirname, resolve } from 'path';
|
|
2
|
+
import { LogLevels } from '../types';
|
|
2
3
|
import {
|
|
3
4
|
setLogLevel,
|
|
4
5
|
logDone,
|
|
@@ -9,7 +10,6 @@ import {
|
|
|
9
10
|
combinePiletExternals,
|
|
10
11
|
ensure,
|
|
11
12
|
} from '../common';
|
|
12
|
-
import { LogLevels } from '../types';
|
|
13
13
|
|
|
14
14
|
export interface DeclarationPiletOptions {
|
|
15
15
|
/**
|
|
@@ -62,22 +62,11 @@ export async function declarationPilet(baseDir = process.cwd(), options: Declara
|
|
|
62
62
|
|
|
63
63
|
for (const item of allEntries) {
|
|
64
64
|
const targetDir = dirname(item);
|
|
65
|
-
const { peerDependencies, peerModules, root, apps,
|
|
65
|
+
const { peerDependencies, peerModules, root, apps, importmap } = await retrievePiletData(targetDir);
|
|
66
66
|
const piralInstances = apps.map((m) => m.appPackage.name);
|
|
67
67
|
const externals = combinePiletExternals(piralInstances, peerDependencies, peerModules, importmap);
|
|
68
68
|
const dest = resolve(root, target);
|
|
69
|
-
results.push(
|
|
70
|
-
await createPiletDeclaration(
|
|
71
|
-
piletPackage.name,
|
|
72
|
-
piralInstances,
|
|
73
|
-
root,
|
|
74
|
-
item,
|
|
75
|
-
externals,
|
|
76
|
-
dest,
|
|
77
|
-
forceOverwrite,
|
|
78
|
-
logLevel,
|
|
79
|
-
),
|
|
80
|
-
);
|
|
69
|
+
results.push(await createPiletDeclaration(piralInstances, root, item, externals, dest, forceOverwrite, logLevel));
|
|
81
70
|
}
|
|
82
71
|
|
|
83
72
|
if (results.every(Boolean)) {
|
|
@@ -144,7 +144,6 @@ async function createDeclarationFile(options: DeclOptions, target: string, force
|
|
|
144
144
|
}
|
|
145
145
|
|
|
146
146
|
export async function createPiletDeclaration(
|
|
147
|
-
name: string,
|
|
148
147
|
piralInstances: Array<string>,
|
|
149
148
|
root: string,
|
|
150
149
|
entry: string,
|
|
@@ -168,7 +167,7 @@ export async function createPiletDeclaration(
|
|
|
168
167
|
plugins: [createDiffPlugin(file)],
|
|
169
168
|
apis,
|
|
170
169
|
noModuleDeclaration: true,
|
|
171
|
-
imports: allowedImports,
|
|
170
|
+
imports: allowedImports.filter((m) => m !== piralInstance),
|
|
172
171
|
logLevel,
|
|
173
172
|
logger: createLogger(),
|
|
174
173
|
};
|
package/src/common/pilet.ts
CHANGED
|
@@ -3,10 +3,10 @@ import { config } from './config';
|
|
|
3
3
|
import { removeDirectory } from './io';
|
|
4
4
|
import { ForceOverwrite } from './enums';
|
|
5
5
|
import { logInfo, progress } from './log';
|
|
6
|
-
import { callPiletBuild } from '../bundler';
|
|
7
6
|
import { defaultSchemaVersion } from './constants';
|
|
8
7
|
import { createPiletDeclaration } from './declaration';
|
|
9
8
|
import { combinePiletExternals, retrievePiletData, validateSharedDependencies } from './package';
|
|
9
|
+
import { callPiletBuild } from '../bundler';
|
|
10
10
|
import { LogLevels, PiletSchemaVersion } from '../types';
|
|
11
11
|
|
|
12
12
|
const defaultOutput = 'dist/index.js';
|
|
@@ -73,7 +73,7 @@ export async function triggerBuildPilet({
|
|
|
73
73
|
const schemaVersion = originalSchemaVersion || schema || config.schemaVersion || defaultSchemaVersion;
|
|
74
74
|
const piralInstances = apps.map((m) => m.appPackage.name);
|
|
75
75
|
const externals = combinePiletExternals(piralInstances, peerDependencies, peerModules, importmap);
|
|
76
|
-
const { main = defaultOutput
|
|
76
|
+
const { main = defaultOutput } = piletPackage;
|
|
77
77
|
const dest = getTarget(root, main, targetDir, target);
|
|
78
78
|
const outDir = dirname(dest);
|
|
79
79
|
const outFile = basename(dest);
|
|
@@ -117,7 +117,6 @@ export async function triggerBuildPilet({
|
|
|
117
117
|
if (declaration) {
|
|
118
118
|
await hooks.beforeDeclaration?.({ root, outDir, entryModule, piletPackage });
|
|
119
119
|
await createPiletDeclaration(
|
|
120
|
-
name,
|
|
121
120
|
piralInstances,
|
|
122
121
|
root,
|
|
123
122
|
entryModule,
|