fix(prettier): Properly handle lint-stage files (#6970)
Now handles top level files and recursive files in folders. Set max line length to be 100
This commit is contained in:
@@ -67,11 +67,7 @@ class ParseServer {
|
||||
|
||||
const allControllers = controllers.getControllers(options);
|
||||
|
||||
const {
|
||||
loggerController,
|
||||
databaseController,
|
||||
hooksController,
|
||||
} = allControllers;
|
||||
const { loggerController, databaseController, hooksController } = allControllers;
|
||||
this.config = Config.put(Object.assign({}, options, allControllers));
|
||||
|
||||
logging.setLogger(loggerController);
|
||||
@@ -116,10 +112,7 @@ class ParseServer {
|
||||
handleShutdown() {
|
||||
const promises = [];
|
||||
const { adapter: databaseAdapter } = this.config.databaseController;
|
||||
if (
|
||||
databaseAdapter &&
|
||||
typeof databaseAdapter.handleShutdown === 'function'
|
||||
) {
|
||||
if (databaseAdapter && typeof databaseAdapter.handleShutdown === 'function') {
|
||||
promises.push(databaseAdapter.handleShutdown());
|
||||
}
|
||||
const { adapter: fileAdapter } = this.config.filesController;
|
||||
@@ -130,10 +123,7 @@ class ParseServer {
|
||||
if (cacheAdapter && typeof cacheAdapter.handleShutdown === 'function') {
|
||||
promises.push(cacheAdapter.handleShutdown());
|
||||
}
|
||||
return (promises.length > 0
|
||||
? Promise.all(promises)
|
||||
: Promise.resolve()
|
||||
).then(() => {
|
||||
return (promises.length > 0 ? Promise.all(promises) : Promise.resolve()).then(() => {
|
||||
if (this.config.serverCloseComplete) {
|
||||
this.config.serverCloseComplete();
|
||||
}
|
||||
@@ -164,11 +154,7 @@ class ParseServer {
|
||||
});
|
||||
});
|
||||
|
||||
api.use(
|
||||
'/',
|
||||
bodyParser.urlencoded({ extended: false }),
|
||||
new PublicAPIRouter().expressRouter()
|
||||
);
|
||||
api.use('/', bodyParser.urlencoded({ extended: false }), new PublicAPIRouter().expressRouter());
|
||||
|
||||
api.use(bodyParser.json({ type: '*/*', limit: maxUploadSize }));
|
||||
api.use(middlewares.allowMethodOverride);
|
||||
@@ -186,9 +172,7 @@ class ParseServer {
|
||||
process.on('uncaughtException', err => {
|
||||
if (err.code === 'EADDRINUSE') {
|
||||
// user-friendly message for this common error
|
||||
process.stderr.write(
|
||||
`Unable to listen on port ${err.port}. The port is already in use.`
|
||||
);
|
||||
process.stderr.write(`Unable to listen on port ${err.port}. The port is already in use.`);
|
||||
process.exit(0);
|
||||
} else {
|
||||
throw err;
|
||||
@@ -200,13 +184,8 @@ class ParseServer {
|
||||
ParseServer.verifyServerUrl();
|
||||
});
|
||||
}
|
||||
if (
|
||||
process.env.PARSE_SERVER_ENABLE_EXPERIMENTAL_DIRECT_ACCESS === '1' ||
|
||||
directAccess
|
||||
) {
|
||||
Parse.CoreManager.setRESTController(
|
||||
ParseServerRESTController(appId, appRouter)
|
||||
);
|
||||
if (process.env.PARSE_SERVER_ENABLE_EXPERIMENTAL_DIRECT_ACCESS === '1' || directAccess) {
|
||||
Parse.CoreManager.setRESTController(ParseServerRESTController(appId, appRouter));
|
||||
}
|
||||
return api;
|
||||
}
|
||||
@@ -267,9 +246,7 @@ class ParseServer {
|
||||
if (options.mountGraphQL === true || options.mountPlayground === true) {
|
||||
let graphQLCustomTypeDefs = undefined;
|
||||
if (typeof options.graphQLSchema === 'string') {
|
||||
graphQLCustomTypeDefs = parse(
|
||||
fs.readFileSync(options.graphQLSchema, 'utf8')
|
||||
);
|
||||
graphQLCustomTypeDefs = parse(fs.readFileSync(options.graphQLSchema, 'utf8'));
|
||||
} else if (
|
||||
typeof options.graphQLSchema === 'object' ||
|
||||
typeof options.graphQLSchema === 'function'
|
||||
@@ -350,11 +327,7 @@ class ParseServer {
|
||||
.catch(response => response)
|
||||
.then(response => {
|
||||
const json = response.data || null;
|
||||
if (
|
||||
response.status !== 200 ||
|
||||
!json ||
|
||||
(json && json.status !== 'ok')
|
||||
) {
|
||||
if (response.status !== 200 || !json || (json && json.status !== 'ok')) {
|
||||
/* eslint-disable no-console */
|
||||
console.warn(
|
||||
`\nWARNING, Unable to connect to '${Parse.serverURL}'.` +
|
||||
@@ -411,10 +384,7 @@ function injectDefaults(options: ParseServerOptions) {
|
||||
/* eslint-enable no-console */
|
||||
|
||||
const userSensitiveFields = Array.from(
|
||||
new Set([
|
||||
...(defaults.userSensitiveFields || []),
|
||||
...(options.userSensitiveFields || []),
|
||||
])
|
||||
new Set([...(defaults.userSensitiveFields || []), ...(options.userSensitiveFields || [])])
|
||||
);
|
||||
|
||||
// If the options.protectedFields is unset,
|
||||
@@ -422,17 +392,11 @@ function injectDefaults(options: ParseServerOptions) {
|
||||
// Here, protect against the case where protectedFields
|
||||
// is set, but doesn't have _User.
|
||||
if (!('_User' in options.protectedFields)) {
|
||||
options.protectedFields = Object.assign(
|
||||
{ _User: [] },
|
||||
options.protectedFields
|
||||
);
|
||||
options.protectedFields = Object.assign({ _User: [] }, options.protectedFields);
|
||||
}
|
||||
|
||||
options.protectedFields['_User']['*'] = Array.from(
|
||||
new Set([
|
||||
...(options.protectedFields['_User']['*'] || []),
|
||||
...userSensitiveFields,
|
||||
])
|
||||
new Set([...(options.protectedFields['_User']['*'] || []), ...userSensitiveFields])
|
||||
);
|
||||
}
|
||||
|
||||
@@ -453,9 +417,7 @@ function injectDefaults(options: ParseServerOptions) {
|
||||
});
|
||||
|
||||
options.masterKeyIps = Array.from(
|
||||
new Set(
|
||||
options.masterKeyIps.concat(defaults.masterKeyIps, options.masterKeyIps)
|
||||
)
|
||||
new Set(options.masterKeyIps.concat(defaults.masterKeyIps, options.masterKeyIps))
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user