refactor: cjs (#437)

webpack-contrib · Dec 17, 2019 · 5c51b90 · 5c51b90
1 parent 609263a
commit 5c51b90
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
     "type": "opencollective",
     "url": "https://opencollective.com/webpack"
   },
-  "main": "dist/index.js",
+  "main": "dist/cjs.js",
   "engines": {
     "node": ">= 8.9.0"
   },

diff --git a/src/cjs.js b/src/cjs.js
@@ -0,0 +1,3 @@
+const loader = require('./index');
+
+module.exports = loader.default;
diff --git a/src/index.js b/src/index.js
@@ -5,9 +5,9 @@ import validateOptions from 'schema-utils';
 
 import schema from './options.json';
 
-module.exports = () => {};
+const loaderApi = () => {};
 
-module.exports.pitch = function loader(request) {
+loaderApi.pitch = function loader(request) {
   const options = loaderUtils.getOptions(this) || {};
 
   validateOptions(schema, options, {
@@ -192,3 +192,5 @@ ${hmrCode}`;
     }
   }
 };
+
+export default loaderApi;
diff --git a/test/cjs.test.js b/test/cjs.test.js
@@ -0,0 +1,8 @@
+import src from '../src';
+import cjs from '../src/cjs';
+
+describe('cjs', () => {
+  it('should exported', () => {
+    expect(cjs).toEqual(src);
+  });
+});
diff --git a/test/helpers/getCompiler.js b/test/helpers/getCompiler.js
@@ -20,7 +20,7 @@ export default (fixture, loaderOptions = {}, config = {}) => {
           test: /\.css$/i,
           use: [
             {
-              loader: path.resolve(__dirname, '../../src'),
+              loader: path.resolve(__dirname, '../../src/cjs.js'),
               options: loaderOptions || {},
             },
             loaderOptions &&

diff --git a/test/loader.test.js b/test/loader.test.js
@@ -65,7 +65,7 @@ describe('loader', () => {
                 test: /\.css$/i,
                 use: [
                   {
-                    loader: path.resolve(__dirname, '../src'),
+                    loader: path.resolve(__dirname, '../src/cjs.js'),
                     options: { injectType },
                   },
                   injectType === 'linkTag'
@@ -147,7 +147,7 @@ describe('loader', () => {
                 test: /\.css$/i,
                 use: [
                   {
-                    loader: path.resolve(__dirname, '../src'),
+                    loader: path.resolve(__dirname, '../src/cjs.js'),
                     options: { injectType },
                   },
                   injectType === 'linkTag'
@@ -188,7 +188,7 @@ describe('loader', () => {
                 test: /\.css$/i,
                 use: [
                   {
-                    loader: path.resolve(__dirname, '../src'),
+                    loader: path.resolve(__dirname, '../src/cjs.js'),
                     options: { injectType },
                   },
                   injectType === 'linkTag'
@@ -225,7 +225,7 @@ describe('loader', () => {
                 test: /\.css$/i,
                 use: [
                   {
-                    loader: path.resolve(__dirname, '../src'),
+                    loader: path.resolve(__dirname, '../src/cjs.js'),
                     options: { injectType },
                   },
                   injectType === 'linkTag'
@@ -262,7 +262,7 @@ describe('loader', () => {
                 test: /\.css$/i,
                 use: [
                   {
-                    loader: path.resolve(__dirname, '../src'),
+                    loader: path.resolve(__dirname, '../src/cjs.js'),
                     options: { injectType },
                   },
                   injectType === 'linkTag'