@sima-land/isomorph 11.0.0-alpha.26 → 11.0.0-alpha.27
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/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sima-land/isomorph",
|
|
3
|
-
"version": "11.0.0-alpha.
|
|
3
|
+
"version": "11.0.0-alpha.27",
|
|
4
4
|
"description": "Tiny framework for fast start frontend microservices",
|
|
5
5
|
"author": "www.sima-land.ru team",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -53,8 +53,8 @@
|
|
|
53
53
|
"express": "^4.17.3",
|
|
54
54
|
"jsesc": "^3.0.2",
|
|
55
55
|
"middleware-axios": "^2.1.5",
|
|
56
|
-
"pino": "^8.
|
|
57
|
-
"pino-pretty": "^9.
|
|
56
|
+
"pino": "^8.7.0",
|
|
57
|
+
"pino-pretty": "^9.1.1",
|
|
58
58
|
"prom-client": "^14.0.1",
|
|
59
59
|
"webpack": "^5.74.0"
|
|
60
60
|
},
|
|
@@ -25,7 +25,14 @@ class EnvPlugin {
|
|
|
25
25
|
*/
|
|
26
26
|
apply(compiler) {
|
|
27
27
|
const { webpack } = compiler;
|
|
28
|
-
const env = (0, utils_1.defineEnv)({
|
|
28
|
+
const env = (0, utils_1.defineEnv)({
|
|
29
|
+
dotenvUsage: this.options.dotenvUsage,
|
|
30
|
+
onError: error => {
|
|
31
|
+
compiler.hooks.compilation.tap('EnvPlugin', compilation => {
|
|
32
|
+
compilation.warnings.push(new webpack.WebpackError(`[EnvPlugin] ${String(error)}`));
|
|
33
|
+
});
|
|
34
|
+
},
|
|
35
|
+
});
|
|
29
36
|
let values = null;
|
|
30
37
|
let target;
|
|
31
38
|
// define target
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/utils/webpack/env/index.ts"],"names":[],"mappings":";;;AAAA,mCAAsC;AAGtC,mCAAoD;AAEpD;;;;GAIG;AACH,MAAa,SAAS;IAGpB;;OAEG;IACH,YAAY,UAA4B,EAAE;QACxC,IAAI,CAAC,OAAO,GAAG;YACb,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,MAAM;YAChC,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,IAAI;YACxC,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,EAAE;YACpC,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,EAAE;SAC7B,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,QAAkB;QACtB,MAAM,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/utils/webpack/env/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,9 @@ import { EnvPluginOptions } from './types';
|
|
|
4
4
|
* @param options Опции.
|
|
5
5
|
* @return Объект с переменными среды.
|
|
6
6
|
*/
|
|
7
|
-
export declare function defineEnv(options: Pick<EnvPluginOptions, 'dotenvUsage'>
|
|
7
|
+
export declare function defineEnv(options: Pick<EnvPluginOptions, 'dotenvUsage'> & {
|
|
8
|
+
onError?: (error: unknown) => void;
|
|
9
|
+
}): Record<string, string | undefined>;
|
|
8
10
|
/**
|
|
9
11
|
* Получив таблицу "название переменной среды >> значение переменной среды" вернёт определение для DefinePlugin.
|
|
10
12
|
* @param input Таблица переменных.
|
|
@@ -15,15 +15,21 @@ const dotenv_1 = __importDefault(require("dotenv"));
|
|
|
15
15
|
function defineEnv(options) {
|
|
16
16
|
const result = { ...process.env };
|
|
17
17
|
if (options.dotenvUsage && process.env.NODE_ENV) {
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
18
|
+
try {
|
|
19
|
+
const dotenvPath = path_1.default.join(process.cwd(), `.env.${process.env.NODE_ENV}`);
|
|
20
|
+
if ((0, fs_1.existsSync)(dotenvPath)) {
|
|
21
|
+
const parsed = dotenv_1.default.parse((0, fs_1.readFileSync)(dotenvPath, 'utf-8'));
|
|
22
|
+
// @todo дёрнуть бы эту логику из пакета dotenv, https://github.com/motdotla/dotenv/issues/690
|
|
23
|
+
for (const key of Object.keys(parsed)) {
|
|
24
|
+
if (!Object.prototype.hasOwnProperty.call(result, key)) {
|
|
25
|
+
result[key] = parsed[key];
|
|
26
|
+
}
|
|
27
|
+
}
|
|
25
28
|
}
|
|
26
29
|
}
|
|
30
|
+
catch (error) {
|
|
31
|
+
options.onError?.(error);
|
|
32
|
+
}
|
|
27
33
|
}
|
|
28
34
|
return result;
|
|
29
35
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/utils/webpack/env/utils.ts"],"names":[],"mappings":";;;;;;AACA,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/utils/webpack/env/utils.ts"],"names":[],"mappings":";;;;;;AACA,2BAA8C;AAC9C,gDAAwB;AACxB,oDAA4B;AAE5B;;;;GAIG;AACH,SAAgB,SAAS,CACvB,OAAuF;IAEvF,MAAM,MAAM,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAElC,IAAI,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE;QAC/C,IAAI;YACF,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,QAAQ,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;YAE5E,IAAI,IAAA,eAAU,EAAC,UAAU,CAAC,EAAE;gBAC1B,MAAM,MAAM,GAAG,gBAAM,CAAC,KAAK,CAAC,IAAA,iBAAY,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC;gBAE/D,8FAA8F;gBAC9F,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;oBACrC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE;wBACtD,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;qBAC3B;iBACF;aACF;SACF;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC;SAC1B;KACF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAzBD,8BAyBC;AAED;;;;GAIG;AACH,SAAgB,cAAc,CAAC,KAAyC;IACtE,MAAM,MAAM,GAA2B,EAAE,CAAC;IAE1C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QAChD,IAAI,GAAG,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YACpC,MAAM,CAAC,eAAe,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;SACtD;KACF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAVD,wCAUC"}
|