piral-cli 0.14.24-beta.4163 → 0.14.24-beta.4191
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 -3
- 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.js +1 -1
- package/lib/apps/publish-pilet.js.map +1 -1
- package/lib/apps/publish-piral.js +1 -1
- package/lib/apps/publish-piral.js.map +1 -1
- package/lib/apps/upgrade-pilet.js +2 -2
- 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/common/clients/lerna.d.ts +3 -0
- package/lib/common/clients/lerna.js +32 -1
- package/lib/common/clients/lerna.js.map +1 -1
- package/lib/common/clients/npm.d.ts +2 -0
- package/lib/common/clients/npm.js +18 -1
- package/lib/common/clients/npm.js.map +1 -1
- package/lib/common/clients/pnpm.d.ts +3 -0
- package/lib/common/clients/pnpm.js +32 -1
- package/lib/common/clients/pnpm.js.map +1 -1
- package/lib/common/clients/rush.d.ts +3 -0
- package/lib/common/clients/rush.js +57 -3
- package/lib/common/clients/rush.js.map +1 -1
- package/lib/common/clients/yarn.d.ts +3 -0
- package/lib/common/clients/yarn.js +32 -1
- package/lib/common/clients/yarn.js.map +1 -1
- package/lib/common/emulator.js +2 -2
- package/lib/common/emulator.js.map +1 -1
- package/lib/common/inspect.js +2 -1
- package/lib/common/inspect.js.map +1 -1
- package/lib/common/npm.d.ts +9 -7
- package/lib/common/npm.js +53 -36
- 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 +14 -4
- package/lib/common/package.js.map +1 -1
- package/lib/common/scaffold.js +1 -1
- package/lib/common/scaffold.js.map +1 -1
- package/lib/external/index.js +1982 -92
- package/lib/injectors/pilet.js +2 -2
- package/lib/injectors/pilet.js.map +1 -1
- package/lib/plugin.js +4 -4
- package/lib/plugin.js.map +1 -1
- package/lib/types/internal.d.ts +9 -1
- package/package.json +4 -2
- package/src/apps/new-pilet.ts +9 -6
- package/src/apps/new-piral.ts +9 -5
- package/src/apps/publish-pilet.ts +2 -2
- package/src/apps/publish-piral.ts +2 -2
- package/src/apps/upgrade-pilet.ts +4 -4
- package/src/apps/upgrade-piral.ts +2 -2
- package/src/bundler.test.ts +1 -1
- package/src/bundler.ts +2 -2
- package/src/common/clients/lerna.ts +28 -0
- package/src/common/clients/npm.ts +14 -0
- package/src/common/clients/pnpm.ts +28 -0
- package/src/common/clients/rush.ts +66 -4
- package/src/common/clients/yarn.ts +28 -0
- package/src/common/emulator.ts +3 -3
- package/src/common/inspect.ts +2 -1
- package/src/common/npm.test.ts +35 -33
- package/src/common/npm.ts +52 -33
- package/src/common/pack.test.ts +1 -1
- package/src/common/pack.ts +2 -2
- package/src/common/package.ts +20 -10
- package/src/common/scaffold.ts +2 -2
- package/src/external/index.ts +2 -1
- package/src/injectors/pilet.ts +3 -3
- package/src/plugin.ts +4 -4
- package/src/types/internal.ts +6 -1
package/lib/injectors/pilet.js
CHANGED
|
@@ -21,8 +21,8 @@ function fillPiletMeta(pilet, basePath, metaFile) {
|
|
|
21
21
|
const { root, bundler } = pilet;
|
|
22
22
|
const metaPath = (0, path_1.join)(root, metaFile);
|
|
23
23
|
const packagePath = (0, path_1.join)(root, 'package.json');
|
|
24
|
-
const def =
|
|
25
|
-
const metaOverride = (0, fs_1.existsSync)(metaPath) ?
|
|
24
|
+
const def = external_1.jju.parse((0, fs_1.readFileSync)(packagePath, 'utf8'));
|
|
25
|
+
const metaOverride = (0, fs_1.existsSync)(metaPath) ? external_1.jju.parse((0, fs_1.readFileSync)(metaPath, 'utf8')) : undefined;
|
|
26
26
|
const file = bundler.bundle.name.replace(/^[\/\\]/, '');
|
|
27
27
|
const target = (0, path_1.join)(bundler.bundle.dir, file);
|
|
28
28
|
const url = new url_1.URL(file, basePath);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pilet.js","sourceRoot":"","sources":["../../src/injectors/pilet.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,6BAA0B;AAC1B,+BAA4B;AAE5B,2BAAwD;AAExD,uCAAoC;AACpC,yCAAkD;AAClD,6CAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"pilet.js","sourceRoot":"","sources":["../../src/injectors/pilet.ts"],"names":[],"mappings":"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"}
|
package/lib/plugin.js
CHANGED
|
@@ -16,10 +16,10 @@ const common_1 = require("./common");
|
|
|
16
16
|
const inject_1 = require("./inject");
|
|
17
17
|
function getContainerDir() {
|
|
18
18
|
const currentDir = __dirname.split(path_1.sep).join(path_1.posix.sep);
|
|
19
|
-
if (currentDir.includes(`/.pnpm/${common_1.cliName}@${common_1.cliVersion}/node_modules/${common_1.cliName}/`)) {
|
|
20
|
-
return (0, path_1.resolve)(__dirname, '..', '..'
|
|
19
|
+
if (!currentDir.includes(`/.pnpm/${common_1.cliName}@${common_1.cliVersion}/node_modules/${common_1.cliName}/`)) {
|
|
20
|
+
return (0, path_1.resolve)(__dirname, '..', '..');
|
|
21
21
|
}
|
|
22
|
-
return
|
|
22
|
+
return undefined;
|
|
23
23
|
}
|
|
24
24
|
function getLocalPackageDir() {
|
|
25
25
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -33,7 +33,7 @@ function getLocalPackageDir() {
|
|
|
33
33
|
// Right now we always take the first one, but in the future this may be different
|
|
34
34
|
// once we come up with more / better criteria to identify if its a good/valid
|
|
35
35
|
// plugin root directory
|
|
36
|
-
for (const dir of proposedDirs) {
|
|
36
|
+
for (const dir of proposedDirs.filter(Boolean)) {
|
|
37
37
|
(0, common_1.log)('generalDebug_0003', `Checking for potential plugin directory "${dir}" ...`);
|
|
38
38
|
if (yield isDirectory(dir)) {
|
|
39
39
|
return dir;
|
package/lib/plugin.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2BAAmC;AACnC,+BAAiD;AACjD,qCAAoD;AACpD,qCAAkC;AAElC,SAAS,eAAe;IACtB,MAAM,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC,UAAG,CAAC,CAAC,IAAI,CAAC,YAAK,CAAC,GAAG,CAAC,CAAC;IAExD,IAAI,UAAU,CAAC,QAAQ,CAAC,UAAU,gBAAO,IAAI,mBAAU,iBAAiB,gBAAO,GAAG,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"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"}
|
package/lib/types/internal.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import { LogLevels } from './common';
|
|
2
|
+
import type { LogLevels, PiletsInfo } from './common';
|
|
3
3
|
export interface PackageData {
|
|
4
4
|
name: string;
|
|
5
5
|
version: string;
|
|
@@ -11,6 +11,14 @@ export interface PackageData {
|
|
|
11
11
|
email?: string;
|
|
12
12
|
};
|
|
13
13
|
custom?: any;
|
|
14
|
+
pilets?: PiletsInfo;
|
|
15
|
+
piralCLI?: {
|
|
16
|
+
generated: boolean;
|
|
17
|
+
version: string;
|
|
18
|
+
};
|
|
19
|
+
dependencies: Record<string, string>;
|
|
20
|
+
peerDependencies: Record<string, string>;
|
|
21
|
+
devDependencies: Record<string, string>;
|
|
14
22
|
}
|
|
15
23
|
export interface PackageFiles {
|
|
16
24
|
[file: string]: Buffer;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "piral-cli",
|
|
3
|
-
"version": "0.14.24-beta.
|
|
3
|
+
"version": "0.14.24-beta.4191",
|
|
4
4
|
"description": "The standard CLI for creating and building a Piral instance or a Pilet.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"portal",
|
|
@@ -50,6 +50,7 @@
|
|
|
50
50
|
"@types/express": "^4.16.1",
|
|
51
51
|
"@types/glob": "^7.1.1",
|
|
52
52
|
"@types/inquirer": "^6.0.0",
|
|
53
|
+
"@types/jju": "^1.4.2",
|
|
53
54
|
"@types/mime": "^2.0.0",
|
|
54
55
|
"@types/node": "^12.7.2",
|
|
55
56
|
"@types/rc": "^1.1.0",
|
|
@@ -62,6 +63,7 @@
|
|
|
62
63
|
"get-port": "^5.0.0",
|
|
63
64
|
"glob": "^7.1.3",
|
|
64
65
|
"inquirer": "^6.2.2",
|
|
66
|
+
"jju": "^1.4.0",
|
|
65
67
|
"mime": "^2.5.2",
|
|
66
68
|
"open": "^7.1.0",
|
|
67
69
|
"rc": "^1.2.8",
|
|
@@ -77,5 +79,5 @@
|
|
|
77
79
|
"typescript": "^4.0.2",
|
|
78
80
|
"yargs": "^15.4.1"
|
|
79
81
|
},
|
|
80
|
-
"gitHead": "
|
|
82
|
+
"gitHead": "ae605bd9075d6d70abb0c159521f00aebcb6ea4b"
|
|
81
83
|
}
|
package/src/apps/new-pilet.ts
CHANGED
|
@@ -5,12 +5,12 @@ import {
|
|
|
5
5
|
SourceLanguage,
|
|
6
6
|
createDirectory,
|
|
7
7
|
createFileIfNotExists,
|
|
8
|
-
|
|
8
|
+
installNpmPackage,
|
|
9
9
|
dissectPackageName,
|
|
10
10
|
copyPiralFiles,
|
|
11
11
|
patchPiletPackage,
|
|
12
12
|
scaffoldPiletSourceFiles,
|
|
13
|
-
|
|
13
|
+
installNpmDependencies,
|
|
14
14
|
combinePackageRef,
|
|
15
15
|
getPackageName,
|
|
16
16
|
getPackageVersion,
|
|
@@ -29,6 +29,7 @@ import {
|
|
|
29
29
|
getPiralPath,
|
|
30
30
|
getPiletScaffoldData,
|
|
31
31
|
config,
|
|
32
|
+
initNpmProject,
|
|
32
33
|
} from '../common';
|
|
33
34
|
|
|
34
35
|
export interface NewPiletOptions {
|
|
@@ -128,6 +129,7 @@ export async function newPilet(baseDir = process.cwd(), options: NewPiletOptions
|
|
|
128
129
|
|
|
129
130
|
if (success) {
|
|
130
131
|
const npmClient = await determineNpmClient(root, options.npmClient);
|
|
132
|
+
const projectName = basename(root);
|
|
131
133
|
|
|
132
134
|
progress(`Scaffolding new pilet in %s ...`, root);
|
|
133
135
|
|
|
@@ -136,7 +138,7 @@ export async function newPilet(baseDir = process.cwd(), options: NewPiletOptions
|
|
|
136
138
|
'package.json',
|
|
137
139
|
JSON.stringify(
|
|
138
140
|
{
|
|
139
|
-
name:
|
|
141
|
+
name: projectName,
|
|
140
142
|
version: '1.0.0',
|
|
141
143
|
description: '',
|
|
142
144
|
keywords: ['pilet'],
|
|
@@ -152,6 +154,8 @@ export async function newPilet(baseDir = process.cwd(), options: NewPiletOptions
|
|
|
152
154
|
),
|
|
153
155
|
);
|
|
154
156
|
|
|
157
|
+
await initNpmProject(npmClient, projectName, root);
|
|
158
|
+
|
|
155
159
|
if (registry !== newPiletDefaults.registry) {
|
|
156
160
|
progress(`Setting up npm registry (%s) ...`, registry);
|
|
157
161
|
|
|
@@ -170,8 +174,7 @@ always-auth=true`,
|
|
|
170
174
|
const packageRef = combinePackageRef(sourceName, sourceVersion, type);
|
|
171
175
|
|
|
172
176
|
progress(`Installing npm package %s ...`, packageRef);
|
|
173
|
-
|
|
174
|
-
await installPackage(npmClient, packageRef, root, '--save-dev', '--save-exact');
|
|
177
|
+
await installNpmPackage(npmClient, packageRef, root, '--save-dev', '--save-exact');
|
|
175
178
|
} else {
|
|
176
179
|
progress(`Using locally available npm package %s ...`, sourceName);
|
|
177
180
|
}
|
|
@@ -213,7 +216,7 @@ always-auth=true`,
|
|
|
213
216
|
|
|
214
217
|
if (install) {
|
|
215
218
|
progress(`Installing dependencies ...`);
|
|
216
|
-
await
|
|
219
|
+
await installNpmDependencies(npmClient, root);
|
|
217
220
|
}
|
|
218
221
|
|
|
219
222
|
if (postScaffold) {
|
package/src/apps/new-piral.ts
CHANGED
|
@@ -3,14 +3,14 @@ import { LogLevels, Framework, NpmClientType } from '../types';
|
|
|
3
3
|
import {
|
|
4
4
|
ForceOverwrite,
|
|
5
5
|
SourceLanguage,
|
|
6
|
-
|
|
6
|
+
installNpmPackage,
|
|
7
7
|
updateExistingJson,
|
|
8
8
|
getPiralPackage,
|
|
9
9
|
scaffoldPiralSourceFiles,
|
|
10
10
|
createDirectory,
|
|
11
11
|
createFileIfNotExists,
|
|
12
12
|
logDone,
|
|
13
|
-
|
|
13
|
+
installNpmDependencies,
|
|
14
14
|
combinePackageRef,
|
|
15
15
|
setLogLevel,
|
|
16
16
|
fail,
|
|
@@ -19,6 +19,7 @@ import {
|
|
|
19
19
|
cliVersion,
|
|
20
20
|
getPiralScaffoldData,
|
|
21
21
|
config,
|
|
22
|
+
initNpmProject,
|
|
22
23
|
} from '../common';
|
|
23
24
|
|
|
24
25
|
export interface NewPiralOptions {
|
|
@@ -128,6 +129,7 @@ export async function newPiral(baseDir = process.cwd(), options: NewPiralOptions
|
|
|
128
129
|
if (success) {
|
|
129
130
|
const npmClient = await determineNpmClient(root, options.npmClient);
|
|
130
131
|
const packageRef = combinePackageRef(framework, version, 'registry');
|
|
132
|
+
const projectName = basename(root);
|
|
131
133
|
|
|
132
134
|
progress(`Creating a new Piral instance in %s ...`, root);
|
|
133
135
|
|
|
@@ -136,7 +138,7 @@ export async function newPiral(baseDir = process.cwd(), options: NewPiralOptions
|
|
|
136
138
|
'package.json',
|
|
137
139
|
JSON.stringify(
|
|
138
140
|
{
|
|
139
|
-
name:
|
|
141
|
+
name: projectName,
|
|
140
142
|
version: '1.0.0',
|
|
141
143
|
description: '',
|
|
142
144
|
keywords: ['piral'],
|
|
@@ -148,6 +150,8 @@ export async function newPiral(baseDir = process.cwd(), options: NewPiralOptions
|
|
|
148
150
|
),
|
|
149
151
|
);
|
|
150
152
|
|
|
153
|
+
await initNpmProject(npmClient, projectName, root);
|
|
154
|
+
|
|
151
155
|
if (registry !== newPiralDefaults.registry) {
|
|
152
156
|
progress(`Setting up npm registry (%s) ...`, registry);
|
|
153
157
|
|
|
@@ -162,7 +166,7 @@ always-auth=true`,
|
|
|
162
166
|
|
|
163
167
|
progress(`Installing npm package ${packageRef} ...`);
|
|
164
168
|
|
|
165
|
-
await
|
|
169
|
+
await installNpmPackage(npmClient, packageRef, root, '--save-exact');
|
|
166
170
|
|
|
167
171
|
progress(`Taking care of templating ...`);
|
|
168
172
|
|
|
@@ -177,7 +181,7 @@ always-auth=true`,
|
|
|
177
181
|
|
|
178
182
|
if (install) {
|
|
179
183
|
progress(`Installing dependencies ...`);
|
|
180
|
-
await
|
|
184
|
+
await installNpmDependencies(npmClient, root);
|
|
181
185
|
}
|
|
182
186
|
|
|
183
187
|
logDone(`Piral instance scaffolded successfully!`);
|
|
@@ -13,7 +13,7 @@ import {
|
|
|
13
13
|
log,
|
|
14
14
|
config,
|
|
15
15
|
checkExists,
|
|
16
|
-
|
|
16
|
+
findNpmTarball,
|
|
17
17
|
downloadFile,
|
|
18
18
|
matchAnyPilet,
|
|
19
19
|
retrievePiletData,
|
|
@@ -192,7 +192,7 @@ async function getFiles(
|
|
|
192
192
|
}
|
|
193
193
|
case 'npm': {
|
|
194
194
|
log('generalDebug_0003', `View npm package "${sources.join('", "')}".`);
|
|
195
|
-
const allUrls = await Promise.all(sources.map((s) =>
|
|
195
|
+
const allUrls = await Promise.all(sources.map((s) => findNpmTarball(s)));
|
|
196
196
|
log('generalDebug_0003', `Download file from "${allUrls.join('", "')}".`);
|
|
197
197
|
const allFiles = await Promise.all(allUrls.map((url) => downloadFile(url, ca)));
|
|
198
198
|
return allFiles.reduce((result, files) => [...result, ...files], []);
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { resolve } from 'path';
|
|
2
2
|
import { publishArtifacts } from '../release';
|
|
3
3
|
import { LogLevels, PiralBuildType } from '../types';
|
|
4
|
-
import { setLogLevel, progress, checkExists, fail, logDone, logReset,
|
|
4
|
+
import { setLogLevel, progress, checkExists, fail, logDone, logReset, publishNpmPackage, matchFiles } from '../common';
|
|
5
5
|
|
|
6
6
|
export interface PublishPiralOptions {
|
|
7
7
|
/**
|
|
@@ -58,7 +58,7 @@ async function publishEmulator(baseDir: string, source: string, args: Record<str
|
|
|
58
58
|
p.push(`--${c}`, args[c]);
|
|
59
59
|
return p;
|
|
60
60
|
}, [] as Array<string>);
|
|
61
|
-
await
|
|
61
|
+
await publishNpmPackage(directory, file, flags);
|
|
62
62
|
}
|
|
63
63
|
|
|
64
64
|
async function publishRelease(
|
|
@@ -2,7 +2,7 @@ import { resolve } from 'path';
|
|
|
2
2
|
import { LogLevels, NpmClientType } from '../types';
|
|
3
3
|
import {
|
|
4
4
|
readJson,
|
|
5
|
-
|
|
5
|
+
installNpmPackage,
|
|
6
6
|
checkExistingDirectory,
|
|
7
7
|
patchPiletPackage,
|
|
8
8
|
copyPiralFiles,
|
|
@@ -10,7 +10,7 @@ import {
|
|
|
10
10
|
readPiralPackage,
|
|
11
11
|
getPiletsInfo,
|
|
12
12
|
runScript,
|
|
13
|
-
|
|
13
|
+
installNpmDependencies,
|
|
14
14
|
getCurrentPackageDetails,
|
|
15
15
|
checkAppShellPackage,
|
|
16
16
|
setLogLevel,
|
|
@@ -129,7 +129,7 @@ export async function upgradePilet(baseDir = process.cwd(), options: UpgradePile
|
|
|
129
129
|
if (!monorepoRef) {
|
|
130
130
|
// only install the latest if the shell does come from remote
|
|
131
131
|
progress(`Updating npm package to %s ...`, packageRef);
|
|
132
|
-
await
|
|
132
|
+
await installNpmPackage(npmClient, packageRef, root, '--no-save');
|
|
133
133
|
}
|
|
134
134
|
|
|
135
135
|
const piralInfo = await readPiralPackage(root, sourceName);
|
|
@@ -162,7 +162,7 @@ export async function upgradePilet(baseDir = process.cwd(), options: UpgradePile
|
|
|
162
162
|
|
|
163
163
|
if (install) {
|
|
164
164
|
progress(`Updating dependencies ...`);
|
|
165
|
-
await
|
|
165
|
+
await installNpmDependencies(npmClient, root);
|
|
166
166
|
}
|
|
167
167
|
|
|
168
168
|
if (postUpgrade) {
|
|
@@ -3,7 +3,7 @@ import { LogLevels, NpmClientType } from '../types';
|
|
|
3
3
|
import {
|
|
4
4
|
readJson,
|
|
5
5
|
checkExistingDirectory,
|
|
6
|
-
|
|
6
|
+
installNpmDependencies,
|
|
7
7
|
setLogLevel,
|
|
8
8
|
progress,
|
|
9
9
|
fail,
|
|
@@ -113,7 +113,7 @@ export async function upgradePiral(baseDir = process.cwd(), options: UpgradePira
|
|
|
113
113
|
|
|
114
114
|
if (install) {
|
|
115
115
|
progress(`Updating the npm packages to %s ...`, version);
|
|
116
|
-
await
|
|
116
|
+
await installNpmDependencies(npmClient, root);
|
|
117
117
|
}
|
|
118
118
|
|
|
119
119
|
logDone('Piral instance upgraded successfully!');
|
package/src/bundler.test.ts
CHANGED
package/src/bundler.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { callDynamic, callStatic } from './build/bundler-calls';
|
|
2
2
|
import { availableBundlers } from './helpers';
|
|
3
3
|
import {
|
|
4
|
-
|
|
4
|
+
installNpmPackage,
|
|
5
5
|
cliVersion,
|
|
6
6
|
fail,
|
|
7
7
|
progress,
|
|
@@ -39,7 +39,7 @@ async function installDefaultBundler(root: string) {
|
|
|
39
39
|
const client = await determineNpmClient(root);
|
|
40
40
|
log('generalDebug_0003', `Prepare to install ${selectedPackage}@${cliVersion} using "${client}" into "${root}".`);
|
|
41
41
|
progress(`Installing ${selectedPackage} ...`);
|
|
42
|
-
await
|
|
42
|
+
await installNpmPackage(client, `${selectedPackage}@${cliVersion}`, root, '--save-dev', '--save-exact');
|
|
43
43
|
log('generalDebug_0003', `Installed bundler from "${selectedPackage}".`);
|
|
44
44
|
|
|
45
45
|
require('./inject').inject(selectedPackage);
|
|
@@ -47,3 +47,31 @@ export async function installPackage(packageRef: string, target = '.', ...flags:
|
|
|
47
47
|
export async function detectClient(root: string) {
|
|
48
48
|
return !!(await findFile(root, 'lerna.json'));
|
|
49
49
|
}
|
|
50
|
+
|
|
51
|
+
export async function initProject(projectName: string, target: string) {}
|
|
52
|
+
|
|
53
|
+
export async function isProject(root: string, packageRef: string) {
|
|
54
|
+
const projects = await listProjects(root);
|
|
55
|
+
|
|
56
|
+
if (Array.isArray(projects)) {
|
|
57
|
+
return projects?.some((p) => p.name === packageRef) ?? false;
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
return false;
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
// Functions to exclusively use from lerna client:
|
|
64
|
+
|
|
65
|
+
export async function listProjects(target: string) {
|
|
66
|
+
const ms = new MemoryStream();
|
|
67
|
+
|
|
68
|
+
try {
|
|
69
|
+
await runLernaProcess(['list', '--json', '-p'], target, ms);
|
|
70
|
+
} catch (e) {
|
|
71
|
+
log('generalDebug_0003', `lerna list error: ${e}`);
|
|
72
|
+
return [];
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
log('generalDebug_0003', `lerna list project result: ${ms.value}`);
|
|
76
|
+
return JSON.parse(ms.value);
|
|
77
|
+
}
|
|
@@ -32,6 +32,19 @@ export async function detectClient(root: string) {
|
|
|
32
32
|
return !!(await findFile(root, 'package-lock.json'));
|
|
33
33
|
}
|
|
34
34
|
|
|
35
|
+
export async function isProject(root: string, packageRef: string) {
|
|
36
|
+
const details = await listPackage(packageRef, root);
|
|
37
|
+
const packageDetails = details?.dependencies?.[packageRef];
|
|
38
|
+
|
|
39
|
+
if (packageDetails && typeof packageDetails.resolved === 'string') {
|
|
40
|
+
return packageDetails.resolved.startsWith('file:');
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
return false;
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
export async function initProject(projectName: string, target: string) {}
|
|
47
|
+
|
|
35
48
|
// Functions to exclusively use from npm client:
|
|
36
49
|
|
|
37
50
|
export async function unpackPackage(packageRef: string, target = '.', ...flags: Array<string>) {
|
|
@@ -76,6 +89,7 @@ export async function listPackage(packageRef: string, target = '.', ...flags: Ar
|
|
|
76
89
|
await runNpmProcess(['ls', packageRef, '--json', '--depth', '0', ...flags], target, ms);
|
|
77
90
|
} catch (e) {
|
|
78
91
|
log('generalDebug_0003', `npm ls packageRef error: ${e}`);
|
|
92
|
+
return {};
|
|
79
93
|
}
|
|
80
94
|
|
|
81
95
|
log('generalDebug_0003', `npm ls packageRef result: ${ms.value}`);
|
|
@@ -43,3 +43,31 @@ export async function installPackage(packageRef: string, target = '.', ...flags:
|
|
|
43
43
|
export async function detectClient(root: string) {
|
|
44
44
|
return !!(await findFile(root, 'pnpm-lock.yaml'));
|
|
45
45
|
}
|
|
46
|
+
|
|
47
|
+
export async function initProject(projectName: string, target: string) {}
|
|
48
|
+
|
|
49
|
+
export async function isProject(root: string, packageRef: string) {
|
|
50
|
+
const projects = await listProjects(root);
|
|
51
|
+
|
|
52
|
+
if (Array.isArray(projects)) {
|
|
53
|
+
return projects?.some((p) => p.name === packageRef) ?? false;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
return false;
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
// Functions to exclusively use from pnpm client:
|
|
60
|
+
|
|
61
|
+
export async function listProjects(target: string) {
|
|
62
|
+
const ms = new MemoryStream();
|
|
63
|
+
|
|
64
|
+
try {
|
|
65
|
+
await runPnpmProcess(['list', '--json', '--recursive', '--depth', '0'], target, ms);
|
|
66
|
+
} catch (e) {
|
|
67
|
+
log('generalDebug_0003', `pnpm list error: ${e}`);
|
|
68
|
+
return [];
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
log('generalDebug_0003', `pnpm list project result: ${ms.value}`);
|
|
72
|
+
return JSON.parse(ms.value);
|
|
73
|
+
}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
|
-
import { resolve } from 'path';
|
|
1
|
+
import { dirname, relative, resolve } from 'path';
|
|
2
2
|
import { log } from '../log';
|
|
3
|
-
import { findFile } from '../io';
|
|
3
|
+
import { findFile, readText, writeText } from '../io';
|
|
4
|
+
import { jju } from '../../external';
|
|
4
5
|
import { runCommand } from '../scripts';
|
|
5
6
|
import { MemoryStream } from '../MemoryStream';
|
|
6
7
|
|
|
7
8
|
// Helpers:
|
|
9
|
+
const rushJson = 'rush.json';
|
|
8
10
|
|
|
9
11
|
function runRushProcess(args: Array<string>, target: string, output?: NodeJS.WritableStream) {
|
|
10
12
|
log('generalDebug_0003', 'Starting the Rush process ...');
|
|
@@ -16,7 +18,8 @@ function convert(flags: Array<string>) {
|
|
|
16
18
|
return flags.map((flag) => {
|
|
17
19
|
switch (flag) {
|
|
18
20
|
case '--save-exact':
|
|
19
|
-
|
|
21
|
+
// discard as this may lead to problems
|
|
22
|
+
return '';
|
|
20
23
|
case '--save-dev':
|
|
21
24
|
return '--dev';
|
|
22
25
|
case '--no-save':
|
|
@@ -45,5 +48,64 @@ export async function installPackage(packageRef: string, target = '.', ...flags:
|
|
|
45
48
|
}
|
|
46
49
|
|
|
47
50
|
export async function detectClient(root: string) {
|
|
48
|
-
return !!(await findFile(root,
|
|
51
|
+
return !!(await findFile(root, rushJson));
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
export async function initProject(packageName: string, target: string) {
|
|
55
|
+
const rushPath = await findFile(target, rushJson);
|
|
56
|
+
|
|
57
|
+
if (!rushPath) {
|
|
58
|
+
throw new Error(
|
|
59
|
+
`Could not find the "${rushJson}" from "${target}". Sure you want to create the project in the right directory?`,
|
|
60
|
+
);
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
const rushDir = dirname(rushPath);
|
|
64
|
+
const rushContent = await readText(rushDir, rushJson);
|
|
65
|
+
const rushData = jju.parse(rushContent);
|
|
66
|
+
const projectFolder = relative(rushDir, target);
|
|
67
|
+
|
|
68
|
+
if (!Array.isArray(rushData.projects)) {
|
|
69
|
+
rushData.projects = [];
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
rushData.projects.push({
|
|
73
|
+
packageName,
|
|
74
|
+
projectFolder,
|
|
75
|
+
});
|
|
76
|
+
|
|
77
|
+
await writeText(
|
|
78
|
+
rushDir,
|
|
79
|
+
rushJson,
|
|
80
|
+
jju.update(rushContent, rushData, {
|
|
81
|
+
mode: 'cjson',
|
|
82
|
+
indent: 2,
|
|
83
|
+
}),
|
|
84
|
+
);
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
export async function isProject(root: string, packageRef: string) {
|
|
88
|
+
const details = await listProjects(root);
|
|
89
|
+
|
|
90
|
+
if (typeof details === 'object' && Array.isArray(details?.projects)) {
|
|
91
|
+
return details?.projects?.some((p) => p.name === packageRef) ?? false;
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
return false;
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
// Functions to exclusively use from rush client:
|
|
98
|
+
|
|
99
|
+
export async function listProjects(target: string) {
|
|
100
|
+
const ms = new MemoryStream();
|
|
101
|
+
|
|
102
|
+
try {
|
|
103
|
+
await runRushProcess(['list', '--json'], target, ms);
|
|
104
|
+
} catch (e) {
|
|
105
|
+
log('generalDebug_0003', `rush list error: ${e}`);
|
|
106
|
+
return {};
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
log('generalDebug_0003', `rush list project result: ${ms.value}`);
|
|
110
|
+
return JSON.parse(ms.value);
|
|
49
111
|
}
|
|
@@ -47,3 +47,31 @@ export async function installPackage(packageRef: string, target = '.', ...flags:
|
|
|
47
47
|
export async function detectClient(root: string) {
|
|
48
48
|
return !!(await findFile(root, 'yarn.lock'));
|
|
49
49
|
}
|
|
50
|
+
|
|
51
|
+
export async function initProject(projectName: string, target: string) {}
|
|
52
|
+
|
|
53
|
+
export async function isProject(root: string, packageRef: string) {
|
|
54
|
+
const details = await listProjects(root);
|
|
55
|
+
|
|
56
|
+
if (typeof details === 'object') {
|
|
57
|
+
return typeof details?.[packageRef]?.location === 'string';
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
return false;
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
// Functions to exclusively use from yarn client:
|
|
64
|
+
|
|
65
|
+
export async function listProjects(target: string) {
|
|
66
|
+
const ms = new MemoryStream();
|
|
67
|
+
|
|
68
|
+
try {
|
|
69
|
+
await runYarnProcess(['workspaces', 'info'], target, ms);
|
|
70
|
+
} catch (e) {
|
|
71
|
+
log('generalDebug_0003', `yarn workspaces error: ${e}`);
|
|
72
|
+
return {};
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
log('generalDebug_0003', `yarn workspaces result: ${ms.value}`);
|
|
76
|
+
return JSON.parse(ms.value);
|
|
77
|
+
}
|
package/src/common/emulator.ts
CHANGED
|
@@ -3,7 +3,7 @@ import { findDependencyVersion, copyScaffoldingFiles, isValidDependency } from '
|
|
|
3
3
|
import { createFileFromTemplateIfNotExists } from './template';
|
|
4
4
|
import { filesTar, filesOnceTar } from './constants';
|
|
5
5
|
import { cliVersion } from './info';
|
|
6
|
-
import {
|
|
6
|
+
import { createNpmPackage, makeExternals } from './npm';
|
|
7
7
|
import { createPiralDeclaration } from './declaration';
|
|
8
8
|
import { ForceOverwrite } from './enums';
|
|
9
9
|
import { createTarball } from './archive';
|
|
@@ -31,7 +31,7 @@ export async function createEmulatorSources(
|
|
|
31
31
|
...piralPkg.devDependencies,
|
|
32
32
|
...piralPkg.dependencies,
|
|
33
33
|
};
|
|
34
|
-
const allExternals = makeExternals(allDeps, piralPkg.pilets?.externals);
|
|
34
|
+
const allExternals = makeExternals(sourceDir, allDeps, piralPkg.pilets?.externals);
|
|
35
35
|
|
|
36
36
|
const externalPackages = await Promise.all(
|
|
37
37
|
allExternals.filter(isValidDependency).map(async (name) => ({
|
|
@@ -138,7 +138,7 @@ export async function createEmulatorSources(
|
|
|
138
138
|
|
|
139
139
|
export async function packageEmulator(rootDir: string) {
|
|
140
140
|
// finally package everything up
|
|
141
|
-
await
|
|
141
|
+
await createNpmPackage(rootDir);
|
|
142
142
|
|
|
143
143
|
// get all files
|
|
144
144
|
const names = await getFileNames(rootDir);
|
package/src/common/inspect.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { dirname, basename } from 'path';
|
|
2
2
|
import { unpackGzTar } from './archive';
|
|
3
|
+
import { jju } from '../external';
|
|
3
4
|
import { PackageData, PackageFiles } from '../types';
|
|
4
5
|
|
|
5
6
|
const packageRoot = 'package/';
|
|
@@ -8,7 +9,7 @@ function getPackageJson(files: PackageFiles): PackageData {
|
|
|
8
9
|
const fileName = `${packageRoot}package.json`;
|
|
9
10
|
const fileContent = files[fileName];
|
|
10
11
|
const content = fileContent.toString('utf8');
|
|
11
|
-
return
|
|
12
|
+
return jju.parse(content);
|
|
12
13
|
}
|
|
13
14
|
|
|
14
15
|
function getPiletMainPath(data: PackageData, files: PackageFiles) {
|