Merge pull request #50 from webpack-contrib/lint

Lint

Author: TrySound

.eslintignore

@@ -0,0 +1,3 @@
+test/fixtures
+test/expected
+createInlineWorker.js

createInlineWorker.js

@@ -2,22 +2,22 @@
 
 var URL = window.URL || window.webkitURL;
 module.exports = function(content, url) {
-	try {
-		try {
-			var blob;
-			try { // BlobBuilder = Deprecated, but widely implemented
-				var BlobBuilder = window.BlobBuilder || window.WebKitBlobBuilder || window.MozBlobBuilder || window.MSBlobBuilder;
-				blob = new BlobBuilder();
-				blob.append(content);
-				blob = blob.getBlob();
-			} catch(e) { // The proposed API
-				blob = new Blob([content]);
-			}
-			return new Worker(URL.createObjectURL(blob));
-		} catch(e) {
-			return new Worker('data:application/javascript,' + encodeURIComponent(content));
-		}
-	} catch(e) {
-		return new Worker(url);
-	}
-}
+  try {
+    try {
+      var blob;
+      try { // BlobBuilder = Deprecated, but widely implemented
+        var BlobBuilder = window.BlobBuilder || window.WebKitBlobBuilder || window.MozBlobBuilder || window.MSBlobBuilder;
+        blob = new BlobBuilder();
+        blob.append(content);
+        blob = blob.getBlob();
+      } catch(e) { // The proposed API
+        blob = new Blob([content]);
+      }
+      return new Worker(URL.createObjectURL(blob));
+    } catch(e) {
+      return new Worker('data:application/javascript,' + encodeURIComponent(content));
+    }
+  } catch(e) {
+    return new Worker(url);
+  }
+}

index.js

@@ -1,56 +1,60 @@
-var WebWorkerTemplatePlugin = require("webpack/lib/webworker/WebWorkerTemplatePlugin");
-var SingleEntryPlugin = require("webpack/lib/SingleEntryPlugin");
-var path = require("path");
+'use strict';
 
-var loaderUtils = require("loader-utils");
-module.exports = function() {};
-module.exports.pitch = function(request) {
-	if(!this.webpack) throw new Error("Only usable with webpack");
-	this.cacheable(false);
-	var callback = this.async();
-	var query = loaderUtils.parseQuery(this.query);
-	var filename = loaderUtils.interpolateName(this, query.name || "[hash].worker.js", {
-		context: query.context || this.options.context,
-		regExp: query.regExp
-	});
-	var outputOptions = {
-		filename: filename,
-		chunkFilename: "[id]." + filename,
-		namedChunkFilename: null
-	};
-	if(this.options && this.options.worker && this.options.worker.output) {
-		for(var name in this.options.worker.output) {
-			outputOptions[name] = this.options.worker.output[name];
-		}
-	}
-	var workerCompiler = this._compilation.createChildCompiler("worker", outputOptions);
-	workerCompiler.apply(new WebWorkerTemplatePlugin(outputOptions));
-	workerCompiler.apply(new SingleEntryPlugin(this.context, "!!" + request, "main"));
-	if(this.options && this.options.worker && this.options.worker.plugins) {
-		this.options.worker.plugins.forEach(function(plugin) {
-			workerCompiler.apply(plugin);
-		});
-	}
-	var subCache = "subcache " + __dirname + " " + request;
-	workerCompiler.plugin("compilation", function(compilation) {
-		if(compilation.cache) {
-			if(!compilation.cache[subCache])
-				compilation.cache[subCache] = {};
-			compilation.cache = compilation.cache[subCache];
-		}
-	});
-	workerCompiler.runAsChild(function(err, entries, compilation) {
-		if(err) return callback(err);
-		if (entries[0]) {
-			var workerFile = entries[0].files[0];
-			var constructor = "new Worker(__webpack_public_path__ + " + JSON.stringify(workerFile) + ")";
-			if(query.inline) {
-				constructor = "require(" + JSON.stringify("!!" + path.join(__dirname, "createInlineWorker.js")) + ")(" +
-					JSON.stringify(compilation.assets[workerFile].source()) + ", __webpack_public_path__ + " + JSON.stringify(workerFile) + ")";
-			}
-			return callback(null, "module.exports = function() {\n\treturn " + constructor + ";\n};");
-		} else {
-			return callback(null, null);
-		}
-	});
+const path = require('path');
+const WebWorkerTemplatePlugin = require('webpack/lib/webworker/WebWorkerTemplatePlugin');
+const SingleEntryPlugin = require('webpack/lib/SingleEntryPlugin');
+const loaderUtils = require('loader-utils');
+
+module.exports = function workerLoader() {};
+
+module.exports.pitch = function pitch(request) {
+  if (!this.webpack) throw new Error('Only usable with webpack');
+  this.cacheable(false);
+  const callback = this.async();
+  const query = loaderUtils.parseQuery(this.query);
+  const filename = loaderUtils.interpolateName(this, query.name || '[hash].worker.js', {
+    context: query.context || this.options.context,
+    regExp: query.regExp,
+  });
+  const outputOptions = {
+    filename,
+    chunkFilename: `[id].${filename}`,
+    namedChunkFilename: null,
+  };
+  if (this.options && this.options.worker && this.options.worker.output) {
+    Object.keys(this.options.worker.output).forEach((name) => {
+      outputOptions[name] = this.options.worker.output[name];
+    });
+  }
+  const workerCompiler = this._compilation.createChildCompiler('worker', outputOptions);
+  workerCompiler.apply(new WebWorkerTemplatePlugin(outputOptions));
+  workerCompiler.apply(new SingleEntryPlugin(this.context, `!!${request}`, 'main'));
+  if (this.options && this.options.worker && this.options.worker.plugins) {
+    this.options.worker.plugins.forEach(plugin => workerCompiler.apply(plugin));
+  }
+  const subCache = `subcache ${__dirname} ${request}`;
+  workerCompiler.plugin('compilation', (compilation) => {
+    if (compilation.cache) {
+      if (!compilation.cache[subCache]) {
+        compilation.cache[subCache] = {};
+      }
+      compilation.cache = compilation.cache[subCache];
+    }
+  });
+  workerCompiler.runAsChild((err, entries, compilation) => {
+    if (err) return callback(err);
+    if (entries[0]) {
+      const workerFile = entries[0].files[0];
+      let constructor = `new Worker(__webpack_public_path__ + ${JSON.stringify(workerFile)})`;
+      if (query.inline) {
+        constructor = `require(${JSON.stringify(`!!${path.join(__dirname, 'createInlineWorker.js')}`)})(${
+          JSON.stringify(compilation.assets[workerFile].source())
+        }, __webpack_public_path__ + ${
+          JSON.stringify(workerFile)
+        })`;
+      }
+      return callback(null, `module.exports = function() {\n\treturn ${constructor};\n};`);
+    }
+    return callback(null, null);
+  });
 };

package.json

@@ -4,7 +4,28 @@
   "author": "Tobias Koppers @sokra",
   "description": "worker loader module for webpack",
   "scripts": {
-    "test": "mocha"
+    "test": "mocha",
+    "posttest": "eslint ."
+  },
+  "eslintConfig": {
+    "extends": "webpack",
+    "rules": {
+      "linebreak-style": 0,
+      "comma-dangle": [
+        "error",
+        {
+          "arrays": "always-multiline",
+          "objects": "always-multiline",
+          "imports": "always-multiline",
+          "exports": "always-multiline",
+          "functions": "never"
+        }
+      ],
+      "no-underscore-dangle": 0,
+      "no-param-reassign": 0,
+      "prefer-destructuring": 0,
+      "strict": 0
+    }
   },
   "peerDependencies": {
     "webpack": ">=0.9 <2 || ^2.1.0-beta || ^2.2.0"
@@ -14,6 +35,9 @@
   },
   "devDependencies": {
     "del": "^2.2.2",
+    "eslint": "^3.16.0",
+    "eslint-config-webpack": "^1.0.0",
+    "eslint-plugin-import": "^2.2.0",
     "mocha": "^3.2.0",
     "webpack": "^2.2.1"
   },

test/fixtures/inline/entry.js

@@ -1 +1 @@
-import Worker from '../../../index.js?inline!./worker.js';
+const Worker = require('../../../index.js?inline!./worker.js');

test/fixtures/name/entry.js

@@ -1 +1 @@
-import Worker from '../../../index.js?name=namedWorker.js!./worker.js';
+const Worker = require('../../../index.js?name=namedWorker.js!./worker.js');

test/fixtures/worker/entry.js

@@ -1 +1 @@
-import Worker from '../../../index.js!./worker.js';
+const Worker = require('../../../index.js!./worker.js');

test/index.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const assert = require('assert');
 const fs = require('fs');
 const del = require('del');
@@ -7,55 +9,59 @@ process.chdir(__dirname);
 
 const readFile = file => fs.readFileSync(file, 'utf-8');
 
-const makeBundle = name => {
-	return del(`expected/${name}`).then(() => {
-		const bundle = webpack({
-			entry: `./fixtures/${name}/entry.js`,
-			output: {
-				path: `expected/${name}`,
-				filename: 'bundle.js'
-			}
-		});
-		return new Promise((resolve, reject) => {
-			bundle.run((err, stats) => err ? reject(err) : resolve(stats))
-		});
-	});
-};
+const makeBundle = name => del(`expected/${name}`).then(() => {
+  const bundle = webpack({
+    entry: `./fixtures/${name}/entry.js`,
+    output: {
+      path: `expected/${name}`,
+      filename: 'bundle.js',
+    },
+  });
+  return new Promise((resolve, reject) => {
+    bundle.run((err, stats) => {
+      if (err) {
+        reject(err);
+      } else {
+        resolve(stats);
+      }
+    });
+  });
+});
 
 describe('worker-loader', () => {
-	it('should create chunk with worker', () => {
-		return makeBundle('worker').then(stats => {
-			const workerFile = stats.toJson('minimal').children
-				.map(item => item.chunks)
-				.reduce((acc, item) => acc.concat(item), [])
-				.map(item => item.files)
-				.map(item => 'expected/worker/' + item)[0];
-			assert(workerFile);
-			assert.notEqual(readFile(workerFile).indexOf('// worker test mark'), -1);
-		});
-	});
+  it('should create chunk with worker', () =>
+    makeBundle('worker').then((stats) => {
+      const workerFile = stats.toJson('minimal').children
+        .map(item => item.chunks)
+        .reduce((acc, item) => acc.concat(item), [])
+        .map(item => item.files)
+        .map(item => `expected/worker/${item}`)[0];
+      assert(workerFile);
+      assert.notEqual(readFile(workerFile).indexOf('// worker test mark'), -1);
+    })
+  );
 
-	it('should create chunk with specified name', () => {
-		return makeBundle('name').then(stats => {
-			const workerFile = 'expected/name/namedWorker.js'
-			const receivedWorkerFile = stats.toJson('minimal').children
-				.map(item => item.chunks)
-				.reduce((acc, item) => acc.concat(item), [])
-				.map(item => item.files)
-				.map(item => 'expected/name/' + item)[0];
-			assert.equal(receivedWorkerFile, workerFile);
-			assert.notEqual(readFile(workerFile).indexOf('// named worker test mark'), -1);
-		});
-	});
+  it('should create chunk with specified name', () =>
+    makeBundle('name').then((stats) => {
+      const workerFile = 'expected/name/namedWorker.js';
+      const receivedWorkerFile = stats.toJson('minimal').children
+        .map(item => item.chunks)
+        .reduce((acc, item) => acc.concat(item), [])
+        .map(item => item.files)
+        .map(item => `expected/name/${item}`)[0];
+      assert.equal(receivedWorkerFile, workerFile);
+      assert.notEqual(readFile(workerFile).indexOf('// named worker test mark'), -1);
+    })
+  );
 
-	it('should inline worker with inline option', () => {
-		return makeBundle('inline').then(stats => {
-			const bundleFile = stats.toJson('minimal').chunks
-				.map(item => item.files)
-				.reduce((acc, item) => acc.concat(item), [])
-				.map(item => 'expected/inline/' + item)[0];
-			assert(bundleFile);
-			assert.notEqual(readFile(bundleFile).indexOf('// inlined worker test mark'), -1);
-		});
-	});
+  it('should inline worker with inline option', () =>
+    makeBundle('inline').then((stats) => {
+      const bundleFile = stats.toJson('minimal').chunks
+        .map(item => item.files)
+        .reduce((acc, item) => acc.concat(item), [])
+        .map(item => `expected/inline/${item}`)[0];
+      assert(bundleFile);
+      assert.notEqual(readFile(bundleFile).indexOf('// inlined worker test mark'), -1);
+    })
+  );
 });