piral-cli 0.15.0-alpha.4041 → 0.15.0-alpha.4231
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.js.map +1 -1
- package/lib/apps/build-piral.js.map +1 -1
- package/lib/apps/debug-pilet.js.map +1 -1
- package/lib/apps/debug-piral.js.map +1 -1
- package/lib/apps/index.js +5 -1
- package/lib/apps/index.js.map +1 -1
- package/lib/apps/new-pilet.js +5 -9
- package/lib/apps/new-pilet.js.map +1 -1
- package/lib/apps/new-piral.js +5 -3
- package/lib/apps/new-piral.js.map +1 -1
- package/lib/apps/publish-pilet.d.ts +4 -0
- package/lib/apps/publish-pilet.js +4 -3
- package/lib/apps/publish-pilet.js.map +1 -1
- package/lib/apps/publish-piral.d.ts +4 -0
- package/lib/apps/publish-piral.js +9 -7
- package/lib/apps/publish-piral.js.map +1 -1
- package/lib/apps/upgrade-pilet.js +2 -8
- package/lib/apps/upgrade-pilet.js.map +1 -1
- package/lib/apps/upgrade-piral.js +1 -1
- package/lib/apps/upgrade-piral.js.map +1 -1
- package/lib/build/bundler-calls.d.ts +1 -1
- package/lib/build/run-build-pilet.js.map +1 -1
- package/lib/build/run-build-piral.js.map +1 -1
- package/lib/build/run-debug-mono-piral.js +1 -1
- package/lib/build/run-debug-mono-piral.js.map +1 -1
- package/lib/build/run-debug-pilet.js.map +1 -1
- package/lib/build/run-debug-piral.js.map +1 -1
- package/lib/bundler.js +1 -1
- package/lib/bundler.js.map +1 -1
- package/lib/commands.js +8 -0
- package/lib/commands.js.map +1 -1
- package/lib/common/browser.d.ts +1 -0
- package/lib/common/browser.js +16 -10
- package/lib/common/browser.js.map +1 -1
- package/lib/common/clients/index.d.ts +19 -0
- package/lib/common/clients/index.js +40 -0
- package/lib/common/clients/index.js.map +1 -0
- package/lib/common/clients/lerna.d.ts +6 -1
- package/lib/common/clients/lerna.js +67 -3
- package/lib/common/clients/lerna.js.map +1 -1
- package/lib/common/clients/npm.d.ts +4 -1
- package/lib/common/clients/npm.js +36 -9
- package/lib/common/clients/npm.js.map +1 -1
- package/lib/common/clients/pnpm.d.ts +4 -0
- package/lib/common/clients/pnpm.js +41 -1
- package/lib/common/clients/pnpm.js.map +1 -1
- package/lib/common/clients/rush.d.ts +6 -0
- package/lib/common/clients/rush.js +118 -0
- package/lib/common/clients/rush.js.map +1 -0
- package/lib/common/clients/yarn.d.ts +4 -0
- package/lib/common/clients/yarn.js +44 -4
- package/lib/common/clients/yarn.js.map +1 -1
- package/lib/common/config.js.map +1 -1
- package/lib/common/constants.d.ts +1 -1
- package/lib/common/constants.js +1 -1
- package/lib/common/constants.js.map +1 -1
- package/lib/common/declaration.js +14 -10
- package/lib/common/declaration.js.map +1 -1
- package/lib/common/emulator.js +2 -2
- package/lib/common/emulator.js.map +1 -1
- package/lib/common/http.d.ts +1 -1
- package/lib/common/http.js +12 -7
- package/lib/common/http.js.map +1 -1
- package/lib/common/importmap.js +7 -16
- package/lib/common/importmap.js.map +1 -1
- package/lib/common/index.js +5 -1
- package/lib/common/index.js.map +1 -1
- package/lib/common/info.d.ts +4 -0
- package/lib/common/info.js +6 -1
- package/lib/common/info.js.map +1 -1
- package/lib/common/inspect.js +2 -1
- package/lib/common/inspect.js.map +1 -1
- package/lib/common/interactive.d.ts +9 -0
- package/lib/common/interactive.js +31 -1
- package/lib/common/interactive.js.map +1 -1
- package/lib/common/io.js +1 -1
- package/lib/common/io.js.map +1 -1
- package/lib/common/npm.d.ts +11 -16
- package/lib/common/npm.js +165 -158
- package/lib/common/npm.js.map +1 -1
- package/lib/common/pack.js +1 -1
- package/lib/common/pack.js.map +1 -1
- package/lib/common/package.d.ts +6 -7
- package/lib/common/package.js +26 -28
- package/lib/common/package.js.map +1 -1
- package/lib/common/scaffold.js +5 -2
- package/lib/common/scaffold.js.map +1 -1
- package/lib/common/version.js +4 -4
- package/lib/common/version.js.map +1 -1
- package/lib/external/index.js +2380 -470
- package/lib/helpers.d.ts +1 -1
- package/lib/helpers.js +1 -1
- package/lib/helpers.js.map +1 -1
- package/lib/index.js +5 -1
- package/lib/index.js.map +1 -1
- package/lib/injectors/pilet.d.ts +1 -0
- package/lib/injectors/pilet.js +7 -7
- package/lib/injectors/pilet.js.map +1 -1
- package/lib/messages.d.ts +1 -1
- package/lib/messages.js +5 -1
- package/lib/messages.js.map +1 -1
- package/lib/plugin.js +27 -2
- package/lib/plugin.js.map +1 -1
- package/lib/release.d.ts +1 -1
- package/lib/release.js +7 -2
- package/lib/release.js.map +1 -1
- package/lib/types/common.d.ts +1 -1
- package/lib/types/index.js +5 -1
- package/lib/types/index.js.map +1 -1
- package/lib/types/internal.d.ts +9 -1
- package/lib/types/public.d.ts +2 -2
- package/package.json +5 -3
- package/src/apps/new-pilet.ts +9 -14
- package/src/apps/new-piral.ts +9 -5
- package/src/apps/publish-pilet.ts +10 -3
- package/src/apps/publish-piral.ts +21 -6
- package/src/apps/upgrade-pilet.ts +4 -12
- package/src/apps/upgrade-piral.ts +2 -2
- package/src/build/bundler-calls.ts +1 -1
- package/src/build/run-build-pilet.ts +1 -1
- package/src/build/run-build-piral.ts +1 -1
- package/src/build/run-debug-mono-piral.ts +2 -2
- package/src/build/run-debug-pilet.ts +1 -1
- package/src/build/run-debug-piral.ts +1 -1
- package/src/bundler.test.ts +1 -1
- package/src/bundler.ts +2 -2
- package/src/commands.ts +8 -0
- package/src/common/browser.ts +12 -8
- package/src/common/clients/index.ts +33 -0
- package/src/common/clients/lerna.ts +61 -1
- package/src/common/clients/npm.ts +31 -6
- package/src/common/clients/pnpm.ts +37 -0
- package/src/common/clients/rush.ts +111 -0
- package/src/common/clients/yarn.ts +40 -3
- package/src/common/config.ts +3 -3
- package/src/common/constants.ts +1 -1
- package/src/common/declaration.ts +17 -10
- package/src/common/emulator.ts +3 -3
- package/src/common/http.ts +20 -6
- package/src/common/importmap.ts +7 -15
- package/src/common/info.ts +6 -1
- package/src/common/inspect.ts +2 -1
- package/src/common/interactive.test.ts +3 -0
- package/src/common/interactive.ts +48 -1
- package/src/common/io.ts +1 -1
- package/src/common/npm.test.ts +122 -76
- package/src/common/npm.ts +177 -152
- package/src/common/pack.test.ts +1 -1
- package/src/common/pack.ts +2 -2
- package/src/common/package.test.ts +1 -14
- package/src/common/package.ts +31 -29
- package/src/common/scaffold.ts +7 -2
- package/src/common/version.ts +4 -4
- package/src/external/index.ts +2 -1
- package/src/helpers.ts +2 -2
- package/src/injectors/pilet.ts +9 -8
- package/src/messages.ts +6 -2
- package/src/plugin.ts +34 -5
- package/src/release.ts +10 -2
- package/src/types/common.ts +1 -1
- package/src/types/internal.ts +6 -1
- package/src/types/public.ts +2 -2
|
@@ -0,0 +1,118 @@
|
|
|
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
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.listProjects = exports.isProject = exports.initProject = exports.detectClient = exports.installPackage = exports.installDependencies = void 0;
|
|
13
|
+
const path_1 = require("path");
|
|
14
|
+
const log_1 = require("../log");
|
|
15
|
+
const io_1 = require("../io");
|
|
16
|
+
const external_1 = require("../../external");
|
|
17
|
+
const scripts_1 = require("../scripts");
|
|
18
|
+
const MemoryStream_1 = require("../MemoryStream");
|
|
19
|
+
// Helpers:
|
|
20
|
+
const rushJson = 'rush.json';
|
|
21
|
+
function runRushProcess(args, target, output) {
|
|
22
|
+
(0, log_1.log)('generalDebug_0003', 'Starting the Rush process ...');
|
|
23
|
+
const cwd = (0, path_1.resolve)(process.cwd(), target);
|
|
24
|
+
return (0, scripts_1.runCommand)('rush', args, cwd, output);
|
|
25
|
+
}
|
|
26
|
+
function convert(flags) {
|
|
27
|
+
return flags.map((flag) => {
|
|
28
|
+
switch (flag) {
|
|
29
|
+
case '--save-exact':
|
|
30
|
+
// discard as this may lead to problems
|
|
31
|
+
return '';
|
|
32
|
+
case '--save-dev':
|
|
33
|
+
return '--dev';
|
|
34
|
+
case '--no-save':
|
|
35
|
+
// unfortunately no
|
|
36
|
+
return '';
|
|
37
|
+
default:
|
|
38
|
+
return flag;
|
|
39
|
+
}
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
// Client interface functions:
|
|
43
|
+
function installDependencies(target = '.', ...flags) {
|
|
44
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
45
|
+
const ms = new MemoryStream_1.MemoryStream();
|
|
46
|
+
yield runRushProcess(['update', ...convert(flags)], target, ms);
|
|
47
|
+
(0, log_1.log)('generalDebug_0003', `Rush install dependencies result: ${ms.value}`);
|
|
48
|
+
return ms.value;
|
|
49
|
+
});
|
|
50
|
+
}
|
|
51
|
+
exports.installDependencies = installDependencies;
|
|
52
|
+
function installPackage(packageRef, target = '.', ...flags) {
|
|
53
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
54
|
+
const ms = new MemoryStream_1.MemoryStream();
|
|
55
|
+
yield runRushProcess(['add', '--package', packageRef, ...convert(flags)], target, ms);
|
|
56
|
+
(0, log_1.log)('generalDebug_0003', `Rush install package result: ${ms.value}`);
|
|
57
|
+
return ms.value;
|
|
58
|
+
});
|
|
59
|
+
}
|
|
60
|
+
exports.installPackage = installPackage;
|
|
61
|
+
function detectClient(root) {
|
|
62
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
63
|
+
return !!(yield (0, io_1.findFile)(root, rushJson));
|
|
64
|
+
});
|
|
65
|
+
}
|
|
66
|
+
exports.detectClient = detectClient;
|
|
67
|
+
function initProject(packageName, target) {
|
|
68
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
69
|
+
const rushPath = yield (0, io_1.findFile)(target, rushJson);
|
|
70
|
+
if (!rushPath) {
|
|
71
|
+
throw new Error(`Could not find the "${rushJson}" from "${target}". Sure you want to create the project in the right directory?`);
|
|
72
|
+
}
|
|
73
|
+
const rushDir = (0, path_1.dirname)(rushPath);
|
|
74
|
+
const rushContent = yield (0, io_1.readText)(rushDir, rushJson);
|
|
75
|
+
const rushData = external_1.jju.parse(rushContent);
|
|
76
|
+
const projectFolder = (0, path_1.relative)(rushDir, target);
|
|
77
|
+
if (!Array.isArray(rushData.projects)) {
|
|
78
|
+
rushData.projects = [];
|
|
79
|
+
}
|
|
80
|
+
rushData.projects.push({
|
|
81
|
+
packageName,
|
|
82
|
+
projectFolder,
|
|
83
|
+
});
|
|
84
|
+
yield (0, io_1.writeText)(rushDir, rushJson, external_1.jju.update(rushContent, rushData, {
|
|
85
|
+
mode: 'cjson',
|
|
86
|
+
indent: 2,
|
|
87
|
+
}));
|
|
88
|
+
});
|
|
89
|
+
}
|
|
90
|
+
exports.initProject = initProject;
|
|
91
|
+
function isProject(root, packageRef) {
|
|
92
|
+
var _a, _b;
|
|
93
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
94
|
+
const details = yield listProjects(root);
|
|
95
|
+
if (typeof details === 'object' && Array.isArray(details === null || details === void 0 ? void 0 : details.projects)) {
|
|
96
|
+
return (_b = (_a = details === null || details === void 0 ? void 0 : details.projects) === null || _a === void 0 ? void 0 : _a.some((p) => p.name === packageRef)) !== null && _b !== void 0 ? _b : false;
|
|
97
|
+
}
|
|
98
|
+
return false;
|
|
99
|
+
});
|
|
100
|
+
}
|
|
101
|
+
exports.isProject = isProject;
|
|
102
|
+
// Functions to exclusively use from rush client:
|
|
103
|
+
function listProjects(target) {
|
|
104
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
105
|
+
const ms = new MemoryStream_1.MemoryStream();
|
|
106
|
+
try {
|
|
107
|
+
yield runRushProcess(['list', '--json'], target, ms);
|
|
108
|
+
}
|
|
109
|
+
catch (e) {
|
|
110
|
+
(0, log_1.log)('generalDebug_0003', `rush list error: ${e}`);
|
|
111
|
+
return {};
|
|
112
|
+
}
|
|
113
|
+
(0, log_1.log)('generalDebug_0003', `rush list project result: ${ms.value}`);
|
|
114
|
+
return JSON.parse(ms.value);
|
|
115
|
+
});
|
|
116
|
+
}
|
|
117
|
+
exports.listProjects = listProjects;
|
|
118
|
+
//# sourceMappingURL=rush.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"rush.js","sourceRoot":"","sources":["../../../src/common/clients/rush.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,6 @@
|
|
|
1
1
|
export declare function installDependencies(target?: string, ...flags: Array<string>): Promise<string>;
|
|
2
2
|
export declare function installPackage(packageRef: string, target?: string, ...flags: Array<string>): Promise<string>;
|
|
3
|
+
export declare function detectClient(root: string): Promise<boolean>;
|
|
4
|
+
export declare function initProject(projectName: string, target: string): Promise<void>;
|
|
5
|
+
export declare function isProject(root: string, packageRef: string): Promise<boolean>;
|
|
6
|
+
export declare function listProjects(target: string): Promise<any>;
|
|
@@ -9,13 +9,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.installPackage = exports.installDependencies = void 0;
|
|
12
|
+
exports.listProjects = exports.isProject = exports.initProject = exports.detectClient = exports.installPackage = exports.installDependencies = void 0;
|
|
13
13
|
const path_1 = require("path");
|
|
14
14
|
const log_1 = require("../log");
|
|
15
|
+
const io_1 = require("../io");
|
|
15
16
|
const scripts_1 = require("../scripts");
|
|
16
17
|
const MemoryStream_1 = require("../MemoryStream");
|
|
18
|
+
// Helpers:
|
|
17
19
|
function runYarnProcess(args, target, output) {
|
|
18
|
-
(0, log_1.log)('generalDebug_0003', 'Starting the Yarn process ...');
|
|
20
|
+
(0, log_1.log)('generalDebug_0003', 'Starting the Yarn@1 process ...');
|
|
19
21
|
const cwd = (0, path_1.resolve)(process.cwd(), target);
|
|
20
22
|
return (0, scripts_1.runCommand)('yarn', args, cwd, output);
|
|
21
23
|
}
|
|
@@ -34,11 +36,12 @@ function convert(flags) {
|
|
|
34
36
|
}
|
|
35
37
|
});
|
|
36
38
|
}
|
|
39
|
+
// Client interface functions:
|
|
37
40
|
function installDependencies(target = '.', ...flags) {
|
|
38
41
|
return __awaiter(this, void 0, void 0, function* () {
|
|
39
42
|
const ms = new MemoryStream_1.MemoryStream();
|
|
40
43
|
yield runYarnProcess(['install', ...convert(flags)], target, ms);
|
|
41
|
-
(0, log_1.log)('generalDebug_0003', `Yarn install dependencies result: ${ms.value}`);
|
|
44
|
+
(0, log_1.log)('generalDebug_0003', `Yarn@1 install dependencies result: ${ms.value}`);
|
|
42
45
|
return ms.value;
|
|
43
46
|
});
|
|
44
47
|
}
|
|
@@ -47,9 +50,46 @@ function installPackage(packageRef, target = '.', ...flags) {
|
|
|
47
50
|
return __awaiter(this, void 0, void 0, function* () {
|
|
48
51
|
const ms = new MemoryStream_1.MemoryStream();
|
|
49
52
|
yield runYarnProcess(['add', packageRef, ...convert(flags)], target, ms);
|
|
50
|
-
(0, log_1.log)('generalDebug_0003', `Yarn install package result: ${ms.value}`);
|
|
53
|
+
(0, log_1.log)('generalDebug_0003', `Yarn@1 install package result: ${ms.value}`);
|
|
51
54
|
return ms.value;
|
|
52
55
|
});
|
|
53
56
|
}
|
|
54
57
|
exports.installPackage = installPackage;
|
|
58
|
+
function detectClient(root) {
|
|
59
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
60
|
+
return !!(yield (0, io_1.findFile)(root, 'yarn.lock'));
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
exports.detectClient = detectClient;
|
|
64
|
+
function initProject(projectName, target) {
|
|
65
|
+
return __awaiter(this, void 0, void 0, function* () { });
|
|
66
|
+
}
|
|
67
|
+
exports.initProject = initProject;
|
|
68
|
+
function isProject(root, packageRef) {
|
|
69
|
+
var _a;
|
|
70
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
71
|
+
const details = yield listProjects(root);
|
|
72
|
+
if (typeof details === 'object') {
|
|
73
|
+
return typeof ((_a = details === null || details === void 0 ? void 0 : details[packageRef]) === null || _a === void 0 ? void 0 : _a.location) === 'string';
|
|
74
|
+
}
|
|
75
|
+
return false;
|
|
76
|
+
});
|
|
77
|
+
}
|
|
78
|
+
exports.isProject = isProject;
|
|
79
|
+
// Functions to exclusively use from yarn client:
|
|
80
|
+
function listProjects(target) {
|
|
81
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
82
|
+
const ms = new MemoryStream_1.MemoryStream();
|
|
83
|
+
try {
|
|
84
|
+
yield runYarnProcess(['workspaces', 'info'], target, ms);
|
|
85
|
+
}
|
|
86
|
+
catch (e) {
|
|
87
|
+
(0, log_1.log)('generalDebug_0003', `yarn workspaces error: ${e}`);
|
|
88
|
+
return {};
|
|
89
|
+
}
|
|
90
|
+
(0, log_1.log)('generalDebug_0003', `yarn workspaces result: ${ms.value}`);
|
|
91
|
+
return JSON.parse(ms.value);
|
|
92
|
+
});
|
|
93
|
+
}
|
|
94
|
+
exports.listProjects = listProjects;
|
|
55
95
|
//# sourceMappingURL=yarn.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yarn.js","sourceRoot":"","sources":["../../../src/common/clients/yarn.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAA+B;AAC/B,gCAA6B;AAC7B,wCAAwC;AACxC,kDAA+C;AAE/C,SAAS,cAAc,CAAC,IAAmB,EAAE,MAAc,EAAE,MAA8B;IACzF,IAAA,SAAG,EAAC,mBAAmB,EAAE
|
|
1
|
+
{"version":3,"file":"yarn.js","sourceRoot":"","sources":["../../../src/common/clients/yarn.ts"],"names":[],"mappings":"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"}
|
package/lib/common/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/common/config.ts"],"names":[],"mappings":";;;AAAA,mCAAyC;AACzC,2CAA8C;AAC9C,0CAAiC;AAiEpB,QAAA,MAAM,GAAmB,IAAA,aAAE,EACtC,OAAO,EACP;IACE,MAAM,EAAE,SAAS;IACjB,OAAO,EAAE,EAAE;IACX,GAAG,EAAE,SAAS;IACd,IAAI,EAAE,SAAS;IACf,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/common/config.ts"],"names":[],"mappings":";;;AAAA,mCAAyC;AACzC,2CAA8C;AAC9C,0CAAiC;AAiEpB,QAAA,MAAM,GAAmB,IAAA,aAAE,EACtC,OAAO,EACP;IACE,MAAM,EAAE,SAAS;IACjB,OAAO,EAAE,EAAE;IACX,GAAG,EAAE,SAAS;IACd,IAAI,EAAE,SAAS;IACf,SAAS,EAAE,KAAc;IACzB,OAAO,EAAE,UAAmB;IAC5B,QAAQ,EAAE,aAAa;IACvB,UAAU,EAAE,EAAE;IACd,aAAa,EAAE,IAAa;IAC5B,WAAW,EAAE,KAAK;IAClB,IAAI,EAAE,IAAI;IACV,QAAQ,EAAE,sBAAc,CAAC,EAAE;IAC3B,IAAI,EAAE,WAAW;IACjB,QAAQ,EAAE,2BAAe;CAC1B,EACD,EAAE,CACH,CAAC"}
|
|
@@ -2,7 +2,7 @@ export declare const defaultRegistry = "https://registry.npmjs.org/";
|
|
|
2
2
|
export declare const filesTar = "files";
|
|
3
3
|
export declare const filesOnceTar = "files_once";
|
|
4
4
|
export declare const piralBaseRoot = "piral-base/package.json";
|
|
5
|
-
export declare const frameworkLibs: ("piral" | "piral-core" | "piral-base")[];
|
|
5
|
+
export declare const frameworkLibs: ("piral-native" | "piral" | "piral-core" | "piral-base")[];
|
|
6
6
|
export declare const entryModuleExtensions: string[];
|
|
7
7
|
export declare const bundlerNames: ("esbuild" | "parcel" | "parcel2" | "rollup" | "webpack" | "webpack5" | "vite" | "xbuild")[];
|
|
8
8
|
export declare const declarationEntryExtensions: string[];
|
package/lib/common/constants.js
CHANGED
|
@@ -5,7 +5,7 @@ exports.defaultRegistry = 'https://registry.npmjs.org/';
|
|
|
5
5
|
exports.filesTar = 'files';
|
|
6
6
|
exports.filesOnceTar = 'files_once';
|
|
7
7
|
exports.piralBaseRoot = 'piral-base/package.json';
|
|
8
|
-
exports.frameworkLibs = ['piral', 'piral-core', 'piral-base'];
|
|
8
|
+
exports.frameworkLibs = ['piral-native', 'piral', 'piral-core', 'piral-base'];
|
|
9
9
|
exports.entryModuleExtensions = ['.ts', '.tsx', '.js', '.jsx'];
|
|
10
10
|
exports.bundlerNames = [
|
|
11
11
|
'esbuild',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/common/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,eAAe,GAAG,6BAA6B,CAAC;AAChD,QAAA,QAAQ,GAAG,OAAO,CAAC;AACnB,QAAA,YAAY,GAAG,YAAY,CAAC;AAC5B,QAAA,aAAa,GAAG,yBAAyB,CAAC;AAC1C,QAAA,aAAa,GAAG,CAAC,OAAgB,EAAE,YAAqB,EAAE,YAAqB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/common/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,eAAe,GAAG,6BAA6B,CAAC;AAChD,QAAA,QAAQ,GAAG,OAAO,CAAC;AACnB,QAAA,YAAY,GAAG,YAAY,CAAC;AAC5B,QAAA,aAAa,GAAG,yBAAyB,CAAC;AAC1C,QAAA,aAAa,GAAG,CAAC,cAAuB,EAAE,OAAgB,EAAE,YAAqB,EAAE,YAAqB,CAAC,CAAC;AAC1G,QAAA,qBAAqB,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;AACvD,QAAA,YAAY,GAAG;IAC1B,SAAkB;IAClB,QAAiB;IACjB,SAAkB;IAClB,QAAiB;IACjB,SAAkB;IAClB,UAAmB;IACnB,MAAe;IACf,QAAiB;CAClB,CAAC;AACW,QAAA,0BAA0B,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,6BAAqB,CAAC,CAAC;AACzE,QAAA,mBAAmB,GAAG;IACjC,sBAAsB;IACtB,aAAa;IACb,SAAS;IACT,OAAO;IACP,WAAW;IACX,cAAc;IACd,kBAAkB;IAClB,OAAO;IACP,gBAAgB;CACjB,CAAC"}
|
|
@@ -25,10 +25,16 @@ function findPiralBaseApi(root) {
|
|
|
25
25
|
const projectDir = (0, path_1.dirname)(packageJsonPath);
|
|
26
26
|
// By default support for piral-base < 0.15
|
|
27
27
|
const { piletApiTypings = 'lib/types.d.ts' } = project;
|
|
28
|
-
return
|
|
28
|
+
return [
|
|
29
|
+
{
|
|
30
|
+
file: (0, path_1.resolve)(projectDir, piletApiTypings),
|
|
31
|
+
name: 'PiletApi',
|
|
32
|
+
},
|
|
33
|
+
];
|
|
29
34
|
}
|
|
30
|
-
catch (
|
|
31
|
-
|
|
35
|
+
catch (err) {
|
|
36
|
+
(0, log_1.log)('generalError_0002', `Could not find the root API of "piral-base" from "${root}": ${err}`);
|
|
37
|
+
return [];
|
|
32
38
|
}
|
|
33
39
|
}
|
|
34
40
|
function findDeclaredTypings(root) {
|
|
@@ -130,17 +136,15 @@ function createPiralDeclaration(baseDir, entry, target, forceOverwrite, logLevel
|
|
|
130
136
|
root,
|
|
131
137
|
files,
|
|
132
138
|
types: findDeclaredTypings(root),
|
|
133
|
-
apis:
|
|
134
|
-
{
|
|
135
|
-
file: findPiralBaseApi(root),
|
|
136
|
-
name: 'PiletApi',
|
|
137
|
-
},
|
|
138
|
-
],
|
|
139
|
+
apis: findPiralBaseApi(root),
|
|
139
140
|
imports: externals,
|
|
140
141
|
logLevel,
|
|
141
142
|
logger: createLogger(),
|
|
142
143
|
};
|
|
143
|
-
|
|
144
|
+
if (options.apis.length) {
|
|
145
|
+
return yield createDeclarationFile(options, baseDir, target, forceOverwrite);
|
|
146
|
+
}
|
|
147
|
+
(0, log_1.log)('declarationCouldNotBeGenerated_0076', baseDir, 'The main Pilet API interface could not be found.');
|
|
144
148
|
});
|
|
145
149
|
}
|
|
146
150
|
exports.createPiralDeclaration = createPiralDeclaration;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"declaration.js","sourceRoot":"","sources":["../../src/common/declaration.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAAqF;AACrF,+BAA2D;AAC3D,+BAAoE;AAEpE,uCAAkE;AAClE,2CAAmE;AACnE,6BAAkF;AAGlF,SAAS,gBAAgB,CAAC,IAAY;IACpC,IAAI;QACF,MAAM,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,yBAAa,EAAE;YACrD,KAAK,EAAE,CAAC,IAAI,CAAC;SACd,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;QACzC,MAAM,UAAU,GAAG,IAAA,cAAO,EAAC,eAAe,CAAC,CAAC;QAC5C,2CAA2C;QAC3C,MAAM,EAAE,eAAe,GAAG,gBAAgB,EAAE,GAAG,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"declaration.js","sourceRoot":"","sources":["../../src/common/declaration.ts"],"names":[],"mappings":"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"}
|
package/lib/common/emulator.js
CHANGED
|
@@ -27,7 +27,7 @@ function createEmulatorSources(sourceDir, targetDir, targetFile, logLevel) {
|
|
|
27
27
|
const piralPkg = require((0, path_1.resolve)(sourceDir, packageJson));
|
|
28
28
|
const files = (_b = (_a = piralPkg.pilets) === null || _a === void 0 ? void 0 : _a.files) !== null && _b !== void 0 ? _b : [];
|
|
29
29
|
const allDeps = Object.assign(Object.assign({}, piralPkg.devDependencies), piralPkg.dependencies);
|
|
30
|
-
const allExternals = (0, npm_1.makeExternals)(allDeps, (_c = piralPkg.pilets) === null || _c === void 0 ? void 0 : _c.externals);
|
|
30
|
+
const allExternals = (0, npm_1.makeExternals)(sourceDir, allDeps, (_c = piralPkg.pilets) === null || _c === void 0 ? void 0 : _c.externals);
|
|
31
31
|
const externalPackages = yield Promise.all(allExternals.filter(package_1.isValidDependency).map((name) => __awaiter(this, void 0, void 0, function* () {
|
|
32
32
|
return ({
|
|
33
33
|
name,
|
|
@@ -104,7 +104,7 @@ exports.createEmulatorSources = createEmulatorSources;
|
|
|
104
104
|
function packageEmulator(rootDir) {
|
|
105
105
|
return __awaiter(this, void 0, void 0, function* () {
|
|
106
106
|
// finally package everything up
|
|
107
|
-
yield (0, npm_1.
|
|
107
|
+
yield (0, npm_1.createNpmPackage)(rootDir);
|
|
108
108
|
// get all files
|
|
109
109
|
const names = yield (0, io_1.getFileNames)(rootDir);
|
|
110
110
|
// cleanup
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"emulator.js","sourceRoot":"","sources":["../../src/common/emulator.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAA+C;AAC/C,uCAA2F;AAC3F,yCAA+D;AAC/D,2CAAqD;AACrD,iCAAoC;AACpC,+
|
|
1
|
+
{"version":3,"file":"emulator.js","sourceRoot":"","sources":["../../src/common/emulator.ts"],"names":[],"mappings":"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"}
|
package/lib/common/http.d.ts
CHANGED
|
@@ -6,4 +6,4 @@ export interface PostFileResult {
|
|
|
6
6
|
success: boolean;
|
|
7
7
|
response?: object;
|
|
8
8
|
}
|
|
9
|
-
export declare function postFile(target: string, scheme: PiletPublishScheme, key: string, file: Buffer, customFields?: Record<string, string>, customHeaders?: Record<string, string>, ca?: Buffer): Promise<PostFileResult>;
|
|
9
|
+
export declare function postFile(target: string, scheme: PiletPublishScheme, key: string, file: Buffer, customFields?: Record<string, string>, customHeaders?: Record<string, string>, ca?: Buffer, interactive?: boolean): Promise<PostFileResult>;
|
package/lib/common/http.js
CHANGED
|
@@ -6,11 +6,9 @@ const https_1 = require("https");
|
|
|
6
6
|
const os_1 = require("os");
|
|
7
7
|
const fs_1 = require("fs");
|
|
8
8
|
const log_1 = require("./log");
|
|
9
|
+
const info_1 = require("./info");
|
|
10
|
+
const interactive_1 = require("./interactive");
|
|
9
11
|
const external_1 = require("../external");
|
|
10
|
-
const os = (0, os_1.platform)();
|
|
11
|
-
const standardHeaders = {
|
|
12
|
-
'user-agent': `piral-cli/http.node-${os}`,
|
|
13
|
-
};
|
|
14
12
|
function getMessage(body) {
|
|
15
13
|
if (typeof body === 'string') {
|
|
16
14
|
try {
|
|
@@ -44,7 +42,7 @@ function downloadFile(target, ca) {
|
|
|
44
42
|
return external_1.axios.default
|
|
45
43
|
.get(target, {
|
|
46
44
|
responseType: 'stream',
|
|
47
|
-
headers: standardHeaders,
|
|
45
|
+
headers: info_1.standardHeaders,
|
|
48
46
|
httpsAgent,
|
|
49
47
|
})
|
|
50
48
|
.then((res) => {
|
|
@@ -59,12 +57,12 @@ function downloadFile(target, ca) {
|
|
|
59
57
|
});
|
|
60
58
|
}
|
|
61
59
|
exports.downloadFile = downloadFile;
|
|
62
|
-
function postFile(target, scheme, key, file, customFields = {}, customHeaders = {}, ca) {
|
|
60
|
+
function postFile(target, scheme, key, file, customFields = {}, customHeaders = {}, ca, interactive = false) {
|
|
63
61
|
const form = new external_1.FormData();
|
|
64
62
|
const httpsAgent = ca ? new https_1.Agent({ ca }) : undefined;
|
|
65
63
|
Object.keys(customFields).forEach((key) => form.append(key, customFields[key]));
|
|
66
64
|
form.append('file', file, 'pilet.tgz');
|
|
67
|
-
const headers = Object.assign(Object.assign(Object.assign({}, form.getHeaders()), standardHeaders), customHeaders);
|
|
65
|
+
const headers = Object.assign(Object.assign(Object.assign({}, form.getHeaders()), info_1.standardHeaders), customHeaders);
|
|
68
66
|
if (key) {
|
|
69
67
|
switch (scheme) {
|
|
70
68
|
case 'basic':
|
|
@@ -99,6 +97,13 @@ function postFile(target, scheme, key, file, customFields = {}, customHeaders =
|
|
|
99
97
|
// The request was made and the server responded with a status code
|
|
100
98
|
// that falls out of the range of 2xx
|
|
101
99
|
const { data, statusText, status } = error.response;
|
|
100
|
+
if (interactive && 'interactiveAuth' in data) {
|
|
101
|
+
const { interactiveAuth } = data;
|
|
102
|
+
if (typeof interactiveAuth === 'string') {
|
|
103
|
+
(0, log_1.log)('generalDebug_0003', `Received status "${status}" from HTTP - trying interactive log in to "${interactiveAuth}".`);
|
|
104
|
+
return (0, interactive_1.getTokenInteractively)(interactiveAuth, httpsAgent).then(({ mode, token }) => postFile(target, mode, token, file, customFields, customHeaders, ca, false));
|
|
105
|
+
}
|
|
106
|
+
}
|
|
102
107
|
const message = getMessage(data) || '';
|
|
103
108
|
(0, log_1.log)('unsuccessfulHttpPost_0066', statusText, status, message);
|
|
104
109
|
return {
|
package/lib/common/http.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/common/http.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAC5B,iCAA8B;AAE9B,
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/common/http.ts"],"names":[],"mappings":"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"}
|
package/lib/common/importmap.js
CHANGED
|
@@ -15,17 +15,8 @@ const log_1 = require("./log");
|
|
|
15
15
|
const version_1 = require("./version");
|
|
16
16
|
const hash_1 = require("./hash");
|
|
17
17
|
const io_1 = require("./io");
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
return require.resolve(name, {
|
|
21
|
-
paths: [baseDir],
|
|
22
|
-
});
|
|
23
|
-
}
|
|
24
|
-
catch (ex) {
|
|
25
|
-
(0, log_1.log)('generalDebug_0003', `Could not resolve the package "${name}" in "${baseDir}": ${ex}`);
|
|
26
|
-
return undefined;
|
|
27
|
-
}
|
|
28
|
-
}
|
|
18
|
+
const npm_1 = require("./npm");
|
|
19
|
+
const shorthandsUrls = ['', '.', '...'];
|
|
29
20
|
function getDependencyDetails(depName) {
|
|
30
21
|
const sep = depName.indexOf('@', 1);
|
|
31
22
|
const version = sep > 0 ? depName.substring(sep + 1) : '';
|
|
@@ -69,8 +60,8 @@ function resolveImportmap(dir, importmap) {
|
|
|
69
60
|
type: 'remote',
|
|
70
61
|
});
|
|
71
62
|
}
|
|
72
|
-
else if (url === identifier) {
|
|
73
|
-
const entry =
|
|
63
|
+
else if (url === identifier || shorthandsUrls.includes(url)) {
|
|
64
|
+
const entry = (0, npm_1.tryResolvePackage)(identifier, dir);
|
|
74
65
|
if (entry) {
|
|
75
66
|
const packageJson = yield (0, io_1.findFile)((0, path_1.dirname)(entry), 'package.json');
|
|
76
67
|
const [version, requireVersion] = getLocalDependencyVersion(packageJson, depName, versionSpec);
|
|
@@ -84,7 +75,7 @@ function resolveImportmap(dir, importmap) {
|
|
|
84
75
|
});
|
|
85
76
|
}
|
|
86
77
|
else {
|
|
87
|
-
(0, log_1.fail)('importMapReferenceNotFound_0027', dir,
|
|
78
|
+
(0, log_1.fail)('importMapReferenceNotFound_0027', dir, identifier);
|
|
88
79
|
}
|
|
89
80
|
}
|
|
90
81
|
else {
|
|
@@ -101,7 +92,7 @@ function resolveImportmap(dir, importmap) {
|
|
|
101
92
|
dependencies.push({
|
|
102
93
|
id: `${identifier}@${version}`,
|
|
103
94
|
requireId: `${identifier}@${requireVersion}`,
|
|
104
|
-
entry: isDirectory ?
|
|
95
|
+
entry: isDirectory ? (0, npm_1.tryResolvePackage)(entry, dir) : entry,
|
|
105
96
|
name: identifier,
|
|
106
97
|
ref: `${assetName}.js`,
|
|
107
98
|
type: 'local',
|
|
@@ -130,7 +121,7 @@ function resolveImportmap(dir, importmap) {
|
|
|
130
121
|
}
|
|
131
122
|
if (Array.isArray(inheritedImports)) {
|
|
132
123
|
for (const inheritedImport of inheritedImports) {
|
|
133
|
-
const packageJson =
|
|
124
|
+
const packageJson = (0, npm_1.tryResolvePackage)(`${inheritedImport}/package.json`, dir);
|
|
134
125
|
if (packageJson) {
|
|
135
126
|
const packageDir = (0, path_1.dirname)(packageJson);
|
|
136
127
|
const packageDetails = require(packageJson);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"importmap.js","sourceRoot":"","sources":["../../src/common/importmap.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAAwC;AACxC,+BAAkC;AAClC,uCAAgD;AAChD,iCAAqC;AACrC,6BAAkF;
|
|
1
|
+
{"version":3,"file":"importmap.js","sourceRoot":"","sources":["../../src/common/importmap.ts"],"names":[],"mappings":"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"}
|
package/lib/common/index.js
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
package/lib/common/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4CAA0B;AAC1B,4CAA0B;AAC1B,kDAAgC;AAChC,2CAAyB;AACzB,8CAA4B;AAC5B,gDAA8B;AAC9B,6CAA2B;AAC3B,0CAAwB;AACxB,0CAAwB;AACxB,yCAAuB;AACvB,yCAAuB;AACvB,yCAAuB;AACvB,8CAA4B;AAC5B,yCAAuB;AACvB,8CAA4B;AAC5B,uCAAqB;AACrB,6CAA2B;AAC3B,wCAAsB;AACtB,0CAAwB;AACxB,wCAAsB;AACtB,yCAAuB;AACvB,4CAA0B;AAC1B,6CAA2B;AAC3B,4CAA0B;AAC1B,4CAA0B;AAC1B,yCAAuB;AACvB,0CAAwB;AACxB,6CAA2B;AAC3B,4CAA0B;AAC1B,yCAAuB;AACvB,6CAA2B;AAC3B,wCAAsB"}
|
package/lib/common/info.d.ts
CHANGED
|
@@ -1,8 +1,12 @@
|
|
|
1
1
|
export declare function findCompatVersion(version: string): string;
|
|
2
2
|
export declare const nodeVersion: string;
|
|
3
|
+
export declare const cliName: any;
|
|
3
4
|
export declare const cliVersion: any;
|
|
4
5
|
export declare const compatVersion: string;
|
|
5
6
|
export declare const repositoryUrl: any;
|
|
6
7
|
export declare const isWindows: boolean;
|
|
7
8
|
export declare const pathSeparator: string;
|
|
8
9
|
export declare const cpuCount: number;
|
|
10
|
+
export declare const standardHeaders: {
|
|
11
|
+
'user-agent': string;
|
|
12
|
+
};
|
package/lib/common/info.js
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.cpuCount = exports.pathSeparator = exports.isWindows = exports.repositoryUrl = exports.compatVersion = exports.cliVersion = exports.nodeVersion = exports.findCompatVersion = void 0;
|
|
3
|
+
exports.standardHeaders = exports.cpuCount = exports.pathSeparator = exports.isWindows = exports.repositoryUrl = exports.compatVersion = exports.cliVersion = exports.cliName = exports.nodeVersion = exports.findCompatVersion = void 0;
|
|
4
4
|
const os_1 = require("os");
|
|
5
5
|
const info = require('../../package.json');
|
|
6
|
+
const os = (0, os_1.platform)();
|
|
6
7
|
function findCompatVersion(version) {
|
|
7
8
|
// we only care about major and minor
|
|
8
9
|
const [major, minor] = version.split('.');
|
|
@@ -14,10 +15,14 @@ function findCompatVersion(version) {
|
|
|
14
15
|
}
|
|
15
16
|
exports.findCompatVersion = findCompatVersion;
|
|
16
17
|
exports.nodeVersion = process.version.substring(1);
|
|
18
|
+
exports.cliName = info.name;
|
|
17
19
|
exports.cliVersion = info.version;
|
|
18
20
|
exports.compatVersion = findCompatVersion(exports.cliVersion);
|
|
19
21
|
exports.repositoryUrl = info.repository.url;
|
|
20
22
|
exports.isWindows = process.platform === 'win32';
|
|
21
23
|
exports.pathSeparator = exports.isWindows ? ';' : ':';
|
|
22
24
|
exports.cpuCount = (0, os_1.cpus)().length;
|
|
25
|
+
exports.standardHeaders = {
|
|
26
|
+
'user-agent': `piral-cli/http.node-${os}`,
|
|
27
|
+
};
|
|
23
28
|
//# sourceMappingURL=info.js.map
|
package/lib/common/info.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"info.js","sourceRoot":"","sources":["../../src/common/info.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"info.js","sourceRoot":"","sources":["../../src/common/info.ts"],"names":[],"mappings":";;;AAAA,2BAAoC;AAEpC,MAAM,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAC3C,MAAM,EAAE,GAAG,IAAA,aAAQ,GAAE,CAAC;AAEtB,SAAgB,iBAAiB,CAAC,OAAe;IAC/C,qCAAqC;IACrC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAE1C,IAAI,KAAK,KAAK,GAAG,EAAE;QACjB,kEAAkE;QAClE,OAAO,GAAG,KAAK,IAAI,KAAK,EAAE,CAAC;KAC5B;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAVD,8CAUC;AAEY,QAAA,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AAC3C,QAAA,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC;AACpB,QAAA,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC;AAC1B,QAAA,aAAa,GAAG,iBAAiB,CAAC,kBAAU,CAAC,CAAC;AAC9C,QAAA,aAAa,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;AACpC,QAAA,SAAS,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC;AACzC,QAAA,aAAa,GAAG,iBAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;AACtC,QAAA,QAAQ,GAAG,IAAA,SAAI,GAAE,CAAC,MAAM,CAAC;AACzB,QAAA,eAAe,GAAG;IAC7B,YAAY,EAAE,uBAAuB,EAAE,EAAE;CAC1C,CAAC"}
|
package/lib/common/inspect.js
CHANGED
|
@@ -3,12 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.inspectPilet = exports.inspectPackage = void 0;
|
|
4
4
|
const path_1 = require("path");
|
|
5
5
|
const archive_1 = require("./archive");
|
|
6
|
+
const external_1 = require("../external");
|
|
6
7
|
const packageRoot = 'package/';
|
|
7
8
|
function getPackageJson(files) {
|
|
8
9
|
const fileName = `${packageRoot}package.json`;
|
|
9
10
|
const fileContent = files[fileName];
|
|
10
11
|
const content = fileContent.toString('utf8');
|
|
11
|
-
return
|
|
12
|
+
return external_1.jju.parse(content);
|
|
12
13
|
}
|
|
13
14
|
function getPiletMainPath(data, files) {
|
|
14
15
|
const paths = [
|