Merge branch 'main' into v7

.github/workflows/ci.yml

@@ -93,6 +93,9 @@ jobs:
     runs-on: windows-latest
     env:
       LERNA_OS_TYPE: windows
+      # Set the temp directory to a short dir without username in it otherwise import command specs have a problem because of different paths on windows agents
+      TEMP: C:\temp
+      TMP: C:\temp
     steps:
       - uses: actions/checkout@v3
 
@@ -112,12 +115,12 @@ jobs:
         # From old maintainer regarding integration tests: "import is NOT TESTED in windows because pain and suffering"
         run: |
           pids=()
-          npx nx run integration:integration --ci --maxWorkers=2 --testPathIgnorePatterns=lerna-import.spec.ts &
+          npx nx run integration:integration --ci --maxWorkers=2 &
           pids+=($!)
 
           # Ignored specs currently failing on windows
           # TODO: investigate why
-          npx nx run-many -t test --parallel=3 --ci --maxWorkers=2 --testTimeout=60000 --testPathIgnorePatterns=import-command.spec.ts --testPathIgnorePatterns=save.spec.ts --testPathIgnorePatterns=find-file.spec.ts --testPathIgnorePatterns=chain-class.spec.ts &
+          npx nx run-many -t test --parallel=3 --ci --maxWorkers=2 --testTimeout=60000 --testPathIgnorePatterns=save.spec.ts --testPathIgnorePatterns=find-file.spec.ts --testPathIgnorePatterns=chain-class.spec.ts &
 
           pids+=($!)
 
@@ -138,6 +141,9 @@ jobs:
         agent: [1, 2, 3, 4]
     env:
       LERNA_OS_TYPE: windows
+      # Set the temp directory to a short dir without containing username, otherwise import command specs have a problem because of different paths on windows agents
+      TEMP: C:\temp
+      TMP: C:\temp
     steps:
       - uses: actions/checkout@v3
 

libs/commands/import/src/index.ts

@@ -73,6 +73,14 @@ class ImportCommand extends Command {
     const lernaRootRelativeToGitRoot = path.relative(gitRepoRoot, this.project.rootPath);
     this.targetDirRelativeToGitRoot = path.join(lernaRootRelativeToGitRoot, targetDir);
 
+    //if the target directory is not in the Git root
+    if (this.targetDirRelativeToGitRoot.startsWith("..")) {
+      throw new ValidationError(
+        "ENOTINREPO",
+        `Project root ${this.project.rootPath} is not a subdirectory of git root ${gitRepoRoot}`
+      );
+    }
+
     if (fs.existsSync(path.resolve(this.project.rootPath, targetDir))) {
       throw new ValidationError("EEXISTS", `Target directory already exists "${targetDir}"`);
     }

libs/commands/import/src/lib/import-command.spec.ts

@@ -278,6 +278,20 @@ describe("ImportCommand", () => {
       await expect(command).rejects.toThrow(`Target directory already exists "${relativePath}"`);
     });
 
+    it("errors if projectDir is not in repository", async () => {
+      const [testDir, externalDir] = await initBasicFixtures();
+      //create a symlinked project
+      const symlinkedLernaPath = path.join(testDir, "symlink");
+      const linkedProject = await initFixture("basic");
+      fs.symlinkSync(linkedProject, symlinkedLernaPath, "dir");
+
+      const command = lernaImport(symlinkedLernaPath)(externalDir);
+
+      await expect(command).rejects.toThrow(
+        `Project root ${symlinkedLernaPath} is not a subdirectory of git root`
+      );
+    });
+
     it("infers correct target directory given packages glob", async () => {
       const [testDir, externalDir] = await initBasicFixtures();
       const targetDir = path.join(testDir, "pkg", path.basename(externalDir));

libs/commands/publish/src/index.ts

@@ -989,6 +989,7 @@ class PublishCommand extends Command {
               }
 
               this.logger.silly("", err);
+              this.logger.warn("notice", `Package failed to publish: ${pkg.name}`);
               this.logger.error(err.code, (err.body && err.body.error) || err.message);
 
               // avoid dumping logs, this isn't a lerna problem

libs/commands/publish/src/lib/publish-from-package.spec.ts

@@ -49,9 +49,11 @@ const promptConfirmation = jest.mocked(_promptConfirmation);
 const throwIfUncommitted = jest.mocked(_throwIfUncommitted);
 
 // The mock differs from the real thing
-const npmPublish = _npmPublish as any;
-const writePkg = _writePkg as any;
-const output = _output as any;
+const npmPublish = _npmPublish as jest.MockedFunction<typeof _npmPublish> & { order: () => string[] };
+const writePkg = _writePkg as jest.MockedFunction<typeof _writePkg> & {
+  updatedManifest: (name: string) => { gitHead?: string };
+};
+const output = _output as jest.MockedFunction<typeof _output> & { logged: () => string[] };
 
 const initFixture = initFixtureFactory(__dirname);
 
@@ -106,6 +108,27 @@ describe("publish from-package", () => {
     ]);
   });
 
+  it("logs the name of the package that fails to be published", async () => {
+    const cwd = await initFixture("independent");
+
+    getUnpublishedPackages.mockImplementationOnce((packageGraph) => Array.from(packageGraph.values()));
+
+    npmPublish.mockImplementation(async (pkg) => {
+      if (pkg.name === "package-2") {
+        throw new Error("some-error");
+      }
+    });
+
+    try {
+      await lernaPublish(cwd)("from-package");
+    } catch {
+      // ignore error
+    }
+
+    const logMessages = loggingOutput("notice");
+    expect(logMessages).toContain("Package failed to publish: package-2");
+  });
+
   it("exits early when all packages are published", async () => {
     const cwd = await initFixture("normal");