@stackbit/dev 0.0.37 → 0.0.40
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/command.js +6 -6
- package/dist/command.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/package.json +3 -3
- package/src/command.ts +6 -6
- package/src/server/index.ts +2 -0
- package/src/server/proxy.ts +3 -1
package/dist/command.js
CHANGED
|
@@ -40,8 +40,8 @@ function builder(yargs) {
|
|
|
40
40
|
default: '',
|
|
41
41
|
choices: ['', 'git', 'contentful', 'sanity']
|
|
42
42
|
})
|
|
43
|
-
.options('contentful-
|
|
44
|
-
description: 'Contentful
|
|
43
|
+
.options('contentful-management-token', {
|
|
44
|
+
description: 'Contentful management token',
|
|
45
45
|
default: ''
|
|
46
46
|
})
|
|
47
47
|
.options('contentful-space-id', {
|
|
@@ -49,7 +49,7 @@ function builder(yargs) {
|
|
|
49
49
|
default: ''
|
|
50
50
|
})
|
|
51
51
|
.options('contentful-preview-token', {
|
|
52
|
-
description: 'Contentful preview
|
|
52
|
+
description: 'Contentful preview token',
|
|
53
53
|
default: ''
|
|
54
54
|
})
|
|
55
55
|
.options('sanity-token', {
|
|
@@ -96,8 +96,8 @@ function builder(yargs) {
|
|
|
96
96
|
.check((argv) => {
|
|
97
97
|
var _a, _b;
|
|
98
98
|
if (argv.cms === 'contentful') {
|
|
99
|
-
if (!argv.contentfulAccessToken) {
|
|
100
|
-
throw new Error('Missing Contentful
|
|
99
|
+
if (!argv.contentfulAccessToken && !argv.contentfulManagementToken) {
|
|
100
|
+
throw new Error('Missing Contentful management token: --contentful-management-token <management-token>');
|
|
101
101
|
}
|
|
102
102
|
if (!argv.contentfulPreviewToken) {
|
|
103
103
|
throw new Error('Missing Contentful preview token: --contentful-preview-token <preview-token>');
|
|
@@ -136,7 +136,7 @@ function handler(telemetryTrack) {
|
|
|
136
136
|
autoOpen: argv.open,
|
|
137
137
|
cmsType: argv.cms,
|
|
138
138
|
runnableDir: argv['runnable-dir'],
|
|
139
|
-
contentfulAccessToken: argv.contentfulAccessToken,
|
|
139
|
+
contentfulAccessToken: argv.contentfulManagementToken || argv.contentfulAccessToken,
|
|
140
140
|
contentfulSpaceIds: possibleArray(argv.contentfulSpaceId),
|
|
141
141
|
contentfulPreviewTokens: possibleArray(argv.contentfulPreviewToken),
|
|
142
142
|
sanityToken: argv.sanityToken,
|
package/dist/command.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command.js","sourceRoot":"","sources":["../src/command.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AAGvB,SAAS,aAAa,CAAC,GAAQ;IAC3B,IAAI,MAAM,CAAC;IACX,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QACjB,IAAI,gBAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAChB,MAAM,GAAG,GAAG,CAAC;SAChB;aAAM;YACH,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC;SAClB;KACJ;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,SAAgB,OAAO,CAAC,KAAiB;IACrC,KAAK;SACA,MAAM,CAAC,MAAM,EAAE;QACZ,KAAK,EAAE,GAAG;QACV,WAAW,EAAE,MAAM;QACnB,OAAO,EAAE,IAAI;KAChB,CAAC;SACD,OAAO,CAAC,MAAM,EAAE;QACb,KAAK,EAAE,GAAG;QACV,WAAW,EAAE,UAAU;QACvB,OAAO,EAAE,WAAW;KACvB,CAAC;SACD,OAAO,CAAC,KAAK,EAAE;QACZ,KAAK,EAAE,GAAG;QACV,WAAW,EAAE,UAAU;QACvB,OAAO,EAAE,OAAO,CAAC,GAAG,EAAE;KACzB,CAAC;SACD,OAAO,CAAC,KAAK,EAAE;QACZ,KAAK,EAAE,GAAG;QACV,WAAW,EAAE,UAAU;QACvB,OAAO,EAAE,EAAE;QACX,OAAO,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,QAAQ,CAAC;KAC/C,CAAC;SACD,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"command.js","sourceRoot":"","sources":["../src/command.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":";;;;;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,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,IAAI,OAAO,EAAE,CAAC,CAAC,CAAC,UAAU,OAAO,IAAI,OAAO,EAAE,CAAC;IAE7G,MAAM,iBAAiB,GAAG,CAAC,GAAQ,EAAE,GAAQ,EAAE,GAAQ,EAAE,EAAE;QACvD,IAAI,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,MAAK,cAAc,KAAI,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,MAAM,CAAA,EAAE;YAC7C,IAAA,yBAAiB,EAAC,GAAG,EAAE,GAAG,EAAE;gBACxB,SAAS,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC;gBAC5C,QAAQ,EAAE,cAAc;gBACxB,SAAS,EAAE,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,KAAI,EAAE;gBAC1B,WAAW,EAAE,EAAE;gBACf,MAAM,EAAE,GAAG;gBACX,aAAa,EAAE,IAAI;aACtB,CAAC,CAAC;SACN;IACL,CAAC,CAAC;IAEF,2EAA2E;IAC3E,6EAA6E;IAC7E,MAAM,WAAW,GAAG,gBAAC,CAAC,IAAI,CAAC,gBAAC,CAAC,MAAM,CAAC,gBAAM,CAAC,yBAAyB,EAAE,MAAM,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;IAChG,MAAM,CAAC,GAAG,CACN,IAAA,+BAAK,EAAC,WAAW,EAAE;QACf,MAAM,EAAE,cAAc;QACtB,YAAY,EAAE,MAAM,CAAC,qBAAqB,EAAE;QAC5C,EAAE,EAAE,IAAI;QACR,MAAM,EAAE,KAAK;QACb,WAAW,EAAE,GAAG,EAAE,CAAC,gBAAM;QACzB,QAAQ,EAAE,gBAAM,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ;QACzD,MAAM,EAAE,MAAA,MAAM,CAAC,eAAe,EAAE,mCAAI,EAAE;QACtC,OAAO,EAAE,CAAC,GAAQ,EAAE,GAAQ,EAAE,GAAQ,EAAE,EAAE;YACtC,gBAAM,CAAC,KAAK,CAAC,qCAAqC,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,GAAG,YAAY,GAAG,CAAC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;YAClH,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QACrC,CAAC;KACJ,CAAC,CACL,CAAC;IAEF,MAAM,CAAC,GAAG,CACN,IAAA,+BAAK,EAAC;QACF,MAAM,EAAE,cAAc;QACtB,YAAY,EAAE,IAAI;QAClB,eAAe,EAAE,IAAI;QACrB,MAAM,EAAE,KAAK;QACb,WAAW,EAAE,GAAG,EAAE,CAAC,gBAAM;QACzB,QAAQ,EAAE,gBAAM,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ;QACzD,OAAO,EAAE,CAAC,GAAQ,EAAE,GAAQ,EAAE,GAAQ,EAAE,EAAE;YACtC,gBAAM,CAAC,KAAK,CAAC,mCAAmC,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,GAAG,YAAY,GAAG,CAAC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;YAChH,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QACrC,CAAC;QACD,kBAAkB,EAAE,IAAI;QACxB,UAAU,EAAE,IAAA,iDAAmC,EAAC;YAC5C,UAAU,EAAE,OAAO;YACnB,gBAAgB,EAAE,CAAC,QAAiB,EAAE,GAAY,EAAE,EAAE;gBAClD,OAAO,GAAG,CAAC,MAAM,KAAK,KAAK,IAAI,IAAA,oBAAM,EAAC,QAAQ,CAAC,CAAC;YACpD,CAAC;YACD,UAAU,EAAE,CAAC,IAAY,EAAE,EAAE;gBACzB,IAAI,GAAG,IAAA,0BAAY,EAAC,IAAI,EAAE,gBAAM,CAAC,UAAU,CAAC,CAAC;gBAC7C,OAAO,IAAI,CAAC;YAChB,CAAC;SACJ,CAAC;KACL,CAAC,CACL,CAAC;IAEF,OAAO,MAAM,CAAC;AAClB,CAAC;AA/ED,kCA+EC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@stackbit/dev",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.40",
|
|
4
4
|
"description": "stackbit-dev",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
"license": "MIT",
|
|
24
24
|
"dependencies": {
|
|
25
25
|
"@stackbit/cms-core": "^0.0.14",
|
|
26
|
-
"@stackbit/dev-common": "^0.0.
|
|
26
|
+
"@stackbit/dev-common": "^0.0.36",
|
|
27
27
|
"@stackbit/sdk": "^0.2.32",
|
|
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": "899a60c5ae6d06d8e3b796e81c03b716f1f8d1b1"
|
|
59
59
|
}
|
package/src/command.ts
CHANGED
|
@@ -36,8 +36,8 @@ export function builder(yargs: yargs.Argv) {
|
|
|
36
36
|
default: '',
|
|
37
37
|
choices: ['', 'git', 'contentful', 'sanity']
|
|
38
38
|
})
|
|
39
|
-
.options('contentful-
|
|
40
|
-
description: 'Contentful
|
|
39
|
+
.options('contentful-management-token', {
|
|
40
|
+
description: 'Contentful management token',
|
|
41
41
|
default: ''
|
|
42
42
|
})
|
|
43
43
|
.options('contentful-space-id', {
|
|
@@ -45,7 +45,7 @@ export function builder(yargs: yargs.Argv) {
|
|
|
45
45
|
default: ''
|
|
46
46
|
})
|
|
47
47
|
.options('contentful-preview-token', {
|
|
48
|
-
description: 'Contentful preview
|
|
48
|
+
description: 'Contentful preview token',
|
|
49
49
|
default: ''
|
|
50
50
|
})
|
|
51
51
|
.options('sanity-token', {
|
|
@@ -91,8 +91,8 @@ export function builder(yargs: yargs.Argv) {
|
|
|
91
91
|
.options('help', {})
|
|
92
92
|
.check((argv) => {
|
|
93
93
|
if (argv.cms === 'contentful') {
|
|
94
|
-
if (!argv.contentfulAccessToken) {
|
|
95
|
-
throw new Error('Missing Contentful
|
|
94
|
+
if (!argv.contentfulAccessToken && !argv.contentfulManagementToken) {
|
|
95
|
+
throw new Error('Missing Contentful management token: --contentful-management-token <management-token>');
|
|
96
96
|
}
|
|
97
97
|
if (!argv.contentfulPreviewToken) {
|
|
98
98
|
throw new Error('Missing Contentful preview token: --contentful-preview-token <preview-token>');
|
|
@@ -131,7 +131,7 @@ export function handler(telemetryTrack?: (event: string, data?: any) => void) {
|
|
|
131
131
|
autoOpen: argv.open,
|
|
132
132
|
cmsType: argv.cms,
|
|
133
133
|
runnableDir: argv['runnable-dir'],
|
|
134
|
-
contentfulAccessToken: argv.contentfulAccessToken,
|
|
134
|
+
contentfulAccessToken: argv.contentfulManagementToken || argv.contentfulAccessToken,
|
|
135
135
|
contentfulSpaceIds: possibleArray(argv.contentfulSpaceId),
|
|
136
136
|
contentfulPreviewTokens: possibleArray(argv.contentfulPreviewToken),
|
|
137
137
|
sanityToken: argv.sanityToken,
|
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) => {
|