@teambit/formatter 1.0.527 → 1.0.529
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/dist/format.task.js +5 -0
- package/dist/format.task.js.map +1 -1
- package/dist/formatter.main.runtime.d.ts +16 -5
- package/dist/formatter.main.runtime.js +22 -7
- package/dist/formatter.main.runtime.js.map +1 -1
- package/dist/formatter.service.d.ts +1 -1
- package/dist/formatter.service.js +8 -2
- package/dist/formatter.service.js.map +1 -1
- package/dist/{preview-1737947940915.js → preview-1738120666692.js} +2 -2
- package/package.json +9 -8
package/dist/format.task.js
CHANGED
|
@@ -10,6 +10,11 @@ class FormatTask {
|
|
|
10
10
|
this.name = name;
|
|
11
11
|
}
|
|
12
12
|
async execute(context) {
|
|
13
|
+
if (!context.env.getFormatter) {
|
|
14
|
+
return {
|
|
15
|
+
componentsResults: []
|
|
16
|
+
};
|
|
17
|
+
}
|
|
13
18
|
const formatter = context.env.getFormatter();
|
|
14
19
|
// TODO: add option to select between check and format here
|
|
15
20
|
const results = await formatter.check(context);
|
package/dist/format.task.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["FormatTask","constructor","aspectId","name","execute","context","
|
|
1
|
+
{"version":3,"names":["FormatTask","constructor","aspectId","name","execute","context","env","getFormatter","componentsResults","formatter","results","check","map","formatResult","component","metadata","errors","exports"],"sources":["format.task.ts"],"sourcesContent":["import { BuildTask, BuiltTaskResult, BuildContext, ComponentResult } from '@teambit/builder';\nimport { Formatter } from './formatter';\n\nexport class FormatTask implements BuildTask {\n constructor(\n readonly aspectId: string,\n readonly name = 'format'\n ) {}\n\n async execute(context: BuildContext): Promise<BuiltTaskResult> {\n if (!context.env.getFormatter) {\n return {\n componentsResults: [],\n };\n }\n\n const formatter: Formatter = context.env.getFormatter();\n // TODO: add option to select between check and format here\n const results = await formatter.check(context);\n const componentsResults = results.results.map((formatResult): ComponentResult => {\n return {\n component: formatResult.component,\n metadata: {\n results: formatResult.results,\n },\n errors: [],\n };\n });\n\n return {\n componentsResults,\n };\n }\n}\n"],"mappings":";;;;;;AAGO,MAAMA,UAAU,CAAsB;EAC3CC,WAAWA,CACAC,QAAgB,EAChBC,IAAI,GAAG,QAAQ,EACxB;IAAA,KAFSD,QAAgB,GAAhBA,QAAgB;IAAA,KAChBC,IAAI,GAAJA,IAAI;EACZ;EAEH,MAAMC,OAAOA,CAACC,OAAqB,EAA4B;IAC7D,IAAI,CAACA,OAAO,CAACC,GAAG,CAACC,YAAY,EAAE;MAC7B,OAAO;QACLC,iBAAiB,EAAE;MACrB,CAAC;IACH;IAEA,MAAMC,SAAoB,GAAGJ,OAAO,CAACC,GAAG,CAACC,YAAY,CAAC,CAAC;IACvD;IACA,MAAMG,OAAO,GAAG,MAAMD,SAAS,CAACE,KAAK,CAACN,OAAO,CAAC;IAC9C,MAAMG,iBAAiB,GAAGE,OAAO,CAACA,OAAO,CAACE,GAAG,CAAEC,YAAY,IAAsB;MAC/E,OAAO;QACLC,SAAS,EAAED,YAAY,CAACC,SAAS;QACjCC,QAAQ,EAAE;UACRL,OAAO,EAAEG,YAAY,CAACH;QACxB,CAAC;QACDM,MAAM,EAAE;MACV,CAAC;IACH,CAAC,CAAC;IAEF,OAAO;MACLR;IACF,CAAC;EACH;AACF;AAACS,OAAA,CAAAjB,UAAA,GAAAA,UAAA","ignoreList":[]}
|
|
@@ -1,18 +1,22 @@
|
|
|
1
1
|
import { CLIMain } from '@teambit/cli';
|
|
2
2
|
import { Component, ComponentMain } from '@teambit/component';
|
|
3
3
|
import { EnvsMain, ExecutionContext } from '@teambit/envs';
|
|
4
|
-
import { LoggerMain } from '@teambit/logger';
|
|
4
|
+
import { Logger, LoggerMain } from '@teambit/logger';
|
|
5
5
|
import { Workspace } from '@teambit/workspace';
|
|
6
6
|
import { FormatterService } from './formatter.service';
|
|
7
7
|
import { FormatTask } from './format.task';
|
|
8
8
|
import { FormatterOptions } from './formatter-context';
|
|
9
9
|
import { Formatter } from './formatter';
|
|
10
|
-
|
|
10
|
+
import { SnappingMain } from '@teambit/snapping';
|
|
11
|
+
export type FormatterConfig = {
|
|
12
|
+
formatOnPreSnap?: boolean;
|
|
13
|
+
};
|
|
11
14
|
export declare class FormatterMain {
|
|
12
15
|
private envs;
|
|
13
16
|
private formatterService;
|
|
17
|
+
private logger;
|
|
14
18
|
static runtime: import("@teambit/harmony").RuntimeDefinition;
|
|
15
|
-
constructor(envs: EnvsMain, formatterService: FormatterService);
|
|
19
|
+
constructor(envs: EnvsMain, formatterService: FormatterService, logger: Logger);
|
|
16
20
|
/**
|
|
17
21
|
* format an array of components.
|
|
18
22
|
*/
|
|
@@ -21,7 +25,7 @@ export declare class FormatterMain {
|
|
|
21
25
|
* check format an array of components.
|
|
22
26
|
*/
|
|
23
27
|
check(components: Component[], opts: FormatterOptions): Promise<import("@teambit/envs").EnvsExecutionResult<import("./formatter").FormatResults>>;
|
|
24
|
-
getFormatter(context: ExecutionContext, options: FormatterOptions): Formatter;
|
|
28
|
+
getFormatter(context: ExecutionContext, options: FormatterOptions): Formatter | undefined;
|
|
25
29
|
private toFormatServiceOptions;
|
|
26
30
|
/**
|
|
27
31
|
* create a format task for build pipelines.
|
|
@@ -30,5 +34,12 @@ export declare class FormatterMain {
|
|
|
30
34
|
createTask(name?: string): FormatTask;
|
|
31
35
|
static dependencies: import("@teambit/harmony").Aspect[];
|
|
32
36
|
static defaultConfig: FormatterConfig;
|
|
33
|
-
static provider([envs, cli, component, loggerAspect, workspace
|
|
37
|
+
static provider([envs, cli, component, loggerAspect, workspace, snapping]: [
|
|
38
|
+
EnvsMain,
|
|
39
|
+
CLIMain,
|
|
40
|
+
ComponentMain,
|
|
41
|
+
LoggerMain,
|
|
42
|
+
Workspace,
|
|
43
|
+
SnappingMain
|
|
44
|
+
], config: FormatterConfig): Promise<FormatterMain>;
|
|
34
45
|
}
|
|
@@ -67,15 +67,23 @@ function _format2() {
|
|
|
67
67
|
};
|
|
68
68
|
return data;
|
|
69
69
|
}
|
|
70
|
+
function _snapping() {
|
|
71
|
+
const data = require("@teambit/snapping");
|
|
72
|
+
_snapping = function () {
|
|
73
|
+
return data;
|
|
74
|
+
};
|
|
75
|
+
return data;
|
|
76
|
+
}
|
|
70
77
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
71
78
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
72
79
|
function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
|
|
73
80
|
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
|
|
74
81
|
function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
75
82
|
class FormatterMain {
|
|
76
|
-
constructor(envs, formatterService) {
|
|
83
|
+
constructor(envs, formatterService, logger) {
|
|
77
84
|
this.envs = envs;
|
|
78
85
|
this.formatterService = formatterService;
|
|
86
|
+
this.logger = logger;
|
|
79
87
|
}
|
|
80
88
|
|
|
81
89
|
/**
|
|
@@ -111,19 +119,26 @@ class FormatterMain {
|
|
|
111
119
|
createTask(name) {
|
|
112
120
|
return new (_format().FormatTask)(_formatter().FormatterAspect.id, name);
|
|
113
121
|
}
|
|
114
|
-
static async provider([envs, cli, component, loggerAspect, workspace], config) {
|
|
115
|
-
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
122
|
+
static async provider([envs, cli, component, loggerAspect, workspace, snapping], config) {
|
|
116
123
|
const logger = loggerAspect.createLogger(_formatter().FormatterAspect.id);
|
|
117
124
|
const formatterService = new (_formatter2().FormatterService)(config);
|
|
118
|
-
const
|
|
125
|
+
const formatterMain = new FormatterMain(envs, formatterService, logger);
|
|
119
126
|
envs.registerService(formatterService);
|
|
120
|
-
cli.register(new (_format2().FormatCmd)(
|
|
121
|
-
|
|
127
|
+
cli.register(new (_format2().FormatCmd)(formatterMain, component.getHost(), workspace));
|
|
128
|
+
snapping.registerOnPreSnap(async components => {
|
|
129
|
+
if (!config.formatOnPreSnap) {
|
|
130
|
+
return;
|
|
131
|
+
}
|
|
132
|
+
await formatterMain.format(components, {
|
|
133
|
+
check: false
|
|
134
|
+
});
|
|
135
|
+
});
|
|
136
|
+
return formatterMain;
|
|
122
137
|
}
|
|
123
138
|
}
|
|
124
139
|
exports.FormatterMain = FormatterMain;
|
|
125
140
|
_defineProperty(FormatterMain, "runtime", _cli().MainRuntime);
|
|
126
|
-
_defineProperty(FormatterMain, "dependencies", [_envs().EnvsAspect, _cli().CLIAspect, _component().ComponentAspect, _logger().LoggerAspect, _workspace().WorkspaceAspect]);
|
|
141
|
+
_defineProperty(FormatterMain, "dependencies", [_envs().EnvsAspect, _cli().CLIAspect, _component().ComponentAspect, _logger().LoggerAspect, _workspace().WorkspaceAspect, _snapping().SnappingAspect]);
|
|
127
142
|
_defineProperty(FormatterMain, "defaultConfig", {});
|
|
128
143
|
_formatter().FormatterAspect.addRuntime(FormatterMain);
|
|
129
144
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_cli","data","require","_component","_envs","_logger","_workspace","_formatter","_formatter2","_format","_format2","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","FormatterMain","constructor","envs","formatterService","format","components","opts","envsRuntime","createEnvironment","formatResults","run","toFormatServiceOptions","check","getFormatter","context","options","createTask","name","FormatTask","FormatterAspect","id","provider","cli","component","loggerAspect","workspace","
|
|
1
|
+
{"version":3,"names":["_cli","data","require","_component","_envs","_logger","_workspace","_formatter","_formatter2","_format","_format2","_snapping","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","FormatterMain","constructor","envs","formatterService","logger","format","components","opts","envsRuntime","createEnvironment","formatResults","run","toFormatServiceOptions","check","getFormatter","context","options","createTask","name","FormatTask","FormatterAspect","id","provider","cli","component","loggerAspect","workspace","snapping","config","createLogger","FormatterService","formatterMain","registerService","register","FormatCmd","getHost","registerOnPreSnap","formatOnPreSnap","exports","MainRuntime","EnvsAspect","CLIAspect","ComponentAspect","LoggerAspect","WorkspaceAspect","SnappingAspect","addRuntime"],"sources":["formatter.main.runtime.ts"],"sourcesContent":["import { CLIAspect, CLIMain, MainRuntime } from '@teambit/cli';\nimport { Component, ComponentAspect, ComponentMain } from '@teambit/component';\nimport { EnvsAspect, EnvsMain, ExecutionContext } from '@teambit/envs';\nimport { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';\nimport { Workspace, WorkspaceAspect } from '@teambit/workspace';\nimport { FormatterAspect } from './formatter.aspect';\nimport { FormatterService } from './formatter.service';\nimport { FormatTask } from './format.task';\nimport { FormatCmd } from './format.cmd';\nimport { FormatterOptions } from './formatter-context';\nimport { Formatter } from './formatter';\nimport { SnappingAspect, SnappingMain } from '@teambit/snapping';\n\nexport type FormatterConfig = {\n formatOnPreSnap?: boolean;\n};\nexport class FormatterMain {\n static runtime = MainRuntime;\n\n constructor(\n private envs: EnvsMain,\n private formatterService: FormatterService,\n private logger: Logger\n ) {}\n\n /**\n * format an array of components.\n */\n async format(components: Component[], opts: FormatterOptions) {\n const envsRuntime = await this.envs.createEnvironment(components);\n const formatResults = envsRuntime.run(this.formatterService, this.toFormatServiceOptions(opts, false));\n return formatResults;\n }\n\n /**\n * check format an array of components.\n */\n async check(components: Component[], opts: FormatterOptions) {\n const envsRuntime = await this.envs.createEnvironment(components);\n const formatResults = envsRuntime.run(this.formatterService, this.toFormatServiceOptions(opts, true));\n return formatResults;\n }\n\n getFormatter(context: ExecutionContext, options: FormatterOptions): Formatter | undefined {\n return this.formatterService.getFormatter(context, options);\n }\n\n private toFormatServiceOptions(opts: FormatterOptions, check = false): FormatterOptions {\n return {\n ...opts,\n check,\n };\n }\n\n /**\n * create a format task for build pipelines.\n * @param name name of the task.\n */\n createTask(name?: string): FormatTask {\n return new FormatTask(FormatterAspect.id, name);\n }\n\n static dependencies = [EnvsAspect, CLIAspect, ComponentAspect, LoggerAspect, WorkspaceAspect, SnappingAspect];\n\n static defaultConfig: FormatterConfig = {};\n\n static async provider(\n [envs, cli, component, loggerAspect, workspace, snapping]: [\n EnvsMain,\n CLIMain,\n ComponentMain,\n LoggerMain,\n Workspace,\n SnappingMain,\n ],\n config: FormatterConfig\n ) {\n const logger = loggerAspect.createLogger(FormatterAspect.id);\n const formatterService = new FormatterService(config);\n const formatterMain = new FormatterMain(envs, formatterService, logger);\n envs.registerService(formatterService);\n cli.register(new FormatCmd(formatterMain, component.getHost(), workspace));\n snapping.registerOnPreSnap(async (components) => {\n if (!config.formatOnPreSnap) {\n return;\n }\n await formatterMain.format(components, { check: false });\n });\n\n return formatterMain;\n }\n}\n\nFormatterAspect.addRuntime(FormatterMain);\n"],"mappings":"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","ignoreList":[]}
|
|
@@ -10,7 +10,7 @@ export declare class FormatterService implements EnvService<FormatResults> {
|
|
|
10
10
|
name: string;
|
|
11
11
|
constructor(formatterConfig: FormatterConfig);
|
|
12
12
|
run(context: ExecutionContext, options: FormatterOptions): Promise<FormatResults>;
|
|
13
|
-
getFormatter(context: ExecutionContext, options: FormatterOptions): Formatter;
|
|
13
|
+
getFormatter(context: ExecutionContext, options: FormatterOptions): Formatter | undefined;
|
|
14
14
|
private optionsWithDefaults;
|
|
15
15
|
private mergeContext;
|
|
16
16
|
render(env: EnvDefinition): string;
|
|
@@ -35,16 +35,22 @@ class FormatterService {
|
|
|
35
35
|
_defineProperty(this, "name", 'formatter');
|
|
36
36
|
}
|
|
37
37
|
async run(context, options) {
|
|
38
|
+
const formatter = this.getFormatter(context, options);
|
|
39
|
+
if (!formatter) {
|
|
40
|
+
return {
|
|
41
|
+
results: [],
|
|
42
|
+
errors: []
|
|
43
|
+
};
|
|
44
|
+
}
|
|
38
45
|
const mergedOpts = this.optionsWithDefaults(options);
|
|
39
46
|
const formatterContext = this.mergeContext(mergedOpts, context);
|
|
40
|
-
const formatter = this.getFormatter(context, options);
|
|
41
47
|
const results = options.check ? await formatter.check(formatterContext) : await formatter.format(formatterContext);
|
|
42
48
|
return results;
|
|
43
49
|
}
|
|
44
50
|
getFormatter(context, options) {
|
|
45
51
|
const mergedOpts = this.optionsWithDefaults(options);
|
|
46
52
|
const formatterContext = this.mergeContext(mergedOpts, context);
|
|
47
|
-
const formatter = context.env.getFormatter(formatterContext);
|
|
53
|
+
const formatter = context.env.getFormatter?.(formatterContext);
|
|
48
54
|
return formatter;
|
|
49
55
|
}
|
|
50
56
|
optionsWithDefaults(options) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_lodash","_cliHighlight","e","__esModule","default","_defineProperty","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","FormatterService","constructor","formatterConfig","run","context","options","
|
|
1
|
+
{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_lodash","_cliHighlight","e","__esModule","default","_defineProperty","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","FormatterService","constructor","formatterConfig","run","context","options","formatter","getFormatter","results","errors","mergedOpts","optionsWithDefaults","formatterContext","mergeContext","check","format","env","defaults","assign","render","descriptor","getDescriptor","name","chalk","green","id","displayName","version","configLabel","configObj","config","highlight","language","ignoreIllegals","transform","undefined","icon","displayConfig","exports"],"sources":["formatter.service.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { defaults } from 'lodash';\nimport { EnvService, ExecutionContext, EnvDefinition, Env, EnvContext, ServiceTransformationMap } from '@teambit/envs';\nimport highlight from 'cli-highlight';\nimport { Formatter, FormatResults } from './formatter';\nimport { FormatterContext, FormatterOptions } from './formatter-context';\nimport { FormatterConfig } from './formatter.main.runtime';\n\ntype FormatterTransformationMap = ServiceTransformationMap & {\n getFormatter: () => Formatter;\n};\nexport class FormatterService implements EnvService<FormatResults> {\n name = 'formatter';\n\n constructor(private formatterConfig: FormatterConfig) {}\n\n async run(context: ExecutionContext, options: FormatterOptions): Promise<FormatResults> {\n const formatter = this.getFormatter(context, options);\n if (!formatter) {\n return { results: [], errors: [] };\n }\n const mergedOpts = this.optionsWithDefaults(options);\n const formatterContext: FormatterContext = this.mergeContext(mergedOpts, context);\n\n const results = options.check ? await formatter.check(formatterContext) : await formatter.format(formatterContext);\n return results;\n }\n\n getFormatter(context: ExecutionContext, options: FormatterOptions): Formatter | undefined {\n const mergedOpts = this.optionsWithDefaults(options);\n const formatterContext: FormatterContext = this.mergeContext(mergedOpts, context);\n const formatter = context.env.getFormatter?.(formatterContext);\n\n return formatter;\n }\n\n private optionsWithDefaults(options: FormatterOptions): FormatterOptions {\n return defaults(options, this.formatterConfig);\n }\n\n private mergeContext(options: FormatterOptions, context?: ExecutionContext): FormatterContext {\n const formatterContext: FormatterContext = Object.assign({}, options, context);\n return formatterContext;\n }\n\n render(env: EnvDefinition) {\n const descriptor = this.getDescriptor(env);\n const name = `${chalk.green('configured formatter:')} ${descriptor?.id} (${descriptor?.displayName} @ ${\n descriptor?.version\n })`;\n const configLabel = chalk.green('formatter config:');\n const configObj = descriptor?.config\n ? highlight(descriptor?.config, { language: 'json', ignoreIllegals: true })\n : '';\n return `${name}\\n${configLabel}\\n${configObj}`;\n }\n\n transform(env: Env, context: EnvContext): FormatterTransformationMap | undefined {\n // Old env\n if (!env?.formatter) return undefined;\n return {\n getFormatter: () => env.formatter()(context),\n };\n }\n\n getDescriptor(env: EnvDefinition) {\n if (!env.env.getFormatter) return undefined;\n const mergedOpts = this.optionsWithDefaults({});\n const formatterContext = this.mergeContext(mergedOpts);\n const formatter = env.env.getFormatter(formatterContext);\n\n return {\n id: formatter.id,\n icon: formatter.icon,\n config: formatter.displayConfig ? formatter.displayConfig() : undefined,\n version: formatter.version ? formatter.version() : '?',\n displayName: formatter.displayName ? formatter.displayName : '?',\n };\n }\n}\n"],"mappings":"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","ignoreList":[]}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad/teambit.defender_formatter@1.0.
|
|
2
|
-
import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad/teambit.defender_formatter@1.0.
|
|
1
|
+
import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad/teambit.defender_formatter@1.0.529/dist/formatter.composition.js';
|
|
2
|
+
import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad/teambit.defender_formatter@1.0.529/dist/formatter.docs.mdx';
|
|
3
3
|
|
|
4
4
|
export const compositions = [compositions_0];
|
|
5
5
|
export const overview = [overview_0];
|
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@teambit/formatter",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.529",
|
|
4
4
|
"homepage": "https://bit.cloud/teambit/defender/formatter",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"componentId": {
|
|
7
7
|
"scope": "teambit.defender",
|
|
8
8
|
"name": "formatter",
|
|
9
|
-
"version": "1.0.
|
|
9
|
+
"version": "1.0.529"
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"chalk": "2.4.2",
|
|
@@ -14,14 +14,15 @@
|
|
|
14
14
|
"graphql-tag": "2.12.1",
|
|
15
15
|
"cli-highlight": "2.1.9",
|
|
16
16
|
"@teambit/harmony": "0.4.6",
|
|
17
|
-
"@teambit/cli": "0.0.
|
|
18
|
-
"@teambit/component": "1.0.
|
|
19
|
-
"@teambit/envs": "1.0.
|
|
17
|
+
"@teambit/cli": "0.0.1106",
|
|
18
|
+
"@teambit/component": "1.0.529",
|
|
19
|
+
"@teambit/envs": "1.0.529",
|
|
20
20
|
"@teambit/legacy.constants": "0.0.8",
|
|
21
21
|
"@teambit/toolbox.time.timer": "0.0.3",
|
|
22
|
-
"@teambit/workspace": "1.0.
|
|
23
|
-
"@teambit/builder": "1.0.
|
|
24
|
-
"@teambit/logger": "0.0.
|
|
22
|
+
"@teambit/workspace": "1.0.529",
|
|
23
|
+
"@teambit/builder": "1.0.529",
|
|
24
|
+
"@teambit/logger": "0.0.1199",
|
|
25
|
+
"@teambit/snapping": "1.0.529"
|
|
25
26
|
},
|
|
26
27
|
"devDependencies": {
|
|
27
28
|
"@types/lodash": "4.14.165",
|