@plugin-light/shared 1.0.0 → 1.0.2

package/README.md

@@ -11,7 +11,11 @@
 
 除 `t-comm` 外，`plugin-light-shared` 是整个工具库中最底层的依赖。
 
-## 如何使用
+## 1. 作者
+
+**novlan1**
+
+## 2. 如何使用
 
 安装
 
@@ -27,6 +31,6 @@ import { getDeps } from '@plugin-light/shared';
 getDeps(__dirname);
 ```
 
-## 更新日志
+## 3. 更新日志
 
 [点此查看](./CHANGELOG.md)

package/lib/config/index.d.ts

@@ -2,6 +2,10 @@ export declare const PLATFORM_MAP: {
     readonly MP_WX: "mp-weixin";
     readonly MP_QQ: "mp-qq";
     readonly MP_ALIPAY: "mp-alipay";
+    readonly MP_BAIDU: "mp-baidu";
+    readonly MP_TOUTIAO: "mp-toutiao";
+    readonly MP_KUAISHOU: "mp-kuaishou";
+    readonly MP_XHS: "mp-xhs";
     readonly MP_JD: "mp-jd";
     readonly H5: "h5";
 };

package/lib/cross-game-style/config.d.ts

@@ -1 +1,2 @@
 export declare const TIP_STYLE_NAME = "@TIP_STYLE_NAME";
+export declare const DEFAULT_EXT_LIST: string[];

package/lib/cross-game-style/types.d.ts

@@ -1,4 +1,14 @@
 export type ICrossGameStyleOptions = {
+    /**
+     * 要替换的样式文件名，不含后缀，默认空，即从项目的 config.js 中获取
+     */
     styleName?: string | Array<string>;
+    /**
+     * 处理的平台，默认全部，即 ['ALL']
+     */
     platforms?: Array<string>;
+    /**
+     * 要查找的文件后缀，默认 ['scss', 'less']
+     */
+    extList?: Array<string>;
 };

package/lib/index.js

@@ -58,6 +58,10 @@ const PLATFORM_MAP = {
     MP_WX: 'mp-weixin',
     MP_QQ: 'mp-qq',
     MP_ALIPAY: 'mp-alipay',
+    MP_BAIDU: 'mp-baidu',
+    MP_TOUTIAO: 'mp-toutiao',
+    MP_KUAISHOU: 'mp-kuaishou',
+    MP_XHS: 'mp-xhs',
     MP_JD: 'mp-jd',
     H5: 'h5',
 };
@@ -248,6 +252,7 @@ const DEFAULT_KEYS = [
     'MP_WEIXIN',
     'MP_KUAISHOU',
     'MP_JD',
+    'MP_XHS',
     'QUICKAPP_NATIVE',
     'QUICKAPP_WEBVIEW',
     'QUICKAPP_WEBVIEW_HUAWEI',
@@ -409,6 +414,27 @@ function getSubProjectName() {
     return name;
 }
 
+function updateManifestCore(_a) {
+  var path = _a.path,
+    value = _a.value,
+    manifest = _a.manifest;
+  var arr = path.split('.');
+  var len = arr.length;
+  var lastItem = arr[len - 1];
+  var i = 0;
+  var manifestArr = manifest.split(/\n/);
+  for (var index = 0; index < manifestArr.length; index++) {
+    var item = manifestArr[index];
+    if (new RegExp("\"".concat(arr[i], "\"")).test(item)) i = i + 1;
+    if (i === len) {
+      var hasComma = /,/.test(item);
+      manifestArr[index] = item.replace(new RegExp("\"".concat(lastItem, "\"[\\s\\S]*:[\\s\\S]*")), "\"".concat(lastItem, "\": ").concat(value).concat(hasComma ? ',' : ''));
+      break;
+    }
+  }
+  return manifestArr.join('\n');
+}
+
 // 读取 manifest.json ，修改后重新写入
 const manifestPath = `${process.env.UNI_INPUT_DIR}/manifest.json`;
 let originManifest = '';
@@ -418,26 +444,12 @@ try {
 catch (err) {
 }
 let Manifest = originManifest;
-function replaceManifest(path, value) {
-    const arr = path.split('.');
-    const len = arr.length;
-    const lastItem = arr[len - 1];
-    let i = 0;
-    const ManifestArr = Manifest.split(/\n/);
-    for (let index = 0; index < ManifestArr.length; index++) {
-        const item = ManifestArr[index];
-        if (new RegExp(`"${arr[i]}"`).test(item))
-            i = i + 1;
-        if (i === len) {
-            const hasComma = /,/.test(item);
-            ManifestArr[index] = item.replace(new RegExp(`"${lastItem}"[\\s\\S]*:[\\s\\S]*`), `"${lastItem}": ${value}${hasComma ? ',' : ''}`);
-            break;
-        }
-    }
-    Manifest = ManifestArr.join('\n');
-}
 function updateManifest(path, value) {
-    replaceManifest(path, value);
+    Manifest = updateManifestCore({
+        path,
+        value,
+        manifest: Manifest,
+    });
     fs__namespace.writeFileSync(manifestPath, Manifest, {
         flag: 'w',
     });
@@ -488,6 +500,10 @@ const isQuickappUnion = () => getPlatform() === 'quickapp-webview-union';
 const isQuickappHuawei = () => getPlatform() === 'quickapp-webview-huawei';
 
 const TIP_STYLE_NAME = '@TIP_STYLE_NAME';
+const DEFAULT_EXT_LIST = [
+    'scss',
+    'less',
+];
 
 function getAppDir() {
     if (process.env.VUE_APP_DIR) {
@@ -523,10 +539,20 @@ function tryRemoveImport(source, removeImport = false) {
     }
     return res;
 }
+function findValidFile(fileName, extList) {
+    for (const ext of extList) {
+        const file = `${fileName}.${ext}`;
+        if (fs__namespace.existsSync(file)) {
+            return [ext, file];
+        }
+    }
+    return [];
+}
 function crossGameStyle({ source, options, dir, removeImport = false, }) {
     if (!source.includes(TIP_STYLE_NAME)) {
         return source;
     }
+    const extList = options?.extList || DEFAULT_EXT_LIST;
     let styleName = '';
     // 使用 env.local 的样式 VUE_APP_DIR = module/ingame-nba，即为 nba
     if (options?.styleName) {
@@ -554,11 +580,12 @@ function crossGameStyle({ source, options, dir, removeImport = false, }) {
         }
         styleName = styleName[0] || '';
     }
-    const cssPath = `./css/${styleName}.scss`;
-    const cssAbsolutePath = `${dir}/css/${styleName}.scss`;
-    const exist = fs__namespace.existsSync(cssAbsolutePath);
-    if (exist) {
-        return source.replace(TIP_STYLE_NAME, cssPath);
+    const cssPath = `./css/${styleName}`;
+    const cssAbsolutePath = `${dir}/css/${styleName}`;
+    const found = findValidFile(cssAbsolutePath, extList);
+    if (found.length) {
+        const [ext] = found;
+        return source.replace(TIP_STYLE_NAME, `${cssPath}.${ext}`);
     }
     return tryRemoveImport(source, removeImport);
 }
@@ -635,18 +662,26 @@ function getMpVersionCode() {
     return `
 var uni = (typeof wx !== 'undefined' && wx) 
   || (typeof qq !== 'undefined' && qq) 
+  || (typeof swan !== 'undefined' && swan)
   || (typeof jd !== 'undefined' && jd)
+  || (typeof tt !== 'undefined' && tt)
+  || (typeof kuaishou !== 'undefined' && kuaishou)
+  || (typeof xhs !== 'undefined' && xhs)
   || (typeof my !== 'undefined' && my);
 
 var miniProgram = (uni.getAccountInfoSync && uni.getAccountInfoSync().miniProgram) || {};
-var systemInfo = (uni.getSystemInfoSync && uni.getSystemInfoSync()) || {};
+var { envVersion = '', version = '' } = miniProgram;
+function getSystemInfo() {
+  return (uni.getSystemInfoSync && uni.getSystemInfoSync()) || {};
+}
+
+var { pixelRatio } = (uni.getWindowInfo && uni.getWindowInfo()) || getSystemInfo();
+var { brand, model, pixelRatio } = (uni.getDeviceInfo && uni.getDeviceInfo()) || getSystemInfo();
 var envVersionMap = {
   develop: '开发版',
   trial: '体验版',
   release: '正式版'
-}
-var { envVersion = '', version = '' } = miniProgram;
-var { brand, model, pixelRatio } = systemInfo;
+};
 var versionDesc = \`\${envVersion}(\${envVersionMap[envVersion] || ''})\`;
 
 console.info('[system]', '');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plugin-light/shared",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "homepage": "https://novlan1.github.io/docs/plugin-light/zh/plugin-light-shared.html",
   "bugs": {
     "url": "https://github.com/novlan1/plugin-light/issues"
@@ -16,7 +16,7 @@
     "lib/"
   ],
   "dependencies": {
-    "t-comm": "^1.5.40"
+    "t-comm": "^3.0.3"
   },
   "scripts": {
     "build": "rm -rf lib && rollup -c",