piral-cli 1.5.0-beta.6564 → 1.5.0-beta.6565
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.
|
@@ -20,16 +20,18 @@ function findPiralBaseRoot(root, framework) {
|
|
|
20
20
|
}
|
|
21
21
|
return root;
|
|
22
22
|
}
|
|
23
|
-
async function findPiralInstanceApi(piralInstance) {
|
|
23
|
+
async function findPiralInstanceApi(root, piralInstance) {
|
|
24
24
|
if (piralInstance) {
|
|
25
|
-
const path = require.resolve(`${piralInstance}/${constants_1.packageJson}
|
|
26
|
-
|
|
27
|
-
|
|
25
|
+
const path = require.resolve(`${piralInstance}/${constants_1.packageJson}`, {
|
|
26
|
+
paths: [(0, path_1.join)(root, 'node_modules')],
|
|
27
|
+
});
|
|
28
|
+
const appRoot = (0, path_1.dirname)(path);
|
|
29
|
+
const data = await (0, io_1.readJson)(appRoot, constants_1.packageJson);
|
|
28
30
|
const subpath = data.types || data.typings;
|
|
29
31
|
if (subpath) {
|
|
30
32
|
return [
|
|
31
33
|
{
|
|
32
|
-
file: (0, path_1.resolve)(
|
|
34
|
+
file: (0, path_1.resolve)(appRoot, subpath),
|
|
33
35
|
name: piletApiName,
|
|
34
36
|
},
|
|
35
37
|
];
|
|
@@ -123,7 +125,7 @@ async function createDeclarationFile(options, source, target, forceOverwrite) {
|
|
|
123
125
|
}
|
|
124
126
|
async function createPiletDeclaration(name, piralInstances, root, entry, allowedImports, target, forceOverwrite, logLevel) {
|
|
125
127
|
const piralInstance = piralInstances[0];
|
|
126
|
-
const apis = await findPiralInstanceApi(piralInstance);
|
|
128
|
+
const apis = await findPiralInstanceApi(root, piralInstance);
|
|
127
129
|
const file = apis.map((m) => m.file)[0];
|
|
128
130
|
if (file) {
|
|
129
131
|
const files = await getAllFiles([entry]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"declaration.js","sourceRoot":"","sources":["../../src/common/declaration.ts"],"names":[],"mappings":";;;AAAA,+BAAkF;AAClF,+
|
|
1
|
+
{"version":3,"file":"declaration.js","sourceRoot":"","sources":["../../src/common/declaration.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.5.0-beta.
|
|
3
|
+
"version": "1.5.0-beta.6565",
|
|
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": "
|
|
84
|
+
"gitHead": "5d59c5b44461625a1ee367f2543fd84827b5bf83"
|
|
85
85
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { DeclOptions, generateDeclaration, createDiffPlugin, Logger } from 'dets';
|
|
2
|
-
import { dirname,
|
|
2
|
+
import { basename, dirname, extname, join, resolve } from 'path';
|
|
3
3
|
import { progress, log, logWarn, logVerbose, logInfo } from './log';
|
|
4
4
|
import { ForceOverwrite } from './enums';
|
|
5
5
|
import { retrievePiralRoot, retrievePiletsInfo, flattenExternals, validateSharedDependencies } from './package';
|
|
@@ -23,17 +23,19 @@ function findPiralBaseRoot(root: string, framework: string) {
|
|
|
23
23
|
return root;
|
|
24
24
|
}
|
|
25
25
|
|
|
26
|
-
async function findPiralInstanceApi(piralInstance: string) {
|
|
26
|
+
async function findPiralInstanceApi(root: string, piralInstance: string) {
|
|
27
27
|
if (piralInstance) {
|
|
28
|
-
const path = require.resolve(`${piralInstance}/${packageJson}
|
|
29
|
-
|
|
30
|
-
|
|
28
|
+
const path = require.resolve(`${piralInstance}/${packageJson}`, {
|
|
29
|
+
paths: [join(root, 'node_modules')],
|
|
30
|
+
});
|
|
31
|
+
const appRoot = dirname(path);
|
|
32
|
+
const data = await readJson(appRoot, packageJson);
|
|
31
33
|
const subpath = data.types || data.typings;
|
|
32
34
|
|
|
33
35
|
if (subpath) {
|
|
34
36
|
return [
|
|
35
37
|
{
|
|
36
|
-
file: resolve(
|
|
38
|
+
file: resolve(appRoot, subpath),
|
|
37
39
|
name: piletApiName,
|
|
38
40
|
},
|
|
39
41
|
];
|
|
@@ -155,7 +157,7 @@ export async function createPiletDeclaration(
|
|
|
155
157
|
logLevel: LogLevels,
|
|
156
158
|
) {
|
|
157
159
|
const piralInstance = piralInstances[0];
|
|
158
|
-
const apis = await findPiralInstanceApi(piralInstance);
|
|
160
|
+
const apis = await findPiralInstanceApi(root, piralInstance);
|
|
159
161
|
const file = apis.map((m) => m.file)[0];
|
|
160
162
|
|
|
161
163
|
if (file) {
|