Merge pull request #45 from wwwdevio/master

Fix styleUrls replace.

Author: Ścibor Rudnicki

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "rollup-plugin-angular",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Angular2 template and styles inliner",
   "main": "dist/rollup-plugin-angular.js",
   "module": "dist/rollup-plugin-angular.esm.js",

package.json

@@ -10,7 +10,7 @@ const moduleIdRegex = /moduleId\s*:(.*)/g;
 const componentRegex = /@Component\(\s?{([\s\S]*)}\s?\)$|type:\s?Component,\s?args:\s?\[\s?{([\s\S]*)},\s?\]/gm;
 const commentRegex = /\/\*[\s\S]*?\*\/|([^\\:]|^)\/\/.*$/gm; // http://www.regextester.com/?fam=96247
 const templateUrlRegex = /templateUrl\s*:(.*)/g;
-const styleUrlsRegex = /styleUrls\s*:(\s*\[[\s\S]*?\])/g;
+const styleUrlsRegex = /styleUrls\s*:(\s*\[[\s\S]*?\])/g; // http://www.regextester.com/?fam=98594
 const stringRegex = /(['"`])((?:[^\\]\\\1|.)*?)\1/g;
 
 function insertText(str, dir, preprocessor = res => res, processFilename = false, sourceType = 'ts') {
@@ -76,7 +76,7 @@ export default function angular(options = {}) {
             /* replace styles in files generated by ngc */
             if (fileExt === 'js') {
               replace({
-                regex: match,
+                regex: styleUrlsRegex,
                 replacement: toReplace,
                 paths: [map],
                 recursive: true,

src/index.js

@@ -2,15 +2,33 @@
 ExampleComponent.decorators = [
   { type: Component, args: [{
               selector: 'example-component',
-              templateUrl: `./example-component.html`
+              templateUrl: `./example-component.html`,
+              styleUrls: [
+                './style.scss',
+                './style.scss'
+              ]
           },] },
 ];
 
  */
+ExampleComponent.decorators = [
+  { type: Component, args: [{
+              selector: 'example-component',
+              templateUrl: `./example-component.html`,
+              styleUrls: [
+                './style.scss',
+                './style.scss'
+              ]
+          },] },
+];
 
 ExampleComponent.decorators = [
   { type: Component, args: [{
               selector: 'example-component',
-              templateUrl: `./example-component.html`
+              template: `blaaah`,
+              style: [
+                '.test{ }',
+                '.test_aa {}'
+              ]
           },] },
 ];

test/mochajs/example-component.js

@@ -0,0 +1,34 @@
+/**
+ExampleComponent.decorators = [
+  { type: Component, args: [{
+              selector: 'example-component',
+              templateUrl: `./example-component.html`,
+              styleUrls: [
+                './style.scss',
+                './style.scss'
+              ]
+          },] },
+];
+
+ */
+ExampleComponent.decorators = [
+  { type: Component, args: [{
+              selector: 'example-component',
+              templateUrl: `./example-component.html`,
+              styleUrls: [
+                './style.scss',
+                './style.scss'
+              ]
+          },] },
+];
+
+ExampleComponent.decorators = [
+  { type: Component, args: [{
+              selector: 'example-component',
+              template: `blaaah`,
+              style: [
+                '.test{ }',
+                '.test_aa {}'
+              ]
+          },] },
+];

test/mochajs/example-component.original.js

@@ -0,0 +1,3 @@
+.test {
+  font-family: fantasy;
+}