TheLanc3/code-server
1
0
Fork 0
mirror of https://github.com/coder/code-server.git synced 2026-05-25 21:57:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore(vscode): update to 1.53.2

Browse Source 
These conflicts will be resolved in the following commits. We do it this way so
that PR review is possible.
This commit is contained in:
Joe Previte
2021-02-25 11:27:27 -07:00
parent db3a13ba06 89b6e0164f
commit eae5d8c807
1900 changed files with 83066 additions and 64589 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/vscode/src/vs/loader.js
View File

@@ -36,7 +36,7 @@ var AMDLoader;
this._detect();
return this._isWindows;
},
enumerable: true,
enumerable: false,
configurable: true
});
Object.defineProperty(Environment.prototype, "isNode", {
@@ -44,7 +44,7 @@ var AMDLoader;
this._detect();
return this._isNode;
},
enumerable: true,
enumerable: false,
configurable: true
});
Object.defineProperty(Environment.prototype, "isElectronRenderer", {
@@ -52,7 +52,7 @@ var AMDLoader;
this._detect();
return this._isElectronRenderer;
},
enumerable: true,
enumerable: false,
configurable: true
});
Object.defineProperty(Environment.prototype, "isWebWorker", {
@@ -60,7 +60,7 @@ var AMDLoader;
this._detect();
return this._isWebWorker;
},
enumerable: true,
enumerable: false,
configurable: true
});
Environment.prototype._detect = function () {
@@ -199,6 +199,7 @@ var AMDLoader;
return obj;
}
if (!Array.isArray(obj) && Object.getPrototypeOf(obj) !== Object.prototype) {
// only clone "simple" objects
return obj;
}
var result = Array.isArray(obj) ? [] : {};
@@ -740,8 +741,8 @@ var AMDLoader;
// nothing
}
};
require.resolve = function resolve(request) {
return Module._resolveFilename(request, mod);
require.resolve = function resolve(request, options) {
return Module._resolveFilename(request, mod, false, options);
};
require.main = process.mainModule;
require.extensions = Module._extensions;
@@ -862,7 +863,7 @@ var AMDLoader;
}
};
NodeScriptLoader.prototype._getCachedDataPath = function (config, filename) {
var hash = this._crypto.createHash('md5').update(filename, 'utf8').update(config.seed, 'utf8').digest('hex');
var hash = this._crypto.createHash('md5').update(filename, 'utf8').update(config.seed, 'utf8').update(process.arch, '').digest('hex');
var basename = this._path.basename(filename).replace(/\.js$/, '');
return this._path.join(config.path, basename + "-" + hash + ".code");
};
@@ -1217,6 +1218,7 @@ var AMDLoader;
this._requireFunc = requireFunc;
this._moduleIdProvider = new ModuleIdProvider();
this._config = new AMDLoader.Configuration(this._env);
this._hasDependencyCycle = false;
this._modules2 = [];
this._knownModules2 = [];
this._inverseDependencies2 = [];
@@ -1561,6 +1563,9 @@ var AMDLoader;
result.getStats = function () {
return _this.getLoaderEvents();
};
result.hasDependencyCycle = function () {
return _this._hasDependencyCycle;
};
result.config = function (params, shouldOverwrite) {
if (shouldOverwrite === void 0) { shouldOverwrite = false; }
_this.configure(params, shouldOverwrite);
@@ -1666,6 +1671,7 @@ var AMDLoader;
continue;
}
if (this._hasDependencyPath(dependency.id, module.id)) {
this._hasDependencyCycle = true;
console.warn('There is a dependency cycle between \'' + this._moduleIdProvider.getStrModuleId(dependency.id) + '\' and \'' + this._moduleIdProvider.getStrModuleId(module.id) + '\'. The cyclic path follows:');
var cyclePath = this._findCyclePath(dependency.id, module.id, 0) || [];
cyclePath.reverse();