create-young-proj 1.6.2 → 2.0.0

package/template-nuxt-mobile/package.json

@@ -17,6 +17,7 @@
     "@bluesyoung/logger": "^0.0.1",
     "@bluesyoung/utils": "^0.2.1",
     "c12": "^1.4.2",
+    "h3-proxy": "^1.12.0",
     "http-proxy": "^1.18.1"
   },
   "devDependencies": {

package/template-nuxt-mobile/server/utils/proxy.ts

@@ -1,40 +1,11 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-09-27 11:22:08
- * @LastEditTime: 2023-11-01 19:10:45
+ * @LastEditTime: 2024-03-08 15:04:57
  * @Description:
  */
-import type { ServerOptions as HTTPProxyOptions } from 'http-proxy'
-import ProxyModule from 'http-proxy'
 import type { H3Event } from 'h3'
 
-/**
- * @param target 接口代理的具体地址
- * @param defaults 代理配置
- * @example
- * export default defineEventHandler(async (event) => {
- *   const proxy = createTransparentProxy(`http://127.0.0.1:3333`);
- *   await proxy.handle(event);
- * });
- */
-export function createTransparentProxy(target: string, defaults: HTTPProxyOptions = {}) {
-  const proxy = ProxyModule.createProxy()
-  const handle = (event: H3Event, opts: HTTPProxyOptions = {}) => {
-    return new Promise<void>((resolve, reject) => {
-      proxy.web(event.node.req, event.node.res, { target, ...defaults, ...opts }, (error: any) => {
-        if (error.code !== 'ECONNRESET')
-          reject(error)
-
-        resolve()
-      })
-    })
-  }
-  return {
-    proxy,
-    handle,
-  }
-}
-
 /**
  * 服务端发送的请求
  */

package/template-nuxt-mobile/yarn.lock

@@ -4232,6 +4232,15 @@ gzip-size@^7.0.0:
   dependencies:
     duplexer "^0.1.2"
 
+h3-proxy@^1.12.0:
+  version "1.12.0"
+  resolved "https://registry.npmmirror.com/h3-proxy/-/h3-proxy-1.12.0.tgz#2a25c6df3fae63e8a1183ba234cd100038e0d4ca"
+  integrity sha512-nvYRfRVPyU2Nt3Z5gZoAPp8swUH6XTltV6mRQUnTJHc9UulYcCVyQCZX32tJdGESDvurE18WtjXT8sWWioCzFw==
+  dependencies:
+    consola "^3.2.3"
+    is-glob "^4.0.3"
+    micromatch "^4.0.5"
+
 h3@^1.6.6, h3@^1.8.1, h3@^1.8.2:
   version "1.8.2"
   resolved "https://registry.npmmirror.com/h3/-/h3-1.8.2.tgz#69ea8ca0285c1bb268cd08b9a7017e02939f88b7"

package/template-nuxt-website/package.json

@@ -16,6 +16,7 @@
     "@bluesyoung/logger": "^0.0.1",
     "@bluesyoung/utils": "^0.2.1",
     "c12": "^1.4.2",
+    "h3-proxy": "^1.12.0",
     "http-proxy": "^1.18.1"
   },
   "devDependencies": {

package/template-nuxt-website/server/utils/proxy.ts

@@ -1,40 +1,11 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-09-27 11:22:08
- * @LastEditTime: 2023-11-01 19:10:45
+ * @LastEditTime: 2024-03-08 15:05:53
  * @Description:
  */
-import type { ServerOptions as HTTPProxyOptions } from 'http-proxy'
-import ProxyModule from 'http-proxy'
 import type { H3Event } from 'h3'
 
-/**
- * @param target 接口代理的具体地址
- * @param defaults 代理配置
- * @example
- * export default defineEventHandler(async (event) => {
- *   const proxy = createTransparentProxy(`http://127.0.0.1:3333`);
- *   await proxy.handle(event);
- * });
- */
-export function createTransparentProxy(target: string, defaults: HTTPProxyOptions = {}) {
-  const proxy = ProxyModule.createProxy()
-  const handle = (event: H3Event, opts: HTTPProxyOptions = {}) => {
-    return new Promise<void>((resolve, reject) => {
-      proxy.web(event.node.req, event.node.res, { target, ...defaults, ...opts }, (error: any) => {
-        if (error.code !== 'ECONNRESET')
-          reject(error)
-
-        resolve()
-      })
-    })
-  }
-  return {
-    proxy,
-    handle,
-  }
-}
-
 /**
  * 服务端发送的请求
  */

package/template-nuxt-website/yarn.lock

@@ -4146,6 +4146,15 @@ gzip-size@^7.0.0:
   dependencies:
     duplexer "^0.1.2"
 
+h3-proxy@^1.12.0:
+  version "1.12.0"
+  resolved "https://registry.npmmirror.com/h3-proxy/-/h3-proxy-1.12.0.tgz#2a25c6df3fae63e8a1183ba234cd100038e0d4ca"
+  integrity sha512-nvYRfRVPyU2Nt3Z5gZoAPp8swUH6XTltV6mRQUnTJHc9UulYcCVyQCZX32tJdGESDvurE18WtjXT8sWWioCzFw==
+  dependencies:
+    consola "^3.2.3"
+    is-glob "^4.0.3"
+    micromatch "^4.0.5"
+
 h3@^1.6.6, h3@^1.8.1, h3@^1.8.2:
   version "1.8.2"
   resolved "https://registry.npmmirror.com/h3/-/h3-1.8.2.tgz#69ea8ca0285c1bb268cd08b9a7017e02939f88b7"

package/template-uni-app/README.md

@@ -93,4 +93,9 @@ npm i -g young-commit
 
 2. 创建对应的 `.env.{mode}` 文件
 
-3. 代码中使用 `import.meta.env.{变量名}` 直接读取使用
+3. 代码中使用 `import.meta.env.{变量名}` 直接读取使用
+
+
+## 注意！！！
+
+**`APP` 必须配置 `VITE_API_BASE_URL` 的环境变量用以接口请求**

package/template-uni-app/_env

@@ -1,3 +1,4 @@
 # 此处存放公共配置
-VITE_APPID = tochangetowxappid_dev
+VITE_APPID = tochangetoappid_dev
+VITE_APPNAME = tochangetoappname
 VITE_CUSTOM_LOADING = true

package/template-uni-app/auto-imports.d.ts

@@ -423,7 +423,6 @@ declare module 'vue' {
     readonly effectScope: UnwrapRef<typeof import('vue')['effectScope']>
     readonly extendRef: UnwrapRef<typeof import('@vueuse/core')['extendRef']>
     readonly fingerPrintAuth: UnwrapRef<typeof import('./src/utils/auth')['fingerPrintAuth']>
-    readonly geocoderLocation: UnwrapRef<typeof import('./src/utils/map')['geocoderLocation']>
     readonly getActivePinia: UnwrapRef<typeof import('pinia')['getActivePinia']>
     readonly getAuthInfo: UnwrapRef<typeof import('./src/utils/auth')['getAuthInfo']>
     readonly getCurrentInstance: UnwrapRef<typeof import('vue')['getCurrentInstance']>
@@ -516,7 +515,6 @@ declare module 'vue' {
     readonly resolveRef: UnwrapRef<typeof import('@vueuse/core')['resolveRef']>
     readonly resolveUnref: UnwrapRef<typeof import('@vueuse/core')['resolveUnref']>
     readonly route: UnwrapRef<typeof import('./src/utils/route')['route']>
-    readonly searchLoaction: UnwrapRef<typeof import('./src/utils/map')['searchLoaction']>
     readonly setActivePinia: UnwrapRef<typeof import('pinia')['setActivePinia']>
     readonly setLocationInfo: UnwrapRef<typeof import('./src/store/local/index')['setLocationInfo']>
     readonly setMapStoreSuffix: UnwrapRef<typeof import('pinia')['setMapStoreSuffix']>
@@ -796,7 +794,6 @@ declare module '@vue/runtime-core' {
     readonly effectScope: UnwrapRef<typeof import('vue')['effectScope']>
     readonly extendRef: UnwrapRef<typeof import('@vueuse/core')['extendRef']>
     readonly fingerPrintAuth: UnwrapRef<typeof import('./src/utils/auth')['fingerPrintAuth']>
-    readonly geocoderLocation: UnwrapRef<typeof import('./src/utils/map')['geocoderLocation']>
     readonly getActivePinia: UnwrapRef<typeof import('pinia')['getActivePinia']>
     readonly getAuthInfo: UnwrapRef<typeof import('./src/utils/auth')['getAuthInfo']>
     readonly getCurrentInstance: UnwrapRef<typeof import('vue')['getCurrentInstance']>
@@ -889,7 +886,6 @@ declare module '@vue/runtime-core' {
     readonly resolveRef: UnwrapRef<typeof import('@vueuse/core')['resolveRef']>
     readonly resolveUnref: UnwrapRef<typeof import('@vueuse/core')['resolveUnref']>
     readonly route: UnwrapRef<typeof import('./src/utils/route')['route']>
-    readonly searchLoaction: UnwrapRef<typeof import('./src/utils/map')['searchLoaction']>
     readonly setActivePinia: UnwrapRef<typeof import('pinia')['setActivePinia']>
     readonly setLocationInfo: UnwrapRef<typeof import('./src/store/local/index')['setLocationInfo']>
     readonly setMapStoreSuffix: UnwrapRef<typeof import('pinia')['setMapStoreSuffix']>

package/template-uni-app/custom-plugins/multiconf.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: zhangyang
  * @Date: 2023-07-19 14:32:45
- * @LastEditTime: 2023-11-16 09:57:41
+ * @LastEditTime: 2024-02-01 11:29:08
  * @Description:
  */
 import type { Plugin } from 'vite'
@@ -22,6 +22,9 @@ export function multiConf(env: string) {
     },
     generateBundle(options, bundle) {
       const appid = configEnv.VITE_APPID
+      const appname = configEnv.VITE_APPNAME
+
+      // 微信小程序
       const json = bundle['project.config.json'] as OutputAsset
       if (json?.source && typeof json.source === 'string') {
         const jsonConf = JSON.parse(json.source)
@@ -80,6 +83,15 @@ export function multiConf(env: string) {
 
         app.source = JSON.stringify(appConf, null, 2)
       }
+
+      // APP
+      const manifest = bundle['manifest.json'] as OutputAsset
+      if (manifest?.source && typeof manifest.source === 'string') {
+        const manifestConf = JSON.parse(manifest.source)
+        manifestConf.id = appid
+        manifestConf.name = appname
+        manifest.source = JSON.stringify(manifestConf, null, 2)
+      }
     },
   } as Plugin
 }

package/template-uni-app/package.json

@@ -47,19 +47,19 @@
   "dependencies": {
     "@bluesyoung/http": "^1.2.0",
     "@bluesyoung/utils": "^0.2.1",
-    "@dcloudio/uni-app": "3.0.0-3080720230703001",
-    "@dcloudio/uni-app-plus": "3.0.0-3080720230703001",
-    "@dcloudio/uni-components": "3.0.0-3080720230703001",
-    "@dcloudio/uni-h5": "3.0.0-3080720230703001",
-    "@dcloudio/uni-mp-alipay": "3.0.0-3080720230703001",
-    "@dcloudio/uni-mp-baidu": "3.0.0-3080720230703001",
-    "@dcloudio/uni-mp-jd": "3.0.0-3080720230703001",
-    "@dcloudio/uni-mp-kuaishou": "3.0.0-3080720230703001",
-    "@dcloudio/uni-mp-lark": "3.0.0-3080720230703001",
-    "@dcloudio/uni-mp-qq": "3.0.0-3080720230703001",
-    "@dcloudio/uni-mp-toutiao": "3.0.0-3080720230703001",
-    "@dcloudio/uni-mp-weixin": "3.0.0-3080720230703001",
-    "@dcloudio/uni-quickapp-webview": "3.0.0-3080720230703001",
+    "@dcloudio/uni-app": "3.0.0-3090920231225001",
+    "@dcloudio/uni-app-plus": "3.0.0-3090920231225001",
+    "@dcloudio/uni-components": "3.0.0-3090920231225001",
+    "@dcloudio/uni-h5": "3.0.0-3090920231225001",
+    "@dcloudio/uni-mp-alipay": "3.0.0-3090920231225001",
+    "@dcloudio/uni-mp-baidu": "3.0.0-3090920231225001",
+    "@dcloudio/uni-mp-jd": "3.0.0-3090920231225001",
+    "@dcloudio/uni-mp-kuaishou": "3.0.0-3090920231225001",
+    "@dcloudio/uni-mp-lark": "3.0.0-3090920231225001",
+    "@dcloudio/uni-mp-qq": "3.0.0-3090920231225001",
+    "@dcloudio/uni-mp-toutiao": "3.0.0-3090920231225001",
+    "@dcloudio/uni-mp-weixin": "3.0.0-3090920231225001",
+    "@dcloudio/uni-quickapp-webview": "3.0.0-3090920231225001",
     "@uni-helper/uni-use": "^0.17.1",
     "@vueuse/core": "9",
     "dayjs": "^1.11.10",
@@ -78,11 +78,11 @@
   "devDependencies": {
     "@antfu/eslint-config": "^1.1.2",
     "@dcloudio/types": "^3.4.3",
-    "@dcloudio/uni-automator": "3.0.0-3080720230703001",
-    "@dcloudio/uni-cli-shared": "3.0.0-3080720230703001",
-    "@dcloudio/uni-stacktracey": "3.0.0-3080720230703001",
+    "@dcloudio/uni-automator": "3.0.0-3090920231225001",
+    "@dcloudio/uni-cli-shared": "3.0.0-3090920231225001",
+    "@dcloudio/uni-stacktracey": "3.0.0-3090920231225001",
     "@dcloudio/uni-ui": "^1.4.28",
-    "@dcloudio/vite-plugin-uni": "3.0.0-3080720230703001",
+    "@dcloudio/vite-plugin-uni": "3.0.0-3090920231225001",
     "@types/md5": "^2.3.5",
     "@uni-helper/pages-json-schema": "^0.2.12",
     "@uni-helper/uni-app-types": "^0.5.8",