@modern-js/core 2.35.1 → 2.37.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/bin.js +2 -5
- package/dist/config/createDefaultConfig.js +24 -7
- package/dist/config/createLoadedConfig.js +54 -35
- package/dist/config/createResolvedConfig.js +49 -23
- package/dist/config/index.js +24 -6
- package/dist/config/loadConfig.js +62 -49
- package/dist/context.js +61 -48
- package/dist/createCli.js +62 -52
- package/dist/index.js +57 -56
- package/dist/loadEnv.js +40 -14
- package/dist/loadPlugins.js +39 -29
- package/dist/manager.js +45 -36
- package/dist/nodeApi.js +31 -22
- package/dist/runBin.js +31 -16
- package/dist/schema/patchSchema.js +29 -12
- package/dist/schema/traverseSchema.js +24 -7
- package/dist/types/config/index.js +15 -3
- package/dist/types/context.d.ts +51 -12
- package/dist/types/context.js +15 -3
- package/dist/types/coreOptions.js +15 -3
- package/dist/types/hooks.js +15 -3
- package/dist/types/index.js +30 -9
- package/dist/types/plugin.js +15 -3
- package/dist/types/pluginAPI.js +15 -3
- package/dist/utils/checkIsDuplicationPlugin.js +27 -10
- package/dist/utils/commander.js +29 -19
- package/dist/utils/createFileWatcher.js +45 -20
- package/dist/utils/index.js +30 -9
- package/dist/utils/initAppDir.js +38 -12
- package/dist/utils/mergeConfig.js +32 -15
- package/dist/utils/repeatKeyWarning.js +27 -17
- package/package.json +8 -8
package/dist/utils/index.js
CHANGED
|
@@ -1,11 +1,32 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
Object.defineProperty
|
|
3
|
-
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __copyProps = (to, from, except, desc) => {
|
|
7
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
8
|
+
for (let key of __getOwnPropNames(from))
|
|
9
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
10
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
11
|
+
}
|
|
12
|
+
return to;
|
|
13
|
+
};
|
|
14
|
+
var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
|
|
15
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
16
|
+
var utils_exports = {};
|
|
17
|
+
module.exports = __toCommonJS(utils_exports);
|
|
18
|
+
__reExport(utils_exports, require("./commander"), module.exports);
|
|
19
|
+
__reExport(utils_exports, require("./createFileWatcher"), module.exports);
|
|
20
|
+
__reExport(utils_exports, require("./initAppDir"), module.exports);
|
|
21
|
+
__reExport(utils_exports, require("./mergeConfig"), module.exports);
|
|
22
|
+
__reExport(utils_exports, require("./repeatKeyWarning"), module.exports);
|
|
23
|
+
__reExport(utils_exports, require("./checkIsDuplicationPlugin"), module.exports);
|
|
24
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
25
|
+
0 && (module.exports = {
|
|
26
|
+
...require("./commander"),
|
|
27
|
+
...require("./createFileWatcher"),
|
|
28
|
+
...require("./initAppDir"),
|
|
29
|
+
...require("./mergeConfig"),
|
|
30
|
+
...require("./repeatKeyWarning"),
|
|
31
|
+
...require("./checkIsDuplicationPlugin")
|
|
4
32
|
});
|
|
5
|
-
const _export_star = require("@swc/helpers/_/_export_star");
|
|
6
|
-
_export_star._(require("./commander"), exports);
|
|
7
|
-
_export_star._(require("./createFileWatcher"), exports);
|
|
8
|
-
_export_star._(require("./initAppDir"), exports);
|
|
9
|
-
_export_star._(require("./mergeConfig"), exports);
|
|
10
|
-
_export_star._(require("./repeatKeyWarning"), exports);
|
|
11
|
-
_export_star._(require("./checkIsDuplicationPlugin"), exports);
|
package/dist/utils/initAppDir.js
CHANGED
|
@@ -1,25 +1,51 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
Object.
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
Object.
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
2
|
+
var __create = Object.create;
|
|
3
|
+
var __defProp = Object.defineProperty;
|
|
4
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
5
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
6
|
+
var __getProtoOf = Object.getPrototypeOf;
|
|
7
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
8
|
+
var __export = (target, all) => {
|
|
9
|
+
for (var name in all)
|
|
10
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
11
|
+
};
|
|
12
|
+
var __copyProps = (to, from, except, desc) => {
|
|
13
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
14
|
+
for (let key of __getOwnPropNames(from))
|
|
15
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
16
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
9
17
|
}
|
|
18
|
+
return to;
|
|
19
|
+
};
|
|
20
|
+
var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
|
|
21
|
+
// If the importer is in node compatibility mode or this is not an ESM
|
|
22
|
+
// file that has been converted to a CommonJS file using a Babel-
|
|
23
|
+
// compatible transform (i.e. "__esModule" has not been set), then set
|
|
24
|
+
// "default" to the CommonJS "module.exports" for node compatibility.
|
|
25
|
+
isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
|
|
26
|
+
mod
|
|
27
|
+
));
|
|
28
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
29
|
+
var initAppDir_exports = {};
|
|
30
|
+
__export(initAppDir_exports, {
|
|
31
|
+
initAppDir: () => initAppDir
|
|
10
32
|
});
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
33
|
+
module.exports = __toCommonJS(initAppDir_exports);
|
|
34
|
+
var import_path = __toESM(require("path"));
|
|
35
|
+
var import_utils = require("@modern-js/utils");
|
|
14
36
|
const initAppDir = async (cwd) => {
|
|
15
37
|
if (!cwd) {
|
|
16
38
|
cwd = process.cwd();
|
|
17
39
|
}
|
|
18
|
-
const pkg = await (0,
|
|
40
|
+
const pkg = await (0, import_utils.pkgUp)({
|
|
19
41
|
cwd
|
|
20
42
|
});
|
|
21
43
|
if (!pkg) {
|
|
22
44
|
throw new Error(`no package.json found in current work dir: ${cwd}`);
|
|
23
45
|
}
|
|
24
|
-
return
|
|
46
|
+
return import_path.default.dirname(pkg);
|
|
25
47
|
};
|
|
48
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
49
|
+
0 && (module.exports = {
|
|
50
|
+
initAppDir
|
|
51
|
+
});
|
|
@@ -1,20 +1,33 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
Object.defineProperty
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
Object.
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __export = (target, all) => {
|
|
7
|
+
for (var name in all)
|
|
8
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
9
|
+
};
|
|
10
|
+
var __copyProps = (to, from, except, desc) => {
|
|
11
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
12
|
+
for (let key of __getOwnPropNames(from))
|
|
13
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
14
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
9
15
|
}
|
|
16
|
+
return to;
|
|
17
|
+
};
|
|
18
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
|
+
var mergeConfig_exports = {};
|
|
20
|
+
__export(mergeConfig_exports, {
|
|
21
|
+
mergeConfig: () => mergeConfig
|
|
10
22
|
});
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
23
|
+
module.exports = __toCommonJS(mergeConfig_exports);
|
|
24
|
+
var import_utils = require("@modern-js/utils");
|
|
25
|
+
var import_lodash = require("@modern-js/utils/lodash");
|
|
26
|
+
const mergeConfig = (configs) => (0, import_lodash.mergeWith)({}, ...configs, (target, source, key) => {
|
|
14
27
|
if (key === "designSystem" || key === "tailwindcss" && typeof source === "object") {
|
|
15
|
-
return (0,
|
|
28
|
+
return (0, import_lodash.mergeWith)({}, target !== null && target !== void 0 ? target : {}, source !== null && source !== void 0 ? source : {});
|
|
16
29
|
}
|
|
17
|
-
if ((0,
|
|
30
|
+
if ((0, import_utils.isOverriddenConfigKey)(key)) {
|
|
18
31
|
return source !== null && source !== void 0 ? source : target;
|
|
19
32
|
}
|
|
20
33
|
if (Array.isArray(target) || Array.isArray(source)) {
|
|
@@ -25,11 +38,11 @@ const mergeConfig = (configs) => (0, _lodash.mergeWith)({}, ...configs, (target,
|
|
|
25
38
|
return target;
|
|
26
39
|
}
|
|
27
40
|
return [
|
|
28
|
-
...(0,
|
|
29
|
-
...(0,
|
|
41
|
+
...(0, import_utils.ensureArray)(target),
|
|
42
|
+
...(0, import_utils.ensureArray)(source)
|
|
30
43
|
];
|
|
31
44
|
}
|
|
32
|
-
if ((0,
|
|
45
|
+
if ((0, import_lodash.isFunction)(target) || (0, import_lodash.isFunction)(source)) {
|
|
33
46
|
if (source === void 0) {
|
|
34
47
|
return target;
|
|
35
48
|
}
|
|
@@ -43,3 +56,7 @@ const mergeConfig = (configs) => (0, _lodash.mergeWith)({}, ...configs, (target,
|
|
|
43
56
|
}
|
|
44
57
|
return void 0;
|
|
45
58
|
});
|
|
59
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
60
|
+
0 && (module.exports = {
|
|
61
|
+
mergeConfig
|
|
62
|
+
});
|
|
@@ -1,23 +1,28 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
Object.defineProperty
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __export = (target, all) => {
|
|
6
7
|
for (var name in all)
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
return deepGet;
|
|
15
|
-
},
|
|
16
|
-
repeatKeyWarning: function() {
|
|
17
|
-
return repeatKeyWarning;
|
|
8
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
9
|
+
};
|
|
10
|
+
var __copyProps = (to, from, except, desc) => {
|
|
11
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
12
|
+
for (let key of __getOwnPropNames(from))
|
|
13
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
14
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
18
15
|
}
|
|
16
|
+
return to;
|
|
17
|
+
};
|
|
18
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
|
+
var repeatKeyWarning_exports = {};
|
|
20
|
+
__export(repeatKeyWarning_exports, {
|
|
21
|
+
deepGet: () => deepGet,
|
|
22
|
+
repeatKeyWarning: () => repeatKeyWarning
|
|
19
23
|
});
|
|
20
|
-
|
|
24
|
+
module.exports = __toCommonJS(repeatKeyWarning_exports);
|
|
25
|
+
var import_traverseSchema = require("../schema/traverseSchema");
|
|
21
26
|
const deepGet = (obj, key) => {
|
|
22
27
|
for (const p of key.split(".")) {
|
|
23
28
|
obj = obj ? obj[p] : void 0;
|
|
@@ -25,7 +30,7 @@ const deepGet = (obj, key) => {
|
|
|
25
30
|
return obj;
|
|
26
31
|
};
|
|
27
32
|
const repeatKeyWarning = (schema, jsConfig, pkgConfig) => {
|
|
28
|
-
const keys = (0,
|
|
33
|
+
const keys = (0, import_traverseSchema.traverseSchema)(schema);
|
|
29
34
|
for (const key of keys) {
|
|
30
35
|
if (deepGet(jsConfig, key) !== void 0 && deepGet(pkgConfig, key) !== void 0) {
|
|
31
36
|
throw new Error(`The same configuration ${key} exists in modern.config.js and package.json.
|
|
@@ -33,3 +38,8 @@ const repeatKeyWarning = (schema, jsConfig, pkgConfig) => {
|
|
|
33
38
|
}
|
|
34
39
|
}
|
|
35
40
|
};
|
|
41
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
42
|
+
0 && (module.exports = {
|
|
43
|
+
deepGet,
|
|
44
|
+
repeatKeyWarning
|
|
45
|
+
});
|
package/package.json
CHANGED
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
"modern",
|
|
15
15
|
"modern.js"
|
|
16
16
|
],
|
|
17
|
-
"version": "2.
|
|
17
|
+
"version": "2.37.0",
|
|
18
18
|
"jsnext:source": "./src/index.ts",
|
|
19
19
|
"types": "./dist/index.d.ts",
|
|
20
20
|
"main": "./dist/index.js",
|
|
@@ -71,9 +71,9 @@
|
|
|
71
71
|
},
|
|
72
72
|
"dependencies": {
|
|
73
73
|
"@swc/helpers": "0.5.1",
|
|
74
|
-
"@modern-js/node-bundle-require": "2.
|
|
75
|
-
"@modern-js/plugin": "2.
|
|
76
|
-
"@modern-js/utils": "2.
|
|
74
|
+
"@modern-js/node-bundle-require": "2.37.0",
|
|
75
|
+
"@modern-js/plugin": "2.37.0",
|
|
76
|
+
"@modern-js/utils": "2.37.0"
|
|
77
77
|
},
|
|
78
78
|
"devDependencies": {
|
|
79
79
|
"@types/jest": "^29",
|
|
@@ -81,10 +81,10 @@
|
|
|
81
81
|
"tsm": "2.3.0",
|
|
82
82
|
"jest": "^29",
|
|
83
83
|
"typescript": "^5",
|
|
84
|
-
"@modern-js/builder-shared": "2.
|
|
85
|
-
"@modern-js/types": "2.
|
|
86
|
-
"@scripts/build": "2.
|
|
87
|
-
"@scripts/jest-config": "2.
|
|
84
|
+
"@modern-js/builder-shared": "2.37.0",
|
|
85
|
+
"@modern-js/types": "2.37.0",
|
|
86
|
+
"@scripts/build": "2.37.0",
|
|
87
|
+
"@scripts/jest-config": "2.37.0"
|
|
88
88
|
},
|
|
89
89
|
"sideEffects": false,
|
|
90
90
|
"publishConfig": {
|