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

Commit

Permalink
fix(template): fix bug with using dollar sign within templates
Browse files Browse the repository at this point in the history
  • Loading branch information
danbucholtz committed Nov 13, 2017
1 parent a47f120 commit de09048
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions src/template.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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')}"*/\`<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*/`);
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*/`);
mockFs.restore();
});

Expand All @@ -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')}"*/\`<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*/`);
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*/`);
mockFs.restore();
});

Expand All @@ -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')}"*/\`<div>hello</div>\`/*ion-inline-end:"${join(baseDir, 'some-file.html')}"*/ })`);
expect(results).toEqual(`@Component({template:/*ion-inline-start:"${join(baseDir, 'some-file.html')}"*/\'<div>hello</div>\'/*ion-inline-end:"${join(baseDir, 'some-file.html')}"*/ })`);
mockFs.restore();
});

Expand Down Expand Up @@ -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 <div>\t\\n this is "multiline" \\'content\\'\\n </div>\\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 <div>\t\\n this is "multiline" \\'content\\'\\n </div>\\n\\n \'/*ion-inline-end:"${join(process.cwd(), 'full', 'path', 'to', 'somepage.html')}"*/})`;

expect(result).toEqual(expected);
});
Expand All @@ -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}"*/`);
});

});
Expand Down
2 changes: 1 addition & 1 deletion src/template.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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)}`;
}


Expand Down

0 comments on commit de09048

Please sign in to comment.