Prechádzať zdrojové kódy

Merge remote-tracking branch 'origin/master' into pr/jimmydief/81

Alexandru Dima 5 rokov pred
rodič
commit
da92d8fcc8
5 zmenil súbory, kde vykonal 166 pridanie a 256 odobranie
  1. 0 41
      features.js
  2. 2 15
      index.js
  3. 4 50
      languages.js
  4. 156 147
      package-lock.json
  5. 4 3
      package.json

+ 0 - 41
features.js

@@ -1,169 +1,128 @@
 module.exports = {
   accessibilityHelp: {
     entry: 'vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp',
-    worker: undefined,
   },
   bracketMatching: {
     entry: 'vs/editor/contrib/bracketMatching/bracketMatching',
-    worker: undefined,
   },
   caretOperations: {
     entry: 'vs/editor/contrib/caretOperations/caretOperations',
-    worker: undefined,
   },
   clipboard: {
     entry: 'vs/editor/contrib/clipboard/clipboard',
-    worker: undefined,
   },
   codeAction: {
     entry: 'vs/editor/contrib/codeAction/codeActionContributions',
-    worker: undefined,
   },
   codelens: {
     entry: 'vs/editor/contrib/codelens/codelensController',
-    worker: undefined,
   },
   colorDetector: {
     entry: 'vs/editor/contrib/colorPicker/colorDetector',
-    worker: undefined,
   },
   comment: {
     entry: 'vs/editor/contrib/comment/comment',
-    worker: undefined,
   },
   contextmenu: {
     entry: 'vs/editor/contrib/contextmenu/contextmenu',
-    worker: undefined,
   },
   coreCommands: {
     entry: 'vs/editor/browser/controller/coreCommands',
-    worker: undefined,
   },
   cursorUndo: {
     entry: 'vs/editor/contrib/cursorUndo/cursorUndo',
-    worker: undefined,
   },
   dnd: {
     entry: 'vs/editor/contrib/dnd/dnd',
-    worker: undefined,
   },
   find: {
     entry: 'vs/editor/contrib/find/findController',
-    worker: undefined,
   },
   folding: {
     entry: 'vs/editor/contrib/folding/folding',
-    worker: undefined,
   },
   fontZoom: {
     entry: 'vs/editor/contrib/fontZoom/fontZoom',
-    worker: undefined,
   },
   format: {
     entry: 'vs/editor/contrib/format/formatActions',
-    worker: undefined,
   },
   goToDefinitionCommands: {
     entry: 'vs/editor/contrib/goToDefinition/goToDefinitionCommands',
-    worker: undefined,
   },
   goToDefinitionMouse: {
     entry: 'vs/editor/contrib/goToDefinition/goToDefinitionMouse',
-    worker: undefined,
   },
   gotoError: {
     entry: 'vs/editor/contrib/gotoError/gotoError',
-    worker: undefined,
   },
   gotoLine: {
     entry: 'vs/editor/standalone/browser/quickOpen/gotoLine',
-    worker: undefined,
   },
   hover: {
     entry: 'vs/editor/contrib/hover/hover',
-    worker: undefined,
   },
   inPlaceReplace: {
     entry: 'vs/editor/contrib/inPlaceReplace/inPlaceReplace',
-    worker: undefined,
   },
   inspectTokens: {
     entry: 'vs/editor/standalone/browser/inspectTokens/inspectTokens',
-    worker: undefined,
   },
   iPadShowKeyboard: {
     entry: 'vs/editor/standalone/browser/iPadShowKeyboard/iPadShowKeyboard',
-    worker: undefined,
   },
   linesOperations: {
     entry: 'vs/editor/contrib/linesOperations/linesOperations',
-    worker: undefined,
   },
   links: {
     entry: 'vs/editor/contrib/links/links',
-    worker: undefined,
   },
   multicursor: {
     entry: 'vs/editor/contrib/multicursor/multicursor',
-    worker: undefined,
   },
   parameterHints: {
     entry: 'vs/editor/contrib/parameterHints/parameterHints',
-    worker: undefined,
   },
   quickCommand: {
     entry: 'vs/editor/standalone/browser/quickOpen/quickCommand',
-    worker: undefined,
   },
   quickOutline: {
     entry: 'vs/editor/standalone/browser/quickOpen/quickOutline',
-    worker: undefined,
   },
   referenceSearch: {
     entry: [
       'vs/editor/contrib/referenceSearch/referenceSearch',
       'vs/editor/standalone/browser/referenceSearch/standaloneReferenceSearch',
     ],
-    worker: undefined,
   },
   rename: {
     entry: 'vs/editor/contrib/rename/rename',
-    worker: undefined,
   },
   smartSelect: {
     entry: 'vs/editor/contrib/smartSelect/smartSelect',
-    worker: undefined,
   },
   snippets: {
     entry: 'vs/editor/contrib/snippet/snippetController2',
-    worker: undefined,
   },
   suggest: {
     entry: 'vs/editor/contrib/suggest/suggestController',
-    worker: undefined,
   },
   toggleHighContrast: {
     entry: 'vs/editor/standalone/browser/toggleHighContrast/toggleHighContrast',
-    worker: undefined,
   },
   toggleTabFocusMode: {
     entry: 'vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode',
-    worker: undefined,
   },
   transpose: {
     entry: 'vs/editor/contrib/caretOperations/transpose',
-    worker: undefined,
   },
   wordHighlighter: {
     entry: 'vs/editor/contrib/wordHighlighter/wordHighlighter',
-    worker: undefined,
   },
   wordOperations: {
     entry: 'vs/editor/contrib/wordOperations/wordOperations',
-    worker: undefined,
   },
   wordPartOperations: {
     entry: 'vs/editor/contrib/wordPartOperations/wordPartOperations',
-    worker: undefined,
   },
 };

+ 2 - 15
index.js

@@ -12,7 +12,6 @@ const EDITOR_MODULE = {
     output: 'editor.worker.js',
     fallback: undefined
   },
-  alias: undefined,
 };
 const LANGUAGES = require('./languages');
 const FEATURES = require('./features');
@@ -21,11 +20,7 @@ function resolveMonacoPath(filePath) {
   return require.resolve(path.join('monaco-editor/esm', filePath));
 }
 
-const languagesById = fromPairs(
-  flatMap(toPairs(LANGUAGES), ([id, language]) =>
-    [id].concat(language.alias || []).map((label) => [label, mixin({ label }, language)])
-  )
-);
+const languagesById = mapValues(LANGUAGES, (language, id) => mixin({ label: id }, language));
 const featuresById = mapValues(FEATURES, (feature, key) => mixin({ label: key }, feature))
 
 function getFeaturesIds(userFeatures, predefinedFeaturesById) {
@@ -66,7 +61,7 @@ class MonacoWebpackPlugin {
     const compilationPublicPath = getCompilationPublicPath(compiler);
     const modules = [EDITOR_MODULE].concat(languages).concat(features);
     const workers = modules.map(
-      ({ label, alias, worker }) => worker && (mixin({ label, alias }, worker))
+      ({ label, worker }) => worker && (mixin({ label }, worker))
     ).filter(Boolean);
     const rules = createLoaderRules(languages, features, workers, output, publicPath, compilationPublicPath);
     const plugins = createPlugins(workers, output);
@@ -166,10 +161,6 @@ function createPlugins(workers, outputPath) {
   );
 }
 
-function flatMap(items, iteratee) {
-  return items.map(iteratee).reduce((acc, item) => [].concat(acc).concat(item), []);
-}
-
 function flatArr(items) {
   return items.reduce((acc, item) => {
     if (Array.isArray(item)) {
@@ -179,10 +170,6 @@ function flatArr(items) {
   }, []);
 }
 
-function toPairs(object) {
-  return Object.keys(object).map((key) => [key, object[key]]);
-}
-
 function fromPairs(values) {
   return values.reduce((acc, [key, value]) => Object.assign(acc, { [key]: value }), {});
 }

+ 4 - 50
languages.js

@@ -2,42 +2,34 @@ module.exports = {
   apex: {
     entry: 'vs/basic-languages/apex/apex.contribution',
     worker: undefined,
-    alias: undefined,
   },
   azcli: {
     entry: 'vs/basic-languages/azcli/azcli.contribution',
     worker: undefined,
-    alias: undefined,
   },
   bat: {
     entry: 'vs/basic-languages/bat/bat.contribution',
     worker: undefined,
-    alias: undefined,
   },
   clojure: {
     entry: 'vs/basic-languages/clojure/clojure.contribution',
     worker: undefined,
-    alias: undefined,
   },
   coffee: {
     entry: 'vs/basic-languages/coffee/coffee.contribution',
     worker: undefined,
-    alias: undefined,
   },
   cpp: {
     entry: 'vs/basic-languages/cpp/cpp.contribution',
     worker: undefined,
-    alias: undefined,
   },
   csharp: {
     entry: 'vs/basic-languages/csharp/csharp.contribution',
     worker: undefined,
-    alias: undefined,
   },
   csp: {
     entry: 'vs/basic-languages/csp/csp.contribution',
     worker: undefined,
-    alias: undefined,
   },
   css: {
     entry: [
@@ -50,27 +42,26 @@ module.exports = {
       output: 'css.worker.js',
       fallback: 'vs/language/css/cssWorker',
     },
-    alias: undefined,
   },
   dockerfile: {
     entry: 'vs/basic-languages/dockerfile/dockerfile.contribution',
     worker: undefined,
-    alias: undefined,
   },
   fsharp: {
     entry: 'vs/basic-languages/fsharp/fsharp.contribution',
     worker: undefined,
-    alias: undefined,
   },
   go: {
     entry: 'vs/basic-languages/go/go.contribution',
     worker: undefined,
-    alias: undefined,
+  },
+  graphql: {
+    entry: 'vs/basic-languages/graphql/graphql.contribution',
+    worker: undefined,
   },
   handlebars: {
     entry: 'vs/basic-languages/handlebars/handlebars.contribution',
     worker: undefined,
-    alias: undefined,
   },
   html: {
     entry: [
@@ -83,22 +74,18 @@ module.exports = {
       output: 'html.worker.js',
       fallback: 'vs/language/html/htmlWorker',
     },
-    alias: undefined,
   },
   ini: {
     entry: 'vs/basic-languages/ini/ini.contribution',
     worker: undefined,
-    alias: undefined,
   },
   java: {
     entry: 'vs/basic-languages/java/java.contribution',
     worker: undefined,
-    alias: undefined,
   },
   javascript: {
     entry: 'vs/basic-languages/javascript/javascript.contribution',
     worker: undefined,
-    alias: undefined,
   },
   json: {
     entry: 'vs/language/json/monaco.contribution',
@@ -108,147 +95,118 @@ module.exports = {
       output: 'json.worker.js',
       fallback: 'vs/language/json/jsonWorker',
     },
-    alias: undefined,
   },
   less: {
     entry: 'vs/basic-languages/less/less.contribution',
     worker: undefined,
-    alias: undefined,
   },
   lua: {
     entry: 'vs/basic-languages/lua/lua.contribution',
     worker: undefined,
-    alias: undefined,
   },
   markdown: {
     entry: 'vs/basic-languages/markdown/markdown.contribution',
     worker: undefined,
-    alias: undefined,
   },
   msdax: {
     entry: 'vs/basic-languages/msdax/msdax.contribution',
     worker: undefined,
-    alias: undefined,
   },
   mysql: {
     entry: 'vs/basic-languages/mysql/mysql.contribution',
     worker: undefined,
-    alias: undefined,
   },
   objective: {
     entry: 'vs/basic-languages/objective-c/objective-c.contribution',
     worker: undefined,
-    alias: undefined,
   },
   perl: {
     entry: 'vs/basic-languages/perl/perl.contribution',
     worker: undefined,
-    alias: undefined,
   },
   pgsql: {
     entry: 'vs/basic-languages/pgsql/pgsql.contribution',
     worker: undefined,
-    alias: undefined,
   },
   php: {
     entry: 'vs/basic-languages/php/php.contribution',
     worker: undefined,
-    alias: undefined,
   },
   postiats: {
     entry: 'vs/basic-languages/postiats/postiats.contribution',
     worker: undefined,
-    alias: undefined,
   },
   powerquery: {
     entry: 'vs/basic-languages/powerquery/powerquery.contribution',
     worker: undefined,
-    alias: undefined,
   },
   powershell: {
     entry: 'vs/basic-languages/powershell/powershell.contribution',
     worker: undefined,
-    alias: undefined,
   },
   pug: {
     entry: 'vs/basic-languages/pug/pug.contribution',
     worker: undefined,
-    alias: undefined,
   },
   python: {
     entry: 'vs/basic-languages/python/python.contribution',
     worker: undefined,
-    alias: undefined,
   },
   r: {
     entry: 'vs/basic-languages/r/r.contribution',
     worker: undefined,
-    alias: undefined,
   },
   razor: {
     entry: 'vs/basic-languages/razor/razor.contribution',
     worker: undefined,
-    alias: undefined,
   },
   redis: {
     entry: 'vs/basic-languages/redis/redis.contribution',
     worker: undefined,
-    alias: undefined,
   },
   redshift: {
     entry: 'vs/basic-languages/redshift/redshift.contribution',
     worker: undefined,
-    alias: undefined,
   },
   ruby: {
     entry: 'vs/basic-languages/ruby/ruby.contribution',
     worker: undefined,
-    alias: undefined,
   },
   rust: {
     entry: 'vs/basic-languages/rust/rust.contribution',
     worker: undefined,
-    alias: undefined,
   },
   sb: {
     entry: 'vs/basic-languages/sb/sb.contribution',
     worker: undefined,
-    alias: undefined,
   },
   scheme: {
     entry: 'vs/basic-languages/scheme/scheme.contribution',
     worker: undefined,
-    alias: undefined,
   },
   scss: {
     entry: 'vs/basic-languages/scss/scss.contribution',
     worker: undefined,
-    alias: undefined,
   },
   shell: {
     entry: 'vs/basic-languages/shell/shell.contribution',
     worker: undefined,
-    alias: undefined,
   },
   solidity: {
     entry: 'vs/basic-languages/solidity/solidity.contribution',
     worker: undefined,
-    alias: undefined,
   },
   sql: {
     entry: 'vs/basic-languages/sql/sql.contribution',
     worker: undefined,
-    alias: undefined,
   },
   st: {
     entry: 'vs/basic-languages/st/st.contribution',
     worker: undefined,
-    alias: undefined,
   },
   swift: {
     entry: 'vs/basic-languages/swift/swift.contribution',
     worker: undefined,
-    alias: undefined,
   },
   typescript: {
     entry: [
@@ -261,21 +219,17 @@ module.exports = {
       output: 'typescript.worker.js',
       fallback: 'vs/language/typescript/tsWorker',
     },
-    alias: undefined,
   },
   vb: {
     entry: 'vs/basic-languages/vb/vb.contribution',
     worker: undefined,
-    alias: undefined,
   },
   xml: {
     entry: 'vs/basic-languages/xml/xml.contribution',
     worker: undefined,
-    alias: undefined,
   },
   yaml: {
     entry: 'vs/basic-languages/yaml/yaml.contribution',
     worker: undefined,
-    alias: undefined,
   },
 };

+ 156 - 147
package-lock.json

@@ -7,22 +7,26 @@
     "@types/anymatch": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/@types/anymatch/-/anymatch-1.3.0.tgz",
-      "integrity": "sha512-7WcbyctkE8GTzogDb0ulRAEw7v8oIS54ft9mQTU7PfM0hp5e+8kpa+HeQ7IQrFbKtJXBKcZ4bh+Em9dTw5L6AQ=="
+      "integrity": "sha512-7WcbyctkE8GTzogDb0ulRAEw7v8oIS54ft9mQTU7PfM0hp5e+8kpa+HeQ7IQrFbKtJXBKcZ4bh+Em9dTw5L6AQ==",
+      "dev": true
     },
     "@types/node": {
       "version": "10.12.8",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.8.tgz",
-      "integrity": "sha512-INamyRZG4rW3lDCUmwVd5Xho/bXvQm/v1yP8V0UN1RuInU7RoWoaO570b+yLX4Ia/0szsx1wa8VzcsVlsvbWLA=="
+      "integrity": "sha512-INamyRZG4rW3lDCUmwVd5Xho/bXvQm/v1yP8V0UN1RuInU7RoWoaO570b+yLX4Ia/0szsx1wa8VzcsVlsvbWLA==",
+      "dev": true
     },
     "@types/tapable": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.4.tgz",
-      "integrity": "sha512-78AdXtlhpCHT0K3EytMpn4JNxaf5tbqbLcbIRoQIHzpTIyjpxLQKRoxU55ujBXAtg3Nl2h/XWvfDa9dsMOd0pQ=="
+      "integrity": "sha512-78AdXtlhpCHT0K3EytMpn4JNxaf5tbqbLcbIRoQIHzpTIyjpxLQKRoxU55ujBXAtg3Nl2h/XWvfDa9dsMOd0pQ==",
+      "dev": true
     },
     "@types/uglify-js": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.0.4.tgz",
       "integrity": "sha512-SudIN9TRJ+v8g5pTG8RRCqfqTMNqgWCKKd3vtynhGzkIIjxaicNAMuY5TRadJ6tzDu3Dotf3ngaMILtmOdmWEQ==",
+      "dev": true,
       "requires": {
         "source-map": "^0.6.1"
       }
@@ -31,6 +35,7 @@
       "version": "4.4.19",
       "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.4.19.tgz",
       "integrity": "sha512-vO/PuQ9iF9Gy8spN8RUUjt5reu9Z+Tb7iWxeAopCmXaIZaIsOgtY5U6UE2ELlcRUBO1HbNWhy+lQE9G92IJcmQ==",
+      "dev": true,
       "requires": {
         "@types/anymatch": "*",
         "@types/node": "*",
@@ -282,6 +287,17 @@
       "requires": {
         "micromatch": "^3.1.4",
         "normalize-path": "^2.1.1"
+      },
+      "dependencies": {
+        "normalize-path": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+          "dev": true,
+          "requires": {
+            "remove-trailing-separator": "^1.0.1"
+          }
+        }
       }
     },
     "aproba": {
@@ -358,9 +374,9 @@
       "dev": true
     },
     "async-each": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz",
-      "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
+      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
       "dev": true
     },
     "atob": {
@@ -448,15 +464,14 @@
       "dev": true
     },
     "big.js": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
-      "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
-      "dev": true
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="
     },
     "binary-extensions": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.12.0.tgz",
-      "integrity": "sha512-DYWGk01lDcxeS/K9IHPGWfT8PsJmbXRtRd2Sx72Tnb8pcYZQFF1oSDb8hJtS1vhp212q1Rzi5dUf9+nq0o9UIg==",
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
       "dev": true
     },
     "bluebird": {
@@ -674,24 +689,23 @@
       }
     },
     "chokidar": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-      "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
       "dev": true,
       "requires": {
         "anymatch": "^2.0.0",
-        "async-each": "^1.0.0",
-        "braces": "^2.3.0",
-        "fsevents": "^1.2.2",
+        "async-each": "^1.0.1",
+        "braces": "^2.3.2",
+        "fsevents": "^1.2.7",
         "glob-parent": "^3.1.0",
-        "inherits": "^2.0.1",
+        "inherits": "^2.0.3",
         "is-binary-path": "^1.0.0",
         "is-glob": "^4.0.0",
-        "lodash.debounce": "^4.0.8",
-        "normalize-path": "^2.1.1",
+        "normalize-path": "^3.0.0",
         "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.0.0",
-        "upath": "^1.0.5"
+        "readdirp": "^2.2.1",
+        "upath": "^1.1.1"
       }
     },
     "chownr": {
@@ -1118,8 +1132,7 @@
     "emojis-list": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
-      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
-      "dev": true
+      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k="
     },
     "end-of-stream": {
       "version": "1.4.1",
@@ -1454,14 +1467,14 @@
       "dev": true
     },
     "fsevents": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz",
-      "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==",
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz",
+      "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==",
       "dev": true,
       "optional": true,
       "requires": {
-        "nan": "^2.9.2",
-        "node-pre-gyp": "^0.10.0"
+        "nan": "^2.12.1",
+        "node-pre-gyp": "^0.12.0"
       },
       "dependencies": {
         "abbrev": {
@@ -1473,7 +1486,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -1482,7 +1496,7 @@
           "optional": true
         },
         "are-we-there-yet": {
-          "version": "1.1.4",
+          "version": "1.1.5",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -1494,19 +1508,21 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
           }
         },
         "chownr": {
-          "version": "1.0.1",
+          "version": "1.1.1",
           "bundled": true,
           "dev": true,
           "optional": true
@@ -1514,17 +1530,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -1533,16 +1552,16 @@
           "optional": true
         },
         "debug": {
-          "version": "2.6.9",
+          "version": "4.1.1",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
-            "ms": "2.0.0"
+            "ms": "^2.1.1"
           }
         },
         "deep-extend": {
-          "version": "0.5.1",
+          "version": "0.6.0",
           "bundled": true,
           "dev": true,
           "optional": true
@@ -1591,7 +1610,7 @@
           }
         },
         "glob": {
-          "version": "7.1.2",
+          "version": "7.1.3",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -1611,12 +1630,12 @@
           "optional": true
         },
         "iconv-lite": {
-          "version": "0.4.21",
+          "version": "0.4.24",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
-            "safer-buffer": "^2.1.0"
+            "safer-buffer": ">= 2.1.2 < 3"
           }
         },
         "ignore-walk": {
@@ -1641,7 +1660,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -1653,6 +1673,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -1667,6 +1688,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -1674,19 +1696,21 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
-          "version": "2.2.4",
+          "version": "2.3.5",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
-            "safe-buffer": "^5.1.1",
+            "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
           }
         },
         "minizlib": {
-          "version": "1.1.0",
+          "version": "1.2.1",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -1698,40 +1722,41 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
         },
         "ms": {
-          "version": "2.0.0",
+          "version": "2.1.1",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "needle": {
-          "version": "2.2.0",
+          "version": "2.3.0",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
-            "debug": "^2.1.2",
+            "debug": "^4.1.0",
             "iconv-lite": "^0.4.4",
             "sax": "^1.2.4"
           }
         },
         "node-pre-gyp": {
-          "version": "0.10.0",
+          "version": "0.12.0",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
             "detect-libc": "^1.0.2",
             "mkdirp": "^0.5.1",
-            "needle": "^2.2.0",
+            "needle": "^2.2.1",
             "nopt": "^4.0.1",
             "npm-packlist": "^1.1.6",
             "npmlog": "^4.0.2",
-            "rc": "^1.1.7",
+            "rc": "^1.2.7",
             "rimraf": "^2.6.1",
             "semver": "^5.3.0",
             "tar": "^4"
@@ -1748,13 +1773,13 @@
           }
         },
         "npm-bundled": {
-          "version": "1.0.3",
+          "version": "1.0.6",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "npm-packlist": {
-          "version": "1.1.10",
+          "version": "1.4.1",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -1778,7 +1803,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -1790,6 +1816,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -1829,12 +1856,12 @@
           "optional": true
         },
         "rc": {
-          "version": "1.2.7",
+          "version": "1.2.8",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
-            "deep-extend": "^0.5.1",
+            "deep-extend": "^0.6.0",
             "ini": "~1.3.0",
             "minimist": "^1.2.0",
             "strip-json-comments": "~2.0.1"
@@ -1864,18 +1891,19 @@
           }
         },
         "rimraf": {
-          "version": "2.6.2",
+          "version": "2.6.3",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
-            "glob": "^7.0.5"
+            "glob": "^7.1.3"
           }
         },
         "safe-buffer": {
-          "version": "5.1.1",
+          "version": "5.1.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -1890,7 +1918,7 @@
           "optional": true
         },
         "semver": {
-          "version": "5.5.0",
+          "version": "5.7.0",
           "bundled": true,
           "dev": true,
           "optional": true
@@ -1911,6 +1939,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -1930,6 +1959,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -1941,17 +1971,17 @@
           "optional": true
         },
         "tar": {
-          "version": "4.4.1",
+          "version": "4.4.8",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
-            "chownr": "^1.0.1",
+            "chownr": "^1.1.1",
             "fs-minipass": "^1.2.5",
-            "minipass": "^2.2.4",
-            "minizlib": "^1.1.0",
+            "minipass": "^2.3.4",
+            "minizlib": "^1.1.1",
             "mkdirp": "^0.5.0",
-            "safe-buffer": "^5.1.1",
+            "safe-buffer": "^5.1.2",
             "yallist": "^3.0.2"
           }
         },
@@ -1962,23 +1992,25 @@
           "optional": true
         },
         "wide-align": {
-          "version": "1.1.2",
+          "version": "1.1.3",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
-            "string-width": "^1.0.2"
+            "string-width": "^1.0.2 || 2"
           }
         },
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
-          "version": "3.0.2",
+          "version": "3.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -2355,9 +2387,9 @@
       "dev": true
     },
     "is-glob": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz",
-      "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
       "dev": true,
       "requires": {
         "is-extglob": "^2.1.1"
@@ -2447,10 +2479,19 @@
       "dev": true
     },
     "json5": {
-      "version": "0.5.1",
-      "resolved": "http://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
-      "dev": true
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "requires": {
+        "minimist": "^1.2.0"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+        }
+      }
     },
     "kind-of": {
       "version": "6.0.2",
@@ -2474,14 +2515,13 @@
       "dev": true
     },
     "loader-utils": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
-      "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
-      "dev": true,
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
+      "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
       "requires": {
-        "big.js": "^3.1.3",
+        "big.js": "^5.2.2",
         "emojis-list": "^2.0.0",
-        "json5": "^0.5.0"
+        "json5": "^1.0.1"
       }
     },
     "locate-path": {
@@ -2495,15 +2535,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.11",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-      "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
-      "dev": true
-    },
-    "lodash.debounce": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
+      "version": "4.17.15",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
       "dev": true
     },
     "lru-cache": {
@@ -2664,9 +2698,9 @@
       }
     },
     "mixin-deep": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
-      "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
       "dev": true,
       "requires": {
         "for-in": "^1.0.2",
@@ -2694,9 +2728,9 @@
       }
     },
     "monaco-editor": {
-      "version": "0.15.6",
-      "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.15.6.tgz",
-      "integrity": "sha512-JoU9V9k6KqT9R9Tiw1RTU8ohZ+Xnf9DMg6Ktqqw5hILumwmq7xqa/KLXw513uTUsWbhtnHoSJYYR++u3pkyxJg==",
+      "version": "0.17.0",
+      "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.17.0.tgz",
+      "integrity": "sha512-8BQQHCFxy3DF0GYFOy5BmcCWlwm/XaTMPbPbN4gwItFGctZErSfX82uQSBpojJSlPNyudB5Q5qnukoorD3/UuA==",
       "dev": true
     },
     "move-concurrently": {
@@ -2720,9 +2754,9 @@
       "dev": true
     },
     "nan": {
-      "version": "2.11.1",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.1.tgz",
-      "integrity": "sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA==",
+      "version": "2.14.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
+      "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
       "dev": true,
       "optional": true
     },
@@ -2797,13 +2831,10 @@
       }
     },
     "normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-      "dev": true,
-      "requires": {
-        "remove-trailing-separator": "^1.0.1"
-      }
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true
     },
     "npm-run-path": {
       "version": "2.0.2",
@@ -3424,9 +3455,9 @@
       "dev": true
     },
     "set-value": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
-      "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
       "dev": true,
       "requires": {
         "extend-shallow": "^2.0.1",
@@ -3605,7 +3636,8 @@
     "source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true
     },
     "source-map-resolve": {
       "version": "0.5.2",
@@ -3901,38 +3933,15 @@
       }
     },
     "union-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
-      "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
       "dev": true,
       "requires": {
         "arr-union": "^3.1.0",
         "get-value": "^2.0.6",
         "is-extendable": "^0.1.1",
-        "set-value": "^0.4.3"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "set-value": {
-          "version": "0.4.3",
-          "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
-          "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-extendable": "^0.1.1",
-            "is-plain-object": "^2.0.1",
-            "to-object-path": "^0.3.0"
-          }
-        }
+        "set-value": "^2.0.1"
       }
     },
     "unique-filename": {
@@ -3994,9 +4003,9 @@
       }
     },
     "upath": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
-      "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
+      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
       "dev": true
     },
     "uri-js": {

+ 4 - 3
package.json

@@ -25,16 +25,17 @@
   "homepage": "https://github.com/Microsoft/monaco-editor-webpack-plugin#readme",
   "peerDependencies": {
     "webpack": "^4.5.0",
-    "monaco-editor": "^0.15.1"
+    "monaco-editor": "^0.17.0"
   },
   "devDependencies": {
+    "@types/webpack": "^4.4.19",
     "css-loader": "^1.0.1",
-    "monaco-editor": "^0.15.6",
+    "monaco-editor": "^0.17.0",
     "style-loader": "^0.23.1",
     "webpack": "^4.25.1",
     "webpack-cli": "^3.1.2"
   },
   "dependencies": {
-    "@types/webpack": "^4.4.19"
+    "loader-utils": "^1.2.3"
   }
 }