From 7cdedb7d2090b66f01d6562d3ef9f8c642291566 Mon Sep 17 00:00:00 2001 From: Jim Laurie Date: Thu, 19 Oct 2017 18:30:37 +0200 Subject: [PATCH] Fix ejs --- docs/3.x.x/en/migration/migration-guide.md | 4 ++++ .../.editorconfig | 0 .../.gitignore | 0 .../.npmignore | 0 .../LICENSE.md | 0 .../README.md | 0 .../lib/index.js | 3 ++- .../package.json | 5 +++-- packages/strapi/lib/core/hooks.js | 3 ++- packages/strapi/lib/core/middlewares.js | 20 ++++++++++++++++++- 10 files changed, 30 insertions(+), 5 deletions(-) rename packages/{strapi-views => strapi-middleware-views}/.editorconfig (100%) rename packages/{strapi-views => strapi-middleware-views}/.gitignore (100%) rename packages/{strapi-views => strapi-middleware-views}/.npmignore (100%) rename packages/{strapi-views => strapi-middleware-views}/LICENSE.md (100%) rename packages/{strapi-views => strapi-middleware-views}/README.md (100%) rename packages/{strapi-views => strapi-middleware-views}/lib/index.js (97%) rename packages/{strapi-views => strapi-middleware-views}/package.json (93%) diff --git a/docs/3.x.x/en/migration/migration-guide.md b/docs/3.x.x/en/migration/migration-guide.md index 434806844e..dec61ddd51 100644 --- a/docs/3.x.x/en/migration/migration-guide.md +++ b/docs/3.x.x/en/migration/migration-guide.md @@ -340,6 +340,10 @@ It works exactly as before. You need to add `strapi-views` into your app's depen ```json { "views": { + "enabled": true, + "map": { + "ejs": "ejs" + }, "viewExt": "ejs", "debug": true, "cache": true diff --git a/packages/strapi-views/.editorconfig b/packages/strapi-middleware-views/.editorconfig similarity index 100% rename from packages/strapi-views/.editorconfig rename to packages/strapi-middleware-views/.editorconfig diff --git a/packages/strapi-views/.gitignore b/packages/strapi-middleware-views/.gitignore similarity index 100% rename from packages/strapi-views/.gitignore rename to packages/strapi-middleware-views/.gitignore diff --git a/packages/strapi-views/.npmignore b/packages/strapi-middleware-views/.npmignore similarity index 100% rename from packages/strapi-views/.npmignore rename to packages/strapi-middleware-views/.npmignore diff --git a/packages/strapi-views/LICENSE.md b/packages/strapi-middleware-views/LICENSE.md similarity index 100% rename from packages/strapi-views/LICENSE.md rename to packages/strapi-middleware-views/LICENSE.md diff --git a/packages/strapi-views/README.md b/packages/strapi-middleware-views/README.md similarity index 100% rename from packages/strapi-views/README.md rename to packages/strapi-middleware-views/README.md diff --git a/packages/strapi-views/lib/index.js b/packages/strapi-middleware-views/lib/index.js similarity index 97% rename from packages/strapi-views/lib/index.js rename to packages/strapi-middleware-views/lib/index.js index 499c00f05e..04626e867a 100755 --- a/packages/strapi-views/lib/index.js +++ b/packages/strapi-middleware-views/lib/index.js @@ -10,6 +10,7 @@ const path = require('path'); // Public node modules. const _ = require('lodash'); const consolidate = require('consolidate'); +const views = require('koa-views'); /** * Public assets hook @@ -69,7 +70,7 @@ module.exports = strapi => { }); strapi.app.use( - strapi.koaMiddlewares.views( + views( path.resolve(strapi.config.appPath, strapi.config.paths.views), opts ) diff --git a/packages/strapi-views/package.json b/packages/strapi-middleware-views/package.json similarity index 93% rename from packages/strapi-views/package.json rename to packages/strapi-middleware-views/package.json index 539ce9c707..94ad82dccf 100755 --- a/packages/strapi-views/package.json +++ b/packages/strapi-middleware-views/package.json @@ -1,5 +1,5 @@ { - "name": "strapi-views", + "name": "strapi-middleware-views", "version": "3.0.0-alpha.6.3", "description": "Views hook to enable server-side rendering for the Strapi framework", "homepage": "http://strapi.io", @@ -16,6 +16,7 @@ "main": "./lib", "dependencies": { "consolidate": "^0.14.5", + "koa-views": "^6.1.1", "lodash": "^4.17.4" }, "strapi": { @@ -45,4 +46,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} \ No newline at end of file +} diff --git a/packages/strapi/lib/core/hooks.js b/packages/strapi/lib/core/hooks.js index 1a5139b410..c211652397 100755 --- a/packages/strapi/lib/core/hooks.js +++ b/packages/strapi/lib/core/hooks.js @@ -22,7 +22,8 @@ module.exports = function() { './node_modules/strapi-utils', './node_modules/strapi-generate*', './node_modules/strapi-plugin-*', - './node_modules/strapi-helper-*' + './node_modules/strapi-helper-*', + './node_modules/strapi-middleware-*' ] }, (err, files) => { if (err) { diff --git a/packages/strapi/lib/core/middlewares.js b/packages/strapi/lib/core/middlewares.js index bdf36e9690..37bbf047fd 100755 --- a/packages/strapi/lib/core/middlewares.js +++ b/packages/strapi/lib/core/middlewares.js @@ -46,6 +46,23 @@ module.exports = function() { } ); }), + new Promise((resolve, reject) => { + const cwd = process.cwd(); + + glob( + './node_modules/*(strapi-middleware-*)', + { + cwd + }, + (err, files) => { + if (err) { + return reject(err); + } + + mountMiddlewares.call(this, files, cwd)(resolve, reject); + } + ); + }), new Promise((resolve, reject) => { const cwd = path.resolve(__dirname, '..', 'middlewares'); @@ -124,7 +141,8 @@ const mountMiddlewares = function (files, cwd) { return (resolve, reject) => parallel( files.map(p => cb => { - const name = p.split('/')[1]; + const name = p.replace(/^.\/node_modules\/strapi-middleware-/, './') + .split('/')[1]; this.middleware[name] = { loaded: false