create-young-proj 1.2.0 → 1.3.0

package/CHANGELOG.md

@@ -1,6 +1,58 @@
 # Changelog
 
 
+## v1.3.0
+
+[compare changes](https://github.com/BluesYoung-web/create-young-proj/compare/v1.2.1...v1.3.0)
+
+### 🚀 Enhancements
+
+- 🚀 route json -> route yaml ([3ab111c](https://github.com/BluesYoung-web/create-young-proj/commit/3ab111c))
+- 🚀 add missing /get/env api ([a48d2c1](https://github.com/BluesYoung-web/create-young-proj/commit/a48d2c1))
+- 🚀 add @uni-helper/uni-use & @vueuse/core ([bd2d2cf](https://github.com/BluesYoung-web/create-young-proj/commit/bd2d2cf))
+- ⚠️  🚀 360 极速浏览器 13.5 定向兼容-css better ([51d9b33](https://github.com/BluesYoung-web/create-young-proj/commit/51d9b33))
+
+### 🩹 Fixes
+
+- ⚠️  🩹 fix build error ([1a7ad50](https://github.com/BluesYoung-web/create-young-proj/commit/1a7ad50))
+- ⚠️  🩹 360 极速浏览器 13.5 定向兼容 ([e5cefc8](https://github.com/BluesYoung-web/create-young-proj/commit/e5cefc8))
+
+### 🏡 Chore
+
+- 🏡 依赖升级 ([c3bc4b6](https://github.com/BluesYoung-web/create-young-proj/commit/c3bc4b6))
+
+### 🎨 Styles
+
+- 🎨 lint fix ([96c1a4e](https://github.com/BluesYoung-web/create-young-proj/commit/96c1a4e))
+
+#### ⚠️ Breaking Changes
+
+- ⚠️  🚀 360 极速浏览器 13.5 定向兼容-css better ([51d9b33](https://github.com/BluesYoung-web/create-young-proj/commit/51d9b33))
+- ⚠️  🩹 fix build error ([1a7ad50](https://github.com/BluesYoung-web/create-young-proj/commit/1a7ad50))
+- ⚠️  🩹 360 极速浏览器 13.5 定向兼容 ([e5cefc8](https://github.com/BluesYoung-web/create-young-proj/commit/e5cefc8))
+
+### ❤️ Contributors
+
+- 张扬 <bluesyoung_web@163.com>
+
+## v1.2.1
+
+[compare changes](https://github.com/BluesYoung-web/create-young-proj/compare/v1.2.0...v1.2.1)
+
+### 🚀 Enhancements
+
+- 🚀 日志 & 自适应跳转优化 ([1325277](https://github.com/BluesYoung-web/create-young-proj/commit/1325277))
+- 🚀 打印请求者 ua, ip ([59fc41d](https://github.com/BluesYoung-web/create-young-proj/commit/59fc41d))
+- 🚀 缓存配置 ([3573531](https://github.com/BluesYoung-web/create-young-proj/commit/3573531))
+
+### 🔥 Performance
+
+- 🔥 缓存机制优化 ([cbe8bb5](https://github.com/BluesYoung-web/create-young-proj/commit/cbe8bb5))
+
+### ❤️ Contributors
+
+- 张扬 <bluesyoung_web@163.com>
+
 ## v1.2.0
 
 [compare changes](https://github.com/BluesYoung-web/create-young-proj/compare/v1.1.0...v1.2.0)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "create-young-proj",
   "type": "module",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "create project from template",
   "author": "BluesYoung-web",
   "license": "MIT",

package/template-nuxt-admin/nuxt.config.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: zhangyang
- * @Date: 2023-05-25 19:45:20
- * @LastEditTime: 2023-11-07 15:56:03
+ * @Date: 2023-09-21 15:57:55
+ * @LastEditTime: 2023-11-15 11:52:33
  * @Description:
  */
 import { resolve } from 'node:path'
@@ -87,6 +87,8 @@ export default defineNuxtConfig({
       // 兼容钉钉浏览器
       target: 'es2015',
       sourcemap: false,
+      /* hack fix 360 极速浏览器 13.5 不支持 inset */
+      cssTarget: 'chrome61',
     },
     css: {
       preprocessorOptions: {

package/template-nuxt-admin/server/plugins/env.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: zhangyang
  * @Date: 2022-12-30 17:19:42
- * @LastEditTime: 2023-11-07 14:38:26
+ * @LastEditTime: 2023-11-10 16:09:24
  * @Description:
  */
 import { resolve } from 'node:path'
@@ -48,13 +48,19 @@ export default defineNitroPlugin(async (nitroApp) => {
       delete config[key]
   }
 
+  // 仅打包之后格式化日志
+  if (process.env.NODE_ENV !== 'development')
+    useYoungLogger()
+
   console.log('------------------------读取配置文件------------------------')
   console.log(config)
   console.log('-------------------------------------------------------------')
 
-  // 仅打包之后格式化日志
-  if (process.env.NODE_ENV !== 'development')
-    useYoungLogger()
+  nitroApp.hooks.hook('request', (event) => {
+    const headers = event.node.req.headers
+    console.log('ua', headers['user-agent'], 'x-forwarded-for', headers['x-forwarded-for'], 'x-real-ip', headers['x-real-ip'])
+  })
+
 
   nitroApp.hooks.hook('render:html', (html, { event }) => {
     // 直接注入环境变量到前端

package/template-nuxt-website/README.md

@@ -27,6 +27,18 @@ navigateTo({
 
 **`asstes` 内的图片不得大于 4k**，超过大小的图片需要转换为 `webp` 后上传至 `cdn`
 
+### 接口缓存基准时间
+
+开发时可以修改 `nuxt.config.ts -> runtimeConfig -> public -> cacheTime` 的值
+
+部署时调整 `boot.mjs` 中 `NUXT_PUBLIC_CACHE_TIME` 的默认值
+
+**系统环境变量 `NUXT_PUBLIC_CACHE_TIME` 优先级最高！！！**
+
+### 垃圾浏览器
+
+[**360 极速浏览器 13.5 ！！！mdzz**](https://bbs.360.cn/thread-15913525-1-1.html)
+
 ## 特性
 
 - 基于 [@nuxtjs/device](https://github.com/nuxt-modules/device) 的设备判断

package/template-nuxt-website/boot.mjs

@@ -1,12 +1,21 @@
 /*
  * @Author: zhangyang
  * @Date: 2022-09-07 09:31:12
- * @LastEditTime: 2023-05-26 11:21:19
+ * @LastEditTime: 2023-11-10 09:41:43
  * @Description:
  */
 (async () => {
   const env = process.env.DEPLOY_ENV
   const listenPort = process.env.LISTEN_PORT || 3003
+
+  /**
+   * !!! 接口缓存时间基准配置，默认 60s
+   */
+  const NUXT_PUBLIC_CACHE_TIME = 60
+
+  if (!(+process.env.NUXT_PUBLIC_CACHE_TIME > 0))
+    process.env.NUXT_PUBLIC_CACHE_TIME = NUXT_PUBLIC_CACHE_TIME
+
   console.log('当前环境：', env)
   console.log('服务监听端口：', listenPort)
 

package/template-nuxt-website/composables/config.ts

@@ -1,11 +1,17 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-07-26 11:48:46
- * @LastEditTime: 2023-09-27 12:06:20
+ * @LastEditTime: 2023-11-10 10:27:21
  * @Description:
  */
 /**
- * 接口缓存时间，单位为 s
- * todo: 正式部署前按需修改
+ * 接口缓存基准时间，单位为 s
  */
-export const NUXT_PUBLIC_CACHE_TIME = 1
+export const NUXT_PUBLIC_CACHE_TIME = +useRuntimeConfig().public.cacheTime
+
+if (!NUXT_PUBLIC_CACHE_TIME) {
+  console.error('配置异常：缓存基准时长 NUXT_PUBLIC_CACHE_TIME', NUXT_PUBLIC_CACHE_TIME)
+  process.exit(1)
+}
+
+console.log('缓存基准时长 NUXT_PUBLIC_CACHE_TIME：', NUXT_PUBLIC_CACHE_TIME, '秒')

package/template-nuxt-website/composables/utils.ts

@@ -34,8 +34,6 @@ export function closeWindow() {
   window.close()
 }
 
-
-
 export async function showLoading() {
   if (process.server)
     return
@@ -80,5 +78,3 @@ export function injectComponent(El: ReturnType<typeof defineComponent>) {
 
   return onDestroy
 }
-
-

package/template-nuxt-website/nuxt.config.ts

@@ -1,10 +1,9 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-09-21 15:57:55
- * @LastEditTime: 2023-11-08 10:56:04
+ * @LastEditTime: 2023-11-15 11:53:36
  * @Description:
  */
-
 import { resolve } from 'node:path'
 
 // https://nuxt.com/docs/api/configuration/nuxt-config
@@ -88,11 +87,29 @@ export default defineNuxtConfig({
     defaultImage: '/svg/image_placeholder.svg',
   },
 
+  'routeRules': {
+    /**
+     * 页面缓存，配置具体数值会被作为 max-age 的值，不过貌似 true 就足够了
+     * 根据具体情况自行调整各个路径的对应配置
+     */
+    '*': { swr: true },
+  },
+
   'vite': {
     build: {
       // 兼容钉钉浏览器
       target: 'es2015',
       sourcemap: false,
+      /* hack fix 360 极速浏览器 13.5 不支持 inset */
+      cssTarget: 'chrome61',
+    },
+  },
+  'runtimeConfig': {
+    public: {
+      /**
+       * 接口缓存基准时间，会被 NUXT_PUBLIC_CACHE_TIME 环境变量覆盖
+       */
+      cacheTime: 10,
     },
   },
 })

package/template-nuxt-website/package.json

@@ -5,9 +5,9 @@
   "private": true,
   "scripts": {
     "build": "nuxt build",
-    "dev": "nuxt dev --host",
+    "dev": "nuxt dev",
     "generate": "nuxt generate",
-    "preview": "nuxt preview --host",
+    "preview": "nuxt preview",
     "postinstall": "nuxt prepare",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix"
@@ -31,11 +31,10 @@
     "@vueuse/nuxt": "^10.5.0",
     "element-plus": "^2.3.14",
     "eslint": "^8.51.0",
-    "nuxt": "3.7.4",
+    "nuxt": "3.5.1",
     "nuxt-swiper": "^1.2.2",
     "sass": "^1.69.5",
     "typescript": "^5.2.2",
-    "vant": "^4.7.3",
-    "vconsole": "^3.15.1"
+    "vant": "^4.7.3"
   }
 }

package/template-nuxt-website/server/api/get_footer_info.get.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-10-07 16:02:03
- * @LastEditTime: 2023-11-08 10:32:38
+ * @LastEditTime: 2023-11-10 15:02:38
  * @Description:
  */
 import { NUXT_PUBLIC_CACHE_TIME } from '~~/composables/config'
@@ -13,12 +13,12 @@ export default cachedEventHandler(async () => {
     const friend_links: FriendLinkItem[] = [
       {
         title: '来游戏',
-        href: 'https://www.laiyouxi.com'
+        href: 'https://www.laiyouxi.com',
       },
       {
         title: '🌾',
-        href: 'https://mi.com'
-      }
+        href: 'https://mi.com',
+      },
     ]
     const follow_us: FollowItem[] = []
     const about_nav: AboutNavItem[] = []
@@ -47,6 +47,6 @@ export default cachedEventHandler(async () => {
     return false
   }
 }, {
-  maxAge: NUXT_PUBLIC_CACHE_TIME,
+  maxAge: NUXT_PUBLIC_CACHE_TIME * 10,
   swr: true,
 })

package/template-nuxt-website/server/api/get_gray_status.get.ts

@@ -1,10 +1,11 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-06-07 12:06:48
- * @LastEditTime: 2023-11-08 10:30:59
+ * @LastEditTime: 2023-11-10 15:02:45
  * @Description:
  */
 import { NUXT_PUBLIC_CACHE_TIME } from '~~/composables/config'
+
 /**
  * @example 服务端请求示例
  */
@@ -33,6 +34,6 @@ export default cachedEventHandler(async (event) => {
     }
   }
 }, {
-  maxAge: NUXT_PUBLIC_CACHE_TIME * 3,
+  maxAge: NUXT_PUBLIC_CACHE_TIME * 5,
   swr: true,
 })

package/template-nuxt-website/server/api/get_head_nav.get.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-06-07 14:43:38
- * @LastEditTime: 2023-11-08 09:53:14
+ * @LastEditTime: 2023-11-10 15:02:52
  * @Description:
  */
 import { NUXT_PUBLIC_CACHE_TIME } from '~~/composables/config'
@@ -14,7 +14,7 @@ export default cachedEventHandler(async () => {
       { title: '首页', href: '/' },
       { title: '资讯', href: '/news.html' },
       { title: '赛事', href: '/match.html' },
-      { title: '商城', href: '/shop.html' }
+      { title: '商城', href: '/shop.html' },
     ]
     const fromMobile = process.env.PROJECT_NAME === 'mobile'
 
@@ -33,6 +33,6 @@ export default cachedEventHandler(async () => {
     return false
   }
 }, {
-  maxAge: NUXT_PUBLIC_CACHE_TIME,
+  maxAge: NUXT_PUBLIC_CACHE_TIME * 5,
   swr: true,
 })

package/template-nuxt-website/server/api/get_home_banner.get.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-10-07 17:43:38
- * @LastEditTime: 2023-10-09 12:08:35
+ * @LastEditTime: 2023-11-10 15:03:01
  * @Description:
  */
 import { NUXT_PUBLIC_CACHE_TIME } from '~~/composables/config'
@@ -12,8 +12,8 @@ export default cachedEventHandler(async (event) => {
   try {
     const banners: BannerItem[] = [
       {
-        img_url: 'https://master-web-cdn.laiyouxi.com/platform_index/online/files/banner-pc.png'
-      }
+        img_url: 'https://master-web-cdn.laiyouxi.com/platform_index/online/files/banner-pc.png',
+      },
     ]
 
     return banners
@@ -23,6 +23,6 @@ export default cachedEventHandler(async (event) => {
     return false
   }
 }, {
-  maxAge: NUXT_PUBLIC_CACHE_TIME,
+  maxAge: NUXT_PUBLIC_CACHE_TIME * 3,
   swr: true,
 })

package/template-nuxt-website/server/api/get_seo_info.get.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-06-07 14:29:59
- * @LastEditTime: 2023-11-08 09:51:06
+ * @LastEditTime: 2023-11-10 15:03:09
  * @Description:
  */
 import { NUXT_PUBLIC_CACHE_TIME } from '~~/composables/config'

package/template-nuxt-website/server/plugins/init.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: zhangyang
  * @Date: 2022-12-30 17:19:42
- * @LastEditTime: 2023-11-08 10:52:46
+ * @LastEditTime: 2023-11-10 14:59:37
  * @Description:
  */
 import { resolve } from 'node:path'
@@ -9,6 +9,9 @@ import { loadConfig } from 'c12'
 import { useYoungLogger } from '@bluesyoung/logger'
 
 export default defineNitroPlugin(async (nitroApp) => {
+  const IS_PROD = process.env.NODE_ENV !== 'development'
+  console.log('🚀 ~ file: init.ts:13 ~ IS_PROD:', IS_PROD)
+
   const env = (process.env.DEPLOY_ENV as 'dev' | 'test' | 'online') || 'dev'
   const { config } = await loadConfig<Record<string, any>>({
     name: env,
@@ -17,7 +20,7 @@ export default defineNitroPlugin(async (nitroApp) => {
       // 优先读取环境变量中的版本信息(自己打的 Tag)
       NUXT_PUBLIC_CURRENT_VERSION: process.env.PROJECT_VERSION || 'v0.0.1',
       // 日志等级
-      CONSOLA_LEVEL: 1,
+      CONSOLA_LEVEL: 3,
       // 此处可以放置通用的环境变量
       VITE_WECHAT_APPID: 'todo: 微信公众号appid',
       VITE_OSS_URL: `https://master-web-cdn.laiyouxi.com/platform_index/${env}/`,
@@ -45,25 +48,19 @@ export default defineNitroPlugin(async (nitroApp) => {
       delete config[key]
   }
 
-  console.log('------------------------读取配置文件------------------------')
-  console.log(config)
-  console.log('-------------------------------------------------------------')
-
-  const IS_PROD = process.env.NODE_ENV !== 'development'
-  console.log('🚀 ~ file: init.ts:53 ~ IS_PROD:', IS_PROD)
-
   if (IS_PROD) {
     // 格式化日志
-    const { consola } = useYoungLogger()
-    const logger = consola.create({
-      level: +process.env.CONSOLA_LEVEL!,
-    })
-    logger.wrapConsole()
+    useYoungLogger()
   }
 
-  nitroApp.hooks.hook('render:html', async (html, { event }) => {
+  console.log('------------------------读取配置文件------------------------')
+  console.log(config)
+  console.log('-------------------------------------------------------------')
+
+  nitroApp.hooks.hook('request', (event) => {
     const ua = event.node.req.headers['user-agent']
 
+    console.log('ua', ua, 'x-forwarded-for', event.node.req.headers['x-forwarded-for'], 'x-real-ip', event.node.req.headers['x-real-ip'])
     console.log('jump status: ', !config!.DISABLE_AUTO_LOCATION, typeof !config!.DISABLE_AUTO_LOCATION)
 
     if (ua && (IS_PROD && !config!.DISABLE_AUTO_LOCATION)) {
@@ -76,18 +73,19 @@ export default defineNitroPlugin(async (nitroApp) => {
         console.log('🚀 ~ file: init.ts:64 ~ nitroApp.hooks.hook ~ 手机访问 PC 网址:')
         event.node.res.setHeader('Location', process.env.VITE_WEBSITE_MOBILE! + event.node.req.url)
         event.node.res.statusCode = 301
-        return
+        event.node.res.end()
       }
       else if (!isMobile && fromMobile) {
         // PC 访问手机网址
         console.log('🚀 ~ file: init.ts:72 ~ nitroApp.hooks.hook ~ PC 访问手机网址:')
         event.node.res.setHeader('Location', process.env.VITE_WEBSITE_PC! + event.node.req.url)
         event.node.res.statusCode = 301
-        return
+        event.node.res.end()
       }
     }
+  })
 
-    // 网站置灰
+  nitroApp.hooks.hook('render:html', async (html, { event }) => {
     try {
       const {
         is_gray,

package/template-nuxt-website/server/routes/get/env.ts

@@ -0,0 +1,13 @@
+/*
+ * @Author: zhangyang
+ * @Date: 2023-07-20 19:48:12
+ * @LastEditTime: 2023-07-21 11:18:40
+ * @Description:
+ */
+export default defineEventHandler(async (event) => {
+  const envObj = {
+    NUXT_PUBLIC_CURRENT_VERSION: process.env.PROJECT_VERSION || 'v0.0.1',
+  }
+
+  return envObj
+})