@stackbit/dev 0.0.39 → 0.0.42
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/runner/index.d.ts +4 -3
- package/dist/runner/index.js +5 -4
- package/dist/runner/index.js.map +1 -1
- package/dist/server/index.js +1 -0
- package/dist/server/index.js.map +1 -1
- package/dist/server/proxy.js +3 -1
- package/dist/server/proxy.js.map +1 -1
- package/dist/services/annotation-errors.js +4 -3
- package/dist/services/annotation-errors.js.map +1 -1
- package/package.json +10 -7
- package/src/runner/index.ts +6 -4
- package/src/server/index.ts +2 -0
- package/src/server/proxy.ts +3 -1
- package/src/services/annotation-errors.ts +4 -3
package/dist/runner/index.d.ts
CHANGED
|
@@ -21,6 +21,7 @@ export default class Runner {
|
|
|
21
21
|
private stackbitYaml;
|
|
22
22
|
private workers;
|
|
23
23
|
private watcher;
|
|
24
|
+
private ssg;
|
|
24
25
|
private readonly options;
|
|
25
26
|
private rootDir;
|
|
26
27
|
private appDir?;
|
|
@@ -28,7 +29,7 @@ export default class Runner {
|
|
|
28
29
|
install(): Promise<void>;
|
|
29
30
|
createCms(): GitCMS | SanityCMS | ContentfulCMS;
|
|
30
31
|
handleFileChanges(filePaths: string[]): Promise<void>;
|
|
31
|
-
getDirectPaths():
|
|
32
|
+
getDirectPaths(): any;
|
|
32
33
|
/**
|
|
33
34
|
* Function retuning a map or a function that rewrites direct proxy requests.
|
|
34
35
|
* https://github.com/chimurai/http-proxy-middleware#http-proxy-middleware-options
|
|
@@ -37,8 +38,8 @@ export default class Runner {
|
|
|
37
38
|
getDirectRoutes(): {
|
|
38
39
|
[hostOrPath: string]: string;
|
|
39
40
|
};
|
|
40
|
-
getDirectChangeOrigin():
|
|
41
|
-
getDirectChangeSocketOrigin():
|
|
41
|
+
getDirectChangeOrigin(): any;
|
|
42
|
+
getDirectChangeSocketOrigin(): any;
|
|
42
43
|
getObjects({ objectIds, locale }: {
|
|
43
44
|
objectIds: string[];
|
|
44
45
|
locale?: string;
|
package/dist/runner/index.js
CHANGED
|
@@ -50,6 +50,7 @@ class Runner {
|
|
|
50
50
|
logger_1.default.error('Error handling file changes: ' + filePaths.join(', '));
|
|
51
51
|
});
|
|
52
52
|
});
|
|
53
|
+
this.ssg = lodash_1.default.assign({}, ssg_1.default, this.stackbitYaml.internalStackbitRunnerOptions);
|
|
53
54
|
}
|
|
54
55
|
createCms() {
|
|
55
56
|
var _a;
|
|
@@ -132,7 +133,7 @@ class Runner {
|
|
|
132
133
|
}
|
|
133
134
|
}
|
|
134
135
|
getDirectPaths() {
|
|
135
|
-
return
|
|
136
|
+
return this.ssg.directPaths;
|
|
136
137
|
}
|
|
137
138
|
/**
|
|
138
139
|
* Function retuning a map or a function that rewrites direct proxy requests.
|
|
@@ -140,13 +141,13 @@ class Runner {
|
|
|
140
141
|
* @return {Function|Object}
|
|
141
142
|
*/
|
|
142
143
|
getDirectRoutes() {
|
|
143
|
-
return
|
|
144
|
+
return this.ssg.directRoutes;
|
|
144
145
|
}
|
|
145
146
|
getDirectChangeOrigin() {
|
|
146
|
-
return
|
|
147
|
+
return this.ssg.directChangeOrigin;
|
|
147
148
|
}
|
|
148
149
|
getDirectChangeSocketOrigin() {
|
|
149
|
-
return
|
|
150
|
+
return this.ssg.directChangeSocketOrigin;
|
|
150
151
|
}
|
|
151
152
|
async getObjects({ objectIds = [], locale }) {
|
|
152
153
|
return this.editor.getObjects({ objectIds, locale });
|
package/dist/runner/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/runner/index.ts"],"names":[],"mappings":";;;;;AAAA,oDAAuB;AACvB,gDAAwB;AACxB,gDAAwB;AACxB,qFAA6D;AAC7D,gFAA2D;AAC3D,oFAAkG;AAClG,yFAAoE;AACpE,oFAA4D;AAC5D,oFAAgF;AAChF,uGAA8E;AAE9E,2DAAoD;AACpD,gEAAwC;AACxC,uDAA+B;AAC/B,qEAAoE;AAepE,MAAqB,MAAM;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/runner/index.ts"],"names":[],"mappings":"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"}
|
package/dist/server/index.js
CHANGED
|
@@ -23,6 +23,7 @@ async function start({ serverPort, ssgPort, ssgHost, rootDir, runnableDir, uuid,
|
|
|
23
23
|
});
|
|
24
24
|
await runner.install();
|
|
25
25
|
logger_1.default.debug('Done runner init');
|
|
26
|
+
process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
|
|
26
27
|
const server = (0, express_1.default)();
|
|
27
28
|
const httpServer = http_1.default.createServer(server);
|
|
28
29
|
socket_service_1.default.use(httpServer, logger_1.default);
|
package/dist/server/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":";;;;;;AACA,gDAAwB;AACxB,sDAA8B;AAC9B,gDAAwB;AAExB,gEAAwC;AAExC,sDAA8B;AAC9B,oDAA4B;AAC5B,uDAA+B;AAC/B,uDAA+B;AAC/B,uGAA8E;AAevE,KAAK,UAAU,KAAK,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,EAAiB;IACxH,gBAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAE/B,MAAM,MAAM,GAAG,IAAI,gBAAM,CAAC;QACtB,OAAO;QACP,WAAW;QACX,OAAO;QACP,GAAG,OAAO;KACb,CAAC,CAAC;IACH,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;IAEvB,gBAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;IAEjC,MAAM,MAAM,GAAG,IAAA,iBAAO,GAAE,CAAC;IACzB,MAAM,UAAU,GAAG,cAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IAC7C,wBAAa,CAAC,GAAG,CAAC,UAAU,EAAE,gBAAM,CAAC,CAAC;IAEtC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAE9B,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QAC1B,eAAe;QACf,gBAAM,CAAC,KAAK,CAAC,eAAe,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,CAAC,WAAW,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;QAC1I,IAAI,EAAE,CAAC;IACX,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,iBAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IACjD,MAAM,CAAC,GAAG,CAAC,gBAAM,CAAC,yBAAyB,EAAE,iBAAO,CAAC,MAAM,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,gBAAM,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC;IACjH,MAAM,CAAC,GAAG,CAAC,gBAAM,CAAC,+BAA+B,EAAE,iBAAO,CAAC,MAAM,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,gBAAM,CAAC,6BAA6B,CAAC,CAAC,CAAC,CAAC;IAE7H,IAAA,gBAAM,EAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IAC7B,IAAA,eAAK,EAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAExC,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACzC,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,EAAE;YAC/B,gBAAM,CAAC,KAAK,CAAC,yBAAyB,GAAG,UAAU,CAAC,CAAC;YACrD,OAAO,EAAE,CAAC;QACd,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":";;;;;;AACA,gDAAwB;AACxB,sDAA8B;AAC9B,gDAAwB;AAExB,gEAAwC;AAExC,sDAA8B;AAC9B,oDAA4B;AAC5B,uDAA+B;AAC/B,uDAA+B;AAC/B,uGAA8E;AAevE,KAAK,UAAU,KAAK,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,EAAiB;IACxH,gBAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAE/B,MAAM,MAAM,GAAG,IAAI,gBAAM,CAAC;QACtB,OAAO;QACP,WAAW;QACX,OAAO;QACP,GAAG,OAAO;KACb,CAAC,CAAC;IACH,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;IAEvB,gBAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;IAEjC,OAAO,CAAC,GAAG,CAAC,4BAA4B,GAAG,GAAG,CAAC;IAE/C,MAAM,MAAM,GAAG,IAAA,iBAAO,GAAE,CAAC;IACzB,MAAM,UAAU,GAAG,cAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IAC7C,wBAAa,CAAC,GAAG,CAAC,UAAU,EAAE,gBAAM,CAAC,CAAC;IAEtC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAE9B,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QAC1B,eAAe;QACf,gBAAM,CAAC,KAAK,CAAC,eAAe,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,CAAC,WAAW,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;QAC1I,IAAI,EAAE,CAAC;IACX,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,iBAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IACjD,MAAM,CAAC,GAAG,CAAC,gBAAM,CAAC,yBAAyB,EAAE,iBAAO,CAAC,MAAM,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,gBAAM,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC;IACjH,MAAM,CAAC,GAAG,CAAC,gBAAM,CAAC,+BAA+B,EAAE,iBAAO,CAAC,MAAM,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,gBAAM,CAAC,6BAA6B,CAAC,CAAC,CAAC,CAAC;IAE7H,IAAA,gBAAM,EAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IAC7B,IAAA,eAAK,EAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAExC,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACzC,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,EAAE;YAC/B,gBAAM,CAAC,KAAK,CAAC,yBAAyB,GAAG,UAAU,CAAC,CAAC;YACrD,OAAO,EAAE,CAAC;QACd,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC;AAxCD,sBAwCC"}
|
package/dist/server/proxy.js
CHANGED
|
@@ -28,7 +28,7 @@ function proxyMiddleware(router, ssgHost, ssgPort, runner) {
|
|
|
28
28
|
res.set('Content-Security-Policy', `frame-ancestors *; `);
|
|
29
29
|
next();
|
|
30
30
|
});
|
|
31
|
-
const proxyTargetUrl = `http://${ssgHost}:${ssgPort}`;
|
|
31
|
+
const proxyTargetUrl = ssgHost.startsWith('http') ? `${ssgHost}:${ssgPort}` : `http://${ssgHost}:${ssgPort}`;
|
|
32
32
|
const handlerProxyError = (err, req, res) => {
|
|
33
33
|
if ((err === null || err === void 0 ? void 0 : err.code) === 'ECONNREFUSED' && (res === null || res === void 0 ? void 0 : res.status)) {
|
|
34
34
|
(0, pages_1.renderLoadingPage)(req, res, {
|
|
@@ -48,6 +48,7 @@ function proxyMiddleware(router, ssgHost, ssgPort, runner) {
|
|
|
48
48
|
target: proxyTargetUrl,
|
|
49
49
|
changeOrigin: runner.getDirectChangeOrigin(),
|
|
50
50
|
ws: true,
|
|
51
|
+
secure: false,
|
|
51
52
|
logProvider: () => logger_1.default,
|
|
52
53
|
logLevel: config_1.default.logLevel === 'debug' ? 'info' : 'silent',
|
|
53
54
|
router: (_a = runner.getDirectRoutes()) !== null && _a !== void 0 ? _a : [],
|
|
@@ -60,6 +61,7 @@ function proxyMiddleware(router, ssgHost, ssgPort, runner) {
|
|
|
60
61
|
target: proxyTargetUrl,
|
|
61
62
|
changeOrigin: true,
|
|
62
63
|
followRedirects: true,
|
|
64
|
+
secure: false,
|
|
63
65
|
logProvider: () => logger_1.default,
|
|
64
66
|
logLevel: config_1.default.logLevel === 'debug' ? 'info' : 'silent',
|
|
65
67
|
onError: (err, req, res) => {
|
package/dist/server/proxy.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../src/server/proxy.ts"],"names":[],"mappings":";;;;;AAAA,oDAAuB;AACvB,gDAAwB;AAExB,kFAA0C;AAC1C,gEAAwC;AACxC,uDAA+B;AAC/B,6EAAwH;AACxH,iEAA0E;AAC1E,uDAA+B;AAG/B,SAAwB,eAAe,CAAC,MAAc,EAAE,OAAe,EAAE,OAAe,EAAE,MAAc;;IACpG,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QAC1B,gBAAC,CAAC,KAAK,CAAC,GAAG,EAAE,2BAA2B,CAAC,CAAC;QAC1C,MAAM,UAAU,GAAG,gBAAC,CAAC,GAAG,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;QAC5C,MAAM,WAAW,GAAG,gBAAC,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,WAAW,EAAE,KAAK,mBAAmB,CAAC,CAAC;QAChH,IAAI,WAAW,GAAG,CAAC,CAAC,EAAE;YAClB,kCAAkC;YAClC,UAAU,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;SACrC;QAED,IAAI,EAAE,CAAC;IACX,CAAC,CAAC,CAAC;IACH,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QAC1B,MAAM,KAAK,GAAG,WAAW,CAAA;QACzB,GAAG,CAAC,GAAG,CAAC,yBAAyB,EAAE,qBAAqB,CAAC,CAAC;QAC1D,IAAI,EAAE,CAAC;IACX,CAAC,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,UAAU,OAAO,IAAI,OAAO,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../src/server/proxy.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,14 +14,15 @@ async function logAnnotationErrors(errors, logger, baseDir, sourcemaps) {
|
|
|
14
14
|
}
|
|
15
15
|
logger.error(`Found ${errors.length} annotation error${errors.length !== 1 ? 's' : ''}`);
|
|
16
16
|
for (const error of errors) {
|
|
17
|
+
const elementXPath = error.elementXPath;
|
|
17
18
|
let message = error.message;
|
|
18
|
-
const sourcemap = sourcemaps === null || sourcemaps === void 0 ? void 0 : sourcemaps[
|
|
19
|
+
const sourcemap = sourcemaps === null || sourcemaps === void 0 ? void 0 : sourcemaps[elementXPath];
|
|
19
20
|
if (sourcemap) {
|
|
20
21
|
const relFileName = path_1.default.isAbsolute(sourcemap.file) ? path_1.default.relative(baseDir, sourcemap.file) : sourcemap.file;
|
|
21
22
|
message += ` (${chalk_1.default.yellow(`${relFileName}:${(_a = sourcemap.start) === null || _a === void 0 ? void 0 : _a.line}`)})`;
|
|
22
23
|
}
|
|
23
|
-
else if (
|
|
24
|
-
message += ` (${
|
|
24
|
+
else if (elementXPath) {
|
|
25
|
+
message += ` (${elementXPath})`;
|
|
25
26
|
}
|
|
26
27
|
logger.error(message);
|
|
27
28
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"annotation-errors.js","sourceRoot":"","sources":["../../src/services/annotation-errors.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,oDAAuB;AACvB,gDAAwB;AAEjB,KAAK,UAAU,mBAAmB,CAAC,MAAa,EAAE,MAAW,EAAE,OAAe,EAAE,UAAiC;;IACpH,IAAI,gBAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QACnB,OAAO;KACV;IACD,MAAM,CAAC,KAAK,CAAC,SAAS,MAAM,CAAC,MAAM,oBAAoB,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAEzF,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QACxB,IAAI,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;QAC5B,MAAM,SAAS,GAAG,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAG,
|
|
1
|
+
{"version":3,"file":"annotation-errors.js","sourceRoot":"","sources":["../../src/services/annotation-errors.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,oDAAuB;AACvB,gDAAwB;AAEjB,KAAK,UAAU,mBAAmB,CAAC,MAAa,EAAE,MAAW,EAAE,OAAe,EAAE,UAAiC;;IACpH,IAAI,gBAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QACnB,OAAO;KACV;IACD,MAAM,CAAC,KAAK,CAAC,SAAS,MAAM,CAAC,MAAM,oBAAoB,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAEzF,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QACxB,MAAM,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC;QACxC,IAAI,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;QAC5B,MAAM,SAAS,GAAG,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAG,YAAY,CAAC,CAAC;QAC7C,IAAI,SAAS,EAAE;YACX,MAAM,WAAW,GAAG,cAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,cAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC;YAC9G,OAAO,IAAI,KAAK,eAAK,CAAC,MAAM,CAAC,GAAG,WAAW,IAAI,MAAA,SAAS,CAAC,KAAK,0CAAE,IAAI,EAAE,CAAC,GAAG,CAAC;SAC9E;aAAM,IAAI,YAAY,EAAE;YACrB,OAAO,IAAI,KAAK,YAAY,GAAG,CAAC;SACnC;QACD,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;KACzB;AACL,CAAC;AAlBD,kDAkBC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@stackbit/dev",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.42",
|
|
4
4
|
"description": "stackbit-dev",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
"/src"
|
|
13
13
|
],
|
|
14
14
|
"scripts": {
|
|
15
|
-
"test": "jest --
|
|
15
|
+
"test": "jest --forceExit --detectOpenHandles --verbose=true --silent=false",
|
|
16
16
|
"build": "npm run clean && npm run copy-files && tsc",
|
|
17
17
|
"clean": "rimraf dist/",
|
|
18
18
|
"prettier": "prettier --write src",
|
|
@@ -22,9 +22,9 @@
|
|
|
22
22
|
"author": "Stackbit Inc.",
|
|
23
23
|
"license": "MIT",
|
|
24
24
|
"dependencies": {
|
|
25
|
-
"@stackbit/cms-core": "^0.0.
|
|
26
|
-
"@stackbit/dev-common": "^0.0.
|
|
27
|
-
"@stackbit/sdk": "^0.2.
|
|
25
|
+
"@stackbit/cms-core": "^0.0.15",
|
|
26
|
+
"@stackbit/dev-common": "^0.0.38",
|
|
27
|
+
"@stackbit/sdk": "^0.2.33",
|
|
28
28
|
"axios": "^0.25.0",
|
|
29
29
|
"chalk": "^4.1.0",
|
|
30
30
|
"chokidar": "^3.5.3",
|
|
@@ -46,14 +46,17 @@
|
|
|
46
46
|
"@types/configstore": "^5.0.1",
|
|
47
47
|
"@types/detect-port": "^1.3.2",
|
|
48
48
|
"@types/express": "^4.17.13",
|
|
49
|
+
"@types/fs-extra": "^9.0.13",
|
|
49
50
|
"@types/http-proxy-middleware": "^1.0.0",
|
|
51
|
+
"@types/jest": "27.4",
|
|
50
52
|
"@types/lodash": "^4.14.178",
|
|
53
|
+
"@types/node": "^18.0.0",
|
|
51
54
|
"@types/uuid": "^8.3.4",
|
|
52
55
|
"copyfiles": "^2.4.1",
|
|
53
56
|
"jest": "^27.4.7",
|
|
54
57
|
"prettier": "^2.5.1",
|
|
55
|
-
"ts-jest": "^27.1.
|
|
58
|
+
"ts-jest": "^27.1.5",
|
|
56
59
|
"typescript": "^4.5.4"
|
|
57
60
|
},
|
|
58
|
-
"gitHead": "
|
|
61
|
+
"gitHead": "ab310b516daf58c88b67f1fb8fbc6ec815a7f44d"
|
|
59
62
|
}
|
package/src/runner/index.ts
CHANGED
|
@@ -34,6 +34,7 @@ export default class Runner {
|
|
|
34
34
|
private stackbitYaml: any;
|
|
35
35
|
private workers: any;
|
|
36
36
|
private watcher: any;
|
|
37
|
+
private ssg: any;
|
|
37
38
|
|
|
38
39
|
private readonly options: RunnerOptions;
|
|
39
40
|
private rootDir: string;
|
|
@@ -73,6 +74,7 @@ export default class Runner {
|
|
|
73
74
|
logger.error('Error handling file changes: ' + filePaths.join(', '));
|
|
74
75
|
});
|
|
75
76
|
});
|
|
77
|
+
this.ssg = _.assign({}, ssg, this.stackbitYaml.internalStackbitRunnerOptions);
|
|
76
78
|
}
|
|
77
79
|
|
|
78
80
|
createCms() {
|
|
@@ -155,7 +157,7 @@ export default class Runner {
|
|
|
155
157
|
}
|
|
156
158
|
|
|
157
159
|
getDirectPaths() {
|
|
158
|
-
return ssg.directPaths;
|
|
160
|
+
return this.ssg.directPaths;
|
|
159
161
|
}
|
|
160
162
|
|
|
161
163
|
/**
|
|
@@ -164,15 +166,15 @@ export default class Runner {
|
|
|
164
166
|
* @return {Function|Object}
|
|
165
167
|
*/
|
|
166
168
|
getDirectRoutes(): { [hostOrPath: string]: string } {
|
|
167
|
-
return ssg.directRoutes;
|
|
169
|
+
return this.ssg.directRoutes;
|
|
168
170
|
}
|
|
169
171
|
|
|
170
172
|
getDirectChangeOrigin() {
|
|
171
|
-
return ssg.directChangeOrigin;
|
|
173
|
+
return this.ssg.directChangeOrigin;
|
|
172
174
|
}
|
|
173
175
|
|
|
174
176
|
getDirectChangeSocketOrigin() {
|
|
175
|
-
return ssg.directChangeSocketOrigin;
|
|
177
|
+
return this.ssg.directChangeSocketOrigin;
|
|
176
178
|
}
|
|
177
179
|
|
|
178
180
|
async getObjects({ objectIds = [], locale }: { objectIds: string[]; locale?: string }) {
|
package/src/server/index.ts
CHANGED
|
@@ -37,6 +37,8 @@ export async function start({ serverPort, ssgPort, ssgHost, rootDir, runnableDir
|
|
|
37
37
|
|
|
38
38
|
logger.debug('Done runner init');
|
|
39
39
|
|
|
40
|
+
process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
|
|
41
|
+
|
|
40
42
|
const server = express();
|
|
41
43
|
const httpServer = http.createServer(server);
|
|
42
44
|
socketService.use(httpServer, logger);
|
package/src/server/proxy.ts
CHANGED
|
@@ -27,7 +27,7 @@ export default function proxyMiddleware(router: Router, ssgHost: string, ssgPort
|
|
|
27
27
|
next();
|
|
28
28
|
});
|
|
29
29
|
|
|
30
|
-
const proxyTargetUrl = `http://${ssgHost}:${ssgPort}`;
|
|
30
|
+
const proxyTargetUrl = ssgHost.startsWith('http') ? `${ssgHost}:${ssgPort}` : `http://${ssgHost}:${ssgPort}`;
|
|
31
31
|
|
|
32
32
|
const handlerProxyError = (err: any, req: any, res: any) => {
|
|
33
33
|
if (err?.code === 'ECONNREFUSED' && res?.status) {
|
|
@@ -50,6 +50,7 @@ export default function proxyMiddleware(router: Router, ssgHost: string, ssgPort
|
|
|
50
50
|
target: proxyTargetUrl,
|
|
51
51
|
changeOrigin: runner.getDirectChangeOrigin(),
|
|
52
52
|
ws: true,
|
|
53
|
+
secure: false,
|
|
53
54
|
logProvider: () => logger,
|
|
54
55
|
logLevel: config.logLevel === 'debug' ? 'info' : 'silent',
|
|
55
56
|
router: runner.getDirectRoutes() ?? [],
|
|
@@ -65,6 +66,7 @@ export default function proxyMiddleware(router: Router, ssgHost: string, ssgPort
|
|
|
65
66
|
target: proxyTargetUrl,
|
|
66
67
|
changeOrigin: true,
|
|
67
68
|
followRedirects: true,
|
|
69
|
+
secure: false,
|
|
68
70
|
logProvider: () => logger,
|
|
69
71
|
logLevel: config.logLevel === 'debug' ? 'info' : 'silent',
|
|
70
72
|
onError: (err: any, req: any, res: any) => {
|
|
@@ -9,13 +9,14 @@ export async function logAnnotationErrors(errors: any[], logger: any, baseDir: s
|
|
|
9
9
|
logger.error(`Found ${errors.length} annotation error${errors.length !== 1 ? 's' : ''}`);
|
|
10
10
|
|
|
11
11
|
for (const error of errors) {
|
|
12
|
+
const elementXPath = error.elementXPath;
|
|
12
13
|
let message = error.message;
|
|
13
|
-
const sourcemap = sourcemaps?.[
|
|
14
|
+
const sourcemap = sourcemaps?.[elementXPath];
|
|
14
15
|
if (sourcemap) {
|
|
15
16
|
const relFileName = path.isAbsolute(sourcemap.file) ? path.relative(baseDir, sourcemap.file) : sourcemap.file;
|
|
16
17
|
message += ` (${chalk.yellow(`${relFileName}:${sourcemap.start?.line}`)})`;
|
|
17
|
-
} else if (
|
|
18
|
-
message += ` (${
|
|
18
|
+
} else if (elementXPath) {
|
|
19
|
+
message += ` (${elementXPath})`;
|
|
19
20
|
}
|
|
20
21
|
logger.error(message);
|
|
21
22
|
}
|