Skip to content

Commit

Permalink
fix(static): use .url instead of .esi as extension for immutable reso…
Browse files Browse the repository at this point in the history 
…urces

See adobe/helix-publish@403ae1b
  • Loading branch information
@trieloff
trieloff committed Apr 30, 2019
1 parent 0b89ac7 commit 70b9674
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
8 changes: 4 additions & 4 deletions src/openwhisk/static.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ function rewriteCSS(css, base = '') {
if (importuri.reference === 'relative' && !importuri.query) {
rule.replaceWith(postcss.atRule({
name: 'import',
params: `url(${quote}<esi:include src="${importuri.path}.esi"/><esi:remove>${importuri.path}</esi:remove>${quote}) ${queries}`,
params: `url(${quote}<esi:include src="${importuri.path}.url"/><esi:remove>${importuri.path}</esi:remove>${quote}) ${queries}`,
}));
}
} else if (parsedurl.nodes
Expand All @@ -128,7 +128,7 @@ function rewriteCSS(css, base = '') {
if (importuri.reference === 'relative' && !importuri.query) {
rule.replaceWith(postcss.atRule({
name: 'import',
params: `${quote}<esi:include src="${uri.resolve(base, importuri.path)}.esi"/><esi:remove>${importuri.path}</esi:remove>${quote} ${queries}`,
params: `${quote}<esi:include src="${uri.resolve(base, importuri.path)}.url"/><esi:remove>${importuri.path}</esi:remove>${quote} ${queries}`,
}));
}
}
Expand All @@ -144,7 +144,7 @@ function rewriteCSS(css, base = '') {
url: (asset) => {
// TODO pass in request URL and make it absolute.
if (asset.search === '' && asset.absolutePath !== '.' && asset.relativePath !== '.') {
return `<esi:include src="${uri.resolve(base, asset.relativePath)}.esi"/><esi:remove>${asset.relativePath}</esi:remove>`;
return `<esi:include src="${uri.resolve(base, asset.relativePath)}.url"/><esi:remove>${asset.relativePath}</esi:remove>`;
}
return asset.url;
},
Expand All @@ -170,7 +170,7 @@ function rewriteJavaScript(javascript, base = '') {
const { specifiers } = path.node;
// console.log(srcuri);
const h = ohash(srcuri.path);
importmap[h] = `<esi:include src="${uri.resolve(base, srcuri.path)}.esi"/><esi:remove>${path.node.source.value}</esi:remove>`;
importmap[h] = `<esi:include src="${uri.resolve(base, srcuri.path)}.url"/><esi:remove>${path.node.source.value}</esi:remove>`;
path.replaceWith(t.importDeclaration(specifiers, t.stringLiteral(h)));
}
}
Expand Down
18 changes: 9 additions & 9 deletions test/testStatic.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,30 +136,30 @@ describe('CSS and JS Rewriting', () => {
assert.equal(await index.getBody('text/css', `.element {
background: url('images/../sprite.png');
}`, true), `.element {
background: url('<esi:include src="sprite.png.esi"/><esi:remove>sprite.png</esi:remove>');
background: url('<esi:include src="sprite.png.url"/><esi:remove>sprite.png</esi:remove>');
}`);
assert.equal(await index.getBody('text/css', `.element {
background: url("images/../sprite.png");
}`, true), `.element {
background: url("<esi:include src="sprite.png.esi"/><esi:remove>sprite.png</esi:remove>");
background: url("<esi:include src="sprite.png.url"/><esi:remove>sprite.png</esi:remove>");
}`);
assert.equal(await index.getBody('text/css',
'@import "fineprint.css" print;', true),
'@import "<esi:include src="fineprint.css.esi"/><esi:remove>fineprint.css</esi:remove>" print;');
'@import "<esi:include src="fineprint.css.url"/><esi:remove>fineprint.css</esi:remove>" print;');
assert.equal(await index.getBody('text/css',
'@import \'fineprint.css\' print;', true),
'@import \'<esi:include src="fineprint.css.esi"/><esi:remove>fineprint.css</esi:remove>\' print;');
'@import \'<esi:include src="fineprint.css.url"/><esi:remove>fineprint.css</esi:remove>\' print;');
assert.equal(await index.getBody('text/css',
'@import url(\'fineprint.css\') print;', true),
'@import url(\'<esi:include src="fineprint.css.esi"/><esi:remove>fineprint.css</esi:remove>\') print;');
'@import url(\'<esi:include src="fineprint.css.url"/><esi:remove>fineprint.css</esi:remove>\') print;');
assert.equal(await index.getBody('text/css',
'@import url("fineprint.css") print;', true),
'@import url("<esi:include src="fineprint.css.esi"/><esi:remove>fineprint.css</esi:remove>") print;');
'@import url("<esi:include src="fineprint.css.url"/><esi:remove>fineprint.css</esi:remove>") print;');
});

it('Rewrite JS', async () => {
assert.equal(await index.getBody('text/javascript', 'import { transform } from "@babel/core";code();', true),
'import { transform } from "<esi:include src="@babel/core.esi"/><esi:remove>@babel/core</esi:remove>";code();');
'import { transform } from "<esi:include src="@babel/core.url"/><esi:remove>@babel/core</esi:remove>";code();');
});
});

Expand Down Expand Up @@ -278,8 +278,8 @@ describe('Static Delivery Action #unittest', () => {
plain: true,
esi: true,
});
assert.equal(res.body, `import barba from "<esi:include src="/web_modules/@barba--core.js.esi"/><esi:remove>./web_modules/@barba--core.js</esi:remove>";import
prefetch from "<esi:include src="/web_modules/@barba--prefetch.js.esi"/><esi:remove>./web_modules/@barba--prefetch.js</esi:remove>";
assert.equal(res.body, `import barba from "<esi:include src="/web_modules/@barba--core.js.url"/><esi:remove>./web_modules/@barba--core.js</esi:remove>";import
prefetch from "<esi:include src="/web_modules/@barba--prefetch.js.url"/><esi:remove>./web_modules/@barba--prefetch.js</esi:remove>";
// tells barba to use the prefetch module
barba.use(prefetch);
Expand Down

0 comments on commit 70b9674

Please sign in to comment.