@stackbit/dev 0.0.17-alpha.0 → 0.0.18-alpha.0
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/dev.js +2 -21
- package/dist/dev.js.map +1 -1
- package/dist/runner/index.d.ts +15 -4
- package/dist/runner/index.js +12 -9
- package/dist/runner/index.js.map +1 -1
- package/dist/server/index.d.ts +0 -1
- package/dist/server/index.js +0 -10
- package/dist/server/index.js.map +1 -1
- package/dist/server/routes.js +12 -8
- package/dist/server/routes.js.map +1 -1
- package/package.json +4 -4
- package/src/dev.ts +3 -18
- package/src/runner/index.ts +12 -9
- package/src/server/index.ts +0 -14
- package/src/server/routes.ts +12 -8
package/dist/dev.js
CHANGED
|
@@ -25,27 +25,9 @@ async function start(options) {
|
|
|
25
25
|
};
|
|
26
26
|
logger_1.default.debug('Local details', { localDetails });
|
|
27
27
|
const studioUrl = `${config_1.default.appUrl}/local/${Buffer.from(JSON.stringify(localDetails)).toString('base64')}`;
|
|
28
|
-
let updateLocalDevDetails = () => {
|
|
29
|
-
var _a;
|
|
30
|
-
return api_1.default.updateLocalDev(userId, {
|
|
31
|
-
...localDetails,
|
|
32
|
-
...(options.cmsType === 'contentful'
|
|
33
|
-
? {
|
|
34
|
-
contentfulAccessToken: options.contentfulAccessToken,
|
|
35
|
-
contentfulSpaces: (_a = options.contentfulSpaceIds) === null || _a === void 0 ? void 0 : _a.map((spaceId, i) => {
|
|
36
|
-
var _a;
|
|
37
|
-
return ({
|
|
38
|
-
spaceId,
|
|
39
|
-
previewApiKey: (_a = options.contentfulPreviewTokens) === null || _a === void 0 ? void 0 : _a[i]
|
|
40
|
-
});
|
|
41
|
-
})
|
|
42
|
-
}
|
|
43
|
-
: {})
|
|
44
|
-
});
|
|
45
|
-
};
|
|
46
28
|
try {
|
|
47
|
-
await
|
|
48
|
-
|
|
29
|
+
const result = await api_1.default.updateLocalDev(userId, localDetails);
|
|
30
|
+
logger_1.default.debug('update local details result', { result: result === null || result === void 0 ? void 0 : result.status });
|
|
49
31
|
}
|
|
50
32
|
catch (err) {
|
|
51
33
|
// failure here is expected if user hasn't pressed the link yet.
|
|
@@ -56,7 +38,6 @@ async function start(options) {
|
|
|
56
38
|
await (0, server_1.start)({
|
|
57
39
|
serverPort,
|
|
58
40
|
uuid: userId,
|
|
59
|
-
updateLocalDevDetails,
|
|
60
41
|
...options
|
|
61
42
|
});
|
|
62
43
|
}
|
package/dist/dev.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev.js","sourceRoot":"","sources":["../src/dev.ts"],"names":[],"mappings":";;;;;;AACA,8DAAqC;AAErC,qCAAgD;AAChD,wDAAmD;AACnD,+DAAuC;AACvC,yDAAwC;AACxC,sDAA8B;AAC9B,kDAA0B;AAC1B,gDAAwB;
|
|
1
|
+
{"version":3,"file":"dev.js","sourceRoot":"","sources":["../src/dev.ts"],"names":[],"mappings":";;;;;;AACA,8DAAqC;AAErC,qCAAgD;AAChD,wDAAmD;AACnD,+DAAuC;AACvC,yDAAwC;AACxC,sDAA8B;AAC9B,kDAA0B;AAC1B,gDAAwB;AAejB,KAAK,UAAU,KAAK,CAAC,OAAmB;IAC3C,gBAAM,CAAC,IAAI,CAAC,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAElD,IAAI,UAAU,GAAG,MAAM,IAAA,qBAAU,EAAC,IAAI,CAAC,CAAC;IACxC,MAAM,MAAM,GAAG,IAAA,uBAAS,GAAE,CAAC;IAC3B,gBAAM,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC;IAE9B,MAAM,YAAY,GAAG;QACjB,CAAC,EAAE,MAAM;QACT,CAAC,EAAE,UAAU;QACb,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC,OAAO;QACrC,GAAG,EAAE,OAAO,CAAC,OAAO,IAAI,KAAK;KAChC,CAAC;IAEF,gBAAM,CAAC,KAAK,CAAC,eAAe,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC;IAChD,MAAM,SAAS,GAAG,GAAG,gBAAM,CAAC,MAAM,UAAU,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;IAE3G,IAAI;QACA,MAAM,MAAM,GAAG,MAAM,aAAU,CAAC,cAAc,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QACrE,gBAAM,CAAC,KAAK,CAAC,6BAA6B,EAAE,EAAE,MAAM,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,EAAE,CAAC,CAAC;KAC3E;IAAC,OAAO,GAAQ,EAAE;QACf,gEAAgE;QAChE,+EAA+E;QAC/E,gBAAM,CAAC,KAAK,CAAC,uBAAuB,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,OAAO,IAAI,GAAG,EAAE,CAAC,CAAC;KACtE;IAED,IAAI;QACA,MAAM,IAAA,cAAW,EAAC;YACd,UAAU;YACV,IAAI,EAAE,MAAM;YACZ,GAAG,OAAO;SACb,CAAC,CAAC;KACN;IAAC,OAAO,GAAG,EAAE;QACV,gBAAM,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;QACnD,gBAAM,CAAC,KAAK,CAAC,oBAAoB,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;QAC5C,OAAO,KAAK,CAAC;KAChB;IAED,gBAAM,CAAC,IAAI,CAAC,2CAA2C,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IAC7F,gBAAM,CAAC,IAAI,CAAC,SAAS,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,eAAK,CAAC,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;IAE/F,IAAI,OAAO,CAAC,QAAQ,EAAE;QAClB,IAAA,cAAI,EAAC,SAAS,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;YACxB,gBAAM,CAAC,KAAK,CAAC,iBAAiB,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;YACzC,gBAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACvC,CAAC,CAAC,CAAA;KACL;AACL,CAAC;AA/CD,sBA+CC"}
|
package/dist/runner/index.d.ts
CHANGED
|
@@ -33,11 +33,22 @@ export default class Runner {
|
|
|
33
33
|
};
|
|
34
34
|
getDirectChangeOrigin(): boolean;
|
|
35
35
|
getDirectChangeSocketOrigin(): boolean;
|
|
36
|
-
getObjects(objectIds
|
|
37
|
-
|
|
38
|
-
|
|
36
|
+
getObjects({ objectIds, locale }: {
|
|
37
|
+
objectIds: string[];
|
|
38
|
+
locale?: string;
|
|
39
|
+
}): Promise<any>;
|
|
40
|
+
getObjectsWithAnnotations({ annotationTree, clientAnnotationErrors, locale }: {
|
|
41
|
+
annotationTree: any;
|
|
42
|
+
clientAnnotationErrors: any;
|
|
43
|
+
locale?: string;
|
|
44
|
+
}): Promise<any>;
|
|
45
|
+
getCollections({ locale }: {
|
|
46
|
+
locale?: string;
|
|
47
|
+
}): Promise<any>;
|
|
39
48
|
getSiteMap(): Promise<any>;
|
|
40
|
-
getSchema(
|
|
49
|
+
getSchema({ locale }: {
|
|
50
|
+
locale?: string;
|
|
51
|
+
}): Promise<any>;
|
|
41
52
|
getUrl(objectId: string, projectId: string, locale: string): Promise<any>;
|
|
42
53
|
getObject(objectId: string, projectId: string): Promise<any>;
|
|
43
54
|
listAssets(filterParams: any): Promise<any>;
|
package/dist/runner/index.js
CHANGED
|
@@ -122,26 +122,26 @@ class Runner {
|
|
|
122
122
|
getDirectChangeSocketOrigin() {
|
|
123
123
|
return ssg_1.default.directChangeSocketOrigin;
|
|
124
124
|
}
|
|
125
|
-
async getObjects(objectIds = []) {
|
|
126
|
-
return this.editor.getObjects(objectIds);
|
|
125
|
+
async getObjects({ objectIds = [], locale }) {
|
|
126
|
+
return this.editor.getObjects({ objectIds, locale });
|
|
127
127
|
}
|
|
128
|
-
async getObjectsWithAnnotations(annotationTree = null, clientAnnotationErrors = []) {
|
|
128
|
+
async getObjectsWithAnnotations({ annotationTree = null, clientAnnotationErrors = [], locale }) {
|
|
129
129
|
var _a;
|
|
130
|
-
const result = await this.editor.getObjectsWithAnnotations(annotationTree);
|
|
130
|
+
const result = await this.editor.getObjectsWithAnnotations({ annotationTree, clientAnnotationErrors, locale, reportAllErrors: true });
|
|
131
131
|
lodash_1.default.forEach([...((_a = result.errors) !== null && _a !== void 0 ? _a : []), ...clientAnnotationErrors], (error) => {
|
|
132
132
|
const errorProps = lodash_1.default.omit(error, ['type', 'message']);
|
|
133
133
|
logger_1.default.error(`${error.message} ${lodash_1.default.map(errorProps, (val, key) => `${key}:'${val && val.toString ? val.toString() : val}'`).join(', ')}`);
|
|
134
134
|
});
|
|
135
135
|
return result;
|
|
136
136
|
}
|
|
137
|
-
async getCollections() {
|
|
138
|
-
return this.editor.getCollections();
|
|
137
|
+
async getCollections({ locale }) {
|
|
138
|
+
return this.editor.getCollections({ locale });
|
|
139
139
|
}
|
|
140
140
|
async getSiteMap() {
|
|
141
141
|
return this.editor.getSiteMap(this.cms.getEncodingResult());
|
|
142
142
|
}
|
|
143
|
-
async getSchema() {
|
|
144
|
-
return this.editor.getSchema();
|
|
143
|
+
async getSchema({ locale }) {
|
|
144
|
+
return this.editor.getSchema({ locale });
|
|
145
145
|
}
|
|
146
146
|
async getUrl(objectId, projectId, locale) {
|
|
147
147
|
return this.editor.getUrl(objectId, projectId, locale);
|
|
@@ -166,7 +166,10 @@ class Runner {
|
|
|
166
166
|
case 'deleteObject':
|
|
167
167
|
return this.cms.deleteObject(data.srcObjectId, data.srcProjectId);
|
|
168
168
|
case 'getAssets':
|
|
169
|
-
return this.cms.listAssets(data)
|
|
169
|
+
return this.cms.listAssets(data).then((result) => ({
|
|
170
|
+
data: result.assets,
|
|
171
|
+
meta: result.meta
|
|
172
|
+
}));
|
|
170
173
|
case 'uploadAssets':
|
|
171
174
|
return this.cms.uploadAssets(data.assets);
|
|
172
175
|
default:
|
package/dist/runner/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/runner/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/runner/index.ts"],"names":[],"mappings":"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"}
|
package/dist/server/index.d.ts
CHANGED
|
@@ -9,7 +9,6 @@ interface ServerOptions {
|
|
|
9
9
|
contentfulAccessToken?: string;
|
|
10
10
|
contentfulSpaceIds?: [string];
|
|
11
11
|
contentfulPreviewTokens?: [string];
|
|
12
|
-
updateLocalDevDetails?: () => Promise<any>;
|
|
13
12
|
}
|
|
14
13
|
export declare function start({ serverPort, ssgPort, ssgHost, rootDir, runnableDir, uuid, cmsType, ...options }: ServerOptions): Promise<void>;
|
|
15
14
|
export {};
|
package/dist/server/index.js
CHANGED
|
@@ -27,19 +27,9 @@ async function start({ serverPort, ssgPort, ssgHost, rootDir, runnableDir, uuid,
|
|
|
27
27
|
const httpServer = http_1.default.createServer(server);
|
|
28
28
|
socket_service_1.default.use(httpServer, logger_1.default);
|
|
29
29
|
server.use(require('cors')());
|
|
30
|
-
let updateLocalDevDetails = options.updateLocalDevDetails;
|
|
31
30
|
server.use((req, res, next) => {
|
|
32
31
|
// log requests
|
|
33
32
|
logger_1.default.debug(`got request ${req.method} ${req.path}`, { method: req.method, originalUrl: req.originalUrl, url: req.url, path: req.path });
|
|
34
|
-
// handle details update if not handled yet
|
|
35
|
-
const runUpdateLocalDevDetails = updateLocalDevDetails;
|
|
36
|
-
updateLocalDevDetails = undefined;
|
|
37
|
-
runUpdateLocalDevDetails === null || runUpdateLocalDevDetails === void 0 ? void 0 : runUpdateLocalDevDetails().then(() => {
|
|
38
|
-
logger_1.default.debug('Updated local dev details after startup');
|
|
39
|
-
}).catch(err => {
|
|
40
|
-
logger_1.default.debug('Error updating local details', { err });
|
|
41
|
-
logger_1.default.error('Error configuring Stackbit with local details');
|
|
42
|
-
});
|
|
43
33
|
next();
|
|
44
34
|
});
|
|
45
35
|
server.use('/_static', express_1.default.static('static'));
|
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;
|
|
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;AAtCD,sBAsCC"}
|
package/dist/server/routes.js
CHANGED
|
@@ -33,9 +33,9 @@ function routes(router, runner, uuid) {
|
|
|
33
33
|
next();
|
|
34
34
|
});
|
|
35
35
|
router.post('/_objects', [body_parser_1.default.json({ limit: '500kb' })], (req, res, next) => {
|
|
36
|
-
const { objectIds } = req.body;
|
|
36
|
+
const { objectIds, locale } = req.body;
|
|
37
37
|
return runner
|
|
38
|
-
.getObjects(objectIds)
|
|
38
|
+
.getObjects({ objectIds, locale })
|
|
39
39
|
.then((result) => {
|
|
40
40
|
res.json(result);
|
|
41
41
|
})
|
|
@@ -50,9 +50,9 @@ function routes(router, runner, uuid) {
|
|
|
50
50
|
});
|
|
51
51
|
});
|
|
52
52
|
router.post('/_objectsWithAnnotations', [body_parser_1.default.json({ limit: '500kb' })], (req, res, next) => {
|
|
53
|
-
const { annotationTree, clientAnnotationErrors } = req.body;
|
|
53
|
+
const { annotationTree, clientAnnotationErrors, locale } = req.body;
|
|
54
54
|
return runner
|
|
55
|
-
.getObjectsWithAnnotations(annotationTree, clientAnnotationErrors)
|
|
55
|
+
.getObjectsWithAnnotations({ annotationTree, clientAnnotationErrors, locale })
|
|
56
56
|
.then((result) => {
|
|
57
57
|
res.json(result);
|
|
58
58
|
})
|
|
@@ -67,8 +67,9 @@ function routes(router, runner, uuid) {
|
|
|
67
67
|
});
|
|
68
68
|
});
|
|
69
69
|
router.get('/_collections', (req, res, next) => {
|
|
70
|
+
const { locale } = req.query;
|
|
70
71
|
return runner
|
|
71
|
-
.getCollections()
|
|
72
|
+
.getCollections({ locale: locale })
|
|
72
73
|
.then((result) => {
|
|
73
74
|
res.json(result);
|
|
74
75
|
})
|
|
@@ -99,8 +100,9 @@ function routes(router, runner, uuid) {
|
|
|
99
100
|
});
|
|
100
101
|
});
|
|
101
102
|
router.get('/_schema', (req, res, next) => {
|
|
103
|
+
const { locale } = req.query;
|
|
102
104
|
return runner
|
|
103
|
-
.getSchema()
|
|
105
|
+
.getSchema({ locale: locale })
|
|
104
106
|
.then((schema) => res.json(schema))
|
|
105
107
|
.catch((err) => {
|
|
106
108
|
logger_1.default.error('Error fetching schema');
|
|
@@ -118,10 +120,12 @@ function routes(router, runner, uuid) {
|
|
|
118
120
|
if (err !== response_errors_1.PageNotFoundError) {
|
|
119
121
|
logger_1.default.error('Error querying for page url');
|
|
120
122
|
}
|
|
121
|
-
const log = err === response_errors_1.PageNotFoundError ? logger_1.default.
|
|
123
|
+
const log = err === response_errors_1.PageNotFoundError ? logger_1.default.debug : logger_1.default.warn;
|
|
122
124
|
log('error getting page path from runner', { params: req.query, error: err });
|
|
123
125
|
res.json({ error: err.toString() });
|
|
124
|
-
|
|
126
|
+
if (err !== response_errors_1.PageNotFoundError) {
|
|
127
|
+
next(err);
|
|
128
|
+
}
|
|
125
129
|
});
|
|
126
130
|
});
|
|
127
131
|
router.get('/_object', (req, res, next) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../src/server/routes.ts"],"names":[],"mappings":";;;;;AAAA,oDAAuB;AAEvB,8DAAqC;AAErC,gEAAwC;AACxC,wFAAuF;AAEvF,MAAM,cAAc,GAAG,CAAC,IAAY,EAAE,EAAE;IACpC,OAAO,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;QACvD,IAAI;YACA,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE;gBAC5B,MAAM,mBAAmB,CAAC;aAC7B;YACD,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YACtD,IAAI,KAAK,KAAK,IAAI,EAAE;gBAChB,IAAI,EAAE,CAAC;aACV;iBAAM;gBACH,MAAM,oBAAoB,CAAC;aAC9B;SACJ;QAAC,OAAO,GAAG,EAAE;YACV,gBAAM,CAAC,KAAK,CAAC,mBAAmB,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;YAClD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;SAC7C;IACL,CAAC,CAAC;AACN,CAAC,CAAC;AAEF,SAAwB,MAAM,CAAC,MAAc,EAAE,MAAc,EAAE,IAAY;IACvE,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QAC1B,MAAM,CAAC,SAAS,EAAE,CAAC;QACnB,IAAI,EAAE,CAAC;IACX,CAAC,CAAC,CAAC;IACH,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,qBAAU,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;QAChH,MAAM,EAAE,SAAS,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../src/server/routes.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@stackbit/dev",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.18-alpha.0",
|
|
4
4
|
"description": "stackbit-dev",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -22,8 +22,8 @@
|
|
|
22
22
|
"author": "Stackbit Inc.",
|
|
23
23
|
"license": "MIT",
|
|
24
24
|
"dependencies": {
|
|
25
|
-
"@stackbit/cms-core": "^0.0.
|
|
26
|
-
"@stackbit/dev-common": "^0.0.
|
|
25
|
+
"@stackbit/cms-core": "^0.0.10-alpha.0",
|
|
26
|
+
"@stackbit/dev-common": "^0.0.16-alpha.0",
|
|
27
27
|
"@stackbit/sdk": "^0.2.22",
|
|
28
28
|
"axios": "^0.25.0",
|
|
29
29
|
"chalk": "^4.1.0",
|
|
@@ -55,5 +55,5 @@
|
|
|
55
55
|
"ts-jest": "^27.1.3",
|
|
56
56
|
"typescript": "^4.5.4"
|
|
57
57
|
},
|
|
58
|
-
"gitHead": "
|
|
58
|
+
"gitHead": "861e87c2a1fad14cc276eaa0f1876653ed56fa2b"
|
|
59
59
|
}
|
package/src/dev.ts
CHANGED
|
@@ -9,6 +9,7 @@ import config from './config';
|
|
|
9
9
|
import chalk from 'chalk';
|
|
10
10
|
import open from 'open';
|
|
11
11
|
|
|
12
|
+
|
|
12
13
|
interface DevOptions {
|
|
13
14
|
ssgPort: number;
|
|
14
15
|
ssgHost: string;
|
|
@@ -38,24 +39,9 @@ export async function start(options: DevOptions) {
|
|
|
38
39
|
logger.debug('Local details', { localDetails });
|
|
39
40
|
const studioUrl = `${config.appUrl}/local/${Buffer.from(JSON.stringify(localDetails)).toString('base64')}`;
|
|
40
41
|
|
|
41
|
-
let updateLocalDevDetails: (() => Promise<any>) | undefined = () => {
|
|
42
|
-
return apiService.updateLocalDev(userId, {
|
|
43
|
-
...localDetails,
|
|
44
|
-
...(options.cmsType === 'contentful'
|
|
45
|
-
? {
|
|
46
|
-
contentfulAccessToken: options.contentfulAccessToken,
|
|
47
|
-
contentfulSpaces: options.contentfulSpaceIds?.map((spaceId, i) => ({
|
|
48
|
-
spaceId,
|
|
49
|
-
previewApiKey: options.contentfulPreviewTokens?.[i]
|
|
50
|
-
}))
|
|
51
|
-
}
|
|
52
|
-
: {})
|
|
53
|
-
});
|
|
54
|
-
};
|
|
55
|
-
|
|
56
42
|
try {
|
|
57
|
-
await
|
|
58
|
-
|
|
43
|
+
const result = await apiService.updateLocalDev(userId, localDetails);
|
|
44
|
+
logger.debug('update local details result', { result: result?.status });
|
|
59
45
|
} catch (err: any) {
|
|
60
46
|
// failure here is expected if user hasn't pressed the link yet.
|
|
61
47
|
// in that case we defer the update to when the server starts getting accessed.
|
|
@@ -66,7 +52,6 @@ export async function start(options: DevOptions) {
|
|
|
66
52
|
await startServer({
|
|
67
53
|
serverPort,
|
|
68
54
|
uuid: userId,
|
|
69
|
-
updateLocalDevDetails,
|
|
70
55
|
...options
|
|
71
56
|
});
|
|
72
57
|
} catch (err) {
|
package/src/runner/index.ts
CHANGED
|
@@ -145,12 +145,12 @@ export default class Runner {
|
|
|
145
145
|
return ssg.directChangeSocketOrigin;
|
|
146
146
|
}
|
|
147
147
|
|
|
148
|
-
async getObjects(objectIds = []) {
|
|
149
|
-
return this.editor.getObjects(objectIds);
|
|
148
|
+
async getObjects({ objectIds = [], locale }: { objectIds: string[], locale?: string }) {
|
|
149
|
+
return this.editor.getObjects({ objectIds, locale });
|
|
150
150
|
}
|
|
151
151
|
|
|
152
|
-
async getObjectsWithAnnotations(annotationTree = null, clientAnnotationErrors = []) {
|
|
153
|
-
const result = await this.editor.getObjectsWithAnnotations(annotationTree);
|
|
152
|
+
async getObjectsWithAnnotations({ annotationTree = null, clientAnnotationErrors = [], locale }: { annotationTree: any, clientAnnotationErrors: any, locale?: string }) {
|
|
153
|
+
const result = await this.editor.getObjectsWithAnnotations({ annotationTree, clientAnnotationErrors, locale, reportAllErrors: true });
|
|
154
154
|
_.forEach([...(result.errors ?? []), ...clientAnnotationErrors], (error) => {
|
|
155
155
|
const errorProps = _.omit(error, ['type', 'message']);
|
|
156
156
|
logger.error(`${error.message} ${_.map(errorProps, (val, key) => `${key}:'${val && val.toString ? val.toString() : val}'`).join(', ')}`);
|
|
@@ -158,16 +158,16 @@ export default class Runner {
|
|
|
158
158
|
return result;
|
|
159
159
|
}
|
|
160
160
|
|
|
161
|
-
async getCollections() {
|
|
162
|
-
return this.editor.getCollections();
|
|
161
|
+
async getCollections({ locale }: { locale?: string }) {
|
|
162
|
+
return this.editor.getCollections({ locale });
|
|
163
163
|
}
|
|
164
164
|
|
|
165
165
|
async getSiteMap() {
|
|
166
166
|
return this.editor.getSiteMap(this.cms.getEncodingResult());
|
|
167
167
|
}
|
|
168
168
|
|
|
169
|
-
async getSchema() {
|
|
170
|
-
return this.editor.getSchema();
|
|
169
|
+
async getSchema({ locale }: { locale?: string}) {
|
|
170
|
+
return this.editor.getSchema({ locale });
|
|
171
171
|
}
|
|
172
172
|
|
|
173
173
|
async getUrl(objectId: string, projectId: string, locale: string): Promise<any> {
|
|
@@ -197,7 +197,10 @@ export default class Runner {
|
|
|
197
197
|
case 'deleteObject':
|
|
198
198
|
return this.cms.deleteObject(data.srcObjectId, data.srcProjectId);
|
|
199
199
|
case 'getAssets':
|
|
200
|
-
return this.cms.listAssets(data)
|
|
200
|
+
return this.cms.listAssets(data).then((result: any) => ({
|
|
201
|
+
data: result.assets,
|
|
202
|
+
meta: result.meta
|
|
203
|
+
}));
|
|
201
204
|
case 'uploadAssets':
|
|
202
205
|
return this.cms.uploadAssets(data.assets);
|
|
203
206
|
default:
|
package/src/server/index.ts
CHANGED
|
@@ -10,7 +10,6 @@ import proxy from './proxy';
|
|
|
10
10
|
import Runner from '../runner';
|
|
11
11
|
import consts from '../consts';
|
|
12
12
|
import socketService from '@stackbit/dev-common/dist/services/socket-service';
|
|
13
|
-
import { options } from 'yargs';
|
|
14
13
|
|
|
15
14
|
interface ServerOptions {
|
|
16
15
|
serverPort: number;
|
|
@@ -23,7 +22,6 @@ interface ServerOptions {
|
|
|
23
22
|
contentfulAccessToken?: string;
|
|
24
23
|
contentfulSpaceIds?: [string];
|
|
25
24
|
contentfulPreviewTokens?: [string];
|
|
26
|
-
updateLocalDevDetails?: () => Promise<any>;
|
|
27
25
|
}
|
|
28
26
|
|
|
29
27
|
export async function start({ serverPort, ssgPort, ssgHost, rootDir, runnableDir, uuid, cmsType, ...options }: ServerOptions) {
|
|
@@ -45,21 +43,9 @@ export async function start({ serverPort, ssgPort, ssgHost, rootDir, runnableDir
|
|
|
45
43
|
|
|
46
44
|
server.use(require('cors')());
|
|
47
45
|
|
|
48
|
-
let updateLocalDevDetails = options.updateLocalDevDetails;
|
|
49
46
|
server.use((req, res, next) => {
|
|
50
47
|
// log requests
|
|
51
48
|
logger.debug(`got request ${req.method} ${req.path}`, { method: req.method, originalUrl: req.originalUrl, url: req.url, path: req.path });
|
|
52
|
-
|
|
53
|
-
// handle details update if not handled yet
|
|
54
|
-
const runUpdateLocalDevDetails = updateLocalDevDetails;
|
|
55
|
-
updateLocalDevDetails = undefined;
|
|
56
|
-
runUpdateLocalDevDetails?.().then(() => {
|
|
57
|
-
logger.debug('Updated local dev details after startup')
|
|
58
|
-
}).catch(err => {
|
|
59
|
-
logger.debug('Error updating local details', { err });
|
|
60
|
-
logger.error('Error configuring Stackbit with local details');
|
|
61
|
-
});
|
|
62
|
-
|
|
63
49
|
next();
|
|
64
50
|
});
|
|
65
51
|
|
package/src/server/routes.ts
CHANGED
|
@@ -30,9 +30,9 @@ export default function routes(router: Router, runner: Runner, uuid: string) {
|
|
|
30
30
|
next();
|
|
31
31
|
});
|
|
32
32
|
router.post('/_objects', [bodyParser.json({ limit: '500kb' })], (req: Request, res: Response, next: NextFunction) => {
|
|
33
|
-
const { objectIds } = req.body;
|
|
33
|
+
const { objectIds, locale } = req.body;
|
|
34
34
|
return runner
|
|
35
|
-
.getObjects(objectIds)
|
|
35
|
+
.getObjects({ objectIds, locale })
|
|
36
36
|
.then((result) => {
|
|
37
37
|
res.json(result);
|
|
38
38
|
})
|
|
@@ -47,9 +47,9 @@ export default function routes(router: Router, runner: Runner, uuid: string) {
|
|
|
47
47
|
});
|
|
48
48
|
});
|
|
49
49
|
router.post('/_objectsWithAnnotations', [bodyParser.json({ limit: '500kb' })], (req: Request, res: Response, next: NextFunction) => {
|
|
50
|
-
const { annotationTree, clientAnnotationErrors } = req.body;
|
|
50
|
+
const { annotationTree, clientAnnotationErrors, locale } = req.body;
|
|
51
51
|
return runner
|
|
52
|
-
.getObjectsWithAnnotations(annotationTree, clientAnnotationErrors)
|
|
52
|
+
.getObjectsWithAnnotations({ annotationTree, clientAnnotationErrors, locale })
|
|
53
53
|
.then((result) => {
|
|
54
54
|
res.json(result);
|
|
55
55
|
})
|
|
@@ -64,8 +64,9 @@ export default function routes(router: Router, runner: Runner, uuid: string) {
|
|
|
64
64
|
});
|
|
65
65
|
});
|
|
66
66
|
router.get('/_collections', (req: Request, res: Response, next: NextFunction) => {
|
|
67
|
+
const { locale } = req.query;
|
|
67
68
|
return runner
|
|
68
|
-
.getCollections()
|
|
69
|
+
.getCollections({ locale: locale as string })
|
|
69
70
|
.then((result) => {
|
|
70
71
|
res.json(result);
|
|
71
72
|
})
|
|
@@ -96,8 +97,9 @@ export default function routes(router: Router, runner: Runner, uuid: string) {
|
|
|
96
97
|
});
|
|
97
98
|
});
|
|
98
99
|
router.get('/_schema', (req: Request, res: Response, next: NextFunction) => {
|
|
100
|
+
const { locale } = req.query;
|
|
99
101
|
return runner
|
|
100
|
-
.getSchema()
|
|
102
|
+
.getSchema({ locale: locale as string })
|
|
101
103
|
.then((schema) => res.json(schema))
|
|
102
104
|
.catch((err) => {
|
|
103
105
|
logger.error('Error fetching schema');
|
|
@@ -115,10 +117,12 @@ export default function routes(router: Router, runner: Runner, uuid: string) {
|
|
|
115
117
|
if (err !== PageNotFoundError) {
|
|
116
118
|
logger.error('Error querying for page url');
|
|
117
119
|
}
|
|
118
|
-
const log = err === PageNotFoundError ? logger.
|
|
120
|
+
const log = err === PageNotFoundError ? logger.debug : logger.warn;
|
|
119
121
|
log('error getting page path from runner', { params: req.query, error: err });
|
|
120
122
|
res.json({ error: err.toString() });
|
|
121
|
-
|
|
123
|
+
if (err !== PageNotFoundError) {
|
|
124
|
+
next(err);
|
|
125
|
+
}
|
|
122
126
|
});
|
|
123
127
|
});
|
|
124
128
|
router.get('/_object', (req: Request, res: Response, next: NextFunction) => {
|