SystemSh0cker/monaco-editor
1
0
Fork 0
mirror of https://github.com/microsoft/monaco-editor.git synced 2025-12-22 23:13:02 +01:00
Code Issues Projects Releases Packages Activity

Merge pull request #2773 from microsoft/alex/update-deps

Browse source 
Update all dependencies
This commit is contained in:
Alexandru Dima 2021-11-16 09:59:57 +01:00 • committed by GitHub
commit 512498b487
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 2506 additions and 2409 deletions
Download patch file Download diff file Expand all files Collapse all files

49
build/npm/installAll.js Normal file
View file

@ -0,0 +1,49 @@
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
//@ts-check
const glob = require('glob');
const path = require('path');
const fs = require('fs');
const cp = require('child_process');
const npm = process.platform === 'win32' ? 'npm.cmd' : 'npm';
const REPO_ROOT = path.join(__dirname, '../../');
const files = glob.sync('**/package.json', {
cwd: REPO_ROOT,
ignore: ['**/node_modules/**', '**/out/**', '**/release/**']
});
for (const file of files) {
const filePath = path.join(REPO_ROOT, file);
const contents = JSON.parse(fs.readFileSync(filePath).toString());
if (!contents.dependencies && !contents.devDependencies && !contents.optionalDependencies) {
// nothing to install
continue;
}
npmInstall(path.dirname(file));
}
function npmInstall(location) {
/** @type {'inherit'} */
const stdio = 'inherit';
const opts = {
env: process.env,
cwd: location,
stdio
};
const args = ['install'];
console.log(`Installing dependencies in ${location}...`);
console.log(`$ npm ${args.join(' ')}`);
const result = cp.spawnSync(npm, args, opts);
if (result.error || result.status !== 0) {
process.exit(1);
}
}

23
build/npm/removeAll.js Normal file
View file

@ -0,0 +1,23 @@
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
//@ts-check
const glob = require('glob');
const path = require('path');
const fs = require('fs');
const REPO_ROOT = path.join(__dirname, '../../');
const files = glob.sync('**/package-lock.json', {
cwd: REPO_ROOT,
ignore: ['**/node_modules/**', '**/out/**', '**/release/**']
});
for (const file of files) {
const filePath = path.join(REPO_ROOT, file);
console.log(`Deleting ${file}...`);
fs.unlinkSync(filePath);
}

1771
monaco-editor-samples/browser-esm-parcel/package-lock.json generated
View file

File diff suppressed because it is too large Load diff

12
monaco-editor-samples/browser-esm-vite-react/package-lock.json generated
View file

@ -325,9 +325,9 @@
"dev": true "dev": true
}, },
"@types/react": { "@types/react": {
"version": "17.0.34", "version": "17.0.35",
"resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.34.tgz", "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.35.tgz",
"integrity": "sha512-46FEGrMjc2+8XhHXILr+3+/sTe3OfzSPU9YGKILLrUYbQ1CLQC9Daqo1KzENGXAWwrFwiY0l4ZbF20gRvgpWTg==", "integrity": "sha512-r3C8/TJuri/SLZiiwwxQoLAoavaczARfT9up9b4Jr65+ErAUX3MIkU0oMOQnrpfgHme8zIqZLX7O5nnjm5Wayw==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/prop-types": "*", "@types/prop-types": "*",
@ -430,9 +430,9 @@
} }
}, },
"csstype": { "csstype": {
"version": "3.0.9", "version": "3.0.10",
"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.9.tgz", "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.10.tgz",
"integrity": "sha512-rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw==", "integrity": "sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA==",
"dev": true "dev": true
}, },
"debug": { "debug": {

8
monaco-editor-samples/browser-esm-vite-react/package.json
View file

@ -9,10 +9,10 @@
"devDependencies": { "devDependencies": {
"monaco-editor": "^0.30.1", "monaco-editor": "^0.30.1",
"react": "^17.0.2", "react": "^17.0.2",
"react-dom": "^17.0.0", "react-dom": "^17.0.2",
"@types/react": "^17.0.0", "@types/react": "^17.0.35",
"@types/react-dom": "^17.0.0", "@types/react-dom": "^17.0.11",
"@vitejs/plugin-react": "^1.0.0", "@vitejs/plugin-react": "^1.0.9",
"typescript": "^4.4.4", "typescript": "^4.4.4",
"vite": "^2.6.14" "vite": "^2.6.14"
} }

1267
monaco-editor-samples/browser-esm-webpack-typescript-react/package-lock.json generated
View file

File diff suppressed because it is too large Load diff

18
monaco-editor-samples/browser-esm-webpack-typescript-react/package.json
View file

@ -6,16 +6,16 @@
}, },
"dependencies": {}, "dependencies": {},
"devDependencies": { "devDependencies": {
"@babel/core": "^7.15.5", "@babel/core": "^7.16.0",
"@babel/preset-env": "^7.15.4", "@babel/preset-env": "^7.16.0",
"@babel/preset-react": "^7.14.5", "@babel/preset-react": "^7.16.0",
"@babel/preset-typescript": "^7.15.0", "@babel/preset-typescript": "^7.16.0",
"@pmmmwh/react-refresh-webpack-plugin": "^0.4.3", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.1",
"@types/react": "^17.0.20", "@types/react": "^17.0.35",
"@types/react-dom": "^17.0.9", "@types/react-dom": "^17.0.11",
"babel-loader": "^8.2.2", "babel-loader": "^8.2.3",
"react": "^17.0.2", "react": "^17.0.2",
"react-dom": "^17.0.2", "react-dom": "^17.0.2",
"react-refresh": "^0.10.0" "react-refresh": "^0.11.0"
} }
} }

4
monaco-editor-samples/browser-esm-webpack/package-lock.json generated
View file

@ -1,4 +0,0 @@
{
"name": "helloworld",
"lockfileVersion": 1
}

4
monaco-editor-samples/electron-amd/package-lock.json generated
View file

@ -1,4 +0,0 @@
{
"name": "electron-amd",
"lockfileVersion": 1
}

12
monaco-editor-samples/nwjs-amd-v2/package-lock.json generated
View file

@ -1,12 +0,0 @@
{
"name": "helloworld",
"requires": true,
"lockfileVersion": 1,
"dependencies": {
"monaco-editor": {
"version": "0.19.0",
"resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.19.0.tgz",
"integrity": "sha512-ida++HI/s9V8ma8yYS9CAS0UJEFwW1gbt9G6oviEdv/aHhFd/kV3sXrINqC63TVdKzOZdKjPRRCOPJJ80zvLbw=="
}
}
}

7
monaco-editor-samples/nwjs-amd-v2/package.json
View file

@ -1,7 +0,0 @@
{
"name": "helloworld",
"main": "index.html",
"dependencies": {
"monaco-editor": "0.19.0"
}
}

12
monaco-editor-samples/nwjs-amd/package-lock.json generated
View file

@ -1,12 +0,0 @@
{
"name": "helloworld",
"requires": true,
"lockfileVersion": 1,
"dependencies": {
"monaco-editor": {
"version": "0.19.0",
"resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.19.0.tgz",
"integrity": "sha512-ida++HI/s9V8ma8yYS9CAS0UJEFwW1gbt9G6oviEdv/aHhFd/kV3sXrINqC63TVdKzOZdKjPRRCOPJJ80zvLbw=="
}
}
}

7
monaco-editor-samples/nwjs-amd/package.json
View file

@ -1,7 +0,0 @@
{
"name": "helloworld",
"main": "index.html",
"dependencies": {
"monaco-editor": "0.19.0"
}
}

677
monaco-editor-samples/package-lock.json generated
View file

File diff suppressed because it is too large Load diff

34
monaco-editor-samples/package.json
View file

@ -4,31 +4,25 @@
"description": "Samples for using the Monaco Editor", "description": "Samples for using the Monaco Editor",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
"prepare": "husky install",
"prettier": "prettier --write .",
"pretty-quick": "pretty-quick --staged",
"simpleserver": "yaserver --root ./ --port 8888" "simpleserver": "yaserver --root ./ --port 8888"
}, },
"author": "Microsoft Corporation", "author": "Microsoft Corporation",
"license": "MIT", "license": "MIT",
"devDependencies": { "devDependencies": {
"css-loader": "^6.2.0", "css-loader": "^6.5.1",
"electron": "^11.0.0", "electron": "^15.3.1",
"file-loader": "^6.2.0", "file-loader": "^6.2.0",
"glob": "^7.1.7", "glob": "^7.2.0",
"html-webpack-plugin": "^5.3.2", "html-webpack-plugin": "^5.5.0",
"husky": "^7.0.2", "monaco-editor-webpack-plugin": "^6.0.0",
"monaco-editor-webpack-plugin": "^4.1.2", "monaco-editor": "^0.30.1",
"monaco-editor": "^0.27.0", "style-loader": "^3.3.1",
"prettier": "^2.3.2", "terser-webpack-plugin": "^5.2.5",
"pretty-quick": "^3.1.1", "ts-loader": "^9.2.6",
"style-loader": "^3.2.1", "typescript": "^4.4.4",
"terser-webpack-plugin": "^5.2.3", "webpack-cli": "^4.9.1",
"ts-loader": "^9.2.5", "webpack-dev-server": "^4.5.0",
"typescript": "^4.4.2", "webpack": "^5.64.1",
"webpack-cli": "^4.8.0", "yaserver": "^0.4.0"
"webpack-dev-server": "^4.1.1",
"webpack": "^5.52.0",
"yaserver": "^0.3.0"
} }
} }

221
package-lock.json generated
View file

@ -11,9 +11,9 @@
"dev": true "dev": true
}, },
"@tootallnate/once": { "@tootallnate/once": {
"version": "1.1.2", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
"integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
"dev": true "dev": true
}, },
"@types/event-stream": { "@types/event-stream": {
@ -744,9 +744,9 @@
} }
}, },
"clean-css": { "clean-css": {
"version": "5.1.2", "version": "5.2.2",
"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.1.2.tgz", "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.2.2.tgz",
"integrity": "sha512-QcaGg9OuMo+0Ds933yLOY+gHPWbxhxqF0HDexmToPf8pczvmvZGYzd+QqWp9/mkucAOKViI+dSFOqoZIvXbeBw==", "integrity": "sha512-/eR8ru5zyxKzpBLv9YZvMXgTSSQn7AdkMItMYynsFgGwTveCRVam9IUPFloE85B4vAIj05IuKmmEoV7/AQjT0w==",
"dev": true, "dev": true,
"requires": { "requires": {
"source-map": "~0.6.0" "source-map": "~0.6.0"
@ -1005,27 +1005,11 @@
"whatwg-url": "^10.0.0" "whatwg-url": "^10.0.0"
}, },
"dependencies": { "dependencies": {
"webidl-conversions": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
"integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
"dev": true
},
"whatwg-mimetype": { "whatwg-mimetype": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz", "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
"integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==", "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
"dev": true "dev": true
},
"whatwg-url": {
"version": "10.0.0",
"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-10.0.0.tgz",
"integrity": "sha512-CLxxCmdUby142H5FZzn4D8ikO1cmypvXVQktsgosNy4a4BHrDHeciBBGZhb0bNoR5/MltoCatso+vFjjGx8t0w==",
"dev": true,
"requires": {
"tr46": "^3.0.0",
"webidl-conversions": "^7.0.0"
}
} }
} }
}, },
@ -1200,20 +1184,12 @@
"dev": true "dev": true
}, },
"domexception": { "domexception": {
"version": "2.0.1", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz", "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
"integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==", "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
"dev": true, "dev": true,
"requires": { "requires": {
"webidl-conversions": "^5.0.0" "webidl-conversions": "^7.0.0"
},
"dependencies": {
"webidl-conversions": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
"integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
"dev": true
}
} }
}, },
"dotignore": { "dotignore": {
@ -1511,9 +1487,9 @@
"optional": true "optional": true
}, },
"esbuild-plugin-alias": { "esbuild-plugin-alias": {
"version": "0.2.0", "version": "0.2.1",
"resolved": "https://registry.npmjs.org/esbuild-plugin-alias/-/esbuild-plugin-alias-0.2.0.tgz", "resolved": "https://registry.npmjs.org/esbuild-plugin-alias/-/esbuild-plugin-alias-0.2.1.tgz",
"integrity": "sha512-biAUOtI9cinWE1ZeO7xyoSEJDb3cTTljLtLZEJJ8sZAe3wLWICrvkyG0zejT7e36S2jQywC0JL067tvCi/fxVw==", "integrity": "sha512-jyfL/pwPqaFXyKnj8lP8iLk6Z0m099uXR45aSN8Av1XD4vhvQutxxPzgA2bTcAwQpa1zCXDcWOlhFgyP3GKqhQ==",
"dev": true "dev": true
}, },
"esbuild-sunos-64": { "esbuild-sunos-64": {
@ -2380,12 +2356,32 @@
"dev": true "dev": true
}, },
"html-encoding-sniffer": { "html-encoding-sniffer": {
"version": "2.0.1", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz", "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
"integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==", "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
"dev": true, "dev": true,
"requires": { "requires": {
"whatwg-encoding": "^1.0.5" "whatwg-encoding": "^2.0.0"
},
"dependencies": {
"iconv-lite": {
"version": "0.6.3",
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
"integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
"dev": true,
"requires": {
"safer-buffer": ">= 2.1.2 < 3.0.0"
}
},
"whatwg-encoding": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
"integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
"dev": true,
"requires": {
"iconv-lite": "0.6.3"
}
}
} }
}, },
"html-tags": { "html-tags": {
@ -2395,12 +2391,12 @@
"dev": true "dev": true
}, },
"http-proxy-agent": { "http-proxy-agent": {
"version": "4.0.1", "version": "5.0.0",
"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
"integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
"dev": true, "dev": true,
"requires": { "requires": {
"@tootallnate/once": "1", "@tootallnate/once": "2",
"agent-base": "6", "agent-base": "6",
"debug": "4" "debug": "4"
}, },
@ -2974,23 +2970,23 @@
"dev": true "dev": true
}, },
"jsdom": { "jsdom": {
"version": "17.0.0", "version": "18.1.0",
"resolved": "https://registry.npmjs.org/jsdom/-/jsdom-17.0.0.tgz", "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-18.1.0.tgz",
"integrity": "sha512-MUq4XdqwtNurZDVeKScENMPHnkgmdIvMzZ1r1NSwHkDuaqI6BouPjr+17COo4/19oLNnmdpFDPOHVpgIZmZ+VA==", "integrity": "sha512-q6QFAfSGLEUqRJ+GCV6vn6ItZCMARWh1d33wiJZPxc+wMNw7HK71JPmQ4C2lIZAsBH8TiJu4uplach/UcrC6bQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"abab": "^2.0.5", "abab": "^2.0.5",
"acorn": "^8.4.1", "acorn": "^8.5.0",
"acorn-globals": "^6.0.0", "acorn-globals": "^6.0.0",
"cssom": "^0.5.0", "cssom": "^0.5.0",
"cssstyle": "^2.3.0", "cssstyle": "^2.3.0",
"data-urls": "^3.0.0", "data-urls": "^3.0.1",
"decimal.js": "^10.3.1", "decimal.js": "^10.3.1",
"domexception": "^2.0.1", "domexception": "^4.0.0",
"escodegen": "^2.0.0", "escodegen": "^2.0.0",
"form-data": "^4.0.0", "form-data": "^4.0.0",
"html-encoding-sniffer": "^2.0.1", "html-encoding-sniffer": "^3.0.0",
"http-proxy-agent": "^4.0.1", "http-proxy-agent": "^5.0.0",
"https-proxy-agent": "^5.0.0", "https-proxy-agent": "^5.0.0",
"is-potential-custom-element-name": "^1.0.1", "is-potential-custom-element-name": "^1.0.1",
"nwsapi": "^2.2.0", "nwsapi": "^2.2.0",
@ -2999,13 +2995,13 @@
"symbol-tree": "^3.2.4", "symbol-tree": "^3.2.4",
"tough-cookie": "^4.0.0", "tough-cookie": "^4.0.0",
"w3c-hr-time": "^1.0.2", "w3c-hr-time": "^1.0.2",
"w3c-xmlserializer": "^2.0.0", "w3c-xmlserializer": "^3.0.0",
"webidl-conversions": "^6.1.0", "webidl-conversions": "^7.0.0",
"whatwg-encoding": "^1.0.5", "whatwg-encoding": "^2.0.0",
"whatwg-mimetype": "^2.3.0", "whatwg-mimetype": "^3.0.0",
"whatwg-url": "^9.0.0", "whatwg-url": "^10.0.0",
"ws": "^8.0.0", "ws": "^8.2.3",
"xml-name-validator": "^3.0.0" "xml-name-validator": "^4.0.0"
}, },
"dependencies": { "dependencies": {
"form-data": { "form-data": {
@ -3018,6 +3014,36 @@
"combined-stream": "^1.0.8", "combined-stream": "^1.0.8",
"mime-types": "^2.1.12" "mime-types": "^2.1.12"
} }
},
"iconv-lite": {
"version": "0.6.3",
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
"integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
"dev": true,
"requires": {
"safer-buffer": ">= 2.1.2 < 3.0.0"
}
},
"whatwg-encoding": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
"integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
"dev": true,
"requires": {
"iconv-lite": "0.6.3"
}
},
"whatwg-mimetype": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
"integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
"dev": true
},
"xml-name-validator": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
"integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
"dev": true
} }
} }
}, },
@ -5314,9 +5340,9 @@
} }
}, },
"terser": { "terser": {
"version": "5.9.0", "version": "5.10.0",
"resolved": "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz", "resolved": "https://registry.npmjs.org/terser/-/terser-5.10.0.tgz",
"integrity": "sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ==", "integrity": "sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==",
"dev": true, "dev": true,
"requires": { "requires": {
"commander": "^2.20.0", "commander": "^2.20.0",
@ -5440,14 +5466,6 @@
"psl": "^1.1.33", "psl": "^1.1.33",
"punycode": "^2.1.1", "punycode": "^2.1.1",
"universalify": "^0.1.2" "universalify": "^0.1.2"
},
"dependencies": {
"universalify": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
"integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
"dev": true
}
} }
}, },
"tr46": { "tr46": {
@ -5502,9 +5520,9 @@
"dev": true "dev": true
}, },
"typedoc": { "typedoc": {
"version": "0.22.7", "version": "0.22.9",
"resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.22.7.tgz", "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.22.9.tgz",
"integrity": "sha512-ndxxp+tU1Wczvdxp4u2/PvT1qjD6hdFdSdehpORHjE+JXmMkl2bftXCR0upHmsnesBG7VCcr8vfgloGHIH8glQ==", "integrity": "sha512-84PjudoXVcap6bwdZFbYIUWlgdz/iLV09ZHwrCzhtHWXaDQG6mlosJ8te6DSThuRkRvQjp46HO+qY/P7Gpm78g==",
"dev": true, "dev": true,
"requires": { "requires": {
"glob": "^7.2.0", "glob": "^7.2.0",
@ -5790,6 +5808,12 @@
"through2-filter": "^3.0.0" "through2-filter": "^3.0.0"
} }
}, },
"universalify": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
"integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
"dev": true
},
"unset-value": { "unset-value": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
@ -5995,9 +6019,9 @@
} }
}, },
"vscode-json-languageservice": { "vscode-json-languageservice": {
"version": "4.1.9", "version": "4.1.10",
"resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-4.1.9.tgz", "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-4.1.10.tgz",
"integrity": "sha512-kxNHitUy2fCxmP6vAp0SRLrUSuecUYzzxlC+85cC3jJlFHWmvtCJOzikC+kcUnIdls9fQSB8n0yHs8Sl6taxJw==", "integrity": "sha512-IHliMEEYSY0tJjJt0ECb8ESx/nRXpoy9kN42WVQXgaqGyizFAf3jibSiezDQTrrY7f3kywXggCU+kkJEM+OLZQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"jsonc-parser": "^3.0.0", "jsonc-parser": "^3.0.0",
@ -6047,18 +6071,26 @@
} }
}, },
"w3c-xmlserializer": { "w3c-xmlserializer": {
"version": "2.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz", "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-3.0.0.tgz",
"integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==", "integrity": "sha512-3WFqGEgSXIyGhOmAFtlicJNMjEps8b1MG31NCA0/vOF9+nKMUW1ckhi9cnNHmf88Rzw5V+dwIwsm2C7X8k9aQg==",
"dev": true, "dev": true,
"requires": { "requires": {
"xml-name-validator": "^3.0.0" "xml-name-validator": "^4.0.0"
},
"dependencies": {
"xml-name-validator": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
"integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
"dev": true
}
} }
}, },
"webidl-conversions": { "webidl-conversions": {
"version": "6.1.0", "version": "7.0.0",
"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
"integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==", "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
"dev": true "dev": true
}, },
"whatwg-encoding": { "whatwg-encoding": {
@ -6077,24 +6109,13 @@
"dev": true "dev": true
}, },
"whatwg-url": { "whatwg-url": {
"version": "9.1.0", "version": "10.0.0",
"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-9.1.0.tgz", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-10.0.0.tgz",
"integrity": "sha512-CQ0UcrPHyomtlOCot1TL77WyMIm/bCwrJ2D6AOKGwEczU9EpyoqAokfqrf/MioU9kHcMsmJZcg1egXix2KYEsA==", "integrity": "sha512-CLxxCmdUby142H5FZzn4D8ikO1cmypvXVQktsgosNy4a4BHrDHeciBBGZhb0bNoR5/MltoCatso+vFjjGx8t0w==",
"dev": true, "dev": true,
"requires": { "requires": {
"tr46": "^2.1.0", "tr46": "^3.0.0",
"webidl-conversions": "^6.1.0" "webidl-conversions": "^7.0.0"
},
"dependencies": {
"tr46": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
"integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
"dev": true,
"requires": {
"punycode": "^2.1.1"
}
}
} }
}, },
"which": { "which": {

12
package.json
View file

@ -36,14 +36,14 @@
"@types/tape": "^4.13.2", "@types/tape": "^4.13.2",
"@typescript/vfs": "^1.3.5", "@typescript/vfs": "^1.3.5",
"chai": "^4.3.4", "chai": "^4.3.4",
"clean-css": "^5.1.1", "clean-css": "^5.2.2",
"esbuild": "^0.13.13", "esbuild": "^0.13.13",
"esbuild-plugin-alias": "^0.2.0", "esbuild-plugin-alias": "^0.2.1",
"event-stream": "4.0.1", "event-stream": "4.0.1",
"glob": "^7.2.0", "glob": "^7.2.0",
"gulp": "^4.0.2", "gulp": "^4.0.2",
"husky": "^7.0.4", "husky": "^7.0.4",
"jsdom": "^17.0.0", "jsdom": "^18.1.0",
"jsonc-parser": "^3.0.0", "jsonc-parser": "^3.0.0",
"mocha": "^9.1.3", "mocha": "^9.1.3",
"monaco-editor-core": "0.30.1", "monaco-editor-core": "0.30.1",
@ -53,14 +53,14 @@
"requirejs": "^2.3.6", "requirejs": "^2.3.6",
"rimraf": "^3.0.2", "rimraf": "^3.0.2",
"tape": "^5.3.1", "tape": "^5.3.1",
"terser": "^5.7.0", "terser": "^5.10.0",
"typedoc": "^0.22.7", "typedoc": "^0.22.9",
"typescript": "4.4.4", "typescript": "4.4.4",
"uncss": "https://github.com/uncss/uncss.git#d0adf4bb89ef4f82006f8dd5b40d22a94269e50a", "uncss": "https://github.com/uncss/uncss.git#d0adf4bb89ef4f82006f8dd5b40d22a94269e50a",
"vinyl": "^2.2.1", "vinyl": "^2.2.1",
"vscode-css-languageservice": "^5.1.8", "vscode-css-languageservice": "^5.1.8",
"vscode-html-languageservice": "^4.1.1", "vscode-html-languageservice": "^4.1.1",
"vscode-json-languageservice": "4.1.9", "vscode-json-languageservice": "4.1.10",
"vscode-languageserver-textdocument": "^1.0.2", "vscode-languageserver-textdocument": "^1.0.2",
"vscode-languageserver-types": "3.16.0", "vscode-languageserver-types": "3.16.0",
"vscode-uri": "3.0.2", "vscode-uri": "3.0.2",

741
webpack-plugin/package-lock.json generated
View file

File diff suppressed because it is too large Load diff

14
webpack-plugin/package.json
View file

@ -33,15 +33,15 @@
"monaco-editor": "0.30.x" "monaco-editor": "0.30.x"
}, },
"devDependencies": { "devDependencies": {
"css-loader": "^5.1.1", "css-loader": "^6.5.1",
"file-loader": "^6.2.0", "file-loader": "^6.2.0",
"glob": "^7.1.6", "glob": "^7.2.0",
"style-loader": "^2.0.0", "style-loader": "^3.3.1",
"typescript": "^4.2.3", "typescript": "^4.4.4",
"webpack": "^5.24.3", "webpack": "^5.64.1",
"webpack-cli": "^4.5.0" "webpack-cli": "^4.9.1"
}, },
"dependencies": { "dependencies": {
"loader-utils": "^2.0.0" "loader-utils": "^3.2.0"
} }
} }

12
webpack-plugin/src/index.ts
View file

@ -6,6 +6,7 @@ import { AddWorkerEntryPointPlugin } from './plugins/AddWorkerEntryPointPlugin';
import { languagesArr, EditorLanguage } from './languages'; import { languagesArr, EditorLanguage } from './languages';
import { featuresArr, EditorFeature, NegatedEditorFeature } from './features'; import { featuresArr, EditorFeature, NegatedEditorFeature } from './features';
import { IFeatureDefinition } from './types'; import { IFeatureDefinition } from './types';
import { ILoaderOptions } from './loaders/include';
const INCLUDE_LOADER_PATH = require.resolve('./loaders/include'); const INCLUDE_LOADER_PATH = require.resolve('./loaders/include');
@ -282,17 +283,18 @@ function createLoaderRules(
}; };
})(${JSON.stringify(workerPaths, null, 2)})` })(${JSON.stringify(workerPaths, null, 2)})`
}; };
const options: ILoaderOptions = {
globals,
pre: featurePaths.map((importPath) => resolveMonacoPath(importPath, monacoEditorPath)),
post: languagePaths.map((importPath) => resolveMonacoPath(importPath, monacoEditorPath))
};
return [ return [
{ {
test: /esm[/\\]vs[/\\]editor[/\\]editor.(api|main).js/, test: /esm[/\\]vs[/\\]editor[/\\]editor.(api|main).js/,
use: [ use: [
{ {
loader: INCLUDE_LOADER_PATH, loader: INCLUDE_LOADER_PATH,
options: { options
globals,
pre: featurePaths.map((importPath) => resolveMonacoPath(importPath, monacoEditorPath)),
post: languagePaths.map((importPath) => resolveMonacoPath(importPath, monacoEditorPath))
}
} }
] ]
} }

26
webpack-plugin/src/loaders/include.ts
View file

@ -1,7 +1,15 @@
const loaderUtils = require('loader-utils'); import type { PitchLoaderDefinitionFunction } from 'webpack';
export function pitch(this: any, remainingRequest: any) { export interface ILoaderOptions {
const { globals = undefined, pre = [], post = [] } = loaderUtils.getOptions(this) || {}; globals?: { [key: string]: string };
pre?: string[];
post?: string[];
}
export const pitch: PitchLoaderDefinitionFunction<ILoaderOptions> = function pitch(
remainingRequest
) {
const { globals = undefined, pre = [], post = [] } = this.getOptions() || {};
// HACK: NamedModulesPlugin overwrites existing modules when requesting the same module via // HACK: NamedModulesPlugin overwrites existing modules when requesting the same module via
// different loaders, so we need to circumvent this by appending a suffix to make the name unique // different loaders, so we need to circumvent this by appending a suffix to make the name unique
@ -10,12 +18,16 @@ export function pitch(this: any, remainingRequest: any) {
this._module.userRequest = `include-loader!${this._module.userRequest}`; this._module.userRequest = `include-loader!${this._module.userRequest}`;
} }
const stringifyRequest = (request: string) => {
return JSON.stringify(this.utils.contextify(this.context || this.rootContext, request));
};
return [ return [
...(globals ...(globals
? Object.keys(globals).map((key) => `self[${JSON.stringify(key)}] = ${globals[key]};`) ? Object.keys(globals).map((key) => `self[${JSON.stringify(key)}] = ${globals[key]};`)
: []), : []),
...pre.map((include: any) => `require(${loaderUtils.stringifyRequest(this, include)});`), ...pre.map((include: any) => `require(${stringifyRequest(include)});`),
`module.exports = require(${loaderUtils.stringifyRequest(this, `!!${remainingRequest}`)});`, `module.exports = require(${stringifyRequest(`!!${remainingRequest}`)});`,
...post.map((include: any) => `require(${loaderUtils.stringifyRequest(this, include)});`) ...post.map((include: any) => `require(${stringifyRequest(include)});`)
].join('\n'); ].join('\n');
} };