diff --git a/components/EditorPanel.tsx b/components/EditorPanel.tsx index f798ad9..66201e5 100644 --- a/components/EditorPanel.tsx +++ b/components/EditorPanel.tsx @@ -19,6 +19,7 @@ import copy from "clipboard-copy"; import { getWorker, Wrapper } from "@utils/workerWrapper"; import Npm from "@assets/svgs/Npm"; import { supportedLanguages } from "@utils/prettier"; +import { useDropzone } from "react-dropzone"; export interface EditorPanelProps { editable?: boolean; @@ -132,7 +133,8 @@ export default function({ [showSettingsDialogue] ); - const onFilePicked = useCallback((files, close) => { + const onFilePicked = useCallback((files, close = () => {}) => { + if (!(files && files.length)) return; const file = files[0]; const reader = new FileReader(); reader.readAsText(file, "utf-8"); @@ -143,6 +145,16 @@ export default function({ }; }, []); + const { getRootProps } = useDropzone({ + onDrop: files => onFilePicked(files), + disabled: !editable, + accept: acceptFiles, + onDropRejected: () => + toaster.danger("This file type is not supported.", { + id + }) + }); + const copyValue = useCallback(() => { copy(value); toaster.success("Copied to clipboard.", { @@ -310,7 +322,15 @@ export default function({ )} - +
{topNotifications && topNotifications({ isSettingsOpen: showSettingsDialogue, @@ -327,7 +347,7 @@ export default function({ }} innerRef={editorRef} /> - +
{IN_BROWSER && showPreview && previewElement && ( diff --git a/package.json b/package.json index 17f4571..0d46806 100644 --- a/package.json +++ b/package.json @@ -74,6 +74,7 @@ "react": "^16.12.0", "react-dom": "^16.12.0", "react-ga": "^2.7.0", + "react-dropzone": "^10.2.1", "rust-keywords": "^1.1.0", "sha1": "^1.1.1", "snack-sdk": "^2.3.1", diff --git a/pages/_app.tsx b/pages/_app.tsx index 3bbe3c6..7a1bb70 100644 --- a/pages/_app.tsx +++ b/pages/_app.tsx @@ -1,5 +1,5 @@ import React from "react"; -import App, { Container } from "next/app"; +import App from "next/app"; import { Button, Pane } from "evergreen-ui"; import Navigator from "@components/Navigator"; import "@styles/main.css"; @@ -96,7 +96,7 @@ export default class extends App { : undefined; return ( - + <> {activeRoute && (activeRoute.title || activeRoute.searchTerm)} @@ -148,7 +148,7 @@ export default class extends App { - + ); } } diff --git a/patches/json_typegen_wasm+0.3.3.patch b/patches/json_typegen_wasm+0.3.3.patch deleted file mode 100644 index 8f3ef43..0000000 --- a/patches/json_typegen_wasm+0.3.3.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/node_modules/json_typegen_wasm/json_typegen_wasm.js b/node_modules/json_typegen_wasm/json_typegen_wasm.js -index 8baafc9..3c9dc39 100644 ---- a/node_modules/json_typegen_wasm/json_typegen_wasm.js -+++ b/node_modules/json_typegen_wasm/json_typegen_wasm.js -@@ -1,5 +1,11 @@ - import * as wasm from './json_typegen_wasm_bg'; - -+if (IN_BROWSER && !window.TextEncoder) { -+ const encoding = require("text-encoding-utf-8"); -+ window.TextEncoder = encoding.TextEncoder; -+ window.TextDecoder = encoding.TextDecoder; -+} -+ - let cachedTextEncoder = new TextEncoder('utf-8'); - - let cachegetUint8Memory = null; diff --git a/patches/json_typegen_wasm+0.4.0.patch b/patches/json_typegen_wasm+0.4.0.patch new file mode 100644 index 0000000..8f93c51 --- /dev/null +++ b/patches/json_typegen_wasm+0.4.0.patch @@ -0,0 +1,17 @@ +diff --git a/node_modules/json_typegen_wasm/index.js b/node_modules/json_typegen_wasm/index.js +index 2201033..e7f5ab6 100644 +--- a/node_modules/json_typegen_wasm/index.js ++++ b/node_modules/json_typegen_wasm/index.js +@@ -4,6 +4,12 @@ let WASM_VECTOR_LEN = 0; + + let cachedTextEncoder = new TextEncoder('utf-8'); + ++if (IN_BROWSER && !window.TextEncoder) { ++ const encoding = require("text-encoding-utf-8"); ++ window.TextEncoder = encoding.TextEncoder; ++ window.TextDecoder = encoding.TextDecoder; ++} ++ + const encodeString = (typeof cachedTextEncoder.encodeInto === 'function' + ? function (arg, view) { + return cachedTextEncoder.encodeInto(arg, view); diff --git a/public/static/monaco/css.worker.js b/public/static/monaco/css.worker.js index 897ba0c..0e48a85 100644 --- a/public/static/monaco/css.worker.js +++ b/public/static/monaco/css.worker.js @@ -9387,7 +9387,7 @@ function getWellformedEdit(textEdit) { /*!***************************************************************************************************************!*\ !*** ./node_modules/monaco-editor/esm/vs/language/css/_deps/vscode-css-languageservice/cssLanguageService.js ***! \***************************************************************************************************************/ -/*! exports provided: getCSSLanguageService, getSCSSLanguageService, getLESSLanguageService, TextDocument, Position, Range, Location, LocationLink, Color, ColorInformation, ColorPresentation, FoldingRangeKind, FoldingRange, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, Diagnostic, Command, TextEdit, TextDocumentEdit, CreateFile, RenameFile, DeleteFile, WorkspaceEdit, WorkspaceChange, TextDocumentIdentifier, VersionedTextDocumentIdentifier, TextDocumentItem, MarkupKind, MarkupContent, CompletionItemKind, InsertTextFormat, CompletionItemTag, CompletionItem, CompletionList, MarkedString, Hover, ParameterInformation, SignatureInformation, DocumentHighlightKind, DocumentHighlight, SymbolKind, SymbolTag, SymbolInformation, DocumentSymbol, CodeActionKind, CodeActionContext, CodeAction, CodeLens, FormattingOptions, DocumentLink, SelectionRange, EOL, ClientCapabilities, FileType */ +/*! exports provided: getCSSLanguageService, getSCSSLanguageService, getLESSLanguageService, TextDocument, ClientCapabilities, FileType, Position, Range, Location, LocationLink, Color, ColorInformation, ColorPresentation, FoldingRangeKind, FoldingRange, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, Diagnostic, Command, TextEdit, TextDocumentEdit, CreateFile, RenameFile, DeleteFile, WorkspaceEdit, WorkspaceChange, TextDocumentIdentifier, VersionedTextDocumentIdentifier, TextDocumentItem, MarkupKind, MarkupContent, CompletionItemKind, InsertTextFormat, CompletionItemTag, CompletionItem, CompletionList, MarkedString, Hover, ParameterInformation, SignatureInformation, DocumentHighlightKind, DocumentHighlight, SymbolKind, SymbolTag, SymbolInformation, DocumentSymbol, CodeActionKind, CodeActionContext, CodeAction, CodeLens, FormattingOptions, DocumentLink, SelectionRange, EOL */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -9412,6 +9412,10 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var _cssLanguageTypes_js__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ./cssLanguageTypes.js */ "./node_modules/monaco-editor/esm/vs/language/css/_deps/vscode-css-languageservice/cssLanguageTypes.js"); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "TextDocument", function() { return _cssLanguageTypes_js__WEBPACK_IMPORTED_MODULE_14__["TextDocument"]; }); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ClientCapabilities", function() { return _cssLanguageTypes_js__WEBPACK_IMPORTED_MODULE_14__["ClientCapabilities"]; }); + +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "FileType", function() { return _cssLanguageTypes_js__WEBPACK_IMPORTED_MODULE_14__["FileType"]; }); + /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Position", function() { return _cssLanguageTypes_js__WEBPACK_IMPORTED_MODULE_14__["Position"]; }); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Range", function() { return _cssLanguageTypes_js__WEBPACK_IMPORTED_MODULE_14__["Range"]; }); @@ -9510,10 +9514,6 @@ __webpack_require__.r(__webpack_exports__); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "EOL", function() { return _cssLanguageTypes_js__WEBPACK_IMPORTED_MODULE_14__["EOL"]; }); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ClientCapabilities", function() { return _cssLanguageTypes_js__WEBPACK_IMPORTED_MODULE_14__["ClientCapabilities"]; }); - -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "FileType", function() { return _cssLanguageTypes_js__WEBPACK_IMPORTED_MODULE_14__["FileType"]; }); - /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. @@ -9586,7 +9586,7 @@ function getLESSLanguageService(options) { /*!*************************************************************************************************************!*\ !*** ./node_modules/monaco-editor/esm/vs/language/css/_deps/vscode-css-languageservice/cssLanguageTypes.js ***! \*************************************************************************************************************/ -/*! exports provided: TextDocument, Position, Range, Location, LocationLink, Color, ColorInformation, ColorPresentation, FoldingRangeKind, FoldingRange, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, Diagnostic, Command, TextEdit, TextDocumentEdit, CreateFile, RenameFile, DeleteFile, WorkspaceEdit, WorkspaceChange, TextDocumentIdentifier, VersionedTextDocumentIdentifier, TextDocumentItem, MarkupKind, MarkupContent, CompletionItemKind, InsertTextFormat, CompletionItemTag, CompletionItem, CompletionList, MarkedString, Hover, ParameterInformation, SignatureInformation, DocumentHighlightKind, DocumentHighlight, SymbolKind, SymbolTag, SymbolInformation, DocumentSymbol, CodeActionKind, CodeActionContext, CodeAction, CodeLens, FormattingOptions, DocumentLink, SelectionRange, EOL, ClientCapabilities, FileType */ +/*! exports provided: TextDocument, ClientCapabilities, FileType, Position, Range, Location, LocationLink, Color, ColorInformation, ColorPresentation, FoldingRangeKind, FoldingRange, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, Diagnostic, Command, TextEdit, TextDocumentEdit, CreateFile, RenameFile, DeleteFile, WorkspaceEdit, WorkspaceChange, TextDocumentIdentifier, VersionedTextDocumentIdentifier, TextDocumentItem, MarkupKind, MarkupContent, CompletionItemKind, InsertTextFormat, CompletionItemTag, CompletionItem, CompletionList, MarkedString, Hover, ParameterInformation, SignatureInformation, DocumentHighlightKind, DocumentHighlight, SymbolKind, SymbolTag, SymbolInformation, DocumentSymbol, CodeActionKind, CodeActionContext, CodeAction, CodeLens, FormattingOptions, DocumentLink, SelectionRange, EOL */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -31191,7 +31191,7 @@ function getBrowserLabel(browsers) { /*!****************************************************************************************************************!*\ !*** ./node_modules/monaco-editor/esm/vs/language/css/_deps/vscode-css-languageservice/languageFacts/facts.js ***! \****************************************************************************************************************/ -/*! exports provided: browserNames, getEntryDescription, getBrowserLabel, colorFunctions, colors, colorKeywords, isColorConstructor, isColorValue, hexDigit, colorFromHex, colorFrom256RGB, colorFromHSL, hslFromColor, getColorValue, positionKeywords, repeatStyleKeywords, lineStyleKeywords, lineWidthKeywords, boxKeywords, geometryBoxKeywords, cssWideKeywords, imageFunctions, transitionTimingFunctions, basicShapeFunctions, units, html5Tags, svgElements, pageBoxDirectives, CSSDataProvider, CSSDataManager, cssDataManager */ +/*! exports provided: cssDataManager, browserNames, getEntryDescription, getBrowserLabel, colorFunctions, colors, colorKeywords, isColorConstructor, isColorValue, hexDigit, colorFromHex, colorFrom256RGB, colorFromHSL, hslFromColor, getColorValue, positionKeywords, repeatStyleKeywords, lineStyleKeywords, lineWidthKeywords, boxKeywords, geometryBoxKeywords, cssWideKeywords, imageFunctions, transitionTimingFunctions, basicShapeFunctions, units, html5Tags, svgElements, pageBoxDirectives, CSSDataProvider, CSSDataManager */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; diff --git a/public/static/monaco/json.worker.js b/public/static/monaco/json.worker.js index c913829..7c8a660 100644 --- a/public/static/monaco/json.worker.js +++ b/public/static/monaco/json.worker.js @@ -10679,7 +10679,7 @@ function applyEdits(text, edits) { /*!******************************************************************************************************************!*\ !*** ./node_modules/monaco-editor/esm/vs/language/json/_deps/vscode-json-languageservice/jsonLanguageService.js ***! \******************************************************************************************************************/ -/*! exports provided: getLanguageService, TextDocument, Position, Range, Location, LocationLink, Color, ColorInformation, ColorPresentation, FoldingRangeKind, FoldingRange, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, Diagnostic, Command, TextEdit, TextDocumentEdit, CreateFile, RenameFile, DeleteFile, WorkspaceEdit, WorkspaceChange, TextDocumentIdentifier, VersionedTextDocumentIdentifier, TextDocumentItem, MarkupKind, MarkupContent, CompletionItemKind, InsertTextFormat, CompletionItemTag, CompletionItem, CompletionList, MarkedString, Hover, ParameterInformation, SignatureInformation, DocumentHighlightKind, DocumentHighlight, SymbolKind, SymbolTag, SymbolInformation, DocumentSymbol, CodeActionKind, CodeActionContext, CodeAction, CodeLens, FormattingOptions, DocumentLink, SelectionRange, EOL, ErrorCode, ClientCapabilities */ +/*! exports provided: getLanguageService, TextDocument, ErrorCode, ClientCapabilities, Position, Range, Location, LocationLink, Color, ColorInformation, ColorPresentation, FoldingRangeKind, FoldingRange, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, Diagnostic, Command, TextEdit, TextDocumentEdit, CreateFile, RenameFile, DeleteFile, WorkspaceEdit, WorkspaceChange, TextDocumentIdentifier, VersionedTextDocumentIdentifier, TextDocumentItem, MarkupKind, MarkupContent, CompletionItemKind, InsertTextFormat, CompletionItemTag, CompletionItem, CompletionList, MarkedString, Hover, ParameterInformation, SignatureInformation, DocumentHighlightKind, DocumentHighlight, SymbolKind, SymbolTag, SymbolInformation, DocumentSymbol, CodeActionKind, CodeActionContext, CodeAction, CodeLens, FormattingOptions, DocumentLink, SelectionRange, EOL */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -10698,6 +10698,10 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var _jsonLanguageTypes_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./jsonLanguageTypes.js */ "./node_modules/monaco-editor/esm/vs/language/json/_deps/vscode-json-languageservice/jsonLanguageTypes.js"); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "TextDocument", function() { return _jsonLanguageTypes_js__WEBPACK_IMPORTED_MODULE_10__["TextDocument"]; }); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ErrorCode", function() { return _jsonLanguageTypes_js__WEBPACK_IMPORTED_MODULE_10__["ErrorCode"]; }); + +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ClientCapabilities", function() { return _jsonLanguageTypes_js__WEBPACK_IMPORTED_MODULE_10__["ClientCapabilities"]; }); + /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Position", function() { return _jsonLanguageTypes_js__WEBPACK_IMPORTED_MODULE_10__["Position"]; }); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Range", function() { return _jsonLanguageTypes_js__WEBPACK_IMPORTED_MODULE_10__["Range"]; }); @@ -10796,10 +10800,6 @@ __webpack_require__.r(__webpack_exports__); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "EOL", function() { return _jsonLanguageTypes_js__WEBPACK_IMPORTED_MODULE_10__["EOL"]; }); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ErrorCode", function() { return _jsonLanguageTypes_js__WEBPACK_IMPORTED_MODULE_10__["ErrorCode"]; }); - -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ClientCapabilities", function() { return _jsonLanguageTypes_js__WEBPACK_IMPORTED_MODULE_10__["ClientCapabilities"]; }); - /*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. @@ -10870,7 +10870,7 @@ function getLanguageService(params) { /*!****************************************************************************************************************!*\ !*** ./node_modules/monaco-editor/esm/vs/language/json/_deps/vscode-json-languageservice/jsonLanguageTypes.js ***! \****************************************************************************************************************/ -/*! exports provided: TextDocument, Position, Range, Location, LocationLink, Color, ColorInformation, ColorPresentation, FoldingRangeKind, FoldingRange, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, Diagnostic, Command, TextEdit, TextDocumentEdit, CreateFile, RenameFile, DeleteFile, WorkspaceEdit, WorkspaceChange, TextDocumentIdentifier, VersionedTextDocumentIdentifier, TextDocumentItem, MarkupKind, MarkupContent, CompletionItemKind, InsertTextFormat, CompletionItemTag, CompletionItem, CompletionList, MarkedString, Hover, ParameterInformation, SignatureInformation, DocumentHighlightKind, DocumentHighlight, SymbolKind, SymbolTag, SymbolInformation, DocumentSymbol, CodeActionKind, CodeActionContext, CodeAction, CodeLens, FormattingOptions, DocumentLink, SelectionRange, EOL, ErrorCode, ClientCapabilities */ +/*! exports provided: TextDocument, ErrorCode, ClientCapabilities, Position, Range, Location, LocationLink, Color, ColorInformation, ColorPresentation, FoldingRangeKind, FoldingRange, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, Diagnostic, Command, TextEdit, TextDocumentEdit, CreateFile, RenameFile, DeleteFile, WorkspaceEdit, WorkspaceChange, TextDocumentIdentifier, VersionedTextDocumentIdentifier, TextDocumentItem, MarkupKind, MarkupContent, CompletionItemKind, InsertTextFormat, CompletionItemTag, CompletionItem, CompletionList, MarkedString, Hover, ParameterInformation, SignatureInformation, DocumentHighlightKind, DocumentHighlight, SymbolKind, SymbolTag, SymbolInformation, DocumentSymbol, CodeActionKind, CodeActionContext, CodeAction, CodeLens, FormattingOptions, DocumentLink, SelectionRange, EOL */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; diff --git a/typings/npm/evergreen-ui.d.ts b/typings/npm/evergreen-ui.d.ts index 3f023c6..92b1028 100644 --- a/typings/npm/evergreen-ui.d.ts +++ b/typings/npm/evergreen-ui.d.ts @@ -56,6 +56,14 @@ declare module "evergreen-ui" { description?: string; } ) => void; + danger: ( + text: string, + options?: { + id?: string | number; + duration?: number; + description?: string; + } + ) => void; closeAll: () => void; }; diff --git a/yarn.lock b/yarn.lock index 7256d85..8cc7c6c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1891,6 +1891,10 @@ atob@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" +attr-accept@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/attr-accept/-/attr-accept-2.0.0.tgz#8422fef5ee4a511c207796c888227ab5de03306f" + auto-bind@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/auto-bind/-/auto-bind-2.0.0.tgz#9a55a461b521f58daf955169203bed1a07a970a9" @@ -4008,6 +4012,12 @@ file-loader@4.2.0: loader-utils "^1.2.3" schema-utils "^2.0.0" +file-selector@^0.1.12: + version "0.1.12" + resolved "https://registry.yarnpkg.com/file-selector/-/file-selector-0.1.12.tgz#fe726547be219a787a9dcc640575a04a032b1fd0" + dependencies: + tslib "^1.9.0" + file-type@5.2.0, file-type@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/file-type/-/file-type-5.2.0.tgz#2ddbea7c73ffe36368dfae49dc338c058c2b8ad6" @@ -7902,6 +7912,14 @@ react-dom@~15.4.1: loose-envify "^1.1.0" object-assign "^4.1.0" +react-dropzone@^10.2.1: + version "10.2.1" + resolved "https://registry.yarnpkg.com/react-dropzone/-/react-dropzone-10.2.1.tgz#b7520124c4a3b66f96d49f7879027c7a475eaa20" + dependencies: + attr-accept "^2.0.0" + file-selector "^0.1.12" + prop-types "^15.7.2" + react-error-overlay@5.1.6: version "5.1.6" resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-5.1.6.tgz#0cd73407c5d141f9638ae1e0c63e7b2bf7e9929d"