@genesislcap/webpack-builder 14.40.1 → 14.41.0

package/dist/config/plugins.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugins.d.ts","sourceRoot":"","sources":["../../src/config/plugins.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAK3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAiB7C,eAAO,MAAM,OAAO,QAAS,YAAY,KAAG,aAAa,CAAC,SAAS,CAsElE,CAAC"}
+{"version":3,"file":"plugins.d.ts","sourceRoot":"","sources":["../../src/config/plugins.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAK3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAgB7C,eAAO,MAAM,OAAO,QAAS,YAAY,KAAG,aAAa,CAAC,SAAS,CAgElE,CAAC"}

package/dist/config/plugins.js

@@ -13,7 +13,6 @@ const webpack_bundle_analyzer_1 = require("webpack-bundle-analyzer");
 const webpack_pwa_manifest_1 = tslib_1.__importDefault(require("webpack-pwa-manifest"));
 const webpackbar_1 = tslib_1.__importDefault(require("webpackbar"));
 const workbox_webpack_plugin_1 = require("workbox-webpack-plugin");
-const utils_1 = require("../utils");
 const federation_1 = require("./federation");
 const getTemplate = (cwd) => {
     const templateApp = (0, node_path_1.resolve)(cwd, 'public/index.ejs');
@@ -23,9 +22,10 @@ const getTemplate = (cwd) => {
     return template;
 };
 const plugins = (ctx) => {
-    const { cli: { isAnalyze }, dirs: { cwd }, config: { serviceWorker, pwa, federation, app: { rootElement }, }, pkg, } = ctx;
+    const { cli: { isAnalyze }, dirs: { cwd }, config: { serviceWorker, pwa, federation, app: { rootElement }, http, env, }, pkg, } = ctx;
     const federatedIndexPresent = (0, federation_1.federatedIndexExists)();
     const moduleFederationOptions = (0, federation_1.resolveFederationOptions)(federation, pkg);
+    const define = (0, build_kit_1.resolveDefineConfig)(env, http);
     return [
         new copy_webpack_plugin_1.default({
             patterns: [
@@ -34,16 +34,7 @@ const plugins = (ctx) => {
                 },
             ],
         }),
-        new webpack_1.DefinePlugin({
-            API_HOST: JSON.stringify(process.env.API_HOST),
-            DEFAULT_ORGANISATION: JSON.stringify(process.env.DEFAULT_ORGANISATION),
-            DEFAULT_USER: JSON.stringify(process.env.DEFAULT_USER),
-            DEFAULT_PASSWORD: JSON.stringify(process.env.DEFAULT_PASSWORD),
-            NODE_ENV: JSON.stringify(process.env.NODE_ENV),
-            FORCE_HTTP: JSON.stringify(process.env.FORCE_HTTP),
-            HTTP_CONFIG: JSON.stringify((0, utils_1.readFile)(process.env.HTTP_CONFIG_PATH)),
-            SOCKET_EXT: JSON.stringify(process.env.SOCKET_EXT),
-        }),
+        new webpack_1.DefinePlugin(define),
         new webpackbar_1.default(),
         new mini_css_extract_plugin_1.default(),
         (rootElement || !federatedIndexPresent) &&

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/webpack-builder",
   "description": "Webpack builder",
-  "version": "14.40.1",
+  "version": "14.41.0",
   "license": "SEE LICENSE IN license.txt",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -12,7 +12,7 @@
     "dev": "tsc -b ./tsconfig.json -w"
   },
   "dependencies": {
-    "@genesislcap/build-kit": "^14.40.1",
+    "@genesislcap/build-kit": "^14.41.0",
     "@module-federation/dashboard-plugin": "2.6.5",
     "@pixability-ui/federated-types": "^0.2.0",
     "camel-case": "^4.1.2",
@@ -53,5 +53,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b2f957496de6a98f8221da5c72ab9a1b6d6ea74b"
+  "gitHead": "98799a829ab05cf534ddcfac6e41b0244538d0ab"
 }

package/src/config/plugins.ts

@@ -1,7 +1,7 @@
 import { existsSync } from 'node:fs';
 import { resolve, join } from 'node:path';
 import type { BuildContext } from '@genesislcap/build-kit';
-import { objToSnakeCase } from '@genesislcap/build-kit';
+import { objToSnakeCase, resolveDefineConfig } from '@genesislcap/build-kit';
 import CopyPlugin from 'copy-webpack-plugin';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 import MiniCssExtractPlugin from 'mini-css-extract-plugin';
@@ -11,7 +11,6 @@ import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
 import WebpackPwaManifest from 'webpack-pwa-manifest';
 import WebpackBar from 'webpackbar';
 import { InjectManifest } from 'workbox-webpack-plugin';
-import { readFile } from '../utils';
 import { getFederationPlugins, federatedIndexExists, resolveFederationOptions } from './federation';
 
 const getTemplate = (cwd) => {
@@ -31,12 +30,15 @@ export const plugins = (ctx: BuildContext): Configuration['plugins'] => {
       pwa,
       federation,
       app: { rootElement },
+      http,
+      env,
     },
     pkg,
   } = ctx;
 
   const federatedIndexPresent = federatedIndexExists();
   const moduleFederationOptions = resolveFederationOptions(federation, pkg);
+  const define = resolveDefineConfig(env, http);
 
   return [
     new CopyPlugin({
@@ -46,16 +48,7 @@ export const plugins = (ctx: BuildContext): Configuration['plugins'] => {
         },
       ],
     }),
-    new DefinePlugin({
-      API_HOST: JSON.stringify(process.env.API_HOST),
-      DEFAULT_ORGANISATION: JSON.stringify(process.env.DEFAULT_ORGANISATION),
-      DEFAULT_USER: JSON.stringify(process.env.DEFAULT_USER),
-      DEFAULT_PASSWORD: JSON.stringify(process.env.DEFAULT_PASSWORD),
-      NODE_ENV: JSON.stringify(process.env.NODE_ENV),
-      FORCE_HTTP: JSON.stringify(process.env.FORCE_HTTP),
-      HTTP_CONFIG: JSON.stringify(readFile(process.env.HTTP_CONFIG_PATH)),
-      SOCKET_EXT: JSON.stringify(process.env.SOCKET_EXT),
-    }),
+    new DefinePlugin(define),
     new WebpackBar(),
     new MiniCssExtractPlugin(),
     (rootElement || !federatedIndexPresent) &&

package/dist/utils/fs.d.ts

@@ -1,2 +0,0 @@
-export declare const readFile: (filePath: any) => string;
-//# sourceMappingURL=fs.d.ts.map

package/dist/utils/fs.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"fs.d.ts","sourceRoot":"","sources":["../../src/utils/fs.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,QAAQ,2BASpB,CAAC"}

package/dist/utils/fs.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.readFile = void 0;
-const node_fs_1 = require("node:fs");
-const node_path_1 = require("node:path");
-const readFile = (filePath) => {
-    if (!filePath)
-        return '';
-    const resolvedPath = (0, node_path_1.resolve)(process.cwd(), filePath);
-    try {
-        return (0, node_fs_1.readFileSync)(resolvedPath, 'utf8');
-    }
-    catch (e) {
-        console.error(e);
-        return '';
-    }
-};
-exports.readFile = readFile;

package/dist/utils/index.d.ts

@@ -1,2 +0,0 @@
-export * from './fs';
-//# sourceMappingURL=index.d.ts.map

package/dist/utils/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,MAAM,CAAC"}

package/dist/utils/index.js

@@ -1,4 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./fs"), exports);

package/src/utils/fs.ts

@@ -1,13 +0,0 @@
-import { readFileSync } from 'node:fs';
-import { resolve } from 'node:path';
-
-export const readFile = (filePath) => {
-  if (!filePath) return '';
-  const resolvedPath = resolve(process.cwd(), filePath);
-  try {
-    return readFileSync(resolvedPath, 'utf8');
-  } catch (e) {
-    console.error(e);
-    return '';
-  }
-};

package/src/utils/index.ts

@@ -1 +0,0 @@
-export * from './fs';