diff --git a/README.md b/README.md index f3fbf4c3..c9ae0f7c 100644 --- a/README.md +++ b/README.md @@ -27,9 +27,10 @@ This npm module is bundled and distributed in the [monaco-editor](https://www.np ## Development * `git clone https://github.com/Microsoft/monaco-json` -* `cd monaco-json` * `npm install .` -* `npm run prepublish` +* compile with `npm run compile` +* watch with `npm run watch` +* `npm run prepublishOnly` * open `$/monaco-json/test/index.html` in your favorite browser. ## License diff --git a/package-lock.json b/package-lock.json index fcff8f92..8af390a9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,28 +4,34 @@ "lockfileVersion": 1, "requires": true, "dependencies": { + "buffer-from": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", + "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", + "dev": true + }, "commander": { - "version": "2.17.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz", - "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==", + "version": "2.20.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz", + "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==", "dev": true }, "jsonc-parser": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.0.3.tgz", - "integrity": "sha512-WJi9y9ABL01C8CxTKxRRQkkSpY/x2bo4Gy0WuiZGrInxQqgxQpvkBCLNcDYcHOSdhx4ODgbFcgAvfL49C+PHgQ==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.1.1.tgz", + "integrity": "sha512-VC0CjnWJylKB1iov4u76/W/5Ef0ydDkjtYWxoZ9t3HdWlSnZQwZL5MgFikaB/EtQ4RmMEw3tmQzuYnZA2/Ja1g==", "dev": true }, "monaco-editor-core": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.18.0.tgz", - "integrity": "sha512-URcHNAqH9X2JvO2skkIisAL4XAcZXxrDC8kcyr453sXQpOHUxicZpXHQb4/arXGvxrWvei3a6zZzpdT1gjeVJA==", + "version": "0.18.1", + "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.18.1.tgz", + "integrity": "sha512-euzXzmwjZFG0oAPGjICMwINcZBzQDyfGDYlAR5YNMBJZO9Bmkqq1xpTTze/qQ0KKbVmawFXiwgUbg7WVgebP9Q==", "dev": true }, "monaco-languages": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/monaco-languages/-/monaco-languages-1.7.0.tgz", - "integrity": "sha512-2YrYlkCF/g2H0PDt/ERax2IStaihZ17v1JkYnj2xEALYNah0pbQvGH9gXJvdVx0EpBoSRmxVnrwwM2oBWWOjSQ==", + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/monaco-languages/-/monaco-languages-1.8.0.tgz", + "integrity": "sha512-vC/lqNgSslQT3vSlNOpyT34ELK0eoNbA/rHUvTUjQemIiR1GpRMKhuwB21BqzWk+0MjZuJydGSCQMCebBge7jg==", "dev": true }, "monaco-plugin-helpers": { @@ -57,32 +63,51 @@ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true }, - "typescript": { - "version": "3.3.3333", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.3.3333.tgz", - "integrity": "sha512-JjSKsAfuHBE/fB2oZ8NxtRTk5iGcg6hkYXMnZ3Wc+b2RSqejEqTaem11mHASMnFilHrax3sLK0GDzcJrekZYLw==", - "dev": true - }, - "uglify-js": { - "version": "3.4.9", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz", - "integrity": "sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==", + "source-map-support": { + "version": "0.5.13", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", + "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", "dev": true, "requires": { - "commander": "~2.17.1", - "source-map": "~0.6.1" + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" } }, - "vscode-json-languageservice": { - "version": "3.3.0-next.6", - "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.3.0-next.6.tgz", - "integrity": "sha512-i1tyLiodWc7y6lR9C4cat+OUSptj8Duk1Ybm1FaMzhNfOTFttSiwrBw1otNb+QwI65VEj7EAEBQHRLeQOWznMw==", + "terser": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/terser/-/terser-4.3.1.tgz", + "integrity": "sha512-pnzH6dnFEsR2aa2SJaKb1uSCl3QmIsJ8dEkj0Fky+2AwMMcC9doMqLOQIH6wVTEKaVfKVvLSk5qxPBEZT9mywg==", "dev": true, "requires": { - "jsonc-parser": "^2.0.3", - "vscode-languageserver-types": "^3.14.0", - "vscode-nls": "^4.0.0", - "vscode-uri": "^1.0.6" + "commander": "^2.20.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.12" + } + }, + "typescript": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.5.3.tgz", + "integrity": "sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==", + "dev": true + }, + "vscode-json-languageservice": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.3.3.tgz", + "integrity": "sha512-5vL3OXTUuQpn6+tGd47dopio+7WwbtIZ07zfYMzAUX8eVWPZjfEsLeSWmQk5Xw+vwgu+j5zC4koz5UofLDGGRA==", + "dev": true, + "requires": { + "jsonc-parser": "^2.1.1", + "vscode-languageserver-types": "^3.15.0-next.2", + "vscode-nls": "^4.1.1", + "vscode-uri": "^2.0.3" + }, + "dependencies": { + "vscode-languageserver-types": { + "version": "3.15.0-next.4", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.0-next.4.tgz", + "integrity": "sha512-IKIWTdUPBnOtwznIrhxKnjVZ7hYxEzwZ3M2xmDi7OjjexuOM6LnGtoo1Dv4wYSik4epK4STEib6e8da2GxUsJA==", + "dev": true + } } }, "vscode-languageserver-types": { @@ -92,15 +117,15 @@ "dev": true }, "vscode-nls": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-4.0.0.tgz", - "integrity": "sha512-qCfdzcH+0LgQnBpZA53bA32kzp9rpq/f66Som577ObeuDlFIrtbEJ+A/+CCxjIh4G8dpJYNCKIsxpRAHIfsbNw==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-4.1.1.tgz", + "integrity": "sha512-4R+2UoUUU/LdnMnFjePxfLqNhBS8lrAFyX7pjb2ud/lqDkrUavFUTcG7wR0HBZFakae0Q6KLBFjMS6W93F403A==", "dev": true }, "vscode-uri": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.6.tgz", - "integrity": "sha512-sLI2L0uGov3wKVb9EB+vIQBl9tVP90nqRvxSoJ35vI3NjxE8jfsE5DSOhWgSunHSZmKS4OCi2jrtfxK7uyp2ww==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.0.3.tgz", + "integrity": "sha512-4D3DI3F4uRy09WNtDGD93H9q034OHImxiIcSq664Hq1Y1AScehlP3qqZyTkX/RWxeu0MRMHGkrxYqm2qlDF/aw==", "dev": true } } diff --git a/package.json b/package.json index 5dd0ce41..680df994 100644 --- a/package.json +++ b/package.json @@ -19,14 +19,14 @@ "url": "https://github.com/Microsoft/monaco-json/issues" }, "devDependencies": { - "jsonc-parser": "^2.0.3", - "monaco-editor-core": "0.18.0", - "monaco-languages": "1.7.0", + "jsonc-parser": "^2.1.1", + "monaco-editor-core": "0.18.1", + "monaco-languages": "1.8.0", "monaco-plugin-helpers": "^1.0.2", "requirejs": "^2.3.6", - "typescript": "3.3.3333", - "uglify-js": "^3.4.9", - "vscode-json-languageservice": "3.3.0-next.6", + "typescript": "3.5.3", + "terser": "^4.3.1", + "vscode-json-languageservice": "3.3.3", "vscode-languageserver-types": "3.14.0" } } diff --git a/scripts/bundle.js b/scripts/bundle.js index d111f2d2..5670651d 100644 --- a/scripts/bundle.js +++ b/scripts/bundle.js @@ -1,7 +1,7 @@ const requirejs = require('requirejs'); const path = require('path'); const fs = require('fs'); -const UglifyJS = require("uglify-js"); +const Terser = require("terser"); const helpers = require('monaco-plugin-helpers'); const REPO_ROOT = path.resolve(__dirname, '..'); @@ -61,7 +61,7 @@ function bundleOne(moduleId, exclude) { const fileContents = fs.readFileSync(devFilePath).toString(); console.log(); console.log(`Minifying ${devFilePath}...`); - const result = UglifyJS.minify(fileContents, { + const result = Terser.minify(fileContents, { output: { comments: 'some' } diff --git a/src/tsconfig.esm.json b/src/tsconfig.esm.json index a84f69ca..33cf660c 100644 --- a/src/tsconfig.esm.json +++ b/src/tsconfig.esm.json @@ -8,7 +8,8 @@ "dom", "es5", "es2015.collection", - "es2015.promise" + "es2015.promise", + "es2015.iterable" ] } } \ No newline at end of file diff --git a/src/tsconfig.json b/src/tsconfig.json index 294f4a3b..c1f28c19 100644 --- a/src/tsconfig.json +++ b/src/tsconfig.json @@ -8,7 +8,8 @@ "dom", "es5", "es2015.collection", - "es2015.promise" + "es2015.promise", + "es2015.iterable" ] } } \ No newline at end of file