akfun 5.1.1 → 5.1.3

package/module/akfunInit.js

@@ -6,7 +6,6 @@ const templateList = {
   'react&ts': 'git@github.com:wibetter/akfun-react-ts-template.git',
   'library': 'git@github.com:wibetter/json-utils.git',
   'json-editor': 'git@github.com:wibetter/json-editor.git',
-  'json-schema-editor': 'git@github.com:wibetter/json-schema-editor.git',
   'pigNews': 'git@github.com:wibetter/pigNews.git',
 };
 

package/module/main.js

@@ -9,6 +9,8 @@ const {resolve} = require('../src/utils/pathUtils');
 const getConfigObj = require('../src/utils/getConfigObj');
 const deepMergeConfig = require('../src/utils/deepMergeConfig');
 const getCurWebpackConfig = require('../src/utils/getCurWebpackConfig.js'); // 用于获取当前webpack配置的方法
+const aliBOS = require('../src/oss/aliBos.js');
+const baiduBOS = require('../src/oss/baiduBos.js');
 
 module.exports = {
   dev: devAction,
@@ -22,4 +24,6 @@ module.exports = {
   deepMergeConfig,
   getCurWebpackConfig,
   curWebpackBaseConfPath: getCurWebpackConfig('base'),
+  aliBOS,
+  baiduBOS
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akfun",
-  "version": "5.1.1",
+  "version": "5.1.3",
   "description": "前端脚手架：支持Vue技术栈和react技术栈",
   "keywords": [
     "前端工程",
@@ -116,6 +116,7 @@
     "html-webpack-plugin": "^5.5.0",
     "http-proxy-middleware": "^2.0.2",
     "inquirer": "^8.2.0",
+    "rollup-plugin-jsx": "^1.0.3",
     "mini-css-extract-plugin": "^2.5.3",
     "open": "^8.4.0",
     "ora": "^4.0.4",
@@ -162,7 +163,9 @@
     "webpack-hot-middleware": "^2.25.1",
     "webpack-merge": "^5.8.0",
     "webpack-node-externals": "^3.0.0",
-    "yargs": "^12.0.5"
+    "yargs": "^12.0.5",
+    "@baiducloud/sdk": "^1.0.7",
+    "ali-oss": "^6.17.0"
   },
   "devDependencies": {
     "@commitlint/cli": "^16.1.0",

package/src/config/rollup.config.js

@@ -1,7 +1,7 @@
 // rollup.config.js
 const { babel } = require('@rollup/plugin-babel');
 const { nodeResolve } = require('@rollup/plugin-node-resolve'); // 支持node中的文件导入
-// const jsx = require('rollup-plugin-jsx'); // 用于处理jsx
+const jsx = require('rollup-plugin-jsx'); // 用于处理jsx
 const typescript = require('@rollup/plugin-typescript'); // 支持ts
 const commonjs = require('@rollup/plugin-commonjs'); // 识别cmd模块
 const vue = require('rollup-plugin-vue');
@@ -74,7 +74,7 @@ module.exports = function (fileName, akfunConfig) {
       buildType === 'ts' ? typescript() : undefined,
       babel(babelConfig), // 备注，需要先babel()再commjs()
       // jsx( {factory: 'React.createElement'} ),
-      buildType === 'ts' ? jsx( {factory: 'React.createElement'} ) : undefined,
+      buildType === 'ts' ? undefined : jsx({ factory: 'React.createElement' }),
       vue(),
       commonjs(),
       postcss({

package/src/dev-server.js

@@ -50,7 +50,7 @@ module.exports = function (akfunConfig, _consoleTag) {
   // 获取开发环境的webpack基本配置
   const webpackConfig = getDevWebpackConfig(config);
 
-    // Define HTTP proxies to your custom API backend
+  // Define HTTP proxies to your custom API backend
   // https://github.com/chimurai/http-proxy-middleware
   // 使用 config.dev.proxyTable 的配置作为 proxyTable 的代理配置
   // 备注：需放connect-history-api-fallback前面，避免get请求的代理失效

package/src/oss/aliBos.js

@@ -0,0 +1,78 @@
+/**
+ * 百度智能云 BOS 存储对接
+ */
+const BosClient = require('ali-oss');
+
+class aliBOS {
+  constructor(endpoint, region, bucket, accessKeyId, accessKeySecret) {
+    this.endpoint = endpoint;
+    this.region = region;
+    this.bucket = bucket;
+    this.accessKeyId = accessKeyId;
+    this.accessKeySecret = accessKeySecret;
+
+    this.client = new BosClient({
+      endpoint: this.endpoint,
+      // region: this.region,
+      accessKeyId: this.accessKeyId,
+      accessKeySecret: this.accessKeySecret,
+      bucket: this.bucket
+    });
+  }
+
+  normalizeKey(objectKey) {
+    return objectKey.replace(/^\//, '').split('?')[0];
+  }
+
+  async exists(_objectKey) {
+    try {
+      const objectKey = this.normalizeKey(_objectKey);
+      await this.client.head(objectKey);
+      return true;
+    } catch (e) {
+      return false;
+    }
+  }
+
+  async get(_objectKey) {
+    try {
+      const objectKey = this.normalizeKey(_objectKey);
+      const result = await this.client.get(objectKey);
+
+      return {
+        headers: result.res.headers,
+        body: result.content, // 文件内容
+        url: result.res.requestUrls[0] // 文件访问地址
+      };
+    } catch (error) {
+      return undefined;
+    }
+  }
+
+  /**
+   * 上传文件
+   * @param {*} fileKey 文件名（对象存储中的路径和文件名）
+   * @param {*} filepath 文件的本地路径
+   */
+  async upload(fileKey, filepath) {
+    const result = await this.client.put(fileKey, filepath);
+    return result;
+  }
+
+  getPublicResourceUrl(key) {
+    let host = this.endpoint;
+    let protocol = 'https:'; // 默认使用https协议
+
+    try {
+      const url = new URL(this.endpoint);
+      host = url.host;
+      protocol = url.protocol;
+    } catch (error) {
+      console.error('无效的 endpoint:', error);
+    }
+
+    return `${protocol}//${this.bucket}.${host}/${key}`;
+  }
+}
+
+module.exports = aliBOS;

package/src/oss/baiduBos.js

@@ -0,0 +1,87 @@
+/**
+ * 百度智能云 BOS 存储对接
+ */
+const { BosClient } = require('@baiducloud/sdk');
+
+class baiduBOS {
+  constructor(endpoint, bucket, ak, sk) {
+    this.endpoint = endpoint;
+    this.bucket = bucket;
+    this.ak = ak;
+    this.sk = sk;
+
+    this.client = new BosClient({
+      endpoint: endpoint,
+      credentials: {
+        ak,
+        sk
+      }
+    });
+  }
+
+  normalizeKey(key) {
+    return key.replace(/^\//, '').split('?')[0];
+  }
+
+  async exists(key) {
+    try {
+      key = this.normalizeKey(key);
+      await this.client.getObjectMetadata(this.bucket, key);
+      return true;
+    } catch (e) {
+      return false;
+    }
+  }
+
+  async get(_objectKey) {
+    try {
+      const objectKey = this.normalizeKey(_objectKey);
+      const result = await this.client.getObject(this.bucket, objectKey);
+      let host = this.endpoint;
+      let protocol = 'https:'; // 默认使用https协议
+
+      try {
+        const url = new URL(this.endpoint);
+        host = url.host;
+        protocol = url.protocol;
+      } catch (error) {
+        console.error('无效的 endpoint:', error);
+      }
+
+      return {
+        headers: result.http_headers,
+        body: result.body,
+        url: `${protocol}//${this.bucket}.${host}/${objectKey}`
+      };
+    } catch (e) {
+      return undefined;
+    }
+  }
+
+  /**
+   * 上传文件
+   * @param {*} fileKey 文件名（对象存储中的路径和文件名）
+   * @param {*} filepath 文件的本地路径
+   */
+  async upload(fileKey, filepath) {
+    const result = await this.client.putObjectFromFile(this.bucket, fileKey, filepath);
+    return result;
+  }
+
+  getPublicResourceUrl(key) {
+    let host = this.endpoint;
+    let protocol = 'https:'; // 默认使用https协议
+
+    try {
+      const url = new URL(this.endpoint);
+      host = url.host;
+      protocol = url.protocol;
+    } catch (error) {
+      console.error('无效的 endpoint:', error);
+    }
+
+    return `${protocol}//${this.bucket}.${host}/${key}`;
+  }
+}
+
+module.exports = baiduBOS;

package/src/utils/catchProcessParam.js

@@ -1,7 +1,6 @@
 /*
   获取执行命令中的指定参数值
 */
-
 function catchProcessParam(paramKey) {
   const argv = process.argv;
   let paramVal = '';

package/src/utils/deepMergeConfig.js

@@ -2,7 +2,7 @@ const deepMerge = require('deepmerge');
 
 const deepMergeConfig = function (defaultConfig, curConfig) {
   const overwriteMerge = (destinationArray, sourceArray, options) => sourceArray;
-  
+
   return deepMerge(defaultConfig, curConfig, { arrayMerge: overwriteMerge });
 };
 

package/src/utils/loadAsset.js

@@ -0,0 +1,47 @@
+// 空函数
+export function noop() {}
+
+/**
+ * 加载远程 JS脚本
+ * @param JsSrc: js脚本地址
+ * @param callback
+ */
+export function loadRemoteJs(JsSrc, callback) {
+  const curCallback = callback || noop;
+  if (document.querySelector(`script[src='${JsSrc}']`)) {
+    curCallback();
+    return;
+  }
+
+  const script = document.createElement('script');
+
+  const loadAction = () => {
+    script.removeEventListener('load', loadAction);
+    curCallback();
+  };
+
+  script.addEventListener('load', loadAction);
+  script.src = JsSrc;
+  document.body.appendChild(script);
+}
+
+/**
+ * 加载远程 CSS
+ * @param cssSrc: css地址
+ * @param callback
+ */
+export function loadRemoteCSS(cssSrc) {
+  const loadedLink = document.querySelector(`link[href='${cssSrc}']`);
+  if (loadedLink) {
+    // 避免重复加载
+    loadedLink.disabled = false;
+    return;
+  }
+
+  const head = document.getElementsByTagName('head')[0];
+  const link = document.createElement('link');
+  link.rel = 'stylesheet';
+  link.type = 'text/css';
+  link.href = src;
+  head.appendChild(link);
+}