@dcl/sdk-commands 7.1.12-4982829389.commit-f2f84bd → 7.1.12-4983855939.commit-561a19a
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/logic/beautiful-logs.d.ts +1 -0
- package/dist/logic/beautiful-logs.js +6 -1
- package/dist/logic/beautiful-logs.js.map +1 -1
- package/dist/logic/bundle.js +5 -22
- package/dist/logic/bundle.js.map +1 -1
- package/dist/logic/composite.d.ts +8 -0
- package/dist/logic/composite.js +51 -0
- package/dist/logic/composite.js.map +1 -0
- package/package.json +4 -3
|
@@ -11,3 +11,4 @@ export declare function printCurrentProjectStarting(logger: ILoggerComponent.ILo
|
|
|
11
11
|
export declare function printCommand(logger: ILoggerComponent.ILogger, commandName: string): void;
|
|
12
12
|
export declare function printWarning(logger: ILoggerComponent.ILogger, warning: string): void;
|
|
13
13
|
export declare function printSuccess(logger: ILoggerComponent.ILogger, operationSuccessfulMessage: string, summary: string): void;
|
|
14
|
+
export declare function printError(logger: ILoggerComponent.ILogger, comment: string, error: Error): void;
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.printSuccess = exports.printWarning = exports.printCommand = exports.printCurrentProjectStarting = exports.printStep = exports.printProgressInfo = exports.printProgressStep = void 0;
|
|
6
|
+
exports.printError = exports.printSuccess = exports.printWarning = exports.printCommand = exports.printCurrentProjectStarting = exports.printStep = exports.printProgressInfo = exports.printProgressStep = void 0;
|
|
7
7
|
const path_1 = __importDefault(require("path"));
|
|
8
8
|
const log_1 = require("../components/log");
|
|
9
9
|
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
@@ -48,4 +48,9 @@ function printSuccess(logger, operationSuccessfulMessage, summary) {
|
|
|
48
48
|
}
|
|
49
49
|
}
|
|
50
50
|
exports.printSuccess = printSuccess;
|
|
51
|
+
function printError(logger, comment, error) {
|
|
52
|
+
logger.log(log_1.colors.redBright(comment));
|
|
53
|
+
logger.error(error);
|
|
54
|
+
}
|
|
55
|
+
exports.printError = printError;
|
|
51
56
|
//# sourceMappingURL=beautiful-logs.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"beautiful-logs.js","sourceRoot":"","sources":["../../src/logic/beautiful-logs.ts"],"names":[],"mappings":";;;;;;AACA,gDAAuB;AACvB,2CAA0C;AAI1C,8DAA8D;AAC9D,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAEvD,SAAgB,iBAAiB,CAAC,MAAgC,EAAE,GAAW,EAAE,WAAmB,EAAE,OAAe;IACnH,MAAM,CAAC,GAAG,CAAC,YAAM,CAAC,GAAG,CAAC,IAAI,WAAW,IAAI,OAAO,GAAG,CAAC,GAAG,GAAG,GAAG,GAAG,CAAC,CAAA;AACnE,CAAC;AAFD,8CAEC;AAED,SAAgB,iBAAiB,CAAC,MAAgC,EAAE,GAAW;IAC7E,MAAM,CAAC,GAAG,CAAC,YAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAA;AAC7B,CAAC;AAFD,8CAEC;AAED,SAAgB,SAAS,CAAC,MAAgC,EAAE,GAAW;IACrE,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;AACjB,CAAC;AAFD,8BAEC;AAED;;GAEG;AACH,SAAgB,2BAA2B,CACzC,MAAgC,EAChC,OAAqB,EACrB,SAAoB;IAEpB,IAAI,SAAS,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;QACjC,MAAM,YAAY,GAAG,cAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,oBAAoB,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAA;QAC5F,MAAM,QAAQ,GAAG,YAAM,CAAC,GAAG,CAAC,IAAI,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,SAAS,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAA;QACxG,MAAM,CAAC,GAAG,CAAC,YAAM,CAAC,IAAI,CAAC,KAAK,QAAQ,OAAO,YAAY,GAAG,CAAC,CAAC,CAAA;KAC7D;AACH,CAAC;AAVD,kEAUC;AAED,SAAgB,YAAY,CAAC,MAAgC,EAAE,WAAmB;IAChF,MAAM,CAAC,GAAG,CAAC,YAAM,CAAC,IAAI,CAAC,GAAG,IAAI,IAAI,WAAW,KAAK,OAAO,EAAE,CAAC,CAAC,CAAA;AAC/D,CAAC;AAFD,oCAEC;AAED,SAAgB,YAAY,CAAC,MAAgC,EAAE,OAAe;IAC5E,MAAM,CAAC,GAAG,CAAC,YAAM,CAAC,OAAO,CAAC,YAAM,CAAC,MAAM,CAAC,YAAM,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;AACvF,CAAC;AAFD,oCAEC;AAED,SAAgB,YAAY,CAAC,MAAgC,EAAE,0BAAkC,EAAE,OAAe;IAChH,2CAA2C;IAC3C,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACd,MAAM,CAAC,GAAG,CAAC,YAAM,CAAC,WAAW,CAAC,0BAA0B,CAAC,CAAC,CAAA;IAC1D,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;QAC/B,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;KACpB;AACH,CAAC;AAPD,oCAOC"}
|
|
1
|
+
{"version":3,"file":"beautiful-logs.js","sourceRoot":"","sources":["../../src/logic/beautiful-logs.ts"],"names":[],"mappings":";;;;;;AACA,gDAAuB;AACvB,2CAA0C;AAI1C,8DAA8D;AAC9D,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAEvD,SAAgB,iBAAiB,CAAC,MAAgC,EAAE,GAAW,EAAE,WAAmB,EAAE,OAAe;IACnH,MAAM,CAAC,GAAG,CAAC,YAAM,CAAC,GAAG,CAAC,IAAI,WAAW,IAAI,OAAO,GAAG,CAAC,GAAG,GAAG,GAAG,GAAG,CAAC,CAAA;AACnE,CAAC;AAFD,8CAEC;AAED,SAAgB,iBAAiB,CAAC,MAAgC,EAAE,GAAW;IAC7E,MAAM,CAAC,GAAG,CAAC,YAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAA;AAC7B,CAAC;AAFD,8CAEC;AAED,SAAgB,SAAS,CAAC,MAAgC,EAAE,GAAW;IACrE,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;AACjB,CAAC;AAFD,8BAEC;AAED;;GAEG;AACH,SAAgB,2BAA2B,CACzC,MAAgC,EAChC,OAAqB,EACrB,SAAoB;IAEpB,IAAI,SAAS,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;QACjC,MAAM,YAAY,GAAG,cAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,oBAAoB,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAA;QAC5F,MAAM,QAAQ,GAAG,YAAM,CAAC,GAAG,CAAC,IAAI,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,SAAS,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAA;QACxG,MAAM,CAAC,GAAG,CAAC,YAAM,CAAC,IAAI,CAAC,KAAK,QAAQ,OAAO,YAAY,GAAG,CAAC,CAAC,CAAA;KAC7D;AACH,CAAC;AAVD,kEAUC;AAED,SAAgB,YAAY,CAAC,MAAgC,EAAE,WAAmB;IAChF,MAAM,CAAC,GAAG,CAAC,YAAM,CAAC,IAAI,CAAC,GAAG,IAAI,IAAI,WAAW,KAAK,OAAO,EAAE,CAAC,CAAC,CAAA;AAC/D,CAAC;AAFD,oCAEC;AAED,SAAgB,YAAY,CAAC,MAAgC,EAAE,OAAe;IAC5E,MAAM,CAAC,GAAG,CAAC,YAAM,CAAC,OAAO,CAAC,YAAM,CAAC,MAAM,CAAC,YAAM,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;AACvF,CAAC;AAFD,oCAEC;AAED,SAAgB,YAAY,CAAC,MAAgC,EAAE,0BAAkC,EAAE,OAAe;IAChH,2CAA2C;IAC3C,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACd,MAAM,CAAC,GAAG,CAAC,YAAM,CAAC,WAAW,CAAC,0BAA0B,CAAC,CAAC,CAAA;IAC1D,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;QAC/B,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;KACpB;AACH,CAAC;AAPD,oCAOC;AAED,SAAgB,UAAU,CAAC,MAAgC,EAAE,OAAe,EAAE,KAAY;IACxF,MAAM,CAAC,GAAG,CAAC,YAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAA;IACrC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;AACrB,CAAC;AAHD,gCAGC"}
|
package/dist/logic/bundle.js
CHANGED
|
@@ -15,6 +15,7 @@ const url_1 = require("url");
|
|
|
15
15
|
const log_1 = require("../components/log");
|
|
16
16
|
const beautiful_logs_1 = require("./beautiful-logs");
|
|
17
17
|
const error_1 = require("./error");
|
|
18
|
+
const composite_1 = require("./composite");
|
|
18
19
|
const MAX_STEP = 2;
|
|
19
20
|
async function bundleProject(components, options, sceneJson) {
|
|
20
21
|
const tsconfig = path_1.default.join(options.workingDirectory, 'tsconfig.json');
|
|
@@ -151,11 +152,14 @@ function compositeLoader(components, options) {
|
|
|
151
152
|
build.onLoad({ filter: /.*/, namespace: 'sdk-composite' }, async (_) => {
|
|
152
153
|
if (shouldReload) {
|
|
153
154
|
if (!options.ignoreComposite) {
|
|
154
|
-
const data = await getAllComposites(components,
|
|
155
|
+
const data = await (0, composite_1.getAllComposites)(components,
|
|
155
156
|
// we pass the build.initialOptions.absWorkingDir to build projects with multiple roots at once
|
|
156
157
|
build.initialOptions.absWorkingDir ?? options.workingDirectory);
|
|
157
158
|
contents = `export const compositeFromLoader = {${data.compositeLines.join(',')}}`;
|
|
158
159
|
watchFiles = data.watchFiles;
|
|
160
|
+
if (data.withErrors) {
|
|
161
|
+
(0, beautiful_logs_1.printWarning)(components.logger, 'Some composites are not included because of errors while compiling them. There can be unexpected behavior in the scene, check the errors and try to fix them.');
|
|
162
|
+
}
|
|
159
163
|
}
|
|
160
164
|
shouldReload = false;
|
|
161
165
|
}
|
|
@@ -168,27 +172,6 @@ function compositeLoader(components, options) {
|
|
|
168
172
|
}
|
|
169
173
|
};
|
|
170
174
|
}
|
|
171
|
-
async function getAllComposites(components, workingDirectory) {
|
|
172
|
-
const composites = {};
|
|
173
|
-
const files = (0, glob_1.globSync)('**/*.{composite,composite.bin}', { cwd: workingDirectory });
|
|
174
|
-
for (const file of files) {
|
|
175
|
-
composites[file] = await components.fs.readFile(path_1.default.join(workingDirectory, file));
|
|
176
|
-
}
|
|
177
|
-
const watchFiles = Object.keys(composites);
|
|
178
|
-
const compositeLines = [];
|
|
179
|
-
for (const compositeName in composites) {
|
|
180
|
-
const bin = composites[compositeName];
|
|
181
|
-
if (compositeName.endsWith('.bin')) {
|
|
182
|
-
compositeLines.push(`'${compositeName}':new Uint8Array(${JSON.stringify(Array.from(bin))})`);
|
|
183
|
-
}
|
|
184
|
-
else {
|
|
185
|
-
const textDecoder = new TextDecoder();
|
|
186
|
-
const json = JSON.stringify(JSON.parse(textDecoder.decode(bin)));
|
|
187
|
-
compositeLines.push(`'${compositeName}':${JSON.stringify(json)}`);
|
|
188
|
-
}
|
|
189
|
-
}
|
|
190
|
-
return { compositeLines, watchFiles };
|
|
191
|
-
}
|
|
192
175
|
function entryPointLoader(components, inputs, options) {
|
|
193
176
|
const escapedInputs = inputs.map(($) => $.replace(/\\/g, '\\\\'));
|
|
194
177
|
const filter = new RegExp(`(${escapedInputs.join('|')})`);
|
package/dist/logic/bundle.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundle.js","sourceRoot":"","sources":["../../src/logic/bundle.ts"],"names":[],"mappings":";AAAA,6EAA6E;AAC7E,4EAA4E;;;;;;AAG5E,kEAAyC;AACzC,sDAA6B;AAC7B,yCAAkC;AAClC,+BAA+B;AAC/B,gDAAuB;AACvB,6BAAmC;AAEnC,2CAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"bundle.js","sourceRoot":"","sources":["../../src/logic/bundle.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { CliComponents } from '../components';
|
|
2
|
+
type CompositeComponents = Pick<CliComponents, 'logger' | 'fs'>;
|
|
3
|
+
export declare function getAllComposites(components: CompositeComponents, workingDirectory: string): Promise<{
|
|
4
|
+
watchFiles: string[];
|
|
5
|
+
compositeLines: string[];
|
|
6
|
+
withErrors: boolean;
|
|
7
|
+
}>;
|
|
8
|
+
export {};
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.getAllComposites = void 0;
|
|
7
|
+
const glob_1 = require("glob");
|
|
8
|
+
const path_1 = __importDefault(require("path"));
|
|
9
|
+
const dist_cjs_1 = require("@dcl/ecs/dist-cjs");
|
|
10
|
+
const beautiful_logs_1 = require("./beautiful-logs");
|
|
11
|
+
async function getAllComposites(components, workingDirectory) {
|
|
12
|
+
let withErrors = false;
|
|
13
|
+
const composites = {};
|
|
14
|
+
const watchFiles = (0, glob_1.globSync)('**/*.composite', { cwd: workingDirectory });
|
|
15
|
+
const textDecoder = new TextDecoder();
|
|
16
|
+
for (const file of watchFiles) {
|
|
17
|
+
try {
|
|
18
|
+
const fileBuffer = await components.fs.readFile(path_1.default.join(workingDirectory, file));
|
|
19
|
+
const json = JSON.parse(textDecoder.decode(fileBuffer));
|
|
20
|
+
composites[file] = dist_cjs_1.Composite.fromJson(json);
|
|
21
|
+
}
|
|
22
|
+
catch (err) {
|
|
23
|
+
(0, beautiful_logs_1.printError)(components.logger, `Composite '${file}' can't be read. Please check if is a valid JSON and composite formated.`, err);
|
|
24
|
+
withErrors = true;
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
const compositeProvider = {
|
|
28
|
+
getCompositeOrNull(src) {
|
|
29
|
+
if (src in composites) {
|
|
30
|
+
return { src, composite: composites[src] };
|
|
31
|
+
}
|
|
32
|
+
return null;
|
|
33
|
+
}
|
|
34
|
+
};
|
|
35
|
+
const compositeLines = [];
|
|
36
|
+
for (const compositeSource in composites) {
|
|
37
|
+
const engine = (0, dist_cjs_1.Engine)();
|
|
38
|
+
try {
|
|
39
|
+
const composite = compositeProvider.getCompositeOrNull(compositeSource);
|
|
40
|
+
dist_cjs_1.Composite.instance(engine, composite, compositeProvider);
|
|
41
|
+
compositeLines.push(`'${composite.src}':${JSON.stringify(dist_cjs_1.Composite.toJson(composite.composite))}`);
|
|
42
|
+
}
|
|
43
|
+
catch (err) {
|
|
44
|
+
(0, beautiful_logs_1.printError)(components.logger, `Composite '${compositeSource}' can't be instanced.`, err);
|
|
45
|
+
withErrors = true;
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
return { compositeLines, watchFiles, withErrors };
|
|
49
|
+
}
|
|
50
|
+
exports.getAllComposites = getAllComposites;
|
|
51
|
+
//# sourceMappingURL=composite.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"composite.js","sourceRoot":"","sources":["../../src/logic/composite.ts"],"names":[],"mappings":";;;;;;AAAA,+BAA+B;AAC/B,gDAAuB;AAEvB,gDAAqD;AACrD,qDAA6C;AAItC,KAAK,UAAU,gBAAgB,CACpC,UAA+B,EAC/B,gBAAwB;IAExB,IAAI,UAAU,GAAG,KAAK,CAAA;IACtB,MAAM,UAAU,GAAyC,EAAE,CAAA;IAC3D,MAAM,UAAU,GAAG,IAAA,eAAQ,EAAC,gBAAgB,EAAE,EAAE,GAAG,EAAE,gBAAgB,EAAE,CAAC,CAAA;IAExE,MAAM,WAAW,GAAG,IAAI,WAAW,EAAE,CAAA;IACrC,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE;QAC7B,IAAI;YACF,MAAM,UAAU,GAAG,MAAM,UAAU,CAAC,EAAE,CAAC,QAAQ,CAAC,cAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC,CAAA;YAClF,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAA;YACvD,UAAU,CAAC,IAAI,CAAC,GAAG,oBAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;SAC5C;QAAC,OAAO,GAAQ,EAAE;YACjB,IAAA,2BAAU,EACR,UAAU,CAAC,MAAM,EACjB,cAAc,IAAI,0EAA0E,EAC5F,GAAG,CACJ,CAAA;YACD,UAAU,GAAG,IAAI,CAAA;SAClB;KACF;IAED,MAAM,iBAAiB,GAAuB;QAC5C,kBAAkB,CAAC,GAAW;YAC5B,IAAI,GAAG,IAAI,UAAU,EAAE;gBACrB,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,CAAA;aAC3C;YACD,OAAO,IAAI,CAAA;QACb,CAAC;KACF,CAAA;IAED,MAAM,cAAc,GAAa,EAAE,CAAA;IAEnC,KAAK,MAAM,eAAe,IAAI,UAAU,EAAE;QACxC,MAAM,MAAM,GAAG,IAAA,iBAAM,GAAE,CAAA;QACvB,IAAI;YACF,MAAM,SAAS,GAAG,iBAAiB,CAAC,kBAAkB,CAAC,eAAe,CAAE,CAAA;YACxE,oBAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,EAAE,iBAAiB,CAAC,CAAA;YACxD,cAAc,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC,GAAG,KAAK,IAAI,CAAC,SAAS,CAAC,oBAAS,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAA;SACnG;QAAC,OAAO,GAAQ,EAAE;YACjB,IAAA,2BAAU,EAAC,UAAU,CAAC,MAAM,EAAE,cAAc,eAAe,uBAAuB,EAAE,GAAG,CAAC,CAAA;YACxF,UAAU,GAAG,IAAI,CAAA;SAClB;KACF;IAED,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,UAAU,EAAE,CAAA;AACnD,CAAC;AAhDD,4CAgDC"}
|
package/package.json
CHANGED
|
@@ -1,14 +1,15 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dcl/sdk-commands",
|
|
3
3
|
"description": "",
|
|
4
|
-
"version": "7.1.12-
|
|
4
|
+
"version": "7.1.12-4983855939.commit-561a19a",
|
|
5
5
|
"author": "Decentraland",
|
|
6
6
|
"bin": {
|
|
7
7
|
"sdk-commands": "./dist/index.js"
|
|
8
8
|
},
|
|
9
9
|
"dependencies": {
|
|
10
|
+
"@dcl/ecs": "7.1.12-4983855939.commit-561a19a",
|
|
10
11
|
"@dcl/hashing": "1.1.3",
|
|
11
|
-
"@dcl/inspector": "7.1.12-
|
|
12
|
+
"@dcl/inspector": "7.1.12-4983855939.commit-561a19a",
|
|
12
13
|
"@dcl/linker-dapp": "0.7.0",
|
|
13
14
|
"@dcl/mini-comms": "1.0.1-20230216163137.commit-a4c75be",
|
|
14
15
|
"@dcl/protocol": "1.0.0-4982615619.commit-96dba07",
|
|
@@ -64,5 +65,5 @@
|
|
|
64
65
|
"displayName": "SDK",
|
|
65
66
|
"tsconfig": "./tsconfig.json"
|
|
66
67
|
},
|
|
67
|
-
"commit": "
|
|
68
|
+
"commit": "561a19a92b772170917fdba6fb98982f7eecdca6"
|
|
68
69
|
}
|