@betty-blocks/cli 26.0.0-beta.14 → 26.0.0-beta.16
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/build/bb-blocks-new.js +10 -15
- package/build/bb-blocks-new.js.map +1 -1
- package/build/bb-blocks-publish.js +41 -55
- package/build/bb-blocks-publish.js.map +1 -1
- package/build/bb-blocks-release.js +6 -20
- package/build/bb-blocks-release.js.map +1 -1
- package/build/bb-blocks.js +2 -4
- package/build/bb-blocks.js.map +1 -1
- package/build/bb-bundle-init.js +15 -29
- package/build/bb-bundle-init.js.map +1 -1
- package/build/bb-bundle.js +4 -9
- package/build/bb-bundle.js.map +1 -1
- package/build/bb-components-build.js +165 -198
- package/build/bb-components-build.js.map +1 -1
- package/build/bb-components-create.js +15 -29
- package/build/bb-components-create.js.map +1 -1
- package/build/bb-components-generate.js +26 -40
- package/build/bb-components-generate.js.map +1 -1
- package/build/bb-components-publish-bundle.js +20 -34
- package/build/bb-components-publish-bundle.js.map +1 -1
- package/build/bb-components-publish.js +21 -35
- package/build/bb-components-publish.js.map +1 -1
- package/build/bb-components-serve.js +9 -14
- package/build/bb-components-serve.js.map +1 -1
- package/build/bb-components.js +3 -4
- package/build/bb-components.js.map +1 -1
- package/build/bb-functions-build.js +31 -33
- package/build/bb-functions-build.js.map +1 -1
- package/build/bb-functions-bump.js +25 -39
- package/build/bb-functions-bump.js.map +1 -1
- package/build/bb-functions-init.js +14 -19
- package/build/bb-functions-init.js.map +1 -1
- package/build/bb-functions-login.js +9 -23
- package/build/bb-functions-login.js.map +1 -1
- package/build/bb-functions-logout.js +6 -11
- package/build/bb-functions-logout.js.map +1 -1
- package/build/bb-functions-new.js +8 -13
- package/build/bb-functions-new.js.map +1 -1
- package/build/bb-functions-publish.js +26 -40
- package/build/bb-functions-publish.js.map +1 -1
- package/build/bb-functions-validate.js +18 -32
- package/build/bb-functions-validate.js.map +1 -1
- package/build/bb-functions.js +2 -4
- package/build/bb-functions.js.map +1 -1
- package/build/bb.js +7 -11
- package/build/bb.js.map +1 -1
- package/build/blocks/blockDefinitions.js +12 -21
- package/build/blocks/blockDefinitions.js.map +1 -1
- package/build/blocks/publishBlocks.js +34 -48
- package/build/blocks/publishBlocks.js.map +1 -1
- package/build/blocks/releaseBlocks.js +27 -43
- package/build/blocks/releaseBlocks.js.map +1 -1
- package/build/components/comments.js +15 -18
- package/build/components/comments.js.map +1 -1
- package/build/components/compatibility.js +13 -15
- package/build/components/compatibility.js.map +1 -1
- package/build/components/transformers/index.js +8 -14
- package/build/components/transformers/index.js.map +1 -1
- package/build/components-build/index.js +2 -18
- package/build/components-build/index.js.map +1 -1
- package/build/components-build/reportDiagnostics.js +4 -12
- package/build/components-build/reportDiagnostics.js.map +1 -1
- package/build/components-build/styles.js +35 -92
- package/build/components-build/styles.js.map +1 -1
- package/build/functions/acquireAppFunctionsProject.js +5 -10
- package/build/functions/acquireAppFunctionsProject.js.map +1 -1
- package/build/functions/acquireCustomFunctionsProject.js +5 -10
- package/build/functions/acquireCustomFunctionsProject.js.map +1 -1
- package/build/functions/bb-components-functions.js +12 -30
- package/build/functions/bb-components-functions.js.map +1 -1
- package/build/functions/config.js +88 -91
- package/build/functions/config.js.map +1 -1
- package/build/functions/functionDefinitions.js +42 -56
- package/build/functions/functionDefinitions.js.map +1 -1
- package/build/functions/icons.js +10 -16
- package/build/functions/icons.js.map +1 -1
- package/build/functions/publishAppFunctions.js +47 -63
- package/build/functions/publishAppFunctions.js.map +1 -1
- package/build/functions/publishCustomFunctions.js +53 -69
- package/build/functions/publishCustomFunctions.js.map +1 -1
- package/build/functions/publishFunctions.js +18 -33
- package/build/functions/publishFunctions.js.map +1 -1
- package/build/functions/utils.js +9 -13
- package/build/functions/utils.js.map +1 -1
- package/build/functions/validations.js +41 -59
- package/build/functions/validations.js.map +1 -1
- package/build/functions/versions.js +21 -27
- package/build/functions/versions.js.map +1 -1
- package/build/interactions/compatibility.js +8 -45
- package/build/interactions/compatibility.js.map +1 -1
- package/build/interactions/diagnostics.js +7 -10
- package/build/interactions/diagnostics.js.map +1 -1
- package/build/types.js +9 -11
- package/build/types.js.map +1 -1
- package/build/utils/arguments.js +2 -7
- package/build/utils/arguments.js.map +1 -1
- package/build/utils/checkPackageVersion.js +6 -19
- package/build/utils/checkPackageVersion.js.map +1 -1
- package/build/utils/checkUpdateAvailable.js +31 -47
- package/build/utils/checkUpdateAvailable.js.map +1 -1
- package/build/utils/fusionAuth.js +84 -108
- package/build/utils/fusionAuth.js.map +1 -1
- package/build/utils/hash.js +2 -7
- package/build/utils/hash.js.map +1 -1
- package/build/utils/ide.js +111 -133
- package/build/utils/ide.js.map +1 -1
- package/build/utils/login.js +62 -78
- package/build/utils/login.js.map +1 -1
- package/build/utils/pick.js +1 -5
- package/build/utils/pick.js.map +1 -1
- package/build/utils/readFilesByType.js +13 -27
- package/build/utils/readFilesByType.js.map +1 -1
- package/build/utils/rootDir.js +3 -8
- package/build/utils/rootDir.js.map +1 -1
- package/build/utils/serveComponentSet.js +15 -29
- package/build/utils/serveComponentSet.js.map +1 -1
- package/build/utils/transpile.js +10 -15
- package/build/utils/transpile.js.map +1 -1
- package/build/utils/uploadBlob.js +22 -36
- package/build/utils/uploadBlob.js.map +1 -1
- package/build/utils/validation.js +9 -18
- package/build/utils/validation.js.map +1 -1
- package/build/validations/component.js +32 -37
- package/build/validations/component.js.map +1 -1
- package/build/validations/constants.js +16 -19
- package/build/validations/constants.js.map +1 -1
- package/build/validations/function-block-validations/index.js +27 -44
- package/build/validations/function-block-validations/index.js.map +1 -1
- package/build/validations/interaction.js +11 -16
- package/build/validations/interaction.js.map +1 -1
- package/build/validations/prefab/action.js +54 -60
- package/build/validations/prefab/action.js.map +1 -1
- package/build/validations/prefab/component.js +97 -102
- package/build/validations/prefab/component.js.map +1 -1
- package/build/validations/prefab/componentOption.js +125 -102
- package/build/validations/prefab/componentOption.js.map +1 -1
- package/build/validations/prefab/interaction.js +22 -28
- package/build/validations/prefab/interaction.js.map +1 -1
- package/build/validations/prefab/linkedOption.js +29 -35
- package/build/validations/prefab/linkedOption.js.map +1 -1
- package/build/validations/prefab/linkedPartial.js +21 -27
- package/build/validations/prefab/linkedPartial.js.map +1 -1
- package/build/validations/prefab/variable.js +20 -26
- package/build/validations/prefab/variable.js.map +1 -1
- package/build/validations/prefab.js +34 -39
- package/build/validations/prefab.js.map +1 -1
- package/build/validations/styles.js +31 -37
- package/build/validations/styles.js.map +1 -1
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"variable.js","sourceRoot":"","sources":["../../../src/validations/prefab/variable.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"variable.js","sourceRoot":"","sources":["../../../src/validations/prefab/variable.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAC;AAEtB,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE;IACjD,MAAM,EAAE;QACN;YACE,EAAE,EAAE,WAAW;YACf,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC;gBACf,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE;gBAC1C,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC;oBACd,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;iBACvC,CAAC,CAAC,QAAQ,EAAE;aACd,CAAC;SACH;QACD;YACE,EAAE,EAAE,QAAQ;YACZ,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC;gBACf,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE;aAC3C,CAAC;SACH;KACF;IACD,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE;CAC3B,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,CAAC,MAAM,CAAC;IACvC,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE;IACvC,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE;SACf,KAAK,CAAC,GAAG,aAAa,CAAC;SACvB,QAAQ,EAAE;IACb,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC;IAC9B,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC;QACd,EAAE,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC3B,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE;QACxB,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE;KACvB,CAAC,CAAC,QAAQ,EAAE;IACb,OAAO,EAAE,kBAAkB;CAC5B,CAAC,CAAC"}
|
|
@@ -1,44 +1,39 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// Array spread is done because of this issue: https://github.com/hapijs/joi/issues/1449#issuecomment-532576296
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
};
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
const
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
name: joi_1.default.string().required(),
|
|
17
|
-
keywords: joi_1.default.array(),
|
|
18
|
-
icon: joi_1.default.string()
|
|
19
|
-
.valid(...constants_1.ICONS)
|
|
2
|
+
import chalk from 'chalk';
|
|
3
|
+
import Joi from 'joi';
|
|
4
|
+
import { findDuplicates } from '../utils/validation';
|
|
5
|
+
import { ICONS, MAX_ACTIONS, MAX_INTERACTIONS, MAX_VARIABLES, } from './constants';
|
|
6
|
+
import { actionSchema } from './prefab/action';
|
|
7
|
+
import { validateComponent } from './prefab/component';
|
|
8
|
+
import { interactionSchema } from './prefab/interaction';
|
|
9
|
+
import { variableSchema } from './prefab/variable';
|
|
10
|
+
const schemaProvider = ({ styles, componentStyleMap, availableComponentNames, prefabType, }) => Joi.object({
|
|
11
|
+
name: Joi.string().required(),
|
|
12
|
+
keywords: Joi.array(),
|
|
13
|
+
icon: Joi.string()
|
|
14
|
+
.valid(...ICONS)
|
|
20
15
|
.required(),
|
|
21
|
-
category:
|
|
22
|
-
type: prefabType === 'partial' ?
|
|
23
|
-
description:
|
|
24
|
-
isPublicPage:
|
|
25
|
-
developerMode:
|
|
26
|
-
detail:
|
|
27
|
-
previewImage:
|
|
28
|
-
previewUrl:
|
|
29
|
-
interactions:
|
|
30
|
-
actions:
|
|
31
|
-
variables:
|
|
32
|
-
beforeCreate:
|
|
33
|
-
structure:
|
|
34
|
-
.items(
|
|
16
|
+
category: Joi.string().required(),
|
|
17
|
+
type: prefabType === 'partial' ? Joi.forbidden() : Joi.string().valid('page'),
|
|
18
|
+
description: Joi.string(),
|
|
19
|
+
isPublicPage: Joi.boolean(),
|
|
20
|
+
developerMode: Joi.string().valid('basic', 'advanced'),
|
|
21
|
+
detail: Joi.string(),
|
|
22
|
+
previewImage: Joi.string(),
|
|
23
|
+
previewUrl: Joi.string(),
|
|
24
|
+
interactions: Joi.array().items(interactionSchema).max(MAX_INTERACTIONS),
|
|
25
|
+
actions: Joi.array().items(actionSchema).max(MAX_ACTIONS),
|
|
26
|
+
variables: Joi.array().items(variableSchema).max(MAX_VARIABLES),
|
|
27
|
+
beforeCreate: Joi.any(),
|
|
28
|
+
structure: Joi.array()
|
|
29
|
+
.items(Joi.custom(validateComponent({
|
|
35
30
|
styles,
|
|
36
31
|
componentStyleMap,
|
|
37
32
|
availableComponentNames,
|
|
38
33
|
prefabType,
|
|
39
34
|
})))
|
|
40
35
|
.required(),
|
|
41
|
-
reconfigure:
|
|
36
|
+
reconfigure: Joi.any(),
|
|
42
37
|
});
|
|
43
38
|
const validate = ({ styles, componentStyleMap, availableComponentNames, prefabType, }) => (prefab) => {
|
|
44
39
|
const { actions, variables } = prefab;
|
|
@@ -49,23 +44,23 @@ const validate = ({ styles, componentStyleMap, availableComponentNames, prefabTy
|
|
|
49
44
|
prefabType,
|
|
50
45
|
}).validate(prefab);
|
|
51
46
|
if (Array.isArray(actions)) {
|
|
52
|
-
|
|
47
|
+
findDuplicates(actions, 'action', { ref: 'id' });
|
|
53
48
|
}
|
|
54
49
|
if (Array.isArray(variables)) {
|
|
55
|
-
|
|
56
|
-
|
|
50
|
+
findDuplicates(variables, 'variable', 'name');
|
|
51
|
+
findDuplicates(variables, 'action', { ref: 'id' });
|
|
57
52
|
}
|
|
58
53
|
if (error) {
|
|
59
|
-
throw new Error(
|
|
54
|
+
throw new Error(chalk.red(`\nProperty: ${error.message} at prefab: ${prefab.name}\n`));
|
|
60
55
|
}
|
|
61
56
|
};
|
|
62
|
-
|
|
57
|
+
export default ({ prefabs, styles, componentStyleMap, availableComponentNames, prefabType, }) => {
|
|
63
58
|
prefabs.forEach(validate({
|
|
64
59
|
styles,
|
|
65
60
|
componentStyleMap,
|
|
66
61
|
availableComponentNames,
|
|
67
62
|
prefabType,
|
|
68
63
|
}));
|
|
69
|
-
|
|
64
|
+
findDuplicates(prefabs, 'prefab', 'name');
|
|
70
65
|
};
|
|
71
66
|
//# sourceMappingURL=prefab.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prefab.js","sourceRoot":"","sources":["../../src/validations/prefab.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"prefab.js","sourceRoot":"","sources":["../../src/validations/prefab.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.overwriteSchema = exports.contentSchema = void 0;
|
|
7
|
-
const chalk_1 = __importDefault(require("chalk"));
|
|
8
|
-
const joi_1 = __importDefault(require("joi"));
|
|
9
|
-
const types_1 = require("../types");
|
|
1
|
+
import chalk from 'chalk';
|
|
2
|
+
import Joi from 'joi';
|
|
3
|
+
import { AllowedStateKeys } from '../types';
|
|
10
4
|
const shadows = [
|
|
11
5
|
'none',
|
|
12
6
|
'0px 2px 1px -1px rgba(0,0,0,0.2),0px 1px 1px 0px rgba(0,0,0,0.14),0px 1px 3px 0px rgba(0,0,0,0.12)',
|
|
@@ -34,23 +28,23 @@ const shadows = [
|
|
|
34
28
|
'0px 11px 14px -7px rgba(0,0,0,0.2),0px 23px 36px 3px rgba(0,0,0,0.14),0px 9px 44px 8px rgba(0,0,0,0.12)',
|
|
35
29
|
'0px 11px 15px -7px rgba(0,0,0,0.2),0px 24px 38px 3px rgba(0,0,0,0.14),0px 9px 46px 8px rgba(0,0,0,0.12)',
|
|
36
30
|
];
|
|
37
|
-
const isString =
|
|
31
|
+
const isString = Joi.string().max(255);
|
|
38
32
|
const validRem = /^\d{1,5}\.?\d{0,5}rem$/;
|
|
39
33
|
const optionType = ['STATIC', 'THEME_COLOR'];
|
|
40
|
-
|
|
41
|
-
backgroundColor:
|
|
34
|
+
export const contentSchema = Joi.object({
|
|
35
|
+
backgroundColor: Joi.object({
|
|
42
36
|
type: optionType,
|
|
43
37
|
value: isString,
|
|
44
38
|
}),
|
|
45
|
-
borderColor:
|
|
39
|
+
borderColor: Joi.object({
|
|
46
40
|
type: optionType,
|
|
47
41
|
value: isString,
|
|
48
42
|
}),
|
|
49
|
-
borderRadius:
|
|
43
|
+
borderRadius: Joi.array().max(1).items(isString.required().pattern(validRem)),
|
|
50
44
|
borderStyle: isString,
|
|
51
|
-
borderWidth:
|
|
45
|
+
borderWidth: Joi.array().max(1).items(isString.required().pattern(validRem)),
|
|
52
46
|
boxShadow: shadows,
|
|
53
|
-
color:
|
|
47
|
+
color: Joi.object({
|
|
54
48
|
type: optionType,
|
|
55
49
|
value: isString,
|
|
56
50
|
}),
|
|
@@ -58,52 +52,52 @@ exports.contentSchema = joi_1.default.object({
|
|
|
58
52
|
fontSize: isString.pattern(validRem),
|
|
59
53
|
fontStyle: ['italic', 'normal', 'none'],
|
|
60
54
|
fontWeight: ['300', '400', '500', '700'],
|
|
61
|
-
letterSpacing:
|
|
62
|
-
lineHeight:
|
|
55
|
+
letterSpacing: Joi.alternatives().try(isString.pattern(validRem), isString.allow('normal')),
|
|
56
|
+
lineHeight: Joi.string().max(255).pattern(/^\d*$/),
|
|
63
57
|
padding: [
|
|
64
58
|
isString,
|
|
65
|
-
|
|
59
|
+
Joi.array().max(4).items(isString.required().pattern(validRem)),
|
|
66
60
|
],
|
|
67
61
|
textDecoration: ['underline', 'none'],
|
|
68
62
|
textTransform: ['uppercase', 'none'],
|
|
69
63
|
});
|
|
70
|
-
const stateSchema =
|
|
71
|
-
name:
|
|
64
|
+
const stateSchema = Joi.object({
|
|
65
|
+
name: Joi.string()
|
|
72
66
|
.required()
|
|
73
|
-
.allow(...Object.keys(
|
|
74
|
-
content:
|
|
67
|
+
.allow(...Object.keys(AllowedStateKeys)),
|
|
68
|
+
content: contentSchema.required().min(1),
|
|
75
69
|
});
|
|
76
70
|
const validateStyleType = (componentNames) => (type) => {
|
|
77
71
|
if (componentNames.includes(type)) {
|
|
78
72
|
return type;
|
|
79
73
|
}
|
|
80
|
-
throw new Error(
|
|
74
|
+
throw new Error(chalk.red(`\n type for style invalid: ${type} is not available as a component \n`));
|
|
81
75
|
};
|
|
82
|
-
const styleSchema = (componentNames) =>
|
|
83
|
-
name:
|
|
84
|
-
type:
|
|
85
|
-
basis:
|
|
86
|
-
states:
|
|
76
|
+
const styleSchema = (componentNames) => Joi.object({
|
|
77
|
+
name: Joi.string().required(),
|
|
78
|
+
type: Joi.string().required().custom(validateStyleType(componentNames)),
|
|
79
|
+
basis: contentSchema.required().min(1),
|
|
80
|
+
states: Joi.array().items(stateSchema).unique('name').required(),
|
|
87
81
|
});
|
|
88
|
-
|
|
89
|
-
.items(
|
|
90
|
-
name:
|
|
82
|
+
export const overwriteSchema = Joi.array()
|
|
83
|
+
.items(Joi.object({
|
|
84
|
+
name: Joi.string()
|
|
91
85
|
.required()
|
|
92
|
-
.allow(...Object.keys(
|
|
93
|
-
content:
|
|
86
|
+
.allow(...Object.keys(AllowedStateKeys), 'basis'),
|
|
87
|
+
content: contentSchema.required().min(1),
|
|
94
88
|
}))
|
|
95
89
|
.unique('name');
|
|
96
90
|
const validateUnique = (a, b) => a.name === b.name && a.type === b.type;
|
|
97
91
|
const validateAll = (styles, componentNames) => {
|
|
98
|
-
const { error } =
|
|
92
|
+
const { error } = Joi.array()
|
|
99
93
|
.items(styleSchema(componentNames))
|
|
100
94
|
.unique(validateUnique)
|
|
101
95
|
.validate(styles);
|
|
102
96
|
if (error) {
|
|
103
|
-
throw new Error(
|
|
97
|
+
throw new Error(chalk.red(`\nStyles: ${error.message}\n`));
|
|
104
98
|
}
|
|
105
99
|
};
|
|
106
|
-
|
|
100
|
+
export default (styles, componentNames) => {
|
|
107
101
|
validateAll(styles, componentNames);
|
|
108
102
|
};
|
|
109
103
|
//# sourceMappingURL=styles.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"styles.js","sourceRoot":"","sources":["../../src/validations/styles.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"styles.js","sourceRoot":"","sources":["../../src/validations/styles.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@betty-blocks/cli",
|
|
3
|
-
"version": "26.0.0-beta.
|
|
3
|
+
"version": "26.0.0-beta.16",
|
|
4
4
|
"description": "A Betty Blocks CLI",
|
|
5
5
|
"module": "./build/bb.js",
|
|
6
6
|
"type": "module",
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
"url": "https://github.com/bettyblocks/cli"
|
|
11
11
|
},
|
|
12
12
|
"scripts": {
|
|
13
|
-
"build": "tsc",
|
|
13
|
+
"build": "tsc --project tsconfig.build.json",
|
|
14
14
|
"typecheck": "tsc",
|
|
15
15
|
"lint:check": "eslint ./src ./__tests__",
|
|
16
16
|
"lint": "eslint ./src ./__tests__ --fix",
|