diff --git a/extensions/configuration-editing/npm-shrinkwrap.json b/extensions/configuration-editing/npm-shrinkwrap.json index 39c4c1a48dd..fd5b19bc407 100644 --- a/extensions/configuration-editing/npm-shrinkwrap.json +++ b/extensions/configuration-editing/npm-shrinkwrap.json @@ -3,14 +3,13 @@ "version": "0.0.1", "dependencies": { "jsonc-parser": { - "version": "0.2.3", - "from": "jsonc-parser@>=0.2.2 <0.3.0", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-0.2.3.tgz" + "version": "0.3.1", + "from": "jsonc-parser@0.3.1" }, "vscode-nls": { - "version": "1.0.7", - "from": "vscode-nls@>=1.0.4 <2.0.0", - "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-1.0.7.tgz" + "version": "2.0.2", + "from": "vscode-nls@>=2.0.2 <3.0.0", + "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-2.0.2.tgz" } } } diff --git a/extensions/configuration-editing/package.json b/extensions/configuration-editing/package.json index 8f64f1c9663..863b7b4f84b 100644 --- a/extensions/configuration-editing/package.json +++ b/extensions/configuration-editing/package.json @@ -1,67 +1,67 @@ { - "name": "configuration-editing", - "version": "0.0.1", - "publisher": "vscode", - "engines": { - "vscode": "^1.0.0" - }, - "categories": [ - "Languages", - "Other" - ], - "activationEvents": [ - "onLanguage:json" - ], - "main": "./out/extension", - "scripts": { - "compile": "gulp compile-extension:configuration-editing", - "watch": "gulp watch-extension:configuration-editing" - }, - "dependencies": { - "jsonc-parser": "^0.2.2" - }, - "contributes": { - "jsonValidation": [ - { - "fileMatch": "vscode://defaultsettings/keybindings.json", - "url": "vscode://schemas/keybindings" - }, - { - "fileMatch": "%APP_SETTINGS_HOME%/keybindings.json", - "url": "vscode://schemas/keybindings" - }, - { - "fileMatch": "vscode://defaultsettings/settings.json", - "url": "vscode://schemas/settings" - }, - { - "fileMatch": "%APP_SETTINGS_HOME%/settings.json", - "url": "vscode://schemas/settings" - }, - { - "fileMatch": "%APP_SETTINGS_HOME%/locale.json", - "url": "vscode://schemas/locale" - }, - { - "fileMatch": "/.vscode/settings.json", - "url": "vscode://schemas/settings" - }, - { - "fileMatch": "/.vscode/launch.json", - "url": "vscode://schemas/launch" - }, - { - "fileMatch": "/.vscode/tasks.json", - "url": "vscode://schemas/tasks" - }, - { - "fileMatch": "%APP_SETTINGS_HOME%/snippets/*.json", - "url": "vscode://schemas/snippets" - }, - { - "fileMatch": "/.vscode/extensions.json", - "url": "vscode://schemas/extensions" - } - ] - } -} \ No newline at end of file + "name": "configuration-editing", + "version": "0.0.1", + "publisher": "vscode", + "engines": { + "vscode": "^1.0.0" + }, + "categories": [ + "Languages", + "Other" + ], + "activationEvents": [ + "onLanguage:json" + ], + "main": "./out/extension", + "scripts": { + "compile": "gulp compile-extension:configuration-editing", + "watch": "gulp watch-extension:configuration-editing" + }, + "dependencies": { + "jsonc-parser": "^0.3.1" + }, + "contributes": { + "jsonValidation": [ + { + "fileMatch": "vscode://defaultsettings/keybindings.json", + "url": "vscode://schemas/keybindings" + }, + { + "fileMatch": "%APP_SETTINGS_HOME%/keybindings.json", + "url": "vscode://schemas/keybindings" + }, + { + "fileMatch": "vscode://defaultsettings/settings.json", + "url": "vscode://schemas/settings" + }, + { + "fileMatch": "%APP_SETTINGS_HOME%/settings.json", + "url": "vscode://schemas/settings" + }, + { + "fileMatch": "%APP_SETTINGS_HOME%/locale.json", + "url": "vscode://schemas/locale" + }, + { + "fileMatch": "/.vscode/settings.json", + "url": "vscode://schemas/settings" + }, + { + "fileMatch": "/.vscode/launch.json", + "url": "vscode://schemas/launch" + }, + { + "fileMatch": "/.vscode/tasks.json", + "url": "vscode://schemas/tasks" + }, + { + "fileMatch": "%APP_SETTINGS_HOME%/snippets/*.json", + "url": "vscode://schemas/snippets" + }, + { + "fileMatch": "/.vscode/extensions.json", + "url": "vscode://schemas/extensions" + } + ] + } +} diff --git a/extensions/javascript/npm-shrinkwrap.json b/extensions/javascript/npm-shrinkwrap.json index 87b6d538718..0ea3a3fbf9a 100644 --- a/extensions/javascript/npm-shrinkwrap.json +++ b/extensions/javascript/npm-shrinkwrap.json @@ -28,9 +28,8 @@ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-0.3.6.tgz" }, "jsonc-parser": { - "version": "0.2.3", - "from": "jsonc-parser@>=0.2.2 <0.3.0", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-0.2.3.tgz" + "version": "0.3.1", + "from": "jsonc-parser@0.3.1" }, "ms": { "version": "0.7.1", @@ -38,14 +37,13 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz" }, "request-light": { - "version": "0.1.0", - "from": "request-light@>=0.1.0 <0.2.0", - "resolved": "https://registry.npmjs.org/request-light/-/request-light-0.1.0.tgz" + "version": "0.2.0", + "from": "request-light@0.2.0" }, "vscode-nls": { - "version": "1.0.7", - "from": "vscode-nls@>=1.0.4 <2.0.0", - "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-1.0.7.tgz" + "version": "2.0.2", + "from": "vscode-nls@>=2.0.2 <3.0.0", + "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-2.0.2.tgz" } } } diff --git a/extensions/javascript/package.json b/extensions/javascript/package.json index 9bc4eee60df..68657c825df 100644 --- a/extensions/javascript/package.json +++ b/extensions/javascript/package.json @@ -1,119 +1,122 @@ { - "name": "javascript", - "version": "0.1.0", - "publisher": "vscode", - "engines": { "vscode": "0.10.x" }, - "activationEvents": [ - "onLanguage:javascript", "onLanguage:json" - ], - "main": "./out/javascriptMain", - "dependencies": { - "vscode-nls": "^1.0.4", - "request-light": "^0.1.0", - "jsonc-parser": "^0.2.2" - }, - "scripts": { - "compile": "gulp compile-extension:javascript", - "watch": "gulp watch-extension:javascript" - }, - "contributes": { - "languages": [ - { - "id": "javascriptreact", - "aliases": [ - "JavaScript React", - "jsx" - ], - "extensions": [ - ".jsx" - ], - "configuration": "./javascript-language-configuration.json" - }, - { - "id": "javascript", - "aliases": [ - "JavaScript", - "javascript", - "js" - ], - "extensions": [ - ".js", - ".es6" - ], - "filenames": [ - "jakefile" - ], - "firstLine": "^#!.*\\bnode", - "mimetypes": [ - "text/javascript" - ], - "configuration": "./javascript-language-configuration.json" - }, - { - "id": "jsx-tags", - "aliases": [], - "configuration": "./tags-language-configuration.json" - } - ], - "grammars": [ - { - "language": "javascriptreact", - "scopeName": "source.js", - "path": "./syntaxes/JavaScript.tmLanguage.json", - "embeddedLanguages": { - "meta.tag.js": "jsx-tags", - "meta.tag.without-attributes.js": "jsx-tags" - } - }, - { - "language": "javascript", - "scopeName": "source.js", - "path": "./syntaxes/JavaScript.tmLanguage.json", - "embeddedLanguages": { - "meta.tag.js": "jsx-tags", - "meta.tag.without-attributes.js": "jsx-tags" - } - }, - { - "scopeName": "source.js.regexp", - "path": "./syntaxes/Regular Expressions (JavaScript).tmLanguage" - } - ], - "snippets": [ - { - "language": "javascript", - "path": "./snippets/javascript.json" - }, - { - "language": "javascriptreact", - "path": "./snippets/javascriptreact.json" - } - ], - "jsonValidation": [ - { - "fileMatch": "package.json", - "url": "http://json.schemastore.org/package" - }, - { - "fileMatch": "bower.json", - "url": "http://json.schemastore.org/bower" - }, - { - "fileMatch": ".bower.json", - "url": "http://json.schemastore.org/bower" - }, - { - "fileMatch": ".bowerrc", - "url": "http://json.schemastore.org/bowerrc" - }, - { - "fileMatch": "jsconfig.json", - "url": "./schemas/jsconfig.schema.json" - }, - { - "fileMatch": "jsconfig.json", - "url": "http://json.schemastore.org/jsconfig" - } - ] - } -} \ No newline at end of file + "name": "javascript", + "version": "0.1.0", + "publisher": "vscode", + "engines": { + "vscode": "0.10.x" + }, + "activationEvents": [ + "onLanguage:javascript", + "onLanguage:json" + ], + "main": "./out/javascriptMain", + "dependencies": { + "jsonc-parser": "^0.3.1", + "request-light": "^0.2.0", + "vscode-nls": "^2.0.2" + }, + "scripts": { + "compile": "gulp compile-extension:javascript", + "watch": "gulp watch-extension:javascript" + }, + "contributes": { + "languages": [ + { + "id": "javascriptreact", + "aliases": [ + "JavaScript React", + "jsx" + ], + "extensions": [ + ".jsx" + ], + "configuration": "./javascript-language-configuration.json" + }, + { + "id": "javascript", + "aliases": [ + "JavaScript", + "javascript", + "js" + ], + "extensions": [ + ".js", + ".es6" + ], + "filenames": [ + "jakefile" + ], + "firstLine": "^#!.*\\bnode", + "mimetypes": [ + "text/javascript" + ], + "configuration": "./javascript-language-configuration.json" + }, + { + "id": "jsx-tags", + "aliases": [], + "configuration": "./tags-language-configuration.json" + } + ], + "grammars": [ + { + "language": "javascriptreact", + "scopeName": "source.js", + "path": "./syntaxes/JavaScript.tmLanguage.json", + "embeddedLanguages": { + "meta.tag.js": "jsx-tags", + "meta.tag.without-attributes.js": "jsx-tags" + } + }, + { + "language": "javascript", + "scopeName": "source.js", + "path": "./syntaxes/JavaScript.tmLanguage.json", + "embeddedLanguages": { + "meta.tag.js": "jsx-tags", + "meta.tag.without-attributes.js": "jsx-tags" + } + }, + { + "scopeName": "source.js.regexp", + "path": "./syntaxes/Regular Expressions (JavaScript).tmLanguage" + } + ], + "snippets": [ + { + "language": "javascript", + "path": "./snippets/javascript.json" + }, + { + "language": "javascriptreact", + "path": "./snippets/javascriptreact.json" + } + ], + "jsonValidation": [ + { + "fileMatch": "package.json", + "url": "http://json.schemastore.org/package" + }, + { + "fileMatch": "bower.json", + "url": "http://json.schemastore.org/bower" + }, + { + "fileMatch": ".bower.json", + "url": "http://json.schemastore.org/bower" + }, + { + "fileMatch": ".bowerrc", + "url": "http://json.schemastore.org/bowerrc" + }, + { + "fileMatch": "jsconfig.json", + "url": "./schemas/jsconfig.schema.json" + }, + { + "fileMatch": "jsconfig.json", + "url": "http://json.schemastore.org/jsconfig" + } + ] + } +} diff --git a/extensions/json/server/npm-shrinkwrap.json b/extensions/json/server/npm-shrinkwrap.json index 66ac01758ae..f19ccbc1c0a 100644 --- a/extensions/json/server/npm-shrinkwrap.json +++ b/extensions/json/server/npm-shrinkwrap.json @@ -28,9 +28,8 @@ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-0.3.6.tgz" }, "jsonc-parser": { - "version": "0.3.0", - "from": "jsonc-parser@0.3.0", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-0.3.0.tgz" + "version": "0.3.1", + "from": "jsonc-parser@>=0.3.0 <0.4.0" }, "ms": { "version": "0.7.2", diff --git a/extensions/json/server/package.json b/extensions/json/server/package.json index e07f8bb2ecf..c5ba8b33b7f 100644 --- a/extensions/json/server/package.json +++ b/extensions/json/server/package.json @@ -8,7 +8,7 @@ "node": "*" }, "dependencies": { - "jsonc-parser": "^0.3.0", + "jsonc-parser": "^0.3.1", "request-light": "^0.2.0", "vscode-json-languageservice": "^2.0.0-next.12", "vscode-languageserver": "^3.0.2-beta.5",