Skip to content

Commit 83a236d

Browse files
committed
[INTERNAL] index: Stop exporting middleware modules
They should be retrieved from the middlewareRepository. However, neither the modules nor the repository is publicly documented. Therefore this is not declared as a breaking change.
1 parent c7b3cf1 commit 83a236d

File tree

3 files changed

+2
-78
lines changed

3 files changed

+2
-78
lines changed

index.js

Lines changed: 2 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,9 @@
55
const modules = {
66
server: "./lib/server",
77
sslUtil: "./lib/sslUtil",
8-
middlewareRepository: "./lib/middleware/middlewareRepository",
9-
10-
// Legacy middleware export. Still private.
11-
middleware: {
12-
csp: "./lib/middleware/csp",
13-
discovery: "./lib/middleware/discovery",
14-
nonReadRequests: "./lib/middleware/discovery",
15-
serveIndex: "./lib/middleware/serveIndex",
16-
serveResources: "./lib/middleware/serveResources",
17-
serveThemes: "./lib/middleware/serveThemes",
18-
versionInfo: "./lib/middleware/versionInfo",
19-
}
8+
middlewareRepository: "./lib/middleware/middlewareRepository"
209
};
2110

22-
const LEGACY_MIDDLEWARE = [
23-
"discovery", "nonReadRequests", "serveIndex",
24-
"serveResources", "serveThemes", "versionInfo"
25-
];
2611
function exportModules(exportRoot, modulePaths) {
2712
for (const moduleName in modulePaths) {
2813
if (Object.prototype.hasOwnProperty.call(modulePaths, moduleName)) {
@@ -32,33 +17,11 @@ function exportModules(exportRoot, modulePaths) {
3217
} else {
3318
Object.defineProperty(exportRoot, moduleName, {
3419
get() {
35-
let m = require(modulePaths[moduleName]);
36-
if (LEGACY_MIDDLEWARE.includes(moduleName)) {
37-
m = mapLegacyMiddlewareArguments(m);
38-
}
39-
return m;
20+
return require(modulePaths[moduleName]);
4021
}
4122
});
4223
}
4324
}
4425
}
4526
}
46-
47-
function mapLegacyMiddlewareArguments(module) {
48-
// Old arguments was a single object with optional properties
49-
// - resourceCollections
50-
// - tree
51-
return function({resourceCollections, tree} = {}) {
52-
const resources = {};
53-
resources.all = resourceCollections.combo;
54-
resources.rootProject = resourceCollections.source;
55-
resources.dependencies = resourceCollections.dependencies;
56-
57-
return module({
58-
resources,
59-
tree
60-
});
61-
};
62-
}
63-
6427
exportModules(module.exports, modules);

test/lib/index.js

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,4 @@ test("index.js exports all expected modules", (t) => {
55
t.truthy(index.server, "Module exported");
66
t.truthy(index.sslUtil, "Module exported");
77
t.truthy(index.middlewareRepository, "Module exported");
8-
9-
t.truthy(index.middleware.csp, "Module exported");
10-
t.truthy(index.middleware.discovery, "Module exported");
11-
t.truthy(index.middleware.nonReadRequests, "Module exported");
12-
t.truthy(index.middleware.serveIndex, "Module exported");
13-
t.truthy(index.middleware.serveResources, "Module exported");
14-
t.truthy(index.middleware.serveThemes, "Module exported");
15-
t.truthy(index.middleware.versionInfo, "Module exported");
168
});

test/lib/indexLegacyExport.js

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)