fix: handle license file next to license directory

Author: mjeanroy

src/license-plugin.js

@@ -190,9 +190,11 @@ class LicensePlugin {
           const cwd = this._cwd || process.cwd();
           const absolutePath = path.join(dir, '[lL][iI][cC][eE][nN][cCsS][eE]*');
           const relativeToCwd = path.relative(cwd, absolutePath);
-          const licenseFile = this._findGlob(relativeToCwd, cwd)[0];
-          // Add the license text if a license file exists
-          if (fs.existsSync(licenseFile) && fs.lstatSync(licenseFile).isFile()) {
+          const licenseFile = this._findGlob(relativeToCwd, cwd).find((file) => (
+            fs.existsSync(file) && fs.lstatSync(file).isFile()
+          ));
+
+          if (licenseFile) {
             pkg.licenseText = fs.readFileSync(licenseFile, 'utf-8');
           }
 

test/fixtures/fake-package-10/index.js

@@ -0,0 +1,25 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016-2020 Mickael Jeanroy
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+console.log('fake-package');

test/fixtures/fake-package-10/license.md

@@ -0,0 +1 @@
+license.md file

test/fixtures/fake-package-10/license/index.md

@@ -0,0 +1 @@
+license/index.md file

test/fixtures/fake-package-10/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "fake-package",
+  "version": "1.0.0",
+  "description": "Fake package used in unit tests",
+  "main": "src/index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "Mickael Jeanroy <mickael.jeanroy@gmail.com>",
+  "license": "MIT",
+  "private": true,
+  "dependencies": {
+    "lodash": "*"
+  }
+}

test/license-plugin.spec.js

@@ -204,6 +204,19 @@ describe('LicensePlugin', () => {
       });
     });
 
+    it('should load pkg and find license file instead of directory', () => {
+      const id = path.join(__dirname, 'fixtures', 'fake-package-10', 'src', 'index.js');
+
+      plugin.scanDependency(id);
+
+      expect(addDependency).toHaveBeenCalled();
+      expect(plugin._dependencies).toEqual({
+        'fake-package': Object.assign(fakePackage, {
+          licenseText: 'license.md file',
+        }),
+      });
+    });
+
     it('should load pkg including license text from license.md file ignoring case of license file', () => {
       const id = path.join(__dirname, 'fixtures', 'fake-package-8', 'src', 'index.js');