install deps of test helpers on travis

.travis.yml

@@ -13,6 +13,9 @@ install:
   - (cd upstream/webpack2; npm install)
   - (cd upstream/webpack3; npm install)
   - (cd upstream/webpack4; npm install)
+  - (cd packages/@happypack/example-utils; npm install --ignore-scripts)
+  - (cd packages/@happypack/test-utils; npm install --ignore-scripts)
+  - (cd packages/@happypack/webpack-config-composer; npm install --ignore-scripts)
 
 script:
   - npm run lint

lib/__tests__/ErrorSerializer.test.js

@@ -1,4 +1,4 @@
-var assert = require('happypack-test-utils').assert;
+var assert = require('@happypack/test-utils').assert;
 var ErrorSerializer = require('../ErrorSerializer');
 var serialize = ErrorSerializer.serialize;
 var deserialize = ErrorSerializer.deserialize;

lib/__tests__/HappyPlugin.integration.test.js

@@ -1,11 +1,11 @@
 var HappyPlugin = require('../HappyPlugin');
 var path = require('path');
 var fs = require('fs');
-var assert = require('happypack-test-utils').assert;
+var assert = require('@happypack/test-utils').assert;
 var webpack = require('webpack');
-var TestUtils = require('happypack-test-utils');
+var TestUtils = require('@happypack/test-utils');
 var multiline = require('multiline-slash');
-var composeWebpackConfig = require('happypack-test-utils').composeWebpackConfig;
+var composeWebpackConfig = require('@happypack/test-utils').composeWebpackConfig;
 
 describe('[Integration] HappyPlugin', function() {
   var testSuite = TestUtils.createIntegrationSuite(this);

lib/__tests__/HappyPlugin.test.js

@@ -1,5 +1,5 @@
 var Subject = require('../HappyPlugin');
-var HappyTestUtils = require('happypack-test-utils');
+var HappyTestUtils = require('@happypack/test-utils');
 var assert = HappyTestUtils.assert;
 
 describe('HappyPlugin', function() {

lib/__tests__/HappyThread.test.js

@@ -1,5 +1,5 @@
 var Subject = require("../HappyThread");
-var HappyTestUtils = require('happypack-test-utils');
+var HappyTestUtils = require('@happypack/test-utils');
 var assert = HappyTestUtils.assert;
 
 describe("HappyThread", function() {

lib/__tests__/HappyThreadPool.test.js

@@ -1,6 +1,6 @@
 var Subject = require("../HappyThreadPool");
-var HappyTestUtils = require("happypack-test-utils");
-var assert = require('happypack-test-utils').assert;
+var HappyTestUtils = require("@happypack/test-utils");
+var assert = require('@happypack/test-utils').assert;
 
 describe("HappyThreadPool", function() {
   HappyTestUtils.createIntegrationSuite(this);

lib/__tests__/HappyWorkerChannel.test.js

@@ -1,6 +1,6 @@
-var assert = require('happypack-test-utils').assert;
+var assert = require('@happypack/test-utils').assert;
 var Channel = require('../HappyWorkerChannel');
-var HappyTestUtils = require('happypack-test-utils');
+var HappyTestUtils = require('@happypack/test-utils');
 var fixturePath = HappyTestUtils.fixturePath;
 
 function testHappyWorkerChannel(config) {

lib/__tests__/JSONSerializer.test.js

@@ -1,4 +1,4 @@
-var assert = require('happypack-test-utils').assert;
+var assert = require('@happypack/test-utils').assert;
 var Subject = require('../JSONSerializer');
 var serialize = Subject.serialize;
 var deserialize = Subject.deserialize;

lib/__tests__/OptionParser.test.js

@@ -1,4 +1,4 @@
-var assert = require('happypack-test-utils').assert;
+var assert = require('@happypack/test-utils').assert;
 var Subject = require('../OptionParser');
 
 describe("OptionParser", function() {

lib/__tests__/WebpackUtils.test.js

@@ -1,9 +1,9 @@
-var assert = require('happypack-test-utils').assert;
+var assert = require('@happypack/test-utils').assert;
 var webpack = require('webpack');
 var Subject = require('../WebpackUtils');
-var createIntegrationSuite = require('happypack-test-utils').createIntegrationSuite;
-var composeWebpackConfig = require('happypack-test-utils').composeWebpackConfig;
-var getModuleLoaders = require('happypack-test-utils').getModuleLoaders;
+var createIntegrationSuite = require('@happypack/test-utils').createIntegrationSuite;
+var composeWebpackConfig = require('@happypack/test-utils').composeWebpackConfig;
+var getModuleLoaders = require('@happypack/test-utils').getModuleLoaders;
 
 describe('WebpackUtils', function() {
   describe('.resolveLoaders', function() {

lib/__tests__/applyLoaders.test.js

@@ -1,9 +1,9 @@
 var Subject = require("../applyLoaders");
-var assert = require('happypack-test-utils').assert;
+var assert = require('@happypack/test-utils').assert;
 var path = require('path');
 var IdentityLoader = require('./fixtures/identity_loader');
 var AnotherLoader = require('./fixtures/another_loader');
-var HappyTestUtils = require('happypack-test-utils');
+var HappyTestUtils = require('@happypack/test-utils');
 var fixture = HappyTestUtils.fixture;
 var fixturePath = HappyTestUtils.fixturePath;
 var multiline = require('multiline-slash');

lib/__tests__/index.js

@@ -1,4 +1,4 @@
-var testUtils = require('happypack-test-utils');
+var testUtils = require('@happypack/test-utils');
 var HappyRPCHandler = require('../HappyRPCHandler');
 
 beforeEach(function() {

lib/__tests__/integration/RPC--Compiler__resolve.test.js

@@ -3,11 +3,11 @@ var multiline = require('multiline-slash');
 var fs = require('fs');
 var webpack = require('webpack');
 var HappyPlugin = require('../../HappyPlugin');
-var HAPPY_LOADER_PATH = require('happypack-test-utils').HAPPY_LOADER_PATH;
-var createIntegrationSuite = require('happypack-test-utils').createIntegrationSuite;
-var composeWebpackConfig = require('happypack-test-utils').composeWebpackConfig;
-var assertNoWebpackErrors = require('happypack-test-utils').assertNoWebpackErrors;
-var assert = require('happypack-test-utils').assert;
+var HAPPY_LOADER_PATH = require('@happypack/test-utils').HAPPY_LOADER_PATH;
+var createIntegrationSuite = require('@happypack/test-utils').createIntegrationSuite;
+var composeWebpackConfig = require('@happypack/test-utils').composeWebpackConfig;
+var assertNoWebpackErrors = require('@happypack/test-utils').assertNoWebpackErrors;
+var assert = require('@happypack/test-utils').assert;
 
 describe('[Integration] Compiler RPCs - this.resolve()', function() {
   var testSuite = createIntegrationSuite(this);

lib/__tests__/integration/RPC--Compiler__stats_.test.js

@@ -1,5 +1,5 @@
 var HappyPlugin = require('../../HappyPlugin');
-var TestUtils = require('happypack-test-utils');
+var TestUtils = require('@happypack/test-utils');
 var webpack = require('webpack');
 const {
   assert,

lib/__tests__/integration/RPC--Loader__addContextDependency.test.js

@@ -1,5 +1,5 @@
 var HappyPlugin = require('../../HappyPlugin');
-var TestUtils = require('happypack-test-utils');
+var TestUtils = require('@happypack/test-utils');
 var webpack = require('webpack');
 const { assert, assertNoWebpackErrors, composeWebpackConfig } = TestUtils
 

lib/__tests__/integration/RPC--Loader__addDependency.test.js

@@ -1,5 +1,5 @@
 var HappyPlugin = require('../../HappyPlugin');
-var TestUtils = require('happypack-test-utils');
+var TestUtils = require('@happypack/test-utils');
 var webpack = require('webpack');
 const { assert, assertNoWebpackErrors, composeWebpackConfig } = TestUtils
 

lib/__tests__/integration/RPC--Loader__clearDependencies.test.js

@@ -1,5 +1,5 @@
 var HappyPlugin = require('../../HappyPlugin');
-var TestUtils = require('happypack-test-utils');
+var TestUtils = require('@happypack/test-utils');
 var webpack = require('webpack');
 const { assert, assertNoWebpackErrors, composeWebpackConfig } = TestUtils
 

lib/__tests__/integration/RPC--Loader__emitError.test.js

@@ -1,9 +1,9 @@
 var HappyPlugin = require('../../HappyPlugin');
-var TestUtils = require('happypack-test-utils');
+var TestUtils = require('@happypack/test-utils');
 var webpack = require('webpack');
-var VERSION_1 = require('happypack-test-utils').VERSION_1;
-var VERSION_2 = require('happypack-test-utils').VERSION_2;
-var VERSION_3 = require('happypack-test-utils').VERSION_3;
+var VERSION_1 = require('@happypack/test-utils').VERSION_1;
+var VERSION_2 = require('@happypack/test-utils').VERSION_2;
+var VERSION_3 = require('@happypack/test-utils').VERSION_3;
 const {
   assert,
   composeWebpackConfig,

lib/__tests__/integration/RPC--Loader__emitFile.test.js

@@ -1,5 +1,5 @@
 var HappyPlugin = require('../../HappyPlugin');
-var TestUtils = require('happypack-test-utils');
+var TestUtils = require('@happypack/test-utils');
 var webpack = require('webpack');
 const {
   assert,

lib/__tests__/integration/RPC--Loader__emitWarning.test.js

@@ -1,9 +1,9 @@
 var HappyPlugin = require('../../HappyPlugin');
-var TestUtils = require('happypack-test-utils');
+var TestUtils = require('@happypack/test-utils');
 var webpack = require('webpack');
-var VERSION_1 = require('happypack-test-utils').VERSION_1;
-var VERSION_2 = require('happypack-test-utils').VERSION_2;
-var VERSION_3 = require('happypack-test-utils').VERSION_3;
+var VERSION_1 = require('@happypack/test-utils').VERSION_1;
+var VERSION_2 = require('@happypack/test-utils').VERSION_2;
+var VERSION_3 = require('@happypack/test-utils').VERSION_3;
 const {
   assert,
   createIntegrationSuite,

lib/__tests__/integration/RPC--Loader__loadModule.test.js

@@ -2,7 +2,7 @@ var fs = require('fs');
 var multiline = require('multiline-slash');
 var webpack = require('webpack');
 var HappyPlugin = require('../../HappyPlugin');
-var TestUtils = require('happypack-test-utils');
+var TestUtils = require('@happypack/test-utils');
 const {
   assert,
   createIntegrationSuite,

lib/__tests__/integration/options__threadPool--pre-post-loaders.test.js

@@ -1,6 +1,6 @@
 var webpack = require('webpack');
 var HappyPlugin = require('../../HappyPlugin');
-var TestUtils = require('happypack-test-utils');
+var TestUtils = require('@happypack/test-utils');
 const {
   assert,
   createIntegrationSuite,

lib/__tests__/integration/options__threadPool.test.js

@@ -1,5 +1,5 @@
 var HappyPlugin = require('../../HappyPlugin');
-var TestUtils = require('happypack-test-utils');
+var TestUtils = require('@happypack/test-utils');
 var webpack = require('webpack');
 const {
   assert,

lib/__tests__/integration/webpack__bail.test.js

@@ -1,5 +1,5 @@
 var HappyPlugin = require('../../HappyPlugin');
-var TestUtils = require('happypack-test-utils');
+var TestUtils = require('@happypack/test-utils');
 var webpack = require('webpack');
 const {
   assert,

lib/__tests__/integration/webpack__watch.test.js

@@ -2,7 +2,7 @@ var webpack = require('webpack');
 var path = require('path');
 var fs = require('fs');
 var HappyPlugin = require('../../HappyPlugin');
-var TestUtils = require('happypack-test-utils');
+var TestUtils = require('@happypack/test-utils');
 const {
   assert,
   createIntegrationSuite,

packages/happypack-test-utils/package.json → packages/@happypack/test-utils/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "happypack-test-utils",
+  "name": "@happypack/test-utils",
   "private": true,
   "version": "1.0.0",
   "main": "src/index.js",
@@ -9,8 +9,5 @@
     "invariant": "2.2.2",
     "lodash": "4.17.4",
     "sinon": "1.17.7"
-  },
-  "devDependencies": {
-    "webpack-config-composer": ""
   }
 }

packages/happypack-test-utils/src/getModuleLoaders.js → packages/@happypack/test-utils/src/getModuleLoaders.js

@@ -1,13 +1,11 @@
-var getWebpackVersion = require('webpack-config-composer').getWebpackVersion;
+var { webpackVersion } = require('@happypack/webpack-config-composer');
 var VERSION_ANY = '*';
 var VERSION_1 = /^1/;
 var VERSION_2 = /^2/;
 var VERSION_3 = /^3/;
 var VERSION_4 = /^4/;
 
 module.exports = function getModuleLoaders(compiler) {
-  var webpackVersion = getWebpackVersion();
-
   if (versionMatches(webpackVersion)(VERSION_1)) {
     return compiler.options.module.loaders;
   }
@@ -16,14 +14,14 @@ module.exports = function getModuleLoaders(compiler) {
   }
 }
 
-function versionMatches(webpackVersion) {
+function versionMatches(version) {
   return function(versionStrings) {
     return [].concat(versionStrings).some(function(versionString) {
       if (versionString === VERSION_ANY) {
         return true;
       }
 
-      return webpackVersion.match(versionString);
+      return version.match(versionString);
     })
   }
 }

packages/happypack-test-utils/src/index.js → packages/@happypack/test-utils/src/index.js

@@ -1,6 +1,6 @@
 var sinon = require('sinon');
 var chai = require('chai');
-var composer = require('webpack-config-composer');
+var composer = require('@happypack/webpack-config-composer');
 
 sinon.assert.expose(chai.assert, { prefix: "" });
 

packages/happypack-test-utils/src/multiWebpackAssert.js → packages/@happypack/test-utils/src/multiWebpackAssert.js

@@ -1,8 +1,6 @@
-var getWebpackVersion = require('webpack-config-composer').getWebpackVersion;
+var { webpackVersion } = require('@happypack/webpack-config-composer');
 
 module.exports = function multiWebpackAssert(specs) {
-  var webpackVersion = getWebpackVersion();
-
   specs
     .filter(function(x) {
       return [].concat(x[0]).some(function(versionString) {

packages/happypack-test-utils/src/root.js → packages/@happypack/test-utils/src/root.js

@@ -1,5 +1,5 @@
 var path = require('path');
-var rootFragments = [ __dirname, '../../../' ];
+var rootFragments = [ __dirname, '../../../../' ];
 var resolve = path.resolve.bind(path);
 
 exports.join = function() {

packages/webpack-config-composer/package.json → packages/@happypack/webpack-config-composer/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "webpack-config-composer",
+  "name": "@happypack/webpack-config-composer",
   "private": true,
   "version": "2.0.0",
   "main": "src/index.js",