@stackbit/dev 0.2.10-develop.2 → 0.3.0-staging.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/runner/index.d.ts +1 -0
- package/dist/runner/index.d.ts.map +1 -1
- package/dist/runner/index.js +19 -18
- package/dist/runner/index.js.map +1 -1
- package/dist/server/routes.js +1 -1
- package/dist/server/routes.js.map +1 -1
- package/package.json +7 -7
- package/src/runner/index.ts +18 -16
- package/src/server/routes.ts +1 -1
package/dist/runner/index.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/runner/index.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,QAAQ,CAAC;AAIvB,OAAO,EAAsC,gBAAgB,EAAE,eAAe,EAAE,2BAA2B,EAAE,MAAM,eAAe,CAAC;AACnI,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAOvD,OAAO,EACH,uBAAuB,EACvB,qBAAqB,EACrB,uBAAuB,EACvB,qBAAqB,EACrB,0BAA0B,EAC1B,kBAAkB,EAClB,uBAAuB,EACvB,qBAAqB,EACrB,0BAA0B,EAC1B,yBAAyB,EACzB,8BAA8B,EAC9B,2BAA2B,EAC3B,wBAAwB,EACxB,kBAAkB,EAClB,kBAAkB,EAClB,mCAAmC,EACtC,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,UAAU,aAAa;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,kBAAkB,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;IAC9B,uBAAuB,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;IACnC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AACD,MAAM,CAAC,OAAO,OAAO,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAsB;IAC1D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAqB;IAC7C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,MAAM,CAAU;IACxB,OAAO,CAAC,OAAO,CAAM;IACrB,OAAO,CAAC,GAAG,CAAM;gBAEL,OAAO,EAAE,aAAa;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/runner/index.ts"],"names":[],"mappings":"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"}
|
package/dist/runner/index.js
CHANGED
|
@@ -14,9 +14,10 @@ const ssg_1 = __importDefault(require("./ssg"));
|
|
|
14
14
|
const annotation_errors_1 = require("../services/annotation-errors");
|
|
15
15
|
class Runner {
|
|
16
16
|
constructor(options) {
|
|
17
|
-
var _a, _b
|
|
17
|
+
var _a, _b;
|
|
18
18
|
this.rootDir = options.rootDir;
|
|
19
19
|
this.appDir = options.runnableDir ? path_1.default.join(this.rootDir, options.runnableDir) : this.rootDir;
|
|
20
|
+
this.logger = (_a = options.logger) !== null && _a !== void 0 ? _a : logger_1.default;
|
|
20
21
|
this.workers = {
|
|
21
22
|
gitApp: new dev_common_1.Worker()
|
|
22
23
|
};
|
|
@@ -28,11 +29,11 @@ class Runner {
|
|
|
28
29
|
rootDir: this.rootDir,
|
|
29
30
|
projectDir: this.rootDir,
|
|
30
31
|
appDir: this.appDir,
|
|
31
|
-
logger:
|
|
32
|
-
userLogger:
|
|
32
|
+
logger: this.logger,
|
|
33
|
+
userLogger: this.logger,
|
|
33
34
|
localDev: true,
|
|
34
35
|
contentfulAccessToken: options.contentfulAccessToken,
|
|
35
|
-
contentfulSpaces: (
|
|
36
|
+
contentfulSpaces: (_b = options.contentfulSpaceIds) === null || _b === void 0 ? void 0 : _b.map((spaceId, i) => {
|
|
36
37
|
var _a;
|
|
37
38
|
return ({
|
|
38
39
|
spaceId,
|
|
@@ -55,14 +56,14 @@ class Runner {
|
|
|
55
56
|
});
|
|
56
57
|
}
|
|
57
58
|
async install() {
|
|
58
|
-
|
|
59
|
+
this.logger.debug('Initializing runner...');
|
|
59
60
|
const { config, errors } = await this.loadStackbitConfig();
|
|
60
61
|
for (const error of errors) {
|
|
61
62
|
if (error instanceof sdk_1.StackbitConfigNotFoundError) {
|
|
62
63
|
// if stackbit config was not found, log the error message,
|
|
63
64
|
// and continue running using the default git-cms behavior
|
|
64
|
-
|
|
65
|
-
|
|
65
|
+
this.logger.warn(error.message);
|
|
66
|
+
this.logger.warn('loading the project as a Git CMS project with a default configuration');
|
|
66
67
|
}
|
|
67
68
|
else if (error instanceof sdk_1.ConfigLoadError) {
|
|
68
69
|
// if stackbit config was found, but it had a fatal error, exit the process
|
|
@@ -71,20 +72,20 @@ class Runner {
|
|
|
71
72
|
}
|
|
72
73
|
else {
|
|
73
74
|
// stackbit config was loaded with some validation errors, log them and continue running
|
|
74
|
-
|
|
75
|
+
this.logger.warn(`error in stackbit config: ` + error.message);
|
|
75
76
|
}
|
|
76
77
|
}
|
|
77
78
|
this.editor = new dev_common_1.Editor({
|
|
78
79
|
contentStoreAdapter: this.contentStoreAdapter,
|
|
79
80
|
stackbitConfig: config,
|
|
80
|
-
logger:
|
|
81
|
-
userLogger:
|
|
81
|
+
logger: this.logger,
|
|
82
|
+
userLogger: this.logger,
|
|
82
83
|
stackbitUrlPathField: consts_1.default.STACKBIT_URL_PATH_FIELD,
|
|
83
84
|
staticAssetsPublicPath: consts_1.default.STATIC_ASSETS_PUBLIC_PATH
|
|
84
85
|
});
|
|
85
86
|
await this.contentStoreAdapter.init({ stackbitConfig: config });
|
|
86
87
|
this.watcher = (0, file_watcher_1.watchDir)(this.rootDir, (filePaths) => {
|
|
87
|
-
|
|
88
|
+
this.logger.debug(`File change detected: ${filePaths}`);
|
|
88
89
|
this.handleFileChanges(filePaths);
|
|
89
90
|
});
|
|
90
91
|
// remove default routes for Gatsby because they're conflicting
|
|
@@ -102,11 +103,11 @@ class Runner {
|
|
|
102
103
|
};
|
|
103
104
|
}
|
|
104
105
|
else {
|
|
105
|
-
|
|
106
|
+
this.logger.debug(`Found Stackbit configuration file at: ${stackbitConfigFilePath}`);
|
|
106
107
|
const stackbitConfigResult = await (0, sdk_1.loadConfig)({
|
|
107
108
|
dirPath: path_1.default.dirname(stackbitConfigFilePath),
|
|
108
109
|
watchCallback: this.onStackbitConfigUpdate.bind(this),
|
|
109
|
-
logger:
|
|
110
|
+
logger: this.logger
|
|
110
111
|
});
|
|
111
112
|
return {
|
|
112
113
|
config: stackbitConfigResult.config,
|
|
@@ -117,7 +118,7 @@ class Runner {
|
|
|
117
118
|
async onStackbitConfigUpdate(result) {
|
|
118
119
|
const { config, errors } = result;
|
|
119
120
|
for (const error of errors) {
|
|
120
|
-
|
|
121
|
+
this.logger.warn(error.message);
|
|
121
122
|
}
|
|
122
123
|
// if user broke the config file, don't reload anything until the file is fixed
|
|
123
124
|
if (!config) {
|
|
@@ -128,12 +129,12 @@ class Runner {
|
|
|
128
129
|
}
|
|
129
130
|
async handleFileChanges(filePaths) {
|
|
130
131
|
try {
|
|
131
|
-
|
|
132
|
+
this.logger.debug('handleFileChanges', { filePaths });
|
|
132
133
|
await this.contentStoreAdapter.handleFileChanges(filePaths);
|
|
133
134
|
}
|
|
134
135
|
catch (err) {
|
|
135
|
-
|
|
136
|
-
|
|
136
|
+
this.logger.debug('Handle file change error', { err, filePaths });
|
|
137
|
+
this.logger.error('Error handling file changes: ' + filePaths.join(', '));
|
|
137
138
|
}
|
|
138
139
|
}
|
|
139
140
|
getDirectPaths() {
|
|
@@ -160,7 +161,7 @@ class Runner {
|
|
|
160
161
|
var _a;
|
|
161
162
|
const result = await this.editor.getObjectsWithAnnotations({ annotationTree, clientAnnotationErrors, locale, reportAllErrors: true });
|
|
162
163
|
const errors = [...((_a = result.errors) !== null && _a !== void 0 ? _a : []), ...clientAnnotationErrors];
|
|
163
|
-
(0, annotation_errors_1.logAnnotationErrors)(errors,
|
|
164
|
+
(0, annotation_errors_1.logAnnotationErrors)(errors, this.logger, this.rootDir, sourcemaps);
|
|
164
165
|
return result;
|
|
165
166
|
}
|
|
166
167
|
async getCollections({ 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;AAExB,qDAA2E;AAC3E,uCAAmI;AAGnI,2DAAoD;AACpD,gEAAwC;AACxC,uDAA+B;AAC/B,gDAAwB;AACxB,qEAAoE;AAqCpE,MAAqB,MAAM;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/runner/index.ts"],"names":[],"mappings":"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"}
|
package/dist/server/routes.js
CHANGED
|
@@ -22,7 +22,7 @@ const authMiddleware = (uuid) => {
|
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
24
|
catch (err) {
|
|
25
|
-
logger_1.default.error('not authenticated', { error: err });
|
|
25
|
+
logger_1.default.error('not authenticated', { error: err, req: req.path });
|
|
26
26
|
res.status(400).send('Not authenticated');
|
|
27
27
|
}
|
|
28
28
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../src/server/routes.ts"],"names":[],"mappings":";;;;;AAAA,oDAAuB;AAEvB,8DAAqC;AAErC,gEAAwC;AACxC,wFAAuF;AAGvF,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;
|
|
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.
|
|
3
|
+
"version": "0.3.0-staging.0",
|
|
4
4
|
"description": "stackbit-dev",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -23,10 +23,10 @@
|
|
|
23
23
|
"author": "Stackbit Inc.",
|
|
24
24
|
"license": "MIT",
|
|
25
25
|
"dependencies": {
|
|
26
|
-
"@stackbit/cms-core": "0.
|
|
27
|
-
"@stackbit/cms-git": "0.
|
|
28
|
-
"@stackbit/dev-common": "0.
|
|
29
|
-
"@stackbit/sdk": "0.
|
|
26
|
+
"@stackbit/cms-core": "0.5.0-staging.0",
|
|
27
|
+
"@stackbit/cms-git": "0.3.0-staging.0",
|
|
28
|
+
"@stackbit/dev-common": "0.4.0-staging.0",
|
|
29
|
+
"@stackbit/sdk": "0.5.0-staging.0",
|
|
30
30
|
"axios": "^0.25.0",
|
|
31
31
|
"chalk": "^4.1.0",
|
|
32
32
|
"chokidar": "^3.5.3",
|
|
@@ -45,7 +45,7 @@
|
|
|
45
45
|
"yargs": "^17.3.1"
|
|
46
46
|
},
|
|
47
47
|
"devDependencies": {
|
|
48
|
-
"@stackbit/types": "0.
|
|
48
|
+
"@stackbit/types": "0.6.0-staging.0",
|
|
49
49
|
"@types/axios": "^0.14.0",
|
|
50
50
|
"@types/configstore": "^5.0.1",
|
|
51
51
|
"@types/detect-port": "^1.3.2",
|
|
@@ -63,5 +63,5 @@
|
|
|
63
63
|
"ts-jest": "^27.1.5",
|
|
64
64
|
"typescript": "^4.5.4"
|
|
65
65
|
},
|
|
66
|
-
"gitHead": "
|
|
66
|
+
"gitHead": "b9364b16f8be9f361d77cb304123762fd75683f5"
|
|
67
67
|
}
|
package/src/runner/index.ts
CHANGED
|
@@ -51,6 +51,7 @@ export default class Runner {
|
|
|
51
51
|
private readonly workers: { gitApp: Worker };
|
|
52
52
|
private readonly rootDir: string;
|
|
53
53
|
private readonly appDir: string;
|
|
54
|
+
private readonly logger: Logger;
|
|
54
55
|
private editor!: Editor;
|
|
55
56
|
private watcher: any;
|
|
56
57
|
private ssg: any;
|
|
@@ -58,6 +59,7 @@ export default class Runner {
|
|
|
58
59
|
constructor(options: RunnerOptions) {
|
|
59
60
|
this.rootDir = options.rootDir;
|
|
60
61
|
this.appDir = options.runnableDir ? path.join(this.rootDir, options.runnableDir) : this.rootDir;
|
|
62
|
+
this.logger = options.logger ?? logger;
|
|
61
63
|
|
|
62
64
|
this.workers = {
|
|
63
65
|
gitApp: new Worker()
|
|
@@ -71,8 +73,8 @@ export default class Runner {
|
|
|
71
73
|
rootDir: this.rootDir,
|
|
72
74
|
projectDir: this.rootDir,
|
|
73
75
|
appDir: this.appDir,
|
|
74
|
-
logger:
|
|
75
|
-
userLogger:
|
|
76
|
+
logger: this.logger,
|
|
77
|
+
userLogger: this.logger,
|
|
76
78
|
localDev: true,
|
|
77
79
|
contentfulAccessToken: options.contentfulAccessToken,
|
|
78
80
|
contentfulSpaces: options.contentfulSpaceIds?.map((spaceId, i) => ({
|
|
@@ -96,7 +98,7 @@ export default class Runner {
|
|
|
96
98
|
}
|
|
97
99
|
|
|
98
100
|
async install() {
|
|
99
|
-
logger.debug('Initializing runner...');
|
|
101
|
+
this.logger.debug('Initializing runner...');
|
|
100
102
|
|
|
101
103
|
const { config, errors } = await this.loadStackbitConfig();
|
|
102
104
|
|
|
@@ -104,23 +106,23 @@ export default class Runner {
|
|
|
104
106
|
if (error instanceof StackbitConfigNotFoundError) {
|
|
105
107
|
// if stackbit config was not found, log the error message,
|
|
106
108
|
// and continue running using the default git-cms behavior
|
|
107
|
-
logger.warn(error.message);
|
|
108
|
-
logger.warn('loading the project as a Git CMS project with a default configuration');
|
|
109
|
+
this.logger.warn(error.message);
|
|
110
|
+
this.logger.warn('loading the project as a Git CMS project with a default configuration');
|
|
109
111
|
} else if (error instanceof ConfigLoadError) {
|
|
110
112
|
// if stackbit config was found, but it had a fatal error, exit the process
|
|
111
113
|
// the error will be logged by the catch block of the dev command
|
|
112
114
|
throw error;
|
|
113
115
|
} else {
|
|
114
116
|
// stackbit config was loaded with some validation errors, log them and continue running
|
|
115
|
-
logger.warn(`error in stackbit config: ` + error.message);
|
|
117
|
+
this.logger.warn(`error in stackbit config: ` + error.message);
|
|
116
118
|
}
|
|
117
119
|
}
|
|
118
120
|
|
|
119
121
|
this.editor = new Editor({
|
|
120
122
|
contentStoreAdapter: this.contentStoreAdapter,
|
|
121
123
|
stackbitConfig: config,
|
|
122
|
-
logger: logger,
|
|
123
|
-
userLogger: logger,
|
|
124
|
+
logger: this.logger,
|
|
125
|
+
userLogger: this.logger,
|
|
124
126
|
stackbitUrlPathField: consts.STACKBIT_URL_PATH_FIELD,
|
|
125
127
|
staticAssetsPublicPath: consts.STATIC_ASSETS_PUBLIC_PATH
|
|
126
128
|
});
|
|
@@ -128,7 +130,7 @@ export default class Runner {
|
|
|
128
130
|
await this.contentStoreAdapter.init({ stackbitConfig: config });
|
|
129
131
|
|
|
130
132
|
this.watcher = watchDir(this.rootDir, (filePaths) => {
|
|
131
|
-
logger.debug(`File change detected: ${filePaths}`);
|
|
133
|
+
this.logger.debug(`File change detected: ${filePaths}`);
|
|
132
134
|
this.handleFileChanges(filePaths);
|
|
133
135
|
});
|
|
134
136
|
|
|
@@ -148,11 +150,11 @@ export default class Runner {
|
|
|
148
150
|
errors: [new StackbitConfigNotFoundError()]
|
|
149
151
|
};
|
|
150
152
|
} else {
|
|
151
|
-
logger.debug(`Found Stackbit configuration file at: ${stackbitConfigFilePath}`);
|
|
153
|
+
this.logger.debug(`Found Stackbit configuration file at: ${stackbitConfigFilePath}`);
|
|
152
154
|
const stackbitConfigResult = await loadConfig({
|
|
153
155
|
dirPath: path.dirname(stackbitConfigFilePath),
|
|
154
156
|
watchCallback: this.onStackbitConfigUpdate.bind(this),
|
|
155
|
-
logger: logger
|
|
157
|
+
logger: this.logger
|
|
156
158
|
});
|
|
157
159
|
return {
|
|
158
160
|
config: stackbitConfigResult.config,
|
|
@@ -164,7 +166,7 @@ export default class Runner {
|
|
|
164
166
|
async onStackbitConfigUpdate(result: LoadConfigResult) {
|
|
165
167
|
const { config, errors } = result;
|
|
166
168
|
for (const error of errors) {
|
|
167
|
-
logger.warn(error.message);
|
|
169
|
+
this.logger.warn(error.message);
|
|
168
170
|
}
|
|
169
171
|
// if user broke the config file, don't reload anything until the file is fixed
|
|
170
172
|
if (!config) {
|
|
@@ -176,11 +178,11 @@ export default class Runner {
|
|
|
176
178
|
|
|
177
179
|
async handleFileChanges(filePaths: string[]): Promise<void> {
|
|
178
180
|
try {
|
|
179
|
-
logger.debug('handleFileChanges', { filePaths });
|
|
181
|
+
this.logger.debug('handleFileChanges', { filePaths });
|
|
180
182
|
await this.contentStoreAdapter.handleFileChanges(filePaths);
|
|
181
183
|
} catch (err) {
|
|
182
|
-
logger.debug('Handle file change error', { err, filePaths });
|
|
183
|
-
logger.error('Error handling file changes: ' + filePaths.join(', '));
|
|
184
|
+
this.logger.debug('Handle file change error', { err, filePaths });
|
|
185
|
+
this.logger.error('Error handling file changes: ' + filePaths.join(', '));
|
|
184
186
|
}
|
|
185
187
|
}
|
|
186
188
|
|
|
@@ -222,7 +224,7 @@ export default class Runner {
|
|
|
222
224
|
}) {
|
|
223
225
|
const result = await this.editor.getObjectsWithAnnotations({ annotationTree, clientAnnotationErrors, locale, reportAllErrors: true });
|
|
224
226
|
const errors = [...(result.errors ?? []), ...clientAnnotationErrors];
|
|
225
|
-
logAnnotationErrors(errors, logger, this.rootDir, sourcemaps);
|
|
227
|
+
logAnnotationErrors(errors, this.logger, this.rootDir, sourcemaps);
|
|
226
228
|
return result;
|
|
227
229
|
}
|
|
228
230
|
|
package/src/server/routes.ts
CHANGED
|
@@ -19,7 +19,7 @@ const authMiddleware = (uuid: string) => {
|
|
|
19
19
|
throw 'Bad token provided';
|
|
20
20
|
}
|
|
21
21
|
} catch (err) {
|
|
22
|
-
logger.error('not authenticated', { error: err });
|
|
22
|
+
logger.error('not authenticated', { error: err, req: req.path });
|
|
23
23
|
res.status(400).send('Not authenticated');
|
|
24
24
|
}
|
|
25
25
|
};
|