clwy-express-generator 5.0.1 → 5.0.3

package/README.md

@@ -12,10 +12,10 @@ Forked from [express-generator](https://github.com/expressjs/generator), this pr
 ## Features
 
 - **🚀 Support for ES6 syntax**: The project now supports using ES6 syntax, making the code more modern and concise.
-- **💾 Support for creating Prisma ORM project**: The project now supports integrating Prisma ORM, simplifying database operations.
 - **🔀 Split routes**: The route files are now split into separate files, making them easier to manage and maintain.
 - **📁 Added middleware folder**: A new middleware folder has been added to store various middleware, improving the modularity of the code.
 - **🔧 Added environment variable configuration file**: The project now includes a configuration file for environment variables, making it easier to manage different environments.
+- **🔄 nodemon has been added**: The project now uses nodemon by default, automatically restarting the server during development when file changes are detected.
 
 ## Quick Start
 
@@ -24,7 +24,7 @@ The quickest way to get started with express is to utilize the executable `expre
 Create the app:
 
 ```bash
-$ npx clwy-express-generator --view=ejs --orm --es6 demo && cd demo
+$ npx clwy-express-generator --es6 es6-demo && cd es6-demo
 ```
 
 Install dependencies:
@@ -44,7 +44,7 @@ $ npm start
 This generator can also be further configured with the following command line flags.
 
         --version        output the version number
-    -v, --view <engine>  add view <engine> support (dust|ejs|hbs|hjs|jade|pug|twig|vash|api) (defaults to ejs)
+    -v, --view <engine>  add view <engine> support (dust|ejs|hbs|hjs|pug|twig|vash|api) (defaults to ejs)
         --no-view        use static html instead of view engine
     -c, --css <engine>   add stylesheet <engine> support (less|stylus|compass|sass) (defaults to plain css)
         --git            add .gitignore
@@ -60,10 +60,10 @@ Forked from [express-generator](https://github.com/expressjs/generator)，此项
 ## 功能特性
 
 - **🚀 支持ES6语法**：项目现在支持使用ES6语法，使代码更加现代化和简洁。
-- **💾 支持创建 Prisma ORM 项目**：项目现在支持集成 Prisma ORM，简化了数据库操作。
 - **🔀 分割路由**：路由文件现在被拆分到单独的文件中，使它们更易于管理和维护。
 - **📁 新增中间件文件夹**：添加了一个新的中间件文件夹来存放各种中间件，提高了代码的模块化。
 - **🔧 添加环境变量配置文件**：项目现在包含一个环境变量的配置文件，使管理不同环境变得更加容易。
+- **🔄 增加了 nodemon**: 项目现在默认使用 nodemon，在开发过程中，当文件发生变化时会自动重启服务。
 
 ## 快速开始
 
@@ -72,7 +72,7 @@ Forked from [express-generator](https://github.com/expressjs/generator)，此项
 创建应用：
 
 ```bash
-$ npx clwy-express-generator --view=ejs --orm --es6 demo && cd demo
+$ npx clwy-express-generator --es6 es6-demo && cd es6-demo
 ```
 
 安装依赖：
@@ -92,7 +92,7 @@ $ npm start
 此生成器还可以通过以下命令行标志进行进一步配置。
 
         --version        输出版本号
-    -v, --view <engine>  添加视图引擎 <engine> 支持 (dust|ejs|hbs|hjs|jade|pug|twig|vash|api)（默认为 ejs）
+    -v, --view <engine>  添加视图引擎 <engine> 支持 (dust|ejs|hbs|hjs|pug|twig|vash|api)（默认为 ejs）
         --no-view        使用静态html而不是视图引擎
     -c, --css <engine>   添加样式表引擎 <engine> 支持 (less|stylus|compass|sass)（默认为纯 css）
         --git            添加 .gitignore 文件

package/bin/express-cli.js

@@ -100,9 +100,9 @@ function createApplication (name, dir, options, done) {
       start: 'nodemon ./bin/www'
     },
     dependencies: {
-      debug: '~2.6.9',
-      dotenv: '^16.4.7',
-      express: '~4.17.1'
+      debug: '~4.4.0',
+      dotenv: '^16.5.0',
+      express: '~5.1.0'
     },
     devDependencies: {
       nodemon: '^3.1.9'
@@ -136,7 +136,7 @@ function createApplication (name, dir, options, done) {
   // Cookie parser
   app.locals.modules.cookieParser = 'cookie-parser'
   app.locals.uses.push('cookieParser()')
-  pkg.dependencies['cookie-parser'] = '~1.4.5'
+  pkg.dependencies['cookie-parser'] = '~1.4.7'
 
   // Env vars
   env.locals.orm = options.orm
@@ -152,15 +152,6 @@ function createApplication (name, dir, options, done) {
   mkdir(dir, 'middlewares')
   mkdir(dir, 'utils')
 
-  // copy Prisma templates
-  if (options.orm) {
-    pkg.dependencies.prisma = '^6.2.1'
-    pkg.dependencies['@prisma/client'] = '^6.2.1'
-
-    mkdir(dir, 'prisma')
-    copyTemplateMulti('prisma', dir + '/prisma', '*.prisma')
-  }
-
   // copy css templates
   switch (options.css) {
     case 'less':
@@ -196,7 +187,7 @@ function createApplication (name, dir, options, done) {
   if (options.view) {
     // Copy view templates
     mkdir(dir, 'views')
-    pkg.dependencies['http-errors'] = '~1.7.2'
+    pkg.dependencies['http-errors'] = '~2.0.0'
     copyTemplateMulti(
       options.es6 ? 'mjs/middlewares' : 'js/middlewares',
       dir + '/middlewares', '*.js'
@@ -215,9 +206,6 @@ function createApplication (name, dir, options, done) {
       case 'hjs':
         copyTemplateMulti('views', dir + '/views', '*.hjs')
         break
-      case 'jade':
-        copyTemplateMulti('views', dir + '/views', '*.jade')
-        break
       case 'pug':
         copyTemplateMulti('views', dir + '/views', '*.pug')
         break
@@ -238,22 +226,22 @@ function createApplication (name, dir, options, done) {
     case 'compass':
       app.locals.modules.compass = 'node-compass'
       app.locals.uses.push("compass({ mode: 'expanded' })")
-      pkg.dependencies['node-compass'] = '0.2.3'
+      pkg.dependencies['node-compass'] = '~0.2.4'
       break
     case 'less':
       app.locals.modules.lessMiddleware = 'less-middleware'
       app.locals.uses.push("lessMiddleware(path.join(__dirname, 'public'))")
-      pkg.dependencies['less-middleware'] = '~2.2.1'
+      pkg.dependencies['less-middleware'] = '~3.1.0'
       break
     case 'sass':
       app.locals.modules.sassMiddleware = 'node-sass-middleware'
       app.locals.uses.push("sassMiddleware({\n  src: path.join(__dirname, 'public'),\n  dest: path.join(__dirname, 'public'),\n  indentedSyntax: true, // true = .sass and false = .scss\n  sourceMap: true\n})")
-      pkg.dependencies['node-sass-middleware'] = '0.11.0'
+      pkg.dependencies['node-sass-middleware'] = '~1.1.0'
       break
     case 'stylus':
       app.locals.modules.stylus = 'stylus'
       app.locals.uses.push("stylus.middleware(path.join(__dirname, 'public'))")
-      pkg.dependencies.stylus = '0.54.5'
+      pkg.dependencies.stylus = '~0.64.0'
       break
   }
 
@@ -269,31 +257,27 @@ function createApplication (name, dir, options, done) {
       break
     case 'ejs':
       app.locals.view = { engine: 'ejs' }
-      pkg.dependencies.ejs = '~2.6.1'
+      pkg.dependencies.ejs = '~3.1.10'
       break
     case 'hbs':
       app.locals.view = { engine: 'hbs' }
-      pkg.dependencies.hbs = '~4.0.4'
+      pkg.dependencies.hbs = '~4.2.0'
       break
     case 'hjs':
       app.locals.view = { engine: 'hjs' }
       pkg.dependencies.hjs = '~0.0.6'
       break
-    case 'jade':
-      app.locals.view = { engine: 'jade' }
-      pkg.dependencies.jade = '~1.11.0'
-      break
     case 'pug':
       app.locals.view = { engine: 'pug' }
-      pkg.dependencies.pug = '2.0.0-beta11'
+      pkg.dependencies.pug = '~3.0.3'
       break
     case 'twig':
       app.locals.view = { engine: 'twig' }
-      pkg.dependencies.twig = '~0.10.3'
+      pkg.dependencies.twig = '~1.17.1'
       break
     case 'vash':
       app.locals.view = { engine: 'vash' }
-      pkg.dependencies.vash = '~0.12.6'
+      pkg.dependencies.vash = '~0.13.0'
       break
     default:
       app.locals.view = false
@@ -551,12 +535,11 @@ function usage () {
   console.log('        --pug            add pug engine support')
   console.log('        --hbs            add handlebars engine support')
   console.log('    -H, --hogan          add hogan.js engine support')
-  console.log('    -v, --view <engine>  add view <engine> support (dust|ejs|hbs|hjs|jade|pug|twig|vash) (defaults to ejs)')
+  console.log('    -v, --view <engine>  add view <engine> support (dust|ejs|hbs|hjs|pug|twig|vash) (defaults to ejs)')
   console.log('        --no-view        use static html instead of view engine')
   console.log('    -c, --css <engine>   add stylesheet <engine> support (less|stylus|compass|sass) (defaults to plain css)')
   console.log('        --git            add .gitignore')
   console.log('        --es6            generate ES6 code and module-type project (requires Node 14.x or higher)')
-  console.log('    -o, --orm            specify the ORM to use Prisma')
   console.log('    -f, --force          force on non-empty directory')
   console.log('    --version            output the version number')
   console.log('    -h, --help           output usage information')

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.1",
+  "version": "5.0.3",
   "author": "TJ Holowaychuk <tj@vision-media.ca>",
   "contributors": [
     "Aaron Heckmann <aaron.heckmann+github@gmail.com>",
@@ -27,7 +27,7 @@
   "repository": "expressjs/generator",
   "license": "MIT",
   "dependencies": {
-    "ejs": "2.6.2",
+    "ejs": "3.1.10",
     "minimatch": "3.0.4",
     "minimist": "1.2.5",
     "mkdirp": "0.5.1",
@@ -36,7 +36,7 @@
   "main": "bin/express-cli.js",
   "preferGlobal": true,
   "bin": {
-    "express": "./bin/express-cli.js"
+    "clwy-express": "./bin/express-cli.js"
   },
   "devDependencies": {
     "eslint": "7.32.0",

package/templates/prisma/schema.prisma

@@ -1,14 +0,0 @@
-// This is your Prisma schema file,
-// learn more about it in the docs: https://pris.ly/d/prisma-schema
-
-// Looking for ways to speed up your queries, or scale easily with your serverless or edge functions?
-// Try Prisma Accelerate: https://pris.ly/cli/accelerate-init
-
-generator client {
-  provider = "prisma-client-js"
-}
-
-datasource db {
-  provider = "mysql"
-  url      = env("DATABASE_URL")
-}