Skip to content

Commit

Permalink
[FEATURE] Support UI5 Tooling specVersion 2.0 / Add all ui5 serve mid…
Browse files Browse the repository at this point in the history
…dlewares

- Upgrades UI5 Tooling dependencies to v2.0
- Adds all ui5 serve middlewares (including custom middlewares)
  • Loading branch information
matz3 committed Apr 2, 2020
1 parent ca4ed45 commit fbfcb09
Show file tree
Hide file tree
Showing 11 changed files with 1,203 additions and 181 deletions.
18 changes: 14 additions & 4 deletions lib/framework.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
const normalizer = require("@ui5/project").normalizer;
const middlewareRepository = require("@ui5/server").middlewareRepository;
const ui5Fs = require("@ui5/fs");
const resourceFactory = ui5Fs.resourceFactory;
const ReaderCollectionPrioritized = ui5Fs.ReaderCollectionPrioritized;
Expand Down Expand Up @@ -424,9 +423,20 @@ class Framework {
all
};

// eslint-disable-next-line new-cap
const router = require("express").Router();

// TODO: rework ui5-server API and make public
const MiddlewareManager = require("@ui5/server/lib/middleware/MiddlewareManager");
const middlewareManager = new MiddlewareManager({
tree,
resources
});

await middlewareManager.applyMiddleware(router);

return {
serveResources: middlewareRepository.getMiddleware("serveResources")({resources}),
serveThemes: middlewareRepository.getMiddleware("serveThemes")({resources})
serveResources: router
};
}

Expand Down Expand Up @@ -456,7 +466,7 @@ class Framework {
} else if (config.ui5.useMiddleware !== false) {
config.beforeMiddleware.push("ui5--pauseRequests");
config.middleware.push("ui5--serveResources");
config.middleware.push("ui5--serveThemes");
// config.middleware.push("ui5--serveThemes");
server = await this.setupUI5Server(config.basePath);
}

Expand Down
Loading

0 comments on commit fbfcb09

Please sign in to comment.