mage-obsidian 3.0.1 → 3.2.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/buildThemes.js +11 -20
- package/dist/cli/buildThemes.js.map +1 -1
- package/dist/cli/envRequirements.d.ts +3 -0
- package/dist/cli/envRequirements.d.ts.map +1 -0
- package/dist/cli/envRequirements.js +8 -0
- package/dist/cli/envRequirements.js.map +1 -0
- package/dist/core/configResolver.d.ts.map +1 -1
- package/dist/core/configResolver.js +3 -1
- package/dist/core/configResolver.js.map +1 -1
- package/dist/core/contractPaths.d.ts +7 -0
- package/dist/core/contractPaths.d.ts.map +1 -0
- package/dist/core/contractPaths.js +17 -0
- package/dist/core/contractPaths.js.map +1 -0
- package/dist/core/contractValidator.d.ts +4 -3
- package/dist/core/contractValidator.d.ts.map +1 -1
- package/dist/core/contractValidator.js +8 -8
- package/dist/core/contractValidator.js.map +1 -1
- package/dist/utils/buildConcurrency.d.ts +2 -0
- package/dist/utils/buildConcurrency.d.ts.map +1 -0
- package/dist/utils/buildConcurrency.js +7 -0
- package/dist/utils/buildConcurrency.js.map +1 -0
- package/package.json +1 -1
package/dist/cli/buildThemes.js
CHANGED
|
@@ -10,7 +10,9 @@ import configResolver from "../core/configResolver.js";
|
|
|
10
10
|
import preCompileMagentoFiles from "../core/preCompileMagentoFiles.js";
|
|
11
11
|
import { writeCmsBaseline } from "../core/cmsBaseline.js";
|
|
12
12
|
import runWithConcurrency from "../utils/runWithConcurrency.js";
|
|
13
|
+
import { resolveConcurrency } from "../utils/buildConcurrency.js";
|
|
13
14
|
import { selectThemeForDevServer } from "./selectTheme.js";
|
|
15
|
+
import { missingEnvFor } from "./envRequirements.js";
|
|
14
16
|
import { COMMAND_NOT_FOUND, missingCommand, withLocalBin } from "./spawnTool.js";
|
|
15
17
|
import dotenv from "dotenv";
|
|
16
18
|
dotenv.config();
|
|
@@ -69,27 +71,17 @@ function tryCreateEnvFile() {
|
|
|
69
71
|
fs.writeFileSync(envFilePath, envContent);
|
|
70
72
|
console.log(chalk.green(".env file created successfully."));
|
|
71
73
|
}
|
|
72
|
-
function validateEnv() {
|
|
73
|
-
const
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
"VITE_SERVER_SECURE",
|
|
77
|
-
"VITE_HMR_PATH",
|
|
78
|
-
"MAGENTO_HOST",
|
|
79
|
-
"VITE_SERVER_ALLOWED_HOSTS",
|
|
80
|
-
];
|
|
81
|
-
const missingEnvVars = [];
|
|
82
|
-
for (const envVar of requiredEnvVars) {
|
|
83
|
-
if (!process.env[envVar]) {
|
|
84
|
-
missingEnvVars.push(envVar);
|
|
85
|
-
}
|
|
74
|
+
function validateEnv(devServer) {
|
|
75
|
+
const missing = missingEnvFor(devServer, process.env);
|
|
76
|
+
if (missing.length === 0) {
|
|
77
|
+
return;
|
|
86
78
|
}
|
|
87
|
-
|
|
88
|
-
|
|
79
|
+
console.error(chalk.red(`Missing required environment variables: ${missing.join(", ")}`));
|
|
80
|
+
if (process.stdin.isTTY) {
|
|
89
81
|
tryCreateEnvFile();
|
|
90
82
|
console.log(chalk.green("Please restart the script after setting up the .env file."));
|
|
91
|
-
process.exit(1);
|
|
92
83
|
}
|
|
84
|
+
process.exit(1);
|
|
93
85
|
}
|
|
94
86
|
/**
|
|
95
87
|
* Build a single theme in its own child process. Each child gets its own
|
|
@@ -130,8 +122,7 @@ const spawnBuild = (themeName) => new Promise((resolve) => {
|
|
|
130
122
|
});
|
|
131
123
|
});
|
|
132
124
|
const buildThemes = async (themeNames) => {
|
|
133
|
-
const
|
|
134
|
-
const limit = Math.max(1, Math.min(themeNames.length, cores - 1));
|
|
125
|
+
const limit = resolveConcurrency(process.env.MAGE_OBSIDIAN_BUILD_CONCURRENCY, themeNames.length, os.cpus()?.length ?? 2);
|
|
135
126
|
console.log(chalk.cyan(`Building ${themeNames.length} theme(s) (concurrency ${limit}): ${themeNames.join(", ")}`));
|
|
136
127
|
const results = await runWithConcurrency(themeNames, (themeName) => spawnBuild(themeName), limit);
|
|
137
128
|
const failed = results.filter((result) => result.code !== 0);
|
|
@@ -215,7 +206,7 @@ const runDevServer = (themeName) => {
|
|
|
215
206
|
console.error(chalk.red(`Failed to start development server for theme "${themeName}":`), error);
|
|
216
207
|
}
|
|
217
208
|
};
|
|
218
|
-
validateEnv();
|
|
209
|
+
validateEnv(Boolean(options.devServer));
|
|
219
210
|
if (options.devServer) {
|
|
220
211
|
runDevServer(theme);
|
|
221
212
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildThemes.js","sourceRoot":"","sources":["../../src/cli/buildThemes.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"buildThemes.js","sourceRoot":"","sources":["../../src/cli/buildThemes.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"envRequirements.d.ts","sourceRoot":"","sources":["../../src/cli/envRequirements.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,uBAAuB,mDAAoD,CAAC;AAEzF,wBAAgB,aAAa,CACzB,SAAS,EAAE,OAAO,EAClB,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,GACxC,MAAM,EAAE,CAKV"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
export const DEV_SERVER_REQUIRED_ENV = ["VITE_SERVER_HOST", "VITE_SERVER_PORT"];
|
|
2
|
+
export function missingEnvFor(devServer, env) {
|
|
3
|
+
if (!devServer) {
|
|
4
|
+
return [];
|
|
5
|
+
}
|
|
6
|
+
return DEV_SERVER_REQUIRED_ENV.filter((name) => !env[name]);
|
|
7
|
+
}
|
|
8
|
+
//# sourceMappingURL=envRequirements.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"envRequirements.js","sourceRoot":"","sources":["../../src/cli/envRequirements.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,kBAAkB,EAAE,kBAAkB,CAAU,CAAC;AAEzF,MAAM,UAAU,aAAa,CACzB,SAAkB,EAClB,GAAuC;IAEvC,IAAI,CAAC,SAAS,EAAE,CAAC;QACb,OAAO,EAAE,CAAC;IACd,CAAC;IACD,OAAO,uBAAuB,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;AAChE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configResolver.d.ts","sourceRoot":"","sources":["../../src/core/configResolver.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"configResolver.d.ts","sourceRoot":"","sources":["../../src/core/configResolver.ts"],"names":[],"mappings":"AAaA,UAAU,gBAAgB;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACtB;AAED,UAAU,eAAe;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACtB;AAqED,eAAO,MAAM,gBAAgB,WAAsB,CAAC;AACpD,eAAO,MAAM,eAAe,WAG3B,CAAC;AACF,eAAO,MAAM,qBAAqB,QACW,CAAC,MAAM,EAAE,gBAAgB,CAAC,EAAE,CAAC;AAC1E,eAAO,MAAM,oBAAoB,QACW,CAAC,MAAM,EAAE,eAAe,CAAC,EAAE,CAAC;AACxE,eAAO,MAAM,2BAA2B,WAAiC,CAAC;AAC1E,eAAO,MAAM,KAAK,eAA4C,CAAC;AAE/D,eAAO,MAAM,qBAAqB,GAAI,cAAS,WAA8C,CAAC;AAE9F,eAAO,MAAM,mBAAmB,GAAI,eAAU,KAAG,gBACZ,CAAC;AAEtC,eAAO,MAAM,kBAAkB,GAAI,cAAS,KAAG,eAAkD,CAAC;AAElG,eAAO,MAAM,IAAI,QAAuB,CAAC;AAEzC,wBAAgB,cAAc,CAAC,GAAG,KAAA,UAEjC;AAED,wBAAgB,eAAe,CAAC,WAAW,KAAA,UAQ1C;AAED,wBAAgB,kBAAkB,CAAC,GAAG,KAAA,OAErC;;;;iCA/B4C,CAAC,MAAM,EAAE,gBAAgB,CAAC,EAAE;gCAE7B,CAAC,MAAM,EAAE,eAAe,CAAC,EAAE;;;;8CAMtB,gBAAgB;4CAGlB,eAAe;;;;;AAsB9D,wBAaE"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import fs from "node:fs";
|
|
2
2
|
import path from "node:path";
|
|
3
3
|
import crypto from "node:crypto";
|
|
4
|
-
import { DEPENDENCY_CONFIG_FILE_PATH, OUTPUT_THEME_DIR } from "../config/default.js";
|
|
4
|
+
import { DEPENDENCY_CONFIG_FILE_PATH, MAGENTO_ROOT, OUTPUT_THEME_DIR } from "../config/default.js";
|
|
5
|
+
import { withAbsoluteSources } from "./contractPaths.js";
|
|
5
6
|
import { validateContract } from "./contractValidator.js";
|
|
6
7
|
const REGENERATE_HINT = "Try running `bin/magento mage-obsidian:frontend:config --generate` to generate the configuration file.";
|
|
7
8
|
// Cached contract, invalidated by the file's mtime. A per-process `const` read
|
|
@@ -41,6 +42,7 @@ function loadContract() {
|
|
|
41
42
|
"If the version differs, the PHP module and JS engine are out of sync — align their versions, then regenerate.",
|
|
42
43
|
]);
|
|
43
44
|
}
|
|
45
|
+
config = withAbsoluteSources(config, MAGENTO_ROOT);
|
|
44
46
|
// Hash the parts that change the build graph (which modules/themes exist and
|
|
45
47
|
// their resolution). Caches downstream key on this so a changed module set
|
|
46
48
|
// invalidates them, rather than serving a result keyed only by theme name.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configResolver.js","sourceRoot":"","sources":["../../src/core/configResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,2BAA2B,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"configResolver.js","sourceRoot":"","sources":["../../src/core/configResolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"contractPaths.d.ts","sourceRoot":"","sources":["../../src/core/contractPaths.ts"],"names":[],"mappings":"AAEA,KAAK,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAcvD,wBAAgB,mBAAmB,CAAC,CAAC,SAAS;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,EACjF,QAAQ,EAAE,CAAC,EACX,IAAI,EAAE,MAAM,GACb,CAAC,CAMH"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import path from "node:path";
|
|
2
|
+
const absolutize = (entries, root) => entries && typeof entries === "object"
|
|
3
|
+
? Object.fromEntries(Object.entries(entries).map(([name, entry]) => [
|
|
4
|
+
name,
|
|
5
|
+
typeof entry?.src === "string"
|
|
6
|
+
? { ...entry, src: path.resolve(root, entry.src) }
|
|
7
|
+
: entry,
|
|
8
|
+
]))
|
|
9
|
+
: entries;
|
|
10
|
+
export function withAbsoluteSources(contract, root) {
|
|
11
|
+
return {
|
|
12
|
+
...contract,
|
|
13
|
+
modules: absolutize(contract.modules, root),
|
|
14
|
+
themes: absolutize(contract.themes, root),
|
|
15
|
+
};
|
|
16
|
+
}
|
|
17
|
+
//# sourceMappingURL=contractPaths.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"contractPaths.js","sourceRoot":"","sources":["../../src/core/contractPaths.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAI7B,MAAM,UAAU,GAAG,CAAC,OAA4B,EAAE,IAAY,EAAuB,EAAE,CACnF,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ;IAClC,CAAC,CAAC,MAAM,CAAC,WAAW,CACd,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;QAC3C,IAAI;QACJ,OAAO,KAAK,EAAE,GAAG,KAAK,QAAQ;YAC1B,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE;YAClD,CAAC,CAAC,KAAK;KACd,CAAC,CACL;IACH,CAAC,CAAC,OAAO,CAAC;AAElB,MAAM,UAAU,mBAAmB,CAC/B,QAAW,EACX,IAAY;IAEZ,OAAO;QACH,GAAG,QAAQ;QACX,OAAO,EAAE,UAAU,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC;QAC3C,MAAM,EAAE,UAAU,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC;KAC5C,CAAC;AACN,CAAC"}
|
|
@@ -2,7 +2,8 @@
|
|
|
2
2
|
export declare function findThemeCycles(themes: Record<string, {
|
|
3
3
|
parent?: string;
|
|
4
4
|
}>): string[];
|
|
5
|
-
export declare const
|
|
5
|
+
export declare const SUPPORTED_SCHEMA_VERSIONS: string[];
|
|
6
|
+
export declare const EXPECTED_SCHEMA_VERSION = "1.1.0";
|
|
6
7
|
export declare const REQUIRED_CONTRACT_KEYS: string[];
|
|
7
8
|
/**
|
|
8
9
|
* Validate the parsed frontend contract.
|
|
@@ -10,10 +11,10 @@ export declare const REQUIRED_CONTRACT_KEYS: string[];
|
|
|
10
11
|
* Pure: no IO, no process exit. The caller decides how to react to errors.
|
|
11
12
|
*
|
|
12
13
|
* @param {unknown} config Parsed contract object.
|
|
13
|
-
* @param {string} [
|
|
14
|
+
* @param {string[]} [supported] Schema versions the caller accepts.
|
|
14
15
|
* @returns {{ ok: boolean, errors: string[] }}
|
|
15
16
|
*/
|
|
16
|
-
export declare function validateContract(config: any,
|
|
17
|
+
export declare function validateContract(config: any, supported?: string[]): {
|
|
17
18
|
ok: boolean;
|
|
18
19
|
errors: any[];
|
|
19
20
|
};
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
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;AAID,eAAO,MAAM,yBAAyB,UAAqB,CAAC;AAC5D,eAAO,MAAM,uBAAuB,UAAU,CAAC;AAI/C,eAAO,MAAM,sBAAsB,UAgBlC,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,KAAA,EAAE,SAAS,WAA4B;;;EA2B7E"}
|
|
@@ -21,10 +21,10 @@ export function findThemeCycles(themes) {
|
|
|
21
21
|
}
|
|
22
22
|
return cycles;
|
|
23
23
|
}
|
|
24
|
-
// Contract
|
|
25
|
-
//
|
|
26
|
-
|
|
27
|
-
export const EXPECTED_SCHEMA_VERSION = "1.
|
|
24
|
+
// Contract versions this build engine understands; ConfigInterface::SCHEMA_VERSION
|
|
25
|
+
// on the PHP side must be one of them.
|
|
26
|
+
export const SUPPORTED_SCHEMA_VERSIONS = ["1.0.0", "1.1.0"];
|
|
27
|
+
export const EXPECTED_SCHEMA_VERSION = "1.1.0";
|
|
28
28
|
// Top-level keys the engine reads off the generated contract. Kept in step with
|
|
29
29
|
// the JSON schema in module-modern-frontend/src/etc.
|
|
30
30
|
export const REQUIRED_CONTRACT_KEYS = [
|
|
@@ -50,16 +50,16 @@ export const REQUIRED_CONTRACT_KEYS = [
|
|
|
50
50
|
* Pure: no IO, no process exit. The caller decides how to react to errors.
|
|
51
51
|
*
|
|
52
52
|
* @param {unknown} config Parsed contract object.
|
|
53
|
-
* @param {string} [
|
|
53
|
+
* @param {string[]} [supported] Schema versions the caller accepts.
|
|
54
54
|
* @returns {{ ok: boolean, errors: string[] }}
|
|
55
55
|
*/
|
|
56
|
-
export function validateContract(config,
|
|
56
|
+
export function validateContract(config, supported = SUPPORTED_SCHEMA_VERSIONS) {
|
|
57
57
|
if (config === null || typeof config !== "object" || Array.isArray(config)) {
|
|
58
58
|
return { ok: false, errors: ["Contract is not a JSON object."] };
|
|
59
59
|
}
|
|
60
60
|
const errors = [];
|
|
61
|
-
if (config.schema_version
|
|
62
|
-
errors.push(`Schema version mismatch: this build engine
|
|
61
|
+
if (!supported.includes(config.schema_version)) {
|
|
62
|
+
errors.push(`Schema version mismatch: this build engine supports ${supported.map((v) => `"${v}"`).join(", ")} ` +
|
|
63
63
|
`but the contract is "${config.schema_version ?? "(missing)"}".`);
|
|
64
64
|
}
|
|
65
65
|
for (const key of REQUIRED_CONTRACT_KEYS) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contractValidator.js","sourceRoot":"","sources":["../../src/core/contractValidator.ts"],"names":[],"mappings":"AAAA,2EAA2E;AAC3E,MAAM,UAAU,eAAe,CAAC,MAA2C;IACvE,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAElC,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QACtC,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC;YAAE,SAAS;QAEjC,MAAM,IAAI,GAAa,EAAE,CAAC;QAC1B,MAAM,MAAM,GAAG,IAAI,GAAG,EAAU,CAAC;QACjC,IAAI,IAAI,GAAuB,KAAK,CAAC;QAErC,OAAO,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YACrE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAChB,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACjB,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC;QAC/B,CAAC;QAED,IAAI,IAAI,IAAI,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YAC3B,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QACxE,CAAC;QAED,KAAK,MAAM,OAAO,IAAI,IAAI;YAAE,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACrD,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,
|
|
1
|
+
{"version":3,"file":"contractValidator.js","sourceRoot":"","sources":["../../src/core/contractValidator.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"buildConcurrency.d.ts","sourceRoot":"","sources":["../../src/utils/buildConcurrency.ts"],"names":[],"mappings":"AAAA,wBAAgB,kBAAkB,CAC9B,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,MAAM,GACd,MAAM,CAOR"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
export function resolveConcurrency(raw, themeCount, cores) {
|
|
2
|
+
const requested = Number(raw);
|
|
3
|
+
const valid = raw !== undefined && raw.trim() !== "" && Number.isInteger(requested) && requested >= 1;
|
|
4
|
+
const limit = valid ? requested : cores - 1;
|
|
5
|
+
return Math.max(1, Math.min(themeCount, limit));
|
|
6
|
+
}
|
|
7
|
+
//# sourceMappingURL=buildConcurrency.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"buildConcurrency.js","sourceRoot":"","sources":["../../src/utils/buildConcurrency.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,kBAAkB,CAC9B,GAAuB,EACvB,UAAkB,EAClB,KAAa;IAEb,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;IAC9B,MAAM,KAAK,GACP,GAAG,KAAK,SAAS,IAAI,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,SAAS,IAAI,CAAC,CAAC;IAC5F,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC;IAE5C,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC;AACpD,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "mage-obsidian",
|
|
3
|
-
"version": "3.0
|
|
3
|
+
"version": "3.2.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": {
|