piral-cli 0.15.0-alpha.4122 → 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/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/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 +37 -16
- package/lib/common/clients/npm.js.map +1 -1
- package/lib/common/clients/pnpm.d.ts +4 -0
- package/lib/common/clients/pnpm.js +43 -9
- 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 +45 -11
- package/lib/common/clients/yarn.js.map +1 -1
- package/lib/common/declaration.js +12 -9
- 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/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 +9 -16
- package/lib/common/npm.js +110 -152
- 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 -6
- package/lib/common/package.js +13 -4
- 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 +1982 -92
- package/lib/helpers.js +1 -1
- package/lib/helpers.js.map +1 -1
- package/lib/injectors/pilet.js +2 -2
- package/lib/injectors/pilet.js.map +1 -1
- package/lib/messages.d.ts +1 -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/internal.d.ts +9 -1
- package/lib/types/public.d.ts +1 -1
- 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/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 +32 -15
- package/src/common/clients/pnpm.ts +39 -10
- package/src/common/clients/rush.ts +111 -0
- package/src/common/clients/yarn.ts +41 -12
- package/src/common/declaration.ts +15 -9
- package/src/common/emulator.ts +3 -3
- package/src/common/http.ts +20 -6
- 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 +109 -76
- package/src/common/npm.ts +119 -146
- package/src/common/pack.test.ts +1 -1
- package/src/common/pack.ts +2 -2
- package/src/common/package.ts +19 -10
- package/src/common/scaffold.ts +6 -2
- package/src/common/version.ts +4 -4
- package/src/external/index.ts +2 -1
- package/src/helpers.ts +1 -1
- package/src/injectors/pilet.ts +3 -3
- package/src/messages.ts +1 -1
- 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 +1 -1
package/lib/common/npm.js
CHANGED
|
@@ -9,10 +9,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.makeExternals = exports.makePiletExternals = exports.getPackageVersion = exports.getGitPackageVersion = exports.getFilePackageVersion = exports.getPackageName = exports.combinePackageRef = exports.isLinkedPackage = exports.findPackageRoot = exports.tryResolvePackage = exports.getCurrentPackageDetails = exports.dissectPackageName = exports.makeFilePath = exports.makeGitUrl = exports.isGitPackage = exports.isLocalPackage = exports.findLatestVersion = exports.findSpecificVersion = exports.
|
|
12
|
+
exports.makeExternals = exports.mergeExternals = exports.makePiletExternals = exports.getPackageVersion = exports.getGitPackageVersion = exports.getFilePackageVersion = exports.getPackageName = exports.combinePackageRef = exports.isLinkedPackage = exports.findPackageRoot = exports.tryResolvePackage = exports.getCurrentPackageDetails = exports.dissectPackageName = exports.makeFilePath = exports.makeGitUrl = exports.isGitPackage = exports.isLocalPackage = exports.findLatestVersion = exports.findSpecificVersion = exports.findNpmTarball = exports.createNpmPackage = exports.publishNpmPackage = exports.initNpmProject = exports.installNpmPackage = exports.installNpmDependencies = exports.isMonorepoPackageRef = exports.determineNpmClient = void 0;
|
|
13
13
|
const path_1 = require("path");
|
|
14
14
|
const fs_1 = require("fs");
|
|
15
15
|
const log_1 = require("./log");
|
|
16
|
+
const clients_1 = require("./clients");
|
|
16
17
|
const config_1 = require("./config");
|
|
17
18
|
const constants_1 = require("./constants");
|
|
18
19
|
const inspect_1 = require("./inspect");
|
|
@@ -20,59 +21,42 @@ const io_1 = require("./io");
|
|
|
20
21
|
const helpers_1 = require("../helpers");
|
|
21
22
|
const gitPrefix = 'git+';
|
|
22
23
|
const filePrefix = 'file:';
|
|
24
|
+
const pathPrefixes = ['/', './', '../', '.\\', '..\\', '~/', '~\\', filePrefix];
|
|
23
25
|
function isProjectReference(name) {
|
|
24
26
|
const target = (0, path_1.resolve)(name, 'package.json');
|
|
25
27
|
return (0, io_1.checkExists)(target);
|
|
26
28
|
}
|
|
27
|
-
function
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
});
|
|
32
|
-
});
|
|
33
|
-
}
|
|
34
|
-
exports.detectPnpm = detectPnpm;
|
|
35
|
-
function detectNpm(root) {
|
|
36
|
-
return new Promise((res) => {
|
|
37
|
-
(0, fs_1.access)((0, path_1.resolve)(root, 'package-lock.json'), fs_1.constants.F_OK, (noPackageLock) => {
|
|
38
|
-
res(!noPackageLock);
|
|
39
|
-
});
|
|
40
|
-
});
|
|
41
|
-
}
|
|
42
|
-
exports.detectNpm = detectNpm;
|
|
43
|
-
function detectYarn(root) {
|
|
44
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
45
|
-
return !!(yield (0, io_1.findFile)(root, 'yarn.lock'));
|
|
46
|
-
});
|
|
47
|
-
}
|
|
48
|
-
exports.detectYarn = detectYarn;
|
|
49
|
-
function getLernaConfigPath(root) {
|
|
50
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
51
|
-
(0, log_1.log)('generalDebug_0003', 'Trying to get the configuration file for Lerna ...');
|
|
52
|
-
const file = yield (0, io_1.findFile)(root, 'lerna.json');
|
|
53
|
-
if (file) {
|
|
54
|
-
(0, log_1.log)('generalDebug_0003', `Found Lerna config in "${file}".`);
|
|
55
|
-
return file;
|
|
56
|
-
}
|
|
57
|
-
return undefined;
|
|
58
|
-
});
|
|
29
|
+
function resolveAbsPath(basePath, fullName) {
|
|
30
|
+
const prefixed = fullName.startsWith(filePrefix);
|
|
31
|
+
const relPath = !prefixed ? fullName : fullName.replace(filePrefix, '');
|
|
32
|
+
return (0, path_1.resolve)(basePath, relPath);
|
|
59
33
|
}
|
|
60
|
-
|
|
61
|
-
function getLernaNpmClient(root) {
|
|
34
|
+
function detectMonorepoRoot(root) {
|
|
62
35
|
return __awaiter(this, void 0, void 0, function* () {
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
return
|
|
36
|
+
let previous = root;
|
|
37
|
+
do {
|
|
38
|
+
if (yield (0, io_1.checkExists)((0, path_1.resolve)(root, 'lerna.json'))) {
|
|
39
|
+
return [root, 'lerna'];
|
|
67
40
|
}
|
|
68
|
-
|
|
69
|
-
|
|
41
|
+
if (yield (0, io_1.checkExists)((0, path_1.resolve)(root, 'rush.json'))) {
|
|
42
|
+
return [root, 'rush'];
|
|
70
43
|
}
|
|
71
|
-
|
|
72
|
-
|
|
44
|
+
if (yield (0, io_1.checkExists)((0, path_1.resolve)(root, 'pnpm-workspace.yaml'))) {
|
|
45
|
+
return [root, 'pnpm'];
|
|
46
|
+
}
|
|
47
|
+
const packageJson = yield (0, io_1.readJson)(root, 'package.json');
|
|
48
|
+
if (Array.isArray(packageJson === null || packageJson === void 0 ? void 0 : packageJson.workspaces)) {
|
|
49
|
+
if (yield (0, io_1.checkExists)((0, path_1.resolve)(root, 'yarn.lock'))) {
|
|
50
|
+
return [root, 'yarn'];
|
|
51
|
+
}
|
|
52
|
+
return [root, 'npm'];
|
|
53
|
+
}
|
|
54
|
+
previous = root;
|
|
55
|
+
root = (0, path_1.dirname)(root);
|
|
56
|
+
} while (root !== previous);
|
|
57
|
+
return [];
|
|
73
58
|
});
|
|
74
59
|
}
|
|
75
|
-
exports.getLernaNpmClient = getLernaNpmClient;
|
|
76
60
|
/**
|
|
77
61
|
* For details about how this works consult issue
|
|
78
62
|
* https://github.com/smapiot/piral/issues/203
|
|
@@ -81,35 +65,32 @@ exports.getLernaNpmClient = getLernaNpmClient;
|
|
|
81
65
|
function determineNpmClient(root, selected) {
|
|
82
66
|
return __awaiter(this, void 0, void 0, function* () {
|
|
83
67
|
if (!selected || !helpers_1.clientTypeKeys.includes(selected)) {
|
|
84
|
-
(0, log_1.log)('generalDebug_0003', 'No npm client selected. Checking for lock files ...');
|
|
85
|
-
const
|
|
86
|
-
const
|
|
87
|
-
(0, log_1.log)('generalDebug_0003', `Results of the lock file check:
|
|
68
|
+
(0, log_1.log)('generalDebug_0003', 'No npm client selected. Checking for lock or config files ...');
|
|
69
|
+
const searchedClients = yield (0, clients_1.detectClients)(root);
|
|
70
|
+
const foundClients = searchedClients.filter((m) => m.result);
|
|
71
|
+
(0, log_1.log)('generalDebug_0003', `Results of the lock file check: ${searchedClients.map((m) => `${m.client}=${m.result}`).join(', ')}`);
|
|
88
72
|
const defaultClient = config_1.config.npmClient;
|
|
89
|
-
if (
|
|
90
|
-
const
|
|
91
|
-
if (
|
|
92
|
-
|
|
93
|
-
|
|
73
|
+
if (foundClients.length > 1) {
|
|
74
|
+
const wrapperClient = foundClients.find((m) => (0, clients_1.isWrapperClient)(m.client));
|
|
75
|
+
if (wrapperClient) {
|
|
76
|
+
const { client } = wrapperClient;
|
|
77
|
+
(0, log_1.log)('generalDebug_0003', `Found valid wrapper client via lock or config file: "${client}".`);
|
|
94
78
|
}
|
|
95
79
|
}
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
else if (hasPnpm) {
|
|
105
|
-
(0, log_1.log)('generalDebug_0003', `Found valid pnpm client via lockfile.`);
|
|
106
|
-
return 'pnpm';
|
|
80
|
+
if (foundClients.length > 0) {
|
|
81
|
+
const { client } = foundClients[0];
|
|
82
|
+
if (foundClients.length > 1) {
|
|
83
|
+
const clientStr = `"${foundClients.map((m) => m.client).join('", "')}"`;
|
|
84
|
+
(0, log_1.log)('generalWarning_0001', `Found multiple clients via their lock or config files: ${clientStr}.`);
|
|
85
|
+
}
|
|
86
|
+
(0, log_1.log)('generalDebug_0003', `Found valid direct client via lock or config file: "${client}".`);
|
|
87
|
+
return client;
|
|
107
88
|
}
|
|
108
89
|
if (helpers_1.clientTypeKeys.includes(defaultClient)) {
|
|
109
|
-
(0, log_1.log)('generalDebug_0003', `
|
|
90
|
+
(0, log_1.log)('generalDebug_0003', `Using the default client: "${defaultClient}".`);
|
|
110
91
|
return defaultClient;
|
|
111
92
|
}
|
|
112
|
-
(0, log_1.log)('generalDebug_0003', 'Using the default npm client.');
|
|
93
|
+
(0, log_1.log)('generalDebug_0003', 'Using the default "npm" client.');
|
|
113
94
|
return 'npm';
|
|
114
95
|
}
|
|
115
96
|
return selected;
|
|
@@ -117,97 +98,68 @@ function determineNpmClient(root, selected) {
|
|
|
117
98
|
}
|
|
118
99
|
exports.determineNpmClient = determineNpmClient;
|
|
119
100
|
function isMonorepoPackageRef(refName, root) {
|
|
120
|
-
var _a, _b, _c;
|
|
121
101
|
return __awaiter(this, void 0, void 0, function* () {
|
|
122
|
-
const
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
return (_c = (_b = (_a = details === null || details === void 0 ? void 0 : details.dependencies) === null || _a === void 0 ? void 0 : _a[refName]) === null || _b === void 0 ? void 0 : _b.extraneous) !== null && _c !== void 0 ? _c : false;
|
|
102
|
+
const [monorepoRoot, client] = yield detectMonorepoRoot(root);
|
|
103
|
+
if (monorepoRoot) {
|
|
104
|
+
const c = clients_1.clients[client];
|
|
105
|
+
return yield c.isProject(monorepoRoot, refName);
|
|
127
106
|
}
|
|
128
107
|
return false;
|
|
129
108
|
});
|
|
130
109
|
}
|
|
131
110
|
exports.isMonorepoPackageRef = isMonorepoPackageRef;
|
|
132
|
-
function
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
if (file !== undefined) {
|
|
136
|
-
return (0, path_1.dirname)(file);
|
|
137
|
-
}
|
|
138
|
-
let previous = root;
|
|
139
|
-
do {
|
|
140
|
-
const packageJson = yield (0, io_1.readJson)(root, 'package.json');
|
|
141
|
-
if (Array.isArray(packageJson === null || packageJson === void 0 ? void 0 : packageJson.workspaces)) {
|
|
142
|
-
return root;
|
|
143
|
-
}
|
|
144
|
-
previous = root;
|
|
145
|
-
root = (0, path_1.dirname)(root);
|
|
146
|
-
} while (root !== previous);
|
|
147
|
-
return undefined;
|
|
148
|
-
});
|
|
111
|
+
function installNpmDependencies(client, target = '.') {
|
|
112
|
+
const { installDependencies } = clients_1.clients[client];
|
|
113
|
+
return installDependencies(target);
|
|
149
114
|
}
|
|
150
|
-
exports.
|
|
151
|
-
function
|
|
115
|
+
exports.installNpmDependencies = installNpmDependencies;
|
|
116
|
+
function installNpmPackage(client, packageRef, target = '.', ...flags) {
|
|
152
117
|
return __awaiter(this, void 0, void 0, function* () {
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
}
|
|
159
|
-
|
|
160
|
-
if (Array.isArray(packageJson === null || packageJson === void 0 ? void 0 : packageJson.workspaces)) {
|
|
161
|
-
return 'yarn';
|
|
162
|
-
}
|
|
118
|
+
try {
|
|
119
|
+
const { installPackage } = clients_1.clients[client];
|
|
120
|
+
return yield installPackage(packageRef, target, ...flags);
|
|
121
|
+
}
|
|
122
|
+
catch (ex) {
|
|
123
|
+
(0, log_1.log)('generalError_0002', `Could not install the package "${packageRef}" using ${client}. Make sure ${client} is correctly installed and accessible: ${ex}`);
|
|
124
|
+
throw ex;
|
|
163
125
|
}
|
|
164
|
-
return 'none';
|
|
165
126
|
});
|
|
166
127
|
}
|
|
167
|
-
exports.
|
|
168
|
-
function
|
|
169
|
-
const
|
|
170
|
-
return
|
|
171
|
-
}
|
|
172
|
-
exports.
|
|
173
|
-
function
|
|
174
|
-
const
|
|
175
|
-
return
|
|
176
|
-
}
|
|
177
|
-
exports.
|
|
178
|
-
function
|
|
179
|
-
const
|
|
180
|
-
return
|
|
181
|
-
}
|
|
182
|
-
exports.
|
|
183
|
-
function
|
|
184
|
-
const
|
|
185
|
-
return
|
|
186
|
-
}
|
|
187
|
-
exports.
|
|
188
|
-
function createPackage(target = '.') {
|
|
189
|
-
const c = require(`./clients/npm`);
|
|
190
|
-
return c.createPackage(target);
|
|
191
|
-
}
|
|
192
|
-
exports.createPackage = createPackage;
|
|
193
|
-
function findTarball(packageRef) {
|
|
194
|
-
const c = require(`./clients/npm`);
|
|
195
|
-
return c.findTarball(packageRef);
|
|
196
|
-
}
|
|
197
|
-
exports.findTarball = findTarball;
|
|
128
|
+
exports.installNpmPackage = installNpmPackage;
|
|
129
|
+
function initNpmProject(client, projectName, target) {
|
|
130
|
+
const { initProject } = clients_1.clients[client];
|
|
131
|
+
return initProject(projectName, target);
|
|
132
|
+
}
|
|
133
|
+
exports.initNpmProject = initNpmProject;
|
|
134
|
+
function publishNpmPackage(target = '.', file = '*.tgz', flags = []) {
|
|
135
|
+
const { publishPackage } = clients_1.clients.npm;
|
|
136
|
+
return publishPackage(target, file, ...flags);
|
|
137
|
+
}
|
|
138
|
+
exports.publishNpmPackage = publishNpmPackage;
|
|
139
|
+
function createNpmPackage(target = '.') {
|
|
140
|
+
const { createPackage } = clients_1.clients.npm;
|
|
141
|
+
return createPackage(target);
|
|
142
|
+
}
|
|
143
|
+
exports.createNpmPackage = createNpmPackage;
|
|
144
|
+
function findNpmTarball(packageRef) {
|
|
145
|
+
const { findTarball } = clients_1.clients.npm;
|
|
146
|
+
return findTarball(packageRef);
|
|
147
|
+
}
|
|
148
|
+
exports.findNpmTarball = findNpmTarball;
|
|
198
149
|
function findSpecificVersion(packageName, version) {
|
|
199
|
-
const
|
|
200
|
-
return
|
|
150
|
+
const { findSpecificVersion } = clients_1.clients.npm;
|
|
151
|
+
return findSpecificVersion(packageName, version);
|
|
201
152
|
}
|
|
202
153
|
exports.findSpecificVersion = findSpecificVersion;
|
|
203
154
|
function findLatestVersion(packageName) {
|
|
155
|
+
const { findSpecificVersion } = clients_1.clients.npm;
|
|
204
156
|
return findSpecificVersion(packageName, 'latest');
|
|
205
157
|
}
|
|
206
158
|
exports.findLatestVersion = findLatestVersion;
|
|
207
159
|
function isLocalPackage(baseDir, fullName) {
|
|
208
160
|
(0, log_1.log)('generalDebug_0003', 'Checking if its a local package ...');
|
|
209
161
|
if (fullName) {
|
|
210
|
-
if (
|
|
162
|
+
if (pathPrefixes.some((prefix) => fullName.startsWith(prefix))) {
|
|
211
163
|
(0, log_1.log)('generalDebug_0003', 'Found a local package by name.');
|
|
212
164
|
return true;
|
|
213
165
|
}
|
|
@@ -241,9 +193,7 @@ function makeGitUrl(fullName) {
|
|
|
241
193
|
}
|
|
242
194
|
exports.makeGitUrl = makeGitUrl;
|
|
243
195
|
function makeFilePath(basePath, fullName) {
|
|
244
|
-
const
|
|
245
|
-
const relPath = !prefixed ? fullName : fullName.replace(filePrefix, '');
|
|
246
|
-
const absPath = (0, path_1.resolve)(basePath, relPath);
|
|
196
|
+
const absPath = resolveAbsPath(basePath, fullName);
|
|
247
197
|
return `${filePrefix}${absPath}`;
|
|
248
198
|
}
|
|
249
199
|
exports.makeFilePath = makeFilePath;
|
|
@@ -266,7 +216,7 @@ function dissectPackageName(baseDir, fullName) {
|
|
|
266
216
|
return [gitUrl, 'latest', false, 'git'];
|
|
267
217
|
}
|
|
268
218
|
else if (isLocalPackage(baseDir, fullName)) {
|
|
269
|
-
const fullPath = (
|
|
219
|
+
const fullPath = resolveAbsPath(baseDir, fullName);
|
|
270
220
|
const exists = yield (0, io_1.checkExists)(fullPath);
|
|
271
221
|
if (!exists) {
|
|
272
222
|
(0, log_1.fail)('scaffoldPathDoesNotExist_0030', fullPath);
|
|
@@ -396,7 +346,8 @@ function isLinkedPackage(name, type, hadVersion) {
|
|
|
396
346
|
exports.isLinkedPackage = isLinkedPackage;
|
|
397
347
|
function combinePackageRef(name, version, type) {
|
|
398
348
|
if (type === 'registry') {
|
|
399
|
-
|
|
349
|
+
const tag = version || 'latest';
|
|
350
|
+
return `${name}@${tag}`;
|
|
400
351
|
}
|
|
401
352
|
return name;
|
|
402
353
|
}
|
|
@@ -443,19 +394,22 @@ function getPackageVersion(hadVersion, sourceName, sourceVersion, type, root) {
|
|
|
443
394
|
}
|
|
444
395
|
}
|
|
445
396
|
exports.getPackageVersion = getPackageVersion;
|
|
446
|
-
function getExternalsFrom(packageName) {
|
|
397
|
+
function getExternalsFrom(root, packageName) {
|
|
447
398
|
try {
|
|
448
|
-
|
|
399
|
+
const target = require.resolve(`${packageName}/package.json`, {
|
|
400
|
+
paths: [root],
|
|
401
|
+
});
|
|
402
|
+
return require(target).sharedDependencies;
|
|
449
403
|
}
|
|
450
404
|
catch (err) {
|
|
451
405
|
(0, log_1.log)('generalError_0002', `Could not get externals from "${packageName}": "${err}`);
|
|
452
406
|
return undefined;
|
|
453
407
|
}
|
|
454
408
|
}
|
|
455
|
-
function getCoreExternals(dependencies) {
|
|
409
|
+
function getCoreExternals(root, dependencies) {
|
|
456
410
|
for (const frameworkLib of constants_1.frameworkLibs) {
|
|
457
411
|
if (dependencies[frameworkLib]) {
|
|
458
|
-
const deps = getExternalsFrom(frameworkLib);
|
|
412
|
+
const deps = getExternalsFrom(root, frameworkLib);
|
|
459
413
|
if (deps) {
|
|
460
414
|
return deps;
|
|
461
415
|
}
|
|
@@ -464,20 +418,19 @@ function getCoreExternals(dependencies) {
|
|
|
464
418
|
(0, log_1.log)('frameworkLibMissing_0078', constants_1.frameworkLibs);
|
|
465
419
|
return [];
|
|
466
420
|
}
|
|
467
|
-
function makePiletExternals(dependencies, externals, fromEmulator, piralInfo) {
|
|
421
|
+
function makePiletExternals(root, dependencies, externals, fromEmulator, piralInfo) {
|
|
468
422
|
if (fromEmulator) {
|
|
469
|
-
const { sharedDependencies =
|
|
423
|
+
const { sharedDependencies = mergeExternals(externals, constants_1.legacyCoreExternals) } = piralInfo;
|
|
470
424
|
return sharedDependencies;
|
|
471
425
|
}
|
|
472
426
|
else {
|
|
473
|
-
return makeExternals(dependencies, externals);
|
|
427
|
+
return makeExternals(root, dependencies, externals);
|
|
474
428
|
}
|
|
475
429
|
}
|
|
476
430
|
exports.makePiletExternals = makePiletExternals;
|
|
477
|
-
function
|
|
478
|
-
|
|
479
|
-
|
|
480
|
-
const [include, exclude] = externals.reduce((prev, curr) => {
|
|
431
|
+
function mergeExternals(customExternals, coreExternals = []) {
|
|
432
|
+
if (customExternals && Array.isArray(customExternals)) {
|
|
433
|
+
const [include, exclude] = customExternals.reduce((prev, curr) => {
|
|
481
434
|
if (typeof curr === 'string') {
|
|
482
435
|
if (curr.startsWith('!')) {
|
|
483
436
|
prev[1].push(curr.substring(1));
|
|
@@ -493,5 +446,10 @@ function makeExternals(dependencies, externals, legacy = false) {
|
|
|
493
446
|
}
|
|
494
447
|
return coreExternals;
|
|
495
448
|
}
|
|
449
|
+
exports.mergeExternals = mergeExternals;
|
|
450
|
+
function makeExternals(root, dependencies, externals) {
|
|
451
|
+
const coreExternals = getCoreExternals(root, dependencies);
|
|
452
|
+
return mergeExternals(externals, coreExternals);
|
|
453
|
+
}
|
|
496
454
|
exports.makeExternals = makeExternals;
|
|
497
455
|
//# sourceMappingURL=npm.js.map
|
package/lib/common/npm.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npm.js","sourceRoot":"","sources":["../../src/common/npm.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"npm.js","sourceRoot":"","sources":["../../src/common/npm.ts"],"names":[],"mappings":"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"}
|
package/lib/common/pack.js
CHANGED
|
@@ -45,7 +45,7 @@ function createPiletPackage(baseDir, source, target) {
|
|
|
45
45
|
}
|
|
46
46
|
(0, log_1.progress)(`Packing pilet in ${dest} ...`);
|
|
47
47
|
(0, log_1.log)('generalDebug_0003', 'Creating package ...');
|
|
48
|
-
yield (0, npm_1.
|
|
48
|
+
yield (0, npm_1.createNpmPackage)(root);
|
|
49
49
|
(0, log_1.log)('generalDebug_0003', 'Successfully created package.');
|
|
50
50
|
const name = `${pckg.name}-${pckg.version}.tgz`.replace(/@/g, '').replace(/\//g, '-');
|
|
51
51
|
(0, log_1.log)('generalDebug_0003', `Assumed package name "${name}".`);
|
package/lib/common/pack.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pack.js","sourceRoot":"","sources":["../../src/common/pack.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAAqC;AACrC,+BAA4C;AAC5C,6BAAsC;AACtC,+
|
|
1
|
+
{"version":3,"file":"pack.js","sourceRoot":"","sources":["../../src/common/pack.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAAqC;AACrC,+BAA4C;AAC5C,6BAAsC;AACtC,+BAAyC;AACzC,mCAAyC;AAEzC,SAAe,OAAO,CAAC,IAAY,EAAE,IAAY,EAAE,IAAY;;QAC7D,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAElC,IAAI,IAAI,KAAK,IAAI,EAAE;YACjB,IAAA,SAAG,EAAC,mBAAmB,EAAE,qBAAqB,IAAI,SAAS,IAAI,OAAO,CAAC,CAAC;YACxE,MAAM,IAAI,GAAG,MAAM,IAAA,SAAI,EAAC,QAAQ,EAAE,IAAI,EAAE,sBAAc,CAAC,GAAG,CAAC,CAAC;YAC5D,IAAA,SAAG,EAAC,mBAAmB,EAAE,0BAA0B,CAAC,CAAC;YACrD,OAAO,IAAI,CAAC;SACb;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;CAAA;AAED,SAAsB,kBAAkB,CAAC,OAAe,EAAE,MAAc,EAAE,MAAc;;QACtF,MAAM,IAAI,GAAG,IAAA,cAAO,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACtC,MAAM,IAAI,GAAG,IAAA,cAAO,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACtC,IAAA,SAAG,EAAC,mBAAmB,EAAE,2BAA2B,IAAI,OAAO,CAAC,CAAC;QACjE,MAAM,IAAI,GAAG,MAAM,IAAA,aAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAClD,IAAA,SAAG,EAAC,mBAAmB,EAAE,4BAA4B,CAAC,CAAC;QAEvD,IAAI,CAAC,IAAI,EAAE;YACT,IAAA,UAAI,EAAC,0BAA0B,CAAC,CAAC;SAClC;QAED,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YACd,IAAA,UAAI,EAAC,6BAA6B,CAAC,CAAC;SACrC;QAED,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,IAAA,UAAI,EAAC,gCAAgC,CAAC,CAAC;SACxC;QAED,IAAA,cAAQ,EAAC,oBAAoB,IAAI,MAAM,CAAC,CAAC;QACzC,IAAA,SAAG,EAAC,mBAAmB,EAAE,sBAAsB,CAAC,CAAC;QACjD,MAAM,IAAA,sBAAgB,EAAC,IAAI,CAAC,CAAC;QAC7B,IAAA,SAAG,EAAC,mBAAmB,EAAE,+BAA+B,CAAC,CAAC;QAC1D,MAAM,IAAI,GAAG,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACtF,IAAA,SAAG,EAAC,mBAAmB,EAAE,yBAAyB,IAAI,IAAI,CAAC,CAAC;QAC5D,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAC7C,IAAA,SAAG,EAAC,mBAAmB,EAAE,gBAAgB,IAAI,IAAI,CAAC,CAAC;QACnD,OAAO,IAAI,CAAC;IACd,CAAC;CAAA;AA5BD,gDA4BC"}
|
package/lib/common/package.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { SourceLanguage, ForceOverwrite } from './enums';
|
|
2
|
-
import { Framework, FileInfo, PiletsInfo, TemplateFileLocation } from '../types';
|
|
2
|
+
import { Framework, FileInfo, PiletsInfo, TemplateFileLocation, PackageData } from '../types';
|
|
3
3
|
export declare function getPiralPath(root: string, name: string): string;
|
|
4
|
-
export declare function readPiralPackage(root: string, name: string): Promise<
|
|
4
|
+
export declare function readPiralPackage(root: string, name: string): Promise<PackageData>;
|
|
5
5
|
export declare function getPiralPackage(app: string, language: SourceLanguage, version: string, framework: Framework, bundler?: string): {
|
|
6
6
|
app: string;
|
|
7
7
|
scripts: {
|
|
@@ -26,8 +26,8 @@ export declare function getFileStats(root: string, name: string, fileMap?: Array
|
|
|
26
26
|
changed: boolean;
|
|
27
27
|
}[]>;
|
|
28
28
|
export declare function copyScaffoldingFiles(source: string, target: string, files: Array<string | TemplateFileLocation>, piralInfo?: any, variables?: Record<string, string>): Promise<void>;
|
|
29
|
-
export declare function copyPiralFiles(root: string, name: string, piralInfo:
|
|
30
|
-
export declare function getPiletsInfo(piralInfo:
|
|
29
|
+
export declare function copyPiralFiles(root: string, name: string, piralInfo: PackageData, forceOverwrite: ForceOverwrite, variables: Record<string, string>, originalFiles?: Array<FileInfo>): Promise<void>;
|
|
30
|
+
export declare function getPiletsInfo(piralInfo: Partial<PackageData>): PiletsInfo;
|
|
31
31
|
export declare function retrievePiralRoot(baseDir: string, entry: string): Promise<string>;
|
|
32
32
|
export declare function findDependencyVersion(pckg: Record<string, any>, rootPath: string, packageName: string): Promise<string>;
|
|
33
33
|
export declare function findPackageVersion(rootPath: string, packageName: string): Promise<string>;
|
|
@@ -55,14 +55,14 @@ export declare function retrievePiletsInfo(entryFile: string): Promise<{
|
|
|
55
55
|
postUpgrade: string;
|
|
56
56
|
}>;
|
|
57
57
|
export declare function isValidDependency(name: string): boolean;
|
|
58
|
-
export declare function patchPiletPackage(root: string, name: string, version: string, piralInfo:
|
|
58
|
+
export declare function patchPiletPackage(root: string, name: string, version: string, piralInfo: PackageData, fromEmulator: boolean, newInfo?: {
|
|
59
59
|
language: SourceLanguage;
|
|
60
60
|
bundler: string;
|
|
61
61
|
}): Promise<void>;
|
|
62
62
|
/**
|
|
63
63
|
* Returns true if its an emulator package, otherwise it has to be a "raw" app shell.
|
|
64
64
|
*/
|
|
65
|
-
export declare function checkAppShellPackage(appPackage:
|
|
65
|
+
export declare function checkAppShellPackage(appPackage: PackageData): boolean;
|
|
66
66
|
export declare function retrievePiletData(target: string, app?: string): Promise<{
|
|
67
67
|
dependencies: any;
|
|
68
68
|
devDependencies: any;
|
package/lib/common/package.js
CHANGED
|
@@ -269,6 +269,15 @@ function extendPackageOverridesFromTemplateFragment(root, piralInfo, files) {
|
|
|
269
269
|
function isTemplateFileLocation(item) {
|
|
270
270
|
return typeof item === 'object';
|
|
271
271
|
}
|
|
272
|
+
function tryFindPackageVersion(packageName) {
|
|
273
|
+
try {
|
|
274
|
+
const { version } = require(`${packageName}/package.json`);
|
|
275
|
+
return version;
|
|
276
|
+
}
|
|
277
|
+
catch (_a) {
|
|
278
|
+
return undefined;
|
|
279
|
+
}
|
|
280
|
+
}
|
|
272
281
|
function copyPiralFiles(root, name, piralInfo, forceOverwrite, variables, originalFiles) {
|
|
273
282
|
return __awaiter(this, void 0, void 0, function* () {
|
|
274
283
|
(0, log_1.log)('generalDebug_0003', `Copying the Piral files ...`);
|
|
@@ -373,7 +382,7 @@ function retrieveExternals(root, packageInfo) {
|
|
|
373
382
|
if (sharedDependencies.length === 0) {
|
|
374
383
|
const allDeps = Object.assign(Object.assign({}, packageInfo.devDependencies), packageInfo.dependencies);
|
|
375
384
|
const deps = (_a = packageInfo.pilets) === null || _a === void 0 ? void 0 : _a.externals;
|
|
376
|
-
return (0, npm_2.makeExternals)(allDeps, deps);
|
|
385
|
+
return (0, npm_2.makeExternals)(root, allDeps, deps);
|
|
377
386
|
}
|
|
378
387
|
return sharedDependencies.map((m) => m.name);
|
|
379
388
|
});
|
|
@@ -389,9 +398,9 @@ function retrievePiletsInfo(entryFile) {
|
|
|
389
398
|
if (!packageJson) {
|
|
390
399
|
(0, log_1.fail)('packageJsonMissing_0074');
|
|
391
400
|
}
|
|
401
|
+
const root = (0, path_1.dirname)(packageJson);
|
|
392
402
|
const packageInfo = require(packageJson);
|
|
393
403
|
const info = getPiletsInfo(packageInfo);
|
|
394
|
-
const root = (0, path_1.dirname)(packageJson);
|
|
395
404
|
const externals = yield retrieveExternals(root, packageInfo);
|
|
396
405
|
return Object.assign(Object.assign({}, info), { externals, name: packageInfo.name, version: packageInfo.version, dependencies: {
|
|
397
406
|
std: packageInfo.dependencies || {},
|
|
@@ -420,7 +429,7 @@ function patchPiletPackage(root, name, version, piralInfo, fromEmulator, newInfo
|
|
|
420
429
|
const scripts = newInfo
|
|
421
430
|
? Object.assign({ start: 'pilet debug', build: 'pilet build', upgrade: 'pilet upgrade' }, info.scripts) : info.scripts;
|
|
422
431
|
const peerModules = [];
|
|
423
|
-
const allExternals = (0, npm_2.makePiletExternals)(piralDependencies, externals, fromEmulator, piralInfo);
|
|
432
|
+
const allExternals = (0, npm_2.makePiletExternals)(root, piralDependencies, externals, fromEmulator, piralInfo);
|
|
424
433
|
const peerDependencies = Object.assign(Object.assign({}, allExternals.reduce((deps, name) => {
|
|
425
434
|
const valid = isValidDependency(name);
|
|
426
435
|
deps[name] = valid ? '*' : undefined;
|
|
@@ -436,7 +445,7 @@ function patchPiletPackage(root, name, version, piralInfo, fromEmulator, newInfo
|
|
|
436
445
|
deps[name] = getDependencyVersion(name, info.devDependencies, piralDependencies);
|
|
437
446
|
return deps;
|
|
438
447
|
}, {})), allExternals.filter(isValidDependency).reduce((deps, name) => {
|
|
439
|
-
const version = piralDependencies[name];
|
|
448
|
+
const version = piralDependencies[name] || tryFindPackageVersion(name);
|
|
440
449
|
if (version || newInfo) {
|
|
441
450
|
// set only if we have an explicit version or we are in the scaffolding case
|
|
442
451
|
deps[name] = version || 'latest';
|