diff --git a/buildutils/package.json b/buildutils/package.json index d92c30a98c2a..7813eba2fa25 100644 --- a/buildutils/package.json +++ b/buildutils/package.json @@ -51,7 +51,7 @@ "mini-css-extract-plugin": "~0.6.0", "package-json": "^6.3.0", "path": "~0.12.7", - "prettier": "^1.18.2", + "prettier": "^1.19.1", "semver": "^6.1.0", "sort-package-json": "~1.22.1", "typescript": "~3.7.2", diff --git a/package.json b/package.json index 111f16735ed7..f9b15b9e0c92 100644 --- a/package.json +++ b/package.json @@ -99,7 +99,7 @@ "husky": "^2.3.0", "lerna": "^3.13.2", "lint-staged": "^8.1.5", - "prettier": "^1.18.2", + "prettier": "^1.19.1", "tslint": "^5.15.0", "tslint-config-prettier": "^1.18.0", "tslint-plugin-prettier": "^2.0.1", diff --git a/packages/application/src/lab.ts b/packages/application/src/lab.ts index 551d68f58618..37f4a97848db 100644 --- a/packages/application/src/lab.ts +++ b/packages/application/src/lab.ts @@ -31,15 +31,12 @@ export class JupyterLab extends JupyterFrontEnd { .catch(() => undefined); // Create an IInfo dictionary from the options to override the defaults. - const info = Object.keys(JupyterLab.defaultInfo).reduce( - (acc, val) => { - if (val in options) { - (acc as any)[val] = JSON.parse(JSON.stringify((options as any)[val])); - } - return acc; - }, - {} as Partial - ); + const info = Object.keys(JupyterLab.defaultInfo).reduce((acc, val) => { + if (val in options) { + (acc as any)[val] = JSON.parse(JSON.stringify((options as any)[val])); + } + return acc; + }, {} as Partial); // Populate application info. this._info = { ...JupyterLab.defaultInfo, ...info }; diff --git a/packages/apputils/src/printing.ts b/packages/apputils/src/printing.ts index c3aede1c5582..26f61dc56f3b 100644 --- a/packages/apputils/src/printing.ts +++ b/packages/apputils/src/printing.ts @@ -70,11 +70,9 @@ export namespace Printing { * @param url URL to load into an iframe. */ export async function printURL(url: string): Promise { - const text = await (await ServerConnection.makeRequest( - url, - {}, - settings - )).text(); + const text = await ( + await ServerConnection.makeRequest(url, {}, settings) + ).text(); return printContent(text); } diff --git a/packages/completer/src/connector.ts b/packages/completer/src/connector.ts index dc9eba43d28b..9f51f409cb1f 100644 --- a/packages/completer/src/connector.ts +++ b/packages/completer/src/connector.ts @@ -90,13 +90,10 @@ namespace Private { const matches = kernel.matches.slice(); // Cache all the kernel matches in a memo. - const memo = matches.reduce( - (acc, val) => { - acc[val] = null; - return acc; - }, - {} as { [key: string]: string } - ); + const memo = matches.reduce((acc, val) => { + acc[val] = null; + return acc; + }, {} as { [key: string]: string }); // Add each context match that is not in the memo to the result. context.matches.forEach(match => { diff --git a/packages/completer/src/model.ts b/packages/completer/src/model.ts index 9fb70883d6b6..0fc9dab12062 100644 --- a/packages/completer/src/model.ts +++ b/packages/completer/src/model.ts @@ -419,13 +419,10 @@ namespace Private { /** * The map of known type annotations of completer matches. */ - const KNOWN_MAP = KNOWN_TYPES.reduce( - (acc, type) => { - acc[type] = null; - return acc; - }, - {} as Completer.TypeMap - ); + const KNOWN_MAP = KNOWN_TYPES.reduce((acc, type) => { + acc[type] = null; + return acc; + }, {} as Completer.TypeMap); /** * A filtered completion menu matching result. diff --git a/packages/console-extension/src/index.ts b/packages/console-extension/src/index.ts index 0e4be0d2b611..748d177cc566 100644 --- a/packages/console-extension/src/index.ts +++ b/packages/console-extension/src/index.ts @@ -237,10 +237,12 @@ async function activateConsole( ...(options as Partial) }); - const interactionMode: string = (await settingRegistry.get( - '@jupyterlab/console-extension:tracker', - 'interactionMode' - )).composite as string; + const interactionMode: string = ( + await settingRegistry.get( + '@jupyterlab/console-extension:tracker', + 'interactionMode' + ) + ).composite as string; panel.console.node.dataset.jpInteractionMode = interactionMode; // Add the console panel to the tracker. We want the panel to show up before @@ -580,9 +582,11 @@ async function activateConsole( execute: async args => { const key = 'keyMap'; try { - await settingRegistry.set(pluginId, 'interactionMode', args[ - 'interactionMode' - ] as string); + await settingRegistry.set( + pluginId, + 'interactionMode', + args['interactionMode'] as string + ); } catch (reason) { console.error(`Failed to set ${pluginId}:${key} - ${reason.message}`); } diff --git a/packages/coreutils/src/statedb.ts b/packages/coreutils/src/statedb.ts index 8627b806f3a0..1d6ff5c719e1 100644 --- a/packages/coreutils/src/statedb.ts +++ b/packages/coreutils/src/statedb.ts @@ -149,13 +149,10 @@ export class StateDB const { ids, values } = await this._list(); - return values.reduce( - (acc, val, idx) => { - acc[ids[idx]] = val; - return acc; - }, - {} as { [id: string]: T } - ); + return values.reduce((acc, val, idx) => { + acc[ids[idx]] = val; + return acc; + }, {} as { [id: string]: T }); } /** diff --git a/packages/coreutils/src/url.ts b/packages/coreutils/src/url.ts index 71353b6bb0f7..235e49e00206 100644 --- a/packages/coreutils/src/url.ts +++ b/packages/coreutils/src/url.ts @@ -125,18 +125,15 @@ export namespace URLExt { return value .replace(/^\?/, '') .split('&') - .reduce( - (acc, val) => { - const [key, value] = val.split('='); - - if (key.length > 0) { - acc[key] = decodeURIComponent(value || ''); - } - - return acc; - }, - {} as { [key: string]: string } - ); + .reduce((acc, val) => { + const [key, value] = val.split('='); + + if (key.length > 0) { + acc[key] = decodeURIComponent(value || ''); + } + + return acc; + }, {} as { [key: string]: string }); } /** diff --git a/packages/filebrowser-extension/src/index.ts b/packages/filebrowser-extension/src/index.ts index 117387198dc1..398d01d1f265 100644 --- a/packages/filebrowser-extension/src/index.ts +++ b/packages/filebrowser-extension/src/index.ts @@ -487,12 +487,14 @@ function addCommands( caption: args => (args.path ? `Open ${args.path}` : 'Open from path'), execute: async ({ path }: { path?: string }) => { if (!path) { - path = (await InputDialog.getText({ - label: 'Path', - placeholder: '/path/relative/to/jlab/root', - title: 'Open Path', - okLabel: 'Open' - })).value; + path = ( + await InputDialog.getText({ + label: 'Path', + placeholder: '/path/relative/to/jlab/root', + title: 'Open Path', + okLabel: 'Open' + }) + ).value; } if (!path) { return; diff --git a/packages/help-extension/src/index.tsx b/packages/help-extension/src/index.tsx index 9c3f1d0dcd8d..3c5c6a630fc8 100644 --- a/packages/help-extension/src/index.tsx +++ b/packages/help-extension/src/index.tsx @@ -156,15 +156,16 @@ function activate( // Populate the Help menu. const helpMenu = mainMenu.helpMenu; - const labGroup = [CommandIDs.about, CommandIDs.launchClassic].map( - command => ({ command }) - ); + const labGroup = [ + CommandIDs.about, + CommandIDs.launchClassic + ].map(command => ({ command })); helpMenu.addGroup(labGroup, 0); // Contextual help in its own group - const contextualHelpGroup = [inspector ? 'inspector:open' : null].map( - command => ({ command }) - ); + const contextualHelpGroup = [ + inspector ? 'inspector:open' : null + ].map(command => ({ command })); helpMenu.addGroup(contextualHelpGroup, 0); const resourcesGroup = RESOURCES.map(args => ({ diff --git a/packages/logconsole-extension/src/index.tsx b/packages/logconsole-extension/src/index.tsx index 2179e9a3042e..73d35cd566c9 100644 --- a/packages/logconsole-extension/src/index.tsx +++ b/packages/logconsole-extension/src/index.tsx @@ -381,9 +381,13 @@ export class LogLevelSwitcher extends ReactWidget { options={ logger === null ? [] - : ['Critical', 'Error', 'Warning', 'Info', 'Debug'].map( - label => ({ label, value: label.toLowerCase() }) - ) + : [ + 'Critical', + 'Error', + 'Warning', + 'Info', + 'Debug' + ].map(label => ({ label, value: label.toLowerCase() })) } /> diff --git a/packages/mathjax2/src/index.ts b/packages/mathjax2/src/index.ts index f900c5218fbe..58d2149e83ce 100644 --- a/packages/mathjax2/src/index.ts +++ b/packages/mathjax2/src/index.ts @@ -71,8 +71,14 @@ export class MathJaxTypesetter implements IRenderMime.ILatexTypesetter { private _onLoad(): void { MathJax.Hub.Config({ tex2jax: { - inlineMath: [['$', '$'], ['\\(', '\\)']], - displayMath: [['$$', '$$'], ['\\[', '\\]']], + inlineMath: [ + ['$', '$'], + ['\\(', '\\)'] + ], + displayMath: [ + ['$$', '$$'], + ['\\[', '\\]'] + ], processEscapes: true, processEnvironments: true }, diff --git a/packages/notebook-extension/src/index.ts b/packages/notebook-extension/src/index.ts index 6dc045b62971..ae2e7b0b51b5 100644 --- a/packages/notebook-extension/src/index.ts +++ b/packages/notebook-extension/src/index.ts @@ -1702,9 +1702,11 @@ function addCommands( return; } - return Private.createConsole(commands, current, args[ - 'activate' - ] as boolean); + return Private.createConsole( + commands, + current, + args['activate'] as boolean + ); }, isEnabled }); diff --git a/packages/notebook/src/default-toolbar.tsx b/packages/notebook/src/default-toolbar.tsx index 8e1b4e634a51..7435d40ded6c 100644 --- a/packages/notebook/src/default-toolbar.tsx +++ b/packages/notebook/src/default-toolbar.tsx @@ -252,8 +252,10 @@ export class CellTypeSwitcher extends ReactWidget { */ handleChange = (event: React.ChangeEvent): void => { if (event.target.value !== '-') { - NotebookActions.changeCellType(this._notebook, event.target - .value as nbformat.CellType); + NotebookActions.changeCellType( + this._notebook, + event.target.value as nbformat.CellType + ); this._notebook.activate(); } }; diff --git a/packages/rendermime/src/factories.ts b/packages/rendermime/src/factories.ts index d7d638f9fc53..379817ee596a 100644 --- a/packages/rendermime/src/factories.ts +++ b/packages/rendermime/src/factories.ts @@ -83,9 +83,7 @@ export const javaScriptRendererFactory: IRenderMime.IRendererFactory = { /** * The standard factories provided by the rendermime package. */ -export const standardRendererFactories: ReadonlyArray< - IRenderMime.IRendererFactory -> = [ +export const standardRendererFactories: ReadonlyArray = [ htmlRendererFactory, markdownRendererFactory, latexRendererFactory, diff --git a/packages/services/src/kernel/future.ts b/packages/services/src/kernel/future.ts index d0fd5b87d8b5..ed52240cdc84 100644 --- a/packages/services/src/kernel/future.ts +++ b/packages/services/src/kernel/future.ts @@ -451,7 +451,8 @@ namespace Private { private _hooks: ( | ((msg: T) => boolean | PromiseLike) - | null)[] = []; + | null + )[] = []; private _compactScheduled: boolean; private _processing: Promise; } diff --git a/tests/test-console/src/history.spec.ts b/tests/test-console/src/history.spec.ts index 9f0572f0f55b..84825fbc38ef 100644 --- a/tests/test-console/src/history.spec.ts +++ b/tests/test-console/src/history.spec.ts @@ -30,7 +30,12 @@ const mockHistory: KernelMessage.IHistoryReplyMsg = { channel: 'shell', content: { status: 'ok', - history: [[0, 0, 'foo'], [0, 0, 'bar'], [0, 0, 'baz'], [0, 0, 'qux']] + history: [ + [0, 0, 'foo'], + [0, 0, 'bar'], + [0, 0, 'baz'], + [0, 0, 'qux'] + ] } }; diff --git a/tests/test-csvviewer/src/model.spec.ts b/tests/test-csvviewer/src/model.spec.ts index b9be33bc70f9..e434d460be9c 100644 --- a/tests/test-csvviewer/src/model.spec.ts +++ b/tests/test-csvviewer/src/model.spec.ts @@ -84,9 +84,9 @@ describe('csvviewer/model', () => { expect(d.rowCount('body')).to.equal(1); expect(d.columnCount('row-header')).to.equal(1); expect(d.columnCount('body')).to.equal(3); - expect([0, 1, 2].map(i => d.data('column-header', 0, i))).to.deep.equal( - ['a', 'b', 'c'] - ); + expect( + [0, 1, 2].map(i => d.data('column-header', 0, i)) + ).to.deep.equal(['a', 'b', 'c']); expect([0, 1, 2].map(i => d.data('body', 0, i))).to.deep.equal([ 'd', 'e', diff --git a/yarn.lock b/yarn.lock index 5448e8ff8f56..47ed104ccba0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9763,11 +9763,16 @@ prettier-linter-helpers@^1.0.0: dependencies: fast-diff "^1.1.2" -prettier@^1.17.0, prettier@^1.18.2: +prettier@^1.17.0: version "1.18.2" resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz#6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea" integrity sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw== +prettier@^1.19.1: + version "1.19.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb" + integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew== + pretty-error@^2.0.2: version "2.1.1" resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"