Improve and Fix some tests

.eslintrc.js

@@ -1,3 +1,7 @@
 module.exports = {
   extends: [require.resolve('eslint-config-fusion')],
+  rules: {
+    'import/no-dynamic-require': 0,
+    'import/no-webpack-loader-syntax': 0,
+  }
 };

bin/cli.js

@@ -1,9 +1,11 @@
 #!/usr/bin/env node
 /* eslint-env node */
-require('./cli-runner').run(process.argv.slice(2).join(' ')).catch(e => {
-  // eslint-disable-next-line no-console
-  console.error(e.message);
-  if (e.yargs) e.yargs.showHelp();
-  // Rethrow so that there's a non-zero exit code
-  throw e;
-});
+require('./cli-runner')
+  .run(process.argv.slice(2).join(' '))
+  .catch(e => {
+    // eslint-disable-next-line no-console
+    console.error(e.message);
+    if (e.yargs) e.yargs.showHelp();
+    // Rethrow so that there's a non-zero exit code
+    throw e;
+  });

build/babel-plugins/babel-plugin-asseturl/index.js

@@ -35,8 +35,9 @@ function refsHandler(t, context, refs = []) {
     args[0].replaceWith(
       t.callExpression(t.identifier('require'), [
         t.stringLiteral(
-          `__SECRET_FILE_LOADER__?storeFile=true&storeFileTarget=node!${args[0]
-            .node.value}`
+          `__SECRET_FILE_LOADER__?storeFile=true&storeFileTarget=node!${
+            args[0].node.value
+          }`
         ),
       ])
     );

build/babel-plugins/babel-plugin-experimentation/test/get-expected.js

@@ -1,5 +1,6 @@
 /* eslint-env node */
 const stripIndent = require('strip-indent');
+
 const sharedExpectedContent = stripIndent(
   `
     import { chunkId as _chunkId } from 'fusion-core';

build/babel-plugins/babel-plugin-experimentation/test/transform.js

@@ -16,8 +16,8 @@ module.exports = function doTransform(inputString) {
         ],
         babelPluginSyntaxJsx,
       ],
-    }).code
-      .trim()
+    })
+      .code.trim()
       // Normalize quotes
       .replace(/"/g, "'")
   );

build/babel-plugins/babel-plugin-i18n/test/get-expected.js

@@ -1,6 +1,7 @@
 /* eslint-env node */
 const stripIndent = require('strip-indent');
 const sharedExpectedContent = require('./shared-expected-content.js');
+
 module.exports = function getExpected(inputString, includeShared = true) {
   const sharedContent = includeShared ? '\n' + sharedExpectedContent() : '';
   return (stripIndent(inputString).trim() + sharedContent).replace(/"/g, "'");

build/babel-plugins/babel-plugin-i18n/test/shared-expected-content.js

@@ -1,5 +1,6 @@
 /* eslint-env node */
 const stripIndent = require('strip-indent');
+
 module.exports = () =>
   stripIndent(
     `

build/babel-plugins/babel-plugin-i18n/test/transform.js

@@ -16,8 +16,8 @@ module.exports = function doTransform(inputString) {
         ],
         babelPluginSyntaxJsx,
       ],
-    }).code
-      .trim()
+    })
+      .code.trim()
       // Normalize quotes
       .replace(/"/g, "'")
   );

build/babel-plugins/babel-plugin-sw/test/transform.js

@@ -5,8 +5,8 @@ module.exports = function doTransform(inputString) {
   return (
     transform(inputString.trim(), {
       plugins: [[plugin]],
-    }).code
-      .trim()
+    })
+      .code.trim()
       // Normalize quotes
       .replace(/"/g, "'")
   );

build/babel-plugins/babel-plugin-utils/replace-import-declaration.js

@@ -1,6 +1,7 @@
 // @flow
 /* eslint-env node */
 const snakeCase = require('just-snake-case');
+
 module.exports = replaceImportDeclaration;
 
 /*

build/compiler.js

@@ -4,6 +4,7 @@ const path = require('path');
 
 const webpack = require('webpack');
 const ProgressBarPlugin = require('progress-bar-webpack-plugin');
+
 const progress = new ProgressBarPlugin();
 const WebpackChunkHash = require('webpack-chunk-hash');
 const webpackDevMiddleware = require('../lib/simple-webpack-dev-middleware');
@@ -87,12 +88,14 @@ function getConfig({target, env, dir, watch, cover}) {
   const destination = path.resolve(dir, `.fusion/dist/${env}/${side}`);
   const evergreen = false;
   const possibleESVersions = ['es5'];
-  const serverEntry = env === 'test'
-    ? serverTestEntry
-    : path.join(__dirname, `../entries/server-entry.js`);
-  const clientEntry = env === 'test'
-    ? browserTestEntry
-    : path.join(__dirname, `../entries/client-entry.js`);
+  const serverEntry =
+    env === 'test'
+      ? serverTestEntry
+      : path.join(__dirname, `../entries/server-entry.js`);
+  const clientEntry =
+    env === 'test'
+      ? browserTestEntry
+      : path.join(__dirname, `../entries/client-entry.js`);
   const entry = {
     node: serverEntry,
     web: clientEntry,
@@ -155,25 +158,27 @@ function getConfig({target, env, dir, watch, cover}) {
      * We only use it for generating nice stack traces
      */
     // TODO(#6): what about node v8 inspector?
-    devtool: target !== 'node' && env === 'production'
-      ? 'hidden-source-map'
-      : 'cheap-module-source-map',
+    devtool:
+      target !== 'node' && env === 'production'
+        ? 'hidden-source-map'
+        : 'cheap-module-source-map',
     output: {
       // For in-memory filesystem in webpack dev middleware, write files to root
       // Otherwise, write to appropriate location on disk
-      path: env === 'development' && watch && target === 'web'
-        ? '/'
-        : destination,
-      filename: env === 'production' && target === 'web'
-        ? `${name}-[name]-[chunkhash].js`
-        : `${name}-[name].js`,
+      path:
+        env === 'development' && watch && target === 'web' ? '/' : destination,
+      filename:
+        env === 'production' && target === 'web'
+          ? `${name}-[name]-[chunkhash].js`
+          : `${name}-[name].js`,
       libraryTarget: target === 'node' ? 'commonjs2' : 'var',
       // This is the recommended default.
       // See https://webpack.js.org/configuration/output/#output-sourcemapfilename
       sourceMapFilename: `[file].map`,
-      chunkFilename: env === 'production' && target === 'web'
-        ? '[id]-[chunkhash].js'
-        : evergreen ? 'evergreen-[id].js' : '[id].js',
+      chunkFilename:
+        env === 'production' && target === 'web'
+          ? '[id]-[chunkhash].js'
+          : evergreen ? 'evergreen-[id].js' : '[id].js',
       // We will set __webpack_public_path__ at runtime, so this should be set to undefined
       publicPath: void 0,
       // TODO(#7): Do we really need this? See lite config
@@ -215,8 +220,8 @@ function getConfig({target, env, dir, watch, cover}) {
         // Tape also requires __dirname, remove once we don't use tape anymore
         __dirname: env === 'test' && target === 'web' ? true : false,
         /**
-       * Tape requires `fs` to be defined
-       */
+         * Tape requires `fs` to be defined
+         */
         fs: env === 'test' && target === 'web' ? 'empty' : false,
       },
       node
@@ -279,15 +284,16 @@ function getConfig({target, env, dir, watch, cover}) {
                   [
                     require.resolve('./babel-preset.js'),
                     {
-                      targets: target === 'node'
-                        ? {
-                            node: 'current',
-                          }
-                        : {
-                            browsers: evergreen
-                              ? browserSupport.evergreen
-                              : browserSupport.conservative,
-                          },
+                      targets:
+                        target === 'node'
+                          ? {
+                              node: 'current',
+                            }
+                          : {
+                              browsers: evergreen
+                                ? browserSupport.evergreen
+                                : browserSupport.conservative,
+                            },
                     },
                   ],
                   ...(fusionConfig.babel && fusionConfig.babel.presets
@@ -345,13 +351,13 @@ function getConfig({target, env, dir, watch, cover}) {
           __ENV__: env,
         },
         target === 'node' &&
-        env === 'test' && {
-          __NODE_TEST_ENTRY__: serverTestEntry,
-        },
+          env === 'test' && {
+            __NODE_TEST_ENTRY__: serverTestEntry,
+          },
         target === 'web' &&
-        env === 'test' && {
-          __BROWSER_TEST_ENTRY__: browserTestEntry,
-        },
+          env === 'test' && {
+            __BROWSER_TEST_ENTRY__: browserTestEntry,
+          },
         alias
       ),
     },

build/dev-runtime.js

@@ -151,18 +151,21 @@ module.exports.DevelopmentRuntime = function({
     state.server = http.createServer((req, res) => {
       middleware(req, res, async () => {
         const childPort = await state.childPortP;
-        lifecycle.wait().then(function retry() {
-          const newUrl = getChildUrl(req.url, {
-            protocol: 'http',
-            hostname: 'localhost',
-            port: childPort,
-          });
-          const proxyReq = request(newUrl);
-          proxyReq.on('error', retry);
-          req.pipe(proxyReq).pipe(res);
-        }, error => {
-          renderError(res, error);
-        });
+        lifecycle.wait().then(
+          function retry() {
+            const newUrl = getChildUrl(req.url, {
+              protocol: 'http',
+              hostname: 'localhost',
+              port: childPort,
+            });
+            const proxyReq = request(newUrl);
+            proxyReq.on('error', retry);
+            req.pipe(proxyReq).pipe(res);
+          },
+          error => {
+            renderError(res, error);
+          }
+        );
       });
     });
     const listen = promisify(state.server.listen.bind(state.server));

build/spawn.js

@@ -1,5 +1,6 @@
 /* eslint-env node */
 const cp = require('child_process');
+
 module.exports = function spawn(commandString) {
   const [command, ...args] = commandString.split(' ');
   const child = cp.spawn(command, args, {stdio: 'inherit'});

commands/start.js

@@ -11,6 +11,11 @@ exports.builder = {
   //   default: false,
   //   describe: 'Debug application',
   // },
+  port: {
+    type: 'number',
+    describe:
+      'Port to start the server on. Defaults to process.env.PORT_HTTP || 3000',
+  },
   dir: {
     type: 'string',
     default: '.',
@@ -23,7 +28,7 @@ exports.builder = {
   },
 };
 
-exports.run = async function({dir = '.', environment}) {
+exports.run = async function({dir = '.', environment, port}) {
   const getEntry = env => {
     const entryPath = `.fusion/dist/${env}/server/server-main.js`;
     return path.resolve(dir, entryPath);
@@ -36,8 +41,7 @@ exports.run = async function({dir = '.', environment}) {
   if (env) {
     const entry = getEntry(env);
     const {start} = require(entry);
-
-    return start({port: process.env.PORT_HTTP || 3000}); // handle server bootstrap errors (e.g. port already in use)
+    return start({port: port || process.env.PORT_HTTP || 3000}); // handle server bootstrap errors (e.g. port already in use)
   } else {
     throw new Error(`App can't start. JS isn't compiled`); // handle compilation errors
   }

entries/client-entry.js

@@ -4,6 +4,7 @@
 import 'core-js/es6';
 import 'core-js/es7';
 
+// eslint-disable-next-line import/no-unresolved, import/no-extraneous-dependencies
 import initialize from '__FRAMEWORK_SHARED_ENTRY__';
 
 /*

entries/polyfills/promise.js

@@ -4,7 +4,7 @@
 
 /* eslint-env browser */
 /* global setImmediate, setTimeout */
-
+// eslint-disable-next-line import/no-mutable-exports
 var Promise = function(executor) {
   if (!(this instanceof Promise))
     throw new Error('Promise must be called with `new`');
@@ -20,9 +20,8 @@ var Promise = function(executor) {
     resolvers: resolvers,
     rejectors: rejectors,
   });
-  var callAsync = typeof setImmediate === 'function'
-    ? setImmediate
-    : setTimeout;
+  var callAsync =
+    typeof setImmediate === 'function' ? setImmediate : setTimeout;
   function handler(list, shouldAbsorb) {
     return function execute(value) {
       var then;

entries/server-entry.js

@@ -1,5 +1,6 @@
 /* eslint-env node */
 import http from 'http';
+// eslint-disable-next-line import/no-unresolved, import/no-extraneous-dependencies
 import main from '__FRAMEWORK_SHARED_ENTRY__';
 import CompilationMetaDataFactory from '../plugins/compilation-metadata-plugin';
 import AssetsFactory from '../plugins/assets-plugin';

lib/simple-webpack-dev-middleware/lib/Shared.js

@@ -3,6 +3,7 @@
 const parseRange = require('range-parser');
 const pathIsAbsolute = require('path-is-absolute');
 const MemoryFileSystem = require('memory-fs');
+
 const HASH_REGEXP = /[0-9a-f]{10,}/;
 const EventEmitter = require('events');