don't use cdn for monaco

rust-lang · Sep 29, 2021 · 526a32a · 526a32a
1 parent b41f078
commit 526a32a
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/ui/frontend/editor/MonacoEditor.tsx b/ui/frontend/editor/MonacoEditor.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
-import { CommonEditorProps, Position } from '../types';
-import MonacoReact, { Monaco } from "@monaco-editor/react";
+import { CommonEditorProps } from '../types';
+import MonacoReact, { Monaco, loader } from "@monaco-editor/react";
 import { connect } from 'react-redux';
 import State from '../state';
 
@@ -13,6 +13,7 @@ const initMonaco = (monaco: Monaco) => {
   monaco.editor.defineTheme('vscode-dark-plus', {
     base: 'vs-dark',
     inherit: true,
+    colors: {},
     rules: [
       { token: 'keyword.control', foreground: 'C586C0' },
       { token: 'variable', foreground: '9CDCFE' },
@@ -41,6 +42,8 @@ const mapStateToProps = (state: State) => {
 
 type MonacoEditorProps = CommonEditorProps & PropsFromState;
 
+loader.config({ paths: { vs: '/assets/vs' } });
+
 const MonacoEditor: React.SFC<MonacoEditorProps> = props => {
   return (
     <MonacoReact

diff --git a/ui/frontend/editor/rust_monaco_def.ts b/ui/frontend/editor/rust_monaco_def.ts
@@ -1,4 +1,6 @@
-export const config = {
+import { languages } from "monaco-editor";
+
+export const config: languages.LanguageConfiguration = {
   comments: {
       lineComment: '//',
       blockComment: ['/*', '*/']
@@ -29,7 +31,7 @@ export const config = {
   }
 };
 
-export const grammar = {
+export const grammar: languages.IMonarchLanguage = {
   // Set defaultToken to invalid to see what you do not tokenize yet
   // defaultToken: 'invalid',
 

diff --git a/ui/frontend/package.json b/ui/frontend/package.json
@@ -12,6 +12,7 @@
     "history": "^4.6.0",
     "isomorphic-fetch": "^3.0.0",
     "lodash": "^4.17.0",
+    "monaco-editor": "^0.28.1",
     "prismjs": "^1.6.0",
     "qs": "^6.4.0",
     "react": "^17.0.1",

diff --git a/ui/frontend/webpack.config.js b/ui/frontend/webpack.config.js
@@ -133,6 +133,7 @@ module.exports = function(_, argv) {
       new CopyPlugin({
         patterns: [
           { from: 'robots.txt', to: '..' },
+          { from: 'node_modules/monaco-editor/min/vs', to: 'vs' }
         ],
       }),
       new MiniCssExtractPlugin({

diff --git a/ui/frontend/yarn.lock b/ui/frontend/yarn.lock
@@ -4698,6 +4698,11 @@ mkdirp@1.x, mkdirp@~1.0.4:
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
+monaco-editor@^0.28.1:
+  version "0.28.1"
+  resolved "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.28.1.tgz#732788ff2172d59e6d436b206da8cac715413940"
+  integrity sha512-P1vPqxB4B1ZFzTeR1ScggSp9/5NoQrLCq88fnlNUsuRAP1usEBN4TIpI2lw0AYIZNVIanHk0qwjze2uJwGOHUw==
+
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"