From 59d1dd094103abe032e3ddcc364445efacd46cdc Mon Sep 17 00:00:00 2001 From: Dominik Moritz Date: Tue, 5 Mar 2019 18:04:58 -0800 Subject: [PATCH 01/11] Bump to 0.16 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a6eec80..73c7984 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "homepage": "https://github.com/Microsoft/monaco-editor-webpack-plugin#readme", "peerDependencies": { "webpack": "^4.5.0", - "monaco-editor": "^0.15.1" + "monaco-editor": "^0.16.0" }, "devDependencies": { "css-loader": "^1.0.1", From 4273b13ac4e68c21a5ba50ed65f0133426b28d54 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Wed, 13 Mar 2019 09:54:45 -0500 Subject: [PATCH 02/11] Webpack property __webpack_public_path__ must be a free var --- index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.js b/index.js index 60783f0..905e6b4 100644 --- a/index.js +++ b/index.js @@ -117,7 +117,7 @@ function createLoaderRules(languages, features, workers, outputPath, publicPath) } return { getWorkerUrl: function (moduleId, label) { - var pathPrefix = (typeof window.__webpack_public_path__ === 'string' ? window.__webpack_public_path__ : ${JSON.stringify(publicPath)}); + var pathPrefix = (typeof __webpack_public_path__ === 'string' ? __webpack_public_path__ : ${JSON.stringify(publicPath)}); return (pathPrefix ? stripTrailingSlash(pathPrefix) + '/' : '') + paths[label]; } }; From 584f788a42c0abf564e624083c5500ece9aeb16d Mon Sep 17 00:00:00 2001 From: rkrasiuk Date: Mon, 17 Jun 2019 13:04:18 -0500 Subject: [PATCH 03/11] bump monaco-editor version and add graphql --- languages.js | 7 ++++- package-lock.json | 47 ++++++++++++++++++++--------- package.json | 76 +++++++++++++++++++++++------------------------ 3 files changed, 77 insertions(+), 53 deletions(-) diff --git a/languages.js b/languages.js index 6a968cb..87621e2 100644 --- a/languages.js +++ b/languages.js @@ -67,6 +67,11 @@ module.exports = { worker: undefined, alias: undefined, }, + graphql: { + entry: 'vs/basic-languages/graphql/graphql.contribution', + worker: undefined, + alias: undefined, + }, handlebars: { entry: 'vs/basic-languages/handlebars/handlebars.contribution', worker: undefined, @@ -278,4 +283,4 @@ module.exports = { worker: undefined, alias: undefined, }, -}; +}; \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 64df109..e2cfa2f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1473,7 +1473,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -1494,12 +1495,14 @@ "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" @@ -1514,17 +1517,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", @@ -1641,7 +1647,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -1653,6 +1660,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -1667,6 +1675,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -1674,12 +1683,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -1698,6 +1709,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -1778,7 +1790,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -1790,6 +1803,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -1875,7 +1889,8 @@ "safe-buffer": { "version": "5.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -1911,6 +1926,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 +1946,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -1973,12 +1990,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, @@ -2694,9 +2713,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": { diff --git a/package.json b/package.json index a6eec80..4bcee40 100644 --- a/package.json +++ b/package.json @@ -1,40 +1,40 @@ { - "name": "monaco-editor-webpack-plugin", - "version": "1.7.0", - "description": "A webpack plugin for the Monaco Editor", - "main": "index.js", - "typings": "./index.d.ts", - "scripts": { - "test": "node ./node_modules/webpack/bin/webpack.js --config test/webpack.config.js" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/Microsoft/monaco-editor-webpack-plugin.git" - }, - "keywords": [ - "webpack", - "monaco", - "editor", - "loader" - ], - "author": "Microsoft Corporation", - "license": "MIT", - "bugs": { - "url": "https://github.com/Microsoft/monaco-editor-webpack-plugin/issues" - }, - "homepage": "https://github.com/Microsoft/monaco-editor-webpack-plugin#readme", - "peerDependencies": { - "webpack": "^4.5.0", - "monaco-editor": "^0.15.1" - }, - "devDependencies": { - "css-loader": "^1.0.1", - "monaco-editor": "^0.15.6", - "style-loader": "^0.23.1", - "webpack": "^4.25.1", - "webpack-cli": "^3.1.2" - }, - "dependencies": { - "@types/webpack": "^4.4.19" - } + "name": "@frstio/monaco-editor-webpack-plugin", + "version": "1.0.0", + "description": "A webpack plugin for the Monaco Editor", + "main": "index.js", + "typings": "./index.d.ts", + "scripts": { + "test": "node ./node_modules/webpack/bin/webpack.js --config test/webpack.config.js" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/Microsoft/monaco-editor-webpack-plugin.git" + }, + "keywords": [ + "webpack", + "monaco", + "editor", + "loader" + ], + "author": "Microsoft Corporation", + "license": "MIT", + "bugs": { + "url": "https://github.com/Microsoft/monaco-editor-webpack-plugin/issues" + }, + "homepage": "https://github.com/Microsoft/monaco-editor-webpack-plugin#readme", + "peerDependencies": { + "webpack": "^4.5.0", + "monaco-editor": "^0.17.0" + }, + "devDependencies": { + "css-loader": "^1.0.1", + "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" + } } From 7bce3f3c9267f8852a3770e956491520dc5132b4 Mon Sep 17 00:00:00 2001 From: rkrasiuk Date: Mon, 17 Jun 2019 13:13:05 -0500 Subject: [PATCH 04/11] restore package json defaults for plugin --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 4bcee40..7638c36 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "@frstio/monaco-editor-webpack-plugin", - "version": "1.0.0", + "name": "monaco-editor-webpack-plugin", + "version": "1.7.0", "description": "A webpack plugin for the Monaco Editor", "main": "index.js", "typings": "./index.d.ts", From 01040633aeea5ecc03a297c66296de7fd012ea06 Mon Sep 17 00:00:00 2001 From: rkrasiuk Date: Mon, 17 Jun 2019 13:17:30 -0500 Subject: [PATCH 05/11] indentation --- package.json | 76 ++++++++++++++++++++++++++-------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/package.json b/package.json index 7638c36..719efa0 100644 --- a/package.json +++ b/package.json @@ -1,40 +1,40 @@ { - "name": "monaco-editor-webpack-plugin", - "version": "1.7.0", - "description": "A webpack plugin for the Monaco Editor", - "main": "index.js", - "typings": "./index.d.ts", - "scripts": { - "test": "node ./node_modules/webpack/bin/webpack.js --config test/webpack.config.js" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/Microsoft/monaco-editor-webpack-plugin.git" - }, - "keywords": [ - "webpack", - "monaco", - "editor", - "loader" - ], - "author": "Microsoft Corporation", - "license": "MIT", - "bugs": { - "url": "https://github.com/Microsoft/monaco-editor-webpack-plugin/issues" - }, - "homepage": "https://github.com/Microsoft/monaco-editor-webpack-plugin#readme", - "peerDependencies": { - "webpack": "^4.5.0", - "monaco-editor": "^0.17.0" - }, - "devDependencies": { - "css-loader": "^1.0.1", - "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" - } + "name": "monaco-editor-webpack-plugin", + "version": "1.7.0", + "description": "A webpack plugin for the Monaco Editor", + "main": "index.js", + "typings": "./index.d.ts", + "scripts": { + "test": "node ./node_modules/webpack/bin/webpack.js --config test/webpack.config.js" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/Microsoft/monaco-editor-webpack-plugin.git" + }, + "keywords": [ + "webpack", + "monaco", + "editor", + "loader" + ], + "author": "Microsoft Corporation", + "license": "MIT", + "bugs": { + "url": "https://github.com/Microsoft/monaco-editor-webpack-plugin/issues" + }, + "homepage": "https://github.com/Microsoft/monaco-editor-webpack-plugin#readme", + "peerDependencies": { + "webpack": "^4.5.0", + "monaco-editor": "^0.17.0" + }, + "devDependencies": { + "css-loader": "^1.0.1", + "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" + } } From adc49310ee90e9b0f13bc0cd1418ccdbee7e6b42 Mon Sep 17 00:00:00 2001 From: Niklas Mollenhauer Date: Tue, 8 Oct 2019 21:57:58 +0200 Subject: [PATCH 06/11] Resolve #73 --- package-lock.json | 79 +++++++++++++++++++++++++++++++---------------- package.json | 3 +- 2 files changed, 54 insertions(+), 28 deletions(-) diff --git a/package-lock.json b/package-lock.json index 64df109..d96ae0a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -448,10 +448,9 @@ "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", @@ -1118,8 +1117,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", @@ -1473,7 +1471,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -1494,12 +1493,14 @@ "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" @@ -1514,17 +1515,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", @@ -1641,7 +1645,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -1653,6 +1658,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -1667,6 +1673,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -1674,12 +1681,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -1698,6 +1707,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -1778,7 +1788,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -1790,6 +1801,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -1875,7 +1887,8 @@ "safe-buffer": { "version": "5.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -1911,6 +1924,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 +1944,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -1973,12 +1988,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, @@ -2447,10 +2464,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 +2500,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": { diff --git a/package.json b/package.json index a6eec80..6588c1c 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "webpack-cli": "^3.1.2" }, "dependencies": { - "@types/webpack": "^4.4.19" + "@types/webpack": "^4.4.19", + "loader-utils": "^1.2.3" } } From 21fb24c29033acb1a9ef7ea3ae0e31ed5965454d Mon Sep 17 00:00:00 2001 From: Niklas Mollenhauer Date: Tue, 8 Oct 2019 21:58:42 +0200 Subject: [PATCH 07/11] Resolve #70 --- package-lock.json | 14 ++++++++++---- package.json | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index d96ae0a..0046b0e 100644 --- a/package-lock.json +++ b/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": "*", @@ -3630,7 +3635,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", diff --git a/package.json b/package.json index 6588c1c..8bf3afd 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "monaco-editor": "^0.15.1" }, "devDependencies": { + "@types/webpack": "^4.4.19", "css-loader": "^1.0.1", "monaco-editor": "^0.15.6", "style-loader": "^0.23.1", @@ -35,7 +36,6 @@ "webpack-cli": "^3.1.2" }, "dependencies": { - "@types/webpack": "^4.4.19", "loader-utils": "^1.2.3" } } From f397fae745742e8a447c88ba60dfc20a198c6a6d Mon Sep 17 00:00:00 2001 From: Niklas Mollenhauer Date: Tue, 8 Oct 2019 21:59:05 +0200 Subject: [PATCH 08/11] npm audit fix --- package-lock.json | 204 +++++++++++++++++++++------------------------- 1 file changed, 91 insertions(+), 113 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0046b0e..2fb260b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -287,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": { @@ -363,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": { @@ -458,9 +469,9 @@ "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": { @@ -678,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": { @@ -1457,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": { @@ -1486,7 +1496,7 @@ "optional": true }, "are-we-there-yet": { - "version": "1.1.4", + "version": "1.1.5", "bundled": true, "dev": true, "optional": true, @@ -1512,7 +1522,7 @@ } }, "chownr": { - "version": "1.0.1", + "version": "1.1.1", "bundled": true, "dev": true, "optional": true @@ -1542,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 @@ -1600,7 +1610,7 @@ } }, "glob": { - "version": "7.1.2", + "version": "7.1.3", "bundled": true, "dev": true, "optional": true, @@ -1620,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": { @@ -1690,17 +1700,17 @@ "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, @@ -1718,35 +1728,35 @@ } }, "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" @@ -1763,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, @@ -1846,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" @@ -1881,16 +1891,16 @@ } }, "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, "optional": true @@ -1908,7 +1918,7 @@ "optional": true }, "semver": { - "version": "5.5.0", + "version": "5.7.0", "bundled": true, "dev": true, "optional": true @@ -1961,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" } }, @@ -1982,12 +1992,12 @@ "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": { @@ -1997,7 +2007,7 @@ "optional": true }, "yallist": { - "version": "3.0.2", + "version": "3.0.3", "bundled": true, "dev": true, "optional": true @@ -2377,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" @@ -2525,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": { @@ -2694,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", @@ -2750,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 }, @@ -2827,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", @@ -3454,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", @@ -3932,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": { @@ -4025,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": { From f9a577ee8b911d6e794ed4cf83972c7f3cb33b5a Mon Sep 17 00:00:00 2001 From: Alexandru Dima Date: Wed, 18 Dec 2019 11:51:47 +0100 Subject: [PATCH 09/11] Remove unused field --- features.js | 41 ----------------------------------------- 1 file changed, 41 deletions(-) diff --git a/features.js b/features.js index f4e1dae..c6d750b 100644 --- a/features.js +++ b/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, }, }; From 5c82c65ae8209d7997abc42d95a008a6d8599c8a Mon Sep 17 00:00:00 2001 From: Alexandru Dima Date: Wed, 18 Dec 2019 11:53:07 +0100 Subject: [PATCH 10/11] Remove more undefined fields --- languages.js | 53 +--------------------------------------------------- 1 file changed, 1 insertion(+), 52 deletions(-) diff --git a/languages.js b/languages.js index 87621e2..7caeb79 100644 --- a/languages.js +++ b/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,32 +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, - alias: undefined, }, handlebars: { entry: 'vs/basic-languages/handlebars/handlebars.contribution', worker: undefined, - alias: undefined, }, html: { entry: [ @@ -88,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', @@ -113,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: [ @@ -266,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, }, -}; \ No newline at end of file +}; From 8aa2205ff3e685015c071347cfaeee9d92657ab9 Mon Sep 17 00:00:00 2001 From: Alexandru Dima Date: Wed, 18 Dec 2019 12:09:59 +0100 Subject: [PATCH 11/11] Simplify code since alias is no longer used --- index.js | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/index.js b/index.js index 905e6b4..92dcf80 100644 --- a/index.js +++ b/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 publicPath = getPublicPath(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); const plugins = createPlugins(workers, output); @@ -156,10 +151,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)) { @@ -169,10 +160,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 }), {}); }