Fix templateUrl regexp for the single line component decorator

index.js

@@ -2,7 +2,7 @@
 var loaderUtils = require("loader-utils");
 
 // using: regex, capture groups, and capture group variables.
-var templateUrlRegex = /templateUrl *:(.*)$/gm;
+var templateUrlRegex = /templateUrl\s*:(\s*['"`](.*?)['"`]([,}\n]))/gm;
 var stylesRegex = /styleUrls *:(\s*\[[^\]]*?\])/g;
 var stringRegex = /(['"])((?:[^\\]\\\1|.)*?)\1/g;
 

test/fixtures/component_with_single_line_decorator.js

@@ -0,0 +1,8 @@
+var componentWithSingleLineDecorator = `
+  import {Component} from '@angular/core';
+
+  @Component({selector: 'test-component', templateUrl: './file.html', styleUrls: ['./styles.css']})
+  export class TestComponent {};
+`;
+
+module.exports = componentWithSingleLineDecorator;

test/fixtures/index.js

@@ -3,9 +3,11 @@ var componentWithQuoteInUrls = require('./component_with_quote_in_urls.js');
 var componentWithMultipleStyles = require('./component_with_multiple_styles.js');
 var componentWithoutRelPeriodSlash = require('./component_without_relative_period_slash.js');
 var componentWithSpacing = require('./component_with_spacing.js');
+var componentWithSingleLineDecorator = require('./component_with_single_line_decorator.js');
 
 exports.simpleAngular2TestComponentFileStringSimple = sampleAngular2ComponentSimpleFixture;
 exports.componentWithQuoteInUrls = componentWithQuoteInUrls;
 exports.componentWithMultipleStyles = componentWithMultipleStyles;
 exports.componentWithoutRelPeriodSlash = componentWithoutRelPeriodSlash;
 exports.componentWithSpacing = componentWithSpacing;
+exports.componentWithSingleLineDecorator = componentWithSingleLineDecorator;

test/loader.spec.js

@@ -72,10 +72,10 @@ describe("loader", function() {
   });
 
   it("Should convert partial string match requires", function() {
-    loader.call({}, `templateUrl: './index/app.html'`)
+    loader.call({}, `{templateUrl: './index/app.html'}`)
       .should
       .be
-      .eql(`template: require('./index/app.html')`);
+      .eql(`{template: require('./index/app.html')}`);
   });
 
   it("Should handle the absense of proper relative path notation", function() {
@@ -160,4 +160,19 @@ describe("loader", function() {
 
   });
 
+  it("Should convert html and style file strings to require()s in a single line component decorator", function() {
+
+    loader.call({}, fixtures.componentWithSingleLineDecorator)
+      .should
+      .be
+      .eql(`
+  import {Component} from '@angular/core';
+
+  @Component({selector: 'test-component', template: require('./file.html'), styles: [require('./styles.css')]})
+  export class TestComponent {};
+`
+      );
+
+  });
+
 });