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

Fix invalid regex in getWorkerUrl

Browse source 
Fixes a typo introduced in #101 where the rendered regex was not escaped correctly.

```
$ npm run test
ERROR in ../node_modules/monaco-editor/esm/vs/editor/editor.api.js (include-loader!../node_modules/monaco-editor/esm/vs/editor/editor.api.js) 9:15
Module parse failed: Invalid regular expression: /^((http:)|(https:)|(file:)|(/: Unterminated group (9:15)
File was processed with these loaders:
 * ../out/loaders/include.js
You may need an additional loader to handle the result of these loaders.
|           var pathPrefix = typeof __webpack_public_path__ === 'string' ? __webpack_public_path__ : "";
|           var result = (pathPrefix ? stripTrailingSlash(pathPrefix) + '/' : '') + paths[label];
>           if (/^((http:)|(https:)|(file:)|(//))/.test(result)) {
|             var currentUrl = String(window.location);
|             var currentOrigin = currentUrl.substr(0, currentUrl.length - window.location.hash.length - window.location.search.length - window.location.pathname.length);
 @ ./index.js 2:0-77 4:0-13
```

Tested on local.
This commit is contained in:
Alex Brausewetter 2020-02-28 14:36:16 +01:00 • committed by GitHub
parent 9548c68804
commit 88eef5d7d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/index.ts
View file

@ -197,7 +197,7 @@ function createLoaderRules(languages: IFeatureDefinition[], features: IFeatureDe
getWorkerUrl: function (moduleId, label) {
var pathPrefix = ${pathPrefix};
var result = (pathPrefix ? stripTrailingSlash(pathPrefix) + '/' : '') + paths[label];
if (/^((http:)|(https:)|(file:)|(\/\/))/.test(result)) {
if (/^((http:)|(https:)|(file:)|(\\/\\/))/.test(result)) {
var currentUrl = String(window.location);
var currentOrigin = currentUrl.substr(0, currentUrl.length - window.location.hash.length - window.location.search.length - window.location.pathname.length);
if (result.substring(0, currentOrigin.length) !== currentOrigin) {