Merge remote-tracking branch 'origin/master' into pr/ulrichb/31

pull/2748/head
Alex Dima 6 years ago
commit 7e126d7c02

@ -20,6 +20,7 @@ This npm module is bundled and distributed in the [monaco-editor](https://www.np
* `git clone https://github.com/Microsoft/monaco-typescript` * `git clone https://github.com/Microsoft/monaco-typescript`
* `cd monaco-typescript` * `cd monaco-typescript`
* `npm install .` * `npm install .`
* `npm run compile`
* `npm run watch` * `npm run watch`
* open `$/monaco-typescript/test/index.html` in your favorite browser. * open `$/monaco-typescript/test/index.html` in your favorite browser.

8
package-lock.json generated

@ -1,6 +1,6 @@
{ {
"name": "monaco-typescript", "name": "monaco-typescript",
"version": "3.4.1", "version": "3.5.0",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
@ -52,9 +52,9 @@
"dev": true "dev": true
}, },
"typescript": { "typescript": {
"version": "3.3.3333", "version": "3.5.1",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.3.3333.tgz", "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.5.1.tgz",
"integrity": "sha512-JjSKsAfuHBE/fB2oZ8NxtRTk5iGcg6hkYXMnZ3Wc+b2RSqejEqTaem11mHASMnFilHrax3sLK0GDzcJrekZYLw==", "integrity": "sha512-64HkdiRv1yYZsSe4xC1WVgamNigVYjlssIoaH2HcZF0+ijsk5YK2g0G34w9wJkze8+5ow4STd22AynfO6ZYYLw==",
"dev": true "dev": true
}, },
"uglify-js": { "uglify-js": {

@ -1,6 +1,6 @@
{ {
"name": "monaco-typescript", "name": "monaco-typescript",
"version": "3.4.1", "version": "3.5.0",
"description": "TypeScript and JavaScript language support for Monaco Editor", "description": "TypeScript and JavaScript language support for Monaco Editor",
"scripts": { "scripts": {
"compile-amd": "mcopy ./src/lib/typescriptServices-amd.js ./release/dev/lib/typescriptServices.js && tsc -p ./src/tsconfig.json", "compile-amd": "mcopy ./src/lib/typescriptServices-amd.js ./release/dev/lib/typescriptServices.js && tsc -p ./src/tsconfig.json",
@ -24,7 +24,7 @@
"monaco-languages": "^1.7.0", "monaco-languages": "^1.7.0",
"monaco-plugin-helpers": "^1.0.2", "monaco-plugin-helpers": "^1.0.2",
"requirejs": "^2.3.6", "requirejs": "^2.3.6",
"typescript": "^3.3.3333", "typescript": "^3.5.1",
"uglify-js": "^3.4.9" "uglify-js": "^3.4.9"
} }
} }

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

@ -8,6 +8,7 @@
"dom", "dom",
"es5", "es5",
"es2015.collection", "es2015.collection",
"es2015.iterable",
"es2015.promise" "es2015.promise"
] ]
}, },

@ -8,6 +8,7 @@
"dom", "dom",
"es5", "es5",
"es2015.collection", "es2015.collection",
"es2015.iterable",
"es2015.promise" "es2015.promise"
] ]
}, },

Loading…
Cancel
Save