refactor: consistent write to fs (#371)

Author: evilebottnawi

lib/fs.js

@@ -24,26 +24,36 @@ module.exports = {
         }
 
         for (const assetPath of Object.keys(assets)) {
-          const asset = assets[assetPath];
-          const source = asset.source();
-          const [assetPathClean] = assetPath.split('?');
-          const isAbsolute = path.isAbsolute(assetPathClean);
-          const writePath = isAbsolute ? assetPathClean : path.join(outputPath, assetPathClean);
-          const relativePath = path.relative(process.cwd(), writePath);
-          const allowWrite = filter && typeof filter === 'function' ? filter(writePath) : true;
+          let targetFile = assetPath;
+
+          const queryStringIdx = targetFile.indexOf('?');
+
+          if (queryStringIdx >= 0) {
+            targetFile = targetFile.substr(0, queryStringIdx);
+          }
+
+          const targetPath = path.isAbsolute(targetFile) ? targetFile : path.join(outputPath, targetFile);
+          const allowWrite = filter && typeof filter === 'function' ? filter(targetPath) : true;
 
           if (allowWrite) {
-            let output = source;
+            const asset = assets[assetPath];
+            let content = asset.source();
 
-            mkdirp.sync(path.dirname(writePath));
+            if (!Buffer.isBuffer(content)) {
+              // TODO need remove in next major release
+              if (Array.isArray(content)) {
+                content = content.join('\n');
+              }
 
-            if (Array.isArray(source)) {
-              output = source.join('\n');
+              content = Buffer.from(content, 'utf8');
             }
 
+            mkdirp.sync(path.dirname(targetPath));
+
             try {
-              fs.writeFileSync(writePath, output, 'utf-8');
-              log.debug(colors.cyan(`Asset written to disk: ${relativePath}`));
+              fs.writeFileSync(targetPath, content, 'utf-8');
+
+              log.debug(colors.cyan(`Asset written to disk: ${path.relative(process.cwd(), targetPath)}`));
             } catch (e) {
               log.error(`Unable to write asset to disk:\n${e}`);
             }