piral-cli 0.14.24-beta.4161 → 0.14.24-beta.4163

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.
Files changed (44) hide show
  1. package/lib/apps/new-pilet.js +1 -7
  2. package/lib/apps/new-pilet.js.map +1 -1
  3. package/lib/apps/upgrade-pilet.js +1 -7
  4. package/lib/apps/upgrade-pilet.js.map +1 -1
  5. package/lib/common/clients/index.d.ts +19 -0
  6. package/lib/common/clients/index.js +40 -0
  7. package/lib/common/clients/index.js.map +1 -0
  8. package/lib/common/clients/lerna.d.ts +3 -1
  9. package/lib/common/clients/lerna.js +36 -3
  10. package/lib/common/clients/lerna.js.map +1 -1
  11. package/lib/common/clients/npm.d.ts +2 -1
  12. package/lib/common/clients/npm.js +20 -16
  13. package/lib/common/clients/npm.js.map +1 -1
  14. package/lib/common/clients/pnpm.d.ts +1 -0
  15. package/lib/common/clients/pnpm.js +14 -11
  16. package/lib/common/clients/pnpm.js.map +1 -1
  17. package/lib/common/clients/rush.d.ts +3 -0
  18. package/lib/common/clients/rush.js +64 -0
  19. package/lib/common/clients/rush.js.map +1 -0
  20. package/lib/common/clients/yarn.d.ts +1 -0
  21. package/lib/common/clients/yarn.js +16 -13
  22. package/lib/common/clients/yarn.js.map +1 -1
  23. package/lib/common/npm.d.ts +0 -9
  24. package/lib/common/npm.js +58 -121
  25. package/lib/common/npm.js.map +1 -1
  26. package/lib/common/scaffold.js +2 -2
  27. package/lib/common/scaffold.js.map +1 -1
  28. package/lib/helpers.js +1 -1
  29. package/lib/helpers.js.map +1 -1
  30. package/lib/types/public.d.ts +1 -1
  31. package/package.json +2 -2
  32. package/src/apps/new-pilet.ts +1 -9
  33. package/src/apps/upgrade-pilet.ts +1 -9
  34. package/src/common/clients/index.ts +33 -0
  35. package/src/common/clients/lerna.ts +33 -1
  36. package/src/common/clients/npm.ts +18 -15
  37. package/src/common/clients/pnpm.ts +13 -12
  38. package/src/common/clients/rush.ts +49 -0
  39. package/src/common/clients/yarn.ts +15 -14
  40. package/src/common/npm.test.ts +25 -38
  41. package/src/common/npm.ts +72 -123
  42. package/src/common/scaffold.ts +2 -2
  43. package/src/helpers.ts +1 -1
  44. 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.getCurrentPackageDetails = exports.dissectPackageName = exports.makeFilePath = exports.makeGitUrl = exports.isGitPackage = exports.isLocalPackage = exports.findLatestVersion = exports.findSpecificVersion = exports.findTarball = exports.createPackage = exports.publishPackage = exports.installPackage = exports.installDependencies = exports.bootstrapMonorepo = exports.detectMonorepo = exports.detectMonorepoRoot = exports.isMonorepoPackageRef = exports.determineNpmClient = exports.getLernaNpmClient = exports.getLernaConfigPath = exports.detectYarn = exports.detectNpm = exports.detectPnpm = void 0;
12
+ exports.makeExternals = exports.makePiletExternals = exports.getPackageVersion = exports.getGitPackageVersion = exports.getFilePackageVersion = exports.getPackageName = exports.combinePackageRef = exports.isLinkedPackage = exports.getCurrentPackageDetails = exports.dissectPackageName = exports.makeFilePath = exports.makeGitUrl = exports.isGitPackage = exports.isLocalPackage = exports.findLatestVersion = exports.findSpecificVersion = exports.findTarball = exports.createPackage = exports.publishPackage = exports.installPackage = exports.installDependencies = 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");
@@ -30,55 +31,26 @@ function resolveAbsPath(basePath, fullName) {
30
31
  const relPath = !prefixed ? fullName : fullName.replace(filePrefix, '');
31
32
  return (0, path_1.resolve)(basePath, relPath);
32
33
  }
33
- function detectPnpm(root) {
34
- return new Promise((res) => {
35
- (0, fs_1.access)((0, path_1.resolve)(root, 'pnpm-lock.yaml'), fs_1.constants.F_OK, (noPnpmLock) => {
36
- res(!noPnpmLock);
37
- });
38
- });
39
- }
40
- exports.detectPnpm = detectPnpm;
41
- function detectNpm(root) {
42
- return new Promise((res) => {
43
- (0, fs_1.access)((0, path_1.resolve)(root, 'package-lock.json'), fs_1.constants.F_OK, (noPackageLock) => {
44
- res(!noPackageLock);
45
- });
46
- });
47
- }
48
- exports.detectNpm = detectNpm;
49
- function detectYarn(root) {
50
- return __awaiter(this, void 0, void 0, function* () {
51
- return !!(yield (0, io_1.findFile)(root, 'yarn.lock'));
52
- });
53
- }
54
- exports.detectYarn = detectYarn;
55
- function getLernaConfigPath(root) {
56
- return __awaiter(this, void 0, void 0, function* () {
57
- (0, log_1.log)('generalDebug_0003', 'Trying to get the configuration file for Lerna ...');
58
- const file = yield (0, io_1.findFile)(root, 'lerna.json');
59
- if (file) {
60
- (0, log_1.log)('generalDebug_0003', `Found Lerna config in "${file}".`);
61
- return file;
62
- }
63
- return undefined;
64
- });
65
- }
66
- exports.getLernaConfigPath = getLernaConfigPath;
67
- function getLernaNpmClient(root) {
34
+ function detectMonorepoRoot(root) {
68
35
  return __awaiter(this, void 0, void 0, function* () {
69
- const file = yield getLernaConfigPath(root);
70
- if (file) {
71
- try {
72
- return require(file).npmClient;
36
+ let previous = root;
37
+ do {
38
+ const isMonorepo = (yield (0, io_1.checkExists)((0, path_1.resolve)(root, 'lerna.json'))) ||
39
+ (yield (0, io_1.checkExists)((0, path_1.resolve)(root, 'rush.json'))) ||
40
+ (yield (0, io_1.checkExists)((0, path_1.resolve)(root, 'pnpm-workspace.yaml')));
41
+ if (isMonorepo) {
42
+ return root;
73
43
  }
74
- catch (err) {
75
- (0, log_1.log)('generalError_0002', `Could not read lerna.json: ${err}.`);
44
+ const packageJson = yield (0, io_1.readJson)(root, 'package.json');
45
+ if (Array.isArray(packageJson === null || packageJson === void 0 ? void 0 : packageJson.workspaces)) {
46
+ return root;
76
47
  }
77
- }
48
+ previous = root;
49
+ root = (0, path_1.dirname)(root);
50
+ } while (root !== previous);
78
51
  return undefined;
79
52
  });
80
53
  }
81
- exports.getLernaNpmClient = getLernaNpmClient;
82
54
  /**
83
55
  * For details about how this works consult issue
84
56
  * https://github.com/smapiot/piral/issues/203
@@ -87,35 +59,32 @@ exports.getLernaNpmClient = getLernaNpmClient;
87
59
  function determineNpmClient(root, selected) {
88
60
  return __awaiter(this, void 0, void 0, function* () {
89
61
  if (!selected || !helpers_1.clientTypeKeys.includes(selected)) {
90
- (0, log_1.log)('generalDebug_0003', 'No npm client selected. Checking for lock files ...');
91
- const [hasNpm, hasYarn, hasPnpm] = yield Promise.all([detectNpm(root), detectYarn(root), detectPnpm(root)]);
92
- const found = +hasNpm + +hasYarn + +hasPnpm;
93
- (0, log_1.log)('generalDebug_0003', `Results of the lock file check: npm = ${hasNpm}, Yarn = ${hasYarn}, Pnpm = ${hasPnpm}`);
62
+ (0, log_1.log)('generalDebug_0003', 'No npm client selected. Checking for lock or config files ...');
63
+ const searchedClients = yield (0, clients_1.detectClients)(root);
64
+ const foundClients = searchedClients.filter((m) => m.result);
65
+ (0, log_1.log)('generalDebug_0003', `Results of the lock file check: ${searchedClients.map((m) => `${m.client}=${m.result}`).join(', ')}`);
94
66
  const defaultClient = config_1.config.npmClient;
95
- if (found !== 1) {
96
- const lernaClient = yield getLernaNpmClient(root);
97
- if (helpers_1.clientTypeKeys.includes(lernaClient)) {
98
- (0, log_1.log)('generalDebug_0003', `Found valid npm client via Lerna: ${lernaClient}.`);
99
- return lernaClient;
67
+ if (foundClients.length > 1) {
68
+ const wrapperClient = foundClients.find((m) => (0, clients_1.isWrapperClient)(m.client));
69
+ if (wrapperClient) {
70
+ const { client } = wrapperClient;
71
+ (0, log_1.log)('generalDebug_0003', `Found valid wrapper client via lock or config file: "${client}".`);
100
72
  }
101
73
  }
102
- else if (hasNpm) {
103
- (0, log_1.log)('generalDebug_0003', `Found valid npm client via lockfile.`);
104
- return 'npm';
105
- }
106
- else if (hasYarn) {
107
- (0, log_1.log)('generalDebug_0003', `Found valid Yarn client via lockfile.`);
108
- return 'yarn';
109
- }
110
- else if (hasPnpm) {
111
- (0, log_1.log)('generalDebug_0003', `Found valid pnpm client via lockfile.`);
112
- return 'pnpm';
74
+ if (foundClients.length > 0) {
75
+ const { client } = foundClients[0];
76
+ if (foundClients.length > 1) {
77
+ const clientStr = `"${foundClients.map((m) => m.client).join('", "')}"`;
78
+ (0, log_1.log)('generalWarning_0001', `Found multiple clients via their lock or config files: ${clientStr}.`);
79
+ }
80
+ (0, log_1.log)('generalDebug_0003', `Found valid direct client via lock or config file: "${client}".`);
81
+ return client;
113
82
  }
114
83
  if (helpers_1.clientTypeKeys.includes(defaultClient)) {
115
- (0, log_1.log)('generalDebug_0003', `Found valid Pnpm client the default client: "${defaultClient}".`);
84
+ (0, log_1.log)('generalDebug_0003', `Using the default client: "${defaultClient}".`);
116
85
  return defaultClient;
117
86
  }
118
- (0, log_1.log)('generalDebug_0003', 'Using the default npm client.');
87
+ (0, log_1.log)('generalDebug_0003', 'Using the default "npm" client.');
119
88
  return 'npm';
120
89
  }
121
90
  return selected;
@@ -125,88 +94,56 @@ exports.determineNpmClient = determineNpmClient;
125
94
  function isMonorepoPackageRef(refName, root) {
126
95
  var _a, _b, _c;
127
96
  return __awaiter(this, void 0, void 0, function* () {
128
- const c = require(`./clients/npm`);
129
97
  const newRoot = yield detectMonorepoRoot(root);
130
98
  if (newRoot) {
131
- const details = yield c.listPackage(refName, newRoot);
99
+ const { listPackage } = clients_1.clients.npm;
100
+ const details = yield listPackage(refName, newRoot);
132
101
  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;
133
102
  }
134
103
  return false;
135
104
  });
136
105
  }
137
106
  exports.isMonorepoPackageRef = isMonorepoPackageRef;
138
- function detectMonorepoRoot(root) {
139
- return __awaiter(this, void 0, void 0, function* () {
140
- const file = yield getLernaConfigPath(root);
141
- if (file !== undefined) {
142
- return (0, path_1.dirname)(file);
143
- }
144
- let previous = root;
145
- do {
146
- const packageJson = yield (0, io_1.readJson)(root, 'package.json');
147
- if (Array.isArray(packageJson === null || packageJson === void 0 ? void 0 : packageJson.workspaces)) {
148
- return root;
149
- }
150
- previous = root;
151
- root = (0, path_1.dirname)(root);
152
- } while (root !== previous);
153
- return undefined;
154
- });
155
- }
156
- exports.detectMonorepoRoot = detectMonorepoRoot;
157
- function detectMonorepo(root) {
158
- return __awaiter(this, void 0, void 0, function* () {
159
- const newRoot = yield detectMonorepoRoot(root);
160
- if (newRoot) {
161
- const file = yield getLernaConfigPath(newRoot);
162
- if (file !== undefined) {
163
- return 'lerna';
164
- }
165
- const packageJson = yield (0, io_1.readJson)(newRoot, 'package.json');
166
- if (Array.isArray(packageJson === null || packageJson === void 0 ? void 0 : packageJson.workspaces)) {
167
- return 'yarn';
168
- }
169
- }
170
- return 'none';
171
- });
172
- }
173
- exports.detectMonorepo = detectMonorepo;
174
- function bootstrapMonorepo(target = '.') {
175
- const c = require(`./clients/lerna`);
176
- return c.bootstrap(target);
177
- }
178
- exports.bootstrapMonorepo = bootstrapMonorepo;
179
107
  function installDependencies(client, target = '.') {
180
- const c = require(`./clients/${client}`);
181
- return c.installDependencies(target);
108
+ const { installDependencies } = clients_1.clients[client];
109
+ return installDependencies(target);
182
110
  }
183
111
  exports.installDependencies = installDependencies;
184
112
  function installPackage(client, packageRef, target = '.', ...flags) {
185
- const c = require(`./clients/${client}`);
186
- return c.installPackage(packageRef, target, ...flags);
113
+ return __awaiter(this, void 0, void 0, function* () {
114
+ try {
115
+ const { installPackage } = clients_1.clients[client];
116
+ return yield installPackage(packageRef, target, ...flags);
117
+ }
118
+ catch (ex) {
119
+ (0, log_1.log)('generalError_0002', `Could not install the package "${packageRef}" using ${client}. Make sure ${client} is correctly installed and accessible: ${ex}`);
120
+ throw ex;
121
+ }
122
+ });
187
123
  }
188
124
  exports.installPackage = installPackage;
189
125
  function publishPackage(target = '.', file = '*.tgz', flags = []) {
190
- const c = require(`./clients/npm`);
191
- return c.publishPackage(target, file, ...flags);
126
+ const { publishPackage } = clients_1.clients.npm;
127
+ return publishPackage(target, file, ...flags);
192
128
  }
193
129
  exports.publishPackage = publishPackage;
194
130
  function createPackage(target = '.') {
195
- const c = require(`./clients/npm`);
196
- return c.createPackage(target);
131
+ const { createPackage } = clients_1.clients.npm;
132
+ return createPackage(target);
197
133
  }
198
134
  exports.createPackage = createPackage;
199
135
  function findTarball(packageRef) {
200
- const c = require(`./clients/npm`);
201
- return c.findTarball(packageRef);
136
+ const { findTarball } = clients_1.clients.npm;
137
+ return findTarball(packageRef);
202
138
  }
203
139
  exports.findTarball = findTarball;
204
140
  function findSpecificVersion(packageName, version) {
205
- const c = require(`./clients/npm`);
206
- return c.findSpecificVersion(packageName, version);
141
+ const { findSpecificVersion } = clients_1.clients.npm;
142
+ return findSpecificVersion(packageName, version);
207
143
  }
208
144
  exports.findSpecificVersion = findSpecificVersion;
209
145
  function findLatestVersion(packageName) {
146
+ const { findSpecificVersion } = clients_1.clients.npm;
210
147
  return findSpecificVersion(packageName, 'latest');
211
148
  }
212
149
  exports.findLatestVersion = findLatestVersion;
@@ -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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"}
@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.scaffoldPiletSourceFiles = exports.getPiletScaffoldData = exports.scaffoldPiralSourceFiles = exports.getPiralScaffoldData = void 0;
13
13
  const path_1 = require("path");
14
- const npm_1 = require("./clients/npm");
14
+ const npm_1 = require("./npm");
15
15
  const enums_1 = require("./enums");
16
16
  const io_1 = require("./io");
17
17
  const log_1 = require("./log");
@@ -32,7 +32,7 @@ function getTemplateFiles(templatePackageName, registry, root, data, forceOverwr
32
32
  templatePackageName = (0, path_1.resolve)(process.cwd(), templatePackageName);
33
33
  }
34
34
  else {
35
- yield (0, npm_1.installPackage)(templatePackageName, __dirname, '--registry', registry);
35
+ yield (0, npm_1.installPackage)('npm', templatePackageName, __dirname, '--registry', registry);
36
36
  }
37
37
  const templateRunner = getTemplatePackage(templatePackageName);
38
38
  if (typeof templateRunner === 'function') {
@@ -1 +1 @@
1
- {"version":3,"file":"scaffold.js","sourceRoot":"","sources":["../../src/common/scaffold.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"scaffold.js","sourceRoot":"","sources":["../../src/common/scaffold.ts"],"names":[],"mappings":"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"}
package/lib/helpers.js CHANGED
@@ -8,7 +8,7 @@ exports.publishModeKeys = ['none', 'basic', 'bearer', 'digest'];
8
8
  exports.fromKeys = ['local', 'remote', 'npm'];
9
9
  exports.piralBuildTypeKeys = ['all', 'release', 'emulator', 'emulator-sources'];
10
10
  exports.piletBuildTypeKeys = ['default', 'standalone', 'manifest'];
11
- exports.clientTypeKeys = ['npm', 'pnpm', 'yarn'];
11
+ exports.clientTypeKeys = ['npm', 'pnpm', 'yarn', 'lerna', 'rush'];
12
12
  exports.bundlerKeys = ['none', ...constants_1.bundlerNames];
13
13
  exports.availableBundlers = [];
14
14
  exports.availableReleaseProviders = [];
@@ -1 +1 @@
1
- {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":";;;AAAA,0CAAgE;AAChE,kDAAiE;AAWpD,QAAA,UAAU,GAA8B,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;AACnE,QAAA,eAAe,GAA8B,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;AACnF,QAAA,QAAQ,GAA8B,CAAC,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;AACjE,QAAA,kBAAkB,GAA0B,CAAC,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,kBAAkB,CAAC,CAAC;AAC/F,QAAA,kBAAkB,GAA0B,CAAC,SAAS,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;AAClF,QAAA,cAAc,GAAyB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAC/D,QAAA,WAAW,GAAkB,CAAC,MAAM,EAAE,GAAG,wBAAY,CAAC,CAAC;AACvD,QAAA,iBAAiB,GAAkB,EAAE,CAAC;AACtC,QAAA,yBAAyB,GAAkB,EAAE,CAAC;AAC9C,QAAA,aAAa,GAAqB,CAAC,GAAG,yBAAa,CAAC,CAAC;AACrD,QAAA,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,sBAAc,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,sBAAc,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAC;AAEnH,SAAgB,qBAAqB,CAAC,GAAW;IAC/C,KAAK,MAAM,iBAAiB,IAAI,0BAAkB,EAAE;QAClD,IAAI,iBAAiB,KAAK,GAAG,EAAE;YAC7B,OAAO,sBAAc,CAAC,iBAAiB,CAAC,CAAC;SAC1C;KACF;IAED,OAAO,sBAAc,CAAC,EAAE,CAAC;AAC3B,CAAC;AARD,sDAQC;AAED,SAAgB,mBAAmB,CAAC,KAAqB;IACvD,KAAK,MAAM,iBAAiB,IAAI,0BAAkB,EAAE;QAClD,IAAI,sBAAc,CAAC,iBAAiB,CAAC,KAAK,KAAK,EAAE;YAC/C,OAAO,iBAAiB,CAAC;SAC1B;KACF;IAED,OAAO,0BAAkB,CAAC,CAAC,CAAC,CAAC;AAC/B,CAAC;AARD,kDAQC;AAEY,QAAA,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,sBAAc,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,sBAAc,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAC;AAElH,SAAgB,oBAAoB,CAAC,GAAW;IAC9C,KAAK,MAAM,gBAAgB,IAAI,yBAAiB,EAAE;QAChD,IAAI,gBAAgB,KAAK,GAAG,EAAE;YAC5B,OAAO,sBAAc,CAAC,gBAAgB,CAAC,CAAC;SACzC;KACF;IAED,OAAO,sBAAc,CAAC,EAAE,CAAC;AAC3B,CAAC;AARD,oDAQC;AAED,SAAgB,kBAAkB,CAAC,KAAqB;IACtD,KAAK,MAAM,gBAAgB,IAAI,yBAAiB,EAAE;QAChD,IAAI,sBAAc,CAAC,gBAAgB,CAAC,KAAK,KAAK,EAAE;YAC9C,OAAO,gBAAgB,CAAC;SACzB;KACF;IAED,OAAO,yBAAiB,CAAC,CAAC,CAAC,CAAC;AAC9B,CAAC;AARD,gDAQC"}
1
+ {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":";;;AAAA,0CAAgE;AAChE,kDAAiE;AAWpD,QAAA,UAAU,GAA8B,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;AACnE,QAAA,eAAe,GAA8B,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;AACnF,QAAA,QAAQ,GAA8B,CAAC,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;AACjE,QAAA,kBAAkB,GAA0B,CAAC,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,kBAAkB,CAAC,CAAC;AAC/F,QAAA,kBAAkB,GAA0B,CAAC,SAAS,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;AAClF,QAAA,cAAc,GAAyB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;AAChF,QAAA,WAAW,GAAkB,CAAC,MAAM,EAAE,GAAG,wBAAY,CAAC,CAAC;AACvD,QAAA,iBAAiB,GAAkB,EAAE,CAAC;AACtC,QAAA,yBAAyB,GAAkB,EAAE,CAAC;AAC9C,QAAA,aAAa,GAAqB,CAAC,GAAG,yBAAa,CAAC,CAAC;AACrD,QAAA,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,sBAAc,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,sBAAc,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAC;AAEnH,SAAgB,qBAAqB,CAAC,GAAW;IAC/C,KAAK,MAAM,iBAAiB,IAAI,0BAAkB,EAAE;QAClD,IAAI,iBAAiB,KAAK,GAAG,EAAE;YAC7B,OAAO,sBAAc,CAAC,iBAAiB,CAAC,CAAC;SAC1C;KACF;IAED,OAAO,sBAAc,CAAC,EAAE,CAAC;AAC3B,CAAC;AARD,sDAQC;AAED,SAAgB,mBAAmB,CAAC,KAAqB;IACvD,KAAK,MAAM,iBAAiB,IAAI,0BAAkB,EAAE;QAClD,IAAI,sBAAc,CAAC,iBAAiB,CAAC,KAAK,KAAK,EAAE;YAC/C,OAAO,iBAAiB,CAAC;SAC1B;KACF;IAED,OAAO,0BAAkB,CAAC,CAAC,CAAC,CAAC;AAC/B,CAAC;AARD,kDAQC;AAEY,QAAA,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,sBAAc,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,sBAAc,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAC;AAElH,SAAgB,oBAAoB,CAAC,GAAW;IAC9C,KAAK,MAAM,gBAAgB,IAAI,yBAAiB,EAAE;QAChD,IAAI,gBAAgB,KAAK,GAAG,EAAE;YAC5B,OAAO,sBAAc,CAAC,gBAAgB,CAAC,CAAC;SACzC;KACF;IAED,OAAO,sBAAc,CAAC,EAAE,CAAC;AAC3B,CAAC;AARD,oDAQC;AAED,SAAgB,kBAAkB,CAAC,KAAqB;IACtD,KAAK,MAAM,gBAAgB,IAAI,yBAAiB,EAAE;QAChD,IAAI,sBAAc,CAAC,gBAAgB,CAAC,KAAK,KAAK,EAAE;YAC9C,OAAO,gBAAgB,CAAC;SACzB;KACF;IAED,OAAO,yBAAiB,CAAC,CAAC,CAAC,CAAC;AAC9B,CAAC;AARD,gDAQC"}
@@ -192,7 +192,7 @@ export declare type PiletPublishSource = 'local' | 'npm' | 'remote';
192
192
  export declare type PiralBuildType = 'all' | 'release' | 'emulator' | 'emulator-sources';
193
193
  export declare type PiletBuildType = 'default' | 'standalone' | 'manifest';
194
194
  export declare type PackageType = 'registry' | 'file' | 'git';
195
- export declare type NpmClientType = 'npm' | 'yarn' | 'pnpm';
195
+ export declare type NpmClientType = 'npm' | 'yarn' | 'pnpm' | 'lerna' | 'rush';
196
196
  export declare type Framework = 'piral' | 'piral-core' | 'piral-base';
197
197
  export interface StandardEnvProps {
198
198
  production?: boolean;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "piral-cli",
3
- "version": "0.14.24-beta.4161",
3
+ "version": "0.14.24-beta.4163",
4
4
  "description": "The standard CLI for creating and building a Piral instance or a Pilet.",
5
5
  "keywords": [
6
6
  "portal",
@@ -77,5 +77,5 @@
77
77
  "typescript": "^4.0.2",
78
78
  "yargs": "^15.4.1"
79
79
  },
80
- "gitHead": "a3e3fde68f96231ad3a65b25b90d358d2648fc68"
80
+ "gitHead": "2b95511ed75a140e1657d7791245cddb3f57f9fe"
81
81
  }
@@ -27,8 +27,6 @@ import {
27
27
  isLinkedPackage,
28
28
  copyScaffoldingFiles,
29
29
  getPiralPath,
30
- detectMonorepo,
31
- bootstrapMonorepo,
32
30
  getPiletScaffoldData,
33
31
  config,
34
32
  } from '../common';
@@ -215,13 +213,7 @@ always-auth=true`,
215
213
 
216
214
  if (install) {
217
215
  progress(`Installing dependencies ...`);
218
- const monorepoKind = await detectMonorepo(root);
219
-
220
- if (monorepoKind === 'lerna') {
221
- await bootstrapMonorepo(root);
222
- } else {
223
- await installDependencies(npmClient, root);
224
- }
216
+ await installDependencies(npmClient, root);
225
217
  }
226
218
 
227
219
  if (postScaffold) {
@@ -22,8 +22,6 @@ import {
22
22
  ForceOverwrite,
23
23
  copyScaffoldingFiles,
24
24
  getPiralPath,
25
- detectMonorepo,
26
- bootstrapMonorepo,
27
25
  isMonorepoPackageRef,
28
26
  getPiletScaffoldData,
29
27
  SourceLanguage,
@@ -164,13 +162,7 @@ export async function upgradePilet(baseDir = process.cwd(), options: UpgradePile
164
162
 
165
163
  if (install) {
166
164
  progress(`Updating dependencies ...`);
167
- const monorepoKind = await detectMonorepo(root);
168
-
169
- if (monorepoKind === 'lerna') {
170
- await bootstrapMonorepo(root);
171
- } else {
172
- await installDependencies(npmClient, root);
173
- }
165
+ await installDependencies(npmClient, root);
174
166
  }
175
167
 
176
168
  if (postUpgrade) {
@@ -0,0 +1,33 @@
1
+ import * as lerna from './lerna';
2
+ import * as npm from './npm';
3
+ import * as pnpm from './pnpm';
4
+ import * as rush from './rush';
5
+ import * as yarn from './yarn';
6
+
7
+ export const clients = {
8
+ lerna,
9
+ npm,
10
+ pnpm,
11
+ rush,
12
+ yarn,
13
+ };
14
+
15
+ type ClientName = keyof typeof clients;
16
+
17
+ const directClients = ['npm', 'yarn', 'pnpm'];
18
+
19
+ export function isWrapperClient(client: ClientName) {
20
+ return !directClients.includes(client);
21
+ }
22
+
23
+ export function detectClients(root: string) {
24
+ return Promise.all(
25
+ Object.keys(clients).map(async (client: ClientName) => {
26
+ const result = await clients[client].detectClient(root);
27
+ return {
28
+ client,
29
+ result,
30
+ };
31
+ }),
32
+ );
33
+ }
@@ -1,17 +1,49 @@
1
1
  import { resolve } from 'path';
2
2
  import { log } from '../log';
3
+ import { findFile } from '../io';
3
4
  import { runCommand } from '../scripts';
4
5
  import { MemoryStream } from '../MemoryStream';
5
6
 
7
+ // Helpers:
8
+
6
9
  function runLernaProcess(args: Array<string>, target: string, output?: NodeJS.WritableStream) {
7
10
  log('generalDebug_0003', 'Starting the Lerna process ...');
8
11
  const cwd = resolve(process.cwd(), target);
9
12
  return runCommand('lerna', args, cwd, output);
10
13
  }
11
14
 
12
- export async function bootstrap(target = '.', ...flags: Array<string>) {
15
+ function convert(flags: Array<string>) {
16
+ return flags.map((flag) => {
17
+ switch (flag) {
18
+ case '--save-exact':
19
+ return '--exact';
20
+ case '--save-dev':
21
+ return '--dev';
22
+ case '--no-save':
23
+ // unfortunately no
24
+ return '';
25
+ default:
26
+ return flag;
27
+ }
28
+ });
29
+ }
30
+
31
+ // Client interface functions:
32
+
33
+ export async function installDependencies(target = '.', ...flags: Array<string>) {
13
34
  const ms = new MemoryStream();
14
35
  await runLernaProcess(['bootstrap', ...flags], target, ms);
15
36
  log('generalDebug_0003', `Lerna bootstrap result: ${ms.value}`);
16
37
  return ms.value;
17
38
  }
39
+
40
+ export async function installPackage(packageRef: string, target = '.', ...flags: Array<string>) {
41
+ const ms = new MemoryStream();
42
+ await runLernaProcess(['add', packageRef, ...convert(flags)], target, ms);
43
+ log('generalDebug_0003', `Lerna install package result: ${ms.value}`);
44
+ return ms.value;
45
+ }
46
+
47
+ export async function detectClient(root: string) {
48
+ return !!(await findFile(root, 'lerna.json'));
49
+ }
@@ -1,14 +1,19 @@
1
1
  import { resolve } from 'path';
2
2
  import { log } from '../log';
3
+ import { findFile } from '../io';
3
4
  import { runCommand } from '../scripts';
4
5
  import { MemoryStream } from '../MemoryStream';
5
6
 
7
+ // Helpers:
8
+
6
9
  function runNpmProcess(args: Array<string>, target: string, output?: NodeJS.WritableStream) {
7
10
  log('generalDebug_0003', 'Starting the npm process ...');
8
11
  const cwd = resolve(process.cwd(), target);
9
12
  return runCommand('npm', args, cwd, output);
10
13
  }
11
14
 
15
+ // Client interface functions:
16
+
12
17
  export async function installDependencies(target = '.', ...flags: Array<string>) {
13
18
  const ms = new MemoryStream();
14
19
  await runNpmProcess(['install', '--legacy-peer-deps', ...flags], target, ms);
@@ -16,6 +21,19 @@ export async function installDependencies(target = '.', ...flags: Array<string>)
16
21
  return ms.value;
17
22
  }
18
23
 
24
+ export async function installPackage(packageRef: string, target = '.', ...flags: Array<string>) {
25
+ const ms = new MemoryStream();
26
+ await runNpmProcess(['install', packageRef, '--legacy-peer-deps', ...flags], target, ms);
27
+ log('generalDebug_0003', `npm install package result: ${ms.value}`);
28
+ return ms.value;
29
+ }
30
+
31
+ export async function detectClient(root: string) {
32
+ return !!(await findFile(root, 'package-lock.json'));
33
+ }
34
+
35
+ // Functions to exclusively use from npm client:
36
+
19
37
  export async function unpackPackage(packageRef: string, target = '.', ...flags: Array<string>) {
20
38
  const ms = new MemoryStream();
21
39
  await runNpmProcess(['pack', packageRef, ...flags], target, ms);
@@ -23,21 +41,6 @@ export async function unpackPackage(packageRef: string, target = '.', ...flags:
23
41
  return ms.value;
24
42
  }
25
43
 
26
- export async function installPackage(packageRef: string, target = '.', ...flags: Array<string>) {
27
- try {
28
- const ms = new MemoryStream();
29
- await runNpmProcess(['install', packageRef, '--legacy-peer-deps', ...flags], target, ms);
30
- log('generalDebug_0003', `npm install package result: ${ms.value}`);
31
- return ms.value;
32
- } catch (ex) {
33
- log(
34
- 'generalError_0002',
35
- `Could not install the package "${packageRef}" using npm. Make sure npm is correctly installed and accessible: ${ex}`,
36
- );
37
- throw ex;
38
- }
39
- }
40
-
41
44
  export async function createPackage(target = '.', ...flags: Array<string>) {
42
45
  const ms = new MemoryStream();
43
46
  await runNpmProcess(['pack', ...flags], target, ms);
@@ -1,8 +1,11 @@
1
1
  import { resolve } from 'path';
2
2
  import { log } from '../log';
3
+ import { findFile } from '../io';
3
4
  import { runCommand } from '../scripts';
4
5
  import { MemoryStream } from '../MemoryStream';
5
6
 
7
+ // Helpers:
8
+
6
9
  function runPnpmProcess(args: Array<string>, target: string, output?: NodeJS.WritableStream) {
7
10
  log('generalDebug_0003', 'Starting the Pnpm process ...');
8
11
  const cwd = resolve(process.cwd(), target);
@@ -21,6 +24,8 @@ function convert(flags: Array<string>) {
21
24
  });
22
25
  }
23
26
 
27
+ // Client interface functions:
28
+
24
29
  export async function installDependencies(target = '.', ...flags: Array<string>) {
25
30
  const ms = new MemoryStream();
26
31
  await runPnpmProcess(['install', ...convert(flags)], target, ms);
@@ -29,16 +34,12 @@ export async function installDependencies(target = '.', ...flags: Array<string>)
29
34
  }
30
35
 
31
36
  export async function installPackage(packageRef: string, target = '.', ...flags: Array<string>) {
32
- try {
33
- const ms = new MemoryStream();
34
- await runPnpmProcess(['add', packageRef, ...convert(flags)], target, ms);
35
- log('generalDebug_0003', `Pnpm install package result: ${ms.value}`);
36
- return ms.value;
37
- } catch (ex) {
38
- log(
39
- 'generalError_0002',
40
- `Could not install the package "${packageRef}" using Pnpm. Make sure Pnpm is correctly installed and accessible: ${ex}`,
41
- );
42
- throw ex;
43
- }
37
+ const ms = new MemoryStream();
38
+ await runPnpmProcess(['add', packageRef, ...convert(flags)], target, ms);
39
+ log('generalDebug_0003', `Pnpm install package result: ${ms.value}`);
40
+ return ms.value;
41
+ }
42
+
43
+ export async function detectClient(root: string) {
44
+ return !!(await findFile(root, 'pnpm-lock.yaml'));
44
45
  }