Merge branch 'noop_on_non_goog_files'

Author: mxmul

jest.config.js

@@ -3,10 +3,10 @@ module.exports = {
     collectCoverageFrom: ['lib/**/*.js'],
     coverageThreshold: {
         global: {
-            statements: 83.69,
-            branches: 73.81,
-            lines: 84.17,
-            functions: 82.35,
+            statements: 87.67,
+            branches: 79.55,
+            lines: 87.59,
+            functions: 84.85,
         },
     },
 };

lib/index.js

@@ -232,27 +232,34 @@ module.exports = function loader(originalSource, inputSourceMap) {
             const globalVarTree = {};
             const exportVarTree = {};
 
-            let matches = null;
-            // eslint-disable-next-line no-cond-assign
-            while ((matches = provideRegExp.exec(source)) !== null) {
+            let provideMatches = provideRegExp.exec(source);
+            let requireMatches = requireRegExp.exec(source);
+
+            if (!provideMatches && !requireMatches) {
+                callback(null, source, inputSourceMap);
+                return;
+            }
+
+            while (provideMatches) {
                 source = source.replace(
-                    new RegExp(escapeRegExp(matches[0]), 'g'),
+                    new RegExp(escapeRegExp(provideMatches[0]), 'g'),
                     '',
                 );
-                globalVars.push(matches[2]);
-                exportedVars.push(matches[2]);
+                globalVars.push(provideMatches[2]);
+                exportedVars.push(provideMatches[2]);
+                provideMatches = provideRegExp.exec(source);
             }
 
-            // eslint-disable-next-line no-cond-assign
-            while ((matches = requireRegExp.exec(source)) !== null) {
-                globalVars.push(matches[2]);
+            while (requireMatches) {
+                globalVars.push(requireMatches[2]);
                 source = replaceRequire(
                     self,
                     source,
-                    matches[2],
-                    matches[0],
+                    requireMatches[2],
+                    requireMatches[0],
                     provideMap,
                 );
+                requireMatches = requireRegExp.exec(source);
             }
 
             globalVars = globalVars

tests/loader.test.js

@@ -0,0 +1,23 @@
+const loader = require('..');
+
+function getLoaderOutput(originalSource) {
+    return new Promise((resolve, reject) => {
+        const context = {
+            async: () => (err, content) => {
+                if (err) {
+                    reject(err);
+                }
+                resolve(content);
+            },
+            query: {},
+            options: {},
+        };
+        loader.apply(context, [originalSource]);
+    });
+}
+
+test('noop when there are no goog.provide or goog.require statements', async () => {
+    const originalSource = 'console.log("hi");';
+    const output = await getLoaderOutput(originalSource);
+    expect(output).toEqual(originalSource);
+});