@automattic/jetpack-critical-css-gen 1.0.8 → 1.0.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md
CHANGED
|
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
|
|
|
5
5
|
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
|
|
6
6
|
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
|
7
7
|
|
|
8
|
+
## [1.0.9] - 2025-03-26
|
|
9
|
+
### Fixed
|
|
10
|
+
- Fix throwing exceptions during ATF selector collection causing the whole generation to fail. [#42613]
|
|
11
|
+
|
|
8
12
|
## [1.0.8] - 2025-03-18
|
|
9
13
|
### Changed
|
|
10
14
|
- Update package dependencies. [#42406] [#42511]
|
|
@@ -66,6 +70,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|
|
66
70
|
### Added
|
|
67
71
|
- Initial version. [#38429]
|
|
68
72
|
|
|
73
|
+
[1.0.9]: https://github.com/Automattic/jetpack-critical-css-gen/compare/v1.0.8...v1.0.9
|
|
69
74
|
[1.0.8]: https://github.com/Automattic/jetpack-critical-css-gen/compare/v1.0.7...v1.0.8
|
|
70
75
|
[1.0.7]: https://github.com/Automattic/jetpack-critical-css-gen/compare/v1.0.6...v1.0.7
|
|
71
76
|
[1.0.6]: https://github.com/Automattic/jetpack-critical-css-gen/compare/v1.0.5...v1.0.6
|
|
@@ -76,25 +76,31 @@ async function getAboveFoldSelectors({ browserInterface, selectorPages, validUrl
|
|
|
76
76
|
// i.e.: may match elements on pages that do not include their CSS file.
|
|
77
77
|
const aboveFoldSelectors = new Set();
|
|
78
78
|
const dangerousSelectors = new Set();
|
|
79
|
+
const errors = {};
|
|
79
80
|
for (const url of validUrls.slice(0, maxPages)) {
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
81
|
+
try {
|
|
82
|
+
// Work out which CSS selectors match any element on this page.
|
|
83
|
+
const pageSelectors = await browserInterface.runInPage(url, null, BrowserInterface.innerFindMatchingSelectors, trimmedSelectors);
|
|
84
|
+
// Check for selectors which may match this page, but are not included in this page's CSS.
|
|
85
|
+
pageSelectors
|
|
86
|
+
.filter(s => !selectorPages[s].has(url))
|
|
87
|
+
.forEach(s => dangerousSelectors.add(s));
|
|
88
|
+
// Collate all above-fold selectors for all viewport sizes.
|
|
89
|
+
for (const size of viewports) {
|
|
90
|
+
updateProgress();
|
|
91
|
+
const pageAboveFold = await browserInterface.runInPage(url, size, BrowserInterface.innerFindAboveFoldSelectors, trimmedSelectors, pageSelectors);
|
|
92
|
+
pageAboveFold.forEach(s => aboveFoldSelectors.add(s));
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
catch (err) {
|
|
96
|
+
errors[url] = err;
|
|
91
97
|
}
|
|
92
98
|
}
|
|
93
99
|
// Remove dangerous selectors from above fold set.
|
|
94
100
|
for (const dangerousSelector of dangerousSelectors) {
|
|
95
101
|
aboveFoldSelectors.delete(dangerousSelector);
|
|
96
102
|
}
|
|
97
|
-
return aboveFoldSelectors;
|
|
103
|
+
return [aboveFoldSelectors, errors];
|
|
98
104
|
}
|
|
99
105
|
/**
|
|
100
106
|
* Generates critical CSS for the given URLs and viewports.
|
|
@@ -131,7 +137,7 @@ export async function generateCriticalCSS({ browserInterface, progressCallback,
|
|
|
131
137
|
// Gather a record of all selectors, and which page URLs each is referenced by.
|
|
132
138
|
const selectorPages = cssFiles.collateSelectorPages();
|
|
133
139
|
// Get CSS selectors for above the fold.
|
|
134
|
-
const aboveFoldSelectors = await getAboveFoldSelectors({
|
|
140
|
+
const [aboveFoldSelectors, aboveFoldErrors] = await getAboveFoldSelectors({
|
|
135
141
|
browserInterface,
|
|
136
142
|
selectorPages,
|
|
137
143
|
validUrls,
|
|
@@ -139,6 +145,12 @@ export async function generateCriticalCSS({ browserInterface, progressCallback,
|
|
|
139
145
|
maxPages,
|
|
140
146
|
updateProgress,
|
|
141
147
|
});
|
|
148
|
+
// During getAboveFoldSelectors, pages are loaded again and might error.
|
|
149
|
+
// We can't continue if there are not enough valid URLs to carry on with.
|
|
150
|
+
const validUrlsPostAboveFold = browserInterface.filterValidUrls(urls);
|
|
151
|
+
if (validUrlsPostAboveFold.length < successUrlsThreshold) {
|
|
152
|
+
throw new SuccessTargetError(aboveFoldErrors);
|
|
153
|
+
}
|
|
142
154
|
// Prune each AST for above-fold selector list. Note: this prunes a clone.
|
|
143
155
|
const asts = cssFiles.prunedAsts(aboveFoldSelectors);
|
|
144
156
|
// Convert ASTs to CSS.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-critical-css.js","sourceRoot":"","sources":["../src/generate-critical-css.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAY,MAAM,aAAa,CAAC;AAC1E,OAAO,EAAE,2BAA2B,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,MAAM,IAAI,GAAG,GAAG,EAAE;IACjB,SAAS;AACV,CAAC,CAAC;AAEF;;;;;;;;;;GAUG;AACH,KAAK,UAAU,eAAe,CAC7B,gBAAkC,EAClC,IAAc,EACd,QAAgB;IAEhB,MAAM,QAAQ,GAAG,IAAI,UAAU,CAAE,gBAAgB,CAAE,CAAC;IACpD,MAAM,MAAM,GAAG,EAAE,CAAC;IAClB,IAAI,SAAS,GAAG,CAAC,CAAC;IAElB,KAAM,MAAM,GAAG,IAAI,IAAI,EAAG;QACzB,IAAI;YACH,MAAM,WAAW,GAAG,MAAM,gBAAgB,CAAC,cAAc,CAAE,GAAG,CAAE,CAAC;YAEjE,qCAAqC;YACrC,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAE,WAAW,CAAE,CAAC;YAChD,MAAM,gBAAgB,GAAG,YAAY,CAAC,MAAM,CAC3C,CAAE,GAAG,EAAE,QAAQ,EAAG,EAAE;gBACnB,IAAI;oBACH,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAE,QAAQ,EAAE,GAAG,CAAE,CAAC,QAAQ,EAAE,CAAC;oBACrD,GAAG,CAAE,QAAQ,CAAE,GAAG,WAAW,CAAE,QAAQ,CAAE,CAAC;iBAC1C;gBAAC,MAAM;oBACP,uBAAuB;oBACvB,sCAAsC;oBACtC,OAAO,CAAC,GAAG,CAAE,6BAA8B,QAAS,EAAE,CAAE,CAAC;iBACzD;gBAED,OAAO,GAAG,CAAC;YACZ,CAAC,EACD,EAAwB,CACxB,CAAC;YAEF,MAAM,QAAQ,CAAC,WAAW,CAAE,GAAG,EAAE,gBAAgB,CAAE,CAAC;YAEpD,MAAM,cAAc,GAAG,MAAM,gBAAgB,CAAC,iBAAiB,CAAE,GAAG,CAAE,CAAC;YACvE,MAAM,QAAQ,CAAC,iBAAiB,CAAE,GAAG,EAAE,cAAc,CAAE,CAAC;YAExD,0CAA0C;YAC1C,SAAS,EAAE,CAAC;YACZ,IAAK,SAAS,IAAI,QAAQ,EAAG;gBAC5B,MAAM;aACN;SACD;QAAC,OAAQ,GAAG,EAAG;YACf,MAAM,CAAE,GAAG,CAAE,GAAG,GAAG,CAAC;SACpB;KACD;IAED,OAAO,CAAE,QAAQ,EAAE,MAAM,CAAE,CAAC;AAC7B,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,KAAK,UAAU,qBAAqB,CAAE,EACrC,gBAAgB,EAChB,aAAa,EACb,SAAS,EACT,SAAS,EACT,QAAQ,EACR,cAAc,GAQd;IACA,uGAAuG;IACvG,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAE,aAAa,CAAE,CAAC,MAAM,CAAE,CAAE,GAAG,EAAE,QAAQ,EAAG,EAAE;QACjF,GAAG,CAAE,QAAQ,CAAE,GAAG,2BAA2B,CAAE,QAAQ,CAAE,CAAC;QAC1D,OAAO,GAAG,CAAC;IACZ,CAAC,EAAE,EAAE,CAAE,CAAC;IAER,uGAAuG;IACvG,wEAAwE;IACxE,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAY,CAAC;IAC/C,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAY,CAAC;IAE/C,KAAM,MAAM,GAAG,IAAI,SAAS,CAAC,KAAK,CAAE,CAAC,EAAE,QAAQ,CAAE,EAAG;QACnD,+DAA+D;
|
|
1
|
+
{"version":3,"file":"generate-critical-css.js","sourceRoot":"","sources":["../src/generate-critical-css.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"type": "module",
|
|
3
3
|
"name": "@automattic/jetpack-critical-css-gen",
|
|
4
|
-
"version": "1.0.
|
|
4
|
+
"version": "1.0.9",
|
|
5
5
|
"description": "A flexible Critical CSS Generator that supports multiple URLs and viewports, with both server-side and client-side generation capabilities.",
|
|
6
6
|
"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/critical-css-gen/#readme",
|
|
7
7
|
"bugs": {
|