@arkxio/ark-dev-utils 0.1.8 → 0.1.10

package/dist/index.js

@@ -1179,134 +1179,142 @@
 
    };
 
-  class ArkWebpackPlugin {
-
-    constructor(options) {
-      this.metaOptions = options;
-    }
-
-    apply(compiler) {
-      // 获取项目根目录路径
-      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: webpack.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 = [];
-
-        await extractArkMetaJson({
-          ...useExtractOptions,
-          chunkJsFiles: jsFiles,
-          isDev: isDev,
-          compilation: compilation,
-          customAssets: customAssets
-        });
-
-        return Promise.resolve();
-      });
-    }
+  class ArkWebpackPlugin {
+
+    constructor(options) {
+      this.metaOptions = options;
+    }
+
+    apply(compiler) {
+      // 获取项目根目录路径
+      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: webpack.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,`
+            //     );
+
+              let findUnpkgModel = false;
+              const webpackRequireLPatternEval = /"https:\/\/unpkg\.com"/g;
+              if (webpackRequireLPatternEval.test(content)) {
+                content = content.replace(webpackRequireLPatternEval, 'window.ArkConfig.cdnHost');
+                findUnpkgModel = true;
+              }
+
+              const webpackRequireLPattern = /"(https:\/\/unpkg\.com)/g;
+              if (webpackRequireLPattern.test(content)) {
+                findUnpkgModel = true;
+                verbose('检测到 unpkg.com 模式');
+                content = content.replace(
+                  webpackRequireLPattern,
+                  `window.ArkConfig.cdnHost + "`
+                );
+              }
+
+              if (findUnpkgModel) {
+                // 更新资源
+                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 = [];
+
+        await extractArkMetaJson({
+          ...useExtractOptions,
+          chunkJsFiles: jsFiles,
+          isDev: isDev,
+          compilation: compilation,
+          customAssets: customAssets
+        });
+
+        return Promise.resolve();
+      });
+    }
   }
 
   var index = {

package/dist/index.min.js

@@ -1179,134 +1179,142 @@
 
    };
 
-  class ArkWebpackPlugin {
-
-    constructor(options) {
-      this.metaOptions = options;
-    }
-
-    apply(compiler) {
-      // 获取项目根目录路径
-      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: webpack.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 = [];
-
-        await extractArkMetaJson({
-          ...useExtractOptions,
-          chunkJsFiles: jsFiles,
-          isDev: isDev,
-          compilation: compilation,
-          customAssets: customAssets
-        });
-
-        return Promise.resolve();
-      });
-    }
+  class ArkWebpackPlugin {
+
+    constructor(options) {
+      this.metaOptions = options;
+    }
+
+    apply(compiler) {
+      // 获取项目根目录路径
+      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: webpack.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,`
+            //     );
+
+              let findUnpkgModel = false;
+              const webpackRequireLPatternEval = /"https:\/\/unpkg\.com"/g;
+              if (webpackRequireLPatternEval.test(content)) {
+                content = content.replace(webpackRequireLPatternEval, 'window.ArkConfig.cdnHost');
+                findUnpkgModel = true;
+              }
+
+              const webpackRequireLPattern = /"(https:\/\/unpkg\.com)/g;
+              if (webpackRequireLPattern.test(content)) {
+                findUnpkgModel = true;
+                verbose('检测到 unpkg.com 模式');
+                content = content.replace(
+                  webpackRequireLPattern,
+                  `window.ArkConfig.cdnHost + "`
+                );
+              }
+
+              if (findUnpkgModel) {
+                // 更新资源
+                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 = [];
+
+        await extractArkMetaJson({
+          ...useExtractOptions,
+          chunkJsFiles: jsFiles,
+          isDev: isDev,
+          compilation: compilation,
+          customAssets: customAssets
+        });
+
+        return Promise.resolve();
+      });
+    }
   }
 
   var index = {