@sima-land/isomorph 11.0.0-alpha.7 → 11.0.0-alpha.8

package/config/browser.js

@@ -7,7 +7,16 @@ const env_1 = require("@humanwhocodes/env");
  * @return Источник.
  */
 function createConfigSource() {
-    return new env_1.Env(process.env);
+    const source = {};
+    // докидываем process если он предоставлен сборкой
+    if (typeof process !== 'undefined') {
+        Object.assign(source, process.env);
+    }
+    // докидываем зашиваемые переменные окружения
+    if (typeof __ISOMORPH_ENV__ !== 'undefined') {
+        Object.assign(source, __ISOMORPH_ENV__);
+    }
+    return new env_1.Env(source);
 }
 exports.createConfigSource = createConfigSource;
 //# sourceMappingURL=browser.js.map

package/config/browser.js.map

@@ -1 +1 @@
-{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../src/config/browser.ts"],"names":[],"mappings":";;;AACA,4CAAyC;AAEzC;;;GAGG;AACH,SAAgB,kBAAkB;IAChC,OAAO,IAAI,SAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;AAC9B,CAAC;AAFD,gDAEC"}
+{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../src/config/browser.ts"],"names":[],"mappings":";;;AACA,4CAAyC;AAIzC;;;GAGG;AACH,SAAgB,kBAAkB;IAChC,MAAM,MAAM,GAAuC,EAAE,CAAC;IAEtD,kDAAkD;IAClD,IAAI,OAAO,OAAO,KAAK,WAAW,EAAE;QAClC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;KACpC;IAED,6CAA6C;IAC7C,IAAI,OAAO,gBAAgB,KAAK,WAAW,EAAE;QAC3C,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;KACzC;IAED,OAAO,IAAI,SAAG,CAAC,MAAM,CAAC,CAAC;AACzB,CAAC;AAdD,gDAcC"}

package/config/node.js

@@ -3,17 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createConfigSource = void 0;
 const env_1 = require("@humanwhocodes/env");
 const dotenv_1 = require("dotenv");
-const utils_1 = require("./utils");
 /**
  * Возвращает "источник" для конфигурации.
  * @return Источник.
  */
 function createConfigSource() {
-    // определяем среду
-    const envName = (0, utils_1.defineEnvironment)();
+    const envName = process.env.NODE_ENV;
+    const source = { ...process.env };
     // подключаем соответствующий среде файл со значениями по умолчанию
-    (0, dotenv_1.config)({ path: `./.env.${envName}` });
-    return new env_1.Env(process.env);
+    if (envName) {
+        (0, dotenv_1.config)({ path: `./.env.${envName}` });
+    }
+    // докидываем зашиваемые переменные окружения
+    if (typeof __ISOMORPH_ENV__ !== 'undefined') {
+        Object.assign(source, __ISOMORPH_ENV__);
+    }
+    return new env_1.Env(source);
 }
 exports.createConfigSource = createConfigSource;
 //# sourceMappingURL=node.js.map

package/config/node.js.map

@@ -1 +1 @@
-{"version":3,"file":"node.js","sourceRoot":"","sources":["../../src/config/node.ts"],"names":[],"mappings":";;;AACA,4CAAyC;AACzC,mCAAgC;AAChC,mCAA4C;AAE5C;;;GAGG;AACH,SAAgB,kBAAkB;IAChC,mBAAmB;IACnB,MAAM,OAAO,GAAG,IAAA,yBAAiB,GAAE,CAAC;IAEpC,mEAAmE;IACnE,IAAA,eAAM,EAAC,EAAE,IAAI,EAAE,UAAU,OAAO,EAAE,EAAE,CAAC,CAAC;IAEtC,OAAO,IAAI,SAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;AAC9B,CAAC;AARD,gDAQC"}
+{"version":3,"file":"node.js","sourceRoot":"","sources":["../../src/config/node.ts"],"names":[],"mappings":";;;AACA,4CAAyC;AACzC,mCAAgC;AAIhC;;;GAGG;AACH,SAAgB,kBAAkB;IAChC,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;IACrC,MAAM,MAAM,GAAuC,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAEtE,mEAAmE;IACnE,IAAI,OAAO,EAAE;QACX,IAAA,eAAM,EAAC,EAAE,IAAI,EAAE,UAAU,OAAO,EAAE,EAAE,CAAC,CAAC;KACvC;IAED,6CAA6C;IAC7C,IAAI,OAAO,gBAAgB,KAAK,WAAW,EAAE;QAC3C,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;KACzC;IAED,OAAO,IAAI,SAAG,CAAC,MAAM,CAAC,CAAC;AACzB,CAAC;AAfD,gDAeC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sima-land/isomorph",
-  "version": "11.0.0-alpha.7",
+  "version": "11.0.0-alpha.8",
   "description": "Tiny framework for fast start frontend microservices",
   "author": "www.sima-land.ru team",
   "license": "Apache-2.0",

package/utils/webpack/index.d.ts

@@ -0,0 +1,23 @@
+import webpack from 'webpack';
+/**
+ * Плагин для зашивания переменных среды в сборки.
+ * В браузерную сборку зашьёт только переменные с префиксом "PUBLIC_".
+ * ВАЖНО: все зашиваемые переменные будут доступны через глобальный объект __ISOMORPH_ENV__.
+ */
+export declare class EnvPlugin {
+    options: {
+        additional: string[];
+        define?: Record<string, string>;
+    };
+    /**
+     * @param options Опции.
+     */
+    constructor(options?: {
+        additional?: string[];
+        define?: Record<string, string>;
+    });
+    /**
+     * @param compiler Компилятор.
+     */
+    apply(compiler: webpack.Compiler): void;
+}

package/utils/webpack/index.js

@@ -0,0 +1,66 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EnvPlugin = void 0;
+const lodash_1 = require("lodash");
+const webpack_1 = __importDefault(require("webpack"));
+const dotenv_1 = __importDefault(require("dotenv"));
+const path_1 = __importDefault(require("path"));
+const env_1 = require("@humanwhocodes/env");
+/**
+ * Плагин для зашивания переменных среды в сборки.
+ * В браузерную сборку зашьёт только переменные с префиксом "PUBLIC_".
+ * ВАЖНО: все зашиваемые переменные будут доступны через глобальный объект __ISOMORPH_ENV__.
+ */
+class EnvPlugin {
+    /**
+     * @param options Опции.
+     */
+    constructor(options = {}) {
+        this.options = {
+            additional: options.additional || [],
+            define: options.define,
+        };
+    }
+    /**
+     * @param compiler Компилятор.
+     */
+    apply(compiler) {
+        const { NODE_ENV } = new env_1.Env().required;
+        dotenv_1.default.config({ path: path_1.default.join(process.cwd(), `.env.${NODE_ENV}`) });
+        const target = Array.isArray(compiler.options.target)
+            ? compiler.options.target
+            : [compiler.options.target];
+        // browser
+        if (target.includes('web')) {
+            const valuesWeb = {
+                ...this.options.define,
+                ...(0, lodash_1.pick)(process.env, [...this.options.additional, 'NODE_ENV']),
+                ...(0, lodash_1.pickBy)(process.env, (_, key) => key.startsWith('PUBLIC_')),
+            };
+            new webpack_1.default.DefinePlugin({ __ISOMORPH_ENV__: JSON.stringify(valuesWeb) }).apply(compiler);
+            new webpack_1.default.DefinePlugin(Object.entries(valuesWeb).reduce((acc, [key, value]) => {
+                acc[`process.env.${key}`] = JSON.stringify(value);
+                return acc;
+            }, {})).apply(compiler);
+        }
+        // node
+        if (!target.includes('web')) {
+            const valuesNode = {
+                ...this.options.define,
+                ...(0, lodash_1.pick)(process.env, [...this.options.additional, 'NODE_ENV']),
+            };
+            new webpack_1.default.DefinePlugin({ __ISOMORPH_ENV__: JSON.stringify(valuesNode) }).apply(compiler);
+            if (this.options.define) {
+                new webpack_1.default.DefinePlugin(Object.entries(this.options.define).reduce((acc, [key, value]) => {
+                    acc[`process.env.${key}`] = JSON.stringify(value);
+                    return acc;
+                }, {})).apply(compiler);
+            }
+        }
+    }
+}
+exports.EnvPlugin = EnvPlugin;
+//# sourceMappingURL=index.js.map

package/utils/webpack/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/webpack/index.ts"],"names":[],"mappings":"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"}

package/config/utils.d.ts

@@ -1,5 +0,0 @@
-/**
- * Возвращает значение process.env.NODE_ENV или "unknown".
- * @return Значение.
- */
-export declare function defineEnvironment(): string;

package/config/utils.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.defineEnvironment = void 0;
-/**
- * Возвращает значение process.env.NODE_ENV или "unknown".
- * @return Значение.
- */
-function defineEnvironment() {
-    return process.env.NODE_ENV || 'unknown';
-}
-exports.defineEnvironment = defineEnvironment;
-//# sourceMappingURL=utils.js.map

package/config/utils.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/config/utils.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,SAAgB,iBAAiB;IAC/B,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,SAAS,CAAC;AAC3C,CAAC;AAFD,8CAEC"}