From 584f788a42c0abf564e624083c5500ece9aeb16d Mon Sep 17 00:00:00 2001 From: rkrasiuk Date: Mon, 17 Jun 2019 13:04:18 -0500 Subject: [PATCH 1/3] 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 2/3] 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 3/3] 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" + } }