fix(publish): Propagate root license into custom publish directories

evocateur · evocateur · commit d410a58e3039 · 2019-07-18T14:54:07.000-07:00
Fixes #2157
diff --git a/commands/publish/__tests__/create-temp-licenses.test.js b/commands/publish/__tests__/create-temp-licenses.test.js
@@ -18,6 +18,34 @@ describe("createTempLicenses", () => {
     expect(licenseWritten).toBe(true);
   });
 
+  it("copies root license into package contents", async () => {
+    const cwd = await initFixture("licenses");
+    const project = new Project(cwd);
+    const [pkg] = await project.getPackages();
+
+    // automagical "contents" setter creates absolute path
+    pkg.contents = "dist";
+
+    await createTempLicenses(project.licensePath, [pkg]);
+
+    const licenseWritten = await fs.pathExists(path.join(pkg.contents, "LICENSE"));
+    expect(licenseWritten).toBe(true);
+  });
+
+  it("copies root license into package publishConfig.directory", async () => {
+    const cwd = await initFixture("licenses");
+    const project = new Project(cwd);
+    const [pkg] = await project.getPackages();
+
+    // automagical "contents" getter creates absolute path
+    await pkg.set("publishConfig", { directory: "build" }).serialize();
+
+    await createTempLicenses(project.licensePath, [pkg]);
+
+    const licenseWritten = await fs.pathExists(path.join(pkg.contents, "LICENSE"));
+    expect(licenseWritten).toBe(true);
+  });
+
   it("copies root license with extension into package location", async () => {
     const cwd = await initFixture("licenses");
     const project = new Project(cwd);
diff --git a/commands/publish/index.js b/commands/publish/index.js
@@ -164,6 +164,13 @@ class PublishCommand extends Command {
 
       this.packagesToPublish = this.updates.map(({ pkg }) => pkg).filter(pkg => !pkg.private);
 
+      if (this.options.contents) {
+        // globally override directory to publish
+        for (const pkg of this.packagesToPublish) {
+          pkg.contents = this.options.contents;
+        }
+      }
+
       if (result.needsConfirmation) {
         // only confirm for --canary, bump === "from-git",
         // or bump === "from-package", as VersionCommand
@@ -616,15 +623,6 @@ class PublishCommand extends Command {
       chain = chain.then(() => this.runPackageLifecycle(this.project.manifest, "prepack"));
     }
 
-    const { contents } = this.options;
-
-    if (contents) {
-      // globally override directory to publish
-      for (const pkg of this.packagesToPublish) {
-        pkg.contents = contents;
-      }
-    }
-
     const opts = this.conf.snapshot;
     const mapper = pPipe(
       [
diff --git a/commands/publish/lib/create-temp-licenses.js b/commands/publish/lib/create-temp-licenses.js
@@ -21,7 +21,7 @@ function createTempLicenses(srcLicensePath, packagesToBeLicensed) {
 
   // store target path for removal later
   packagesToBeLicensed.forEach(pkg => {
-    pkg.licensePath = path.join(pkg.location, licenseFileName);
+    pkg.licensePath = path.join(pkg.contents, licenseFileName);
   });
 
   return pMap(packagesToBeLicensed, pkg => fs.copy(srcLicensePath, pkg.licensePath, options));
