mage-obsidian 2.7.1 → 2.8.0
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/dist/cli/criticalCss.js +26 -7
- package/dist/cli/criticalCss.js.map +1 -1
- package/dist/core/contractValidator.d.ts +4 -0
- package/dist/core/contractValidator.d.ts.map +1 -1
- package/dist/core/contractValidator.js +28 -0
- package/dist/core/contractValidator.js.map +1 -1
- package/dist/core/criticalCss.d.ts +11 -1
- package/dist/core/criticalCss.d.ts.map +1 -1
- package/dist/core/criticalCss.js +48 -1
- package/dist/core/criticalCss.js.map +1 -1
- package/dist/core/cssResolver.d.ts.map +1 -1
- package/dist/core/cssResolver.js +9 -11
- package/dist/core/cssResolver.js.map +1 -1
- package/dist/core/generateInterceptors.d.ts +2 -0
- package/dist/core/generateInterceptors.d.ts.map +1 -1
- package/dist/core/generateInterceptors.js +6 -5
- package/dist/core/generateInterceptors.js.map +1 -1
- package/dist/core/moduleResolver.d.ts.map +1 -1
- package/dist/core/moduleResolver.js +17 -22
- package/dist/core/moduleResolver.js.map +1 -1
- package/dist/core/themeChain.d.ts +11 -0
- package/dist/core/themeChain.d.ts.map +1 -0
- package/dist/core/themeChain.js +21 -0
- package/dist/core/themeChain.js.map +1 -0
- package/dist/core/themeResolverSync.d.ts.map +1 -1
- package/dist/core/themeResolverSync.js +6 -5
- package/dist/core/themeResolverSync.js.map +1 -1
- package/dist/vite/inheritAssetsModuleResolver.d.ts.map +1 -1
- package/dist/vite/inheritAssetsModuleResolver.js +6 -10
- package/dist/vite/inheritAssetsModuleResolver.js.map +1 -1
- package/dist/vite/inheritModuleResolver.d.ts.map +1 -1
- package/dist/vite/inheritModuleResolver.js +1 -2
- package/dist/vite/inheritModuleResolver.js.map +1 -1
- package/dist/vite/magentoHrmRewrite.js +1 -1
- package/dist/vite/magentoHrmRewrite.js.map +1 -1
- package/dist/vite/themeSourceWatcher.d.ts.map +1 -1
- package/dist/vite/themeSourceWatcher.js +2 -0
- package/dist/vite/themeSourceWatcher.js.map +1 -1
- package/package.json +1 -1
package/dist/cli/criticalCss.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { readFileSync, writeFileSync } from "node:fs";
|
|
2
|
-
import { extractCritical } from "../core/criticalCss.js";
|
|
2
|
+
import { extractCritical, mergeDocuments, classCoverage } from "../core/criticalCss.js";
|
|
3
3
|
// Internal bin the PHP `mage-obsidian:frontend:critical-css` command shells out
|
|
4
4
|
// to: it takes the rendered page HTML and the built stylesheet and writes the
|
|
5
5
|
// critical CSS. Kept argv-only (no commander) because it is machine-invoked.
|
|
@@ -7,16 +7,35 @@ function arg(name) {
|
|
|
7
7
|
const i = process.argv.indexOf(name);
|
|
8
8
|
return i > -1 ? process.argv[i + 1] : undefined;
|
|
9
9
|
}
|
|
10
|
-
|
|
10
|
+
function args(name) {
|
|
11
|
+
const found = [];
|
|
12
|
+
process.argv.forEach((value, i) => {
|
|
13
|
+
if (value === name && process.argv[i + 1] !== undefined) {
|
|
14
|
+
found.push(process.argv[i + 1]);
|
|
15
|
+
}
|
|
16
|
+
});
|
|
17
|
+
return found;
|
|
18
|
+
}
|
|
19
|
+
const htmlFiles = args("--html");
|
|
11
20
|
const cssFile = arg("--css");
|
|
12
21
|
const outFile = arg("--out");
|
|
13
|
-
|
|
14
|
-
|
|
22
|
+
const minCoverage = Number(arg("--min-coverage") ?? "0");
|
|
23
|
+
if (htmlFiles.length === 0 || !cssFile || !outFile) {
|
|
24
|
+
console.error("usage: criticalCss --html <file> [--html <file>…] --css <file> --out <file> [--min-coverage <0..1>]");
|
|
15
25
|
process.exit(1);
|
|
16
26
|
}
|
|
17
|
-
const
|
|
27
|
+
const htmls = htmlFiles.map((file) => readFileSync(file, "utf8"));
|
|
18
28
|
const css = readFileSync(cssFile, "utf8");
|
|
19
|
-
const critical = await extractCritical({ html, css });
|
|
29
|
+
const critical = await extractCritical({ html: htmls, css });
|
|
20
30
|
writeFileSync(outFile, critical);
|
|
21
|
-
|
|
31
|
+
const coverage = classCoverage(mergeDocuments(htmls), css, critical);
|
|
32
|
+
console.log(`critical: ${critical.length} bytes -> ${outFile} ` +
|
|
33
|
+
`(coverage ${(coverage.ratio * 100).toFixed(1)}%, ${coverage.covered}/${coverage.total} classes)`);
|
|
34
|
+
if (coverage.ratio < minCoverage) {
|
|
35
|
+
console.error(`critical CSS covers ${(coverage.ratio * 100).toFixed(1)}% of the styled classes, ` +
|
|
36
|
+
`below the required ${(minCoverage * 100).toFixed(1)}%. Missing: ` +
|
|
37
|
+
coverage.missing.slice(0, 20).join(", ") +
|
|
38
|
+
(coverage.missing.length > 20 ? `, and ${coverage.missing.length - 20} more` : ""));
|
|
39
|
+
process.exit(2);
|
|
40
|
+
}
|
|
22
41
|
//# sourceMappingURL=criticalCss.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"criticalCss.js","sourceRoot":"","sources":["../../src/cli/criticalCss.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"criticalCss.js","sourceRoot":"","sources":["../../src/cli/criticalCss.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,7 @@
|
|
|
1
|
+
/** Themes whose ancestry loops back on itself, as human-readable paths. */
|
|
2
|
+
export declare function findThemeCycles(themes: Record<string, {
|
|
3
|
+
parent?: string;
|
|
4
|
+
}>): string[];
|
|
1
5
|
export declare const EXPECTED_SCHEMA_VERSION = "1.0.0";
|
|
2
6
|
export declare const REQUIRED_CONTRACT_KEYS: string[];
|
|
3
7
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contractValidator.d.ts","sourceRoot":"","sources":["../../src/core/contractValidator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"contractValidator.d.ts","sourceRoot":"","sources":["../../src/core/contractValidator.ts"],"names":[],"mappings":"AAAA,2EAA2E;AAC3E,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,MAAM,EAAE,CAyBrF;AAKD,eAAO,MAAM,uBAAuB,UAAU,CAAC;AAI/C,eAAO,MAAM,sBAAsB,UAgBlC,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,KAAA,EAAE,eAAe,SAA0B;;;EA2BjF"}
|
|
@@ -1,3 +1,26 @@
|
|
|
1
|
+
/** Themes whose ancestry loops back on itself, as human-readable paths. */
|
|
2
|
+
export function findThemeCycles(themes) {
|
|
3
|
+
const cycles = [];
|
|
4
|
+
const settled = new Set();
|
|
5
|
+
for (const start of Object.keys(themes)) {
|
|
6
|
+
if (settled.has(start))
|
|
7
|
+
continue;
|
|
8
|
+
const path = [];
|
|
9
|
+
const onPath = new Set();
|
|
10
|
+
let name = start;
|
|
11
|
+
while (name && themes[name] && !onPath.has(name) && !settled.has(name)) {
|
|
12
|
+
path.push(name);
|
|
13
|
+
onPath.add(name);
|
|
14
|
+
name = themes[name].parent;
|
|
15
|
+
}
|
|
16
|
+
if (name && onPath.has(name)) {
|
|
17
|
+
cycles.push([...path.slice(path.indexOf(name)), name].join(" -> "));
|
|
18
|
+
}
|
|
19
|
+
for (const visited of path)
|
|
20
|
+
settled.add(visited);
|
|
21
|
+
}
|
|
22
|
+
return cycles;
|
|
23
|
+
}
|
|
1
24
|
// Contract version this build engine understands. Must match
|
|
2
25
|
// ConfigInterface::SCHEMA_VERSION on the PHP side; a mismatch means the module
|
|
3
26
|
// and the JS engine are out of sync and the contract cannot be trusted.
|
|
@@ -44,6 +67,11 @@ export function validateContract(config, expectedVersion = EXPECTED_SCHEMA_VERSI
|
|
|
44
67
|
errors.push(`Missing required key "${key}".`);
|
|
45
68
|
}
|
|
46
69
|
}
|
|
70
|
+
if (config.themes && typeof config.themes === "object" && !Array.isArray(config.themes)) {
|
|
71
|
+
for (const cycle of findThemeCycles(config.themes)) {
|
|
72
|
+
errors.push(`Theme inheritance is cyclic: ${cycle}.`);
|
|
73
|
+
}
|
|
74
|
+
}
|
|
47
75
|
return { ok: errors.length === 0, errors };
|
|
48
76
|
}
|
|
49
77
|
//# sourceMappingURL=contractValidator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contractValidator.js","sourceRoot":"","sources":["../../src/core/contractValidator.ts"],"names":[],"mappings":"AAAA,6DAA6D;AAC7D,+EAA+E;AAC/E,wEAAwE;AACxE,MAAM,CAAC,MAAM,uBAAuB,GAAG,OAAO,CAAC;AAE/C,gFAAgF;AAChF,qDAAqD;AACrD,MAAM,CAAC,MAAM,sBAAsB,GAAG;IAClC,gBAAgB;IAChB,MAAM;IACN,SAAS;IACT,QAAQ;IACR,YAAY;IACZ,qBAAqB;IACrB,SAAS;IACT,kBAAkB;IAClB,oBAAoB;IACpB,wBAAwB;IACxB,oBAAoB;IACpB,mBAAmB;IACnB,uBAAuB;IACvB,kBAAkB;IAClB,UAAU;CACb,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,UAAU,gBAAgB,CAAC,MAAM,EAAE,eAAe,GAAG,uBAAuB;IAC9E,IAAI,MAAM,KAAK,IAAI,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QACzE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,gCAAgC,CAAC,EAAE,CAAC;IACrE,CAAC;IAED,MAAM,MAAM,GAAG,EAAE,CAAC;IAElB,IAAI,MAAM,CAAC,cAAc,KAAK,eAAe,EAAE,CAAC;QAC5C,MAAM,CAAC,IAAI,CACP,uDAAuD,eAAe,IAAI;YACtE,wBAAwB,MAAM,CAAC,cAAc,IAAI,WAAW,IAAI,CACvE,CAAC;IACN,CAAC;IAED,KAAK,MAAM,GAAG,IAAI,sBAAsB,EAAE,CAAC;QACvC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;YACrD,MAAM,CAAC,IAAI,CAAC,yBAAyB,GAAG,IAAI,CAAC,CAAC;QAClD,CAAC;IACL,CAAC;IAED,OAAO,EAAE,EAAE,EAAE,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;AAC/C,CAAC"}
|
|
1
|
+
{"version":3,"file":"contractValidator.js","sourceRoot":"","sources":["../../src/core/contractValidator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,16 @@
|
|
|
1
1
|
export declare function extractFontFaces(css: string): string;
|
|
2
|
+
export declare function mergeDocuments(htmls: string[]): string;
|
|
3
|
+
export declare function classesInHtml(html: string): Set<string>;
|
|
4
|
+
export declare function classesInCss(css: string): Set<string>;
|
|
5
|
+
export interface CoverageReport {
|
|
6
|
+
total: number;
|
|
7
|
+
covered: number;
|
|
8
|
+
ratio: number;
|
|
9
|
+
missing: string[];
|
|
10
|
+
}
|
|
11
|
+
export declare function classCoverage(html: string, css: string, critical: string): CoverageReport;
|
|
2
12
|
export interface ExtractCriticalOptions {
|
|
3
|
-
html: string;
|
|
13
|
+
html: string | string[];
|
|
4
14
|
css: string;
|
|
5
15
|
}
|
|
6
16
|
export declare function extractCritical({ html, css }: ExtractCriticalOptions): Promise<string>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"criticalCss.d.ts","sourceRoot":"","sources":["../../src/core/criticalCss.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"criticalCss.d.ts","sourceRoot":"","sources":["../../src/core/criticalCss.ts"],"names":[],"mappings":"AA+BA,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEpD;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAUtD;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAUvD;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAMrD;AAED,MAAM,WAAW,cAAc;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,EAAE,CAAC;CACrB;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,cAAc,CAYzF;AAED,MAAM,WAAW,sBAAsB;IACnC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,GAAG,EAAE,MAAM,CAAC;CACf;AASD,wBAAsB,eAAe,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,sBAAsB,GAAG,OAAO,CAAC,MAAM,CAAC,CA2B5F;AAED,eAAe,eAAe,CAAC"}
|
package/dist/core/criticalCss.js
CHANGED
|
@@ -6,6 +6,10 @@ const BeastiesClass = Beasties;
|
|
|
6
6
|
const FONT_FACE_RE = /@font-face\s*\{[^}]*\}/g;
|
|
7
7
|
const STYLE_RE = /<style[^>]*>([\s\S]*?)<\/style>/i;
|
|
8
8
|
const SHEET_LINK_RE = /<link\b[^>]*\bhref="[^"]*\.css"[^>]*>/i;
|
|
9
|
+
const BODY_RE = /<body\b[^>]*>([\s\S]*)<\/body>/i;
|
|
10
|
+
const BODY_CLOSE_RE = /<\/body>/i;
|
|
11
|
+
const CLASS_ATTR_RE = /\bclass\s*=\s*("([^"]*)"|'([^']*)')/gi;
|
|
12
|
+
const CSS_CLASS_RE = /\.((?:[A-Za-z0-9_-]|\\[^\n])+)/g;
|
|
9
13
|
// Pull the @font-face blocks out of a stylesheet verbatim. They must live in the
|
|
10
14
|
// inlined critical CSS so the families are declared before the deferred sheet
|
|
11
15
|
// loads — Beasties drops them from the critical subset (inlineFonts is off so it
|
|
@@ -13,6 +17,48 @@ const SHEET_LINK_RE = /<link\b[^>]*\bhref="[^"]*\.css"[^>]*>/i;
|
|
|
13
17
|
export function extractFontFaces(css) {
|
|
14
18
|
return (css.match(FONT_FACE_RE) ?? []).join("");
|
|
15
19
|
}
|
|
20
|
+
export function mergeDocuments(htmls) {
|
|
21
|
+
const docs = htmls.filter((html) => html.trim() !== "");
|
|
22
|
+
if (docs.length <= 1) {
|
|
23
|
+
return docs[0] ?? "";
|
|
24
|
+
}
|
|
25
|
+
const [shell, ...rest] = docs;
|
|
26
|
+
const extra = rest.map((html) => BODY_RE.exec(html)?.[1] ?? html).join("\n");
|
|
27
|
+
return BODY_CLOSE_RE.test(shell)
|
|
28
|
+
? shell.replace(BODY_CLOSE_RE, () => `${extra}</body>`)
|
|
29
|
+
: `${shell}\n${extra}`;
|
|
30
|
+
}
|
|
31
|
+
export function classesInHtml(html) {
|
|
32
|
+
const found = new Set();
|
|
33
|
+
for (const match of html.matchAll(CLASS_ATTR_RE)) {
|
|
34
|
+
for (const name of (match[2] ?? match[3] ?? "").split(/\s+/)) {
|
|
35
|
+
if (name !== "") {
|
|
36
|
+
found.add(name);
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
return found;
|
|
41
|
+
}
|
|
42
|
+
export function classesInCss(css) {
|
|
43
|
+
const found = new Set();
|
|
44
|
+
for (const match of css.matchAll(CSS_CLASS_RE)) {
|
|
45
|
+
found.add(match[1].replace(/\\(.)/g, "$1"));
|
|
46
|
+
}
|
|
47
|
+
return found;
|
|
48
|
+
}
|
|
49
|
+
export function classCoverage(html, css, critical) {
|
|
50
|
+
const styled = classesInCss(css);
|
|
51
|
+
const inCritical = classesInCss(critical);
|
|
52
|
+
const used = [...classesInHtml(html)].filter((name) => styled.has(name));
|
|
53
|
+
const missing = used.filter((name) => !inCritical.has(name)).sort();
|
|
54
|
+
const covered = used.length - missing.length;
|
|
55
|
+
return {
|
|
56
|
+
total: used.length,
|
|
57
|
+
covered,
|
|
58
|
+
ratio: used.length === 0 ? 1 : covered / used.length,
|
|
59
|
+
missing,
|
|
60
|
+
};
|
|
61
|
+
}
|
|
16
62
|
// Run Beasties over the real rendered HTML against the full stylesheet and
|
|
17
63
|
// return the critical CSS it would inline. The PHP side does the actual inlining
|
|
18
64
|
// and sheet-deferring, so we only need the text; @font-face is prepended because
|
|
@@ -21,6 +67,7 @@ export function extractFontFaces(css) {
|
|
|
21
67
|
// Beasties resolves <link> hrefs from disk, so the sheet is written to a temp
|
|
22
68
|
// dir and the page's stylesheet link is repointed at it.
|
|
23
69
|
export async function extractCritical({ html, css }) {
|
|
70
|
+
const merged = mergeDocuments(Array.isArray(html) ? html : [html]);
|
|
24
71
|
const dir = mkdtempSync(join(tmpdir(), "mo-critical-"));
|
|
25
72
|
try {
|
|
26
73
|
const sheet = "sheet.css";
|
|
@@ -28,7 +75,7 @@ export async function extractCritical({ html, css }) {
|
|
|
28
75
|
// Strip any already-inlined critical <style> (a re-run sees the prior
|
|
29
76
|
// output in the page) and repoint the sheet link so Beasties extracts
|
|
30
77
|
// afresh from the full stylesheet only.
|
|
31
|
-
const wired =
|
|
78
|
+
const wired = merged
|
|
32
79
|
.replace(/<style\b[^>]*>[\s\S]*?<\/style>/gi, "")
|
|
33
80
|
.replace(SHEET_LINK_RE, `<link rel="stylesheet" href="${sheet}">`);
|
|
34
81
|
const beasties = new BeastiesClass({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"criticalCss.js","sourceRoot":"","sources":["../../src/core/criticalCss.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAcjC,MAAM,aAAa,GAAG,QAAmC,CAAC;AAE1D,MAAM,YAAY,GAAG,yBAAyB,CAAC;AAC/C,MAAM,QAAQ,GAAG,kCAAkC,CAAC;AACpD,MAAM,aAAa,GAAG,wCAAwC,CAAC;
|
|
1
|
+
{"version":3,"file":"criticalCss.js","sourceRoot":"","sources":["../../src/core/criticalCss.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cssResolver.d.ts","sourceRoot":"","sources":["../../src/core/cssResolver.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cssResolver.d.ts","sourceRoot":"","sources":["../../src/core/cssResolver.ts"],"names":[],"mappings":"AA4FA,iBAAe,kBAAkB,CAAC,SAAS,KAAA,mBAoB1C;AAmCD,iBAAe,aAAa,CAAC,SAAS,KAAA,mBA0BrC;AAED,eAAe,aAAa,CAAC;AAC7B,OAAO,EAAE,kBAAkB,EAAE,CAAC"}
|
package/dist/core/cssResolver.js
CHANGED
|
@@ -3,6 +3,7 @@ import path from "node:path";
|
|
|
3
3
|
import { CMS_CONTENT_DIR, MODULE_TEMPLATES_PATH, MODULE_WEB_PATH, THEME_CSS_FOLDER, THEME_MODULE_WEB_PATH, } from "../config/default.js";
|
|
4
4
|
import { resolveFileByTheme, getAllJsVueFilesWithInheritanceCached } from "./moduleResolver.js";
|
|
5
5
|
import configResolver from "./configResolver.js";
|
|
6
|
+
import { getThemeChainFromRoot } from "./themeChain.js";
|
|
6
7
|
import fs from "node:fs/promises";
|
|
7
8
|
const { getMagentoConfig, getModuleDefinition, getThemeDefinition, getModulesConfigArray } = configResolver;
|
|
8
9
|
const MODULE_CSS_EXTEND_FILE = getMagentoConfig().MODULE_CSS_EXTEND_FILE;
|
|
@@ -17,13 +18,14 @@ async function getThemeImports(themeName, themeConfig) {
|
|
|
17
18
|
if (!themeConfig) {
|
|
18
19
|
themeConfig = await themeResolver.getThemeConfig(themeName);
|
|
19
20
|
}
|
|
20
|
-
const
|
|
21
|
-
|
|
21
|
+
const chain = themeConfig.includeCssSourceFromParentThemes
|
|
22
|
+
? getThemeChainFromRoot(themeName)
|
|
23
|
+
: [themeName];
|
|
22
24
|
let imports = "";
|
|
23
|
-
|
|
24
|
-
|
|
25
|
+
for (const name of chain) {
|
|
26
|
+
const themePath = getThemeDefinition(name).src;
|
|
27
|
+
imports += `@import "${path.join(themePath, THEME_MODULE_WEB_PATH, THEME_CSS_FOLDER, THEME_CSS_SOURCE_FILE)}";\n`;
|
|
25
28
|
}
|
|
26
|
-
imports += `@import "${path.join(themePath, THEME_MODULE_WEB_PATH, THEME_CSS_FOLDER, THEME_CSS_SOURCE_FILE)}";\n`;
|
|
27
29
|
return imports;
|
|
28
30
|
}
|
|
29
31
|
function resolveModuleCssSourcePath(moduleName, themeName) {
|
|
@@ -38,14 +40,10 @@ function resolveModuleCssSourcePath(moduleName, themeName) {
|
|
|
38
40
|
// Tailwind scans the Twig/phtml templates of every theme in the inheritance
|
|
39
41
|
// chain (a child theme's classes plus everything it inherits unchanged).
|
|
40
42
|
async function getThemeTemplateSources(themeName) {
|
|
41
|
-
const theme = getThemeDefinition(themeName);
|
|
42
|
-
if (!theme)
|
|
43
|
-
return "";
|
|
44
43
|
let sources = "";
|
|
45
|
-
|
|
46
|
-
sources +=
|
|
44
|
+
for (const name of getThemeChainFromRoot(themeName)) {
|
|
45
|
+
sources += `@source "${getThemeDefinition(name).src}";\n`;
|
|
47
46
|
}
|
|
48
|
-
sources += `@source "${theme.src}";\n`;
|
|
49
47
|
return sources;
|
|
50
48
|
}
|
|
51
49
|
// Reads the source-scan opt-out: a theme (merged with its parents) lists the
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cssResolver.js","sourceRoot":"","sources":["../../src/core/cssResolver.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,wBAAwB,CAAC;AACnD,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EACH,eAAe,EACf,qBAAqB,EACrB,eAAe,EACf,gBAAgB,EAChB,qBAAqB,GACxB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,kBAAkB,EAAE,qCAAqC,EAAE,MAAM,qBAAqB,CAAC;AAChG,OAAO,cAAc,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAElC,MAAM,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,GACtF,cAAc,CAAC;AAEnB,MAAM,sBAAsB,GAAG,gBAAgB,EAAE,CAAC,sBAAsB,CAAC;AACzE,MAAM,qBAAqB,GAAG,gBAAgB,EAAE,CAAC,qBAAqB,CAAC;AAEvE,6EAA6E;AAC7E,+EAA+E;AAC/E,gFAAgF;AAChF,+EAA+E;AAC/E,yEAAyE;AACzE,MAAM,WAAW,GAAG,8CAA8C,CAAC;AAEnE,KAAK,UAAU,eAAe,CAAC,SAAS,EAAE,WAAY;IAClD,IAAI,CAAC,WAAW,EAAE,CAAC;QACf,WAAW,GAAG,MAAM,aAAa,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;IAChE,CAAC;
|
|
1
|
+
{"version":3,"file":"cssResolver.js","sourceRoot":"","sources":["../../src/core/cssResolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
export declare const KEY_INTERCEPTED = "originalIntercepted";
|
|
2
2
|
declare function registerInterceptors(themeName: any): Promise<Record<string, any[]>>;
|
|
3
3
|
declare function generateInterceptors(themeName: any): Promise<any>;
|
|
4
|
+
declare function invalidateTheme(themeName?: any): void;
|
|
4
5
|
declare const _default: {
|
|
5
6
|
registerInterceptors: typeof registerInterceptors;
|
|
6
7
|
generateInterceptors: typeof generateInterceptors;
|
|
8
|
+
invalidateTheme: typeof invalidateTheme;
|
|
7
9
|
KEY_INTERCEPTED: string;
|
|
8
10
|
};
|
|
9
11
|
export default _default;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateInterceptors.d.ts","sourceRoot":"","sources":["../../src/core/generateInterceptors.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,eAAe,wBAAwB,CAAC;AAmBrD,iBAAe,oBAAoB,CAAC,SAAS,KAAA,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAgD7E;AAED,iBAAe,oBAAoB,CAAC,SAAS,KAAA,gBAoJ5C
|
|
1
|
+
{"version":3,"file":"generateInterceptors.d.ts","sourceRoot":"","sources":["../../src/core/generateInterceptors.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,eAAe,wBAAwB,CAAC;AAmBrD,iBAAe,oBAAoB,CAAC,SAAS,KAAA,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAgD7E;AAED,iBAAe,oBAAoB,CAAC,SAAS,KAAA,gBAoJ5C;AAiED,iBAAS,eAAe,CAAC,SAAS,CAAC,KAAA,QAIlC;;;;;;;AAED,wBAKE"}
|
|
@@ -192,11 +192,6 @@ async function generateInterceptors(themeName) {
|
|
|
192
192
|
function generateInterceptorCode(target, targetPath, interceptors, targetExports) {
|
|
193
193
|
const imports = [];
|
|
194
194
|
const registrations = [];
|
|
195
|
-
// Import PluginManager (Assuming it's available via alias or relative path in the build environment)
|
|
196
|
-
// For Vite, we might need to adjust this path or use a virtual module ID.
|
|
197
|
-
// Using a relative path from this service file might not work in the generated code context.
|
|
198
|
-
// We'll assume '@mage-obsidian/plugin-manager' or similar alias is set up,
|
|
199
|
-
// or use the absolute path which Vite handles.
|
|
200
195
|
// All string literals go through JSON.stringify so paths or interceptor
|
|
201
196
|
// names containing quotes/backslashes can't break (or inject into) the
|
|
202
197
|
// generated module. Identifiers (export names) come from Object.keys of a
|
|
@@ -239,9 +234,15 @@ ${interceptorCode}
|
|
|
239
234
|
${exportsCode}
|
|
240
235
|
`;
|
|
241
236
|
}
|
|
237
|
+
function invalidateTheme(themeName) {
|
|
238
|
+
themeName = themeName ?? process.env.CURRENT_THEME;
|
|
239
|
+
interceptorsRegisteredByTheme.delete(themeName);
|
|
240
|
+
generatedInterceptorsCache.delete(themeName);
|
|
241
|
+
}
|
|
242
242
|
export default {
|
|
243
243
|
registerInterceptors,
|
|
244
244
|
generateInterceptors,
|
|
245
|
+
invalidateTheme,
|
|
245
246
|
KEY_INTERCEPTED,
|
|
246
247
|
};
|
|
247
248
|
//# sourceMappingURL=generateInterceptors.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateInterceptors.js","sourceRoot":"","sources":["../../src/core/generateInterceptors.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"generateInterceptors.js","sourceRoot":"","sources":["../../src/core/generateInterceptors.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"moduleResolver.d.ts","sourceRoot":"","sources":["../../src/core/moduleResolver.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"moduleResolver.d.ts","sourceRoot":"","sources":["../../src/core/moduleResolver.ts"],"names":[],"mappings":"AAkFA,iBAAS,qCAAqC,CAAC,SAAS,CAAC,KAAA,OAexD;AAED,iBAAe,+BAA+B,CAAC,SAAS,CAAC,KAAA,gBAWxD;AAQD,iBAAS,eAAe,CAAC,SAAS,CAAC,KAAA,QAUlC;AAaD,iBAAS,kBAAkB,CAAC,SAAS,KAAA,EAAE,UAAU,KAAA,EAAE,QAAQ,KAAA,UAS1D;AAoBD;;;;;;GAMG;AACH,iBAAe,4BAA4B,CAAC,SAAS,KAAA,EAAE,WAAW,KAAA,gBAiBjE;;;;;;;;AAED,wBAME;AAEF,OAAO,EACH,4BAA4B,EAC5B,kBAAkB,EAClB,+BAA+B,EAC/B,qCAAqC,EACrC,eAAe,GAClB,CAAC"}
|
|
@@ -10,6 +10,7 @@ import path from "path";
|
|
|
10
10
|
import configResolver from "./configResolver.js";
|
|
11
11
|
import { ALL_JS_VUE_FILES_WITH_INHERITANCE_FILE_NAME, MODULE_WEB_PATH, PRECOMPILED_FOLDER, THEME_MODULE_WEB_PATH, } from "../config/default.js";
|
|
12
12
|
import getFilesFromFolders from "../utils/findComponents.js";
|
|
13
|
+
import { getThemeChain, getThemeChainFromRoot } from "./themeChain.js";
|
|
13
14
|
import fs from "fs";
|
|
14
15
|
import deepmerge from "deepmerge";
|
|
15
16
|
const defaultFoldersToMap = [
|
|
@@ -45,22 +46,18 @@ async function getAllJsVueFilesFromActiveModules() {
|
|
|
45
46
|
}
|
|
46
47
|
async function getAllJsVueFilesFromTheme(themeName) {
|
|
47
48
|
let result = {};
|
|
48
|
-
const
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
const modulePath = path.resolve(theme.src, moduleName, THEME_MODULE_WEB_PATH);
|
|
57
|
-
const moduleResult = await getFilesFromFolders(moduleName, modulePath, defaultFoldersToMap);
|
|
58
|
-
if (moduleResult) {
|
|
59
|
-
result = deepmerge(result, moduleResult);
|
|
49
|
+
for (const name of getThemeChainFromRoot(themeName)) {
|
|
50
|
+
const theme = configResolver.getMagentoConfig().themes[name];
|
|
51
|
+
for (const moduleName of configResolver.getAllMagentoModulesEnabled()) {
|
|
52
|
+
const modulePath = path.resolve(theme.src, moduleName, THEME_MODULE_WEB_PATH);
|
|
53
|
+
const moduleResult = await getFilesFromFolders(moduleName, modulePath, defaultFoldersToMap);
|
|
54
|
+
if (moduleResult) {
|
|
55
|
+
result = deepmerge(result, moduleResult);
|
|
56
|
+
}
|
|
60
57
|
}
|
|
58
|
+
const moduleResult = await getFilesFromFolders(configResolver.getMagentoConfig().THEME_FILES_PATH, path.resolve(theme.src, THEME_MODULE_WEB_PATH), defaultFoldersToMap);
|
|
59
|
+
result = deepmerge(result, moduleResult);
|
|
61
60
|
}
|
|
62
|
-
const moduleResult = await getFilesFromFolders(configResolver.getMagentoConfig().THEME_FILES_PATH, path.resolve(theme.src, THEME_MODULE_WEB_PATH), defaultFoldersToMap);
|
|
63
|
-
result = deepmerge(result, moduleResult);
|
|
64
61
|
return result;
|
|
65
62
|
}
|
|
66
63
|
function getAllJsVueFilesWithInheritanceCached(themeName) {
|
|
@@ -115,13 +112,12 @@ function getModuleConfigPath(moduleSrc) {
|
|
|
115
112
|
return path.join(moduleSrc, "view/frontend/web/", MODULE_CONFIG_FILE);
|
|
116
113
|
}
|
|
117
114
|
function resolveFileByTheme(themeName, moduleName, filePath) {
|
|
118
|
-
const
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
return resolveFileByTheme(theme.parent, moduleName, filePath);
|
|
115
|
+
for (const name of getThemeChain(themeName)) {
|
|
116
|
+
const theme = configResolver.getMagentoConfig().themes[name];
|
|
117
|
+
const fullFilePath = path.join(theme.src, moduleName, "web", filePath);
|
|
118
|
+
if (fs.existsSync(fullFilePath)) {
|
|
119
|
+
return fullFilePath;
|
|
120
|
+
}
|
|
125
121
|
}
|
|
126
122
|
return null;
|
|
127
123
|
}
|
|
@@ -137,7 +133,6 @@ async function resolveModuleConfig(moduleName, themeName) {
|
|
|
137
133
|
if (!fs.existsSync(moduleConfigSourcePath)) {
|
|
138
134
|
return null;
|
|
139
135
|
}
|
|
140
|
-
// Importación dinámica común en ESModules
|
|
141
136
|
const moduleConfig = await import(__rewriteRelativeImportExtension(moduleConfigSourcePath));
|
|
142
137
|
return moduleConfig.default ?? moduleConfig;
|
|
143
138
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"moduleResolver.js","sourceRoot":"","sources":["../../src/core/moduleResolver.ts"],"names":[],"mappings":";;;;;;;;AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,cAAc,MAAM,qBAAqB,CAAC;AACjD,OAAO,EACH,2CAA2C,EAC3C,eAAe,EACf,kBAAkB,EAClB,qBAAqB,GACxB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,mBAAmB,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,SAAS,MAAM,WAAW,CAAC;AAElC,MAAM,mBAAmB,GAAG;IACxB;QACI,GAAG,EAAE,cAAc,CAAC,gBAAgB,EAAE,CAAC,mBAAmB;QAC1D,GAAG,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC;KAC3B;IACD;QACI,GAAG,EAAE,cAAc,CAAC,gBAAgB,EAAE,CAAC,OAAO;QAC9C,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;KACpB;CACJ,CAAC;AAEF,gFAAgF;AAChF,qEAAqE;AACrE,MAAM,oBAAoB,GAAG,IAAI,GAAG,EAAE,CAAC;AAEvC,6EAA6E;AAC7E,0EAA0E;AAC1E,+EAA+E;AAC/E,MAAM,aAAa,GAAG,IAAI,CAAC;AAC3B,MAAM,QAAQ,GAAG,CAAC,SAAS,EAAE,EAAE,CAAC,GAAG,SAAS,GAAG,aAAa,GAAG,cAAc,CAAC,eAAe,EAAE,EAAE,CAAC;AAElG,iFAAiF;AACjF,+EAA+E;AAC/E,6CAA6C;AAC7C,MAAM,oBAAoB,GAAG,IAAI,GAAG,EAAE,CAAC;AAEvC,KAAK,UAAU,iCAAiC;IAC5C,MAAM,MAAM,GAAG,EAAE,CAAC;IAClB,KAAK,MAAM,KAAK,IAAI,cAAc,CAAC,qBAAqB,EAAE,EAAE,CAAC;QACzD,MAAM,CAAC,UAAU,EAAE,YAAY,CAAC,GAAG,KAAK,CAAC;QACzC,MAAM,YAAY,GAAG,MAAM,mBAAmB,CAC1C,UAAU,EACV,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,EAAE,eAAe,CAAC,EAC/C,mBAAmB,CACtB,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IACxC,CAAC;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,KAAK,UAAU,yBAAyB,CAAC,SAAS;IAC9C,IAAI,MAAM,GAAG,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"moduleResolver.js","sourceRoot":"","sources":["../../src/core/moduleResolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
/** The theme and every ancestor it inherits from, nearest first. */
|
|
2
|
+
export declare function getThemeChain(themeName: string): string[];
|
|
3
|
+
/** The same chain from the root down. */
|
|
4
|
+
export declare function getThemeChainFromRoot(themeName: string): string[];
|
|
5
|
+
export { findThemeCycles } from "./contractValidator.ts";
|
|
6
|
+
declare const _default: {
|
|
7
|
+
getThemeChain: typeof getThemeChain;
|
|
8
|
+
getThemeChainFromRoot: typeof getThemeChainFromRoot;
|
|
9
|
+
};
|
|
10
|
+
export default _default;
|
|
11
|
+
//# sourceMappingURL=themeChain.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"themeChain.d.ts","sourceRoot":"","sources":["../../src/core/themeChain.ts"],"names":[],"mappings":"AAEA,oEAAoE;AACpE,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CAazD;AAED,yCAAyC;AACzC,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CAEjE;AAED,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;;;;;AAEzD,wBAAwD"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import configResolver from "./configResolver.js";
|
|
2
|
+
/** The theme and every ancestor it inherits from, nearest first. */
|
|
3
|
+
export function getThemeChain(themeName) {
|
|
4
|
+
const themes = configResolver.getMagentoConfig().themes ?? {};
|
|
5
|
+
const chain = [];
|
|
6
|
+
const seen = new Set();
|
|
7
|
+
let name = themeName;
|
|
8
|
+
while (name && themes[name] && !seen.has(name)) {
|
|
9
|
+
seen.add(name);
|
|
10
|
+
chain.push(name);
|
|
11
|
+
name = themes[name].parent;
|
|
12
|
+
}
|
|
13
|
+
return chain;
|
|
14
|
+
}
|
|
15
|
+
/** The same chain from the root down. */
|
|
16
|
+
export function getThemeChainFromRoot(themeName) {
|
|
17
|
+
return getThemeChain(themeName).reverse();
|
|
18
|
+
}
|
|
19
|
+
export { findThemeCycles } from "./contractValidator.js";
|
|
20
|
+
export default { getThemeChain, getThemeChainFromRoot };
|
|
21
|
+
//# sourceMappingURL=themeChain.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"themeChain.js","sourceRoot":"","sources":["../../src/core/themeChain.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,qBAAqB,CAAC;AAEjD,oEAAoE;AACpE,MAAM,UAAU,aAAa,CAAC,SAAiB;IAC3C,MAAM,MAAM,GAAG,cAAc,CAAC,gBAAgB,EAAE,CAAC,MAAM,IAAI,EAAE,CAAC;IAC9D,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAE/B,IAAI,IAAI,GAAG,SAAS,CAAC;IACrB,OAAO,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;QAC7C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACf,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjB,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC;IAC/B,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,yCAAyC;AACzC,MAAM,UAAU,qBAAqB,CAAC,SAAiB;IACnD,OAAO,aAAa,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,CAAC;AAC9C,CAAC;AAED,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,eAAe,EAAE,aAAa,EAAE,qBAAqB,EAAE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"themeResolverSync.d.ts","sourceRoot":"","sources":["../../src/core/themeResolverSync.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"themeResolverSync.d.ts","sourceRoot":"","sources":["../../src/core/themeResolverSync.ts"],"names":[],"mappings":"AA2CA,wBAAsB,cAAc,CAAC,SAAS,KAAA,gBAsB7C;;;;AAED,wBAEE"}
|
|
@@ -11,6 +11,7 @@ import fs from "fs";
|
|
|
11
11
|
import deepmerge from "deepmerge";
|
|
12
12
|
import { THEME_MODULE_WEB_PATH } from "../config/default.js";
|
|
13
13
|
import configResolver from "./configResolver.js";
|
|
14
|
+
import { getThemeChain } from "./themeChain.js";
|
|
14
15
|
const themeConfigCache = new Map();
|
|
15
16
|
const themeConfigPlainCache = new Map();
|
|
16
17
|
function getThemeConfigPath(themeSrc) {
|
|
@@ -42,7 +43,8 @@ function pathToFileUrl(filePath) {
|
|
|
42
43
|
export async function getThemeConfig(themeName) {
|
|
43
44
|
if (themeConfigCache.has(themeName))
|
|
44
45
|
return themeConfigCache.get(themeName);
|
|
45
|
-
const
|
|
46
|
+
const themes = configResolver.getMagentoConfig().themes;
|
|
47
|
+
const themeDefinition = themes[themeName];
|
|
46
48
|
if (!themeDefinition)
|
|
47
49
|
return null;
|
|
48
50
|
let themeConfig = await loadThemeConfig(themeDefinition, themeName);
|
|
@@ -52,14 +54,13 @@ export async function getThemeConfig(themeName) {
|
|
|
52
54
|
themeConfig.ignoredCssFromModules ??= [];
|
|
53
55
|
themeConfig.exposeNpmPackages ??= [];
|
|
54
56
|
themeConfig.vue ??= { runtimeOnly: false };
|
|
55
|
-
|
|
56
|
-
const
|
|
57
|
-
themeConfig = deepmerge(
|
|
57
|
+
for (const name of getThemeChain(themeName).slice(1)) {
|
|
58
|
+
const ancestorConfig = await loadThemeConfig(themes[name], name);
|
|
59
|
+
themeConfig = deepmerge(ancestorConfig || {}, themeConfig);
|
|
58
60
|
}
|
|
59
61
|
themeConfigCache.set(themeName, themeConfig);
|
|
60
62
|
return themeConfig;
|
|
61
63
|
}
|
|
62
|
-
// Export default con todo
|
|
63
64
|
export default {
|
|
64
65
|
getThemeConfig,
|
|
65
66
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"themeResolverSync.js","sourceRoot":"","sources":["../../src/core/themeResolverSync.ts"],"names":[],"mappings":";;;;;;;;AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,SAAS,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,cAAc,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"themeResolverSync.js","sourceRoot":"","sources":["../../src/core/themeResolverSync.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inheritAssetsModuleResolver.d.ts","sourceRoot":"","sources":["../../src/vite/inheritAssetsModuleResolver.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"inheritAssetsModuleResolver.d.ts","sourceRoot":"","sources":["../../src/vite/inheritAssetsModuleResolver.ts"],"names":[],"mappings":"AAKA,MAAM,CAAC,OAAO,UAAU,0BAA0B;;;;;;EAqEjD"}
|
|
@@ -1,21 +1,17 @@
|
|
|
1
1
|
import path from "path";
|
|
2
2
|
import configResolver from "../core/configResolver.js";
|
|
3
|
+
import { getThemeChain } from "../core/themeChain.js";
|
|
3
4
|
import fs from "fs";
|
|
4
5
|
export default function customAssetsResolverPlugin() {
|
|
5
6
|
const CURRENT_THEME = process.env.CURRENT_THEME;
|
|
6
7
|
const THEME_ASSETS_PATH = "web";
|
|
7
8
|
const MODULE_ASSETS_PATH = "view/frontend/web";
|
|
8
9
|
function tryResolveAssetPathByTheme(themeName, filePath) {
|
|
9
|
-
const
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
if (fs.existsSync(themeAssetPath)) {
|
|
15
|
-
return themeAssetPath;
|
|
16
|
-
}
|
|
17
|
-
if (themeDefinition.parent) {
|
|
18
|
-
return tryResolveAssetPathByTheme(themeDefinition.parent, filePath);
|
|
10
|
+
for (const name of getThemeChain(themeName)) {
|
|
11
|
+
const themeAssetPath = path.join(configResolver.getThemeDefinition(name).src, filePath);
|
|
12
|
+
if (fs.existsSync(themeAssetPath)) {
|
|
13
|
+
return themeAssetPath;
|
|
14
|
+
}
|
|
19
15
|
}
|
|
20
16
|
return null;
|
|
21
17
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inheritAssetsModuleResolver.js","sourceRoot":"","sources":["../../src/vite/inheritAssetsModuleResolver.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,cAAc,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,MAAM,CAAC,OAAO,UAAU,0BAA0B;IAC9C,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;IAChD,MAAM,iBAAiB,GAAG,KAAK,CAAC;IAChC,MAAM,kBAAkB,GAAG,mBAAmB,CAAC;IAE/C,SAAS,0BAA0B,CAAC,SAAS,EAAE,QAAQ;QACnD,MAAM,
|
|
1
|
+
{"version":3,"file":"inheritAssetsModuleResolver.js","sourceRoot":"","sources":["../../src/vite/inheritAssetsModuleResolver.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,cAAc,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,MAAM,CAAC,OAAO,UAAU,0BAA0B;IAC9C,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;IAChD,MAAM,iBAAiB,GAAG,KAAK,CAAC;IAChC,MAAM,kBAAkB,GAAG,mBAAmB,CAAC;IAE/C,SAAS,0BAA0B,CAAC,SAAS,EAAE,QAAQ;QACnD,KAAK,MAAM,IAAI,IAAI,aAAa,CAAC,SAAS,CAAC,EAAE,CAAC;YAC1C,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YACxF,IAAI,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;gBAChC,OAAO,cAAc,CAAC;YAC1B,CAAC;QACL,CAAC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,SAAS,2BAA2B,CAAC,UAAU,EAAE,QAAQ;QACrD,MAAM,gBAAgB,GAAG,cAAc,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC;QACxE,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,kBAAkB,EAAE,QAAQ,CAAC,CAAC;QAChF,IAAI,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YAC3B,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,gBAAgB,GAAG,CAAC,UAAU,EAAE,QAAQ,EAAE,EAAE;QAC9C,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YAClC,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,IAAI,QAAQ,CAAC;QACb,IAAI,UAAU,KAAK,OAAO,EAAE,CAAC;YACzB,QAAQ,GAAG,0BAA0B,CACjC,aAAa,EACb,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CACzC,CAAC;QACN,CAAC;aAAM,CAAC;YACJ,QAAQ,GAAG,0BAA0B,CACjC,aAAa,EACb,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,iBAAiB,EAAE,QAAQ,CAAC,CACrD,CAAC;QACN,CAAC;QACD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACZ,QAAQ,GAAG,2BAA2B,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QACjE,CAAC;QAED,OAAO,QAAQ,CAAC;IACpB,CAAC,CAAC;IAEF,OAAO;QACH,IAAI,EAAE,yBAAyB;QAC/B,SAAS,EAAE;YACP,KAAK,EAAE,KAAK;YACZ,OAAO,CAAC,EAAE;gBACN,IAAI,CAAC,EAAE,EAAE,CAAC;oBACN,OAAO;gBACX,CAAC;gBACD,MAAM,OAAO,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC/B,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACvB,OAAO;gBACX,CAAC;gBACD,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,GAAG,OAAO,CAAC;gBACvC,MAAM,QAAQ,GAAG,gBAAgB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;gBACxD,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACZ,OAAO;gBACX,CAAC;gBACD,OAAO,QAAQ,CAAC;YACpB,CAAC;SACJ;KACJ,CAAC;AACN,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inheritModuleResolver.d.ts","sourceRoot":"","sources":["../../src/vite/inheritModuleResolver.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,OAAO,UAAU,oBAAoB;;;;;;
|
|
1
|
+
{"version":3,"file":"inheritModuleResolver.d.ts","sourceRoot":"","sources":["../../src/vite/inheritModuleResolver.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,OAAO,UAAU,oBAAoB;;;;;;EAwC3C"}
|
|
@@ -2,7 +2,6 @@ import moduleResolver from "../core/moduleResolver.js";
|
|
|
2
2
|
import path from "path";
|
|
3
3
|
import configResolver from "../core/configResolver.js";
|
|
4
4
|
export default function customResolverPlugin() {
|
|
5
|
-
const allComponents = moduleResolver.getAllJsVueFilesWithInheritanceCached();
|
|
6
5
|
const validComponentExtensions = configResolver.getMagentoConfig().ALLOWED_EXTENSIONS;
|
|
7
6
|
const hasValidExtension = (filePath) => validComponentExtensions.some((ext) => filePath.endsWith(ext));
|
|
8
7
|
const hasExtension = (filePath) => !!path.extname(filePath);
|
|
@@ -11,7 +10,7 @@ export default function customResolverPlugin() {
|
|
|
11
10
|
filePath = "components/" + filePath;
|
|
12
11
|
}
|
|
13
12
|
const fileName = path.join(path.dirname(filePath), path.parse(filePath).name);
|
|
14
|
-
return
|
|
13
|
+
return moduleResolver.getAllJsVueFilesWithInheritanceCached()[`${moduleName}/${fileName}`];
|
|
15
14
|
};
|
|
16
15
|
return {
|
|
17
16
|
name: "inherit-resolver",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inheritModuleResolver.js","sourceRoot":"","sources":["../../src/vite/inheritModuleResolver.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,2BAA2B,CAAC;AACvD,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,cAAc,MAAM,2BAA2B,CAAC;AAEvD,MAAM,CAAC,OAAO,UAAU,oBAAoB;IACxC,MAAM,
|
|
1
|
+
{"version":3,"file":"inheritModuleResolver.js","sourceRoot":"","sources":["../../src/vite/inheritModuleResolver.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,2BAA2B,CAAC;AACvD,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,cAAc,MAAM,2BAA2B,CAAC;AAEvD,MAAM,CAAC,OAAO,UAAU,oBAAoB;IACxC,MAAM,wBAAwB,GAAG,cAAc,CAAC,gBAAgB,EAAE,CAAC,kBAAkB,CAAC;IAEtF,MAAM,iBAAiB,GAAG,CAAC,QAAQ,EAAE,EAAE,CACnC,wBAAwB,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;IACnE,MAAM,YAAY,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAE5D,MAAM,oBAAoB,GAAG,CAAC,UAAU,EAAE,QAAQ,EAAE,EAAE;QAClD,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;YACrE,QAAQ,GAAG,aAAa,GAAG,QAAQ,CAAC;QACxC,CAAC;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC;QAC9E,OAAO,cAAc,CAAC,qCAAqC,EAAE,CAAC,GAAG,UAAU,IAAI,QAAQ,EAAE,CAAC,CAAC;IAC/F,CAAC,CAAC;IAEF,OAAO;QACH,IAAI,EAAE,kBAAkB;QACxB,SAAS,EAAE;YACP,KAAK,EAAE,KAAK;YACZ,OAAO,CAAC,EAAE;gBACN,IAAI,CAAC,EAAE,EAAE,CAAC;oBACN,OAAO;gBACX,CAAC;gBACD,MAAM,OAAO,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC/B,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACvB,OAAO;gBACX,CAAC;gBACD,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,GAAG,OAAO,CAAC;gBACvC,IAAI,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC;oBACzD,OAAO;gBACX,CAAC;gBACD,MAAM,YAAY,GAAG,oBAAoB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;gBAChE,IAAI,CAAC,YAAY,EAAE,CAAC;oBAChB,OAAO;gBACX,CAAC;gBAED,OAAO,YAAY,CAAC;YACxB,CAAC;SACJ;KACJ,CAAC;AACN,CAAC"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import moduleResolver from "../core/moduleResolver.js";
|
|
2
2
|
export default () => {
|
|
3
|
-
const components = moduleResolver.getAllJsVueFilesWithInheritanceCached();
|
|
4
3
|
return {
|
|
5
4
|
name: "handle-magento-routes-middleware",
|
|
6
5
|
configureServer(server) {
|
|
7
6
|
server.middlewares.use((req, res, next) => {
|
|
8
7
|
const url = req.url;
|
|
8
|
+
const components = moduleResolver.getAllJsVueFilesWithInheritanceCached();
|
|
9
9
|
const matchedKey = Object.keys(components).find((key) => url.includes(key));
|
|
10
10
|
if (matchedKey) {
|
|
11
11
|
const filePath = components[matchedKey];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"magentoHrmRewrite.js","sourceRoot":"","sources":["../../src/vite/magentoHrmRewrite.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,2BAA2B,CAAC;AAEvD,eAAe,GAAG,EAAE;IAChB,
|
|
1
|
+
{"version":3,"file":"magentoHrmRewrite.js","sourceRoot":"","sources":["../../src/vite/magentoHrmRewrite.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,2BAA2B,CAAC;AAEvD,eAAe,GAAG,EAAE;IAChB,OAAO;QACH,IAAI,EAAE,kCAAkC;QACxC,eAAe,CAAC,MAAM;YAClB,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;gBACtC,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC;gBAEpB,MAAM,UAAU,GAAG,cAAc,CAAC,qCAAqC,EAAE,CAAC;gBAC1E,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;gBAE5E,IAAI,UAAU,EAAE,CAAC;oBACb,MAAM,QAAQ,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC;oBACxC,IAAI,MAAM,CAAC;oBACX,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;wBAC3B,MAAM,GAAG,GAAG,CAAC;oBACjB,CAAC;yBAAM,IAAI,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;wBACvC,MAAM,GAAG,MAAM,CAAC;wBAChB,MAAM,aAAa,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;wBAChD,IAAI,QAAQ,GAAG,kBAAkB,CAAC;wBAClC,IACI,aAAa,KAAK,KAAK;4BACvB,aAAa,KAAK,KAAK;4BACvB,aAAa,KAAK,IAAI;4BAEtB,QAAQ,GAAG,wBAAwB,CAAC;wBACxC,IAAI,aAAa,KAAK,KAAK;4BAAE,QAAQ,GAAG,UAAU,CAAC;wBACnD,IAAI,aAAa,KAAK,MAAM;4BAAE,QAAQ,GAAG,kBAAkB,CAAC;wBAC5D,IAAI,aAAa,KAAK,MAAM;4BAAE,QAAQ,GAAG,WAAW,CAAC;wBAErD,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;oBAC5C,CAAC;yBAAM,CAAC;wBACJ,MAAM,GAAG,MAAM,CAAC;oBACpB,CAAC;oBACD,GAAG,CAAC,GAAG,GAAG,GAAG,MAAM,GAAG,QAAQ,EAAE,CAAC;oBACjC,IAAI,EAAE,CAAC;gBACX,CAAC;qBAAM,CAAC;oBACJ,IAAI,EAAE,CAAC;gBACX,CAAC;YACL,CAAC,CAAC,CAAC;QACP,CAAC;KACJ,CAAC;AACN,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"themeSourceWatcher.d.ts","sourceRoot":"","sources":["../../src/vite/themeSourceWatcher.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"themeSourceWatcher.d.ts","sourceRoot":"","sources":["../../src/vite/themeSourceWatcher.ts"],"names":[],"mappings":"AAgCA;;;;;;;;;GASG;AACH,MAAM,CAAC,OAAO,UAAU,kBAAkB,CAAC,SAAS,KAAA;;;;EAuDnD"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import path from "node:path";
|
|
2
2
|
import configResolver from "../core/configResolver.js";
|
|
3
|
+
import generateInterceptors from "../core/generateInterceptors.js";
|
|
3
4
|
import moduleResolver from "../core/moduleResolver.js";
|
|
4
5
|
import { precompileJs, precompileJsconfig, precompileTsconfig } from "../core/preCompileFiles.js";
|
|
5
6
|
import { MODULE_WEB_PATH } from "../config/default.js";
|
|
@@ -57,6 +58,7 @@ export default function themeSourceWatcher(themeName) {
|
|
|
57
58
|
running = true;
|
|
58
59
|
try {
|
|
59
60
|
moduleResolver.invalidateTheme(themeName);
|
|
61
|
+
generateInterceptors.invalidateTheme(themeName);
|
|
60
62
|
await precompileJs(themeName);
|
|
61
63
|
await precompileJsconfig(themeName);
|
|
62
64
|
await precompileTsconfig(themeName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"themeSourceWatcher.js","sourceRoot":"","sources":["../../src/vite/themeSourceWatcher.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"themeSourceWatcher.js","sourceRoot":"","sources":["../../src/vite/themeSourceWatcher.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "mage-obsidian",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.8.0",
|
|
4
4
|
"description": "The MageObsidian JS build engine for Magento 2 frontends: theme inheritance resolution, precompilation and JS interceptors for Vite builds.",
|
|
5
5
|
"homepage": "https://mage-obsidian.jeanmarcos.dev/",
|
|
6
6
|
"bugs": {
|