From 562882683783dc4a8374dc019d61e149984a5433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=B2=E8=80=98=E2=84=A2?= <hotoo.cn@gmail.com>
Date: Thu, 30 Jul 2015 15:47:14 +0800
Subject: [PATCH] fix(script-spm): support single quote and double quote, and
 some refact

---
 lib/utils/deps.js | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/lib/utils/deps.js b/lib/utils/deps.js
index fe63ba50..451dc957 100644
--- a/lib/utils/deps.js
+++ b/lib/utils/deps.js
@@ -7,26 +7,27 @@ var ReactTools = require('react-tools');
 var normalizeDep = require('./normalizeDep');
 var log = require('spm-log');
 
+// <script type="text/spm"> .... </script>
+var re_spm_script = /(<script type=(["'])text\/spm\2>)([\s\S]*?)(<\/script>)/gmi;
+var re_md_script = /````(?:javascript|js)([\s\S]+?)````/gm;
+
 exports.getDeps = function(file) {
   var content = readFile(file, 'utf-8');
   var extname = path.extname(file);
 
   var ret = [];
-  var re, m;
+  var m;
 
-  // <script type="text/spm"> .... </script>
-  re = /(<script type=\"text\/spm\">)([\s\S]*?)(<\/script>)/gmi;
-  while((m = re.exec(content)) !== null) {
-    crequire(m[2]).forEach(function(item) {
+  while((m = re_spm_script.exec(content)) !== null) {
+    crequire(m[3]).forEach(function(item) {
       ret.push(normalizeDep(item.path, file));
     });
   }
 
   // ````javascript .... ````
   if (extname.toLowerCase() === '.md') {
-    re = /````(javascript|js)([\s\S]+?)````/gm;
-    while ((m = re.exec(content)) !== null) {
-      crequire(m[2]).forEach(function (item) {
+    while ((m = re_md_script.exec(content)) !== null) {
+      crequire(m[1]).forEach(function (item) {
         ret.push(normalizeDep(item.path, file));
       });
     }
@@ -51,17 +52,14 @@ exports.replaceDeps = function(content, file) {
 
   // for iframe syntax and html files
   // <script type="text/spm"> .... </script>
-  re = /(<script type=\"text\/spm\">)([\s\S]*?)(<\/script>)/gi;
-  re_match = /(<script type=\"text\/spm\">)([\s\S]*?)(<\/script>)/i;
-
-  content = content.replace(re, function(replacement) {
-    var match = re_match.exec(replacement);
+  content = content.replace(re_spm_script, function(replacement) {
+    var match = re_spm_script.exec(replacement);
     if (!match) {
       return replacement;
     }
-    var code = match[2];
+    var code = match[3];
     code = transform(code, file);
-    return match[1].replace('type="text/spm"', '') + code + match[3];
+    return match[1].replace(/\s+type=(["'])text\/spm\1/i, '') + code + match[4];
   });
 
   if (extname.toLowerCase() === '.md') {