Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating Prettier & committing fixes #1167

Merged
merged 1 commit into from
Sep 23, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 15 additions & 36 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@
"mocha-webpack": "2.0.0-beta.0",
"node-sass": "^4.11.0",
"null-loader": "^0.1.1",
"prettier": "^1.16.4",
"prettier": "^1.18.2",
"react-hot-loader": "^4.8.3",
"remark": "^10.0.1",
"resolve-url-loader": "^3.1.0",
Expand Down
4 changes: 1 addition & 3 deletions src/main/CertificateManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,7 @@ export class CertificateManager {
enableDetailedButton: boolean = true,
): Promise<boolean> {
const parsedUrl = new URL(url);
const coreMessage = `The server (${
parsedUrl.host
}) is using a certificate that cannot be automatically trusted.`;
const coreMessage = `The server (${parsedUrl.host}) is using a certificate that cannot be automatically trusted.`;
const description = this.describeCertificate(certificate);
const buttons = ['Yes - I trust it!', 'No!'];
if (enableDetailedButton) {
Expand Down
4 changes: 1 addition & 3 deletions src/main/CloudManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,7 @@ export class CloudManager {
const response = await timeout<raas.user.IAuthResponse>(
CloudManager.AUTHENTICATION_TIMEOUT,
new Error(
`Request timed out (waited ${
CloudManager.AUTHENTICATION_TIMEOUT
} ms)`,
`Request timed out (waited ${CloudManager.AUTHENTICATION_TIMEOUT} ms)`,
),
performAuthentication(),
);
Expand Down
6 changes: 1 addition & 5 deletions src/services/data-importer/csv/CSVDataImporter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,7 @@ export class CSVDataImporter extends DataImporter {
// abort transaction and delete the Realm
realm.cancelTransaction();
throw new Error(
`Parsing error at line ${lineIndex}, expected type "${
schema.properties[prop]
}" but got "${
row[prop]
}" for column "${prop}"\nError details: ${e}`,
`Parsing error at line ${lineIndex}, expected type "${schema.properties[prop]}" but got "${row[prop]}" for column "${prop}"\nError details: ${e}`,
);
}
}
Expand Down
4 changes: 1 addition & 3 deletions src/services/schema-export/languages/csharp.ts
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,7 @@ export default class CSharpSchemaExporter extends SchemaExporter {
}

this.appendLine(
`${this.PropertyPadding}public ${prop.type} ${prop.name} { get;${
prop.setter
} }`,
`${this.PropertyPadding}public ${prop.type} ${prop.name} { get;${prop.setter} }`,
);
}

Expand Down
4 changes: 1 addition & 3 deletions src/ui/Greeting/MarketingPanel/MessageSlide.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,7 @@ const renderNode: { [key: string]: NodeRenderer } = {
} else if (entry.sys.contentType) {
// tslint:disable-next-line:no-console
console.warn(
`Rendering unsupported embedded entry of type ${
entry.sys.contentType.sys.id
}`,
`Rendering unsupported embedded entry of type ${entry.sys.contentType.sys.id}`,
);
return '';
} else {
Expand Down
4 changes: 3 additions & 1 deletion src/windows/CloudAuthenticationWindow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ export const CloudAuthenticationWindow: IWindow = {
};
},
getComponent: () =>
import(/* webpackChunkName: "cloud-authentication" */ '../ui/CloudAuthentication').then(
import(
/* webpackChunkName: "cloud-authentication" */ '../ui/CloudAuthentication'
).then(
// TODO: Fix the props for this to include a type
m => m.CloudAuthentication as any,
),
Expand Down
4 changes: 3 additions & 1 deletion src/windows/ConnectToServerWindow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ export const ConnectToServerWindow: IWindow = {
autoHideMenuBar: true,
}),
getComponent: () =>
import(/* webpackChunkName: "connect-to-server" */ '../ui/ConnectToServer').then(
import(
/* webpackChunkName: "connect-to-server" */ '../ui/ConnectToServer'
).then(
// TODO: Fix the props for this to include a type
m => m.ConnectToServer as any,
),
Expand Down
4 changes: 3 additions & 1 deletion src/windows/GraphiqlEditorWindow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ export const GraphiqlEditorWindow: IWindow = {
};
},
getComponent: () =>
import(/* webpackChunkName: "graphiql-editor" */ '../ui/GraphiqlEditor').then(
import(
/* webpackChunkName: "graphiql-editor" */ '../ui/GraphiqlEditor'
).then(
// TODO: Fix the props for this to include a type
m => m.GraphiqlEditor as any,
),
Expand Down
4 changes: 3 additions & 1 deletion src/windows/ServerAdministrationWindow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ export const ServerAdministrationWindow: IWindow = {
};
},
getComponent: () =>
import(/* webpackChunkName: "server-administration" */ '../ui/ServerAdministration').then(
import(
/* webpackChunkName: "server-administration" */ '../ui/ServerAdministration'
).then(
// TODO: Fix the props for this to include a type
m => m.ServerAdministration as any,
),
Expand Down