Remove webpack require hacks - they don't work

joewalker · joewalker · commit 37bd6ee2d218 · 2015-12-10T20:21:06.000Z
diff --git a/lib/gcli/test/mockDocument.js b/lib/gcli/test/mockDocument.js
@@ -23,7 +23,7 @@ var usingMockDocument = false;
  */
 exports.setup = function(requisition) {
   if (requisition.environment.window == null) {
-    var jsdom = require('j' + 'sdom').jsdom;
+    var jsdom = require('jsdom').jsdom;
     var document = jsdom('' +
          '<html>' +
          '<head>' +
diff --git a/lib/gcli/test/suite.js b/lib/gcli/test/suite.js
@@ -36,9 +36,9 @@ exports.init = function(isNode) {
   examiner.addSuite('testFail', require('./testFail'));
 
   if (isNode) {
-    examiner.addSuite('testFile', require('' + './testFile'));
-    examiner.addSuite('testFileparser', require('' + './testFileparser'));
-    examiner.addSuite('testFilesystem', require('' + './testFilesystem'));
+    examiner.addSuite('testFile', require('./testFile'));
+    examiner.addSuite('testFileparser', require('./testFileparser'));
+    examiner.addSuite('testFilesystem', require('./testFilesystem'));
   }
 
   examiner.addSuite('testFocus', require('./testFocus'));
diff --git a/lib/gcli/util/host.js b/lib/gcli/util/host.js
@@ -87,7 +87,7 @@ exports.spawn = function(context, spawnSpec) {
   if (isNode) {
     return new Promise(function(resolve, reject) {
       var output = { data: '' };
-      var childProcess = require('c' + 'hild_process');
+      var childProcess = require('child_process');
       var child = childProcess.spawn(spawnSpec.cmd, spawnSpec.args, {
         env: spawnSpec.env,
         cwd: spawnSpec.cwd
@@ -171,7 +171,7 @@ exports.exec = function(task) {
  */
 exports.createUrl = function(uristr, base) {
   if (isNode) {
-    var U = require('d' + 'om-urls');
+    var U = require('dom-urls');
     return new U(uristr, base);
   }
   else {
@@ -186,7 +186,7 @@ exports.createUrl = function(uristr, base) {
  */
 exports.toDom = function(document, html) {
   if (document == null) {
-    var jsdom = require('j' + 'sdom').jsdom;
+    var jsdom = require('jsdom').jsdom;
     document = jsdom('<html><head></head><body></body></html>');
   }
 
@@ -206,11 +206,11 @@ exports.toDom = function(document, html) {
 exports.staticRequire = function(requistingModule, name) {
   return new Promise(function(resolve, reject) {
     if (isNode) {
-      var path = require('p' + 'ath');
+      var path = require('path');
       var parent = path.dirname(requistingModule.id);
       var filename = parent + '/' + name;
 
-      var fs = require('f' + 's');
+      var fs = require('fs');
       fs.readFile(filename, { encoding: 'utf8' }, function(err, data) {
         if (err) {
           reject(err);
diff --git a/webpack.config.js b/webpack.config.js
@@ -34,32 +34,14 @@ module.exports = {
     loaders: [
       { test: /\.css$/, loader: 'raw' },
       { test: /\.html$/, loader: 'raw' },
-      { test: /\.json/, loader: 'json' },
+      { test: /\.json$/, loader: 'json' },
     ],
   },
   plugins: [
-    new webpack.IgnorePlugin(/jsdom$/),
-    new webpack.IgnorePlugin(/fs$/),
-    new webpack.IgnorePlugin(/express$/),
     new webpack.IgnorePlugin(/child_process$/),
-    new webpack.IgnorePlugin(/body-parser$/),
-    new webpack.IgnorePlugin(/^text!gcli/),
+    new webpack.IgnorePlugin(/dom-urls$/),
+    new webpack.IgnorePlugin(/fs$/),
+    new webpack.IgnorePlugin(/jsdom$/),
+    new webpack.IgnorePlugin(/path$/),
   ],
 };
-
-var compiler = webpack(module.exports);
-
-compiler.run(function(err, stats) {
-  if (err) {
-    throw new Error(err);
-  }
-
-  console.log(stats.toString({ colors: true }));
-
-  //stats.compilation.errors
-  //        .map(function(s) { return s.message; })
-  //        .forEach(console.log);
-  //stats.compilation.warnings
-  //        .map(function(s) { return s.message; })
-  //        .forEach(console.log);
-});
