diff --git a/src/template.spec.ts b/src/template.spec.ts index 725957bf..82a3e7a1 100644 --- a/src/template.spec.ts +++ b/src/template.spec.ts @@ -27,7 +27,7 @@ describe('template', () => { const results = inlineTemplate(sourceText, join(baseDir, 'some-file.ts')); - expect(results).toEqual(`/*someprefix*/@Component({template:/*ion-inline-start:"${join(baseDir, 'some-file.html')}"*/\`
A
\`/*ion-inline-end:"${join(baseDir, 'some-file.html')}"*/ });/*somebetween*/@Component({template:/*ion-inline-start:"${join(baseDir, 'some-file.html')}"*/\`
A
\`/*ion-inline-end:"${join(baseDir, 'some-file.html')}"*/ })/*somesuffix*/`); + expect(results).toEqual(`/*someprefix*/@Component({template:/*ion-inline-start:"${join(baseDir, 'some-file.html')}"*/\'
A
\'/*ion-inline-end:"${join(baseDir, 'some-file.html')}"*/ });/*somebetween*/@Component({template:/*ion-inline-start:"${join(baseDir, 'some-file.html')}"*/\'
A
\'/*ion-inline-end:"${join(baseDir, 'some-file.html')}"*/ })/*somesuffix*/`); mockFs.restore(); }); @@ -47,7 +47,7 @@ describe('template', () => { const results = inlineTemplate(sourceText, join(baseDir, 'some-file.ts')); - expect(results).toEqual(`/*someprefix*/@Component({template:/*ion-inline-start:"${join(baseDir, 'some-file1.html')}"*/\`
A
\`/*ion-inline-end:"${join(baseDir, 'some-file1.html')}"*/ });/*somebetween*/@Component({template:/*ion-inline-start:"${join(baseDir, 'some-file2.html')}"*/\`
B
\`/*ion-inline-end:"${join(baseDir, 'some-file2.html')}"*/ })/*somesuffix*/`); + expect(results).toEqual(`/*someprefix*/@Component({template:/*ion-inline-start:"${join(baseDir, 'some-file1.html')}"*/\'
A
\'/*ion-inline-end:"${join(baseDir, 'some-file1.html')}"*/ });/*somebetween*/@Component({template:/*ion-inline-start:"${join(baseDir, 'some-file2.html')}"*/\'
B
\'/*ion-inline-end:"${join(baseDir, 'some-file2.html')}"*/ })/*somesuffix*/`); mockFs.restore(); }); @@ -67,7 +67,7 @@ describe('template', () => { const results = inlineTemplate(sourceText, join(baseDir, 'some-file.ts')); - expect(results).toEqual(`@Component({template:/*ion-inline-start:"${join(baseDir, 'some-file.html')}"*/\`
hello
\`/*ion-inline-end:"${join(baseDir, 'some-file.html')}"*/ })`); + expect(results).toEqual(`@Component({template:/*ion-inline-start:"${join(baseDir, 'some-file.html')}"*/\'
hello
\'/*ion-inline-end:"${join(baseDir, 'some-file.html')}"*/ })`); mockFs.restore(); }); @@ -149,7 +149,7 @@ describe('template', () => { const match = getTemplateMatch(str); const result = replaceTemplateUrl(match, htmlFilePath, templateContent); - const expected = `Component({template:/*ion-inline-start:"${join(process.cwd(), 'full', 'path', 'to', 'somepage.html')}"*/\`\\n
\t\\n this is "multiline" \\'content\\'\\n
\\n\\n \`/*ion-inline-end:"${join(process.cwd(), 'full', 'path', 'to', 'somepage.html')}"*/})`; + const expected = `Component({template:/*ion-inline-start:"${join(process.cwd(), 'full', 'path', 'to', 'somepage.html')}"*/\'\\n
\t\\n this is "multiline" \\'content\\'\\n
\\n\\n \'/*ion-inline-end:"${join(process.cwd(), 'full', 'path', 'to', 'somepage.html')}"*/})`; expect(result).toEqual(expected); }); @@ -163,7 +163,7 @@ describe('template', () => { const resolvedPath = resolve(path); const results = getTemplateFormat(path, 'filibuster'); expect(path).not.toEqual(resolvedPath); - expect(results).toEqual(`template:/*ion-inline-start:"${resolvedPath}"*/\`filibuster\`/*ion-inline-end:"${resolvedPath}"*/`); + expect(results).toEqual(`template:/*ion-inline-start:"${resolvedPath}"*/\'filibuster\'/*ion-inline-end:"${resolvedPath}"*/`); }); }); diff --git a/src/template.ts b/src/template.ts index d3db4aa9..101c6bd5 100644 --- a/src/template.ts +++ b/src/template.ts @@ -176,7 +176,7 @@ export function getTemplateFormat(htmlFilePath: string, content: string) { content = content.replace(/\r|\n/g, '\\n'); content = content.replace(/\'/g, '\\\''); - return `${getTemplatePrefix(htmlFilePath)}\`${content}\`${getTemplateSuffix(htmlFilePath)}`; + return `${getTemplatePrefix(htmlFilePath)}\'${content}\'${getTemplateSuffix(htmlFilePath)}`; }