optimize: paths

CHANGELOG.md

@@ -1,4 +1,5 @@
 # 2.0.4
+* 增加splitHeight配置项，其他优化
 * 优化B站风控相关，新增bili_tiket参数
 * fix Repeated Instantiation Puppeteer
 * 优化获取B站登录ck

package.json

@@ -1,6 +1,6 @@
 {
   "name": "yz-yuki-plugin",
-  "version": "2.0.4-7",
+  "version": "2.0.4-8",
   "description": "优纪插件，yunzaijs 关于 微博推送、B站推送 等功能的拓展插件",
   "author": "snowtafir",
   "type": "module",

src/components/dynamic/Account.tsx

@@ -2,12 +2,13 @@
 // up账户组件
 import React from 'react';
 import LogoText from '@/components/dynamic/LogoText';
-import { _paths } from '@/utils/paths';
-import path from 'path';
+import { _paths, createRequire } from '@/utils/paths';
 
-const Bilibililogo: string = path.join(_paths.pluginResources, 'img/icon/dynamic/bilibili.svg')
-const Weibilogo: string = path.join(_paths.pluginResources, 'img/icon/dynamic/weibo.svg')
-const AccountCss: string = path.join(_paths.pluginResources, 'css/dynamic/Account.css')
+const require = createRequire(import.meta.url);
+
+const Bilibililogo: string = require('./../../../resources/img/icon/dynamic/bilibili.svg')
+const Weibilogo: string = require('./../../../resources/img/icon/dynamic/weibo.svg')
+const AccountCss: string = require('./../../../resources/css/dynamic/Account.css')
 
 type AccountProps = {
   data: {

src/components/dynamic/Content.tsx

@@ -1,11 +1,12 @@
 // DynamicContent.tsx
 import React from 'react';
-import { _paths } from '@/utils/paths';
-import path from 'path';
+import { _paths, createRequire } from '@/utils/paths';
 
-const ContentBoxGrid4Css: string = path.join(_paths.pluginResources, 'css/dynamic/Content.box.grid.4.css')
-const ContentBoxGrid9Css: string = path.join(_paths.pluginResources, 'css/dynamic/Content.box.grid.9.css')
-const ContentCss: string = path.join(_paths.pluginResources, 'css/dynamic/Content.css')
+const require = createRequire(import.meta.url);
+
+const ContentBoxGrid4Css: string = require('./../../resources/css/dynamic/Content.box.grid.4.css')
+const ContentBoxGrid9Css: string = require('./../../resources/css/dynamic/Content.box.grid.9.css')
+const ContentCss: string = require('./../../resources/css/dynamic/Content.css')
 
 type ContentProps = {
   data: {

src/components/dynamic/Footer.tsx

@@ -2,15 +2,17 @@
 import React from 'react';
 import { BOT_NAME, ConfigController } from 'yunzai';
 import Config from '@/utils/config';
-import { _paths } from '@/utils/paths';
 import path from 'path';
+import { _paths, createRequire } from '@/utils/paths';
+
+const require = createRequire(import.meta.url);
 
 const botVersion = ConfigController.package?.version;
 const yukiPluginVersion = Config.getPackageJsonKey('version', path.join(_paths.pluginPath, 'package.json'));
 
-const bilibililogo: string = path.join(_paths.pluginResources, 'img/icon/dynamic/bilibili.svg')
-const weibilogo: string = path.join(_paths.pluginResources, 'img/icon/dynamic/weibo.svg')
-const FooterCss: string = path.join(_paths.pluginResources, 'css/dynamic/Footer.css')
+const bilibililogo: string = require('./../../../resources/img/icon/dynamic/bilibili.svg')
+const weibilogo: string = require('./../../../resources/img/icon/dynamic/weibo.svg')
+const FooterCss: string = require('./../../../resources/css/dynamic/Footer.css')
 
 type FooterProps = {
   data: {

src/components/dynamic/ForwardContent.tsx

@@ -3,10 +3,11 @@
 import React from 'react';
 import Account from '@/components/dynamic/Account';
 import Content from '@/components/dynamic/Content';
-import { _paths } from '@/utils/paths';
-import path from 'path';
+import { _paths, createRequire } from '@/utils/paths';
 
-const ForwardContentCss: string = path.join(_paths.pluginResources, 'css/dynamic/ForwardContent.css');
+const require = createRequire(import.meta.url);
+
+const ForwardContentCss: string = require('./../../../resources/css/dynamic/ForwardContent.css');
 
 type ForwardContentProps = {
   data?: any;

src/components/dynamic/LogoText.tsx

@@ -1,10 +1,11 @@
 // LogoText
 // Logo 文本组件
 import React from 'react';
-import { _paths } from '@/utils/paths';
-import path from 'path';
+import { _paths, createRequire } from '@/utils/paths';
 
-const LogoTextCss: string = path.join(_paths.pluginResources, 'css/dynamic/LogoText.css')
+const require = createRequire(import.meta.url);
+
+const LogoTextCss: string = require('./../../../resources/css/dynamic/LogoText.css')
 
 type LogoTextProps = {
   data: {

src/components/dynamic/MainPage.tsx

@@ -4,10 +4,11 @@ import Account from '@/components/dynamic/Account';
 import Content from '@/components/dynamic/Content';
 import ForwardContent from '@/components/dynamic/ForwardContent';
 import Footer from '@/components/dynamic/Footer';
-import { _paths } from '@/utils/paths';
-import path from 'path';
+import { _paths, createRequire } from '@/utils/paths';
 
-const MainPageCss: string = path.join(_paths.pluginResources, 'css/dynamic/MainPage.css')
+const require = createRequire(import.meta.url);
+
+const MainPageCss: string = require('./../../resources/css/dynamic/MainPage.css')
 
 export type MainProps = {
   data: {

src/components/help/Help.tsx

@@ -2,14 +2,16 @@
 import React from 'react';
 import { BOT_NAME, ConfigController } from 'yunzai';
 import Config from '@/utils/config';
-import { _paths } from '@/utils/paths';
 import path from 'path';
+import { _paths, createRequire } from '@/utils/paths';
+
+const require = createRequire(import.meta.url);
 
 const botVersion = ConfigController.package?.version;
 const yukiPluginVersion = Config.getPackageJsonKey('version', path.join(_paths.pluginPath, 'package.json'));
 
-const HelpCss: string = path.join(_paths.pluginResources, 'css/help/help.css')
-const iconPath = (iconName: string) => path.join(_paths.pluginResources, `img/icon/puplic/${iconName}.png`)
+const HelpCss: string = require('./../../../resources/css/help/help.css')
+const iconPath = (iconName: string) => require(`./../../../resources/img/icon/puplic/${iconName}.png`)
 
 export type HelpPageProps = {
   data: {

src/components/loginQrcode/Page.tsx

@@ -1,9 +1,10 @@
 // QrcodeLoginPage.tsx
 import React from 'react';
-import { _paths } from '@/utils/paths';
-import path from 'path';
+import { _paths, createRequire } from '@/utils/paths';
 
-const LoginQrcodeCss: string = path.join(_paths.pluginResources, 'css/loginQrcode/Page.css')
+const require = createRequire(import.meta.url);
+
+const LoginQrcodeCss: string = require('./../../../resources/css/loginQrcode/Page.css')
 
 export type LoginProps = {
   data: {

src/components/version/Version.tsx

@@ -1,13 +1,15 @@
 import React from 'react';
 import { BOT_NAME, ConfigController } from 'yunzai';
 import Config from '../../utils/config';
-import { _paths } from '@/utils/paths';
 import path from 'path';
+import { _paths, createRequire } from '@/utils/paths';
+
+const require = createRequire(import.meta.url);
 
 const botVersion = ConfigController.package?.version;
 const yukiPluginVersion = Config.getPackageJsonKey('version', path.join(_paths.pluginPath, 'package.json'));
 
-const VersionCss: string = path.join(_paths.pluginResources, 'css/version/version.css')
+const VersionCss: string = require('./../../../resources/css/version/version.css')
 
 export type VersionProps = {
   data: {

src/utils/paths.ts

@@ -15,4 +15,26 @@ export const _paths = {
   pluginPath, // yuki-plugin根目录
   pluginResources: join(pluginPath, 'resources'), // yuki-plugin资源目录
   pluginName, // 插件所在文件夹名称
-}
+}
+
+/**
+ * 使用import.meta.url得到require
+ * @param basePath
+ * @returns
+ * 这并不是
+ * ***
+ * import { createRequire } from "module"
+ * ***
+ * 原型为
+ * new URL(path, import.meta.url).href
+ */
+export const createRequire = (basePath: string) => {
+  return (path: string) => {
+    if (process.platform === 'linux' || process.platform === 'android' || process.platform === 'darwin') {
+      return new URL(path, basePath).href.replace(/^file:\/\//, '');
+    }
+    else {
+      return new URL(path, basePath).href.replace(/^file:\/\/\//, ''); // windows
+    }
+  };
+};