Skip to content

Commit

Permalink
Merge 7f52be8 into a79091f
Browse files Browse the repository at this point in the history
  • Loading branch information
kethinov committed May 6, 2023
2 parents a79091f + 7f52be8 commit 5415a90
Show file tree
Hide file tree
Showing 6 changed files with 389 additions and 5,414 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

## Next version

- Put your changes here...
- Removed parent-require dependency.
- Various dependencies updated.

## 0.21.8

Expand Down
3 changes: 1 addition & 2 deletions lib/preprocessCss.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ const fs = require('fs-extra')
const path = require('path')
const klawSync = require('klaw-sync')
const CleanCSS = require('clean-css')
const prequire = require('parent-require')
const gitignoreScanner = require('./tools/gitignoreScanner')

module.exports = (app, callback) => {
Expand Down Expand Up @@ -59,7 +58,7 @@ module.exports = (app, callback) => {

// attempt to require that preprocessor
try {
module = prequire(moduleName)
module = require(moduleName)
} catch (err) {
logger.error(`${appName} failed to include your CSS preprocessor! Please ensure that it is declared properly in your package.json and that it has been properly installed to node_modules.`)
logger.warn('CSS preprocessor has been disabled')
Expand Down
5 changes: 2 additions & 3 deletions lib/setExpressConfigs.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
require('@colors/colors')

const morgan = require('morgan') // express logger
const prequire = require('parent-require')
const express = require('express')
const helmet = require('helmet')

Expand All @@ -29,12 +28,12 @@ module.exports = function (app) {
app.set('view engine', viewExt)
}
viewEngine = paramValue[1].trim()
viewModule = prequire(viewEngine)
viewModule = require(viewEngine)
app.set(viewEngine, viewModule)
app.set('view: ' + viewExt, (viewModule.__express ? viewModule.__express : viewModule))
app.engine(viewExt, (viewModule.__express ? viewModule.__express : viewModule))
} catch (e) {
if (e.toString().includes('viewEngine')) {
if (e.toString().includes('viewEngine param formatted incorrectly!')) {
logger.error(`${app.get('appName')} fatal error: viewEngine param must be formatted as "fileExtension: nodeModule"`)
} else {
logger.error('Failed to register viewEngine, please ensure "viewEngine" param is configured properly.')
Expand Down

0 comments on commit 5415a90

Please sign in to comment.