fix(index): revert to CJS exports (#212)

webpack-contrib · Sep 30, 2017 · f412b3e · f412b3e
1 parent c49aceb
commit f412b3e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/index.js b/src/index.js
@@ -65,8 +65,8 @@ export default function loader(content) {
   if (options.emitFile === undefined || options.emitFile) {
     this.emitFile(outputPath, content);
   }
-
-  return `export default ${publicPath};`;
+  // TODO revert to ES2015 Module export, when new CSS Pipeline is in place
+  return `module.exports = ${publicPath};`;
 }
 
 export const raw = true;
diff --git a/test/loader.test.js b/test/loader.test.js
@@ -90,39 +90,39 @@ describe('correct-filename', () => {
 describe('publicPath option', () => {
   it('should be supported', () => {
     expect(run('/file.txt', 'publicPath=http://cdn/').result).toEqual(
-      'export default "http://cdn/81dc9bdb52d04dc20036dbd8313ed055.txt";',
+      'module.exports = "http://cdn/81dc9bdb52d04dc20036dbd8313ed055.txt";',
     );
   });
 
   it('should override public path when given empty string', () => {
     expect(run('/file.txt', 'publicPath=').result).toEqual(
-      'export default "81dc9bdb52d04dc20036dbd8313ed055.txt";',
+      'module.exports = "81dc9bdb52d04dc20036dbd8313ed055.txt";',
     );
   });
 
   it('should use webpack public path when not set', () => {
     expect(run('/file.txt').result).toEqual(
-      'export default __webpack_public_path__ + "81dc9bdb52d04dc20036dbd8313ed055.txt";',
+      'module.exports = __webpack_public_path__ + "81dc9bdb52d04dc20036dbd8313ed055.txt";',
     );
   });
 });
 
 describe('useRelativePath option', () => {
   it('should be supported', () => {
     expect(run('/this/is/the/context/file.txt', 'useRelativePath=true').result).toEqual(
-      'export default __webpack_public_path__ + \"./81dc9bdb52d04dc20036dbd8313ed055.txt\";',
+      'module.exports = __webpack_public_path__ + \"./81dc9bdb52d04dc20036dbd8313ed055.txt\";',
     );
 
     expect(run('/this/is/file.txt', 'useRelativePath=true').result).toEqual(
-      'export default __webpack_public_path__ + \"../../81dc9bdb52d04dc20036dbd8313ed055.txt\";',
+      'module.exports = __webpack_public_path__ + \"../../81dc9bdb52d04dc20036dbd8313ed055.txt\";',
     );
 
     expect(run('/this/file.txt', 'context=/this/is/the/&useRelativePath=true').result).toEqual(
-      'export default __webpack_public_path__ + \"../../81dc9bdb52d04dc20036dbd8313ed055.txt\";',
+      'module.exports = __webpack_public_path__ + \"../../81dc9bdb52d04dc20036dbd8313ed055.txt\";',
     );
 
     expect(run('/this/file.txt', 'context=/&useRelativePath=true').result).toEqual(
-      'export default __webpack_public_path__ + \"this/81dc9bdb52d04dc20036dbd8313ed055.txt\";',
+      'module.exports = __webpack_public_path__ + \"this/81dc9bdb52d04dc20036dbd8313ed055.txt\";',
     );
   });
 });
@@ -134,7 +134,7 @@ describe('outputPath function', () => {
 
     expect(runWithOptions('/this/is/the/context/file.txt', options).result)
       .toEqual(
-        'export default __webpack_public_path__ + \"/path/set/by/func\";',
+        'module.exports = __webpack_public_path__ + \"/path/set/by/func\";',
       );
   });
 
@@ -145,7 +145,7 @@ describe('outputPath function', () => {
 
     expect(runWithOptions('/this/is/the/context/file.txt', options).result)
       .toEqual(
-        'export default __webpack_public_path__ + \"./81dc9bdb52d04dc20036dbd8313ed055.txt\";',
+        'module.exports = __webpack_public_path__ + \"./81dc9bdb52d04dc20036dbd8313ed055.txt\";',
       );
   });
 });