@stackbit/dev 0.0.40 → 0.0.43
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/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/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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"}
|
|
@@ -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.43",
|
|
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.16",
|
|
26
|
+
"@stackbit/dev-common": "^0.0.39",
|
|
27
|
+
"@stackbit/sdk": "^0.2.34",
|
|
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": "5e06cf2972c6368581b2cdd5cbc16d7c02168955"
|
|
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 }) {
|
|
@@ -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
|
}
|