Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bug/issue 1199 gracefully handle unresolvable asset URLs during CSS optimization #1235

Merged
merged 8 commits into from
Jun 22, 2024
Merged

bug/issue 1199 gracefully handle unresolvable asset URLs during CSS optimization #1235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7167efc
feature/issue 1197 Lit v3 upgrade and SSR fixes and enhancements (#1201)
thescientist13 Mar 10, 2024
5df0ca7
v0.30.0-alpha.1
thescientist13 Mar 16, 2024
9602d40
feature/issue 923 native import attributes for CSS and JSON (#1215)
thescientist13 Apr 29, 2024
6bcbbce
gracefully handle unresolvable assets during CSS optimization
thescientist13 May 31, 2024
a3a4d37
refactor URL and fs usage
thescientist13 May 31, 2024
3b47ea9
fix lint
thescientist13 May 31, 2024
dca5b45
missed rebase-a-ronis
thescientist13 Jun 2, 2024
ed4feb0
missed rebase-a-ronis
thescientist13 Jun 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 18 additions & 13 deletions packages/cli/src/plugins/resource/plugin-standard-css.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import fs from 'fs';
import path from 'path';
import { parse, walk } from 'css-tree';
import { ResourceInterface } from '../../lib/resource-interface.js';
import { normalizePathnameForWindows } from '../../lib/resource-utils.js';
import { hashString } from '../../lib/hashing-utils.js';

function bundleCss(body, url, compilation) {
Expand Down Expand Up @@ -38,7 +37,7 @@ function bundleCss(body, url, compilation) {
optimizedCss += `@import url('${value}');`;
}
} else if (type === 'Url' && this.atrule?.name !== 'import') {
if (value.startsWith('http') || value.startsWith('//')) {
if (value.startsWith('http') || value.startsWith('//') || value.startsWith('data:')) {
optimizedCss += `url('${value}')`;
return;
}
Expand All @@ -53,20 +52,26 @@ function bundleCss(body, url, compilation) {
const locationUrl = barePath.startsWith('node_modules')
? new URL(`./${barePath}`, projectDirectory)
: new URL(`./${barePath}`, userWorkspace);
const hash = hashString(fs.readFileSync(locationUrl, 'utf-8'));
const ext = barePath.split('.').pop();
const hashedRoot = barePath.replace(`.${ext}`, `.${hash}.${ext}`);

fs.mkdirSync(normalizePathnameForWindows(new URL(`./${path.dirname(barePath)}/`, outputDir)), {
recursive: true
});
if (fs.existsSync(locationUrl)) {
const hash = hashString(fs.readFileSync(locationUrl, 'utf-8'));
const ext = barePath.split('.').pop();
const hashedRoot = barePath.replace(`.${ext}`, `.${hash}.${ext}`);

fs.promises.copyFile(
locationUrl,
new URL(`./${hashedRoot}`, outputDir)
);
fs.mkdirSync(new URL(`./${path.dirname(barePath)}/`, outputDir), {
recursive: true
});

optimizedCss += `url('${basePath}${hashedRoot}')`;
fs.promises.copyFile(
locationUrl,
new URL(`./${hashedRoot}`, outputDir)
);

optimizedCss += `url('${basePath}${hashedRoot}')`;
} else {
console.warn(`Unable to locate ${value}. You may need to manually copy this file from its source location to the build output directory.`);
optimizedCss += `url('${value}')`;
}
} else if (type === 'Atrule' && name !== 'import') {
optimizedCss += `@${name} `;
} else if (type === 'TypeSelector') {
Expand Down
6 changes: 5 additions & 1 deletion packages/cli/test/cases/build.config.optimization-default/fixtures/expected.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,8 @@ h1:has(+h2){margin:0 0 0.25rem 0}

:is(ol,ul,menu:unsupported) :is(ol,ul){color:green}

.snippet{margin:var(--size-4) 0;padding:0 var(--size-4);}
.snippet{margin:var(--size-4) 0;padding:0 var(--size-4);}

h1{background-image:url('/foo/bar.baz')}

.has-success{background-image:url('data:image/svg+xml;...')}
9 changes: 9 additions & 0 deletions packages/cli/test/cases/build.config.optimization-default/src/styles/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,16 @@ h1:has(+ h2) {
color: green;
}


.snippet {
margin: var(--size-4) 0;
padding: 0 var(--size-4);
}

h1 {
background-image: url('/foo/bar.baz');
}

.has-success{
background-image: url("data:image/svg+xml;...");
}
Loading