fix: remove node-args, fix tests, remove stale helpers

Author: anshumanv

packages/webpack-cli/bin/cli.js

@@ -3,7 +3,6 @@
 'use strict';
 require('v8-compile-cache');
 const importLocal = require('import-local');
-const parseNodeArgs = require('../lib/utils/parse-node-args');
 const runCLI = require('../lib/bootstrap');
 
 // Prefer the local installation of webpack-cli
@@ -14,8 +13,4 @@ process.title = 'webpack';
 
 const [, , ...rawArgs] = process.argv;
 
-// figure out how to inject node args at runtime
-// eslint-disable-next-line no-unused-vars
-const { cliArgs, nodeArgs } = parseNodeArgs(rawArgs);
-
-runCLI(cliArgs);
+runCLI(rawArgs);

packages/webpack-cli/lib/utils/parse-node-args.js

@@ -2,78 +2,37 @@
 const { stat } = require('fs');
 const { resolve } = require('path');
 const { run } = require('../utils/test-utils');
-const parseNodeArgs = require('../../packages/webpack-cli/lib/utils/parse-node-args');
 
-describe.skip('node flags', () => {
-    it('parseNodeArgs helper must work correctly', () => {
-        [
-            {
-                rawArgs: ['--foo', '--bar', '--baz=quux'],
-                expectedCliArgs: ['--foo', '--bar', '--baz=quux'],
-                expectedNodeArgs: [],
-            },
-            {
-                rawArgs: ['--foo', '--bar', '--baz=quux', '--node-args', '--name1=value1', '--node-args', '--name2 value2'],
-                expectedCliArgs: ['--foo', '--bar', '--baz=quux'],
-                expectedNodeArgs: ['--name1=value1', '--name2', 'value2'],
-            },
-            {
-                rawArgs: [
-                    '--node-args',
-                    '--name1=value1',
-                    '--node-args',
-                    '--name2="value2"',
-                    '--node-args',
-                    '--name3 value3',
-                    '--node-args',
-                    '-k v',
-                ],
-                expectedCliArgs: [],
-                expectedNodeArgs: ['--name1=value1', '--name2="value2"', '--name3', 'value3', '-k', 'v'],
-            },
-        ].map(({ rawArgs, expectedNodeArgs, expectedCliArgs }) => {
-            const { nodeArgs, cliArgs } = parseNodeArgs(rawArgs);
-            expect(nodeArgs).toEqual(expectedNodeArgs);
-            expect(cliArgs).toEqual(expectedCliArgs);
-        });
-    });
-
-    it('is able to pass the options flags to node js', (done) => {
-        const { stdout } = run(
-            __dirname,
-            [
-                '--node-args',
-                `--require=${resolve(__dirname, 'bootstrap.js')}`,
-                '--node-args',
-                `-r ${resolve(__dirname, 'bootstrap2.js')}`,
-                '--output',
-                './bin/[name].bundle.js',
-            ],
-            false,
-        );
+describe('node flags', () => {
+    it('is able to pass the options flags to node js', async (done) => {
+        const { stdout, stderr } = await run(__dirname, ['--output', './bin/[name].bundle.js'], false, [
+            `--require=${resolve(__dirname, 'bootstrap.js')}`,
+            `--require=${resolve(__dirname, 'bootstrap2.js')}`,
+        ]);
         expect(stdout).toContain('---from bootstrap.js---');
         expect(stdout).toContain('---from bootstrap2.js---');
+        expect(stderr).toBeFalsy();
         stat(resolve(__dirname, './bin/main.bundle.js'), (err, stats) => {
             expect(err).toBe(null);
             expect(stats.isFile()).toBe(true);
             done();
         });
     });
 
-    it('throws an error on supplying unknown flags', () => {
-        const { stderr } = run(__dirname, ['--node-args', '--unknown']);
+    it('throws an error on supplying unknown flags', async () => {
+        const { stderr } = await run(__dirname, [], false, ['--unknown']);
         expect(stderr).toContain('bad option');
     });
 
-    it('throws an error if no values were supplied with --max-old-space-size', () => {
-        const { stderr, stdout } = run(__dirname, ['--node-args', '--max-old-space-size']);
+    it('throws an error if no values were supplied with --max-old-space-size', async () => {
+        const { stderr, stdout } = await run(__dirname, [], false, ['--max-old-space-size']);
         expect(stderr).toContain('missing value for flag --max-old-space-size');
         expect(stdout).toBeFalsy();
     });
 
-    it('throws an error if an illegal value was supplied with --max-old-space-size', () => {
-        const { stderr, stdout } = run(__dirname, ['--node-args', '--max-old-space-size=1024a']);
-        expect(stderr).toContain('illegal value for flag --max-old-space-size');
+    it('throws an error if an illegal value was supplied with --max-old-space-size', async () => {
+        const { stderr, stdout } = await run(__dirname, [], true, ['--max_old_space_size=1024a']);
+        expect(stderr).toContain('Error: illegal value for flag --max_old_space_size=1024a of type size_t');
         expect(stdout).toBeFalsy();
     });
 });

test/node/node.test.js

@@ -2,7 +2,7 @@
 const path = require('path');
 const fs = require('fs');
 const execa = require('execa');
-const { sync: spawnSync } = execa;
+const { sync: spawnSync, node: execaNode } = execa;
 const { Writable } = require('readable-stream');
 const concat = require('concat-stream');
 
@@ -15,16 +15,18 @@ const ENABLE_LOG_COMPILATION = process.env.ENABLE_PIPE || false;
  * @param {String} testCase The path to folder that contains the webpack.config.js
  * @param {Array} args Array of arguments to pass to webpack
  * @param {Boolean} setOutput Boolean that decides if a default output path will be set or not
- * @returns {Object} The webpack output
+ * @returns {Object} The webpack output or Promise when nodeOptions are present
  */
-function run(testCase, args = [], setOutput = true) {
+function run(testCase, args = [], setOutput = true, nodeArgs = []) {
     const cwd = path.resolve(testCase);
 
     const outputPath = path.resolve(testCase, 'bin');
+    const processExecutor = nodeArgs.length ? execaNode : spawnSync;
     const argsWithOutput = setOutput ? args.concat('--output', outputPath) : args;
-    const result = spawnSync(WEBPACK_PATH, argsWithOutput, {
+    const result = processExecutor(WEBPACK_PATH, argsWithOutput, {
         cwd,
         reject: false,
+        nodeOptions: nodeArgs,
         stdio: ENABLE_LOG_COMPILATION ? 'inherit' : 'pipe',
     });