@baic/yolk-cli 2.1.0-alpha.24 → 2.1.0-alpha.241

package/templates/umi-mobile-uni-app/uni-app/common/request.ts

@@ -0,0 +1,118 @@
+import { REQUEST_HOST } from './constants';
+
+type Options = { baseURL: string };
+
+export type RequestOptions = {
+  loading?: boolean;
+  message?: boolean;
+  needLogin?: boolean;
+};
+
+type ResponseData<T = any> = {
+  code?: string | number;
+  success?: boolean;
+  message?: string;
+  data?: T;
+};
+
+export const getRandomString = (maxLength?: number): string => {
+  return `${Math.random()
+    .toString(36)
+    .substring(2, maxLength && maxLength >= 0 ? maxLength + 2 : 8)}`;
+};
+
+class Request {
+  private options: Options;
+  constructor(options: Options) {
+    this.options = options;
+  }
+  private async request<T = any>(
+    url: string,
+    method: 'GET' | 'POST',
+    params?: Record<string, any>,
+    options?: RequestOptions,
+  ) {
+    const { loading = true, message = true, needLogin = true } = options || {};
+    return new Promise<ResponseData<T>>((resolve, reject) => {
+      if (loading) {
+        uni.showLoading({
+          title: '加载中',
+          mask: true,
+        });
+      }
+      const header: Record<string, string> = {};
+      uni.request({
+        url: `${!/https?/u.test(url) ? this.options.baseURL : ''}${url}${
+          url?.indexOf('?') > 0 ? '&' : '?'
+        }t=${getRandomString(4)}`,
+        method,
+        data: params,
+        header,
+        success(e) {
+          const { data, statusCode } = e;
+          if (loading) {
+            uni.hideLoading();
+          }
+          if (statusCode === 200) {
+            const { success, message: errorMessage } = (data || {}) as any;
+            if (success) {
+              resolve(data as T);
+            } else {
+              if (message) {
+                uni.showToast({
+                  icon: 'none',
+                  title: errorMessage || '系统异常，请重试',
+                });
+              }
+              reject(data);
+            }
+          } else if (statusCode === 401) {
+            if (needLogin) {
+              uni.clearStorageSync();
+            } else {
+              resolve({} as T);
+            }
+          } else {
+            if (message) {
+              if (process.env.NODE_ENV === 'production') {
+                uni.showToast({
+                  icon: 'none',
+                  title: '系统异常，请重试',
+                });
+              } else {
+                uni.showModal({
+                  title: String(statusCode),
+                  content: JSON.stringify(e),
+                  showCancel: false,
+                });
+              }
+            }
+            reject(data);
+          }
+        },
+        fail(e) {
+          if (loading) {
+            uni.hideLoading();
+          }
+          reject(e);
+        },
+      });
+    });
+  }
+  public get<T = any>(
+    url: string,
+    params?: Record<string, any>,
+    options?: RequestOptions,
+  ) {
+    return this.request<T>(url, 'GET', params, options);
+  }
+  public post<T = any>(
+    url: string,
+    params?: Record<string, any>,
+    options?: RequestOptions,
+  ) {
+    return this.request<T>(url, 'POST', params, options);
+  }
+}
+
+export default new Request({ baseURL: REQUEST_HOST });

package/templates/umi-mobile-uni-app/uni-app/common/util.ts

@@ -0,0 +1,27 @@
+import { getRandomString } from './request';
+
+const util = {
+  getRandomString,
+  requestAndroidPermission(permission: string | string[]) {
+    return new Promise<void>((resolve, reject) => {
+      plus.android.requestPermissions(
+        Array.isArray(permission) ? permission : [permission],
+        ({ granted }) => {
+          if (
+            Array.isArray(permission) &&
+            permission.every((item) => granted?.indexOf(item) >= 0)
+          ) {
+            resolve();
+          } else if (granted?.indexOf(permission) >= 0) {
+            resolve();
+          } else {
+            reject();
+          }
+        },
+        reject,
+      );
+    });
+  },
+};
+
+export default util;

package/templates/umi-mobile-uni-app/uni-app/components/webview/webview.vue

@@ -0,0 +1,61 @@
+<style scoped lang="scss">
+</style>
+<template>
+	<web-view v-if="!!src" ref="webview" :style="webviewStyle" :src="src" :update-title="true"
+		:webview-styles="webviewStyles" />
+</template>
+
+<script lang="ts">
+	export default {
+		name: "webview",
+		data() : {
+			webviewStyle ?: string;
+			src ?: string;
+			webviewStyles ?: {
+				progress ?: boolean | {
+					color ?: string;
+				};
+			},
+		} {
+			return {
+				webviewStyle: '',
+				src: '',
+				webviewStyles: {
+					progress: false,
+				},
+			};
+		},
+		props: {
+			url: {
+				type: String,
+				required: true,
+			},
+			data: {
+				type: Object,
+			},
+		},
+		watch: {
+			url: {
+				handler() {
+					this.init();
+				}
+			}
+		},
+		created() {
+			const { url } = this.$props;
+			if (!!url) {
+				this.init();
+			}
+		},
+		beforeDestroy() {
+		},
+		methods: {
+			init() {
+				const { url } = this.$props;
+				if (!!url) {
+					this.src = url;
+				}
+			},
+		},
+	}
+</script>

package/templates/umi-mobile-uni-app/uni-app/hybrid/html/error.html

@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+  <meta name="renderer" content="webkit">
+  <meta name="format-detection" content="telephone=no">
+  <link rel="shortcut icon" href="/favicon.ico">
+  <title>xxx</title>
+  <style>
+    body {
+      margin: 0;
+    }
+    body * {
+      box-sizing: border-box;
+      word-wrap: break-word;
+    }
+  </style>
+</head>
+<body>
+  error
+</body>
+</html>

package/templates/umi-mobile-uni-app/uni-app/images/index.ts

@@ -0,0 +1,2 @@
+export const empty =
+  "data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVQImWNgYGBgAAAABQABh6FO1AAAAABJRU5ErkJggg==";

package/templates/umi-mobile-uni-app/uni-app/index.html

@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <script>
+      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
+        CSS.supports('top: constant(a)'))
+      document.write(
+        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
+        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
+    </script>
+    <title></title>
+    <!--preload-links-->
+    <!--app-context-->
+  </head>
+  <body>
+    <div id="app"><!--app-html--></div>
+    <script type="module" src="/main.js"></script>
+  </body>
+</html>

package/templates/{ice-mobile-native/ios/HBuilder/HBuilder.entitlements → umi-mobile-uni-app/uni-app/info.plist}

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict/>
-</plist>
+  <dict>
+  </dict>
+</plist>

package/templates/umi-mobile-uni-app/uni-app/main.js

@@ -0,0 +1,22 @@
+import App from './App';
+
+// #ifndef VUE3
+import Vue from 'vue';
+import './uni.promisify.adaptor';
+Vue.config.productionTip = false;
+App.mpType = 'app';
+const app = new Vue({
+  ...App,
+});
+app.$mount();
+// #endif
+
+// #ifdef VUE3
+import { createSSRApp } from 'vue';
+export function createApp() {
+  const app = createSSRApp(App);
+  return {
+    app,
+  };
+}
+// #endif

package/templates/umi-mobile-uni-app/uni-app/manifest.json

@@ -0,0 +1,207 @@
+{
+	"name": "xxx",
+	"appid": "xxx",
+	"description": "xxx",
+	"versionName": "1.0.0",
+	"versionCode": 100,
+	/* 5+App特有相关 */
+	"app-plus": {
+		"allowsInlineMediaPlayback": "true",
+		"mediaPlaybackRequiresUserAction": "false",
+		"screenOrientation": ["portrait-primary"],
+		"confusion": {
+			"description": "NVUE原生混淆",
+			"resources": {
+			}
+		},
+		"safearea": {
+			"bottom": {
+				"offset": "none"
+			}
+		},
+		"usingComponents": true,
+		"nvueStyleCompiler": "uni-app",
+		"compilerVersion": 3,
+		"splashscreen": {
+			"alwaysShowBeforeRender": false,
+			"waiting": false,
+			"autoclose": false,
+			"delay": 0
+		},
+		/* 模块配置 */
+		"modules": {
+			"Webview-x5": {}
+		},
+		/* 应用发布信息 */
+		"distribute": {
+			/* android打包配置 */
+			"android": {
+				"permissions": [
+					"<uses-feature android:name=\"android.hardware.camera\"/>",
+					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>",
+					"<uses-permission android:name=\"android.permission.RECEIVE_USER_PRESENT\"/>"
+				],
+				"abiFilters": ["armeabi-v7a", "arm64-v8a"],
+				"minSdkVersion": 21,
+				"schemes": "",
+				"targetSdkVersion": 30
+			},
+			/* ios打包配置 */
+			"ios": {
+				"idfa": false,
+				"dSYMs": false,
+				"urltypes": "",
+				"capabilities": {
+					"entitlements": {
+						"com.apple.developer.associated-domains": [""]
+					}
+				},
+				"CFBundleName": "",
+				"deploymentTarget": "12.2",
+				"privacyDescription": {
+				}
+			},
+			"splashscreen": {
+				"useOriginalMsgbox": true,
+				"androidStyle": "default",
+				"iosStyle": "storyboard",
+				"android": {
+					"hdpi": "assets/storyboard/dc_launchscreen_portrait_background@1x.png",
+					"xhdpi": "assets/storyboard/dc_launchscreen_portrait_background@2x.png",
+					"xxhdpi": "assets/storyboard/dc_launchscreen_portrait_background@3x.png"
+				},
+				"ios": {
+					"storyboard": "assets/storyboard.zip"
+				}
+			},
+			"icons": {
+				"android": {
+					"hdpi": "unpackage/res/icons/72x72.png",
+					"xhdpi": "unpackage/res/icons/96x96.png",
+					"xxhdpi": "unpackage/res/icons/144x144.png",
+					"xxxhdpi": "unpackage/res/icons/192x192.png"
+				},
+				"ios": {
+					"appstore": "unpackage/res/icons/1024x1024.png",
+					"ipad": {
+						"app": "unpackage/res/icons/76x76.png",
+						"app@2x": "unpackage/res/icons/152x152.png",
+						"notification": "unpackage/res/icons/20x20.png",
+						"notification@2x": "unpackage/res/icons/40x40.png",
+						"proapp@2x": "unpackage/res/icons/167x167.png",
+						"settings": "unpackage/res/icons/29x29.png",
+						"settings@2x": "unpackage/res/icons/58x58.png",
+						"spotlight": "unpackage/res/icons/40x40.png",
+						"spotlight@2x": "unpackage/res/icons/80x80.png"
+					},
+					"iphone": {
+						"app@2x": "unpackage/res/icons/120x120.png",
+						"app@3x": "unpackage/res/icons/180x180.png",
+						"notification@2x": "unpackage/res/icons/40x40.png",
+						"notification@3x": "unpackage/res/icons/60x60.png",
+						"settings@2x": "unpackage/res/icons/58x58.png",
+						"settings@3x": "unpackage/res/icons/87x87.png",
+						"spotlight@2x": "unpackage/res/icons/80x80.png",
+						"spotlight@3x": "unpackage/res/icons/120x120.png"
+					}
+				}
+			}
+		},
+		"nvueCompiler": "uni-app",
+		"uniStatistics": {
+			"enable": true
+		},
+		"error" : {
+			"url" : "hybrid/html/error.html"
+		},
+		"nvueLaunchMode": ""
+	},
+	/* 快应用特有相关 */
+	"quickapp": {},
+	/* 小程序特有相关 */
+	"mp-weixin": {
+		"appid": "",
+		"setting": {
+			"urlCheck": false
+		},
+		"usingComponents": true,
+		"uniStatistics": {
+			"enable": true
+		}
+	},
+	"mp-alipay": {
+		"usingComponents": true,
+		"uniStatistics": {
+			"enable": true
+		}
+	},
+	"mp-baidu": {
+		"usingComponents": true,
+		"uniStatistics": {
+			"enable": true
+		}
+	},
+	"mp-toutiao": {
+		"usingComponents": true,
+		"uniStatistics": {
+			"enable": true
+		}
+	},
+	"uniStatistics": {
+		"enable": true,
+		"version": "1"
+	},
+	"vueVersion": "3",
+	"fallbackLocale": "zh-Hans",
+	"locale": "zh-Hans",
+	"h5": {
+		"optimization": {
+			"treeShaking": {
+				"enable": true
+			}
+		},
+		"uniStatistics": {
+			"enable": true
+		}
+	},
+	"mp-jd": {
+		"uniStatistics": {
+			"enable": true
+		}
+	},
+	"mp-kuaishou": {
+		"uniStatistics": {
+			"enable": true
+		}
+	},
+	"mp-lark": {
+		"uniStatistics": {
+			"enable": true
+		}
+	},
+	"mp-qq": {
+		"uniStatistics": {
+			"enable": true
+		}
+	},
+	"quickapp-webview-huawei": {
+		"uniStatistics": {
+			"enable": true
+		}
+	},
+	"quickapp-webview-union": {
+		"uniStatistics": {
+			"enable": true
+		}
+	}
+}

package/templates/umi-mobile-uni-app/uni-app/pages/index/index.vue

@@ -0,0 +1,17 @@
+<style scoped lang="scss">
+</style>
+<template>
+</template>
+
+<script lang="ts">
+
+	export default {
+		data() : {
+		} {
+			return {
+			}
+		},
+		methods: {
+		}
+	}
+</script>

package/templates/umi-mobile-uni-app/uni-app/pages/webview/index.vue

@@ -0,0 +1,19 @@
+<style scoped lang="scss">
+</style>
+<template>
+	<webview ref="webview" :url="url" />
+</template>
+
+<script lang="ts">
+	export default {
+		data() : {
+			url ?: string;
+		} {
+			return {
+			};
+		},
+		async onLoad({ url }) {
+			this.url = decodeURIComponent(url || '');
+		},
+	}
+</script>

package/templates/umi-mobile-uni-app/uni-app/pages.json

@@ -0,0 +1,22 @@
+{
+	"pages": [
+		//pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+		{
+			"path": "pages/index/index"
+		},
+		{
+			"path": "pages/webview/index"
+		}
+	],
+	"globalStyle": {
+		"navigationBarTextStyle": "white",
+		"navigationBarTitleText": "xxx",
+		"backgroundColor": "#FFFFFF",
+		"dynamicRpx": true,
+		"app-plus": {
+			"scrollIndicator": "none",
+			"background": "#FFFFFF",
+			"softinputNavBar": "auto"
+		}
+	}
+}

package/templates/umi-mobile-uni-app/uni-app/uni.promisify.adaptor.js

@@ -0,0 +1,16 @@
+uni.addInterceptor({
+  returnValue(res) {
+    if (
+      !(
+        !!res &&
+        (typeof res === 'object' || typeof res === 'function') &&
+        typeof res.then === 'function'
+      )
+    ) {
+      return res;
+    }
+    return new Promise((resolve, reject) => {
+      res.then((res) => (res[0] ? reject(res[0]) : resolve(res[1])));
+    });
+  },
+});

package/templates/umi-mobile-uni-app/uni-app/uni.scss

@@ -0,0 +1,76 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+
+/* 颜色变量 */
+
+/* 行为相关颜色 */
+$uni-color-primary: #007aff;
+$uni-color-success: #4cd964;
+$uni-color-warning: #f0ad4e;
+$uni-color-error: #dd524d;
+
+/* 文字基本颜色 */
+$uni-text-color: #333; //基本色
+$uni-text-color-inverse: #fff; //反色
+$uni-text-color-grey: #999; //辅助灰色，如加载更多的提示信息
+$uni-text-color-placeholder: #808080;
+$uni-text-color-disable: #c0c0c0;
+
+/* 背景颜色 */
+$uni-bg-color: #fff;
+$uni-bg-color-grey: #f8f8f8;
+$uni-bg-color-hover: #f1f1f1; //点击状态颜色
+$uni-bg-color-mask: rgba(0, 0, 0, 40%); //遮罩颜色
+
+/* 边框颜色 */
+$uni-border-color: #c8c7cc;
+
+/* 尺寸变量 */
+
+/* 文字尺寸 */
+$uni-font-size-sm: 12px;
+$uni-font-size-base: 14px;
+$uni-font-size-lg: 16;
+
+/* 图片尺寸 */
+$uni-img-size-sm: 20px;
+$uni-img-size-base: 26px;
+$uni-img-size-lg: 40px;
+
+/* Border Radius */
+$uni-border-radius-sm: 2px;
+$uni-border-radius-base: 3px;
+$uni-border-radius-lg: 6px;
+$uni-border-radius-circle: 50%;
+
+/* 水平间距 */
+$uni-spacing-row-sm: 5px;
+$uni-spacing-row-base: 10px;
+$uni-spacing-row-lg: 15px;
+
+/* 垂直间距 */
+$uni-spacing-col-sm: 4px;
+$uni-spacing-col-base: 8px;
+$uni-spacing-col-lg: 12px;
+
+/* 透明度 */
+$uni-opacity-disabled: 0.3; // 组件禁用态的透明度
+
+/* 文章场景相关 */
+$uni-color-title: #2c405a; // 文章标题颜色
+$uni-font-size-title: 20px;
+$uni-color-subtitle: #555; // 二级标题颜色
+$uni-font-size-subtitle: 26px;
+$uni-color-paragraph: #3f536e; // 文章段落颜色
+$uni-font-size-paragraph: 15px;

package/templates/umi-web/.eslintrc.js

@@ -0,0 +1,7 @@
+module.exports = {
+  extends: '@baic/eslint-config-yolk',
+  parserOptions: {
+    project: './tsconfig.json',
+    tsconfigRootDir: __dirname,
+  },
+};

package/templates/umi-web/.gitignore.tpl

@@ -4,11 +4,8 @@
 node_modules/
 npm-debug.log*
 npm-error.log*
-package-lock.json
-yarn.lock
 yarn-debug.log*
 yarn-error.log*
-pnpm-lock.yaml
 
 # production
 /dist
@@ -18,10 +15,10 @@ pnpm-lock.yaml
 .DS_Store
 
 # umi
-/src/.umi
-/src/.umi-production
-/src/.umi-test
-/.env.local
+.umi
+.umi-production
+.umi-test
+.env.local
 coverage
 .eslintcache
 .stylelintcache