Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adopt latest loader #161129

Merged
merged 1 commit into from
Sep 17, 2022
Merged

Adopt latest loader #161129

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
33 changes: 9 additions & 24 deletions src/vs/loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,9 +291,6 @@ var AMDLoader;
if (typeof options.isBuild !== 'boolean') {
options.isBuild = false;
}
if (typeof options.buildForceInvokeFactory !== 'object') {
options.buildForceInvokeFactory = {};
}
if (typeof options.paths !== 'object') {
options.paths = {};
}
Expand Down Expand Up @@ -326,9 +323,6 @@ var AMDLoader;
if (typeof options.preferScriptTags === 'undefined') {
options.preferScriptTags = false;
}
if (!Array.isArray(options.nodeModules)) {
options.nodeModules = [];
}
if (options.nodeCachedData && typeof options.nodeCachedData === 'object') {
if (typeof options.nodeCachedData.seed !== 'string') {
options.nodeCachedData.seed = 'seed';
Expand Down Expand Up @@ -374,19 +368,13 @@ var AMDLoader;
this._env = env;
this.options = ConfigurationOptionsUtil.mergeConfigurationOptions(options);
this._createIgnoreDuplicateModulesMap();
this._createNodeModulesMap();
this._createSortedPathsRules();
if (this.options.baseUrl === '') {
if (this.options.nodeRequire && this.options.nodeRequire.main && this.options.nodeRequire.main.filename && this._env.isNode) {
var nodeMain = this.options.nodeRequire.main.filename;
var dirnameIndex = Math.max(nodeMain.lastIndexOf('/'), nodeMain.lastIndexOf('\\'));
this.options.baseUrl = nodeMain.substring(0, dirnameIndex + 1);
}
if (this.options.nodeMain && this._env.isNode) {
var nodeMain = this.options.nodeMain;
var dirnameIndex = Math.max(nodeMain.lastIndexOf('/'), nodeMain.lastIndexOf('\\'));
this.options.baseUrl = nodeMain.substring(0, dirnameIndex + 1);
}
}
}
Configuration.prototype._createIgnoreDuplicateModulesMap = function () {
Expand All @@ -396,14 +384,6 @@ var AMDLoader;
this.ignoreDuplicateModulesMap[this.options.ignoreDuplicateModules[i]] = true;
}
};
Configuration.prototype._createNodeModulesMap = function () {
// Build a map out of nodeModules array
this.nodeModulesMap = Object.create(null);
for (var _i = 0, _a = this.options.nodeModules; _i < _a.length; _i++) {
var nodeModule = _a[_i];
this.nodeModulesMap[nodeModule] = true;
}
};
Configuration.prototype._createSortedPathsRules = function () {
var _this = this;
// Create an array our of the paths rules, sorted descending by length to
Expand Down Expand Up @@ -482,8 +462,8 @@ var AMDLoader;
*/
Configuration.prototype.moduleIdToPaths = function (moduleId) {
if (this._env.isNode) {
var isNodeModule = ((this.nodeModulesMap[moduleId] === true)
|| (this.options.amdModulesPattern instanceof RegExp && !this.options.amdModulesPattern.test(moduleId)));
var isNodeModule = (this.options.amdModulesPattern instanceof RegExp
&& !this.options.amdModulesPattern.test(moduleId));
if (isNodeModule) {
// This is a node module...
if (this.isBuild()) {
Expand Down Expand Up @@ -545,8 +525,13 @@ var AMDLoader;
return true;
}
// during a build, only explicitly marked or anonymous modules get their factories invoked
return (this.options.buildForceInvokeFactory[strModuleId]
|| AMDLoader.Utilities.isAnonymousModule(strModuleId));
if (AMDLoader.Utilities.isAnonymousModule(strModuleId)) {
return true;
}
if (this.options.buildForceInvokeFactory && this.options.buildForceInvokeFactory[strModuleId]) {
return true;
}
return false;
};
/**
* Test if module `moduleId` is expected to be defined multiple times
Expand Down