@stdex/create 1.1.0 → 1.2.0

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@stdex/create",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "npm init 项目模板 - Project Templates For 'npm init'",
-  "homepage": "https://github.com/anjianshi/stdex-create/",
+  "homepage": "https://github.com/anjianshi/stdex-packages/create/",
   "type": "module",
   "bin": {
     "create": "./src/index.js"
@@ -10,19 +10,20 @@
   "files": [
     "src",
     "templates",
-    "templates/**/.env",
     "!templates/**/node_modules",
-    "!templates/**/.swc"
+    "!templates/**/.swc",
+    "!templates/**/.DS_Store",
+    "!templates/**/dist"
   ],
   "bugs": {
-    "url": "https://github.com/anjianshi/stdex-create/issues",
+    "url": "https://github.com/anjianshi/stdex-packages/issues",
     "email": "anjianshi@gmail.com"
   },
   "license": "MIT",
   "author": "anjianshi <anjianshi@gmail.com>",
   "repository": {
     "type": "git",
-    "url": "github:anjianshi/stdex-create"
+    "url": "github:anjianshi/stdex-packages"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
@@ -32,8 +33,8 @@
     "chalk": "^5.3.0"
   },
   "devDependencies": {
-    "@stdex/presets-eslint-node": "^1.0.2",
-    "@stdex/presets-prettier": "^1.0.2"
+    "@stdex/presets-eslint-node": "1.2.0",
+    "@stdex/presets-prettier": "1.2.0"
   },
   "prettier": "@stdex/presets-prettier/prettierrc",
   "scripts": {

package/src/index.js

@@ -106,6 +106,7 @@ fs.cpSync(templatePath, projectPath, {
 const filesToRename = [
   { from: '_gitignore', to: '.gitignore' },
   { from: '_pnpm-workspace.yaml', to: 'pnpm-workspace.yaml' },
+  { from: '_env', to: '.env' },
 ]
 for (const item of filesToRename) {
   const fromPath = path.join(projectPath, item.from)

package/templates/base/index.js

@@ -1 +1,3 @@
-console.log('hello world')
+export function run() {
+  return 1
+}

package/templates/base/package.json

@@ -8,8 +8,8 @@
     "start": "node index.js"
   },
   "devDependencies": {
-    "@stdex/presets-eslint-base": "latest",
-    "@stdex/presets-prettier": "latest",
+    "@stdex/presets-eslint-base": "workspace:*",
+    "@stdex/presets-prettier": "workspace:*",
     "eslint": "latest"
   },
   "prettier": "@stdex/presets-prettier/prettierrc"

package/templates/miniprogram/package.json

@@ -7,9 +7,9 @@
     "build": "gulp build"
   },
   "devDependencies": {
-    "@stdex/presets-eslint-typescript": "latest",
-    "@stdex/presets-prettier": "latest",
-    "@stdex/presets-typescript": "latest",
+    "@stdex/presets-eslint-typescript": "workspace:*",
+    "@stdex/presets-prettier": "workspace:*",
+    "@stdex/presets-typescript": "workspace:*",
     "@swc/core": "latest",
     "gulp": "latest",
     "gulp-rename": "latest",

package/templates/service/package.json

@@ -16,10 +16,13 @@
     "db-deploy": "prisma generate && prisma migrate deploy"
   },
   "dependencies": {
-    "@stdex/utils": "latest",
+    "@stdex/logging": "workspace:*",
+    "@stdex/utils": "workspace:*",
+    "@stdex/utils-node": "workspace:*",
     "@prisma/adapter-pg": "latest",
     "@prisma/client": "latest",
     "dayjs": "latest",
+    "debug": "latest",
     "dotenv": "latest",
     "lodash": "latest",
     "pg": "latest",
@@ -27,16 +30,17 @@
     "starlight-server": "latest"
   },
   "devDependencies": {
-    "@stdex/presets-eslint-node": "latest",
-    "@stdex/presets-prettier": "latest",
-    "@stdex/presets-typescript": "latest",
+    "@stdex/presets-eslint-node": "workspace:*",
+    "@stdex/presets-prettier": "workspace:*",
+    "@stdex/presets-typescript": "workspace:*",
+    "@types/debug": "latest",
     "@types/lodash": "latest",
     "@types/node": "latest",
     "@types/pg": "latest",
     "concurrently": "latest",
     "eslint": "latest",
     "nodemon": "latest",
-    "prisma": "latest",
+    "prisma": "^7.10.1",
     "tsc-alias": "latest",
     "typescript": "^6.0.3"
   },

package/templates/service/src/cache.ts

@@ -1,7 +1,7 @@
 /**
  * 维护基于 redis 的数据缓存
  */
-import { type CacheOptions, Cache, initRedisLogging } from '@stdex/utils/env-service/redis-cache.js'
+import { type CacheOptions, Cache, initRedisLogging } from '@stdex/utils-node/redis-cache.js'
 import { createClient, type RedisClientType } from 'redis'
 import config from '@/config.js'
 import { rootLogger } from '@/logger.js'
@@ -12,7 +12,7 @@ export const redis: RedisClientType = createClient({
 })
 
 export async function initRedis() {
-  initRedisLogging(redis)
+  initRedisLogging(redis, rootLogger.getChild('redis'))
   await redis.connect()
 }
 

package/templates/service/src/config.ts

@@ -1,6 +1,6 @@
 import path from 'node:path'
-import { getDirectoryPath } from '@stdex/utils/env-node/index.js'
-import { EnvReader } from '@stdex/utils/env-service/index.js'
+import { EnvReader } from '@stdex/utils-node/env-reader.js'
+import { getDirectoryPath } from '@stdex/utils-node/fs.js'
 
 /**
  * 环境信息

package/templates/service/src/controllers/common.ts

@@ -3,7 +3,7 @@ import {
   type AnyController,
   Controller,
   initializeControllers,
-} from '@stdex/utils/env-service/index.js'
+} from '@stdex/utils/controllers.js'
 import { getTransactionContextedPrismaClient, type AppPrismaClient } from '@/database.js'
 import { type Logger, rootLogger } from '@/logger.js'
 

package/templates/service/src/database.ts

@@ -1,3 +1,4 @@
+import { PrismaPg } from '@prisma/adapter-pg'
 import {
   getPrismaLoggingOptions,
   adaptPrismaLogging,
@@ -8,8 +9,7 @@ import {
   adaptPrismaDebugLogging,
   getTransactionContextedPrismaClient as rawGetTransactionContextedPrismaClient,
   type GetPrismaClientInTransaction,
-} from '@stdex/utils/env-service/prisma/index.js'
-import { PrismaPg } from '@prisma/adapter-pg'
+} from '@stdex/utils-node/prisma/index.js'
 import config from '@/config.js'
 import { rootLogger } from '@/logger.js'
 import { PrismaClient } from '@/prisma/client.js'
@@ -27,7 +27,7 @@ const logger = rootLogger.getChild('prisma')
  * 初始化基础 PrismaClient 实例
  */
 if (config.DEBUG && config.DB_DEBUG) {
-  adaptPrismaDebugLogging(logger)
+  adaptPrismaDebugLogging((name: string) => logger.getChild(name))
 }
 
 const adapter = new PrismaPg({ connectionString: config.DB_URL })

package/templates/service/src/logger.ts

@@ -1,11 +1,10 @@
-import { logger as rootLogger } from '@stdex/utils/env-node/logging/index.js'
-import { Logger, initLogger } from 'starlight-server'
+import { type Logger, logger as rootLogger, adaptDebugLib } from '@stdex/logging'
+import { FileHandler } from '@stdex/logging/handlers'
+import debug from 'debug'
 import config from '@/config.js'
 
-export { Logger, rootLogger }
+export { type Logger, rootLogger }
 
-initLogger(rootLogger, {
-  level: config.DEBUG ? 'debug' : 'info',
-  debugLib: '*',
-  file: { dir: config.LOGS_DIR },
-})
+rootLogger.setLevel(config.DEBUG ? 'debug' : 'info')
+rootLogger.addHandler(new FileHandler({ dir: config.LOGS_DIR }))
+adaptDebugLib(debug, '*', rootLogger)

package/templates/service/src/tasks/common.ts

@@ -1,4 +1,5 @@
-import { TaskManager } from '@stdex/utils/env-service/index.js'
+import { type Logger } from '@stdex/logging'
+import { TaskManager } from '@stdex/utils/task-manager.js'
 import {
   type Controllers,
   controllerClasses,
@@ -10,10 +11,10 @@ interface Context {
   db: AppPrismaClient
   controllers: Controllers
 }
-class AppTaskManager extends TaskManager<Context> {
+class AppTaskManager extends TaskManager<Context, Logger> {
   getContext(name: string) {
     const db = getTransactionContextedPrismaClient()
-    const controllersLogger = this.baseLogger.getChild(name).getChild('controllers')
+    const controllersLogger = this.logger?.getChild(name).getChild('controllers')
     const controllers = initializeAppControllers(controllerClasses, db, controllersLogger)
     return {
       db,

package/templates/service/src/tasks/demo-school.ts

@@ -1,6 +1,10 @@
 import { tasks } from './common.js'
 
-tasks.run('check-schools', 1000 * 60, async ({ db }, logger) => {
-  const count = await db.school.count({})
-  logger.info(`学校数量：${count}`)
+void tasks.run({
+  name: 'check-schools',
+  interval: 1000 * 60,
+  async executor({ db }, logger) {
+    const count = await db.school.count({})
+    logger?.info(`学校数量：${count}`)
+  },
 })

package/templates/site/package.json

@@ -10,7 +10,9 @@
   },
   "prettier": "@stdex/presets-prettier/prettierrc",
   "dependencies": {
-    "@stdex/utils": "latest",
+    "@stdex/logging": "workspace:*",
+    "@stdex/utils": "workspace:*",
+    "@stdex/utils-frontend": "workspace:*",
     "@ant-design/cssinjs": "latest",
     "@ant-design/icons": "latest",
     "@emotion/react": "latest",
@@ -22,9 +24,9 @@
     "react-router": "latest"
   },
   "devDependencies": {
-    "@stdex/presets-eslint-react": "latest",
-    "@stdex/presets-prettier": "latest",
-    "@stdex/presets-typescript": "latest",
+    "@stdex/presets-eslint-react": "workspace:*",
+    "@stdex/presets-prettier": "workspace:*",
+    "@stdex/presets-typescript": "workspace:*",
     "@swc/plugin-emotion": "latest",
     "@types/lodash": "latest",
     "@types/node": "latest",
@@ -32,6 +34,7 @@
     "@types/react-dom": "latest",
     "@vitejs/plugin-react-swc": "latest",
     "eslint": "latest",
+    "typescript": "^6.0.3",
     "vite": "latest",
     "vite-plugin-svgr": "latest"
   }

package/templates/site/src/app/index.tsx

@@ -1,10 +1,10 @@
-import { EmotionCacheProvider } from '@stdex/utils/env-react/emotion'
-import { initDayJs } from '@stdex/utils/init-dayjs'
 import { StyleProvider } from '@ant-design/cssinjs'
+import { EmotionCacheProvider } from '@stdex/utils-frontend/react/emotion.js'
 import { ConfigProvider, App as AntdApp } from 'antd'
 import zhCn from 'antd/locale/zh_CN'
 import { createRoot } from 'react-dom/client'
 import { RouterProvider } from 'react-router/dom'
+import { initDayJs } from '@/lib/init-dayjs.js'
 import { router } from './router'
 
 import './style.css'

package/templates/site/src/index.tsx

@@ -1,5 +1,5 @@
-import '@stdex/utils/env-react/react-register-globals.js'
-import '@stdex/utils/env-react/emotion-register-globals.js'
+import '@stdex/utils-frontend/react/register-globals.js'
+import '@stdex/utils-frontend/react/emotion-register-globals.js'
 import { renderApp } from '@/app/index'
 
 renderApp()

package/templates/site/src/lib/init-dayjs.ts

@@ -0,0 +1,8 @@
+import dayjs from 'dayjs'
+import objectSupport from 'dayjs/plugin/objectSupport.js'
+import 'dayjs/locale/zh-cn.js'
+
+export function initDayJs() {
+  dayjs.extend(objectSupport)
+  dayjs.locale('zh-cn')
+}

package/templates/site/src/lib/logging.ts

@@ -1,11 +1,5 @@
-import { ConsoleHandler } from '@stdex/utils/env-browser/logging.js'
-import { logger, LogLevel } from '@stdex/utils/logging/index.js'
+import { logger, getLogger, LogLevel } from '@stdex/logging'
 import { config } from '@/lib/config.js'
 
 logger.setLevel(config.inDev ? LogLevel.Debug : LogLevel.Info)
-logger.addHandler(new ConsoleHandler())
-export { logger }
-
-export function getLogger(name: string) {
-  return logger.getChild(name)
-}
+export { logger, getLogger }

package/templates/site/src/views/dashboard.tsx

@@ -1,4 +1,4 @@
-import { usePageTitle } from '@stdex/utils/env-react'
+import { usePageTitle } from '@stdex/utils-frontend/react/hooks.js'
 
 export function Dashboard() {
   usePageTitle('信息概览')

package/templates/site/src/views/school-detail.tsx

@@ -1,4 +1,4 @@
-import { usePageTitle } from '@stdex/utils/env-react'
+import { usePageTitle } from '@stdex/utils-frontend/react/hooks.js'
 import { useParams } from 'react-router'
 import { Breadcrumb } from '@/components/Breadcrumb'
 

package/templates/site/src/views/school-ranking.tsx

@@ -1,4 +1,4 @@
-import { usePageTitle } from '@stdex/utils/env-react'
+import { usePageTitle } from '@stdex/utils-frontend/react/hooks.js'
 
 export function SchoolRanking() {
   usePageTitle('学校排名')

package/templates/site/src/views/schools.tsx

@@ -1,5 +1,5 @@
+import { usePageTitle } from '@stdex/utils-frontend/react/hooks.js'
 import { useNavigate } from 'react-router'
-import { usePageTitle } from '@stdex/utils/env-react'
 
 const schools = [
   { id: 1, name: '学校-1' },

package/templates/site/src/views/setting.tsx

@@ -1,4 +1,4 @@
-import { usePageTitle } from '@stdex/utils/env-react'
+import { usePageTitle } from '@stdex/utils-frontend/react/hooks.js'
 
 export function Setting() {
   usePageTitle('系统设置')

package/templates/site/src/views/student-score.tsx

@@ -1,4 +1,4 @@
-import { usePageTitle } from '@stdex/utils/env-react'
+import { usePageTitle } from '@stdex/utils-frontend/react/hooks.js'
 
 export function StudentScore() {
   usePageTitle('成绩管理')

package/templates/site/src/views/students.tsx

@@ -1,4 +1,4 @@
-import { usePageTitle } from '@stdex/utils/env-react'
+import { usePageTitle } from '@stdex/utils-frontend/react/hooks.js'
 
 export function Students() {
   usePageTitle('学生列表')

package/templates/miniprogram/dist/app.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-const _appdata = require("./lib/app-data");
-App({
-    globalData: (0, _appdata.loadAppData)(),
-    onLaunch () {}
-});

package/templates/miniprogram/dist/app.json

@@ -1,16 +0,0 @@
-{
-  "pages": ["pages/index/index"],
-  "window": {},
-  "style": "v2",
-  "renderer": "skyline",
-  "rendererOptions": {
-    "skyline": {
-      "disableABTest": true,
-      "sdkVersionBegin": "3.0.0",
-      "sdkVersionEnd": "15.255.255"
-    }
-  },
-  "componentFramework": "glass-easel",
-  "sitemapLocation": "sitemap.json",
-  "lazyCodeLoading": "requiredComponents"
-}

package/templates/miniprogram/dist/lib/app-data.js

@@ -1,51 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: all[name]
-    });
-}
-_export(exports, {
-    getAppData: function() {
-        return getAppData;
-    },
-    loadAppData: function() {
-        return loadAppData;
-    },
-    setAppData: function() {
-        return setAppData;
-    }
-});
-const initialAppData = {
-    count: 0
-};
-// -------------------------------
-const dataKey = 'app-data-v1';
-function loadAppData() {
-    return wx.getStorageSync(dataKey) || initialAppData;
-}
-function getAppData() {
-    return getApp().globalData;
-}
-function setAppData(dataOrCallback) {
-    let data;
-    if (typeof dataOrCallback === 'function') {
-        const origData = getAppData();
-        const result = dataOrCallback(origData);
-        if (typeof result === 'object') data = result;
-        else data = origData;
-    } else {
-        data = dataOrCallback;
-    }
-    getApp().globalData = data;
-    wx.setStorage({
-        key: dataKey,
-        data,
-        fail (e) {
-            console.log('保存 appData 失败', e);
-        }
-    });
-}

package/templates/miniprogram/dist/pages/index/index.js

@@ -1,20 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-const _appdata = require("../../lib/app-data");
-Page({
-    data: {
-        count: (0, _appdata.getAppData)().count
-    },
-    click () {
-        const count = this.data.count + 1;
-        this.setData({
-            count
-        });
-        (0, _appdata.setAppData)((current)=>({
-                ...current,
-                count
-            }));
-    }
-});

package/templates/miniprogram/dist/pages/index/index.json

@@ -1,3 +0,0 @@
-{
-  "usingComponents": {}
-}

package/templates/miniprogram/dist/pages/index/index.wxml

@@ -1 +0,0 @@
-<view class="count" bind:tap="click">当前计数：{{count}}</view>

package/templates/miniprogram/dist/pages/index/index.wxss

@@ -1,11 +0,0 @@
-page {
-  align-items: center;
-  justify-content: center;
-}
-
-.count {
-  background-color: #fcfcfc;
-  border-radius: 12rpx;
-  border: 1px solid #f0f0f0;
-  padding: 100rpx 50rpx;
-}

package/templates/miniprogram/dist/sitemap.json

@@ -1,9 +0,0 @@
-{
-  "desc": "关于本文件的更多信息，请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
-  "rules": [
-    {
-      "action": "allow",
-      "page": "*"
-    }
-  ]
-}