Browse Source

Adopt latest `monaco-editor`

Alex Dima 3 years ago
parent
commit
9474cac9bf
4 changed files with 13 additions and 8 deletions
  1. 3 2
      README.md
  2. 3 3
      package-lock.json
  3. 2 2
      package.json
  4. 5 1
      src/languages.ts

+ 3 - 2
README.md

@@ -55,7 +55,7 @@ Options can be passed in to `MonacoWebpackPlugin`. They can be used to generate
 * `publicPath` (`string`) - custom public path for worker scripts, overrides the public path from which files generated by this plugin will be served. This wins out over Webpack's dynamic runtime path and can be useful to avoid attempting to load workers cross-origin when using a CDN for other static resources. Use e.g. '/' if you want to load your resources from the current origin..
   * default value: `''`.
 * `languages` (`string[]`) - include only a subset of the languages supported.
-  * default value: <!-- LANGUAGES_BEGIN -->`['abap', 'apex', 'azcli', 'bat', 'bicep', 'cameligo', 'clojure', 'coffee', 'cpp', 'csharp', 'csp', 'css', 'dart', 'dockerfile', 'ecl', 'elixir', 'fsharp', 'go', 'graphql', 'handlebars', 'hcl', 'html', 'ini', 'java', 'javascript', 'json', 'julia', 'kotlin', 'less', 'lexon', 'liquid', 'lua', 'm3', 'markdown', 'mips', 'msdax', 'mysql', 'objective-c', 'pascal', 'pascaligo', 'perl', 'pgsql', 'php', 'postiats', 'powerquery', 'powershell', 'pug', 'python', 'qsharp', 'r', 'razor', 'redis', 'redshift', 'restructuredtext', 'ruby', 'rust', 'sb', 'scala', 'scheme', 'scss', 'shell', 'solidity', 'sophia', 'sparql', 'sql', 'st', 'swift', 'systemverilog', 'tcl', 'twig', 'typescript', 'vb', 'xml', 'yaml']`<!-- LANGUAGES_END -->.
+  * default value: <!-- LANGUAGES_BEGIN -->`['abap', 'apex', 'azcli', 'bat', 'bicep', 'cameligo', 'clojure', 'coffee', 'cpp', 'csharp', 'csp', 'css', 'dart', 'dockerfile', 'ecl', 'elixir', 'flow9', 'fsharp', 'go', 'graphql', 'handlebars', 'hcl', 'html', 'ini', 'java', 'javascript', 'json', 'julia', 'kotlin', 'less', 'lexon', 'liquid', 'lua', 'm3', 'markdown', 'mips', 'msdax', 'mysql', 'objective-c', 'pascal', 'pascaligo', 'perl', 'pgsql', 'php', 'postiats', 'powerquery', 'powershell', 'pug', 'python', 'qsharp', 'r', 'razor', 'redis', 'redshift', 'restructuredtext', 'ruby', 'rust', 'sb', 'scala', 'scheme', 'scss', 'shell', 'solidity', 'sophia', 'sparql', 'sql', 'st', 'swift', 'systemverilog', 'tcl', 'twig', 'typescript', 'vb', 'xml', 'yaml']`<!-- LANGUAGES_END -->.
 
   Some languages share the same web worker. If one of the following languages is included, you must also include the language responsible for instantiating their shared worker:
 
@@ -78,7 +78,8 @@ Options can be passed in to `MonacoWebpackPlugin`. They can be used to generate
 
 | `monaco-editor-webpack-plugin` | `monaco-editor` |
 |---|---|
-| `4.*.*` | `0.25.*`, `0.26.*` |
+| `5.*.*` | `0.29.*` |
+| `4.*.*` | `0.25.*`, `0.26.*`, `0.27.*`, `0.28.*` |
 | `3.*.*` | `0.22.*`, `0.23.*`, `0.24.*` |
 | `2.*.*` | `0.21.*` |
 | `1.9.*` | `0.20.*` |

+ 3 - 3
package-lock.json

@@ -786,9 +786,9 @@
       "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
     },
     "monaco-editor": {
-      "version": "0.26.0",
-      "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.26.0.tgz",
-      "integrity": "sha512-Ce1Zs/dPCFv+FQ7x9BIKNRN8ytsj8IyompD3zaENnb8h8W8HMaW/RIw723WOs27ZTLsESiFAQfHrhZs+zDyO3w==",
+      "version": "0.29.0",
+      "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.29.0.tgz",
+      "integrity": "sha512-7bOTapOZG8gNfzk9HJstNClnRjD9TEkVqo7qB3W6y+4cypS31A55MBQ7dpnEdnQBU+Hz3isyx61mi3/e05S7Xg==",
       "dev": true
     },
     "neo-async": {

+ 2 - 2
package.json

@@ -29,13 +29,13 @@
   "homepage": "https://github.com/microsoft/monaco-editor-webpack-plugin#readme",
   "peerDependencies": {
     "webpack": "^4.5.0 || 5.x",
-    "monaco-editor": "0.25.x || 0.26.x || 0.27.x || 0.28.x"
+    "monaco-editor": "0.29.x"
   },
   "devDependencies": {
     "css-loader": "^5.1.1",
     "file-loader": "^6.2.0",
     "glob": "^7.1.6",
-    "monaco-editor": "^0.26.0",
+    "monaco-editor": "^0.29.0",
     "style-loader": "^2.0.0",
     "typescript": "^4.2.3",
     "webpack": "^5.24.3",

+ 5 - 1
src/languages.ts

@@ -76,6 +76,10 @@ export const languagesArr: IFeatureDefinition[] = [
     label: 'elixir',
     entry: 'vs/basic-languages/elixir/elixir.contribution'
   },
+  {
+    label: 'flow9',
+    entry: 'vs/basic-languages/flow9/flow9.contribution'
+  },
   {
     label: 'fsharp',
     entry: 'vs/basic-languages/fsharp/fsharp.contribution'
@@ -328,5 +332,5 @@ export const languagesArr: IFeatureDefinition[] = [
   }
 ];
 
-export type EditorLanguage = 'abap' | 'apex' | 'azcli' | 'bat' | 'bicep' | 'cameligo' | 'clojure' | 'coffee' | 'cpp' | 'csharp' | 'csp' | 'css' | 'dart' | 'dockerfile' | 'ecl' | 'elixir' | 'fsharp' | 'go' | 'graphql' | 'handlebars' | 'hcl' | 'html' | 'ini' | 'java' | 'javascript' | 'json' | 'julia' | 'kotlin' | 'less' | 'lexon' | 'liquid' | 'lua' | 'm3' | 'markdown' | 'mips' | 'msdax' | 'mysql' | 'objective-c' | 'pascal' | 'pascaligo' | 'perl' | 'pgsql' | 'php' | 'postiats' | 'powerquery' | 'powershell' | 'pug' | 'python' | 'qsharp' | 'r' | 'razor' | 'redis' | 'redshift' | 'restructuredtext' | 'ruby' | 'rust' | 'sb' | 'scala' | 'scheme' | 'scss' | 'shell' | 'solidity' | 'sophia' | 'sparql' | 'sql' | 'st' | 'swift' | 'systemverilog' | 'tcl' | 'twig' | 'typescript' | 'vb' | 'xml' | 'yaml';
+export type EditorLanguage = 'abap' | 'apex' | 'azcli' | 'bat' | 'bicep' | 'cameligo' | 'clojure' | 'coffee' | 'cpp' | 'csharp' | 'csp' | 'css' | 'dart' | 'dockerfile' | 'ecl' | 'elixir' | 'flow9' | 'fsharp' | 'go' | 'graphql' | 'handlebars' | 'hcl' | 'html' | 'ini' | 'java' | 'javascript' | 'json' | 'julia' | 'kotlin' | 'less' | 'lexon' | 'liquid' | 'lua' | 'm3' | 'markdown' | 'mips' | 'msdax' | 'mysql' | 'objective-c' | 'pascal' | 'pascaligo' | 'perl' | 'pgsql' | 'php' | 'postiats' | 'powerquery' | 'powershell' | 'pug' | 'python' | 'qsharp' | 'r' | 'razor' | 'redis' | 'redshift' | 'restructuredtext' | 'ruby' | 'rust' | 'sb' | 'scala' | 'scheme' | 'scss' | 'shell' | 'solidity' | 'sophia' | 'sparql' | 'sql' | 'st' | 'swift' | 'systemverilog' | 'tcl' | 'twig' | 'typescript' | 'vb' | 'xml' | 'yaml';