fix(sourcemaps): fix source maps for all files

Author: adamdbradley

src/bundle.ts

@@ -57,11 +57,9 @@ function runBundle(context: BuildContext, options: BuildOptions, rollupConfig: R
     // ngc does full production builds itself and the bundler
     // will already have receive transpiled and AoT templates
 
-    // dev mode auto-adds the ion-inline-template and
-    // ion-compiler plugins, which will inline templates
-    // and transpile source typescript code to JS before bundling
+    // dev mode auto-adds the ion-compiler plugin, which will inline
+    // templates and transpile source typescript code to JS before bundling
     rollupConfig.plugins.unshift(
-      inlineTemplate({}),
       ionCompiler({
         rootDir: context.rootDir,
         sourceMap: rollupConfig.sourceMap

src/plugins/ion-compiler.ts

@@ -2,8 +2,9 @@
 // https://github.com/rollup/rollup-plugin-typescript
 // MIT Licenced
 
-import { helperFns, helpersId } from '../util/typescript-helpers';
 import { getCompilerOptions, resolveId, transpile } from '../transpile';
+import { helperFns, helpersId } from '../util/typescript-helpers';
+import { inlineTemplate } from '../template';
 import * as pluginutils from 'rollup-pluginutils';
 
 
@@ -30,6 +31,7 @@ export default function ionCompiler(options: IonCompilerOptions) {
 
     transform(sourceText: string, sourcePath: string): any {
       if (filter(sourcePath)) {
+        sourceText = inlineTemplate(sourceText, sourcePath);
         return transpile(sourceText, sourcePath, compilerOptions, true);
       }
     }

src/plugins/ion-inline-template.ts

@@ -13,7 +13,7 @@ describe('template', () => {
       const sourcePath = 'somefile.ts';
       const output = inlineTemplate(sourceText, sourcePath);
 
-      expect(output).toEqual(null);
+      expect(output).toEqual(sourceText);
     });
 
     it('should do nothing for files with incomplete @Component', () => {
@@ -23,7 +23,7 @@ describe('template', () => {
       const sourcePath = 'somefile.ts';
       const output = inlineTemplate(sourceText, sourcePath);
 
-      expect(output).toEqual(null);
+      expect(output).toEqual(sourceText);
     });
 
     it('should do nothing for files without @Component', () => {
@@ -33,31 +33,26 @@ describe('template', () => {
       const sourcePath = 'somefile.ts';
       const output = inlineTemplate(sourceText, sourcePath);
 
-      expect(output).toEqual(null);
+      expect(output).toEqual(sourceText);
     });
 
     describe('replaceTemplateUrl', () => {
 
       it('should turn the template into one line', () => {
         const str = `
           @Component({
-            templateUrl: "somepage.html"
-          })
-        `;
+            templateUrl: "somepage.html"})`;
         const templateContent = `
-          <div>
-            this is multiline content
-          </div>
+          <div>\t
+            this is "multiline" 'content'
+          </div>\r
         `;
         const match = getTemplateMatch(str);
         const result = replaceTemplateUrl(match, templateContent);
 
-        expect(result).toEqual(`@Component({template: /* ion-inline-template */ \`
-          <div>
-            this is multiline content
-          </div>
-        \`
-          })`);
+        const expected = `@Component({template: /* ion-inline-template */ '\\n          <div>\t\\n            this is "multiline" \\'content\\'\\n          </div>\\n\\n        '})`;
+
+        expect(result).toEqual(expected);
       });
 
     });

src/spec/template.spec.ts

@@ -80,45 +80,33 @@ function getSourceComponentFile(htmlFilePath: string, context: BuildContext) {
 }
 
 
-export function inlineTemplate(sourceText: string, sourcePath: string): InlineTemplateOutput {
+export function inlineTemplate(sourceText: string, sourcePath: string): string {
   const magicString = new MagicString(sourceText);
   const componentDir = parse(sourcePath).dir;
   let match: TemplateUrlMatch;
-  let hasReplacements = false;
   let replacement: string;
   let lastStart = -1;
 
   while (match = getTemplateMatch(magicString.toString())) {
     if (match.start === lastStart) {
       // panic! we don't want to melt any machines if there's a bug
       Logger.debug(`Error matching component: ${match.component}`);
-      return null;
+      return magicString.toString();
     }
     lastStart = match.start;
 
     if (match.templateUrl === '') {
       Logger.error(`Error @Component templateUrl missing in: "${sourcePath}"`);
-      return null;
+      return magicString.toString();
     }
 
     replacement = updateTemplate(componentDir, match);
     if (replacement) {
       magicString.overwrite(match.start, match.end, replacement);
-      hasReplacements = true;
     }
   }
 
-  if (hasReplacements) {
-    return {
-      code: magicString.toString(),
-      map: magicString.generateMap({
-        source: sourcePath,
-        hires: false
-      })
-    };
-  }
-
-  return null;
+  return magicString.toString();
 }
 
 
@@ -133,11 +121,11 @@ function updateTemplate(componentDir: string, match: TemplateUrlMatch): string {
 
 export function replaceTemplateUrl(match: TemplateUrlMatch, templateContent: string): string {
   // turn the template into one line and espcape single quotes
-  // templateContent = templateContent.replace(/\r|\n/g, '\\n');
-  // templateContent = templateContent.replace(/\'/g, '\\\'');
+  templateContent = templateContent.replace(/\r|\n/g, '\\n');
+  templateContent = templateContent.replace(/\'/g, '\\\'');
 
   const orgTemplateProperty = match.templateProperty;
-  const newTemplateProperty = 'template: /* ion-inline-template */ `' + templateContent + '`';
+  const newTemplateProperty = 'template: /* ion-inline-template */ \'' + templateContent + '\'';
 
   return match.component.replace(orgTemplateProperty, newTemplateProperty);
 }
@@ -173,12 +161,6 @@ export function getTemplateMatch(str: string): TemplateUrlMatch {
 
 const COMPONENT_REGEX = /@Component\s*?\(\s*?(\{([\s\S]*?)(\s*templateUrl\s*:\s*(['"`])(.*?)(['"`])\s*?)([\s\S]*?)}\s*?)\)/m;
 
-
-export interface InlineTemplateOutput {
-  code: string;
-  map: any;
-}
-
 export interface TemplateUrlMatch {
   start: number;
   end: number;