@arkxio/ark-dev-utils 0.1.6 → 0.1.9

package/package.json

@@ -1,51 +1,51 @@
-{
-  "name": "@arkxio/ark-dev-utils",
-  "version": "0.1.6",
-  "description": "ark dev utils",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/arkxos/arkjs.git",
-    "directory": "packages/ark-dev-utils"
-  },
-  "license": "MIT",
-  "author": {
-    "name": "fantasticsoul"
-  },
-  "main": "lib/index.js",
-  "files": [
-    "dist",
-    "lib",
-    "src",
-    "typings.d.ts",
-    "jsconfig.json",
-    ".babelrc.js",
-    "README.md"
-  ],
-  "scripts": {
-    "build": "npm run build:commonjs && npm run build:es && npm run build:umd && npm run build:umd:min",
-    "build:commonjs": "cross-env BUILD_ENV=commonjs rollup -c",
-    "build:es": "cross-env BUILD_ENV=es rollup -c",
-    "build:umd": "cross-env BUILD_ENV=development rollup -c",
-    "build:umd:min": "cross-env BUILD_ENV=production rollup -c"
-  },
-  "dependencies": {
-    "jsdom": ">=19.0.0"
-  },
-  "devDependencies": {
-    "@babel/preset-env": "^7.12.11",
-    "@babel/preset-react": "^7.12.10",
-    "babel-cli": "^6.26.0",
-    "fs-extra": "^10.1.0",
-    "rollup": "^2.23.0"
-  },
-  "peerDependencies": {
-    "jsdom": ">=19.0.0",
-    "webpack": "5.75.0"
-  },
-  "bundleDependencies": false,
-  "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org/"
-  },
-  "deprecated": false
-}
+{
+  "name": "@arkxio/ark-dev-utils",
+  "version": "0.1.9",
+  "description": "ark dev utils",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/arkxos/arkjs.git",
+    "directory": "packages/ark-dev-utils"
+  },
+  "license": "MIT",
+  "author": {
+    "name": "fantasticsoul"
+  },
+  "main": "lib/index.js",
+  "files": [
+    "dist",
+    "lib",
+    "src",
+    "typings.d.ts",
+    "jsconfig.json",
+    ".babelrc.js",
+    "README.md"
+  ],
+  "scripts": {
+    "build": "npm run build:commonjs && npm run build:es && npm run build:umd && npm run build:umd:min",
+    "build:commonjs": "cross-env BUILD_ENV=commonjs rollup -c",
+    "build:es": "cross-env BUILD_ENV=es rollup -c",
+    "build:umd": "cross-env BUILD_ENV=development rollup -c",
+    "build:umd:min": "cross-env BUILD_ENV=production rollup -c"
+  },
+  "dependencies": {
+    "jsdom": ">=19.0.0"
+  },
+  "devDependencies": {
+    "@babel/preset-env": "^7.12.11",
+    "@babel/preset-react": "^7.12.10",
+    "babel-cli": "^6.26.0",
+    "fs-extra": "^10.1.0",
+    "rollup": "^2.23.0"
+  },
+  "peerDependencies": {
+    "jsdom": ">=19.0.0",
+    "webpack": "5.75.0"
+  },
+  "bundleDependencies": false,
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  },
+  "deprecated": false
+}

package/src/ArkWebpackPlugin.js

@@ -1,135 +1,125 @@
-import path from "path";
-import extractArkMetaJson from './meta-extractor/index';
-import {verbose} from "./inner-utils";
-import { Compilation } from 'webpack';
-import { resetScriptIdx } from './meta-extractor/fillAssetList';
-
-export default class ArkWebpackPlugin {
-
-  constructor(options) {
-    this.metaOptions = options;
-  }
-
-  apply(compiler) {
-    // 获取项目根目录路径
-    const projectRoot = compiler.context;
-    const useExtractOptions = this.metaOptions;
-
-    // 在每次编译开始时重置脚本索引计数器，确保文件名一致性
-    compiler.hooks.thisCompilation.tap('ArkResetScriptIdx', () => {
-      resetScriptIdx();
-    });
-
-    compiler.hooks.thisCompilation.tap('ArkDynamicCdnChunkLoaderPlugin', (compilation) => {
-      compilation.hooks.processAssets.tap(
-        {
-          name: 'ArkDynamicCdnChunkLoaderPlugin',
-          stage: Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE,
-        },
-        (assets) => {
-          // 新增分块文件过滤逻辑
-          const chunkFiles = new Set();
-          compilation.chunks.forEach(chunk => {
-            chunk.files.forEach(file => {
-              if (file.endsWith('.js')) chunkFiles.add(file);
-            });
-          });
-          // 调试日志
-          verbose('[分块文件列表]', Array.from(chunkFiles));
-
-          Object.entries(assets).forEach(([filename, source]) => {
-            // 仅处理分块JS文件
-            if (!chunkFiles.has(filename)) return;
-
-            // 检查资源内容有效性
-            if (
-              !source ||
-              !source.source ||
-              typeof source.source() !== 'string' ||
-              source.source().trim() === ''
-            ) {
-              console.warn(`资源 ${filename} 内容为空或无效，跳过处理`);
-              return;
-            }
-
-            let content = source.source().toString();
-
-            // 替换逻辑
-            //                                      /(__webpack_require__\.l)\(url,/g)
-          //   const webpackRequireLPattern = /(__webpack_require__\.l)\(url,/g;
-          //   if (webpackRequireLPattern.test(content)) {
-          //     verbose('检测到 __webpack_require__.l 模式');
-          //     content = content.replace(
-          //       webpackRequireLPattern,
-          //       `(function(url, done, key, chunkId) {
-          //   if (typeof window.ArkConfig !== 'undefined' && window.ArkConfig.cdnHost) {
-          //     if (!url.startsWith(window.ArkConfig.cdnHost) && url.startsWith('https://unpkg.com')) {
-          //       url = window.ArkConfig.cdnHost + url.slice('https://unpkg.com'.length);
-          //     }
-          //   }
-          //   return $1(url, done, key, chunkId);
-          // })(url,`
-          //     );
-            const webpackRequireLPattern = /"(https:\/\/unpkg\.com)/g;
-            if (webpackRequireLPattern.test(content)) {
-              verbose('检测到 unpkg.com 模式');
-              content = content.replace(
-                webpackRequireLPattern,
-                `window.ArkConfig.cdnHost + "`
-              );
-
-              // 更新资源
-              compilation.updateAsset(
-                filename,
-                new compiler.webpack.sources.RawSource(content)
-              );
-            }
-
-          });
-        }
-      );
-    });
-
-    compiler.hooks.emit.tapPromise('ArkMetaJsonGeneratorPlugin', async (compilation) => {
-      // 注入环境判断脚本
-      const isDev = process.env.NODE_ENV === 'development';
-
-      // 收集所有生成的JS文件
-      const outputPath = compilation.options.output.publicPath || '';
-      const jsFiles = [];
-
-      // Webpack 5 正确的API：使用 getAssets()
-      const assets = compilation.getAssets ? compilation.getAssets() : compilation.assets;
-
-      // 遍历所有资产，收集JS文件
-      assets.forEach((asset) => {
-        const assetName = asset.name || asset;
-        if (assetName.endsWith('.js')) {
-          console.log('Found JS file:', assetName);
-          // 排除 ark-meta.json 和 ark_userChunk 文件
-          if (assetName.indexOf('js/app.') !== -1 ||
-              assetName.indexOf('js/runtime.') !== -1 ||
-              assetName.indexOf('js/vendors.') !== -1 ||
-              assetName.indexOf('js/main.') !== -1) {
-            jsFiles.push(outputPath + assetName);
-          }
-        }
-      });
-
-      console.log('Final JS files for chunkJsSrcList:', jsFiles);
-
-      // 创建 customAssets 数组用于收集自定义资产（如从 HTML 内联 script 提取的代码）
-      const customAssets = [];
-
-      const arkMeta = await extractArkMetaJson({
-        ...useExtractOptions,
-        chunkJsFiles: jsFiles,
-        isDev: isDev,
-        compilation: compilation,
-        customAssets: customAssets
-      });
-
-      return Promise.resolve();
-    });
-  }
-}
+import path from "path";
+import extractArkMetaJson from './meta-extractor/index';
+import {verbose} from "./inner-utils";
+import { Compilation } from 'webpack';
+import { resetScriptIdx } from './meta-extractor/fillAssetList';
+
+export default class ArkWebpackPlugin {
+
+  constructor(options) {
+    this.metaOptions = options;
+  }
+
+  apply(compiler) {
+    // 获取项目根目录路径
+    const projectRoot = compiler.context;
+    const useExtractOptions = this.metaOptions;
+
+    // 在每次编译开始时重置脚本索引计数器，确保文件名一致性
+    compiler.hooks.thisCompilation.tap('ArkResetScriptIdx', () => {
+      resetScriptIdx();
+    });
+
+    compiler.hooks.thisCompilation.tap('ArkDynamicCdnChunkLoaderPlugin', (compilation) => {
+      compilation.hooks.processAssets.tap(
+        {
+          name: 'ArkDynamicCdnChunkLoaderPlugin',
+          stage: Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE,
+        },
+        (assets) => {
+          // 新增分块文件过滤逻辑
+          const chunkFiles = new Set();
+          compilation.chunks.forEach(chunk => {
+            chunk.files.forEach(file => {
+              if (file.endsWith('.js')) chunkFiles.add(file);
+            });
+          });
+          // 调试日志
+          verbose('[分块文件列表]', Array.from(chunkFiles));
+
+          Object.entries(assets).forEach(([filename, source]) => {
+            // 仅处理分块JS文件
+            if (!chunkFiles.has(filename)) return;
+
+            // 检查资源内容有效性
+            if (!source || !source.source || typeof source.source() !== 'string' || source.source().trim() === '') {
+              console.warn(`资源 ${filename} 内容为空或无效，跳过处理`);
+              return;
+            }
+
+            let content = source.source().toString();
+
+            // 替换逻辑
+            //                                      /(__webpack_require__\.l)\(url,/g)
+            //   const webpackRequireLPattern = /(__webpack_require__\.l)\(url,/g;
+            //   if (webpackRequireLPattern.test(content)) {
+            //     verbose('检测到 __webpack_require__.l 模式');
+            //     content = content.replace(
+            //       webpackRequireLPattern,
+            //       `(function(url, done, key, chunkId) {
+            //   if (typeof window.ArkConfig !== 'undefined' && window.ArkConfig.cdnHost) {
+            //     if (!url.startsWith(window.ArkConfig.cdnHost) && url.startsWith('https://unpkg.com')) {
+            //       url = window.ArkConfig.cdnHost + url.slice('https://unpkg.com'.length);
+            //     }
+            //   }
+            //   return $1(url, done, key, chunkId);
+            // })(url,`
+            //     );
+            // const webpackRequireLPattern = /"(https:\/\/unpkg\.com)/g;
+            // 新：捕获前面可选的 \（eval 模式下会有 \"）
+            const webpackRequireLPattern = /(\\?")https:\/\/unpkg\.com/g;
+            if (webpackRequireLPattern.test(content)) {
+              verbose('检测到 unpkg.com 模式');
+              content = content.replace(webpackRequireLPattern, `window.ArkConfig.cdnHost + "`);
+
+              // 更新资源
+              compilation.updateAsset(filename, new compiler.webpack.sources.RawSource(content));
+            }
+          });
+        }
+      );
+    });
+
+    compiler.hooks.emit.tapPromise('ArkMetaJsonGeneratorPlugin', async (compilation) => {
+      // 注入环境判断脚本
+      const isDev = process.env.NODE_ENV === 'development';
+
+      // 收集所有生成的JS文件
+      const outputPath = compilation.options.output.publicPath || '';
+      const jsFiles = [];
+
+      // Webpack 5 正确的API：使用 getAssets()
+      const assets = compilation.getAssets ? compilation.getAssets() : compilation.assets;
+
+      // 遍历所有资产，收集JS文件
+      assets.forEach((asset) => {
+        const assetName = asset.name || asset;
+        if (assetName.endsWith('.js')) {
+          console.log('Found JS file:', assetName);
+          // 排除 ark-meta.json 和 ark_userChunk 文件
+          if (assetName.indexOf('js/app.') !== -1 ||
+              assetName.indexOf('js/runtime.') !== -1 ||
+              assetName.indexOf('js/vendors.') !== -1 ||
+              assetName.indexOf('js/main.') !== -1) {
+            jsFiles.push(outputPath + assetName);
+          }
+        }
+      });
+
+      console.log('Final JS files for chunkJsSrcList:', jsFiles);
+
+      // 创建 customAssets 数组用于收集自定义资产（如从 HTML 内联 script 提取的代码）
+      const customAssets = [];
+
+      const arkMeta = await extractArkMetaJson({
+        ...useExtractOptions,
+        chunkJsFiles: jsFiles,
+        isDev: isDev,
+        compilation: compilation,
+        customAssets: customAssets
+      });
+
+      return Promise.resolve();
+    });
+  }
+}

package/src/base-utils/index.js

@@ -1,119 +1,119 @@
-/** @typedef {import('../../typings').ICreateSubAppOptions} ICreateSubAppOptions */
-import { getNpmCdnHomePage } from '../inner-utils/index';
-
-/**
- * @param {string} inputPath
- * @param {Object} options
- * @param {'end' | 'start'} [options.loc='end']
- * @param {boolean} [options.need=false]
- */
-export function ensureSlash(inputPath, options) {
-  const { need, loc = 'end' } = options;
-  const isEnd = loc === 'end';
-  const hasSlash = isEnd ? inputPath.endsWith('/') : inputPath.startsWith('/');
-
-  const shouldDelSlash = hasSlash && !need;
-  const shouldAddSlash = !hasSlash && need;
-  if (isEnd) {
-    if (shouldDelSlash) {
-      return inputPath.substring(0, inputPath.length - 1);
-    }
-    if (shouldAddSlash) {
-      return `${inputPath}/`;
-    }
-  }
-  if (!isEnd) {
-    if (shouldDelSlash) {
-      // del start slash
-      return inputPath.substring(1);
-    }
-    if (shouldAddSlash) {
-      return `/${inputPath}`;
-    }
-  }
-
-  return inputPath;
-}
-
-/** 语义化 slash 相关操作，方便上层理解和使用 */
-export const slash = {
-  start: (path) => ensureSlash(path, { loc: 'start', need: true }),
-  noStart: (path) => ensureSlash(path, { loc: 'start', need: false }),
-  end: (path) => ensureSlash(path, { loc: 'end', need: true }),
-  noEnd: (path) => ensureSlash(path, { loc: 'end', need: false }),
-};
-
-export function getHelProcessEnvParams() {
-  // 以下常量由蓝盾流水线注入（由流水线变量或bash脚本注入）
-  const {
-    HOST,
-    PORT,
-    // appHomePage, 形如 http://xxx.cdn.com/hel/app1_2020121201011666
-    HEL_APP_HOME_PAGE,
-    /** 在构建机环境时，会注入真正对应的应用名 */
-    HEL_APP_GROUP_NAME,
-    HEL_APP_NAME,
-  } = process.env;
-
-  let appHomePage = HEL_APP_HOME_PAGE;
-  // 未传递 HEL_APP_HOME_PAGE 的话，根据 HOST 和 PORT 推导
-  if (!appHomePage && (HOST || PORT)) {
-    const host = HOST || 'localhost';
-    const port = PORT || '80';
-    const hotsStr = host.startsWith('http') ? host : `http://${host}`;
-    appHomePage = `${hotsStr}:${port}`;
-  }
-
-  return {
-    appHomePage,
-    appGroupName: HEL_APP_GROUP_NAME,
-    appName: HEL_APP_NAME,
-  };
-}
-
-/**
- * @param {Record<string, any>} pkg
- * @param {ICreateSubAppOptions} options
- * @returns
- */
-export function getHelEnvParams(pkg, options = {}) {
-  const { platform, distDir, homePage: userCustomHomePage, handleHomePage = true, npmCdnType } = options;
-  let cdnHomePage = '';
-  // 计算 unpkg 平台 的 homePage 值，此时如果透传了 homePage，表示 unpkg 为私服
-  if (platform === 'unpkg' && handleHomePage) {
-    cdnHomePage = getNpmCdnHomePage(pkg, { distDir, npmCdnType, homePage: userCustomHomePage });
-  }
-
-  // 来自 process.env 的值优先级最高
-  const p0EnvParams = getHelProcessEnvParams();
-  const appName = p0EnvParams.appName || pkg.appGroupName || '';
-  return {
-    appHomePage: p0EnvParams.appHomePage || cdnHomePage || userCustomHomePage || pkg.homepage || '/',
-    appGroupName: p0EnvParams.appGroupName || pkg.appGroupName || appName,
-    appName,
-  };
-}
-
-/**
- * @param {string} appName - hel 管理台注册的应用名 或 package.name
- * @param {boolean} [useTimestampSuffix=true] - default: true, 是否设置时间戳后缀
- * 设置为 true 时，支持同一个模块正确执行多版本js文件
- * 如不需要同屏加载同一个模块的多个版本功能，且需要自己定制一些其他逻辑，可以设置为false
- */
-export function getJsonpFnName(appName, useTimestampSuffix = true) {
-  if (useTimestampSuffix) {
-    return `helJsonp_${appName}_${Date.now()}`;
-  }
-
-  return `helJsonp_${appName}`;
-}
-
-/**
- *
- * @param {string} homePage - 应用homePage
- * @param {boolean} [needSlash]
- * @returns
- */
-export function getPublicPathOrUrl(homePage, needSlash = true) {
-  return ensureSlash(homePage, { loc: 'end', need: needSlash });
-}
+/** @typedef {import('../../typings').ICreateSubAppOptions} ICreateSubAppOptions */
+import { getNpmCdnHomePage } from '../inner-utils/index';
+
+/**
+ * @param {string} inputPath
+ * @param {Object} options
+ * @param {'end' | 'start'} [options.loc='end']
+ * @param {boolean} [options.need=false]
+ */
+export function ensureSlash(inputPath, options) {
+  const { need, loc = 'end' } = options;
+  const isEnd = loc === 'end';
+  const hasSlash = isEnd ? inputPath.endsWith('/') : inputPath.startsWith('/');
+
+  const shouldDelSlash = hasSlash && !need;
+  const shouldAddSlash = !hasSlash && need;
+  if (isEnd) {
+    if (shouldDelSlash) {
+      return inputPath.substring(0, inputPath.length - 1);
+    }
+    if (shouldAddSlash) {
+      return `${inputPath}/`;
+    }
+  }
+  if (!isEnd) {
+    if (shouldDelSlash) {
+      // del start slash
+      return inputPath.substring(1);
+    }
+    if (shouldAddSlash) {
+      return `/${inputPath}`;
+    }
+  }
+
+  return inputPath;
+}
+
+/** 语义化 slash 相关操作，方便上层理解和使用 */
+export const slash = {
+  start: (path) => ensureSlash(path, { loc: 'start', need: true }),
+  noStart: (path) => ensureSlash(path, { loc: 'start', need: false }),
+  end: (path) => ensureSlash(path, { loc: 'end', need: true }),
+  noEnd: (path) => ensureSlash(path, { loc: 'end', need: false }),
+};
+
+export function getHelProcessEnvParams() {
+  // 以下常量由蓝盾流水线注入（由流水线变量或bash脚本注入）
+  const {
+    HOST,
+    PORT,
+    // appHomePage, 形如 http://xxx.cdn.com/hel/app1_2020121201011666
+    HEL_APP_HOME_PAGE,
+    /** 在构建机环境时，会注入真正对应的应用名 */
+    HEL_APP_GROUP_NAME,
+    HEL_APP_NAME,
+  } = process.env;
+
+  let appHomePage = HEL_APP_HOME_PAGE;
+  // 未传递 HEL_APP_HOME_PAGE 的话，根据 HOST 和 PORT 推导
+  if (!appHomePage && (HOST || PORT)) {
+    const host = HOST || 'localhost';
+    const port = PORT || '80';
+    const hotsStr = host.startsWith('http') ? host : `http://${host}`;
+    appHomePage = `${hotsStr}:${port}`;
+  }
+
+  return {
+    appHomePage,
+    appGroupName: HEL_APP_GROUP_NAME,
+    appName: HEL_APP_NAME,
+  };
+}
+
+/**
+ * @param {Record<string, any>} pkg
+ * @param {ICreateSubAppOptions} options
+ * @returns
+ */
+export function getHelEnvParams(pkg, options = {}) {
+  const { platform, distDir, homePage: userCustomHomePage, handleHomePage = true, npmCdnType } = options;
+  let cdnHomePage = '';
+  // 计算 unpkg 平台 的 homePage 值，此时如果透传了 homePage，表示 unpkg 为私服
+  if (platform === 'unpkg' && handleHomePage) {
+    cdnHomePage = getNpmCdnHomePage(pkg, { distDir, npmCdnType, homePage: userCustomHomePage });
+  }
+
+  // 来自 process.env 的值优先级最高
+  const p0EnvParams = getHelProcessEnvParams();
+  const appName = p0EnvParams.appName || pkg.appGroupName || '';
+  return {
+    appHomePage: p0EnvParams.appHomePage || cdnHomePage || userCustomHomePage || pkg.homepage || '/',
+    appGroupName: p0EnvParams.appGroupName || pkg.appGroupName || appName,
+    appName,
+  };
+}
+
+/**
+ * @param {string} appName - hel 管理台注册的应用名 或 package.name
+ * @param {boolean} [useTimestampSuffix=true] - default: true, 是否设置时间戳后缀
+ * 设置为 true 时，支持同一个模块正确执行多版本js文件
+ * 如不需要同屏加载同一个模块的多个版本功能，且需要自己定制一些其他逻辑，可以设置为false
+ */
+export function getJsonpFnName(appName, useTimestampSuffix = true) {
+  if (useTimestampSuffix) {
+    return `helJsonp_${appName}_${Date.now()}`;
+  }
+
+  return `helJsonp_${appName}`;
+}
+
+/**
+ *
+ * @param {string} homePage - 应用homePage
+ * @param {boolean} [needSlash]
+ * @returns
+ */
+export function getPublicPathOrUrl(homePage, needSlash = true) {
+  return ensureSlash(homePage, { loc: 'end', need: needSlash });
+}