[chore] prettier format

electrode-io · Feb 9, 2018 · 3a2cd39 · 3a2cd39
1 parent 689af78
commit 3a2cd39
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 28 deletions.
diff --git a/packages/electrode-react-webapp/lib/default-handlers.js b/packages/electrode-react-webapp/lib/default-handlers.js
@@ -67,12 +67,8 @@ module.exports = function setup(options) {
         : Array.prototype.concat(data.cssChunk);
 
       const cssLink = css.reduce((acc, file) => {
-        acc += `<link rel="stylesheet" href="${
-          WEBPACK_DEV
-            ? file
-            : prodBundleBase + file.name
-        }" />`;
-        return acc;
+        file = WEBPACK_DEV ? file : prodBundleBase + file.name;
+        return `${acc}<link rel="stylesheet" href="${file}" />`;
       }, "");
 
       const htmlScripts = htmlifyScripts(

diff --git a/packages/electrode-react-webapp/lib/react-webapp.js b/packages/electrode-react-webapp/lib/react-webapp.js
@@ -107,23 +107,18 @@ function makeRouteHandler(routeOptions, userContent) {
 
       let devCSSBundle;
       if (chunkNames.css) {
-        const cssChunks = Array.isArray(chunkNames.css)
-          ? chunkNames.css
-          : [ chunkNames.css ];
-        devCSSBundle = _.map(
-          cssChunks,
-          (chunkName) => `${devBundleBase}${chunkName}.style.css`
-        );
-      } else devCSSBundle = [`${devBundleBase}style.css`];
+        const cssChunks = Array.isArray(chunkNames.css) ? chunkNames.css : [chunkNames.css];
+        devCSSBundle = _.map(cssChunks, chunkName => `${devBundleBase}${chunkName}.style.css`);
+      } else {
+        devCSSBundle = [`${devBundleBase}style.css`];
+      }
 
       const devJSBundle = chunkNames.js
         ? `${devBundleBase}${chunkNames.js}.bundle.dev.js`
         : `${devBundleBase}bundle.dev.js`;
       const jsChunk = _.find(assets.js, asset => _.includes(asset.chunkNames, chunkNames.js));
-      const cssChunk = _.filter(assets.css,
-        asset => _.some(asset.chunkNames,
-          assetChunkName => _.includes(chunkNames.css, assetChunkName)
-        )
+      const cssChunk = _.filter(assets.css, asset =>
+        _.some(asset.chunkNames, assetChunkName => _.includes(chunkNames.css, assetChunkName))
       );
       const scriptNonce = cspScriptNonce ? ` nonce="${cspScriptNonce}"` : "";
       const styleNonce = cspStyleNonce ? ` nonce="${cspStyleNonce}"` : "";
@@ -207,8 +202,9 @@ const setupOptions = options => {
   const pluginOptions = _.defaultsDeep({}, options, pluginOptionsDefaults);
   const chunkSelector = resolveChunkSelector(pluginOptions);
   const devProtocol = process.env.WEBPACK_DEV_HTTPS ? "https://" : "http://";
-  const devBundleBase = `${devProtocol}${pluginOptions.devServer.host}:${pluginOptions.devServer
-    .port}/js/`;
+  const devBundleBase = `${devProtocol}${pluginOptions.devServer.host}:${
+    pluginOptions.devServer.port
+  }/js/`;
   const statsPath = getStatsPath(pluginOptions.stats, pluginOptions.buildArtifacts);
 
   const assets = loadAssetsFromStats(statsPath);

diff --git a/packages/electrode-react-webapp/test/data/chunk-selector.js b/packages/electrode-react-webapp/test/data/chunk-selector.js
@@ -13,10 +13,7 @@ const DEFAULT_BUNDLE = {
   js: "home"
 };
 const MULTI_BUNDLE = {
-  css: [
-    "foo",
-    "bar"
-  ],
+  css: ["foo", "bar"],
   js: "home"
 };
 

diff --git a/packages/electrode-react-webapp/test/spec/hapi.index.spec.js b/packages/electrode-react-webapp/test/spec/hapi.index.spec.js
@@ -263,9 +263,9 @@ describe("hapi electrode-react-webapp", () => {
         })
         .then(res => {
           expect(res.statusCode).to.equal(200);
-            expect(res.result).to.contain("http://127.0.0.1:2992/js/foo.style.css");
-            expect(res.result).to.contain("http://127.0.0.1:2992/js/bar.style.css");
-            expect(res.result).to.contain("http://127.0.0.1:2992/js/home.bundle.dev.js");
+          expect(res.result).to.contain("http://127.0.0.1:2992/js/foo.style.css");
+          expect(res.result).to.contain("http://127.0.0.1:2992/js/bar.style.css");
+          expect(res.result).to.contain("http://127.0.0.1:2992/js/home.bundle.dev.js");
           stopServer(server);
         })
         .catch(err => {
@@ -872,7 +872,7 @@ describe("hapi electrode-react-webapp", () => {
         })
         .then(res => {
           expect(res.statusCode).to.equal(404);
-          expect(res.result).to.contain("<div class=\"js-content\">html content</div>");
+          expect(res.result).to.contain('<div class="js-content">html content</div>');
           stopServer(server);
         })
         .catch(err => {