c12 0.2.8 → 0.2.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/dist/index.cjs +10 -3
- package/dist/index.mjs +10 -3
- package/package.json +4 -4
package/dist/index.cjs
CHANGED
|
@@ -129,12 +129,19 @@ async function loadConfig(opts) {
|
|
|
129
129
|
}
|
|
130
130
|
Object.assign(configRC, rc9__namespace.read({ name: opts.rcFile, dir: opts.cwd }));
|
|
131
131
|
}
|
|
132
|
-
r.config = defu__default(
|
|
132
|
+
r.config = defu__default(
|
|
133
|
+
opts.overrides,
|
|
134
|
+
config,
|
|
135
|
+
configRC
|
|
136
|
+
);
|
|
133
137
|
if (opts.extend) {
|
|
134
138
|
await extendConfig(r.config, opts);
|
|
135
139
|
r.layers = r.config._layers;
|
|
136
140
|
delete r.config._layers;
|
|
137
|
-
r.config = defu__default(
|
|
141
|
+
r.config = defu__default(
|
|
142
|
+
r.config,
|
|
143
|
+
...r.layers.map((e) => e.config)
|
|
144
|
+
);
|
|
138
145
|
}
|
|
139
146
|
const baseLayers = [
|
|
140
147
|
opts.overrides && { config: opts.overrides, configFile: void 0, cwd: void 0 },
|
|
@@ -174,7 +181,7 @@ async function extendConfig(config, opts) {
|
|
|
174
181
|
}
|
|
175
182
|
const GIT_PREFIXES = ["github:", "gitlab:", "bitbucket:", "https://"];
|
|
176
183
|
const NPM_PACKAGE_RE = /^(@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-~][a-z0-9-._~]*$/;
|
|
177
|
-
const jiti = createJiti__default(null, { cache: false, interopDefault: true, requireCache: false });
|
|
184
|
+
const jiti = createJiti__default(null, { cache: false, interopDefault: true, requireCache: false, esmResolve: true });
|
|
178
185
|
async function resolveConfig(source, opts) {
|
|
179
186
|
if (opts.resolve) {
|
|
180
187
|
const res2 = await opts.resolve(source, opts);
|
package/dist/index.mjs
CHANGED
|
@@ -105,12 +105,19 @@ async function loadConfig(opts) {
|
|
|
105
105
|
}
|
|
106
106
|
Object.assign(configRC, rc9.read({ name: opts.rcFile, dir: opts.cwd }));
|
|
107
107
|
}
|
|
108
|
-
r.config = defu(
|
|
108
|
+
r.config = defu(
|
|
109
|
+
opts.overrides,
|
|
110
|
+
config,
|
|
111
|
+
configRC
|
|
112
|
+
);
|
|
109
113
|
if (opts.extend) {
|
|
110
114
|
await extendConfig(r.config, opts);
|
|
111
115
|
r.layers = r.config._layers;
|
|
112
116
|
delete r.config._layers;
|
|
113
|
-
r.config = defu(
|
|
117
|
+
r.config = defu(
|
|
118
|
+
r.config,
|
|
119
|
+
...r.layers.map((e) => e.config)
|
|
120
|
+
);
|
|
114
121
|
}
|
|
115
122
|
const baseLayers = [
|
|
116
123
|
opts.overrides && { config: opts.overrides, configFile: void 0, cwd: void 0 },
|
|
@@ -150,7 +157,7 @@ async function extendConfig(config, opts) {
|
|
|
150
157
|
}
|
|
151
158
|
const GIT_PREFIXES = ["github:", "gitlab:", "bitbucket:", "https://"];
|
|
152
159
|
const NPM_PACKAGE_RE = /^(@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-~][a-z0-9-._~]*$/;
|
|
153
|
-
const jiti = createJiti(null, { cache: false, interopDefault: true, requireCache: false });
|
|
160
|
+
const jiti = createJiti(null, { cache: false, interopDefault: true, requireCache: false, esmResolve: true });
|
|
154
161
|
async function resolveConfig(source, opts) {
|
|
155
162
|
if (opts.resolve) {
|
|
156
163
|
const res2 = await opts.resolve(source, opts);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "c12",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.9",
|
|
4
4
|
"description": "Smart Config Loader",
|
|
5
5
|
"repository": "unjs/c12",
|
|
6
6
|
"license": "MIT",
|
|
@@ -23,8 +23,8 @@
|
|
|
23
23
|
"dotenv": "^16.0.1",
|
|
24
24
|
"gittar": "^0.1.1",
|
|
25
25
|
"jiti": "^1.14.0",
|
|
26
|
-
"mlly": "^0.5.
|
|
27
|
-
"pathe": "^0.3.
|
|
26
|
+
"mlly": "^0.5.7",
|
|
27
|
+
"pathe": "^0.3.3",
|
|
28
28
|
"rc9": "^1.2.2"
|
|
29
29
|
},
|
|
30
30
|
"devDependencies": {
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
"unbuild": "latest",
|
|
37
37
|
"vitest": "latest"
|
|
38
38
|
},
|
|
39
|
-
"packageManager": "pnpm@7.
|
|
39
|
+
"packageManager": "pnpm@7.8.0",
|
|
40
40
|
"scripts": {
|
|
41
41
|
"build": "unbuild",
|
|
42
42
|
"dev": "vitest dev",
|