From c36a9ef240265519207ed524808ab7214f6cfe04 Mon Sep 17 00:00:00 2001
From: EGOIST <0x142857@gmail.com>
Date: Thu, 24 May 2018 22:45:03 +0800
Subject: [PATCH 1/2] inject issuerPath to resourceQuery for custom blocks

---
 lib/codegen/customBlocks.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/codegen/customBlocks.js b/lib/codegen/customBlocks.js
index de2527348..c97187765 100644
--- a/lib/codegen/customBlocks.js
+++ b/lib/codegen/customBlocks.js
@@ -9,7 +9,7 @@ module.exports = function genCustomBlocksCode (
   return `\n/* custom blocks */\n` + blocks.map((block, i) => {
     const src = block.attrs.src || resourcePath
     const attrsQuery = attrsToQuery(block.attrs)
-    const query = `?vue&type=custom&index=${i}&blockType=${qs.escape(block.type)}${attrsQuery}`
+    const query = `?vue&type=custom&index=${i}&blockType=${qs.escape(block.type)}&issuerPath=${qs.escape(resourcePath)}${attrsQuery}`
     return (
       `import block${i} from ${stringifyRequest(src + query)}\n` +
       `if (typeof block${i} === 'function') block${i}(component)`

From 47af890c2c501360068822875490a6899efc6638 Mon Sep 17 00:00:00 2001
From: EGOIST <0x142857@gmail.com>
Date: Mon, 28 May 2018 21:46:14 +0800
Subject: [PATCH 2/2] only add issuerQuery when there's `src` attr

---
 lib/codegen/customBlocks.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/codegen/customBlocks.js b/lib/codegen/customBlocks.js
index c97187765..593a2e221 100644
--- a/lib/codegen/customBlocks.js
+++ b/lib/codegen/customBlocks.js
@@ -9,7 +9,8 @@ module.exports = function genCustomBlocksCode (
   return `\n/* custom blocks */\n` + blocks.map((block, i) => {
     const src = block.attrs.src || resourcePath
     const attrsQuery = attrsToQuery(block.attrs)
-    const query = `?vue&type=custom&index=${i}&blockType=${qs.escape(block.type)}&issuerPath=${qs.escape(resourcePath)}${attrsQuery}`
+    const issuerQuery = block.attrs.src ? `&issuerPath=${qs.escape(resourcePath)}` : ''
+    const query = `?vue&type=custom&index=${i}&blockType=${qs.escape(block.type)}${issuerQuery}${attrsQuery}`
     return (
       `import block${i} from ${stringifyRequest(src + query)}\n` +
       `if (typeof block${i} === 'function') block${i}(component)`