mirror
/
mongo
mirror of https://github.com/mongodb/mongo
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SERVER-105598: Make servers.js a module (#38495) 

GitOrigin-RevId: 235ea01305ec39c1c681eb1158d6302c246f7fb9
This commit is contained in:
Steve McClure 2025-07-14 16:42:10 -04:00 committed by MongoDB Bot
parent d1f0f4f7f2
commit 4a359c01e6
5 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eslint.config.mjs
View File

@ -89,7 +89,7 @@ export default [
QueryHelpers: true, QueryHelpers: true,
___it___: true, ___it___: true,
// src/mongo/shell/servers.d.ts // src/mongo/shell/servers_global.js
MongoRunner: true, MongoRunner: true,
myPort: true, myPort: true,
runMongoProgram: true, runMongoProgram: true,

1
src/mongo/shell/BUILD.bazel
View File

@ -322,6 +322,7 @@ MONGO_SERVER_CPP_JS_FILES = [
"feature_compatibility_version_global.js", "feature_compatibility_version_global.js",
"keyvault.js", "keyvault.js",
"servers.js", "servers.js",
"servers_global.js",
"servers_misc.js", "servers_misc.js",
"servers_misc_global.js", "servers_misc_global.js",
] ]

12
src/mongo/shell/servers.js
View File

@ -1,9 +1,6 @@
var MongoRunner, _startMongod, startMongoProgram, runMongoProgram, startMongoProgramNoConnect, var MongoRunner, _startMongod, startMongoProgram, runMongoProgram, startMongoProgramNoConnect,
myPort; myPort;
(function() {
"use strict";
const SIGTERM = 15; const SIGTERM = 15;
var shellVersion = version; var shellVersion = version;
@ -1788,4 +1785,11 @@ myPort = function() {
return 27017; return 27017;
}; };
}());
export {
MongoRunner,
myPort,
runMongoProgram,
startMongoProgram,
startMongoProgramNoConnect,
};

15
src/mongo/shell/servers_global.js Normal file
View File

@ -0,0 +1,15 @@
// Populate global variables from modules for backwards compatibility
import {
MongoRunner,
myPort,
runMongoProgram,
startMongoProgram,
startMongoProgramNoConnect
} from "src/mongo/shell/servers.js";
globalThis.MongoRunner = MongoRunner;
globalThis.myPort = myPort;
globalThis.runMongoProgram = runMongoProgram;
globalThis.startMongoProgram = startMongoProgram;
globalThis.startMongoProgramNoConnect = startMongoProgramNoConnect;

6
src/mongo/shell/shell_utils.cpp
View File

@ -162,6 +162,7 @@ extern const JSFile data_consistency_checker_global;
extern const JSFile feature_compatibility_version; extern const JSFile feature_compatibility_version;
extern const JSFile feature_compatibility_version_global; extern const JSFile feature_compatibility_version_global;
extern const JSFile servers; extern const JSFile servers;
extern const JSFile servers_global;
extern const JSFile servers_misc; extern const JSFile servers_misc;
extern const JSFile servers_misc_global; extern const JSFile servers_misc_global;
} // namespace JSFiles } // namespace JSFiles
@ -1235,17 +1236,16 @@ void initScope(Scope& scope) {
scope.execSetup(JSFiles::bridge); scope.execSetup(JSFiles::bridge);
scope.execSetup(JSFiles::data_consistency_checker); scope.execSetup(JSFiles::data_consistency_checker);
scope.execSetup(JSFiles::feature_compatibility_version); scope.execSetup(JSFiles::feature_compatibility_version);
scope.execSetup(JSFiles::servers);
scope.execSetup(JSFiles::servers_misc); scope.execSetup(JSFiles::servers_misc);
// globals // globals
scope.execSetup(JSFiles::bridge_global); scope.execSetup(JSFiles::bridge_global);
scope.execSetup(JSFiles::data_consistency_checker_global); scope.execSetup(JSFiles::data_consistency_checker_global);
scope.execSetup(JSFiles::feature_compatibility_version_global); scope.execSetup(JSFiles::feature_compatibility_version_global);
scope.execSetup(JSFiles::servers_global);
scope.execSetup(JSFiles::servers_misc_global); scope.execSetup(JSFiles::servers_misc_global);
// scripts
scope.execSetup(JSFiles::servers);
initializeEnterpriseScope(scope); initializeEnterpriseScope(scope);
scope.injectNative("benchRun", BenchRunner::benchRunSync); // alias scope.injectNative("benchRun", BenchRunner::benchRunSync); // alias