From 7afee796144552c74625b992856765e036cb0da1 Mon Sep 17 00:00:00 2001 From: Sidharth Vinod Date: Fri, 15 Jan 2021 10:23:37 +0530 Subject: [PATCH 1/4] Update Monaco Editor --- bin/beta-release | 3 +- docs/styles.css | 5 ++ package.json | 6 +- src/components/Config.svelte | 62 ++++++------- src/components/Editor.svelte | 11 +-- src/editor.js | 168 ----------------------------------- webpack.config.js | 21 ++++- yarn.lock | 82 ++++++++++++++++- 8 files changed, 138 insertions(+), 220 deletions(-) delete mode 100644 src/editor.js diff --git a/bin/beta-release b/bin/beta-release index 257d945bd7..c04f79a008 100755 --- a/bin/beta-release +++ b/bin/beta-release @@ -9,6 +9,7 @@ yarn release pushd . cp -r docs/* ../docs/mermaid-live-editor-beta cd ../docs -git commit * -m "Beta updated with latest changes" +git add . +git commit -m "Beta updated with latest changes" git push popd diff --git a/docs/styles.css b/docs/styles.css index 73029f592e..b098487335 100644 --- a/docs/styles.css +++ b/docs/styles.css @@ -41,3 +41,8 @@ i { .mermaidTooltip { position: absolute; } + +@font-face{ + font-family: "codicon"; + src: url("../fonts/codicon.ttf") format("truetype"); +} diff --git a/package.json b/package.json index 4f263e7290..3f88805bbc 100644 --- a/package.json +++ b/package.json @@ -5,9 +5,11 @@ "devDependencies": { "cross-env": "^5.2.0", "css-loader": "^2.1.1", + "file-loader": "^6.2.0", "husky": "^4.3.0", "lint-staged": "^10.5.2", "mini-css-extract-plugin": "^0.6.0", + "monaco-editor-webpack-plugin": "^2.1.0", "prettier": "^2.2.1", "prettier-plugin-svelte": "^1.4.1", "serve": "^11.0.0", @@ -26,12 +28,12 @@ "pretty": "prettier --write ./src/*" }, "dependencies": { - "mermaid": "8.8.4", "js-base64": "^2.5.1", "json-lint": "^0.1.0", "jsonlint": "^1.6.3", + "mermaid": "8.8.4", "moment": "^2.24.0", - "monaco-editor": "0.18.1", + "monaco-editor": "0.21.2", "svelte-routing": "^1.4.0", "svelte-spa-router": "^1.3.0" }, diff --git a/src/components/Config.svelte b/src/components/Config.svelte index 26533f93f5..2b23387a1b 100644 --- a/src/components/Config.svelte +++ b/src/components/Config.svelte @@ -49,35 +49,6 @@ } }; - const unsubscribe = codeStore.subscribe((state) => { - if (editorElem === null) { - console.log('Starting stuff', document.getElementById('editor-conf')); - editorElem = document.getElementById('editor-conf'); - } - if (!conf && state) { - conf = JSON.stringify(state.mermaid, null, 2); - } - if (state) { - code = state.code; - } - if (!edit && conf && editorElem !== null) { - edit = monaco.editor.create(editorElem, { - value: [conf].join('\n'), - theme: 'myCoolTheme', - language: 'JSON', - }); - resizeHandler = getResizeHandler(edit); - let decorations = []; - edit.onDidChangeModelContent(function (e) { - const conf = edit.getValue(); - handleConfUpdate(conf); - }); - handleConfUpdate(conf); - } - }); - - initEditor(monaco); - const unsubscribeError = configErrorStore.subscribe((_error) => { // console.log('Error ideintified' + _error.toString()); if (_error) { @@ -89,11 +60,34 @@ onMount(async () => { console.log('Mounting config'); - self.MonacoEnvironment = { - getWorkerUrl: function (moduleId, label) { - return './editor.worker.bundle.js'; - }, - }; + + const unsubscribe = codeStore.subscribe((state) => { + if (editorElem === null) { + console.log('Starting stuff', document.getElementById('editor-conf')); + editorElem = document.getElementById('editor-conf'); + } + if (!conf && state) { + conf = JSON.stringify(state.mermaid, null, 2); + } + if (state) { + code = state.code; + } + if (!edit && conf && editorElem !== null) { + edit = monaco.editor.create(editorElem, { + value: [conf].join('\n'), + theme: 'myCoolTheme', + language: 'json', + }); + resizeHandler = getResizeHandler(edit); + edit.onDidChangeModelContent(function (e) { + const conf = edit.getValue(); + handleConfUpdate(conf); + }); + handleConfUpdate(conf); + } + }); + + initEditor(monaco); }); diff --git a/src/components/Editor.svelte b/src/components/Editor.svelte index 2e58acfd1e..fd850a8d16 100644 --- a/src/components/Editor.svelte +++ b/src/components/Editor.svelte @@ -8,9 +8,7 @@ import mermaid from '@mermaid'; import Error from './Error.svelte'; import { getResizeHandler, initEditor } from './editor-utils'; - import 'monaco-editor/esm/vs/editor/browser/controller/coreCommands.js'; - import 'monaco-editor/esm/vs/editor/contrib/find/findController.js'; - import * as monaco from 'monaco-editor/esm/vs/editor/editor.api.js'; + import * as monaco from 'monaco-editor'; import { watchResize } from 'svelte-watch-resize'; export let code = ''; @@ -63,13 +61,6 @@ }; onMount(async () => { - // editorElem = document.querySelector('#editor') - self.MonacoEnvironment = { - getWorkerUrl: function (moduleId, label) { - return './editor.worker.bundle.js'; - }, - }; - const unsubscribe = codeStore.subscribe((state) => { console.log('Code change'); if (editorElem === null) { diff --git a/src/editor.js b/src/editor.js deleted file mode 100644 index 7623eea21f..0000000000 --- a/src/editor.js +++ /dev/null @@ -1,168 +0,0 @@ -// (1) Desired editor features: -import 'monaco-editor/esm/vs/editor/browser/controller/coreCommands.js'; -// import 'monaco-editor/esm/vs/editor/browser/widget/codeEditorWidget.js'; -// import 'monaco-editor/esm/vs/editor/browser/widget/diffEditorWidget.js'; -// import 'monaco-editor/esm/vs/editor/browser/widget/diffNavigator.js'; -// import 'monaco-editor/esm/vs/editor/contrib/bracketMatching/bracketMatching.js'; -// import 'monaco-editor/esm/vs/editor/contrib/caretOperations/caretOperations.js'; -// import 'monaco-editor/esm/vs/editor/contrib/caretOperations/transpose.js'; -// import 'monaco-editor/esm/vs/editor/contrib/clipboard/clipboard.js'; -// import 'monaco-editor/esm/vs/editor/contrib/codelens/codelensController.js'; -// import 'monaco-editor/esm/vs/editor/contrib/colorPicker/colorDetector.js'; -// import 'monaco-editor/esm/vs/editor/contrib/comment/comment.js'; -// import 'monaco-editor/esm/vs/editor/contrib/contextmenu/contextmenu.js'; -// import 'monaco-editor/esm/vs/editor/contrib/cursorUndo/cursorUndo.js'; -// import 'monaco-editor/esm/vs/editor/contrib/dnd/dnd.js'; -import 'monaco-editor/esm/vs/editor/contrib/find/findController.js'; -// import 'monaco-editor/esm/vs/editor/contrib/folding/folding.js'; -// import 'monaco-editor/esm/vs/editor/contrib/format/formatActions.js'; -// import 'monaco-editor/esm/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.js'; -// import 'monaco-editor/esm/vs/editor/contrib/goToDeclaration/goToDeclarationMouse.js'; -// import 'monaco-editor/esm/vs/editor/contrib/gotoError/gotoError.js'; -// import 'monaco-editor/esm/vs/editor/contrib/hover/hover.js'; -// import 'monaco-editor/esm/vs/editor/contrib/inPlaceReplace/inPlaceReplace.js'; -// import 'monaco-editor/esm/vs/editor/contrib/linesOperations/linesOperations.js'; -// import 'monaco-editor/esm/vs/editor/contrib/links/links.js'; -// import 'monaco-editor/esm/vs/editor/contrib/multicursor/multicursor.js'; -// import 'monaco-editor/esm/vs/editor/contrib/parameterHints/parameterHints.js'; -// import 'monaco-editor/esm/vs/editor/contrib/quickFix/quickFixCommands.js'; -// import 'monaco-editor/esm/vs/editor/contrib/referenceSearch/referenceSearch.js'; -// import 'monaco-editor/esm/vs/editor/contrib/rename/rename.js'; -// import 'monaco-editor/esm/vs/editor/contrib/smartSelect/smartSelect.js'; -// import 'monaco-editor/esm/vs/editor/contrib/snippet/snippetController2.js'; -// import 'monaco-editor/esm/vs/editor/contrib/suggest/suggestController.js'; -// import 'monaco-editor/esm/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.js'; -// import 'monaco-editor/esm/vs/editor/contrib/wordHighlighter/wordHighlighter.js'; -// import 'monaco-editor/esm/vs/editor/contrib/wordOperations/wordOperations.js'; -// import 'monaco-editor/esm/vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp.js'; -// import 'monaco-editor/esm/vs/editor/standalone/browser/inspectTokens/inspectTokens.js'; -// import 'monaco-editor/esm/vs/editor/standalone/browser/iPadShowKeyboard/iPadShowKeyboard.js'; -// import 'monaco-editor/esm/vs/editor/standalone/browser/quickOpen/quickOutline.js'; -// import 'monaco-editor/esm/vs/editor/standalone/browser/quickOpen/gotoLine.js'; -// import 'monaco-editor/esm/vs/editor/standalone/browser/quickOpen/quickCommand.js'; -// import 'monaco-editor/esm/vs/editor/standalone/browser/toggleHighContrast/toggleHighContrast.js'; -import * as monaco from 'monaco-editor/esm/vs/editor/editor.api.js'; - -// (2) Desired languages: -// import 'monaco-editor/esm/vs/language/typescript/monaco.contribution'; -// import 'monaco-editor/esm/vs/language/css/monaco.contribution'; -// import 'monaco-editor/esm/vs/language/json/monaco.contribution'; -// import 'monaco-editor/esm/vs/language/html/monaco.contribution'; -// import 'monaco-editor/esm/vs/basic-languages/bat/bat.contribution.js'; -// import 'monaco-editor/esm/vs/basic-languages/coffee/coffee.contribution.js'; -// import 'monaco-editor/esm/vs/basic-languages/cpp/cpp.contribution.js'; -// import 'monaco-editor/esm/vs/basic-languages/csharp/csharp.contribution.js'; -// import 'monaco-editor/esm/vs/basic-languages/csp/csp.contribution.js'; -// import 'monaco-editor/esm/vs/basic-languages/css/css.contribution.js'; -// import 'monaco-editor/esm/vs/basic-languages/dockerfile/dockerfile.contribution.js'; -// import 'monaco-editor/esm/vs/basic-languages/fsharp/fsharp.contribution.js'; -// import 'monaco-editor/esm/vs/basic-languages/go/go.contribution.js'; -// import 'monaco-editor/esm/vs/basic-languages/handlebars/handlebars.contribution.js'; -// import 'monaco-editor/esm/vs/basic-languages/html/html.contribution.js'; -// import 'monaco-editor/esm/vs/basic-languages/ini/ini.contribution.js'; -// import 'monaco-editor/esm/vs/basic-languages/java/java.contribution.js'; -// import 'monaco-editor/esm/vs/basic-languages/less/less.contribution.js'; -// import 'monaco-editor/esm/vs/basic-languages/lua/lua.contribution.js'; -// import 'monaco-editor/esm/vs/basic-languages/markdown/markdown.contribution.js'; -// import 'monaco-editor/esm/vs/basic-languages/msdax/msdax.contribution.js'; -// import 'monaco-editor/esm/vs/basic-languages/mysql/mysql.contribution.js'; -// import 'monaco-editor/esm/vs/basic-languages/objective-c/objective-c.contribution.js'; -// import 'monaco-editor/esm/vs/basic-languages/pgsql/pgsql.contribution.js'; -// import 'monaco-editor/esm/vs/basic-languages/php/php.contribution.js'; -// import 'monaco-editor/esm/vs/basic-languages/postiats/postiats.contribution.js'; -// import 'monaco-editor/esm/vs/basic-languages/powershell/powershell.contribution.js'; -// import 'monaco-editor/esm/vs/basic-languages/pug/pug.contribution.js'; -import 'monaco-editor/esm/vs/basic-languages/python/python.contribution.js'; -// import 'monaco-editor/esm/vs/basic-languages/r/r.contribution.js'; -// import 'monaco-editor/esm/vs/basic-languages/razor/razor.contribution.js'; -// import 'monaco-editor/esm/vs/basic-languages/redis/redis.contribution.js'; -// import 'monaco-editor/esm/vs/basic-languages/redshift/redshift.contribution.js'; -// import 'monaco-editor/esm/vs/basic-languages/ruby/ruby.contribution.js'; -// import 'monaco-editor/esm/vs/basic-languages/sb/sb.contribution.js'; -// import 'monaco-editor/esm/vs/basic-languages/scss/scss.contribution.js'; -// import 'monaco-editor/esm/vs/basic-languages/solidity/solidity.contribution.js'; -// import 'monaco-editor/esm/vs/basic-languages/sql/sql.contribution.js'; -// import 'monaco-editor/esm/vs/basic-languages/swift/swift.contribution.js'; -// import 'monaco-editor/esm/vs/basic-languages/vb/vb.contribution.js'; -// import 'monaco-editor/esm/vs/basic-languages/xml/xml.contribution.js'; -// import 'monaco-editor/esm/vs/basic-languages/yaml/yaml.contribution.js'; -// import 'monaco-editor/esm/vs/basic-languages/javascript/javascript.contribution'; -// import 'monaco-editor/esm/vs/basic-languages/typescript/typescript.contribution'; - -monaco.languages.register({ id: 'mermaid' }); - -// Register a tokens provider for the language -monaco.languages.setMonarchTokensProvider('mermaid', { - tokenizer: { - root: [ - [/\[graph.*/, 'custom-error'], - [/\[notice.*/, 'custom-notice'], - [/\[info.*/, 'custom-info'], - [/\[[a-zA-Z 0-9:]+\]/, 'custom-date'], - ], - }, -}); - -self.MonacoEnvironment = { - getWorkerUrl: function (moduleId, label) { - return './editor.worker.bundle.js'; - }, -}; - -// Define a new theme that contains only rules that match this language -monaco.editor.defineTheme('myCoolTheme', { - base: 'vs', - inherit: false, - rules: [ - { token: 'custom-info', foreground: '808080' }, - { token: 'custom-error', foreground: 'ff0000', fontStyle: 'bold' }, - { token: 'custom-notice', foreground: 'FFA500' }, - { token: 'custom-date', foreground: '008800' }, - ], -}); - -// Register a completion item provider for the new language -monaco.languages.registerCompletionItemProvider('mySpecialLanguage', { - provideCompletionItems: () => { - var suggestions = [ - { - label: 'simpleText', - kind: monaco.languages.CompletionItemKind.Text, - insertText: 'simpleText', - }, - { - label: 'testing', - kind: monaco.languages.CompletionItemKind.Keyword, - insertText: 'testing(${1:condition})', - insertTextRules: - monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet, - }, - { - label: 'ifelse', - kind: monaco.languages.CompletionItemKind.Snippet, - insertText: [ - 'if (${1:condition}) {', - '\t$0', - '} else {', - '\t', - '}', - ].join('\n'), - insertTextRules: - monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet, - documentation: 'If-Else Statement', - }, - ]; - return { suggestions: suggestions }; - }, -}); - -const edit = monaco.editor.create(document.getElementById('editor'), { - value: [code].join('\n'), - theme: 'myCoolTheme', - // value: getCode(), - //language: 'mySpecialLanguage' - language: 'mermaid', -}); -edit.onDidChangeModelContent(function (e) { - codeStore.set(edit.getValue()); -}); diff --git a/webpack.config.js b/webpack.config.js index c3e4029c7d..0d1e76a982 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,4 +1,5 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin'); +const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin'); const path = require('path'); const mode = process.env.NODE_ENV || 'development'; @@ -14,7 +15,7 @@ module.exports = { "@mermaid": 'mermaid' // "@mermaid": '@mermaid-js/mermaid' }, - extensions: ['.mjs', '.js', '.svelte'], + extensions: ['.mjs', '.js', '.svelte', '.ttf'], mainFields: ['svelte', 'browser', 'module', 'main'] }, output: { @@ -44,13 +45,29 @@ module.exports = { prod ? MiniCssExtractPlugin.loader : 'style-loader', 'css-loader' ] - } + }, + { + test: /\.ttf$/, + use: [ + { + loader: 'file-loader', + options: { + name: '[name].[ext]', + outputPath: 'fonts/' + }, + }, + ], + } ] }, mode, plugins: [ new MiniCssExtractPlugin({ filename: '[name].css' + }), + new MonacoWebpackPlugin({ + languages: ['json'], + features: ['!referenceSearch'] }) ], devtool: prod ? false: 'source-map' diff --git a/yarn.lock b/yarn.lock index d2e9cec0bc..8553c911db 100644 --- a/yarn.lock +++ b/yarn.lock @@ -39,6 +39,11 @@ "@types/minimatch" "*" "@types/node" "*" +"@types/json-schema@^7.0.6": + version "7.0.6" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0" + integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw== + "@types/minimatch@*": version "3.0.3" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" @@ -228,6 +233,11 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1: version "3.4.1" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da" +ajv-keywords@^3.5.2: + version "3.5.2" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" + integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== + ajv@6.5.3: version "6.5.3" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.3.tgz#71a569d189ecf4f4f321224fecb166f071dd90f9" @@ -246,6 +256,16 @@ ajv@^6.1.0, ajv@^6.10.2: json-schema-traverse "^0.4.1" uri-js "^4.2.2" +ajv@^6.12.5: + version "6.12.6" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" + integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + ansi-align@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz#c36aeccba563b89ceb556f3690f0b1d9e3547f7f" @@ -1513,6 +1533,11 @@ emojis-list@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389" +emojis-list@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" + integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q== + encodeurl@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" @@ -1751,6 +1776,11 @@ fast-deep-equal@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49" +fast-deep-equal@^3.1.1: + version "3.1.3" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== + fast-json-stable-stringify@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" @@ -1784,6 +1814,14 @@ figures@^3.2.0: dependencies: escape-string-regexp "^1.0.5" +file-loader@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d" + integrity sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw== + dependencies: + loader-utils "^2.0.0" + schema-utils "^3.0.0" + fill-range@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" @@ -2582,6 +2620,13 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" +json5@^2.1.2: + version "2.1.3" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43" + integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA== + dependencies: + minimist "^1.2.5" + jsonlint@^1.6.3: version "1.6.3" resolved "https://registry.yarnpkg.com/jsonlint/-/jsonlint-1.6.3.tgz#cb5e31efc0b78291d0d862fbef05900adf212988" @@ -2676,6 +2721,15 @@ loader-utils@1.2.3, loader-utils@^1.1.0, loader-utils@^1.2.3: emojis-list "^2.0.0" json5 "^1.0.1" +loader-utils@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0" + integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ== + dependencies: + big.js "^5.2.2" + emojis-list "^3.0.0" + json5 "^2.1.2" + locate-path@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" @@ -2935,6 +2989,11 @@ minimist@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" +minimist@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: version "2.9.0" resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" @@ -2984,9 +3043,17 @@ moment@^2.24.0: version "2.24.0" resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b" -monaco-editor@0.18.1: - version "0.18.1" - resolved "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.18.1.tgz#ced7c305a23109875feeaf395a504b91f6358cfc" +monaco-editor-webpack-plugin@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/monaco-editor-webpack-plugin/-/monaco-editor-webpack-plugin-2.1.0.tgz#216bd35512a282beac7befd2fcdc5adb110403ff" + integrity sha512-DG7Dpo/ItWEOl/BG2egc/UIiHoCbHjq0EOF0E6eJQT+6QNZBOfSVU4GxaXG+kQJXB8rauxli96Xp1ITnNLZtSw== + dependencies: + loader-utils "^2.0.0" + +monaco-editor@0.21.2: + version "0.21.2" + resolved "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.21.2.tgz#37054e63e480d51a2dd17d609dcfb192304d5605" + integrity sha512-jS51RLuzMaoJpYbu7F6TPuWpnWTLD4kjRW0+AZzcryvbxrTwhNy1KC9yboyKpgMTahpUbDUsuQULoo0GV1EPqg== move-concurrently@^1.0.1: version "1.0.1" @@ -3906,6 +3973,15 @@ schema-utils@^1.0.0: ajv-errors "^1.0.0" ajv-keywords "^3.1.0" +schema-utils@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz#67502f6aa2b66a2d4032b4279a2944978a0913ef" + integrity sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA== + dependencies: + "@types/json-schema" "^7.0.6" + ajv "^6.12.5" + ajv-keywords "^3.5.2" + select-hose@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" From 49cd3133927eb5b030eab8986d3def5da2160dcc Mon Sep 17 00:00:00 2001 From: Sidharth Vinod Date: Fri, 15 Jan 2021 10:36:23 +0530 Subject: [PATCH 2/4] Fix font path --- docs/styles.css | 2 +- webpack.config.js | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/styles.css b/docs/styles.css index b098487335..9f42bd5a37 100644 --- a/docs/styles.css +++ b/docs/styles.css @@ -44,5 +44,5 @@ i { @font-face{ font-family: "codicon"; - src: url("../fonts/codicon.ttf") format("truetype"); + src: url("codicon.ttf") format("truetype"); } diff --git a/webpack.config.js b/webpack.config.js index 0d1e76a982..e53301bddf 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -52,8 +52,7 @@ module.exports = { { loader: 'file-loader', options: { - name: '[name].[ext]', - outputPath: 'fonts/' + name: '[name].[ext]' }, }, ], From e7432fbba192b9865eb7d11cc895b22e9ea79839 Mon Sep 17 00:00:00 2001 From: Sidharth Vinod Date: Wed, 20 Jan 2021 10:35:07 +0530 Subject: [PATCH 3/4] Fix header image --- docs/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.html b/docs/index.html index 791a53ca88..31202ebc62 100644 --- a/docs/index.html +++ b/docs/index.html @@ -35,7 +35,7 @@ Online FlowChart & Diagrams Editor - Mermaid Live Editor - + From 1987a272ede6791f4bf7da86c9ad4dcbcbe75f5a Mon Sep 17 00:00:00 2001 From: Sidharth Vinod Date: Wed, 20 Jan 2021 10:36:19 +0530 Subject: [PATCH 4/4] Add deployment --- .github/workflows/deploy.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/deploy.yml diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 0000000000..5c40bcf0f9 --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,26 @@ +name: Deploy Live Editor +on: + push: + branches: + - master +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/setup-node@v2 + with: + node-version: '12' + + - name: Checkout + uses: actions/checkout@v2 + + - name: Build & Deploy + run: | + npm i -g yarn + yarn install + yarn release + git config user.name github-actions + git config user.email github-actions@github.com + git add ./docs/* + git commit -m "Release" + git push