ignore custom blocks with no matching loader

Author: yyx990803

docs/en/configurations/custom-blocks.md

@@ -4,6 +4,8 @@
 
 You can define custom language blocks inside `*.vue` files. The content of a custom block will be processed by the loaders specified in the `loaders` object of `vue-loader` options and then required by the component module. The configuration is similar to what is described in [Advanced Loader Configuration](../configurations/advanced.md), except the matching uses the tag name instead of the `lang` attribute.
 
+If a matching loader is found for a custom block, it will be processed; otherwise the custom block will simply be ignored.
+
 ## Example
 
 Here's an example of extracting all `<docs>` custom blocks into a single docs file:
@@ -63,5 +65,3 @@ module.exports = {
   }
 }
 ```
-
-Note that custom blocks would require specific configuration to work properly, so you probably want to avoid distributing reusable components with custom blocks in source form.

lib/loader.js

@@ -174,7 +174,7 @@ module.exports = function (content) {
         loader = addCssModulesToLoader(loader, part, index)
       }
       // if user defines custom loaders for html, add template compiler to it
-      if (type === 'template' && loader !== defaultLoaders.html) {
+      if (type === 'template' && loader.indexOf(defaultLoaders.html) < 0) {
         loader = defaultLoaders.html + '!' + loader
       }
       // inject rewriter before css/html loader for
@@ -281,32 +281,6 @@ module.exports = function (content) {
     output += '\n'
   }
 
-    // add requires for customBlocks
-  if (parts.customBlocks && parts.customBlocks.length) {
-    var addedPrefix = false
-
-    parts.customBlocks.forEach(function (customBlock, i) {
-      if (!loaders[customBlock.type]) {
-        loaderContext.emitWarning('Loader for custom block type "' + customBlock.type + '" not found in webpack configuration')
-      } else {
-        // require customBlock
-        customBlock.src = customBlock.attrs.src
-        var requireString = customBlock.src
-          ? getRequireForImport(customBlock.type, customBlock)
-          : getRequire(customBlock.type, customBlock, i)
-
-        if (!addedPrefix) {
-          output += '\n/* customBlocks */\n'
-          addedPrefix = true
-        }
-
-        output += requireString + '\n'
-      }
-    })
-
-    output += '\n'
-  }
-
   // we require the component normalizer function, and call it like so:
   // normalizeComponent(
   //   scriptExports,
@@ -385,6 +359,30 @@ module.exports = function (content) {
     }
   }
 
+  // add requires for customBlocks
+  if (parts.customBlocks && parts.customBlocks.length) {
+    var addedPrefix = false
+
+    parts.customBlocks.forEach(function (customBlock, i) {
+      if (loaders[customBlock.type]) {
+        // require customBlock
+        customBlock.src = customBlock.attrs.src
+        var requireString = customBlock.src
+          ? getRequireForImport(customBlock.type, customBlock)
+          : getRequire(customBlock.type, customBlock, i)
+
+        if (!addedPrefix) {
+          output += '\n/* customBlocks */\n'
+          addedPrefix = true
+        }
+
+        output += requireString + '\n'
+      }
+    })
+
+    output += '\n'
+  }
+
   if (!query.inject) {
     // hot reload
     if (

test/test.js

@@ -617,50 +617,15 @@ describe('vue-loader', function () {
     })
   })
 
-  it('custom blocks can be removed from the output', function (done) {
+  it('custom blocks can be ignored', function (done) {
     bundle({
-      entry: './test/fixtures/custom-language.vue',
-      vue: {
-        loaders: {
-          'unit-test': 'null-loader'
-        }
-      }
+      entry: './test/fixtures/custom-language.vue'
     }, function (code, warnings) {
       expect(code).not.to.contain('describe(\'example\', function () {\n  it(\'basic\', function (done) {\n    done();\n  });\n})')
       done()
     })
   })
 
-  it('no warnings when loaders are specified for all custom blocks', function (done) {
-    bundle({
-      entry: './test/fixtures/custom-language.vue',
-      vue: {
-        loaders: {
-          'documentation': 'null-loader',
-          'unit-test': 'null-loader'
-        }
-      }
-    }, function (code, warnings) {
-      expect(warnings.length).to.equal(0)
-      done()
-    })
-  })
-
-  it('warning should be raised when a loader is not specified for a custom block', function (done) {
-    bundle({
-      entry: './test/fixtures/custom-language.vue',
-      vue: {
-        loaders: {
-          'documentation': 'null-loader'
-        }
-      }
-    }, function (code, warnings) {
-      expect(warnings.length).to.equal(1)
-      expect(warnings[0].message).to.equal('Loader for custom block type "unit-test" not found in webpack configuration')
-      done()
-    })
-  })
-
   it('passes attributes as options to the loader', function (done) {
     bundle({
       entry: './test/fixtures/custom-options.vue',