clwy-express-generator 5.0.10 → 5.0.12

package/bin/express-cli.js

@@ -25,10 +25,9 @@ const args = parseArgs(process.argv.slice(2), {
     f: 'force',
     h: 'help',
     H: 'hogan',
-    v: 'view',
-    o: 'orm'
+    v: 'view'
   },
-  boolean: ['ejs', 'es6', 'force', 'git', 'hbs', 'help', 'hogan', 'pug', 'version', 'orm'],
+  boolean: ['ejs', 'es6', 'force', 'git', 'hbs', 'help', 'hogan', 'pug', 'version'],
   default: { css: true, view: true },
   string: ['css', 'view'],
   unknown: function (s) {
@@ -141,8 +140,9 @@ function createApplication (name, dir, options, done) {
   app.locals.uses.push('cookieParser()')
   pkg.dependencies['cookie-parser'] = '~1.4.7'
 
-  // Env consts
-  env.locals.orm = options.orm
+  // CORS
+  app.locals.modules.cors = 'cors'
+  app.locals.uses.push('cors()')
 
   if (dir !== '.') {
     mkdir(dir, '.')

package/package.json

@@ -2,7 +2,7 @@
   "name": "clwy-express-generator",
   "description": "Express' application generator",
   "homepage": "https://github.com/clwy-cn/clwy-express-generator",
-  "version": "5.0.10",
+  "version": "5.0.12",
   "author": "TJ Holowaychuk <tj@vision-media.ca>",
   "contributors": [
     "Aaron Heckmann <aaron.heckmann+github@gmail.com>",

package/templates/js/app.js.ejs

@@ -3,14 +3,11 @@ var path = require('path');
 <% Object.keys(modules).sort().forEach(function (variable) { -%>
 var <%- variable %> = require('<%- modules[variable] %>');
 <% }); -%>
-
+require('dotenv').config();
 <% if (view) { -%>
 var createError = require('http-errors');
 var errorHandler = require('./middlewares/error-handler');
 <% } -%>
-
-// environment variables
-require('dotenv').config();
 var routes = require('./config/routes');
 
 var app = express();
@@ -28,9 +25,6 @@ app.set('view engine', '<%- view.engine %>');
 app.use(<%- use %>);
 <% }); -%>
 
-// CORS
-app.use(cors());
-
 // routes
 app.use(routes);
 

package/templates/mjs/app.js.ejs

@@ -1,23 +1,18 @@
+import express from 'express'
 import path from 'path'
 import { fileURLToPath } from 'url'
-
-import express from 'express'
 <% Object.keys(modules).sort().forEach(function (variable) { -%>
 import <%- variable %> from '<%- modules[variable] %>'
 <% }) -%>
-
+import 'dotenv/config'
 <% if (view) { -%>
 import createError from 'http-errors'
 import errorHandler from './middlewares/error-handler.js'
 <% } -%>
-
-// environment variables
-import 'dotenv/config'
 import routes from './config/routes.js'
 
-const __dirname = path.dirname(fileURLToPath(import.meta.url))
-
 const app = express()
+const __dirname = path.dirname(fileURLToPath(import.meta.url))
 
 <% if (view) { -%>
 // view engine setup
@@ -32,9 +27,6 @@ app.set('view engine', '<%- view.engine %>')
 app.use(<%- use %>)
 <% }) -%>
 
-// CORS
-app.use(cors())
-
 // routes
 app.use(routes)