5
5
const modules = {
6
6
server : "./lib/server" ,
7
7
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"
20
9
} ;
21
10
22
- const LEGACY_MIDDLEWARE = [
23
- "discovery" , "nonReadRequests" , "serveIndex" ,
24
- "serveResources" , "serveThemes" , "versionInfo"
25
- ] ;
26
11
function exportModules ( exportRoot , modulePaths ) {
27
12
for ( const moduleName in modulePaths ) {
28
13
if ( Object . prototype . hasOwnProperty . call ( modulePaths , moduleName ) ) {
@@ -32,33 +17,11 @@ function exportModules(exportRoot, modulePaths) {
32
17
} else {
33
18
Object . defineProperty ( exportRoot , moduleName , {
34
19
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 ] ) ;
40
21
}
41
22
} ) ;
42
23
}
43
24
}
44
25
}
45
26
}
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
-
64
27
exportModules ( module . exports , modules ) ;
0 commit comments