@redhat-cloud-services/frontend-components-config 4.6.35 → 4.6.37

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@redhat-cloud-services/frontend-components-config",
-    "version": "4.6.35",
+    "version": "4.6.37",
     "description": "Config plugins and settings for RedHat Cloud Services project.",
     "main": "index.js",
     "bin": {
@@ -21,7 +21,7 @@
     "homepage": "https://github.com/RedHatInsights/frontend-components/tree/master/packages/config#readme",
     "dependencies": {
         "@pmmmwh/react-refresh-webpack-plugin": "^0.5.8",
-        "@redhat-cloud-services/frontend-components-config-utilities": "^1.5.24",
+        "@redhat-cloud-services/frontend-components-config-utilities": "^1.5.26",
         "assert": "^2.0.0",
         "axios": "^0.27.2",
         "babel-loader": "^8.2.5",

package/src/config.js

@@ -44,7 +44,7 @@ module.exports = ({
   _unstableHotReload = false,
   resolve = {},
 } = {}) => {
-  const filenameMask = `js/[name]${!_unstableHotReload && useFileHash ? `.${Date.now()}.[fullhash]` : ''}.js`;
+  const filenameMask = `js/[name].${!_unstableHotReload && useFileHash ? `[fullhash].` : ''}js`;
   if (betaEnv) {
     env = `${betaEnv}-beta`;
     console.warn('betaEnv is deprecated in favor of env');

package/src/config.test.js

@@ -30,10 +30,10 @@ describe('should create dummy config with no options', () => {
 
   test('output', () => {
     expect(output).toEqual({
-      filename: expect.stringMatching(/js\/\[name\]\.\d+\.\[fullhash\]\.js/),
+      filename: expect.stringMatching(/js\/\[name\]\.\[fullhash\]\.js/),
       path: '/dist',
       publicPath: undefined,
-      chunkFilename: expect.stringMatching(/js\/\[name\]\.\d+\.\[fullhash\]\.js/),
+      chunkFilename: expect.stringMatching(/js\/\[name\]\.\[fullhash\]\.js/),
     });
   });
 
@@ -120,3 +120,8 @@ test('https', () => {
   const { devServer } = configBuilder({ https: true });
   expect(devServer.https).toBe(true);
 });
+
+test('noFileHash', () => {
+  const { output } = configBuilder({ useFileHash: false });
+  expect(output.filename).toBe('js/[name].js');
+});

package/src/scripts/build-script.js

@@ -4,16 +4,14 @@ const { spawn } = require('child_process');
 
 function buildScript(argv, cwd) {
   validateFECConfig(cwd);
-  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';
-  const subprocess = spawn('node', processArgs, {
+  const subprocess = spawn(`npm exec -- webpack -c ${configPath}`, [], {
     stdio: [process.stdout, process.stdout, process.stdout],
     cwd,
     shell: true,

package/src/scripts/dev-script.js

@@ -33,7 +33,6 @@ async function devScript(argv, cwd) {
     validateFECConfig(cwd);
 
     const fecConfig = require(process.env.FEC_CONFIG_PATH);
-    const processArgs = [];
     let configPath;
     if (typeof argv.webpackConfig !== 'undefined') {
       configPath = getWebpackConfigPath(argv.webpackConfig, cwd);
@@ -41,7 +40,7 @@ async function devScript(argv, cwd) {
       configPath = resolve(__dirname, './dev.webpack.config.js');
     }
     await setEnv(cwd);
-    spawn(`npm exec -- webpack serve -c ${configPath}`, processArgs, {
+    spawn(`npm exec -- webpack serve -c ${configPath}`, [], {
       stdio: [process.stdout, process.stdout, process.stdout],
       cwd,
       shell: true,