Webpack 4 support

jest.config.js

@@ -1,6 +1,7 @@
 module.exports = {
     collectCoverage: true,
     collectCoverageFrom: ['lib/**/*.js'],
+    testEnvironment: 'node',
     coverageThreshold: {
         global: {
             statements: 87.67,

lib/index.js

@@ -204,25 +204,21 @@ function createPrefix(loaderContext, globalVarTree, globalVars, useEval) {
 
 module.exports = function loader(originalSource, inputSourceMap) {
     const self = this;
-    let { query } = this;
     const callback = this.async();
     let source = originalSource;
     let globalVars = [];
     let exportedVars = [];
 
-    if (typeof query === 'string' && query.length > 0) {
-        query = loaderUtils.parseQuery(this.query);
-    }
-
     if (this.cacheable) {
         this.cacheable();
     }
 
+    const options = loaderUtils.getOptions(this);
     const config = merge(
         {},
         defaultConfig,
-        this.options[query.config || 'closureLoader'],
-        query,
+        this.options ? this.options[options.config || 'closureLoader'] : {},
+        options,
     );
 
     mapBuilder(config.paths, config.watch, config.fileExt)

package.json

@@ -44,7 +44,7 @@
     "imports-loader": "^0.8.0",
     "jest": "^22.4.3",
     "memory-fs": "^0.4.1",
-    "webpack": "^3.11.0",
+    "webpack": "^4.5.0",
     "webpack-merge": "^4.1.2"
   }
 }