@redhat-cloud-services/frontend-components-config 4.6.2 → 4.6.5

package/README.md

@@ -374,7 +374,7 @@ index f7513bb..d8c9008 100644
      "prod": "NODE_ENV=production webpack serve --config config/dev.webpack.config.js",
      "server:ctr": "node src/server/generateServerKey.js",
      "start": "NODE_ENV=development webpack serve --config config/dev.webpack.config.js",
-+    "start:federated": "fec static --config config/dev.webpack.config.js",
++    "start:federated": "fec static",
      "start:proxy": "PROXY=true NODE_ENV=development webpack serve --config config/dev.webpack.config.js",
      "travis:build": "NODE_ENV=production webpack --config config/prod.webpack.config.js",
      "travis:verify": "npm-run-all travis:build lint test",

package/bin/fec.js

@@ -4,7 +4,8 @@ const static = require('@redhat-cloud-services/frontend-components-config-utilit
 const yargs = require('yargs');
 
 const devScript = require('../src/scripts/dev-script');
-const { logError } = require('../src/scripts/common')
+const buildScript = require('../src/scripts/build-script');
+const { logError } = require('../src/scripts/common');
 
 function patchHosts() {
     const command = `
@@ -48,13 +49,20 @@ const argv = yargs
         describe: 'Path to webpack config',
     })
 })
+.command('build', 'Build production bundle', (yargs) => {
+    yargs.positional('webpack-config', {
+        type: 'string',
+        describe: 'Path to webpack config',
+    })
+})
 .help()
 .argv;
 
 const scripts = {
     static,
     'patch-etc-hosts': patchHosts,
-    dev: devScript
+    dev: devScript,
+    build: buildScript
 };
 
 const args = [ argv, cwd ];

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@redhat-cloud-services/frontend-components-config",
-    "version": "4.6.2",
+    "version": "4.6.5",
     "description": "Config plugins and settings for RedHat Cloud Services project.",
     "main": "index.js",
     "bin": {
@@ -20,7 +20,7 @@
     },
     "homepage": "https://github.com/RedHatInsights/frontend-components/tree/master/packages/config#readme",
     "dependencies": {
-        "@redhat-cloud-services/frontend-components-config-utilities": "^1.5.11",
+        "@redhat-cloud-services/frontend-components-config-utilities": "^1.5.16",
         "assert": "^2.0.0",
         "axios": "^0.25.0",
         "babel-loader": "^8.2.2",

package/src/scripts/build-script.js

@@ -0,0 +1,27 @@
+const { logError, getWebpackConfigPath } = require('./common');
+const { resolve } = require('path');
+const { spawn } = require('child_process');
+
+function buildScript(argv, cwd) {
+  try {
+    const processArgs = [];
+    let configPath;
+    if (typeof argv.webpackConfig !== 'undefined') {
+      configPath = getWebpackConfigPath(argv.webpackConfig, cwd);
+    } else {
+      configPath = resolve(__dirname, './prod.webpack.config.js');
+    }
+    processArgs.push(`node_modules/.bin/webpack -c ${configPath}`);
+    process.env.NODE_ENV = 'production';
+    spawn('node', processArgs, {
+      stdio: [process.stdout, process.stdout, process.stdout],
+      cwd,
+      shell: true,
+    });
+  } catch (error) {
+    logError(error);
+    process.exit(1);
+  }
+}
+
+module.exports = buildScript;

package/src/scripts/common.js

@@ -1,7 +1,48 @@
 const chalk = require('chalk');
+const { resolve } = require('path');
+const { statSync } = require('fs');
 
 function logError(message) {
   console.log(chalk.blue('[fec]') + chalk.red(' ERROR: ') + message);
 }
 
+function validateFECConfig(cwd) {
+  const configPath = resolve(cwd, './fec.config.js');
+  try {
+    statSync(configPath);
+  } catch (error) {
+    logError(`Unable to locate "fec.config.js" at ${configPath}`);
+    throw 'fec.config.js validation failed, file does not exist';
+  }
+
+  const config = require(configPath);
+  if (!config.appUrl) {
+    logError('Missing config "appUrl" in fec.config.js');
+    throw 'fec.config.js validation failed, missing "appUrl" config';
+  }
+  process.env.FEC_CONFIG_PATH = configPath;
+}
+
+function getWebpackConfigPath(path, cwd) {
+  let configPath;
+  try {
+    configPath = resolve(cwd, path);
+    statSync(configPath);
+    let config = require(configPath);
+    if (typeof config === 'function') {
+      config = config(process.env);
+    }
+    return configPath;
+  } catch (error) {
+    if (configPath) {
+      logError(`Unable to open webpack config at: "${configPath}"`);
+    } else {
+      logError(error);
+      throw 'FEC binary failed';
+    }
+  }
+}
+
 module.exports.logError = logError;
+module.exports.validateFECConfig = validateFECConfig;
+module.exports.getWebpackConfigPath = getWebpackConfigPath;

package/src/scripts/dev-script.js

@@ -1,9 +1,8 @@
 /* eslint-disable no-console */
 const inquirer = require('inquirer');
 const { resolve } = require('path');
-const { statSync } = require('fs');
 const { spawn } = require('child_process');
-const { logError } = require('./common');
+const { validateFECConfig, getWebpackConfigPath } = require('./common');
 
 async function setEnv(cwd) {
   return inquirer
@@ -29,43 +28,6 @@ async function setEnv(cwd) {
     });
 }
 
-function getWebpackConfigPath(path, cwd) {
-  let configPath;
-  try {
-    configPath = resolve(cwd, path);
-    statSync(configPath);
-    let config = require(configPath);
-    if (typeof config === 'function') {
-      config = config(process.env);
-    }
-    return configPath;
-  } catch (error) {
-    if (configPath) {
-      logError(`Unable to open webpack config at: "${configPath}"`);
-    } else {
-      logError(error);
-      throw 'FEC binary failed';
-    }
-  }
-}
-
-function validateFECConfig(cwd) {
-  const configPath = resolve(cwd, './fec.config.js');
-  try {
-    statSync(configPath);
-  } catch (error) {
-    logError(`Unable to locate "fec.config.js" at ${configPath}`);
-    throw 'fec.config.js validation failed, file does not exist';
-  }
-
-  const config = require(configPath);
-  if (!config.appUrl) {
-    logError('Missing config "appUrl" in fec.config.js');
-    throw 'fec.config.js validation failed, missing "appUrl" config';
-  }
-  process.env.FEC_CONFIG_PATH = configPath;
-}
-
 async function devScript(argv, cwd) {
   try {
     validateFECConfig(cwd);