diff --git a/examples/umd/index.html b/examples/umd/index.html deleted file mode 100644 index de65adf..0000000 --- a/examples/umd/index.html +++ /dev/null @@ -1,164 +0,0 @@ - - - - - - - - - -

Monaco Editor YAML test page

- -
- - - - - - - - - - - diff --git a/package-lock.json b/package-lock.json index f9db23e..8e62706 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,13 +19,10 @@ "husky": "^5.2.0", "lint-staged": "^10.5.4", "monaco-editor": "^0.21.3", - "monaco-languages": "^2.1.1", "monaco-plugin-helpers": "^1.0.3", "prettier": "2.0.5", - "requirejs": "^2.3.6", "rimraf": "^2.6.2", "typescript": "^4.2.3", - "uglify-es": "^3.3.9", "yaml-language-server": "^0.11.1" } }, @@ -6905,13 +6902,6 @@ "dev": true, "license": "MIT" }, - "node_modules/monaco-languages": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/monaco-languages/-/monaco-languages-2.1.1.tgz", - "integrity": "sha512-VuiqdK1NAIVnXVDUWMQUwqmYsIaWVoi9N735QnwP0O5WZaihA9Spt3JTC1Tk8lBqk5ei/DB2394BWfONeZ+5BA==", - "dev": true, - "license": "MIT" - }, "node_modules/monaco-plugin-helpers": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/monaco-plugin-helpers/-/monaco-plugin-helpers-1.0.3.tgz", @@ -8460,20 +8450,6 @@ "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", "dev": true }, - "node_modules/requirejs": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.3.6.tgz", - "integrity": "sha512-ipEzlWQe6RK3jkzikgCupiTbTvm4S0/CAU5GlgptkN5SO6F3u0UD0K18wy6ErDqiCyP4J4YYe1HuAShvsxePLg==", - "dev": true, - "license": "MIT", - "bin": { - "r_js": "bin/r.js", - "r.js": "bin/r.js" - }, - "engines": { - "node": ">=0.4.0" - } - }, "node_modules/requires-port": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", @@ -10046,30 +10022,6 @@ "node": ">=4.2.0" } }, - "node_modules/uglify-es": { - "version": "3.3.9", - "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz", - "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "commander": "~2.13.0", - "source-map": "~0.6.1" - }, - "bin": { - "uglifyjs": "bin/uglifyjs" - }, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/uglify-es/node_modules/commander": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz", - "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==", - "dev": true, - "license": "MIT" - }, "node_modules/uglify-js": { "version": "3.4.10", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz", @@ -17499,12 +17451,6 @@ "integrity": "sha512-9N7wATLpi+googstvtm6IKg97vPQ77FDYEpkow5tLriM/VJ0DaTRyUP4UVzcoH7KlPDX+e/rE7/imcOUeGkT6g==", "dev": true }, - "monaco-languages": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/monaco-languages/-/monaco-languages-2.1.1.tgz", - "integrity": "sha512-VuiqdK1NAIVnXVDUWMQUwqmYsIaWVoi9N735QnwP0O5WZaihA9Spt3JTC1Tk8lBqk5ei/DB2394BWfONeZ+5BA==", - "dev": true - }, "monaco-plugin-helpers": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/monaco-plugin-helpers/-/monaco-plugin-helpers-1.0.3.tgz", @@ -17529,15 +17475,12 @@ "js-yaml": "^3.14.1", "lint-staged": "^10.5.4", "monaco-editor": "^0.21.3", - "monaco-languages": "^2.1.1", "monaco-plugin-helpers": "^1.0.3", "prettier": "2.0.5", "react-webpack-example": "file:examples/react-webpack", "react-webpack-worker-loader-example": "file:examples/react-webpack-worker-loader", - "requirejs": "^2.3.6", "rimraf": "^2.6.2", "typescript": "^4.2.3", - "uglify-es": "^3.3.9", "yaml-ast-parser-custom-tags": "^0.0.43", "yaml-language-server": "^0.11.1" }, @@ -23072,12 +23015,6 @@ "integrity": "sha512-9N7wATLpi+googstvtm6IKg97vPQ77FDYEpkow5tLriM/VJ0DaTRyUP4UVzcoH7KlPDX+e/rE7/imcOUeGkT6g==", "dev": true }, - "monaco-languages": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/monaco-languages/-/monaco-languages-2.1.1.tgz", - "integrity": "sha512-VuiqdK1NAIVnXVDUWMQUwqmYsIaWVoi9N735QnwP0O5WZaihA9Spt3JTC1Tk8lBqk5ei/DB2394BWfONeZ+5BA==", - "dev": true - }, "monaco-plugin-helpers": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/monaco-plugin-helpers/-/monaco-plugin-helpers-1.0.3.tgz", @@ -24364,12 +24301,6 @@ "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", "dev": true }, - "requirejs": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.3.6.tgz", - "integrity": "sha512-ipEzlWQe6RK3jkzikgCupiTbTvm4S0/CAU5GlgptkN5SO6F3u0UD0K18wy6ErDqiCyP4J4YYe1HuAShvsxePLg==", - "dev": true - }, "requires-port": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", @@ -25669,24 +25600,6 @@ "integrity": "sha512-qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw==", "dev": true }, - "uglify-es": { - "version": "3.3.9", - "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz", - "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==", - "dev": true, - "requires": { - "commander": "~2.13.0", - "source-map": "~0.6.1" - }, - "dependencies": { - "commander": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz", - "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==", - "dev": true - } - } - }, "uglify-js": { "version": "3.4.10", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz", @@ -28519,12 +28432,6 @@ "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", "dev": true }, - "requirejs": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.3.6.tgz", - "integrity": "sha512-ipEzlWQe6RK3jkzikgCupiTbTvm4S0/CAU5GlgptkN5SO6F3u0UD0K18wy6ErDqiCyP4J4YYe1HuAShvsxePLg==", - "dev": true - }, "requires-port": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", @@ -29824,24 +29731,6 @@ "integrity": "sha512-qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw==", "dev": true }, - "uglify-es": { - "version": "3.3.9", - "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz", - "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==", - "dev": true, - "requires": { - "commander": "~2.13.0", - "source-map": "~0.6.1" - }, - "dependencies": { - "commander": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz", - "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==", - "dev": true - } - } - }, "uglify-js": { "version": "3.4.10", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz", diff --git a/package.json b/package.json index 70c83ff..d24d5ed 100644 --- a/package.json +++ b/package.json @@ -4,12 +4,8 @@ "description": "YAML plugin for the Monaco Editor", "scripts": { "watch": "tsc -p ./src --watch", - "compile": "rimraf ./out && npm run compile:umd && npm run compile:esm", - "compile:umd": "tsc -p ./tsconfig.json", - "compile:esm": "tsc -p ./tsconfig.esm.json", - "bundle": "rimraf ./lib && npm run bundle:umd && npm run bundle:esm && mcopy ./src/monaco.d.ts ./lib/monaco.d.ts", - "bundle:umd": "node ./scripts/bundle-umd", - "bundle:esm": "node ./scripts/bundle-esm", + "compile": "rimraf ./out && tsc", + "bundle": "rimraf ./lib && node ./scripts/bundle-esm && mcopy ./src/monaco.d.ts ./lib/monaco.d.ts", "build": "npm run compile && npm run bundle", "prepare": "husky install && npm run build", "lint": "prettier --check ." @@ -44,13 +40,10 @@ "husky": "^5.2.0", "lint-staged": "^10.5.4", "monaco-editor": "^0.21.3", - "monaco-languages": "^2.1.1", "monaco-plugin-helpers": "^1.0.3", "prettier": "2.0.5", - "requirejs": "^2.3.6", "rimraf": "^2.6.2", "typescript": "^4.2.3", - "uglify-es": "^3.3.9", "yaml-language-server": "^0.11.1" }, "prettier": { diff --git a/scripts/bundle-umd.js b/scripts/bundle-umd.js deleted file mode 100644 index ccd9974..0000000 --- a/scripts/bundle-umd.js +++ /dev/null @@ -1,77 +0,0 @@ -const requirejs = require('requirejs'); -const path = require('path'); -const fs = require('fs'); -const uglifyES = require('uglify-es'); -const helpers = require('monaco-plugin-helpers'); - -const REPO_ROOT = path.resolve(__dirname, '..'); - -const sha1 = helpers.getGitVersion(REPO_ROOT); -const semver = require('../package.json').version; -const headerVersion = semver + '(' + sha1 + ')'; - -const BUNDLED_FILE_HEADER = [ - '/*!-----------------------------------------------------------------------------', - ' * Copyright (c) Microsoft Corporation. All rights reserved.', - ' * monaco-yaml version: ' + headerVersion, - ' * Released under the MIT license', - ' * https://github.com/kpdecker/monaco-yaml/blob/master/LICENSE.md', - ' *-----------------------------------------------------------------------------*/', - '', -].join('\n'); - -bundleOne('monaco.contribution'); -bundleOne('yamlMode'); -bundleOne('yamlWorker'); - -function bundleOne(moduleId, exclude) { - requirejs.optimize( - { - baseUrl: 'out/amd/', - name: 'vs/language/yaml/' + moduleId, - out: 'lib/dev/' + moduleId + '.js', - exclude: exclude, - paths: { - 'vs/language/yaml': REPO_ROOT + '/out/amd', - 'monaco-editor/esm/vs/editor/editor.api': - REPO_ROOT + '/out/amd/fillers/monaco-editor-amd', - }, - optimize: 'none', - packages: [ - { - name: 'vscode-languageserver-types', - location: path.join( - REPO_ROOT, - 'node_modules/vscode-languageserver-types/lib/umd' - ), - main: 'main', - }, - { - name: 'yaml-language-server', - location: path.join( - REPO_ROOT, - 'node_modules/yaml-language-server/out/server/src' - ), - main: 'index', - }, - ], - }, - function () { - const devFilePath = path.join(REPO_ROOT, 'lib/dev/' + moduleId + '.js'); - const minFilePath = path.join(REPO_ROOT, 'lib/min/' + moduleId + '.js'); - const fileContents = fs.readFileSync(devFilePath).toString(); - console.log(); - console.log(`Minifying ${devFilePath}...`); - const result = uglifyES.minify(fileContents, { - output: { - comments: 'some', - }, - }); - console.log(`Done.`); - try { - fs.mkdirSync(path.join(REPO_ROOT, 'lib/min')); - } catch (err) {} - fs.writeFileSync(minFilePath, BUNDLED_FILE_HEADER + result.code); - } - ); -} diff --git a/tsconfig.esm.json b/tsconfig.esm.json deleted file mode 100644 index 5a81850..0000000 --- a/tsconfig.esm.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "compilerOptions": { - "alwaysStrict": true, - "declaration": true, - "forceConsistentCasingInFileNames": true, - "downlevelIteration": true, - "module": "esnext", - "moduleResolution": "node", - "lib": ["dom", "es2016"], - "outDir": "./out/esm", - "sourceMap": true, - "target": "es6", - "types": [] - }, - "exclude": ["node_modules", "out", "lib", "test"] -} diff --git a/tsconfig.json b/tsconfig.json index dfff557..5a81850 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,11 +1,14 @@ { "compilerOptions": { + "alwaysStrict": true, "declaration": true, "forceConsistentCasingInFileNames": true, - "module": "umd", + "downlevelIteration": true, + "module": "esnext", "moduleResolution": "node", "lib": ["dom", "es2016"], - "outDir": "./out/amd", + "outDir": "./out/esm", + "sourceMap": true, "target": "es6", "types": [] },