piral-cli 0.14.24-beta.4168 → 0.14.24-beta.4171
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-piral.js +3 -1
- package/lib/apps/new-piral.js.map +1 -1
- package/lib/plugin.js +4 -4
- package/lib/plugin.js.map +1 -1
- package/package.json +2 -2
- package/src/apps/new-piral.ts +5 -1
- package/src/plugin.ts +4 -4
package/lib/apps/new-piral.js
CHANGED
|
@@ -39,15 +39,17 @@ function newPiral(baseDir = process.cwd(), options = {}) {
|
|
|
39
39
|
if (success) {
|
|
40
40
|
const npmClient = yield (0, common_1.determineNpmClient)(root, options.npmClient);
|
|
41
41
|
const packageRef = (0, common_1.combinePackageRef)(framework, version, 'registry');
|
|
42
|
+
const projectName = (0, path_1.basename)(root);
|
|
42
43
|
(0, common_1.progress)(`Creating a new Piral instance in %s ...`, root);
|
|
43
44
|
yield (0, common_1.createFileIfNotExists)(root, 'package.json', JSON.stringify({
|
|
44
|
-
name:
|
|
45
|
+
name: projectName,
|
|
45
46
|
version: '1.0.0',
|
|
46
47
|
description: '',
|
|
47
48
|
keywords: ['piral'],
|
|
48
49
|
dependencies: {},
|
|
49
50
|
scripts: {},
|
|
50
51
|
}, undefined, 2));
|
|
52
|
+
yield (0, common_1.initNpmProject)(npmClient, projectName, root);
|
|
51
53
|
if (registry !== exports.newPiralDefaults.registry) {
|
|
52
54
|
(0, common_1.progress)(`Setting up npm registry (%s) ...`, registry);
|
|
53
55
|
yield (0, common_1.createFileIfNotExists)(root, '.npmrc', `registry=${registry}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"new-piral.js","sourceRoot":"","sources":["../../src/apps/new-piral.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAAyC;AACzC,oCAA+D;AAC/D,
|
|
1
|
+
{"version":3,"file":"new-piral.js","sourceRoot":"","sources":["../../src/apps/new-piral.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/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.4171",
|
|
4
4
|
"description": "The standard CLI for creating and building a Piral instance or a Pilet.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"portal",
|
|
@@ -79,5 +79,5 @@
|
|
|
79
79
|
"typescript": "^4.0.2",
|
|
80
80
|
"yargs": "^15.4.1"
|
|
81
81
|
},
|
|
82
|
-
"gitHead": "
|
|
82
|
+
"gitHead": "1073f96f7199c1ca5b64cf3bdf9d06b6be60045e"
|
|
83
83
|
}
|
package/src/apps/new-piral.ts
CHANGED
|
@@ -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
|
|
package/src/plugin.ts
CHANGED
|
@@ -6,11 +6,11 @@ import { inject } from './inject';
|
|
|
6
6
|
function getContainerDir() {
|
|
7
7
|
const currentDir = __dirname.split(sep).join(posix.sep);
|
|
8
8
|
|
|
9
|
-
if (currentDir.includes(`/.pnpm/${cliName}@${cliVersion}/node_modules/${cliName}/`)) {
|
|
10
|
-
return resolve(__dirname, '..', '..'
|
|
9
|
+
if (!currentDir.includes(`/.pnpm/${cliName}@${cliVersion}/node_modules/${cliName}/`)) {
|
|
10
|
+
return resolve(__dirname, '..', '..');
|
|
11
11
|
}
|
|
12
12
|
|
|
13
|
-
return
|
|
13
|
+
return undefined;
|
|
14
14
|
}
|
|
15
15
|
|
|
16
16
|
async function getLocalPackageDir() {
|
|
@@ -25,7 +25,7 @@ async function getLocalPackageDir() {
|
|
|
25
25
|
// Right now we always take the first one, but in the future this may be different
|
|
26
26
|
// once we come up with more / better criteria to identify if its a good/valid
|
|
27
27
|
// plugin root directory
|
|
28
|
-
for (const dir of proposedDirs) {
|
|
28
|
+
for (const dir of proposedDirs.filter(Boolean)) {
|
|
29
29
|
log('generalDebug_0003', `Checking for potential plugin directory "${dir}" ...`);
|
|
30
30
|
|
|
31
31
|
if (await isDirectory(dir)) {
|