Skip to content
This repository was archived by the owner on May 1, 2020. It is now read-only.

Commit de09048

Browse files
committed
fix(template): fix bug with using dollar sign within templates
1 parent a47f120 commit de09048

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/template.spec.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ describe('template', () => {
2727

2828
const results = inlineTemplate(sourceText, join(baseDir, 'some-file.ts'));
2929

30-
expect(results).toEqual(`/*someprefix*/@Component({template:/*ion-inline-start:"${join(baseDir, 'some-file.html')}"*/\`<div>A</div>\`/*ion-inline-end:"${join(baseDir, 'some-file.html')}"*/ });/*somebetween*/@Component({template:/*ion-inline-start:"${join(baseDir, 'some-file.html')}"*/\`<div>A</div>\`/*ion-inline-end:"${join(baseDir, 'some-file.html')}"*/ })/*somesuffix*/`);
30+
expect(results).toEqual(`/*someprefix*/@Component({template:/*ion-inline-start:"${join(baseDir, 'some-file.html')}"*/\'<div>A</div>\'/*ion-inline-end:"${join(baseDir, 'some-file.html')}"*/ });/*somebetween*/@Component({template:/*ion-inline-start:"${join(baseDir, 'some-file.html')}"*/\'<div>A</div>\'/*ion-inline-end:"${join(baseDir, 'some-file.html')}"*/ })/*somesuffix*/`);
3131
mockFs.restore();
3232
});
3333

@@ -47,7 +47,7 @@ describe('template', () => {
4747

4848
const results = inlineTemplate(sourceText, join(baseDir, 'some-file.ts'));
4949

50-
expect(results).toEqual(`/*someprefix*/@Component({template:/*ion-inline-start:"${join(baseDir, 'some-file1.html')}"*/\`<div>A</div>\`/*ion-inline-end:"${join(baseDir, 'some-file1.html')}"*/ });/*somebetween*/@Component({template:/*ion-inline-start:"${join(baseDir, 'some-file2.html')}"*/\`<div>B</div>\`/*ion-inline-end:"${join(baseDir, 'some-file2.html')}"*/ })/*somesuffix*/`);
50+
expect(results).toEqual(`/*someprefix*/@Component({template:/*ion-inline-start:"${join(baseDir, 'some-file1.html')}"*/\'<div>A</div>\'/*ion-inline-end:"${join(baseDir, 'some-file1.html')}"*/ });/*somebetween*/@Component({template:/*ion-inline-start:"${join(baseDir, 'some-file2.html')}"*/\'<div>B</div>\'/*ion-inline-end:"${join(baseDir, 'some-file2.html')}"*/ })/*somesuffix*/`);
5151
mockFs.restore();
5252
});
5353

@@ -67,7 +67,7 @@ describe('template', () => {
6767

6868
const results = inlineTemplate(sourceText, join(baseDir, 'some-file.ts'));
6969

70-
expect(results).toEqual(`@Component({template:/*ion-inline-start:"${join(baseDir, 'some-file.html')}"*/\`<div>hello</div>\`/*ion-inline-end:"${join(baseDir, 'some-file.html')}"*/ })`);
70+
expect(results).toEqual(`@Component({template:/*ion-inline-start:"${join(baseDir, 'some-file.html')}"*/\'<div>hello</div>\'/*ion-inline-end:"${join(baseDir, 'some-file.html')}"*/ })`);
7171
mockFs.restore();
7272
});
7373

@@ -149,7 +149,7 @@ describe('template', () => {
149149
const match = getTemplateMatch(str);
150150
const result = replaceTemplateUrl(match, htmlFilePath, templateContent);
151151

152-
const expected = `Component({template:/*ion-inline-start:"${join(process.cwd(), 'full', 'path', 'to', 'somepage.html')}"*/\`\\n <div>\t\\n this is "multiline" \\'content\\'\\n </div>\\n\\n \`/*ion-inline-end:"${join(process.cwd(), 'full', 'path', 'to', 'somepage.html')}"*/})`;
152+
const expected = `Component({template:/*ion-inline-start:"${join(process.cwd(), 'full', 'path', 'to', 'somepage.html')}"*/\'\\n <div>\t\\n this is "multiline" \\'content\\'\\n </div>\\n\\n \'/*ion-inline-end:"${join(process.cwd(), 'full', 'path', 'to', 'somepage.html')}"*/})`;
153153

154154
expect(result).toEqual(expected);
155155
});
@@ -163,7 +163,7 @@ describe('template', () => {
163163
const resolvedPath = resolve(path);
164164
const results = getTemplateFormat(path, 'filibuster');
165165
expect(path).not.toEqual(resolvedPath);
166-
expect(results).toEqual(`template:/*ion-inline-start:"${resolvedPath}"*/\`filibuster\`/*ion-inline-end:"${resolvedPath}"*/`);
166+
expect(results).toEqual(`template:/*ion-inline-start:"${resolvedPath}"*/\'filibuster\'/*ion-inline-end:"${resolvedPath}"*/`);
167167
});
168168

169169
});

src/template.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ export function getTemplateFormat(htmlFilePath: string, content: string) {
176176
content = content.replace(/\r|\n/g, '\\n');
177177
content = content.replace(/\'/g, '\\\'');
178178

179-
return `${getTemplatePrefix(htmlFilePath)}\`${content}\`${getTemplateSuffix(htmlFilePath)}`;
179+
return `${getTemplatePrefix(htmlFilePath)}\'${content}\'${getTemplateSuffix(htmlFilePath)}`;
180180
}
181181

182182

0 commit comments

Comments
 (0)