Fixes #1178: Use slashes even on Windows

This commit is contained in:
Alex Dima 2018-11-13 13:36:48 +01:00
parent 96f41a5292
commit f137ccee65
4 changed files with 26 additions and 7 deletions

19
.vscode/launch.json vendored Normal file
View file

@ -0,0 +1,19 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "node",
"request": "launch",
"name": "Gulp Release",
"program": "${workspaceFolder}/node_modules/gulp/bin/gulp.js",
"stopOnEntry": true,
"args": [
"release"
],
"cwd": "${workspaceFolder}"
},
]
}

View file

@ -262,7 +262,7 @@ function ESM_pluginStream(plugin, destinationPath) {
const myFileDestPath = path.join(DESTINATION, plugin.modulePrefix, data.relative); const myFileDestPath = path.join(DESTINATION, plugin.modulePrefix, data.relative);
const importFilePath = path.join(DESTINATION, importText.substr('monaco-editor-core/esm/'.length)); const importFilePath = path.join(DESTINATION, importText.substr('monaco-editor-core/esm/'.length));
let relativePath = path.relative(path.dirname(myFileDestPath), importFilePath); let relativePath = path.relative(path.dirname(myFileDestPath), importFilePath).replace(/\\/g, '/');
if (!/(^\.\/)|(^\.\.\/)/.test(relativePath)) { if (!/(^\.\/)|(^\.\.\/)/.test(relativePath)) {
relativePath = './' + relativePath; relativePath = './' + relativePath;
} }
@ -286,7 +286,7 @@ function ESM_pluginStream(plugin, destinationPath) {
const myFileDestPath = path.join(DESTINATION, plugin.modulePrefix, data.relative); const myFileDestPath = path.join(DESTINATION, plugin.modulePrefix, data.relative);
const apiFilePath = path.join(DESTINATION, 'vs/editor/editor.api'); const apiFilePath = path.join(DESTINATION, 'vs/editor/editor.api');
let relativePath = path.relative(path.dirname(myFileDestPath), apiFilePath); let relativePath = path.relative(path.dirname(myFileDestPath), apiFilePath).replace(/\\/g, '/');
if (!/(^\.\/)|(^\.\.\/)/.test(relativePath)) { if (!/(^\.\/)|(^\.\.\/)/.test(relativePath)) {
relativePath = './' + relativePath; relativePath = './' + relativePath;
} }
@ -360,7 +360,7 @@ function ESM_addPluginContribs(dest) {
metadata.METADATA.PLUGINS.forEach(function(plugin) { metadata.METADATA.PLUGINS.forEach(function(plugin) {
const contribDestPath = path.join(DESTINATION, plugin.contrib); const contribDestPath = path.join(DESTINATION, plugin.contrib);
let relativePath = path.relative(path.dirname(mainFileDestPath), contribDestPath); let relativePath = path.relative(path.dirname(mainFileDestPath), contribDestPath).replace(/\\/g, '/');
if (!/(^\.\/)|(^\.\.\/)/.test(relativePath)) { if (!/(^\.\/)|(^\.\.\/)/.test(relativePath)) {
relativePath = './' + relativePath; relativePath = './' + relativePath;
} }

6
package-lock.json generated
View file

@ -2282,9 +2282,9 @@
"dev": true "dev": true
}, },
"monaco-typescript": { "monaco-typescript": {
"version": "3.3.0", "version": "3.3.1",
"resolved": "https://registry.npmjs.org/monaco-typescript/-/monaco-typescript-3.3.0.tgz", "resolved": "https://registry.npmjs.org/monaco-typescript/-/monaco-typescript-3.3.1.tgz",
"integrity": "sha512-VxlmeaPa07+rnrQi00INcvlMoC/Y1poACSV0brs9EjKbF1DEdpEu9/NAeJmXXApv56ywXviaqtMkCI8JLvId+g==", "integrity": "sha512-sOnMeEgDQmwuwkcj/ElVZ7mF3d0HAiCINGWE9LyOH9wJCQNJaBqa+cSP+wnPiSWQnOshHZ+A2vsA8A7PyXls6Q==",
"dev": true "dev": true
}, },
"ms": { "ms": {

View file

@ -28,7 +28,7 @@
"monaco-html": "2.3.0", "monaco-html": "2.3.0",
"monaco-json": "2.3.0", "monaco-json": "2.3.0",
"monaco-languages": "1.6.0", "monaco-languages": "1.6.0",
"monaco-typescript": "3.3.0", "monaco-typescript": "3.3.1",
"rimraf": "^2.6.2", "rimraf": "^2.6.2",
"typedoc": "^0.11.1", "typedoc": "^0.11.1",
"typescript": "^3.0.1", "typescript": "^3.0.1",