From a4d463f80e57dc0ce45f333bd60a27d827bf708e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E5=A4=9C=E5=B8=A6=E5=88=80?= Date: Thu, 5 Sep 2013 22:15:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=B7=A5=E5=85=B7=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 合并工具的正则优化 --- core/build/index.html | 38 ++++++++++++++++++++++++++++++++++++++ easycombo/easycombo.js | 8 ++++---- 2 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 core/build/index.html diff --git a/core/build/index.html b/core/build/index.html new file mode 100644 index 0000000..fccc1b6 --- /dev/null +++ b/core/build/index.html @@ -0,0 +1,38 @@ + + + + +test + + + + + + +

一些美国官员日披露。

+ + + + + + \ No newline at end of file diff --git a/easycombo/easycombo.js b/easycombo/easycombo.js index 507efa2..4b92696 100644 --- a/easycombo/easycombo.js +++ b/easycombo/easycombo.js @@ -1,13 +1,13 @@ /* - * easyCombo v0.2 for easy.js - * 2013-07-01 + * easyCombo v0.3 for easy.js + * 2013-09-05 */ -var rExistId = /define\(\s*['"][^\[f'"\{]+['"]\s*,?/, +var rExistId = /define\(\s*['"][^\[\('"\{]+['"]\s*,?/, rProtocol = /^(http(?:s)?\:\/\/|file\:.+\:\/)/, rModId = /([^\/?]+?)(\.(?:js|css))?(\?.*)?$/, rRightEnd = /,?\s*(function\s*\(.*|\{.*)/, rPullDeps = /((?:define|E\.use)\(.*)/g, - rDeps = /(define\([^\[f\{]*\[)([^\]]+)/, + rDeps = /((?:define|seed\.use)\([^\[\(\{]*\[)([^\]]+)/, rDefine = /define\(/, fs = require( 'fs' ),