Skip to content

Commit 77ada85

Browse files
committed
feat: move settings methods to app.settings and deprecate old versions
1 parent 1f311c5 commit 77ada85

File tree

17 files changed

+191
-152
lines changed

17 files changed

+191
-152
lines changed

History.md

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
unreleased
22
========================
33

4+
* Deprecate `.get(setting)`, `.set()`, `.disable()`, `.enable()`, `.enabled()`, `.disabled()` in favor of new
5+
`.settings` api
46
* Remove `utils-merge` dependency - use spread syntax instead
57
* Remove `Object.setPrototypeOf` polyfill
68
* cleanup: remove AsyncLocalStorage check from tests

examples/auth/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ var app = module.exports = express();
1313

1414
// config
1515

16-
app.set('view engine', 'ejs');
17-
app.set('views', path.join(__dirname, 'views'));
16+
app.settings.set('view engine', 'ejs');
17+
app.settings.set('views', path.join(__dirname, 'views'));
1818

1919
// middleware
2020

examples/ejs/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ app.engine('.html', require('ejs').__express);
2424

2525
// Optional since express defaults to CWD/views
2626

27-
app.set('views', path.join(__dirname, 'views'));
27+
app.settings.set('views', path.join(__dirname, 'views'));
2828

2929
// Path to our public directory
3030

@@ -33,7 +33,7 @@ app.use(express.static(path.join(__dirname, 'public')));
3333
// Without this you would need to
3434
// supply the extension to res.render()
3535
// ex: res.render('users.html').
36-
app.set('view engine', 'html');
36+
app.settings.set('view engine', 'html');
3737

3838
// Dummy users
3939
var users = [

examples/error-pages/index.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ var logger = require('morgan');
1111
var silent = process.env.NODE_ENV === 'test'
1212

1313
// general config
14-
app.set('views', path.join(__dirname, 'views'));
15-
app.set('view engine', 'ejs');
14+
app.settings.set('views', path.join(__dirname, 'views'));
15+
app.settings.set('view engine', 'ejs');
1616

1717
// our custom "verbose errors" setting
1818
// which we can use in the templates
1919
// via settings['verbose errors']
20-
app.enable('verbose errors');
20+
app.settings.enable('verbose errors');
2121

2222
// disable them in production
2323
// use $ NODE_ENV=production node examples/error-pages
24-
if (app.settings.env === 'production') app.disable('verbose errors')
24+
if (app.settings.env === 'production') app.settings.disable('verbose errors')
2525

2626
silent || app.use(logger('dev'));
2727

examples/error/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
var express = require('../../');
88
var logger = require('morgan');
99
var app = module.exports = express();
10-
var test = app.get('env') === 'test'
10+
var test = app.settings.get('env') === 'test'
1111

1212
if (!test) app.use(logger('dev'));
1313

examples/markdown/index.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ app.engine('md', function(path, options, fn){
2424
});
2525
});
2626

27-
app.set('views', path.join(__dirname, 'views'));
27+
app.settings.set('views', path.join(__dirname, 'views'));
2828

29-
// make it the default, so we don't need .md
30-
app.set('view engine', 'md');
29+
// make it the default so we dont need .md
30+
app.settings.set('view engine', 'md');
3131

3232
app.get('/', function(req, res){
3333
res.render('index', { title: 'Markdown Example' });

examples/mvc/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ var app = module.exports = express();
1414

1515
// set our default template engine to "ejs"
1616
// which prevents the need for using file extensions
17-
app.set('view engine', 'ejs');
17+
app.settings.set('view engine', 'ejs');
1818

1919
// set views for error and 404 pages
20-
app.set('views', path.join(__dirname, 'views'));
20+
app.settings.set('views', path.join(__dirname, 'views'));
2121

2222
// define a custom res.message() method
2323
// which stores messages in the session

examples/mvc/lib/boot.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ module.exports = function(parent, options){
2424
var url;
2525

2626
// allow specifying the view engine
27-
if (obj.engine) app.set('view engine', obj.engine);
28-
app.set('views', path.join(__dirname, '..', 'controllers', name, 'views'));
27+
if (obj.engine) app.settings.set('view engine', obj.engine);
28+
app.settings.set('views', path.join(__dirname, '..', 'controllers', name, 'views'));
2929

3030
// generate routes based
3131
// on the exported methods

examples/route-separation/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ module.exports = app;
1818

1919
// Config
2020

21-
app.set('view engine', 'ejs');
22-
app.set('views', path.join(__dirname, 'views'));
21+
app.settings.set('view engine', 'ejs');
22+
app.settings.set('views', path.join(__dirname, 'views'));
2323

2424
/* istanbul ignore next */
2525
if (!module.parent) {

examples/view-constructor/github-view.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ function GithubView(name, options){
2424
this.name = name;
2525
options = options || {};
2626
this.engine = options.engines[extname(name)];
27-
// "root" is the app.set('views') setting, however
27+
// "root" is the app.settings.set('views') setting, however
2828
// in your own implementation you could ignore this
2929
this.path = '/' + options.root + '/master/' + name;
3030
}

examples/view-constructor/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ app.engine('md', function(str, options, fn){
2424
});
2525

2626
// pointing to a particular github repo to load files from it
27-
app.set('views', 'expressjs/express');
27+
app.settings.set('views', 'expressjs/express');
2828

2929
// register a new view constructor
30-
app.set('view', GithubView);
30+
app.settings.set('view', GithubView);
3131

3232
app.get('/', function(req, res){
3333
// rendering a view relative to the repo.

examples/view-locals/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ var path = require('node:path');
99
var User = require('./user');
1010
var app = express();
1111

12-
app.set('views', path.join(__dirname, 'views'));
13-
app.set('view engine', 'ejs');
12+
app.settings.set('views', path.join(__dirname, 'views'));
13+
app.settings.set('view engine', 'ejs');
1414

1515
// filter ferrets only
1616

0 commit comments

Comments
 (0)