Skip to content

Commit 3b07c43

Browse files
web-padawanweb-padawan
authored
chore: fix processing of font assets in dev pages builds (#10007)
1 parent d16b52d commit 3b07c43

File tree

4 files changed

+64
-4
lines changed

4 files changed

+64
-4
lines changed

‎dev/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
"@web/rollup-plugin-html": "^2.3.0",
5959
"postcss": "^8.1.0",
6060
"postcss-import": "^16.1.1",
61+
"postcss-url": "^10.1.3",
6162
"rimraf": "^6.0.1",
6263
"rollup": "^4.46.2"
6364
}

‎dev/rollup.config.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import terser from '@rollup/plugin-terser';
33
import { rollupPluginHTML as html } from '@web/rollup-plugin-html';
44
import postcss from 'postcss';
55
import atImport from 'postcss-import';
6+
import url from 'postcss-url';
67
import { appendStyles, generateListing } from '../wds-utils.js';
78

89
export default {
@@ -11,6 +12,7 @@ export default {
1112
plugins: [
1213
nodeResolve(),
1314
html({
15+
bundleAssetsFromCss: true, // Use Aura CSS fonts
1416
flattenOutput: false, // Preserve "charts" folder
1517
transformHtml: [
1618
(html) => appendStyles(html),
@@ -22,9 +24,12 @@ export default {
2224
transformAsset: [
2325
async (content, filePath) => {
2426
if (filePath.endsWith('.css')) {
25-
const result = await postcss().use(atImport()).process(content, {
26-
from: filePath,
27-
});
27+
const result = await postcss()
28+
.use(atImport())
29+
.use(url({ url: 'rebase' }))
30+
.process(content, {
31+
from: filePath,
32+
});
2833
return result.css;
2934
}
3035
},

‎patches/@web+rollup-plugin-html+2.3.0.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/node_modules/@web/rollup-plugin-html/dist/output/emitAssets.js b/node_modules/@web/rollup-plugin-html/dist/output/emitAssets.js
2+
index 7fdc0bf..ec95119 100644
3+
--- a/node_modules/@web/rollup-plugin-html/dist/output/emitAssets.js
4+
+++ b/node_modules/@web/rollup-plugin-html/dist/output/emitAssets.js
5+
@@ -73,7 +73,7 @@ async function emitAssets(inputs, options) {
6+
let updatedCssSource = false;
7+
const { code } = await (0, lightningcss_1.transform)({
8+
filename: basename,
9+
- code: asset.content,
10+
+ code: source,
11+
minify: false,
12+
visitor: {
13+
Url: url => {

‎yarn.lock

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3915,6 +3915,11 @@ cubic2quad@^1.2.1:
39153915
resolved "https://registry.yarnpkg.com/cubic2quad/-/cubic2quad-1.2.1.tgz#2442260b72c02ee4b6a2fe998fcc1c4073622286"
39163916
integrity sha512-wT5Y7mO8abrV16gnssKdmIhIbA9wSkeMzhh27jAguKrV82i24wER0vL5TGhUJ9dbJNDcigoRZ0IAHFEEEI4THQ==
39173917

3918+
cuint@^0.2.2:
3919+
version "0.2.2"
3920+
resolved "https://registry.yarnpkg.com/cuint/-/cuint-0.2.2.tgz#408086d409550c2631155619e9fa7bcadc3b991b"
3921+
integrity sha512-d4ZVpCW31eWwCMe1YT3ur7mUDnTXbgwyzaL320DrcRT45rfjYxkt5QWLrmOJ+/UEAI2+fQgKe/fCjR8l4TpRgw==
3922+
39183923
damerau-levenshtein@^1.0.8:
39193924
version "1.0.8"
39203925
resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz#b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7"
@@ -7962,6 +7967,13 @@ make-dir@^2.1.0:
79627967
pify "^4.0.1"
79637968
semver "^5.6.0"
79647969

7970+
make-dir@~3.1.0:
7971+
version "3.1.0"
7972+
resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
7973+
integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
7974+
dependencies:
7975+
semver "^6.0.0"
7976+
79657977
make-fetch-happen@^13.0.0, make-fetch-happen@^13.0.1:
79667978
version "13.0.1"
79677979
resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz#273ba2f78f45e1f3a6dca91cede87d9fa4821e36"
@@ -8141,6 +8153,11 @@ mime@^3.0.0:
81418153
resolved "https://registry.yarnpkg.com/mime/-/mime-3.0.0.tgz#b374550dca3a0c18443b0c950a6a58f1931cf7a7"
81428154
integrity sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==
81438155

8156+
mime@~2.5.2:
8157+
version "2.5.2"
8158+
resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe"
8159+
integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==
8160+
81448161
mimic-fn@^2.1.0:
81458162
version "2.1.0"
81468163
resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
@@ -8225,6 +8242,13 @@ minimatch@^9.0.0, minimatch@^9.0.3, minimatch@^9.0.4:
82258242
dependencies:
82268243
brace-expansion "^2.0.1"
82278244

8245+
minimatch@~3.0.4:
8246+
version "3.0.8"
8247+
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.8.tgz#5e6a59bd11e2ab0de1cfb843eb2d82e546c321c1"
8248+
integrity sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==
8249+
dependencies:
8250+
brace-expansion "^1.1.7"
8251+
82288252
minimist-options@4.1.0:
82298253
version "4.1.0"
82308254
resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
@@ -9574,6 +9598,16 @@ postcss-selector-parser@^7.1.0:
95749598
cssesc "^3.0.0"
95759599
util-deprecate "^1.0.2"
95769600

9601+
postcss-url@^10.1.3:
9602+
version "10.1.3"
9603+
resolved "https://registry.yarnpkg.com/postcss-url/-/postcss-url-10.1.3.tgz#54120cc910309e2475ec05c2cfa8f8a2deafdf1e"
9604+
integrity sha512-FUzyxfI5l2tKmXdYc6VTu3TWZsInayEKPbiyW+P6vmmIrrb4I6CGX0BFoewgYHLK+oIL5FECEK02REYRpBvUCw==
9605+
dependencies:
9606+
make-dir "~3.1.0"
9607+
mime "~2.5.2"
9608+
minimatch "~3.0.4"
9609+
xxhashjs "~0.2.2"
9610+
95779611
postcss-value-parser@^4.0.0, postcss-value-parser@^4.2.0:
95789612
version "4.2.0"
95799613
resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
@@ -10362,7 +10396,7 @@ semver-greatest-satisfied-range@^2.0.0:
1036210396
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
1036310397
integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
1036410398

10365-
semver@^6.3.0, semver@^6.3.1:
10399+
semver@^6.0.0, semver@^6.3.0, semver@^6.3.1:
1036610400
version "6.3.1"
1036710401
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
1036810402
integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
@@ -12242,6 +12276,13 @@ xtend@^4.0.0, xtend@~4.0.1:
1224212276
resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
1224312277
integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
1224412278

12279+
xxhashjs@~0.2.2:
12280+
version "0.2.2"
12281+
resolved "https://registry.yarnpkg.com/xxhashjs/-/xxhashjs-0.2.2.tgz#8a6251567621a1c46a5ae204da0249c7f8caa9d8"
12282+
integrity sha512-AkTuIuVTET12tpsVIQo+ZU6f/qDmKuRUcjaqR+OIvm+aCBsZ95i7UVY5WJ9TMsSaZ0DA2WxoZ4acu0sPH+OKAw==
12283+
dependencies:
12284+
cuint "^0.2.2"
12285+
1224512286
y18n@^5.0.5:
1224612287
version "5.0.8"
1224712288
resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"

0 commit comments

Comments
 (0)