piral-cli 0.14.0 → 0.14.1-beta.3250
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/declaration.js +9 -1
- package/lib/common/declaration.js.map +1 -1
- package/lib/common/language.js +8 -8
- package/lib/common/language.js.map +1 -1
- package/package.json +2 -2
- package/src/apps/new-piral.ts +1 -1
- package/src/common/declaration.ts +9 -1
- package/src/common/language.ts +8 -8
|
@@ -31,7 +31,15 @@ function findPiralBaseApi(root) {
|
|
|
31
31
|
}
|
|
32
32
|
function findDeclaredTypings(root) {
|
|
33
33
|
try {
|
|
34
|
-
const { typings } = require((0, path_1.resolve)(root, 'package.json'));
|
|
34
|
+
const { typings, extraTypes } = require((0, path_1.resolve)(root, 'package.json'));
|
|
35
|
+
if (extraTypes) {
|
|
36
|
+
if (typeof extraTypes === 'string') {
|
|
37
|
+
return [(0, path_1.resolve)(root, extraTypes)];
|
|
38
|
+
}
|
|
39
|
+
else if (Array.isArray(extraTypes)) {
|
|
40
|
+
return extraTypes.filter((types) => typeof types === 'string').map((types) => (0, path_1.resolve)(root, types));
|
|
41
|
+
}
|
|
42
|
+
}
|
|
35
43
|
if (typings) {
|
|
36
44
|
return [(0, path_1.resolve)(root, typings)];
|
|
37
45
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"declaration.js","sourceRoot":"","sources":["../../src/common/declaration.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAAqF;AACrF,+BAA2D;AAC3D,+BAAoE;AACpE,+BAAsC;AAEtC,uCAAkE;AAClE,2CAAmE;AACnE,6BAAkF;AAGlF,SAAS,gBAAgB,CAAC,IAAY;;IACpC,IAAI;QACF,OAAO,MAAA,OAAO;aACX,OAAO,CAAC,yBAAa,EAAE;YACtB,KAAK,EAAE,CAAC,IAAI,CAAC;SACd,CAAC,0CACA,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;KAC/B;IAAC,WAAM;QACN,OAAO,SAAS,CAAC;KAClB;AACH,CAAC;AAED,SAAS,mBAAmB,CAAC,IAAY;IACvC,IAAI;QACF,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,IAAA,cAAO,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"declaration.js","sourceRoot":"","sources":["../../src/common/declaration.ts"],"names":[],"mappings":"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"}
|
package/lib/common/language.js
CHANGED
|
@@ -4,16 +4,16 @@ exports.getDevDependencies = exports.getDependencies = exports.reactTypings = ex
|
|
|
4
4
|
const log_1 = require("./log");
|
|
5
5
|
const enums_1 = require("./enums");
|
|
6
6
|
exports.reactDeps = {
|
|
7
|
-
react: '
|
|
8
|
-
'react-dom': '
|
|
9
|
-
'react-router': '
|
|
10
|
-
'react-router-dom': '
|
|
7
|
+
react: '^17',
|
|
8
|
+
'react-dom': '^17',
|
|
9
|
+
'react-router': '^5',
|
|
10
|
+
'react-router-dom': '^5',
|
|
11
11
|
};
|
|
12
12
|
exports.reactTypings = {
|
|
13
|
-
'@types/react': '
|
|
14
|
-
'@types/react-dom': '
|
|
15
|
-
'@types/react-router': '
|
|
16
|
-
'@types/react-router-dom': '
|
|
13
|
+
'@types/react': '^17',
|
|
14
|
+
'@types/react-dom': '^17',
|
|
15
|
+
'@types/react-router': '^5',
|
|
16
|
+
'@types/react-router-dom': '^5',
|
|
17
17
|
};
|
|
18
18
|
function getDependencies(language, packages = exports.reactDeps) {
|
|
19
19
|
switch (language) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"language.js","sourceRoot":"","sources":["../../src/common/language.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAC5B,mCAAyC;AAE5B,QAAA,SAAS,GAAG;IACvB,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"language.js","sourceRoot":"","sources":["../../src/common/language.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAC5B,mCAAyC;AAE5B,QAAA,SAAS,GAAG;IACvB,KAAK,EAAE,KAAK;IACZ,WAAW,EAAE,KAAK;IAClB,cAAc,EAAE,IAAI;IACpB,kBAAkB,EAAE,IAAI;CACzB,CAAC;AAEW,QAAA,YAAY,GAAG;IAC1B,cAAc,EAAE,KAAK;IACrB,kBAAkB,EAAE,KAAK;IACzB,qBAAqB,EAAE,IAAI;IAC3B,yBAAyB,EAAE,IAAI;CAChC,CAAC;AAEF,SAAgB,eAAe,CAAC,QAAwB,EAAE,WAAmC,iBAAS;IACpG,QAAQ,QAAQ,EAAE;QAChB,KAAK,sBAAc,CAAC,EAAE,CAAC;QACvB,KAAK,sBAAc,CAAC,EAAE;YACpB,yBACK,QAAQ,EACX;QACJ;YACE,IAAA,SAAG,EAAC,mBAAmB,EAAE,+DAA+D,CAAC,CAAC;YAC1F,OAAO,EAAE,CAAC;KACb;AACH,CAAC;AAXD,0CAWC;AAED,SAAgB,kBAAkB,CAAC,QAAwB,EAAE,UAAkC,oBAAY;IACzG,QAAQ,QAAQ,EAAE;QAChB,KAAK,sBAAc,CAAC,EAAE;YACpB,uCACK,OAAO,KACV,aAAa,EAAE,QAAQ,EACvB,UAAU,EAAE,QAAQ,IACpB;QACJ,KAAK,sBAAc,CAAC,EAAE;YACpB,OAAO,EAAE,CAAC;QACZ;YACE,IAAA,SAAG,EAAC,mBAAmB,EAAE,+DAA+D,CAAC,CAAC;YAC1F,OAAO,EAAE,CAAC;KACb;AACH,CAAC;AAdD,gDAcC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "piral-cli",
|
|
3
|
-
"version": "0.14.
|
|
3
|
+
"version": "0.14.1-beta.3250",
|
|
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": "e6b329deaa798ea0b9287fbb57be8f39973eeac2"
|
|
81
81
|
}
|
package/src/apps/new-piral.ts
CHANGED
|
@@ -167,7 +167,7 @@ always-auth=true`,
|
|
|
167
167
|
await installPackage(npmClient, packageRef, root);
|
|
168
168
|
|
|
169
169
|
progress(`Taking care of templating ...`);
|
|
170
|
-
|
|
170
|
+
|
|
171
171
|
const data = getPiralScaffoldData(language, root, app, framework, variables);
|
|
172
172
|
await scaffoldPiralSourceFiles(template, registry, data, forceOverwrite);
|
|
173
173
|
|
|
@@ -22,7 +22,15 @@ function findPiralBaseApi(root: string) {
|
|
|
22
22
|
|
|
23
23
|
function findDeclaredTypings(root: string) {
|
|
24
24
|
try {
|
|
25
|
-
const { typings } = require(resolve(root, 'package.json'));
|
|
25
|
+
const { typings, extraTypes } = require(resolve(root, 'package.json'));
|
|
26
|
+
|
|
27
|
+
if (extraTypes) {
|
|
28
|
+
if (typeof extraTypes === 'string') {
|
|
29
|
+
return [resolve(root, extraTypes)];
|
|
30
|
+
} else if (Array.isArray(extraTypes)) {
|
|
31
|
+
return extraTypes.filter((types) => typeof types === 'string').map((types) => resolve(root, types));
|
|
32
|
+
}
|
|
33
|
+
}
|
|
26
34
|
|
|
27
35
|
if (typings) {
|
|
28
36
|
return [resolve(root, typings)];
|
package/src/common/language.ts
CHANGED
|
@@ -2,17 +2,17 @@ import { log } from './log';
|
|
|
2
2
|
import { SourceLanguage } from './enums';
|
|
3
3
|
|
|
4
4
|
export const reactDeps = {
|
|
5
|
-
react: '
|
|
6
|
-
'react-dom': '
|
|
7
|
-
'react-router': '
|
|
8
|
-
'react-router-dom': '
|
|
5
|
+
react: '^17',
|
|
6
|
+
'react-dom': '^17',
|
|
7
|
+
'react-router': '^5',
|
|
8
|
+
'react-router-dom': '^5',
|
|
9
9
|
};
|
|
10
10
|
|
|
11
11
|
export const reactTypings = {
|
|
12
|
-
'@types/react': '
|
|
13
|
-
'@types/react-dom': '
|
|
14
|
-
'@types/react-router': '
|
|
15
|
-
'@types/react-router-dom': '
|
|
12
|
+
'@types/react': '^17',
|
|
13
|
+
'@types/react-dom': '^17',
|
|
14
|
+
'@types/react-router': '^5',
|
|
15
|
+
'@types/react-router-dom': '^5',
|
|
16
16
|
};
|
|
17
17
|
|
|
18
18
|
export function getDependencies(language: SourceLanguage, packages: Record<string, string> = reactDeps) {
|