piral-cli 0.14.8-beta.3487 → 0.14.8-beta.3490
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/common/scaffold.js
CHANGED
|
@@ -17,7 +17,7 @@ const io_1 = require("./io");
|
|
|
17
17
|
const log_1 = require("./log");
|
|
18
18
|
function getTemplatePackage(templatePackageName) {
|
|
19
19
|
const idx = templatePackageName.indexOf('@', 1);
|
|
20
|
-
const normalizedName = idx > 0 ? templatePackageName.substr(0, idx) : templatePackageName;
|
|
20
|
+
const normalizedName = idx > 0 && !(0, path_1.isAbsolute)(templatePackageName) ? templatePackageName.substr(0, idx) : templatePackageName;
|
|
21
21
|
try {
|
|
22
22
|
return require(normalizedName);
|
|
23
23
|
}
|
|
@@ -27,7 +27,7 @@ function getTemplatePackage(templatePackageName) {
|
|
|
27
27
|
}
|
|
28
28
|
function getTemplateFiles(templatePackageName, registry, root, data) {
|
|
29
29
|
return __awaiter(this, void 0, void 0, function* () {
|
|
30
|
-
// debug in monorepo such as "
|
|
30
|
+
// debug in monorepo such as "../templates/pilet-template-react/lib/index.js"
|
|
31
31
|
if (templatePackageName.startsWith('.')) {
|
|
32
32
|
templatePackageName = (0, path_1.resolve)(process.cwd(), templatePackageName);
|
|
33
33
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scaffold.js","sourceRoot":"","sources":["../../src/common/scaffold.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+
|
|
1
|
+
{"version":3,"file":"scaffold.js","sourceRoot":"","sources":["../../src/common/scaffold.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.8-beta.
|
|
3
|
+
"version": "0.14.8-beta.3490",
|
|
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": "
|
|
80
|
+
"gitHead": "c8a70566a926e3306ad5aee94e0f3f7b1bc3d690"
|
|
81
81
|
}
|
package/src/common/scaffold.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { join, dirname, resolve, basename } from 'path';
|
|
1
|
+
import { join, dirname, resolve, basename, isAbsolute } from 'path';
|
|
2
2
|
import { installPackage } from './clients/npm';
|
|
3
3
|
import { ForceOverwrite, SourceLanguage } from './enums';
|
|
4
4
|
import { createDirectory, createFileIfNotExists, updateExistingJson } from './io';
|
|
@@ -12,7 +12,8 @@ interface TemplateFile {
|
|
|
12
12
|
|
|
13
13
|
function getTemplatePackage(templatePackageName: string) {
|
|
14
14
|
const idx = templatePackageName.indexOf('@', 1);
|
|
15
|
-
const normalizedName =
|
|
15
|
+
const normalizedName =
|
|
16
|
+
idx > 0 && !isAbsolute(templatePackageName) ? templatePackageName.substr(0, idx) : templatePackageName;
|
|
16
17
|
|
|
17
18
|
try {
|
|
18
19
|
return require(normalizedName);
|
|
@@ -30,7 +31,7 @@ async function getTemplateFiles(
|
|
|
30
31
|
root: string,
|
|
31
32
|
data: Record<string, any>,
|
|
32
33
|
): Promise<Array<TemplateFile>> {
|
|
33
|
-
// debug in monorepo such as "
|
|
34
|
+
// debug in monorepo such as "../templates/pilet-template-react/lib/index.js"
|
|
34
35
|
if (templatePackageName.startsWith('.')) {
|
|
35
36
|
templatePackageName = resolve(process.cwd(), templatePackageName);
|
|
36
37
|
} else {
|